diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-27 14:32:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-07-27 14:32:43 +1000 |
| commit | 451cc82bd11eb6a374f4dbcfc1cf007eafea91ab (patch) | |
| tree | eeb794d0182e8068efc008c4d6342856f4aaa9b4 | |
| parent | 128ee4a7fd47e271e76532ce4b75bd24e04a2f8f (diff) | |
Add linux-next specific files for 20230727next-20230727
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 366 | ||||
| -rw-r--r-- | Next/Trees | 368 | ||||
| -rw-r--r-- | Next/merge.log | 8326 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 9061 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..fe2067b4d0e2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,366 @@ +Name SHA1 +---- ---- +origin 0a8db05b571ad5b8d5c8774a004c0424260a90bd +fixes d528014517f2b0531862c02865b9d4c908019dc4 +mm-hotfixes 646d7feb004981ac8d45d17fef28b177592027e3 +kbuild-current df01b7cfcef08bf3fdcac2909d0e1910781d6bfd +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd +arm64-fixes 05d881b85b48c7ac6a7c92ce00aa916c4a84d052 +arm-soc-fixes 92d39d018347ead1078dcba3cb1d8aeb9de79e04 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes faafd6ca7e6e7100d21d3f43ec17674f36c9f843 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 4055eabe04a26f5d113b5a02588b20b5e166a753 +powerpc-fixes 106ea7ffd56b0f9454cd4f625474967f12ac4dbd +s390-fixes 6eaae198076080886b9e7d57f4ae06fa782f90ef +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net fa29d467977d50400f6bb1374e942e7474fdf53c +bpf aa89592fcb3af8372bd39ff468fdd65477f57201 +ipsec 6018a266279b1a75143c7c0804dd08a5fc4c3e0b +netfilter d4a7ce642100765119a872d4aba1bf63e3a22c8a +ipvs 9b39f758974ff8dfa721e68c6cecfd37e6ddb206 +wireless 456b5e85d8a56e5563573b10e0840c7ae59373da +wpan 9a43827e876c9a071826cc81783aa2222b020f1d +rdma-fixes 5c719d7aef298e9b727f39b45e88528a96df3620 +sound-current f7fea075edfa085c25eb34c44ceacf3602537f98 +sound-asoc-fixes 2821cfc936af7bef93711fb328fb790f442197f0 +regmap-fixes 6eaae198076080886b9e7d57f4ae06fa782f90ef +regulator-fixes f09ac4b67fb218c31c5f4ef619be9d218edf348f +spi-fixes 86e99e6b5d38878ee9315ce978c951504e9a5711 +pci-current b607aa1edc9ca2ff16ae29c48e3e4090fae8aeab +driver-core.current 6eaae198076080886b9e7d57f4ae06fa782f90ef +tty.current 748c5ea8b8796ae8ee80b8d3a3d940570b588d59 +usb.current 2627335a1329a0d39d8d277994678571c4f21800 +usb-serial-fixes d245aedc00775c4d7265a9f4522cc4e1fd34d102 +phy 13c088cf3657d70893d75cf116be937f1509cc0f +staging.current 6eaae198076080886b9e7d57f4ae06fa782f90ef +iio-fixes 6811694eb2f6b7a4e97be2029edc7dd6a39460f8 +counter-current aead78125a987f48944bff2001f61df72b95afc4 +char-misc.current f8ea95021022826a010f56cf19451c21f4c9c155 +soundwire-fixes 7891d0a5ce6f627132d3068ba925cf86f29008b1 +thunderbolt-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1 +input-current eb09074bdb05ffd6bfe77f8b4a41b76ef78c997b +crypto-current 0b7ec177b589842c0abf9e91459c83ba28d32452 +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes 569f8b501b177f21121d483a96491716ab8905f4 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes d2a257684758b7253ed37c4642b68e0fc1e9bfac +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes ea690ad78dd611e3906df5b948a516000b05c1cb +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 0cb1d9c845110ce638a43a1417c7df5968d1daa3 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 6eaae198076080886b9e7d57f4ae06fa782f90ef +at91-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 0c189708bfbfa90b458dac5f0fd4379f9a7d547e +kvms390-fixes c2fceb59bbda16468bda82b002383bff59de89ab +hwmon-fixes 0bd66784274a287beada2933c2c0fa3a0ddae0d7 +nvdimm-fixes e98d14fa7315867fded127a98db355f49807dfdb +cxl-fixes 70d49bbf962ce4579bebd82938ef7f265bc3e6ae +btrfs-fixes d3099c02c16583b2425a63c33c874ba41c74164d +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes c21733754cd6ecbca346f2adf9b17d4cfa50504f +samsung-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-samsung-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +devicetree-fixes ffc59c6414f9ffd52591786efe3e62e145563deb +dt-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +scsi-fixes d4e0265345778c623d1fe619075b677731847c34 +drm-fixes 28801cc85906ea62043e62c71def7f9daaf1c168 +drm-intel-fixes e354f67733115b4453268f61e6e072e9b1ea7a2f +mmc-fixes 5def5c1c15bf22934ee227af85c1716762f3829f +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes fdf0eaf11452d72945af31804e2a1048ee1b574c +hyperv-fixes ed0cf84e9cc42e6310961c87709621f1825c2bb8 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes ab2dbc7accedc2e98eb7d8b8878d337e3b36c95d +riscv-dt-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-soc-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +spdx fdf0eaf11452d72945af31804e2a1048ee1b574c +gpio-brgl-fixes 644ee70267a934be27370f9aa618b29af7290544 +gpio-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +erofs-fixes fdf0eaf11452d72945af31804e2a1048ee1b574c +kunit-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 9e46e4dcd9d6cd88342b028dbfa5f4fb7483d39c +nfsd-fixes f75546f58a70da5cfdcec5a45ffc377885ccbee8 +irqchip-fixes 6fe5c68ee6a1aae0ef291a56001e7888de547fa2 +renesas-fixes 4c188fa183ebb45238ef16504c4c7606955cf9d4 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current ccff6d117d8dc8d8d86e8695a75e5f8b01e573bf +efi-fixes 36e4fc57fc1619f462e669e939209c45763bc8f5 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 205f4cf3136fc0bdac5e963a219ae6f115496a14 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes e6ab0b914c12acefbb0880dded48cb930ccab5cf +w1-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drm-misc-fixes 39b1320e5dc2b707dfb5c25b0298ce9d4fc05aea +mm-stable 6eaae198076080886b9e7d57f4ae06fa782f90ef +mm-nonmm-stable 6eaae198076080886b9e7d57f4ae06fa782f90ef +mm f0c21a88ed02b3cca28e8828e5afa8dd8fbeead9 +kbuild 4d15c9fa058e6dee09324cfc93f48858d4296019 +clang-format 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +perf 681f34d52b9647db68cebc5f957ddfff01fb6ba0 +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping 8ac04063354a01a484d2e55d20ed1958aa0d3392 +asm-generic 4dd595c34c4bb22c16a76206a18c13e4e194335d +arc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +arm 1faf70485ea9b3209620bfbdd74ccd9b49e2fdba +arm64 893b24181b4c4bf1fa2841b1ed192e5413a97cb1 +arm-perf dea0f4146f66a242450b29fae4d643bd5318c511 +arm-soc c9b007d4c7552e975b696a88c52f33b6e9c2de85 +amlogic 76483eaf2109fc3d94f29c68ff9dee6579e95ccf +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed a43f3e970a1d8f7b2f5729fcf7af9985dd0d6a0d +at91 12fe727585e312300469e87b88862c1456578f37 +broadcom 0d8d8753ede03c7db24e05bdb8c9a95016d430ec +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory f7812cdabb82b2b143bba7cb1736889cd56d2092 +imx-mxs 230ac1a44545fd7e377f3a2fb1020dea3dfe047b +mediatek f6925844c82ae23165097eb14e272f76b855fb5d +mvebu 54fbc0260c64a6386cbd88a7aff5b3ae4ceeff3c +omap f581c395fcb821a0acc17c7fa8728752c021156a +qcom 5f8e7fdfa482f56c9c884b5c41f40f8f5923d9c4 +renesas f589646c2e1db46614b0bafb41d36cf77921c2bb +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip 5c42724cf38e4c7021e8443773acd1634ed80210 +samsung-krzk 31b721cf256cb39580530e67013abd8ff99586d3 +scmi e1b68ed58b3b295fc5254ad9e2276e31dbcb6a35 +stm32 2f38de940f072db369edd3e6e8d82bb8f42c5c9b +sunxi 1bcb932283c9664a2bc57bb74864b9ab0050981b +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra a3e08a88120b085021abb38a40c02f5a08913aa7 +ti 897aebaf0d58258c69bbf7ba6edaab27ccab90a5 +xilinx 9335fe594d855cfad0a1043a9a4e03abc62292dc +clk 4d7c2c61e5c5793ce8c3823ea2bc12630eb8a8b0 +clk-imx 2deed4cda3b76bcb8be2533f5bd07803b1bfa452 +clk-renesas 2fd3f06b527e6ffaa929129a267386961e20a86c +csky 6ee1ffdc1838cb84d8d91b23c718bbbb12007286 +loongarch 66b198b500fa82bfdd10a508a08bf3440c3e72e2 +m68k 922a9bd138101e3e5718f0f4d40dba68ef89bb43 +m68knommu cdff93a49cc4e1a21450951c2f289489f8d7f5d2 +microblaze 0e9a2a228a1ac80053d9817a8af68abcd754675e +mips 0859bdf1ace659e8981a82956920573c1f8203da +openrisc dceaafd668812115037fc13a1893d068b7b880f5 +parisc-hd 6995e2de6891c724bfeb2db33d7b87775f913ad1 +powerpc fdf0eaf11452d72945af31804e2a1048ee1b574c +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 471aba2e4760f9abcec7d872a85795c6dd60dce1 +riscv-dt e7c304c0346d23f5813149bfc686fb68b1108bbe +riscv-soc 30fb4784483b41ba7169432e594e6a96d7cbe4e0 +s390 305b9f4f7bebc12610035f8cd865a0db87df81b6 +sh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa a160e9414d8a1747225206558b24d7df513b3c8d +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 324718ddddc40905f0216062dfbb977809184c06 +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 0914825aa54f2d4bf25569c74dacc0c4cf939761 +ceph 588159009d5b7a09c3e5904cffddbe4a4e170301 +cifs a171eb5cac427fa8d084eaf5e47fbe4c0f1e279f +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 1f9beb807470ae60210f4d4e96dac3a7733dd117 +exfat ff84772fd45d486e4fc78c82e2f70ce5333543e6 +ext3 eccf9ae283126b6eeca01600b757d1877a870d73 +ext4 9d3de7ee192a6a253f475197fe4d2e2af10a731f +f2fs 10c7134ee4408eb3ecc16b7177ca369cbbb8b697 +fsverity 456ae5fe9b448f44ebe98b391a3bae9c75df465e +fuse 6a567e920fd0451bf29abc418df96c3365925770 +gfs2 c6fa6b6c07c8ca5b0cc6b6879661d138884190d4 +jfs 6e2bda2c192d0244b5a78b787ef20aa10cb319b7 +ksmbd f40125c0a160912ee3ac8def2f7de5bacb80df50 +nfs 5b4a82a0724af1dfd1320826e0266117b6a57fbd +nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52 +nfsd c7d247b033faa0418602c1c1ca3faccdb2d503fb +ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 0a3bf81dbcb228124c9de72c85c442a81d70ab1e +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +xfs f6250e205691a58c81be041b1809a2e706852641 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap a67371b7aee931572eab313384e7fcd93255f6f8 +djw-vfs 59ba4fdd2d1f9dd7af98f5168c846150c9aec56d +file-locks 72bb0abc34923c207eab2e3f15114b3aed89a795 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs-brauner 91bcc05fab9bb173d6d6da955d2ae213919e2ef0 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 82515ab6aeb3ff54833a3632b798f285da8fdbdd +pci 69286072664490a366f3331f9496fe78efaca603 +pstore 438b805003a07606f9a9f222a7ddb7dcdb87aeaa +hid 5eb5c80feb93316ff0f659f386025ec492c6fad7 +i2c 6537ed3904a3b3720e5e238dd5d542448fcf94c2 +i3c 49b472ebc61de3d4aa7cc57539246bb39f6c5128 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging c944c8c532f7bd6d9e52ee3e2e97dcdd9c6014c0 +jc_docs c35211059b77ece1360fd2338c8e4935f1a3b30e +v4l-dvb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +v4l-dvb-next d7b13edd4cb4bfa335b6008ab867ac28582d3e5c +pm cbda924b739da26f43629bffb62e7a713fb2e060 +cpufreq-arm fd459406b99d4a0c641a02aaaf56b585571566cf +cpupower 99481d2195bfd13a663904e6014887abf46b57c7 +devfreq c46de2fb4ad9e2e5d9041953e87d71ee762fc160 +opp c2add32ce452e216f5b80269fe73d11be1e2c9a5 +thermal 57c9eaa4de537e6f08819d9214de502cac5a989c +dlm dc52cd2eff4ac924a795efcef27f8fd58a5260bb +rdma 24b1b5d85c1c1e1c0eb7b6d7b6986ecb6c80041d +net-next 2303fae130640874823ea1bc7ec65c3cd074a7eb +bpf-next 63e2da3b7f7f63f881aa508825b0c4241e9910e1 +ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 2303fae130640874823ea1bc7ec65c3cd074a7eb +ipvs-next b8e39b38487e68c6503419db6e4a851a0ef56de7 +bluetooth f57f797eebfe62621f37d00831b5bc4c95398a11 +wireless-next b2090d93d4b6f1c72a9793d5a171806b8468b7cb +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd de2a5d52f2c052814349013e8a77d1bc02717d74 +nand c3519aed2a3faf77b66350214fb5caa9a0905888 +spi-nor aa517a29d6457e8afcbe8e7e9eb8813594c39d1f +crypto dd105461ad15ea930d88aec1e4fcfc1f3186da43 +drm 6c7f27441d6af776a89147027c6f4a11c0162c64 +drm-misc 45b58669e532bcdfd6e1593488d1f23eabd55428 +amdgpu b5ac08806c07ab86645c6fbaa5832214c1d10e34 +drm-intel 4948738e296c75de57e0c4a8e8ead1ff2c03fe00 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm cd036d542afb82adfbbd43c5dbeb7010e8e91ee7 +drm-msm-lumag 1275b21a6c54b0d72100d16e978e0e01238e6659 +etnaviv 88c31d2dd191ab78e9ba9ff967845018aa7ee214 +fbdev 6995e2de6891c724bfeb2db33d7b87775f913ad1 +regmap ffb57ee9c0e2a9aae89016ee7b793a666c6aa4a5 +sound a32e0834df769a153419fd2c88d19704ae67cf18 +ieee1394 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +sound-asoc 588b870db68fa6cd4cdaf26dcef7eae107c7982f +modules 4b49df654cd0d1c3c359fc0f52182943a650b746 +input 92e24e0e57f72e06c2df87116557331fd2d4dda2 +block 2d834f87d3e9de58dc33acbe83b9f54ec99d35c3 +device-mapper 1e4ab7b4c881cf26c1c72b3f56519e03475486fb +libata 5cff2dbd980d6df90e90d56864754ccdd8c4f23f +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc e8e2c7b0e695be00c31d4b2b296fa867ce735b75 +mfd b90e33b6116afd3bf18f43d4b6d2858caa3c8640 +backlight a33677b9211b6c328ad359b072043af94f7c9592 +battery af73fd32b4f2d23bb61c37f533ddae49e10ef3b0 +regulator d9c0ee81cba8d60e61c69e3a3230d73e0991c61d +security faf302f5a2132960670d085cd44abc30fd60a98d +apparmor afad53575a938ceb557227ecfeb0dda59d668d4e +integrity 95526d13038c2bbddd567a4d8e39fac42484e182 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 3876043ad9f7ff5fa3e506ea9673641971e46d8b +smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e +tomoyo a959dbd98d1aeb51dec1cc7e5ada5d84ce16cbbc +tpmdd 8447ac1ca47bc17307cd3a0882480cd0d2152d17 +watchdog fdf0eaf11452d72945af31804e2a1048ee1b574c +iommu a5003e75a1714857c01317d04982eef81331fe2f +audit bf98354280bff22bc9e57c698d485c9e1c0b04f3 +devicetree ac63227d0a4db6f0480e7ecbba59019175360f8f +dt-krzk f418e00ab4338216ad6dd9caff7e6e759151b77c +mailbox 1b712f18c461bd75f018033a15cf381e712806b5 +spi 6a88e25213b6f7eefba732643174b833ada4a589 +tip 3f3422d644e12169456bbf141d685a6ae4c12fa6 +clockevents 8b5bf64c89c7100c921bd807ba39b2eb003061ab +edac c545f5e412250555bd4e717d062b117f20bab418 +irqchip a82f3119d543406ed5b242deabf83cdecb9fe523 +ftrace 61c692f56feceaa5f6bf55301f7c108ac1013e91 +rcu 606c1a58664f21f7db3f38b333420f582821de3e +kvm 0c189708bfbfa90b458dac5f0fd4379f9a7d547e +kvm-arm 192df2aa0113ddddee2a93e453ff46610807b425 +kvms390 db54dfc9f71cd2df7afd1e88535ef6099cb0333e +kvm-riscv 07f225b5842420ae9c18cba17873fc71ed69c28e +kvm-x86 fdf0eaf11452d72945af31804e2a1048ee1b574c +xen-tip 58f6259b7a08f8d47d4629609703d358b042f0fd +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 2ef92cb3bc82900945e2390f15deb6d5f4ac9d6d +drivers-x86 9204fc5071bf8b237d455e0c271c37729682a7ff +chrome-platform 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +hsi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 7a2b85a76b05f16e8e788d035afcacdd4faa1d71 +ipmi b02bb79eee074f07acdfde540f2d4fe2a04471d8 +driver-core 6eaae198076080886b9e7d57f4ae06fa782f90ef +usb a85ff0db48c372063988f2072a07bd361ce9c4ef +thunderbolt 481012b479fe6d8dd4e01d739c359a8d99d074a9 +usb-serial 974e2f6a0554685493cc44406bc7d8ba0a3b0e33 +tty 9b4e18f032db160a70d73d3cdf3a0bff229686b4 +char-misc fdf0eaf11452d72945af31804e2a1048ee1b574c +accel ef8b0cb1ba370231f155c1579a602b698a9f6650 +coresight 04e8429c5b4f644257fe64db3403205a7a41e33b +fastrpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga 3969f6458f783d2b4b8b15bef1eeab674eaa34bd +icc 768c42cd9acb87691dd7ec12d6a9afc20903918a +iio 3a06b2845a09a2c7bcbd909d4289353f054363e9 +phy-next e7379477f4478c290be47cde3ad8a39d5ff561d2 +soundwire 3f92da3ea4480648ebeb8a4802085908a5c64cee +extcon a635f91c71d9737c8227d44eff1dee5526953fad +gnss fdf0eaf11452d72945af31804e2a1048ee1b574c +vfio 094671300fea0e24fe1eb33b73b54863065490c9 +w1 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +staging 6eaae198076080886b9e7d57f4ae06fa782f90ef +counter-next ba8d5d2b9f39ab2512e2735a300b16daff3918fc +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 1b13e52c0c76097fde35d3283e8105545d34b80b +cgroup a3fdeeb3f1c1fad3b7b07aa96a7e422fde3c2c15 +scsi d82cd15be581681ba9b2eff3949e30e45f44eb9e +scsi-mkp a615e93d6cfe70f9fab2cb02c7b11fe9de1c56b5 +vhost 373abdba01d4a975390a8ef1d2265cdcaa51aa33 +rpmsg b666efef756a4e8e72a96078d1a17695f8892a56 +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl 6b4c76ded3582651afca319f2ca58c22ec908529 +gpio-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl 173b67f16e13d1b744c9984ffea57853f6fb9cad +pinctrl-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-renesas 95eb19869401850f069723b296170b8b3bd5be9e +pinctrl-samsung 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pwm a2f68c7e312f94c8f78740449a88e8d7308ab18d +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 7e4bf0c1d0f707d446ec1bb673d946ee55c9a4f4 +kunit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +kunit-next e588586675f62b710fcc2d7bc6ea3ea8353e055d +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 1b733a9ebc3d8011ca66ec6ff17f55a440358794 +nvdimm fd774e36fe873632b1e9cf067cea46d7d7df55ac +at24 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +ntb 994def29acc5d8cc5b513fc67a75aa79b059dbe8 +seccomp 7d5cb68af638fc370e89df4c2d8d8c4708600e67 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem 8fd85ce6cfdfa41a7823c706832407ad815084df +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6 +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi d0184830e611d0881e014e0fb10da707edbb3f71 +memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459 +cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 2e28a798c3092ea42b968fa16ac835969d124898 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 66489e5487b7157c457d84ed23cd6306e811df07 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 35ca4239929737bdc021ee923f97ebe7aff8fcc4 +rust 341faf2b45ba266d52c1ca886c4ffca52d666786 +sysctl 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +execve fdf0eaf11452d72945af31804e2a1048ee1b574c +bitmap 94b1547668965e1fde8bde3638845ab582b40034 +hte ac9a78681b921877518763ba0e89202254349d1b +kspp 8453e7924a1a9130f2b4d2c507de2cdc3892a5b5 +kspp-gustavo 6ae3f51825e31ac9ad9f062f00b57a6c9bac3179 +nolibc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +iommufd 6583c865dec5493beb4c72fd724eb9d43d8d7ebb +genpd-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +genpd 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +chrome-platform-firmware 0979e7e3cfd7b479c34dc0f7217beb0c30f8028a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ea1d202f7164 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,368 @@ +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 +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 +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 +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 +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 +genpd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +genpd git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0ca04e8827e0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8326 @@ +$ date -R +Thu, 27 Jul 2023 08:33:30 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 85% (4722/5503)
Updating files: 86% (4733/5503)
Updating files: 87% (4788/5503)
Updating files: 88% (4843/5503)
Updating files: 89% (4898/5503)
Updating files: 90% (4953/5503)
Updating files: 91% (5008/5503)
Updating files: 92% (5063/5503)
Updating files: 93% (5118/5503)
Updating files: 94% (5173/5503)
Updating files: 95% (5228/5503)
Updating files: 96% (5283/5503)
Updating files: 97% (5338/5503)
Updating files: 98% (5393/5503)
Updating files: 99% (5448/5503)
Updating files: 100% (5503/5503)
Updating files: 100% (5503/5503), done. +HEAD is now at 18b44bc5a672 ovl: Always reevaluate the file signature for IMA +Merging origin/master (0a8db05b571a Merge tag 'platform-drivers-x86-v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 18b44bc5a672..0a8db05b571a +Fast-forward (no commit created; -m option ignored) + drivers/platform/x86/amd/pmc-quirks.c | 8 +-- + drivers/platform/x86/amd/pmf/acpi.c | 23 +++++++- + drivers/platform/x86/amd/pmf/core.c | 9 ++- + drivers/platform/x86/amd/pmf/pmf.h | 16 ++++++ + drivers/platform/x86/amd/pmf/sps.c | 74 +++++++++++++++++++++++-- + drivers/platform/x86/asus-wmi.c | 14 ++++- + drivers/platform/x86/huawei-wmi.c | 2 + + drivers/platform/x86/intel/hid.c | 27 +++++---- + drivers/platform/x86/msi-laptop.c | 8 +-- + drivers/platform/x86/serial-multi-instantiate.c | 21 +++++-- + drivers/platform/x86/think-lmi.c | 4 +- + drivers/platform/x86/touchscreen_dmi.c | 7 ++- + fs/smb/server/ksmbd_netlink.h | 3 +- + fs/smb/server/server.c | 7 ++- + fs/smb/server/smb2pdu.c | 47 ++++++++++------ + fs/smb/server/smb_common.c | 19 ++++--- + fs/smb/server/smb_common.h | 2 +- + fs/smb/server/vfs.c | 65 ++++++++++++---------- + fs/smb/server/vfs.h | 4 +- + kernel/signal.c | 4 ++ + 20 files changed, 265 insertions(+), 99 deletions(-) +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 (646d7feb0049 mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 97 ++++++++++++++++++++++++++++++++++++- + Documentation/filesystems/tmpfs.rst | 45 ++++++++--------- + arch/um/os-Linux/sigio.c | 7 +-- + fs/proc/task_mmu.c | 8 ++- + fs/proc/vmcore.c | 2 +- + include/linux/mm.h | 29 ++++++++--- + include/linux/mm_types.h | 28 +++++++++++ + include/linux/mmap_lock.h | 10 +++- + lib/scatterlist.c | 2 +- + mm/damon/core-test.h | 10 ++-- + mm/hugetlb.c | 75 +++++++++++++++++++--------- + mm/memory-failure.c | 2 +- + mm/memory.c | 3 ++ + mm/mmap.c | 1 + + mm/pagewalk.c | 5 +- + mm/shmem.c | 28 +++++++++-- + mm/zsmalloc.c | 14 ++++-- + scripts/spelling.txt | 1 - + 18 files changed, 284 insertions(+), 83 deletions(-) +Merging kbuild-current/fixes (df01b7cfcef0 kbuild: rust: avoid creating temporary files) +$ 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 (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path) +$ 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 (05d881b85b48 arm64/sme: Set new vector length before reallocating) +$ 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 +Merge made by the 'ort' strategy. + arch/arm64/kernel/fpsimd.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging arm-soc-fixes/arm/fixes (92d39d018347 dt-bindings: serial: atmel,at91-usart: update compatible for sam9x60) +$ 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. + .../bindings/serial/atmel,at91-usart.yaml | 4 +++- + arch/arm/boot/dts/microchip/sam9x60.dtsi | 26 +++++++++++----------- + arch/arm/boot/dts/nspire/nspire.dtsi | 2 +- + arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 1 - + drivers/firmware/arm_scmi/mailbox.c | 4 +++- + drivers/firmware/arm_scmi/raw_mode.c | 5 ++++- + drivers/firmware/arm_scmi/smc.c | 21 +++++++++++------ + drivers/firmware/smccc/soc_id.c | 5 ++--- + 8 files changed, 40 insertions(+), 28 deletions(-) + delete mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi +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 +Merge made by the 'ort' strategy. + drivers/memory/tegra/mc.c | 37 +++++++++++++++++++++++++++++++++++++ + drivers/memory/tegra/tegra194.c | 1 + + drivers/memory/tegra/tegra234.c | 27 +++------------------------ + include/soc/tegra/mc.h | 3 +++ + 4 files changed, 44 insertions(+), 24 deletions(-) +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 (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (106ea7ffd56b Revert "powerpc/64s: Remove support for ELFv1 little endian userspace") +$ 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 (6eaae1980760 Linux 6.5-rc3) +$ 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 (fa29d467977d Merge branch 'tools-ynl-gen-fix-parse-multi-attr-enum-attribute') +$ 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. + Documentation/networking/napi.rst | 13 +- + drivers/net/bonding/bond_main.c | 5 + + drivers/net/can/usb/gs_usb.c | 2 + + drivers/net/dsa/qca/qca8k-8xxx.c | 7 +- + drivers/net/dsa/qca/qca8k-common.c | 19 ++- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 7 +- + drivers/net/ethernet/freescale/fec_main.c | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 7 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 22 ++- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 51 ++++++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 34 ++++- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 11 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 26 ++-- + drivers/net/ethernet/intel/igc/igc_main.c | 40 +++-- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 43 +++++- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 +- + drivers/net/ipa/ipa_table.c | 22 +-- + drivers/net/macvlan.c | 1 + + drivers/net/phy/marvell10g.c | 7 + + drivers/net/team/team.c | 9 ++ + drivers/net/vxlan/vxlan_core.c | 165 +++++++++++++-------- + include/net/ipv6.h | 8 +- + include/net/vxlan.h | 13 +- + include/uapi/linux/if_packet.h | 6 +- + net/can/raw.c | 5 +- + net/ipv6/addrconf.c | 14 +- + net/packet/af_packet.c | 2 +- + net/unix/af_unix.c | 6 +- + tools/net/ynl/lib/ynl.py | 16 +- + 38 files changed, 437 insertions(+), 168 deletions(-) +Merging bpf/master (aa89592fcb3a Merge branch 'bpf-disable-preemption-in-perf_event_output-helpers-code') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/trace/bpf_trace.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) +Merging ipsec/master (6018a266279b ip_vti: fix potential slab-use-after-free in decode_session6) +$ 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. + 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_user.c | 11 ++++++++++- + 7 files changed, 28 insertions(+), 23 deletions(-) +Merging netfilter/main (d4a7ce642100 igc: Fix Kernel Panic during ndo_tx_timeout callback) +$ 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 (9b39f758974f Merge tag 'nf-23-07-20' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (456b5e85d8a5 MAINTAINERS: add Jeff as ath10k, ath11k and ath12k maintainer) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 36 +++++++++------------- + drivers/net/wireless/ath/ath11k/ahb.c | 1 - + drivers/net/wireless/ath/ath11k/pcic.c | 1 - + drivers/net/wireless/ath/ath6kl/Makefile | 5 --- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 6 ++-- + net/wireless/scan.c | 2 +- + 6 files changed, 18 insertions(+), 33 deletions(-) +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 (5c719d7aef29 RDMA/rxe: Fix an error handling path in rxe_bind_mw()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 2 ++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 12 ++++++++ + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 28 ++++++++++++++---- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 9 +++--- + drivers/infiniband/hw/irdma/ctrl.c | 31 ++++++++++++-------- + drivers/infiniband/hw/irdma/defs.h | 46 ++++++++++++++---------------- + drivers/infiniband/hw/irdma/hw.c | 2 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/puda.c | 6 ++++ + drivers/infiniband/hw/irdma/type.h | 2 ++ + drivers/infiniband/hw/irdma/uk.c | 3 ++ + drivers/infiniband/hw/irdma/utils.c | 8 +++--- + drivers/infiniband/hw/mlx4/qp.c | 18 ++++++------ + drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 3 +- + 16 files changed, 112 insertions(+), 63 deletions(-) +Merging sound-current/for-linus (f7fea075edfa ALSA: usb-audio: Update for native DSD support quirks) +$ 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/core/seq/seq_ump_client.c | 3 +-- + sound/pci/hda/patch_realtek.c | 1 + + sound/usb/mixer_maps.c | 14 ++++++++++++++ + sound/usb/quirks.c | 37 +++++++++++++++++++++++++++++++------ + 4 files changed, 47 insertions(+), 8 deletions(-) +Merging sound-asoc-fixes/for-linus (2821cfc936af 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/atmel/atmel-i2s.c | 5 +- + sound/soc/codecs/cs43130.h | 138 +++++++++++++++++++------------------- + sound/soc/codecs/da7219-aad.c | 12 +++- + sound/soc/codecs/es8316.c | 2 +- + sound/soc/codecs/nau8821.c | 41 +++++++++++ + sound/soc/codecs/rt5682-sdw.c | 9 ++- + sound/soc/codecs/rt711-sdca-sdw.c | 10 ++- + sound/soc/codecs/rt711-sdw.c | 9 ++- + sound/soc/codecs/rt712-sdca-sdw.c | 10 ++- + sound/soc/codecs/rt722-sdca-sdw.c | 10 ++- + sound/soc/codecs/wm8904.c | 3 + + sound/soc/fsl/fsl_spdif.c | 2 + + sound/soc/soc-compress.c | 1 + + sound/soc/tegra/tegra210_sfc.c | 31 ++++++++- + sound/soc/tegra/tegra210_sfc.h | 4 +- + 15 files changed, 205 insertions(+), 82 deletions(-) +Merging regmap-fixes/for-linus (6eaae1980760 Linux 6.5-rc3) +$ 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 (f09ac4b67fb2 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 | 9 ++++++--- + drivers/regulator/mt6358-regulator.c | 10 +++++----- + 2 files changed, 11 insertions(+), 8 deletions(-) +Merging spi-fixes/for-linus (86e99e6b5d38 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-qcom-qspi.c | 54 ++++++++++++++++++++++++++++++++++++++---- + drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++---- + 2 files changed, 57 insertions(+), 9 deletions(-) +Merging pci-current/for-linus (b607aa1edc9c Revert "PCI: acpiphp: Reassign resources on bridge if necessary") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 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 | 5 ++++- + 5 files changed, 16 insertions(+), 24 deletions(-) +Merging driver-core.current/driver-core-linus (6eaae1980760 Linux 6.5-rc3) +$ 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 (748c5ea8b879 serial: 8250_dw: Preserve original value of DLF register) +$ 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. + Documentation/admin-guide/devices.txt | 2 +- + MAINTAINERS | 6 ++++++ + drivers/tty/n_gsm.c | 4 +++- + drivers/tty/serial/8250/8250_dwlib.c | 6 ++++-- + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/tty_io.c | 2 +- + 8 files changed, 18 insertions(+), 8 deletions(-) +Merging usb.current/usb-linus (2627335a1329 usb: cdns3: fix incorrect calculation of ep_buf_size when more than one config) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/usb/cdns3/cdns3-gadget.c | 4 +- + drivers/usb/core/quirks.c | 4 ++ + drivers/usb/dwc3/core.c | 20 +------- + drivers/usb/dwc3/core.h | 3 -- + drivers/usb/gadget/composite.c | 4 ++ + drivers/usb/gadget/legacy/raw_gadget.c | 12 +++-- + drivers/usb/gadget/udc/core.c | 1 - + drivers/usb/gadget/udc/tegra-xudc.c | 8 +-- + drivers/usb/host/ohci-at91.c | 8 ++- + drivers/usb/host/xhci-mtk.c | 1 + + drivers/usb/host/xhci-pci.c | 4 +- + drivers/usb/host/xhci-ring.c | 25 +-------- + drivers/usb/host/xhci-tegra.c | 8 +-- + drivers/usb/serial/option.c | 6 +++ + drivers/usb/serial/usb-serial-simple.c | 73 +++++++++++++++------------ + drivers/usb/typec/class.c | 15 +++--- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 4 +- + drivers/usb/typec/ucsi/ucsi.c | 4 +- + 19 files changed, 96 insertions(+), 109 deletions(-) +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 (13c088cf3657 phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 2 +- + drivers/phy/mediatek/phy-mtk-dp.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 2 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 78 +++++++++++++++++---------- + 4 files changed, 53 insertions(+), 31 deletions(-) +Merging staging.current/staging-linus (6eaae1980760 Linux 6.5-rc3) +$ 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 (6811694eb2f6 iio: imu: lsm6dsx: Fix mount matrix retrieval) +$ 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. + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 3 --- + drivers/iio/adc/ad7192.c | 16 +++++++-------- + drivers/iio/adc/ina2xx-adc.c | 9 ++++++--- + drivers/iio/adc/meson_saradc.c | 23 +++++++++++----------- + 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 ++++++++++++++++++--- + 9 files changed, 72 insertions(+), 35 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 +Merge made by the 'ort' strategy. + drivers/counter/Kconfig | 14 +++++++------- + tools/counter/Makefile | 3 ++- + 2 files changed, 9 insertions(+), 8 deletions(-) +Merging char-misc.current/char-misc-linus (f8ea95021022 misc/genalloc: Name subpools by of_node_full_name()) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + .../process/embargoed-hardware-issues.rst | 3 -- + Documentation/process/security-bugs.rst | 37 ++++++++++------------ + drivers/misc/sram.c | 2 +- + lib/genalloc.c | 2 +- + 4 files changed, 19 insertions(+), 25 deletions(-) +Merging soundwire-fixes/fixes (7891d0a5ce6f soundwire: amd: Fix a check for errors in probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/amd_manager.c | 4 ++-- + drivers/soundwire/bus.c | 8 ++++---- + drivers/soundwire/qcom.c | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) +Merging thunderbolt-fixes/fixes (6995e2de6891 Linux 6.4) +$ 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 (d2a257684758 dmaengine: mcf-edma: Fix a potential un-allocated memory access) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/Kconfig | 2 ++ + drivers/dma/mcf-edma.c | 13 +++++++------ + drivers/dma/xilinx/xdma.c | 2 +- + 3 files changed, 10 insertions(+), 7 deletions(-) +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 (ea690ad78dd6 mtd: rawnand: rockchip: Align hwecc vs. raw page helper layouts) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/meson_nand.c | 3 +- + drivers/mtd/nand/raw/omap_elm.c | 24 ++++++------- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 45 ++++++++++++++----------- + drivers/mtd/nand/spi/toshiba.c | 4 +-- + drivers/mtd/nand/spi/winbond.c | 4 +-- + 5 files changed, 42 insertions(+), 38 deletions(-) +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 (0cb1d9c84511 media: verisilicon: change confusingly named relaxed register access) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (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 (0c189708bfbf Merge tag 'kvm-s390-master-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (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 (0bd66784274a hwmon: (pmbus_core) Fix NULL pointer dereference) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/aquacomputer_d5next.c | 2 +- + drivers/hwmon/nct6775-core.c | 28 +++++++++++++++++++++------ + drivers/hwmon/nct6775-platform.c | 2 +- + drivers/hwmon/nct6775.h | 1 + + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/oxp-sensors.c | 38 +++++++++++++++++++++++-------------- + drivers/hwmon/pmbus/pmbus_core.c | 17 +++++++++-------- + 7 files changed, 59 insertions(+), 31 deletions(-) +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 (70d49bbf962c tools/testing/cxl: Remove unused SZ_512G macro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +++- + drivers/cxl/Kconfig | 3 ++- + drivers/cxl/acpi.c | 5 ++--- + drivers/cxl/cxlmem.h | 2 +- + tools/testing/cxl/test/cxl.c | 4 ---- + 5 files changed, 8 insertions(+), 10 deletions(-) +Merging btrfs-fixes/next-fixes (d3099c02c165 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. + fs/btrfs/block-group.c | 51 ++++++++++++++++++++++++++++++---------------- + fs/btrfs/block-group.h | 4 ++-- + fs/btrfs/block-rsv.c | 5 +++++ + fs/btrfs/disk-io.c | 7 ++++++- + fs/btrfs/free-space-tree.c | 24 +++++++++++++++------- + fs/btrfs/transaction.c | 10 +++++++-- + fs/btrfs/zoned.c | 3 +++ + 7 files changed, 75 insertions(+), 29 deletions(-) +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 (c21733754cd6 platform/x86: huawei-wmi: Silence ambient light sensor) +$ 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 (d4e026534577 scsi: pm80xx: Fix error return code in pm8001_pci_probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/s390/scsi/zfcp_fc.c | 6 +----- + drivers/scsi/pm8001/pm8001_init.c | 3 ++- + drivers/scsi/storvsc_drv.c | 4 ++++ + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging drm-fixes/drm-fixes (28801cc85906 Merge tag 'amd-drm-fixes-6.5-2023-07-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ 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 (e354f6773311 drm/i915: Fix an error handling path in igt_write_huge()) +$ 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. + drivers/gpu/drm/i915/display/intel_dpt.c | 4 +++- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging mmc-fixes/fixes (5def5c1c15bf mmc: sdhci-f-sdh30: Replace with sdhci_pltfm) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/moxart-mmc.c | 8 +----- + drivers/mmc/host/sdhci_f_sdh30.c | 60 ++++++++++++++++++---------------------- + 2 files changed, 28 insertions(+), 40 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 (ed0cf84e9cc4 vmbus_testing: fix wrong python syntax for integer value comparison) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging arch/x86/hyperv/ivm.c +Auto-merging arch/x86/include/asm/mshyperv.h +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_apic.c | 4 +--- + arch/x86/hyperv/hv_init.c | 21 +++++++++++++++++++++ + arch/x86/hyperv/ivm.c | 7 +++---- + arch/x86/hyperv/mmu.c | 12 ++---------- + arch/x86/hyperv/nested.c | 11 ++--------- + arch/x86/include/asm/mshyperv.h | 2 +- + drivers/hv/connection.c | 13 ++++++------- + drivers/hv/hv_balloon.c | 2 +- + drivers/hv/hv_common.c | 10 +++++----- + include/asm-generic/mshyperv.h | 2 +- + tools/hv/vmbus_testing | 4 ++-- + 11 files changed, 45 insertions(+), 43 deletions(-) +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (ab2dbc7acced RISC-V: Don't include Zicsr or Zifencei in I from ACPI) +$ 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 (644ee70267a9 gpio: mvebu: fix irq domain leak) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (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 (fdf0eaf11452 Linux 6.5-rc2) +$ 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 +Merge made by the 'ort' strategy. + mm/memblock.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging nfsd-fixes/nfsd-fixes (f75546f58a70 nfsd: Remove incorrect check in nfsd4_validate_stateid) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +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 +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 3 ++ + drivers/irqchip/irq-bcm6345-l1.c | 14 ++---- + drivers/irqchip/irq-gic-v3-its.c | 78 ++++++++++++++++++----------- + drivers/irqchip/irq-gic-v3.c | 62 ++++++++++++++++++++++- + 4 files changed, 117 insertions(+), 40 deletions(-) +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 +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 16 ++++++++-------- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 16 ++++++++-------- + 2 files changed, 16 insertions(+), 16 deletions(-) +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 (ccff6d117d8d Merge tag 'perf-tools-fixes-for-v6.5-1-2023-07-18' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (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 +Merge made by the 'ort' strategy. + fs/9p/fid.h | 6 +++--- + fs/9p/v9fs.c | 2 -- + fs/9p/v9fs.h | 2 +- + fs/9p/vfs_dir.c | 5 +++-- + fs/9p/vfs_file.c | 5 +---- + fs/9p/vfs_inode.c | 6 ------ + fs/9p/vfs_inode_dotl.c | 1 - + net/9p/client.c | 46 ++++++++++++---------------------------------- + net/9p/trans_virtio.c | 8 ++++---- + 9 files changed, 24 insertions(+), 57 deletions(-) +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 drm-misc-fixes/for-linux-next-fixes (39b1320e5dc2 drm/fb-helper: Remove unused inline function drm_fb_helper_defio_init()) +$ 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. + include/drm/drm_fb_helper.h | 5 ----- + 1 file changed, 5 deletions(-) +Merging mm-stable/mm-stable (6eaae1980760 Linux 6.5-rc3) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (6eaae1980760 Linux 6.5-rc3) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (f0c21a88ed02 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging kernel/signal.c +Merge made by the 'ort' strategy. + .../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/admin-guide/mm/zswap.rst | 14 +- + Documentation/block/biovecs.rst | 1 + + Documentation/features/vm/TLB/arch-support.txt | 2 +- + Documentation/mm/frontswap.rst | 264 ---------- + Documentation/mm/index.rst | 1 - + Documentation/mm/vmemmap_dedup.rst | 1 + + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/vmemmap_dedup.rst | 101 ++++ + Documentation/translations/zh_CN/mm/frontswap.rst | 196 ------- + Documentation/translations/zh_CN/mm/index.rst | 1 - + MAINTAINERS | 8 - + arch/Kconfig | 17 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/io.h | 7 +- + arch/arc/mm/ioremap.c | 49 +- + arch/arm/Kconfig | 29 +- + arch/arm/mm/fault-armv.c | 3 +- + arch/arm64/Kconfig | 63 +-- + 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 | 5 +- + 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 | 31 +- + arch/ia64/include/asm/cmpxchg.h | 17 + + arch/ia64/include/asm/io.h | 13 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 17 - + arch/ia64/mm/ioremap.c | 41 +- + arch/loongarch/Kconfig | 28 +- + arch/loongarch/include/asm/io.h | 2 - + arch/m68k/Kconfig | 19 +- + arch/m68k/include/asm/io_mm.h | 2 - + arch/m68k/include/asm/kmap.h | 2 - + arch/mips/Kconfig | 30 +- + 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 | 35 +- + arch/parisc/include/asm/io.h | 15 +- + arch/parisc/mm/ioremap.c | 62 +-- + arch/powerpc/Kconfig | 57 +- + 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 | 572 +++++++++++++++++++-- + arch/powerpc/mm/book3s64/radix_tlb.c | 11 + + arch/powerpc/mm/fault.c | 7 +- + 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/Kbuild | 2 +- + arch/riscv/Kconfig | 48 +- + arch/riscv/include/asm/pgtable.h | 12 +- + arch/riscv/kernel/elf_kexec.c | 4 +- + arch/riscv/mm/fault.c | 7 +- + arch/s390/Kbuild | 2 +- + arch/s390/Kconfig | 72 +-- + arch/s390/include/asm/io.h | 21 +- + arch/s390/include/asm/pgalloc.h | 4 + + arch/s390/mm/fault.c | 5 +- + arch/s390/mm/pgalloc.c | 80 ++- + arch/s390/pci/pci.c | 57 +- + arch/sh/Kconfig | 43 +- + arch/sh/include/asm/io.h | 65 +-- + 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 | 93 +--- + arch/x86/include/asm/io.h | 5 - + arch/x86/include/asm/pgtable.h | 16 +- + arch/x86/include/asm/rmwcc.h | 11 +- + arch/x86/include/asm/tlbflush.h | 24 +- + arch/x86/mm/fault.c | 7 +- + arch/x86/mm/tlb.c | 2 + + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/io.h | 32 +- + arch/xtensa/mm/ioremap.c | 58 +-- + drivers/acpi/numa/hmat.c | 218 ++++++-- + drivers/char/xillybus/Kconfig | 2 +- + drivers/dax/kmem.c | 54 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + 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/irqchip/Kconfig | 1 + + drivers/misc/Kconfig | 1 + + drivers/misc/ocxl/link.c | 8 +- + drivers/net/ethernet/altera/Kconfig | 1 + + drivers/net/ethernet/sfc/io.h | 2 +- + drivers/net/ethernet/sfc/siena/io.h | 2 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/pcmcia/Kconfig | 1 + + 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/hfsplus/extents.c | 6 +- + 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/ocfs2/journal.c | 11 +- + fs/ocfs2/journal.h | 2 +- + fs/proc/base.c | 1 + + fs/proc/meminfo.c | 1 + + fs/smb/client/fscache.c | 2 + + fs/splice.c | 3 +- + fs/udf/file.c | 6 +- + fs/userfaultfd.c | 112 ++-- + include/asm-generic/io.h | 31 +- + include/asm-generic/iomap.h | 6 +- + include/asm-generic/tlb.h | 1 - + include/kunit/test.h | 1 + + include/linux/args.h | 28 + + include/linux/arm-smccc.h | 69 ++- + include/linux/bio.h | 5 + + include/linux/buffer_head.h | 4 +- + include/linux/frontswap.h | 91 ---- + include/linux/fs.h | 2 +- + include/linux/genl_magic_func.h | 27 +- + include/linux/genl_magic_struct.h | 8 +- + include/linux/highmem.h | 44 ++ + include/linux/hugetlb.h | 35 +- + include/linux/ioremap.h | 30 ++ + include/linux/kernel.h | 7 - + 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 | 13 +- + include/linux/memory-tiers.h | 27 +- + include/linux/mm.h | 120 +++-- + include/linux/mm_inline.h | 21 + + include/linux/mm_types.h | 16 +- + 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_ext.h | 6 + + include/linux/page_idle.h | 5 - + include/linux/page_table_check.h | 66 +-- + include/linux/pagemap.h | 27 +- + include/linux/pci.h | 2 +- + include/linux/pgtable.h | 28 +- + include/linux/rmap.h | 2 + + include/linux/seqlock.h | 2 +- + include/linux/swap.h | 9 - + include/linux/swapfile.h | 5 - + include/linux/swapops.h | 15 +- + include/linux/userfaultfd_k.h | 4 + + include/linux/zswap.h | 37 ++ + include/net/tcp.h | 1 - + include/trace/bpf_probe.h | 2 + + include/trace/events/thp.h | 33 +- + include/uapi/linux/userfaultfd.h | 25 +- + init/Kconfig | 2 + + init/initramfs.c | 2 +- + ipc/sem.c | 6 +- + kernel/Kconfig.kexec | 116 +++++ + kernel/acct.c | 2 +- + kernel/cred.c | 27 +- + kernel/events/uprobes.c | 2 +- + kernel/futex/core.c | 3 +- + kernel/iomem.c | 13 +- + kernel/kexec_file.c | 6 +- + kernel/panic.c | 2 +- + kernel/relay.c | 2 +- + kernel/signal.c | 13 +- + lib/error-inject.c | 2 - + lib/maple_tree.c | 483 ++++++++--------- + lib/notifier-error-inject.c | 3 - + lib/test_hmm.c | 10 +- + lib/test_maple_tree.c | 141 +++++ + lib/test_meminit.c | 2 +- + mm/Kconfig | 12 +- + mm/Makefile | 1 - + mm/cma.c | 4 +- + mm/compaction.c | 40 +- + mm/debug_vm_pgtable.c | 18 +- + mm/filemap.c | 54 +- + mm/frontswap.c | 283 ---------- + 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 | 10 +- + mm/memcontrol.c | 93 ++-- + mm/memfd.c | 57 +- + mm/memory-failure.c | 151 ++++-- + mm/memory-tiers.c | 82 ++- + mm/memory.c | 385 ++++++++++---- + 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 | 76 ++- + mm/page_ext.c | 103 ++-- + mm/page_io.c | 80 ++- + mm/page_isolation.c | 8 +- + mm/page_owner.c | 2 +- + mm/page_table_check.c | 52 +- + mm/page_vma_mapped.c | 12 +- + mm/pgtable-generic.c | 97 +++- + mm/rmap.c | 208 ++++---- + mm/shmem.c | 6 +- + mm/show_mem.c | 4 +- + mm/sparse-vmemmap.c | 3 + + mm/sparse.c | 3 +- + mm/swap.h | 1 - + mm/swap_state.c | 12 +- + mm/swapfile.c | 51 +- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 87 +++- + mm/util.c | 6 - + mm/vmscan.c | 8 +- + mm/workingset.c | 1 + + mm/zsmalloc.c | 79 +-- + mm/zswap.c | 247 +++++---- + net/ipv4/tcp.c | 11 +- + scripts/headers_install.sh | 1 - + 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 +- + tools/testing/selftests/proc/proc-empty-vm.c | 23 + + 297 files changed, 6377 insertions(+), 4860 deletions(-) + delete mode 100644 Documentation/mm/frontswap.rst + create mode 100644 Documentation/powerpc/vmemmap_dedup.rst + delete mode 100644 Documentation/translations/zh_CN/mm/frontswap.rst + create mode 100644 arch/arm64/include/asm/tlbbatch.h + delete mode 100644 arch/hexagon/mm/ioremap.c + create mode 100644 include/linux/args.h + delete mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/ioremap.h + delete mode 100644 include/linux/net_mm.h + create mode 100644 include/linux/zswap.h + create mode 100644 kernel/Kconfig.kexec + delete mode 100644 mm/frontswap.c + create mode 100644 tools/testing/selftests/cgroup/test_zswap.c + create mode 100644 tools/testing/selftests/mm/hugetlb-read-hwpoison.c +Merging kbuild/for-next (4d15c9fa058e Revert "kbuild: Hack for depmod not handling X.Y versions") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + Makefile | 3 ++ + include/linux/export.h | 4 +- + scripts/Makefile.modpost | 1 + + 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/mod/modpost.c | 8 +++- + 11 files changed, 112 insertions(+), 130 deletions(-) +Merging clang-format/clang-format (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (681f34d52b96 perf diff: Replaces some ',' as separator with the more usual ';') +$ 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. + MAINTAINERS | 2 + + tools/perf/Documentation/perf-bench.txt | 3 + + tools/perf/Makefile.perf | 1 + + 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-trace.c | 38 +++++- + tools/perf/util/bpf_skel/bench_uprobe.bpf.c | 23 ++++ + tools/perf/util/evsel.c | 1 + + tools/perf/util/thread.c | 13 ++ + tools/perf/util/thread.h | 2 + + 13 files changed, 288 insertions(+), 9 deletions(-) + create mode 100644 tools/perf/bench/uprobe.c + create mode 100644 tools/perf/util/bpf_skel/bench_uprobe.bpf.c +Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) +$ 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 (8ac04063354a swiotlb: reduce the number of areas to match actual memory pool size) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (4dd595c34c4b syscalls: Remove file path comments from headers) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (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 (1faf70485ea9 Merge branches 'misc' and 'fixes' into for-next) +$ 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. +Merging arm64/for-next/core (893b24181b4c arm64: sme: Use STR P to clear FFR context field in streaming SVE mode) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (dea0f4146f66 docs: perf: Fix warning from 'make htmldocs' in hisi-pmu.rst) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (c9b007d4c755 Merge branch 'soc/drivers' into for-next) +$ 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. + MAINTAINERS | 22 ++++++++++++---- + arch/arm/mach-ux500/Makefile | 1 - + arch/arm/mach-ux500/cpu-db8500.c | 5 ---- + arch/arm/mach-ux500/pm_domains.h | 17 ------------ + drivers/Makefile | 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 | 0 + drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c | 0 + drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c | 0 + 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 | 0 + drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c | 0 + drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c | 0 + drivers/{soc => genpd}/imx/imx93-blk-ctrl.c | 0 + drivers/{soc => genpd}/imx/imx93-pd.c | 0 + 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} | 0 + 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 | 0 + drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0 + drivers/genpd/xilinx/Makefile | 2 ++ + .../xilinx/zynqmp-pm-domains.c} | 0 + drivers/soc/Makefile | 2 -- + drivers/soc/actions/Makefile | 4 --- + drivers/soc/amlogic/Makefile | 3 --- + drivers/soc/apple/Makefile | 2 -- + drivers/soc/bcm/Kconfig | 22 +++++++++++++++- + drivers/soc/bcm/Makefile | 3 --- + drivers/soc/bcm/bcm63xx/Kconfig | 21 --------------- + drivers/soc/bcm/bcm63xx/Makefile | 3 --- + drivers/soc/imx/Makefile | 7 +---- + drivers/soc/mediatek/Makefile | 2 -- + drivers/soc/qcom/Makefile | 3 --- + drivers/soc/renesas/Makefile | 27 ------------------- + drivers/soc/rockchip/Makefile | 1 - + drivers/soc/samsung/Makefile | 1 - + drivers/soc/starfive/Makefile | 3 --- + drivers/soc/sunxi/Makefile | 1 - + drivers/soc/tegra/Makefile | 1 - + drivers/soc/ti/Makefile | 2 -- + drivers/soc/xilinx/Makefile | 1 - + 108 files changed, 151 insertions(+), 120 deletions(-) + delete mode 100644 arch/arm/mach-ux500/pm_domains.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 (100%) + rename drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c (100%) + rename drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c (100%) + 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 (100%) + rename drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c (100%) + rename drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c (100%) + rename drivers/{soc => genpd}/imx/imx93-blk-ctrl.c (100%) + rename drivers/{soc => genpd}/imx/imx93-pd.c (100%) + 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} (100%) + 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 (100%) + 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 + delete mode 100644 drivers/soc/starfive/Makefile +Merging amlogic/for-next (76483eaf2109 Merge branch 'v6.6/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 7 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 54 +++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 155 +++++++++++++++++++++ + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 2 +- + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + 6 files changed, 219 insertions(+), 2 deletions(-) + 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 +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 72b8e9a4e9f2] 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 (a43f3e970a1d ARM: dts: aspeed: Add AST2600 VUARTs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 129 ++++--- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 20 ++ + .../dts/aspeed/aspeed-bmc-inventec-starscream.dts | 389 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 20 ++ + drivers/soc/aspeed/aspeed-socinfo.c | 1 + + drivers/soc/aspeed/aspeed-uart-routing.c | 2 +- + 8 files changed, 521 insertions(+), 42 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-starscream.dts +Merging at91/at91-next (12fe727585e3 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/microchip/at91-vinco.dts | 4 ++-- + arch/arm/boot/dts/microchip/at91sam9260.dtsi | 2 +- + 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/sama5d3.dtsi | 2 +- + arch/arm/boot/dts/microchip/sama5d4.dtsi | 2 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 12 ++++++------ + drivers/soc/atmel/sfr.c | 1 - + drivers/soc/microchip/mpfs-sys-controller.c | 2 +- + 14 files changed, 19 insertions(+), 20 deletions(-) +Merging broadcom/next (0d8d8753ede0 Merge branch 'devicetree/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,bcm53573.yaml | 39 ++++++++++++++++++++++ + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 18 ++++++++++ + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 +-- + 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 +- + .../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 | 1 - + .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts | 2 -- + arch/arm/boot/dts/broadcom/bcm53573.dtsi | 5 +-- + arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 ++-- + 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 +- + 29 files changed, 160 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.yaml +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 (f7812cdabb82 dt-bindings: net: davicom,dm9000: convert to DT schema) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../bindings/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 - + 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 | 610 +++++++++++++-------- + drivers/memory/tegra/tegra30-emc.c | 2 +- + drivers/memory/tegra/tegra30.c | 2 +- + 21 files changed, 516 insertions(+), 350 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/davicom,dm9000.yaml + delete mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt +Merging imx-mxs/for-next (230ac1a44545 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. + Documentation/devicetree/bindings/arm/fsl.yaml | 19 + + arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts | 50 +- + 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.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 | 32 +- + arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi | 36 +- + arch/arm/boot/dts/nxp/imx/imx53-sk-imx53.dts | 10 + + 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/imx6q-arm2.dts | 36 +- + arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts | 55 +- + arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts | 19 +- + arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts | 66 +-- + .../boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi | 4 +- + .../boot/dts/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi | 30 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi | 84 ++- + 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 | 74 +-- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 129 ++--- + arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi | 114 ++-- + .../boot/dts/nxp/imx/imx6qdl-phytec-pbab01.dtsi | 26 +- + .../boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 42 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi | 57 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi | 136 ++--- + arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi | 36 +- + arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 2 +- + 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 +- + .../boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi | 2 +- + .../boot/dts/nxp/imx/imx6ul-tx6ul-mainboard.dts | 2 +- + 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/ls/ls1021a-iot.dts | 10 +- + .../boot/dts/nxp/mxs/imx28-eukrea-mbmx283lc.dts | 2 +- + arch/arm/boot/dts/nxp/vf/vf610-twr.dts | 31 +- + 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/arm64/boot/dts/freescale/Makefile | 7 +- + .../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-ls208xa-qds.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 8 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 131 +++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 48 ++ + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 54 +- + .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 6 +- + .../freescale/imx8mm-venice-gw72xx-0x-rpidsi.dtso | 90 +++ + .../freescale/imx8mm-venice-gw73xx-0x-rpidsi.dtso | 90 +++ + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 51 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 33 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 4 + + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 22 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 133 +++++ + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 118 +++- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 33 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 4 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 8 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 155 +++-- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 265 +++++---- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 20 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 6 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 6 +- + .../boot/dts/freescale/imx8mq-librem5-r3.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 4 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 206 +++++++ + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 2 +- + .../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/configs/defconfig | 3 + + drivers/bus/imx-weim.c | 2 +- + drivers/genpd/imx/gpcv2.c | 2 +- + drivers/genpd/imx/imx8m-blk-ctrl.c | 3 +- + drivers/genpd/imx/imx8mp-blk-ctrl.c | 4 +- + drivers/genpd/imx/imx93-blk-ctrl.c | 17 +- + drivers/genpd/imx/imx93-pd.c | 2 +- + 113 files changed, 2927 insertions(+), 1080 deletions(-) + 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/imx93-tqma9352-mba93xxla.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi +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 (54fbc0260c64 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. + .../boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts | 6 +++--- + 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/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 20 ++++++++++++++++++-- + arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts | 2 +- + drivers/firmware/turris-mox-rwtm.c | 12 ++++++------ + 7 files changed, 32 insertions(+), 16 deletions(-) +Merging omap/for-next (f581c395fcb8 Merge branches 'omap-for-v6.5/ti-sysc' and 'omap-for-v6.5/cleanup' 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 +Merge made by the 'ort' strategy. + arch/arm/mach-omap2/omap_hwmod.c | 45 ++++++--------------------------------- + arch/arm/mach-omap2/powerdomain.c | 2 +- + drivers/bus/ti-sysc.c | 2 ++ + 3 files changed, 9 insertions(+), 40 deletions(-) +Merging qcom/for-next (5f8e7fdfa482 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 +Auto-merging drivers/soc/qcom/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/qcom-soc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 1 + + .../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 | 2 +- + .../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 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 2 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 2 +- + .../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 +- + .../devicetree/bindings/clock/qcom,videocc.yaml | 2 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 1 + + .../bindings/power/qcom,kpss-acc-v2.yaml | 1 + + .../bindings/remoteproc/qcom,glink-edge.yaml | 3 - + .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 2 +- + .../bindings/remoteproc/qcom,rpm-proc.yaml | 171 +++++++ + .../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 | 34 +- + 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-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-pm8941.dtsi | 22 +- + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 2 +- + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 15 +- + arch/arm64/boot/dts/qcom/apq8039-t2.dts | 2 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 23 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 36 ++ + 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 +++++++- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 1 + + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 21 +- + .../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 ++- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +- + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 495 +++++++++++++++++++++ + .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 1 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 130 +++--- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.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 | 152 +++---- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 99 +++-- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 1 + + .../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 | 179 +++++--- + .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 1 - + arch/arm64/boot/dts/qcom/msm8998.dtsi | 118 ++--- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 33 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +- + 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 | 2 +- + arch/arm64/boot/dts/qcom/qru1000-idp.dts | 16 + + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 193 +++++++- + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 246 +++++++++- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 89 +++- + .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 +- + 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 | 2 - + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 + + arch/arm64/boot/dts/qcom/sdm630.dtsi | 142 +++--- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 + + .../boot/dts/qcom/sdm845-oneplus-enchilada.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.dtsi | 4 +- + 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 | 2 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 2 +- + 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/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 | 22 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 1 + + .../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 | 264 +++++------ + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 225 +++++----- + arch/arm64/configs/defconfig | 3 + + drivers/clk/qcom/camcc-sc7180.c | 2 +- + drivers/clk/qcom/clk-smd-rpm.c | 314 ++++++------- + drivers/clk/qcom/dispcc-sm8450.c | 13 +- + drivers/clk/qcom/dispcc-sm8550.c | 13 +- + drivers/clk/qcom/gcc-ipq9574.c | 37 ++ + drivers/clk/qcom/gcc-sc8280xp.c | 145 +++++- + drivers/clk/qcom/gcc-sm7150.c | 1 + + drivers/clk/qcom/gpucc-sm6350.c | 18 +- + drivers/clk/qcom/lpasscc-sc7280.c | 16 +- + drivers/clk/qcom/mmcc-msm8974.c | 11 + + drivers/clk/qcom/mss-sc7180.c | 15 +- + drivers/clk/qcom/q6sstop-qcs404.c | 15 +- + drivers/clk/qcom/turingcc-qcs404.c | 15 +- + drivers/firmware/qcom_scm.c | 92 +--- + drivers/genpd/qcom/cpr.c | 1 - + drivers/genpd/qcom/rpmhpd.c | 102 ++--- + 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/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 | 70 +-- + drivers/soc/qcom/pmic_glink.c | 2 +- + drivers/soc/qcom/pmic_glink_altmode.c | 1 + + drivers/soc/qcom/qcom_gsbi.c | 11 +- + 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 | 16 +- + drivers/soc/qcom/spm.c | 6 +- + drivers/soc/qcom/trace-rpmh.h | 16 +- + drivers/soc/qcom/wcnss_ctrl.c | 1 + + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 + + include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 + + include/dt-bindings/interconnect/qcom,rpm-icc.h | 13 + + include/dt-bindings/power/qcom,rpmhpd.h | 30 ++ + include/linux/soc/qcom/smd-rpm.h | 20 +- + include/linux/soc/qcom/smem.h | 1 + + 212 files changed, 7380 insertions(+), 2443 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,rpm-proc.yaml + 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 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/interconnect/qcom,rpm-icc.h + create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h +Merging renesas/next (f589646c2e1d Merge branches 'renesas-arm-soc-for-v6.6' and '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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 - + 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 ++-- + 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 ++++++++++- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 4 ++-- + arch/arm64/configs/defconfig | 4 ++++ + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 2 ++ + 19 files changed, 203 insertions(+), 19 deletions(-) +Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS) +$ 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 (5c42724cf38e Merge branch 'v6.6-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 10 + + Documentation/devicetree/bindings/eeprom/at24.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + .../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 | 1 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 1 + + 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-rock-5b.dts | 79 ++- + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 164 +++++ + .../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 | 184 ++++++ + arch/arm64/configs/defconfig | 2 + + drivers/clk/rockchip/clk-rk3568.c | 3 +- + drivers/soc/rockchip/grf.c | 14 + + 52 files changed, 2399 insertions(+), 100 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 +Merging samsung-krzk/for-next (31b721cf256c Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/pwm-samsung.yaml | 17 +- + MAINTAINERS | 4 +- + 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/mach-s5pv210/s5pv210.c | 2 +- + 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/tesla/fsd.dtsi | 4 +- + drivers/genpd/samsung/exynos-pm-domains.c | 3 +- + drivers/soc/samsung/exynos-chipid.c | 1 - + drivers/soc/samsung/exynos-pmu.c | 2 +- + 23 files changed, 1521 insertions(+), 43 deletions(-) + 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 +Merging scmi/for-linux-next (e1b68ed58b3b Merge branches 'for-next/juno/updates', 'for-next/vexpress/updates' and 'for-next/scmi/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/corstone1000.dtsi | 20 +- + arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 10 +- + drivers/bus/vexpress-config.c | 4 +- + drivers/firmware/arm_scmi/perf.c | 430 ++++++++++++++++++----- + 4 files changed, 362 insertions(+), 102 deletions(-) +Merging stm32/stm32-next (2f38de940f07 ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM) +$ 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.dtsi | 47 ++ + 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 | 16 - + 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 | 4 +- + 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 +- + 23 files changed, 1178 insertions(+), 119 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 (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (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 (a3e08a88120b 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. + .../devicetree/bindings/arm/tegra/nvidia,nvec.txt | 21 - + .../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 17 - + .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 18 - + .../bindings/clock/nvidia,tegra124-car.yaml | 4 +- + .../cpu/nvidia,tegra186-ccplex-cluster.yaml | 37 + + .../bindings/serial/nvidia,tegra20-hsuart.txt | 73 - + .../bindings/serial/nvidia,tegra20-hsuart.yaml | 125 ++ + .../devicetree/bindings/soc/tegra/nvidia,nvec.yaml | 84 + + .../bindings/soc/tegra/nvidia,tegra20-ahb.yaml | 40 + + .../soc/tegra/nvidia,tegra20-flowctrl.yaml | 41 + + .../bindings/thermal/nvidia,tegra124-soctherm.txt | 238 --- + .../bindings/thermal/nvidia,tegra124-soctherm.yaml | 380 ++++ + 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 | 4 + + 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 | 2 + + .../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 | 2 + + arch/arm/boot/dts/nvidia/tegra30.dtsi | 5 - + 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 | 4 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 3 +- + .../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 | 2113 +------------------- + .../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 | 84 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 8 +- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 52 +- + .../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 | 327 ++- + drivers/bus/tegra-gmi.c | 4 +- + drivers/soc/tegra/cbb/tegra-cbb.c | 4 - + 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 - + 80 files changed, 3425 insertions(+), 2646 deletions(-) + 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/cpu/nvidia,tegra186-ccplex-cluster.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/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 arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi +Merging ti/ti-next (897aebaf0d58 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-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. + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 14 +- + arch/arm/mach-keystone/keystone.c | 4 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 3 +- + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 30 +-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 3 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 3 +- + .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 14 +- + .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 31 ++-- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 13 -- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 5 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 2 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-serdes.h | 204 +++++++++++++++++++++ + drivers/firmware/ti_sci.c | 49 +---- + drivers/genpd/ti/omap_prm.c | 13 +- + drivers/soc/ti/k3-ringacc.c | 8 +- + drivers/soc/ti/pruss.c | 4 +- + drivers/soc/ti/ti_sci_inta_msi.c | 3 +- + include/dt-bindings/mux/ti-serdes.h | 8 + + 34 files changed, 340 insertions(+), 158 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-serdes.h +Merging xilinx/for-next (9335fe594d85 Merge branch 'zynq/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. + arch/arm/mach-zynq/pm.c | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 5 +++-- + arch/arm64/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 | 20 ++++++++++++++++---- + drivers/soc/xilinx/xlnx_event_manager.c | 6 ++---- + 16 files changed, 68 insertions(+), 41 deletions(-) +Merging clk/clk-next (4d7c2c61e5c5 Merge branch 'clk-versa' 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/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-sc8280xp.c +Auto-merging drivers/clk/qcom/gcc-sm7150.c +Auto-merging drivers/clk/qcom/mmcc-msm8974.c +Auto-merging drivers/clk/rockchip/clk-rk3568.c +Merge made by the 'ort' strategy. + .../bindings/arm/hisilicon/controller/cpuctrl.yaml | 20 + + .../devicetree/bindings/clock/hix5hd2-clock.txt | 30 - + .../devicetree/bindings/clock/oxnas,stdclk.txt | 28 - + .../devicetree/bindings/clock/renesas,5p35023.yaml | 86 ++ + .../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 ++ + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 7 +- + .../soc/starfive/starfive,jh7110-syscon.yaml | 93 ++ + MAINTAINERS | 13 + + drivers/clk/Kconfig | 17 +- + 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/ccu-pll.c | 6 +- + 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-imx93.c | 2 +- + drivers/clk/imx/clk-scu.c | 2 +- + drivers/clk/keystone/pll.c | 2 +- + drivers/clk/keystone/sci-clk.c | 3 +- + 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 | 31 +- + 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/a1-peripherals.c | 2 +- + drivers/clk/meson/a1-pll.c | 2 +- + drivers/clk/meson/axg-audio.c | 2 +- + drivers/clk/meson/axg.c | 2 +- + drivers/clk/meson/g12a.c | 2 +- + drivers/clk/meson/gxbb.c | 2 +- + drivers/clk/meson/meson-aoclk.c | 2 +- + drivers/clk/meson/meson-eeclk.c | 2 +- + 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-mdm9615.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/rcar-usb2-clock-sel.c | 1 - + drivers/clk/renesas/renesas-cpg-mssr.c | 1 - + drivers/clk/renesas/rzg2l-cpg.c | 3 +- + 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 | 2 +- + drivers/clk/uniphier/clk-uniphier-core.c | 1 - + drivers/clk/xilinx/xlnx_vcu.c | 2 +- + drivers/clk/zynqmp/clkc.c | 3 +- + include/dt-bindings/clock/ast2600-clock.h | 12 + + include/dt-bindings/clock/starfive,jh7110-crg.h | 80 ++ + include/dt-bindings/reset/starfive,jh7110-crg.h | 60 + + 235 files changed, 3278 insertions(+), 630 deletions(-) + 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 + 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/soc/starfive/starfive,jh7110-syscon.yaml + delete mode 100644 drivers/clk/clk-oxnas.c + create mode 100644 drivers/clk/clk-versaclock3.c + 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 (2deed4cda3b7 clk: imx: clk-gpr-mux: Simplify .determine_rate()) +$ 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-imx93.c +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-fracn-gppll.c | 1 + + drivers/clk/imx/clk-gpr-mux.c | 8 +------- + drivers/clk/imx/clk-imx93.c | 4 +++- + include/dt-bindings/clock/imx93-clock.h | 3 ++- + 4 files changed, 7 insertions(+), 9 deletions(-) +Merging clk-renesas/renesas-clk (2fd3f06b527e clk: renesas: r9a07g043: Add MTU3a clock and reset entry) +$ 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 +Auto-merging drivers/clk/renesas/rzg2l-cpg.c +Merge made by the 'ort' strategy. + 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/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/rzg2l-cpg.c | 8 +------- + 8 files changed, 57 insertions(+), 11 deletions(-) +Merging csky/linux-next (6ee1ffdc1838 csky: pgtable: Fixup update_mmu_cache for abiv2) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/abiv2/cacheflush.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging loongarch/loongarch-next (66b198b500fa LoongArch: Allow building with kcov coverage) +$ 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 +Merge made by the 'ort' strategy. + Documentation/features/debug/kcov/arch-support.txt | 2 +- + arch/loongarch/Kconfig | 17 ++ + arch/loongarch/Makefile | 2 + + arch/loongarch/include/asm/asm-prototypes.h | 1 + + arch/loongarch/include/asm/asmmacro.h | 51 +++++- + arch/loongarch/include/asm/fpu.h | 15 +- + arch/loongarch/include/asm/lbt.h | 107 ++++++++++++ + arch/loongarch/include/asm/loongarch.h | 4 + + arch/loongarch/include/asm/processor.h | 26 +-- + arch/loongarch/include/asm/setup.h | 6 + + arch/loongarch/include/asm/switch_to.h | 2 + + arch/loongarch/include/asm/thread_info.h | 4 + + arch/loongarch/include/uapi/asm/ptrace.h | 6 + + arch/loongarch/include/uapi/asm/sigcontext.h | 10 ++ + arch/loongarch/kernel/Makefile | 2 + + arch/loongarch/kernel/asm-offsets.c | 18 +- + arch/loongarch/kernel/cpu-probe.c | 14 ++ + arch/loongarch/kernel/fpu.S | 9 +- + arch/loongarch/kernel/kfpu.c | 55 +++++- + arch/loongarch/kernel/lbt.S | 144 ++++++++++++++++ + arch/loongarch/kernel/process.c | 15 +- + arch/loongarch/kernel/ptrace.c | 54 ++++++ + arch/loongarch/kernel/setup.c | 16 ++ + arch/loongarch/kernel/signal.c | 188 +++++++++++++++++++++ + arch/loongarch/kernel/traps.c | 41 ++++- + arch/loongarch/lib/clear_user.S | 3 +- + arch/loongarch/lib/copy_user.S | 3 +- + arch/loongarch/net/bpf_jit.h | 2 +- + arch/loongarch/vdso/Makefile | 2 + + 29 files changed, 769 insertions(+), 50 deletions(-) + create mode 100644 arch/loongarch/include/asm/lbt.h + create mode 100644 arch/loongarch/kernel/lbt.S +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 (cdff93a49cc4 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 (0859bdf1ace6 Revert MIPS: Loongson: Fix build error when make modules_install) +$ 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/lantiq/irq.c | 2 +- + arch/mips/lantiq/xway/dcdc.c | 3 ++- + arch/mips/lantiq/xway/gptu.c | 4 ++-- + arch/mips/lantiq/xway/sysctrl.c | 1 - + arch/mips/lantiq/xway/vmmc.c | 3 ++- + arch/mips/pci/pci-lantiq.c | 4 ++-- + arch/mips/pci/pci-rt2880.c | 5 ++--- + arch/mips/pic32/pic32mzda/config.c | 1 - + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.c | 2 -- + 14 files changed, 25 insertions(+), 24 deletions(-) +Merging openrisc/for-next (dceaafd66881 openrisc: Union fpcsr and oldmask in sigcontext to unbreak userspace ABI) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (6995e2de6891 Linux 6.4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (471aba2e4760 riscv: sigcontext: Correct the comment of sigreturn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Merge made by the 'ort' strategy. + arch/riscv/include/uapi/asm/sigcontext.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging riscv-dt/riscv-dt-for-next (e7c304c0346d riscv: dts: starfive: jh7110: add the node and pins configuration for tdm) +$ 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 +Merge made by the 'ort' strategy. + 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 | 136 +++++++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 415 ++++++++++++++++++++- + 6 files changed, 636 insertions(+), 2 deletions(-) +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 (305b9f4f7beb s390: use obj-y to descend into drivers/s390/) +$ 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 MAINTAINERS +Auto-merging arch/s390/Kbuild +Auto-merging arch/s390/Kconfig +CONFLICT (content): Merge conflict in arch/s390/Kconfig +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 a6c360638053] 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 | 30 +- + arch/s390/Makefile | 1 - + arch/s390/boot/startup.c | 4 +- + 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/debug.h | 4 +- + arch/s390/include/asm/diag.h | 3 + + arch/s390/include/asm/ftrace.h | 17 + + arch/s390/include/asm/pgtable.h | 2 - + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/setup.h | 1 + + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/asm-offsets.c | 9 + + arch/s390/kernel/cert_store.c | 810 ++++++++++++++++++++++ + arch/s390/kernel/diag.c | 23 + + arch/s390/kernel/mcount.S | 65 +- + arch/s390/kernel/setup.c | 1 + + arch/s390/kernel/sthyi.c | 4 +- + arch/s390/mm/extmem.c | 9 +- + 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 +- + 67 files changed, 1727 insertions(+), 1642 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/kernel/cert_store.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 (0914825aa54f Merge branch 'for-next-next-v6.5-20230726' into for-next-20230726) +$ 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/block-group.c | 77 ++-- + fs/btrfs/block-group.h | 6 +- + fs/btrfs/btrfs_inode.h | 6 +- + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/disk-io.c | 31 +- + fs/btrfs/extent-io-tree.c | 14 +- + fs/btrfs/extent-io-tree.h | 6 +- + fs/btrfs/extent-tree.c | 26 +- + fs/btrfs/extent-tree.h | 3 - + fs/btrfs/extent_io.c | 501 ++++++++++++-------------- + fs/btrfs/extent_io.h | 9 +- + fs/btrfs/free-space-cache.c | 7 +- + fs/btrfs/free-space-tree.c | 13 +- + fs/btrfs/inode.c | 813 ++++++++++++++++--------------------------- + fs/btrfs/ordered-data.c | 28 +- + fs/btrfs/raid56.c | 25 +- + fs/btrfs/raid56.h | 1 - + fs/btrfs/relocation.c | 10 +- + fs/btrfs/scrub.c | 6 - + fs/btrfs/super.c | 6 + + fs/btrfs/sysfs.c | 7 + + fs/btrfs/transaction.c | 27 +- + fs/btrfs/tree-log.c | 4 +- + fs/btrfs/volumes.c | 49 ++- + fs/btrfs/zoned.c | 4 +- + include/linux/writeback.h | 5 - + include/trace/events/btrfs.h | 29 +- + mm/page-writeback.c | 49 +-- + 30 files changed, 779 insertions(+), 1016 deletions(-) +Merging ceph/master (588159009d5b rbd: retrieve and check lock owner twice before blocklisting) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 124 +++++++++++++++++++++++++++++++++++---------------- + fs/ceph/metric.c | 2 +- + net/ceph/messenger.c | 1 + + 3 files changed, 88 insertions(+), 39 deletions(-) +Merging cifs/for-next (a171eb5cac42 cifs: add missing return value check for cifs_sb_tlink) +$ 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/nls/nls_base.c | 4 ++-- + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/cifssmb.c | 3 +-- + fs/smb/client/connect.c | 5 +++++ + fs/smb/client/ioctl.c | 5 +++++ + fs/smb/client/misc.c | 1 + + fs/smb/client/sess.c | 4 +++- + fs/smb/client/smb2pdu.c | 3 +-- + include/linux/nls.h | 2 +- + 9 files changed, 20 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 (1f9beb807470 erofs: boost negative xattr lookup with bloom filter) +$ 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 | 17 ++- + fs/erofs/Makefile | 1 + + fs/erofs/compress.h | 2 + + fs/erofs/decompressor.c | 6 + + fs/erofs/decompressor_deflate.c | 250 ++++++++++++++++++++++++++++++++++++++++ + fs/erofs/erofs_fs.h | 17 ++- + fs/erofs/internal.h | 23 ++++ + fs/erofs/super.c | 55 +++------ + fs/erofs/xattr.c | 14 +++ + fs/erofs/zdata.c | 7 +- + fs/erofs/zmap.c | 5 +- + 11 files changed, 350 insertions(+), 47 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 +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 6 +++--- + fs/exfat/dir.c | 36 +++++++++++++++++++----------------- + 2 files changed, 22 insertions(+), 20 deletions(-) +Merging ext3/for_next (eccf9ae28312 Pull patch forbiding superblock / mount marks on internal kernel mounts.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/ialloc.c | 3 - + fs/quota/dquot.c | 244 ++++++++++++++++++++++++++++--------------------------- + 2 files changed, 125 insertions(+), 122 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 (10c7134ee440 f2fs: compress: don't {,de}compress non-full cluster) +$ 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/compress.c | 14 +-------- + fs/f2fs/data.c | 8 ++--- + fs/f2fs/f2fs.h | 3 +- + fs/f2fs/file.c | 55 +++++++++++++++++++++++---------- + fs/f2fs/segment.c | 2 ++ + fs/f2fs/super.c | 20 +++++------- + 7 files changed, 57 insertions(+), 53 deletions(-) +Merging fsverity/for-next (456ae5fe9b44 fsverity: move sysctl registration out of signature.c) +$ 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 | 61 ++++++-------------------------------------- + fs/verity/verify.c | 11 ++------ + 6 files changed, 63 insertions(+), 103 deletions(-) +Merging fuse/for-next (6a567e920fd0 fuse: ioctl: translate ENOSYS in outarg) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (c6fa6b6c07c8 gfs2: increase usage of folio_next_index() helper) +$ 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. + fs/gfs2/aops.c | 3 +-- + 1 file changed, 1 insertion(+), 2 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 (f40125c0a160 Merge tag '6.5-rc3-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (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 (c7d247b033fa SUNRPC: Reduce thread wake-up rate when receiving large RPC messages) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'ort' strategy. + fs/lockd/svclock.c | 13 +- + fs/locks.c | 7 - + fs/nfsd/cache.h | 8 +- + fs/nfsd/nfs3proc.c | 4 +- + fs/nfsd/nfs4acl.c | 34 +++- + fs/nfsd/nfs4proc.c | 61 ++++++- + fs/nfsd/nfs4state.c | 120 +++++++++++-- + fs/nfsd/nfs4xdr.c | 22 ++- + fs/nfsd/nfscache.c | 206 +++++++++++++++-------- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfsfh.c | 26 +-- + fs/nfsd/nfsfh.h | 6 +- + fs/nfsd/nfssvc.c | 10 +- + 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 | 12 +- + include/linux/sunrpc/svc.h | 1 - + include/linux/sunrpc/svcauth.h | 3 - + include/linux/sunrpc/svcsock.h | 4 +- + include/linux/sunrpc/xdr.h | 2 + + 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/svcsock.c | 128 +++++++------- + net/sunrpc/xdr.c | 50 ++++++ + 36 files changed, 576 insertions(+), 1370 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 (0a3bf81dbcb2 ovl: auto generate uuid for new overlay filesystems) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 2 + + Documentation/filesystems/overlayfs.rst | 72 +++++++++++ + fs/overlayfs/copy_up.c | 52 +++++++- + fs/overlayfs/export.c | 26 +++- + fs/overlayfs/file.c | 8 +- + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/namei.c | 87 +++++++++++-- + fs/overlayfs/overlayfs.h | 66 +++++++++- + fs/overlayfs/ovl_entry.h | 4 +- + fs/overlayfs/params.c | 92 ++++++++++++-- + fs/overlayfs/super.c | 34 ++++- + fs/overlayfs/util.c | 217 +++++++++++++++++++++++++++++++- + 12 files changed, 617 insertions(+), 45 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 (a67371b7aee9 Merge tag 'iomap-per-block-dirty-tracking' of https://github.com/riteshharjani/linux into iomap-6.6-merge) +$ 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 fs/f2fs/compress.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/gfs2/aops.c +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/xfs/xfs_aops.c | 2 +- + fs/zonefs/file.c | 2 +- + include/linux/iomap.h | 3 +- + include/linux/pagemap.h | 82 +++++- + include/linux/uio.h | 9 +- + lib/iov_iter.c | 43 ++-- + mm/filemap.c | 65 ++--- + mm/folio-compat.c | 2 +- + mm/readahead.c | 13 - + 16 files changed, 481 insertions(+), 238 deletions(-) +Merging djw-vfs/vfs-for-next (59ba4fdd2d1f fs: wait for partially frozen filesystems) +$ 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 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 ++++++++++++++++++++++++++++++++++---- + include/linux/fs.h | 15 +++-- + 8 files changed, 138 insertions(+), 36 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 (91bcc05fab9b Merge branch 'vfs.super' 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/tmpfs.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging arch/s390/hypfs/inode.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging fs/Kconfig +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/read_write.c +Auto-merging fs/erofs/inode.c +Auto-merging fs/ext2/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/xattr.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/jfs/jfs_imap.c +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/overlayfs/file.c +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/client/smb2ops.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/splice.c +Auto-merging fs/super.c +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 +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 8 +- + Documentation/filesystems/tmpfs.rst | 31 ++ + 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 + + drivers/android/binderfs.c | 8 +- + drivers/infiniband/hw/qib/qib_fs.c | 3 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 +- + drivers/misc/ibmvmc.c | 2 +- + 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 | 4 +- + fs/9p/vfs_inode_dotl.c | 8 +- + fs/Kconfig | 12 + + fs/adfs/inode.c | 4 +- + fs/affs/amigaffs.c | 6 +- + fs/affs/inode.c | 16 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 6 +- + fs/attr.c | 22 +- + fs/autofs/inode.c | 2 +- + fs/autofs/root.c | 6 +- + fs/bad_inode.c | 3 +- + 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/file.c | 21 +- + fs/btrfs/inode.c | 54 +- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/reflink.c | 3 +- + fs/btrfs/transaction.c | 3 +- + fs/btrfs/tree-log.c | 4 +- + fs/btrfs/xattr.c | 4 +- + fs/ceph/acl.c | 2 +- + fs/ceph/caps.c | 2 +- + fs/ceph/inode.c | 16 +- + 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 | 2 +- + fs/configfs/inode.c | 7 +- + fs/cramfs/inode.c | 3 +- + fs/debugfs/inode.c | 3 +- + fs/devpts/inode.c | 6 +- + fs/ecryptfs/inode.c | 2 +- + fs/ecryptfs/mmap.c | 4 +- + 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 | 12 +- + fs/eventfd.c | 2 +- + fs/eventpoll.c | 12 +- + fs/exfat/file.c | 4 +- + fs/exfat/inode.c | 6 +- + fs/exfat/namei.c | 26 +- + fs/exfat/super.c | 3 +- + fs/ext2/acl.c | 2 +- + fs/ext2/dir.c | 6 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 10 +- + 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/extents.c | 12 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode-test.c | 6 +- + fs/ext4/inode.c | 16 +- + fs/ext4/ioctl.c | 9 +- + fs/ext4/namei.c | 26 +- + fs/ext4/super.c | 2 +- + fs/ext4/xattr.c | 6 +- + fs/f2fs/dir.c | 8 +- + fs/f2fs/f2fs.h | 4 +- + fs/f2fs/file.c | 20 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 10 +- + fs/f2fs/namei.c | 12 +- + fs/f2fs/recovery.c | 4 +- + fs/f2fs/super.c | 2 +- + fs/f2fs/xattr.c | 2 +- + fs/fat/inode.c | 5 +- + fs/fat/misc.c | 3 +- + fs/fcntl.c | 29 +- + fs/freevxfs/vxfs_inode.c | 3 +- + fs/fuse/control.c | 2 +- + fs/fuse/dir.c | 8 +- + 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 | 8 +- + 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 | 16 +- + 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 | 26 +- + 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/inode.c | 5 +- + fs/libfs.c | 305 ++++++++++- + fs/locks.c | 20 +- + fs/minix/bitmap.c | 2 +- + fs/minix/dir.c | 6 +- + fs/minix/inode.c | 10 +- + 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 | 20 +- + 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/notify/dnotify/dnotify.c | 4 +- + fs/nsfs.c | 2 +- + fs/ntfs/inode.c | 15 +- + fs/ntfs/mft.c | 3 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/frecord.c | 3 +- + fs/ntfs3/inode.c | 14 +- + fs/ntfs3/namei.c | 11 +- + 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 | 16 +- + fs/ocfs2/inode.c | 12 +- + 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 | 19 +- + fs/openpromfs/inode.c | 5 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-utils.c | 6 +- + fs/overlayfs/file.c | 7 +- + fs/overlayfs/util.c | 2 +- + fs/pipe.c | 8 +- + fs/posix_acl.c | 2 +- + fs/proc/base.c | 5 +- + fs/proc/inode.c | 2 +- + fs/proc/proc_net.c | 1 + + fs/proc/proc_sysctl.c | 2 +- + 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/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 | 3 +- + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/file.c | 4 +- + fs/smb/client/fscache.h | 5 +- + fs/smb/client/inode.c | 14 +- + fs/smb/client/smb2ops.c | 3 +- + fs/smb/server/smb2pdu.c | 8 +- + fs/splice.c | 46 +- + fs/squashfs/inode.c | 2 +- + fs/stack.c | 2 +- + fs/stat.c | 2 +- + fs/super.c | 194 +++---- + fs/sysv/dir.c | 6 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/inode.c | 5 +- + fs/sysv/itree.c | 4 +- + fs/sysv/namei.c | 6 +- + fs/tracefs/inode.c | 2 +- + fs/ubifs/debug.c | 4 +- + fs/ubifs/dir.c | 39 +- + fs/ubifs/file.c | 16 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/super.c | 4 +- + fs/ubifs/xattr.c | 6 +- + fs/udf/ialloc.c | 2 +- + fs/udf/inode.c | 17 +- + fs/udf/namei.c | 24 +- + fs/ufs/dir.c | 6 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 23 +- + fs/ufs/namei.c | 8 +- + fs/vboxsf/utils.c | 4 +- + fs/xfs/libxfs/xfs_inode_buf.c | 5 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 +- + fs/xfs/xfs_inode.c | 3 +- + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_iops.c | 4 +- + fs/xfs/xfs_itable.c | 4 +- + fs/zonefs/super.c | 8 +- + include/linux/dnotify.h | 4 +- + include/linux/filelock.h | 12 +- + include/linux/fs.h | 73 ++- + include/linux/fs_stack.h | 2 +- + include/linux/pipe_fs_i.h | 4 +- + include/linux/shmem_fs.h | 29 ++ + include/linux/syscalls.h | 4 +- + include/uapi/asm-generic/unistd.h | 5 +- + 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 | 575 ++++++++++++++++----- + mm/shmem_quota.c | 350 +++++++++++++ + net/sunrpc/rpc_pipe.c | 2 +- + security/apparmor/apparmorfs.c | 11 +- + security/apparmor/policy_unpack.c | 11 +- + security/inode.c | 2 +- + security/selinux/selinuxfs.c | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/fchmodat2/.gitignore | 2 + + tools/testing/selftests/fchmodat2/Makefile | 6 + + tools/testing/selftests/fchmodat2/fchmodat2_test.c | 162 ++++++ + tools/testing/selftests/nolibc/nolibc-test.c | 1 - + 291 files changed, 2467 insertions(+), 1206 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 (82515ab6aeb3 Merge branch 'rework/misc-cleanups' 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_safe.c | 9 +- + 7 files changed, 163 insertions(+), 79 deletions(-) +Merging pci/next (692860726644 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/dwc/pcie-designware.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + arch/x86/pci/irq.c | 4 ++-- + 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 | 5 ++--- + 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 | 1 - + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2 +- + drivers/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 | 6 +++++- + drivers/pci/controller/pcie-iproc-msi.c | 5 ++--- + drivers/pci/controller/pcie-microchip-host.c | 10 ++++++++-- + drivers/pci/controller/pcie-rockchip-host.c | 4 +--- + drivers/pci/controller/pcie-rockchip.c | 1 + + drivers/pci/controller/pcie-rockchip.h | 6 +++--- + drivers/pci/endpoint/pci-epc-core.c | 1 - + drivers/pci/hotplug/ibmphp_pci.c | 10 +++++----- + drivers/pci/pci-sysfs.c | 4 ++++ + drivers/pci/pcie/aer.c | 15 +-------------- + drivers/pci/probe.c | 1 - + drivers/pci/quirks.c | 2 ++ + include/linux/aer.h | 11 ----------- + include/linux/pci.h | 6 +++--- + 43 files changed, 81 insertions(+), 95 deletions(-) +Merging pstore/for-next/pstore (438b805003a0 pstore: Replace crypto API compression with zlib_deflate library calls) +$ 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 ++++++++++++++++----------------------------------- + 2 files changed, 110 insertions(+), 320 deletions(-) +Merging hid/for-next (5eb5c80feb93 Merge branch 'for-6.5/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (6537ed3904a3 i2c: mpc: Drop unused variable) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (49b472ebc61d i3c: master: svc: add NACK check after start byte sent) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (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 (c944c8c532f7 hwmon: (hs3001) Fix unused variable compiler warning) +$ 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 | 1 - + 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 | 2 +- + drivers/hwmon/ads7828.c | 2 +- + drivers/hwmon/adt7475.c | 1 - + 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 | 1 - + drivers/hwmon/it87.c | 74 ++- + drivers/hwmon/lan966x-hwmon.c | 24 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/lm75.c | 1 - + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lochnagar-hwmon.c | 1 - + drivers/hwmon/ltq-cputemp.c | 3 +- + drivers/hwmon/max31730.c | 1 - + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6697.c | 1 - + drivers/hwmon/mcp3021.c | 1 - + drivers/hwmon/nct6775-core.c | 221 ++++--- + drivers/hwmon/nct6775-platform.c | 2 +- + drivers/hwmon/nct6775.h | 28 +- + drivers/hwmon/nsa320-hwmon.c | 2 - + 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 | 2 +- + drivers/hwmon/pmbus/ir38064.c | 4 +- + drivers/hwmon/pmbus/max20730.c | 66 +- + drivers/hwmon/pmbus/mp2975.c | 422 +++++++++--- + drivers/hwmon/pmbus/mp5023.c | 2 +- + drivers/hwmon/pmbus/mpq7932.c | 2 +- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + drivers/hwmon/pmbus/tps53679.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/hwmon/pmbus/ucd9200.c | 2 +- + 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/tps23861.c | 2 +- + drivers/hwmon/ultra45_env.c | 3 +- + drivers/hwmon/vexpress-hwmon.c | 1 - + drivers/hwmon/w83773g.c | 2 +- + 61 files changed, 1235 insertions(+), 1421 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 (c35211059b77 docs: Integrate rustdoc generation into htmldocs) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-nvdimm | 4 +- + Documentation/Makefile | 16 ++ + Documentation/admin-guide/kernel-parameters.txt | 42 ++--- + .../admin-guide/mm/numa_memory_policy.rst | 2 +- + Documentation/admin-guide/xfs.rst | 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/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/process/deprecated.rst | 2 +- + 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 ++++++++++++++++ + .../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 | 6 +- + MAINTAINERS | 4 +- + include/linux/jiffies.h | 197 +++++++++++++++++--- + kernel/time/time.c | 169 +++++++++++++++-- + rust/Makefile | 15 +- + 97 files changed, 1092 insertions(+), 338 deletions(-) + create mode 100644 Documentation/maintainer/feature-and-driver-maintainers.rst + create mode 100644 Documentation/translations/sp_SP/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/sp_SP/process/researcher-guidelines.rst +Merging v4l-dvb/master (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (d7b13edd4cb4 media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()) +$ 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. + Documentation/devicetree/bindings/i2c/i2c-atr.yaml | 34 + + .../devicetree/bindings/media/cdns,csi2rx.txt | 100 - + .../devicetree/bindings/media/cdns,csi2rx.yaml | 201 + + .../bindings/media/i2c/ti,ds90ub913.yaml | 133 + + .../bindings/media/i2c/ti,ds90ub953.yaml | 134 + + .../bindings/media/i2c/ti,ds90ub960.yaml | 427 +++ + Documentation/i2c/i2c-address-translators.rst | 96 + + Documentation/i2c/index.rst | 1 + + MAINTAINERS | 54 +- + drivers/i2c/Kconfig | 9 + + drivers/i2c/Makefile | 1 + + drivers/i2c/i2c-atr.c | 710 ++++ + drivers/media/cec/i2c/ch7322.c | 2 +- + drivers/media/cec/platform/meson/ao-cec.c | 2 +- + drivers/media/cec/platform/tegra/tegra_cec.c | 2 +- + drivers/media/i2c/Kconfig | 47 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/ad5820.c | 2 - + drivers/media/i2c/ds90ub913.c | 906 +++++ + drivers/media/i2c/ds90ub953.c | 1400 +++++++ + drivers/media/i2c/ds90ub960.c | 4051 ++++++++++++++++++++ + drivers/media/i2c/hi556.c | 2 +- + drivers/media/i2c/hi847.c | 2 +- + drivers/media/i2c/imx208.c | 2 +- + drivers/media/i2c/imx290.c | 7 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/max9286.c | 2 +- + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/og01a1b.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 | 2 +- + drivers/media/i2c/ov2740.c | 2 +- + drivers/media/i2c/ov5640.c | 7 +- + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/i2c/ov5675.c | 2 +- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/tvp5150.c | 4 + + drivers/media/pci/Kconfig | 2 +- + drivers/media/pci/intel/Kconfig | 21 + + drivers/media/pci/intel/Makefile | 4 +- + .../pci/intel/{ipu3/cio2-bridge.c => ipu-bridge.c} | 179 +- + .../pci/intel/{ipu3/cio2-bridge.h => ipu-bridge.h} | 57 +- + drivers/media/pci/intel/ipu3/Kconfig | 19 - + drivers/media/pci/intel/ipu3/Makefile | 3 - + .../intel/ipu3/{ipu3-cio2-main.c => ipu3-cio2.c} | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 6 - + drivers/media/platform/allegro-dvt/allegro-core.c | 2 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 107 +- + drivers/media/platform/intel/pxa_camera.c | 2 +- + drivers/media/platform/marvell/mmp-driver.c | 2 +- + drivers/media/platform/mediatek/mdp/mtk_mdp_core.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 +- + .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 2 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 2 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 2 +- + drivers/media/platform/ti/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/verisilicon/hantro_drv.c | 2 +- + 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 | 120 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 18 +- + include/linux/i2c-atr.h | 116 + + include/media/i2c/ds90ub9xx.h | 22 + + 72 files changed, 8813 insertions(+), 406 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/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/pci/intel/Kconfig + rename drivers/media/pci/intel/{ipu3/cio2-bridge.c => ipu-bridge.c} (68%) + rename drivers/media/pci/intel/{ipu3/cio2-bridge.h => ipu-bridge.h} (72%) + rename drivers/media/pci/intel/ipu3/{ipu3-cio2-main.c => ipu3-cio2.c} (99%) + create mode 100644 include/linux/i2c-atr.h + create mode 100644 include/media/i2c/ds90ub9xx.h +Merging pm/linux-next (cbda924b739d Merge branch 'powercap' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + arch/ia64/include/asm/acpi.h | 6 +- + arch/x86/include/asm/acpi.h | 24 ++- + arch/x86/xen/enlighten_pv.c | 8 +- + 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/battery.c | 24 ++- + drivers/acpi/bus.c | 33 +++- + drivers/acpi/hed.c | 15 +- + drivers/acpi/internal.h | 10 +- + drivers/acpi/nfit/core.c | 42 +++-- + drivers/acpi/processor_pdc.c | 97 +---------- + drivers/acpi/thermal.c | 23 ++- + drivers/acpi/video_detect.c | 9 + + drivers/acpi/x86/utils.c | 35 ++++ + drivers/base/power/power.h | 1 + + drivers/base/power/wakeirq.c | 61 +------ + drivers/powercap/arm_scmi_powercap.c | 159 ++++++++++-------- + 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 ++--- + 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_core.c | 4 +- + drivers/thermal/thermal_of.c | 30 +--- + drivers/thermal/uniphier_thermal.c | 1 - + drivers/tty/serial/qcom_geni_serial.c | 7 - + 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 +++++ + include/linux/pm_wakeirq.h | 10 -- + include/linux/thermal.h | 6 +- + kernel/power/snapshot.c | 187 ++++++++++++++++----- + 67 files changed, 839 insertions(+), 500 deletions(-) + delete mode 100644 include/acpi/pdc_intel.h + create mode 100644 include/acpi/proc_cap_intel.h +Merging cpufreq-arm/cpufreq/arm/linux-next (fd459406b99d cpufreq: omap: Convert to platform remove callback returning void) +$ 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/armada-37xx-cpufreq.c | 4 +--- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 ++---- + 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/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 ++---- + 24 files changed, 45 insertions(+), 84 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 +Merge made by the 'ort' strategy. + 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 +++++++++++++++++++++++- + 7 files changed, 146 insertions(+), 13 deletions(-) +Merging devfreq/devfreq-next (c46de2fb4ad9 PM / devfreq: Reword the kernel-doc comment for devfreq_monitor_start() API) +$ 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 | 9 +++++---- + 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, 8 insertions(+), 8 deletions(-) +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 (dc52cd2eff4a fs: dlm: fix F_CANCELLK to cancel pending request) +$ 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/plock.c | 161 ++++++++++++++++++++++++++++++++--------- + fs/gfs2/file.c | 9 +-- + fs/ocfs2/stack_user.c | 13 +--- + include/linux/dlm_plock.h | 2 + + include/uapi/linux/dlm_plock.h | 1 + + 5 files changed, 136 insertions(+), 50 deletions(-) +Merging rdma/for-next (24b1b5d85c1c IB/hfi1: Use struct_size()) +$ 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 +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 11 ++ + drivers/infiniband/core/cma.c | 32 +++- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 27 +++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 52 +++++- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 + + drivers/infiniband/hw/bnxt_re/main.c | 220 ++++++++++++++++++++++++ + drivers/infiniband/hw/bnxt_re/qplib_res.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 19 ++ + 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/pio.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 1 - + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 93 ++-------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 13 +- + drivers/infiniband/hw/irdma/cm.c | 67 +++++++- + drivers/infiniband/hw/irdma/verbs.c | 46 +++-- + drivers/infiniband/hw/mlx5/mr.c | 5 + + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 1 - + drivers/infiniband/sw/siw/siw.h | 1 + + drivers/infiniband/sw/siw/siw_main.c | 22 +-- + drivers/infiniband/sw/siw/siw_qp.c | 4 +- + drivers/infiniband/sw/siw/siw_verbs.c | 10 +- + 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 + + 29 files changed, 608 insertions(+), 148 deletions(-) +Merging net-next/main (2303fae13064 net: skbuff: remove unused HAVE_HW_TIME_STAMP feature define) +$ 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 drivers/net/dsa/qca/qca8k-8xxx.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +Auto-merging drivers/net/vxlan/vxlan_core.c +Auto-merging include/net/tcp.h +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/key/af_key.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + 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 | 2 +- + .../bpf/{ => standardization}/linux-notes.rst | 3 +- + .../devicetree/bindings/net/brcm,asp-v2.0.yaml | 155 ++ + .../devicetree/bindings/net/brcm,unimac-mdio.yaml | 2 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 20 +- + .../devicetree/bindings/net/can/xilinx,can.yaml | 3 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- + .../devicetree/bindings/net/motorcomm,yt8xxx.yaml | 34 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 1 + + Documentation/netlink/specs/netdev.yaml | 6 + + Documentation/networking/af_xdp.rst | 211 +- + .../device_drivers/ethernet/marvell/octeontx2.rst | 8 + + Documentation/networking/ip-sysctl.rst | 9 + + Documentation/networking/netconsole.rst | 11 +- + Documentation/networking/page_pool.rst | 11 +- + MAINTAINERS | 16 +- + arch/x86/net/bpf_jit_comp.c | 248 ++- + drivers/connector/cn_proc.c | 111 +- + drivers/connector/connector.c | 40 +- + drivers/hid/bpf/entrypoints/Makefile | 2 +- + drivers/net/can/Kconfig | 5 + + drivers/net/can/grcan.c | 3 +- + drivers/net/can/kvaser_pciefd.c | 307 ++- + drivers/net/can/m_can/m_can.c | 32 +- + drivers/net/can/m_can/m_can.h | 3 + + drivers/net/can/m_can/m_can_platform.c | 21 +- + drivers/net/can/sja1000/ems_pci.c | 6 +- + drivers/net/can/usb/ucan.c | 2 +- + drivers/net/can/xilinx_can.c | 25 +- + drivers/net/dsa/b53/b53_common.c | 6 - + drivers/net/dsa/lan9303-core.c | 6 - + drivers/net/dsa/microchip/ksz_common.c | 2 - + drivers/net/dsa/mt7530.c | 6 - + drivers/net/dsa/mv88e6xxx/Makefile | 3 + + drivers/net/dsa/mv88e6xxx/chip.c | 424 +--- + 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 | 898 ++++++++ + 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/qca/ar9331.c | 2 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 2 - + drivers/net/dsa/sja1105/sja1105_main.c | 6 - + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 12 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 2 +- + drivers/net/ethernet/broadcom/Kconfig | 11 + + 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/bnxt/bnxt.c | 156 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 + + drivers/net/ethernet/brocade/bna/bnad.c | 13 +- + drivers/net/ethernet/engleder/tsnep_main.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 16 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 +- + drivers/net/ethernet/freescale/fec.h | 5 - + drivers/net/ethernet/freescale/fec_main.c | 51 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 6 +- + drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 6 +- + drivers/net/ethernet/freescale/fec_ptp.c | 16 +- + drivers/net/ethernet/freescale/fman/mac.c | 5 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 6 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 6 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 6 +- + drivers/net/ethernet/freescale/gianfar.c | 6 +- + drivers/net/ethernet/freescale/ucc_geth.c | 6 +- + drivers/net/ethernet/google/gve/gve_desc.h | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 65 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 101 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 5 +- + drivers/net/ethernet/intel/ice/ice_base.c | 9 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 46 +- + drivers/net/ethernet/intel/ice/ice_eswitch_br.c | 1309 ++++++++++++ + drivers/net/ethernet/intel/ice/ice_eswitch_br.h | 120 ++ + drivers/net/ethernet/intel/ice/ice_lib.c | 25 + + drivers/net/ethernet/intel/ice/ice_lib.h | 1 + + drivers/net/ethernet/intel/ice/ice_main.c | 9 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 2 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 3 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 150 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 6 +- + drivers/net/ethernet/intel/ice/ice_trace.h | 90 + + drivers/net/ethernet/intel/ice/ice_type.h | 1 + + .../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_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/igc/igc_main.c | 35 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 10 - + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 9 +- + .../net/ethernet/marvell/octeontx2/af/rvu_switch.c | 6 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 12 +- + .../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_tc.c | 320 ++- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 408 +++- + drivers/net/ethernet/marvell/octeontx2/nic/qos.h | 11 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 104 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + + drivers/net/ethernet/mediatek/mtk_ppe.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 27 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 12 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 59 +- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 6 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 1 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 73 + + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 351 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 27 +- + .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 11 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 3 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 68 + + .../ethernet/mellanox/mlxsw/spectrum_port_range.c | 200 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 601 +++++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 11 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 170 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 5 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 54 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + .../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/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/smsc/smsc9420.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 39 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 23 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 5 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 36 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 4 +- + 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 | 2 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 24 +- + 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 | 2 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 123 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 47 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 254 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 6 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 68 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 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 | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 8 +- + drivers/net/gtp.c | 3 +- + drivers/net/mdio/mdio-bcm-unimac.c | 2 + + drivers/net/mdio/mdio-xgene.c | 4 +- + drivers/net/netconsole.c | 115 +- + drivers/net/netdevsim/Makefile | 4 + + drivers/net/netdevsim/macsec.c | 356 ++++ + drivers/net/netdevsim/netdev.c | 3 + + drivers/net/netdevsim/netdevsim.h | 34 + + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 139 +- + drivers/net/phy/bcm7xxx.c | 1 + + drivers/net/phy/marvell-88q2xxx.c | 263 +++ + drivers/net/phy/mdio_bus.c | 37 +- + drivers/net/phy/motorcomm.c | 118 ++ + drivers/net/phy/phy-c45.c | 63 +- + drivers/net/phy/phylink.c | 182 +- + drivers/net/ppp/pppoe.c | 4 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/vxlan/vxlan_core.c | 44 + + 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/ptp/ptp_qoriq.c | 2 +- + drivers/s390/net/Kconfig | 5 +- + drivers/s390/net/lcs.c | 39 +- + drivers/w1/w1_netlink.c | 6 +- + include/linux/bpf-cgroup.h | 4 +- + include/linux/bpf.h | 42 + + include/linux/bpf_mem_alloc.h | 2 + + include/linux/bpf_mprog.h | 327 +++ + include/linux/brcmphy.h | 1 + + include/linux/btf_ids.h | 1 + + include/linux/connector.h | 8 +- + include/linux/icmpv6.h | 10 +- + include/linux/ipv6.h | 16 +- + include/linux/lsm_hook_defs.h | 2 +- + include/linux/marvell_phy.h | 1 + + include/linux/mdio.h | 26 + + include/linux/mlx5/mlx5_ifc.h | 7 +- + include/linux/netdevice.h | 18 +- + include/linux/netlink.h | 6 + + include/linux/phy.h | 1 + + include/linux/phylink.h | 86 +- + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 1 + + include/linux/security.h | 5 +- + include/linux/skbuff.h | 16 +- + include/linux/stmmac.h | 26 +- + include/linux/tcp.h | 4 +- + include/linux/trace_events.h | 3 +- + include/net/dropreason-core.h | 3 + + include/net/dsa.h | 3 - + include/net/ip_tunnels.h | 1 + + include/net/netfilter/nf_conntrack_expect.h | 2 +- + include/net/netns/ipv4.h | 2 +- + include/net/page_pool.h | 10 +- + include/net/pkt_cls.h | 1 + + include/net/route.h | 6 +- + include/net/sch_generic.h | 2 +- + include/net/sock.h | 1 + + include/net/switchdev.h | 6 + + include/net/tcp.h | 36 +- + include/net/tcx.h | 206 ++ + include/net/xdp_sock.h | 7 + + include/net/xdp_sock_drv.h | 54 + + include/net/xsk_buff_pool.h | 7 + + include/uapi/linux/bpf.h | 112 +- + 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 | 1 + + kernel/bpf/Kconfig | 1 + + kernel/bpf/Makefile | 3 +- + kernel/bpf/btf.c | 24 +- + kernel/bpf/cpumask.c | 20 +- + kernel/bpf/hashtab.c | 22 +- + kernel/bpf/helpers.c | 55 +- + kernel/bpf/map_iter.c | 42 +- + kernel/bpf/memalloc.c | 378 +++- + kernel/bpf/mprog.c | 445 ++++ + 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 | 348 +++ + kernel/bpf/verifier.c | 64 +- + kernel/rcu/rcu.h | 2 - + kernel/trace/bpf_trace.c | 49 +- + kernel/trace/trace_kprobe.c | 13 +- + kernel/trace/trace_uprobe.c | 3 +- + lib/test_bpf.c | 12 +- + net/Kconfig | 5 + + net/bpf/test_run.c | 18 +- + net/bridge/br.c | 8 + + net/bridge/br_forward.c | 1 + + net/bridge/br_netlink.c | 12 + + net/bridge/br_private.h | 19 + + net/bridge/br_switchdev.c | 15 +- + net/bridge/br_vlan_tunnel.c | 15 + + net/core/dev.c | 303 +-- + net/core/filter.c | 11 +- + net/core/netdev-genl.c | 8 + + net/core/page_pool.c | 13 +- + net/core/rtnetlink.c | 11 +- + net/core/sock.c | 15 +- + net/dccp/ipv4.c | 3 +- + net/dccp/ipv6.c | 1 + + net/dccp/ipv6.h | 4 - + net/devlink/leftover.c | 4 +- + net/dsa/port.c | 41 - + net/dsa/slave.c | 9 +- + net/ipv4/bpf_tcp_ca.c | 2 - + net/ipv4/nexthop.c | 61 +- + net/ipv4/tcp.c | 11 +- + net/ipv4/tcp_input.c | 38 +- + net/ipv4/tcp_ipv4.c | 3 + + net/ipv4/udp.c | 2 +- + net/ipv6/addrconf.c | 10 + + net/ipv6/af_inet6.c | 4 +- + net/ipv6/datagram.c | 7 +- + net/ipv6/exthdrs.c | 2 - + net/ipv6/icmp.c | 6 +- + net/ipv6/mcast.c | 8 +- + net/ipv6/ndisc.c | 18 +- + net/ipv6/ping.c | 1 + + net/ipv6/raw.c | 1 + + net/ipv6/rpl_iptunnel.c | 3 +- + net/ipv6/tcp_ipv6.c | 1 + + net/ipv6/udp.c | 1 + + net/ipv6/udplite.c | 1 + + net/key/af_key.c | 1 - + net/l2tp/l2tp_ip6.c | 4 +- + net/mptcp/protocol.c | 16 +- + net/mptcp/protocol.h | 8 +- + net/mptcp/subflow.c | 2 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_expect.c | 4 +- + net/netfilter/nft_ct.c | 2 + + net/netlink/af_netlink.c | 38 +- + net/netlink/af_netlink.h | 4 + + net/netlink/genetlink.c | 6 +- + net/openvswitch/conntrack.c | 78 +- + net/qrtr/af_qrtr.c | 5 + + net/qrtr/ns.c | 139 +- + net/sched/Kconfig | 4 +- + net/sched/act_ct.c | 3 +- + net/sched/sch_htb.c | 7 +- + net/sched/sch_ingress.c | 61 +- + net/sctp/protocol.c | 3 +- + net/sctp/socket.c | 1 + + net/switchdev/switchdev.c | 25 + + net/xdp/xsk.c | 375 +++- + 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 | 112 +- + tools/include/uapi/linux/if_xdp.h | 9 + + tools/include/uapi/linux/netdev.h | 1 + + tools/lib/bpf/bpf.c | 135 +- + tools/lib/bpf/bpf.h | 103 +- + 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.c | 5 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 2 + + tools/testing/selftests/bpf/Makefile | 13 +- + 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 | 49 +- + 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 + + tools/testing/selftests/bpf/gnu/stubs.h | 2 +- + .../selftests/bpf/map_tests/map_percpu_stats.c | 447 ++++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +- + .../selftests/bpf/prog_tests/cgroup_tcp_skb.c | 402 ++++ + .../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/global_map_resize.c | 14 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 78 +- + .../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 + + .../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 | 2239 ++++++++++++++++++++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 2 +- + .../selftests/bpf/prog_tests/tracing_struct.c | 19 + + .../selftests/bpf/prog_tests/trampoline_count.c | 4 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + 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 + + tools/testing/selftests/bpf/progs/htab_mem_bench.c | 105 + + 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_global_map_resize.c | 8 +- + .../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 + + tools/testing/selftests/bpf/progs/tracing_struct.c | 54 + + .../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/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/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/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 | 3 + + tools/testing/selftests/net/forwarding/lib.sh | 18 + + .../selftests/net/forwarding/router_bridge.sh | 50 + + .../forwarding/router_bridge_pvid_vlan_upper.sh | 155 ++ + .../selftests/net/forwarding/router_bridge_vlan.sh | 100 +- + .../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 | 308 +-- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 66 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 20 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 4 + + tools/testing/selftests/net/mptcp/userspace_pm.sh | 181 +- + tools/testing/selftests/net/psock_lib.h | 4 +- + tools/testing/selftests/net/rtnetlink.sh | 83 + + .../selftests/net/test_bridge_backup_port.sh | 759 +++++++ + tools/testing/selftests/tc-testing/Makefile | 2 +- + 481 files changed, 28440 insertions(+), 5222 deletions(-) + create mode 100644 Documentation/bpf/standardization/index.rst + rename Documentation/bpf/{ => standardization}/instruction-set.rst (99%) + rename Documentation/bpf/{ => standardization}/linux-notes.rst (96%) + create mode 100644 Documentation/devicetree/bindings/net/brcm,asp-v2.0.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 + 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/mellanox/mlxsw/spectrum_port_range.c + create mode 100644 drivers/net/netdevsim/macsec.c + create mode 100644 drivers/net/phy/marvell-88q2xxx.c + create mode 100644 include/linux/bpf_mprog.h + create mode 100644 include/net/tcx.h + create mode 100644 kernel/bpf/mprog.c + create mode 100644 kernel/bpf/tcx.c + 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 100644 tools/testing/selftests/bpf/map_tests/map_percpu_stats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.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/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/htab_mem_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/map_percpu_stats.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/verifier_typedef.c + 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 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_pvid_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 +Merging bpf-next/for-next (63e2da3b7f7f bpf: work around -Wuninitialized warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + include/net/inet6_hashtables.h | 79 +++++++- + include/net/inet_hashtables.h | 74 +++++++- + include/net/sock.h | 7 +- + include/uapi/linux/bpf.h | 3 - + kernel/bpf/memalloc.c | 12 +- + net/core/filter.c | 4 +- + net/ipv4/inet_hashtables.c | 68 ++++--- + net/ipv4/udp.c | 88 ++++----- + net/ipv6/inet6_hashtables.c | 71 +++++--- + net/ipv6/udp.c | 96 ++++------ + tools/include/uapi/linux/bpf.h | 3 - + tools/testing/selftests/bpf/network_helpers.c | 3 + + .../selftests/bpf/prog_tests/assign_reuse.c | 199 +++++++++++++++++++++ + .../selftests/bpf/progs/test_assign_reuse.c | 142 +++++++++++++++ + tools/testing/selftests/bpf/xskxceiver.c | 2 +- + 16 files changed, 669 insertions(+), 186 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/assign_reuse.c + create mode 100644 tools/testing/selftests/bpf/progs/test_assign_reuse.c +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 (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (2303fae13064 net: skbuff: remove unused HAVE_HW_TIME_STAMP feature define) +$ 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 (b8e39b38487e netlink: Make use of __assign_bit() API) +$ 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 (f57f797eebfe bluetooth: Explicitly include correct DT includes) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btusb.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_core.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/sco.c +Resolved 'net/bluetooth/hci_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 32f96ef8cf21] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btbcm.c | 5 + + drivers/bluetooth/btintel.c | 124 ++++++++++ + drivers/bluetooth/btintel.h | 2 + + drivers/bluetooth/btmtk.c | 133 ++++++++++ + drivers/bluetooth/btmtk.h | 42 ++++ + drivers/bluetooth/btmtkuart.c | 1 - + drivers/bluetooth/btrtl.c | 163 ++++++++++--- + drivers/bluetooth/btrtl.h | 13 + + drivers/bluetooth/btusb.c | 291 +++++++++++++++++----- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 3 +- + drivers/bluetooth/hci_qca.c | 150 ++++++++---- + include/net/bluetooth/bluetooth.h | 11 +- + include/net/bluetooth/hci.h | 11 + + include/net/bluetooth/hci_core.h | 73 +++++- + include/net/bluetooth/hci_sync.h | 2 +- + include/net/bluetooth/mgmt.h | 2 + + include/net/bluetooth/sco.h | 2 - + net/bluetooth/af_bluetooth.c | 53 +++- + net/bluetooth/bnep/sock.c | 10 +- + net/bluetooth/hci_conn.c | 501 ++++++++++++++++++-------------------- + net/bluetooth/hci_core.c | 16 +- + net/bluetooth/hci_debugfs.c | 3 +- + net/bluetooth/hci_event.c | 159 ++++++++---- + net/bluetooth/hci_sock.c | 77 +++++- + net/bluetooth/hci_sync.c | 186 ++++++++++---- + net/bluetooth/hidp/sock.c | 10 +- + net/bluetooth/iso.c | 114 +++++---- + 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 +-- + 33 files changed, 1971 insertions(+), 703 deletions(-) +Merging wireless-next/for-next (b2090d93d4b6 wifi: brcmsmac: remove unused data type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Merge made by the 'ort' strategy. + .../net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h | 8 -------- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 1 + + drivers/net/wireless/marvell/mwifiex/main.c | 11 +++-------- + drivers/net/wireless/marvell/mwifiex/tdls.c | 9 ++++++--- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 ++ + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 2 ++ + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 2 ++ + drivers/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/debug.c | 8 +++++--- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + 19 files changed, 36 insertions(+), 78 deletions(-) +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 (de2a5d52f2c0 dt-bindings: mtd: Add SEAMA partition bindings) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/partitions/seama.yaml | 44 +++++++++++ + drivers/mtd/devices/docg3.c | 8 +- + 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-core.c | 3 +- + drivers/mtd/maps/plat-ram.c | 3 +- + drivers/mtd/mtdcore.c | 88 ++++++++++++---------- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdpart.c | 14 ++-- + include/linux/mtd/mtd.h | 2 +- + 12 files changed, 114 insertions(+), 83 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/seama.yaml +Merging nand/nand/next (c3519aed2a3f dt-bindings: nand: meson: support for 512B ECC step size) +$ 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/raw/meson_nand.c +Auto-merging drivers/mtd/nand/spi/toshiba.c +Merge made by the 'ort' strategy. + .../bindings/mtd/amlogic,meson-nand.yaml | 2 +- + .../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/brcmnand.c | 119 ++- + 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 | 26 +- + 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 | 891 ++++++++++++--------- + 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/spi/esmt.c | 9 + + drivers/mtd/nand/spi/gigadevice.c | 20 + + drivers/mtd/nand/spi/toshiba.c | 33 + + include/linux/mtd/rawnand.h | 1 + + 27 files changed, 724 insertions(+), 710 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 +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 (dd105461ad15 hwrng: arm-smccc-trng - don't set drvdata) +$ 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 +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/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/asymmetric_keys/verify_pefile.c | 2 +- + crypto/lrw.c | 6 +- + crypto/sig.c | 5 - + crypto/xts.c | 6 +- + drivers/char/hw_random/Kconfig | 5 +- + drivers/char/hw_random/arm_smccc_trng.c | 2 - + drivers/char/hw_random/ba431-rng.c | 10 +- + drivers/char/hw_random/exynos-trng.c | 8 +- + drivers/char/hw_random/imx-rngc.c | 24 +- + drivers/char/hw_random/ingenic-trng.c | 57 +- + drivers/char/hw_random/nomadik-rng.c | 19 +- + drivers/char/hw_random/pic32-rng.c | 71 +- + drivers/char/hw_random/timeriomem-rng.c | 25 +- + drivers/crypto/atmel-aes.c | 15 +- + drivers/crypto/atmel-sha.c | 15 +- + drivers/crypto/atmel-tdes.c | 14 +- + 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 +- + .../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 +- + 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/jh7110-cryp.c | 6 +- + drivers/crypto/stm32/Kconfig | 2 + + drivers/crypto/stm32/stm32-hash.c | 720 ++++++++++--- + include/linux/hisi_acc_qm.h | 2 +- + include/linux/psp-platform-access.h | 4 + + include/uapi/linux/psp-dbc.h | 147 +++ + 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 +++++ + 84 files changed, 5665 insertions(+), 431 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-qat + 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 include/uapi/linux/psp-dbc.h + 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 (6c7f27441d6a Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/heaps/system_heap.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.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/nouveau/dispnv50/disp.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/ep93xx-fb.c +Auto-merging drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +Merge made by the 'ort' strategy. + .../bindings/display/panel/visionox,r66451.yaml | 59 ++ + .../bindings/display/solomon,ssd1307fb.yaml | 28 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 18 +- + Documentation/gpu/drm-mm.rst | 12 + + Documentation/gpu/todo.rst | 22 +- + 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 +- + drivers/accel/ivpu/Makefile | 4 +- + drivers/accel/ivpu/ivpu_debugfs.c | 294 ++++++ + drivers/accel/ivpu/ivpu_debugfs.h | 13 + + drivers/accel/ivpu/ivpu_drv.c | 16 +- + drivers/accel/ivpu/ivpu_drv.h | 1 + + drivers/accel/ivpu/ivpu_fw.c | 68 +- + 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_hw.h | 1 + + drivers/accel/ivpu/ivpu_hw_mtl.c | 19 +- + drivers/accel/ivpu/ivpu_job.c | 4 +- + drivers/accel/ivpu/ivpu_mmu.c | 14 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 330 +++++-- + 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_drv.c | 1 - + 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 | 9 + + drivers/gpu/drm/Makefile | 3 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 299 +++--- + 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_drv.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 49 +- + drivers/gpu/drm/arm/Kconfig | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 5 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 5 +- + drivers/gpu/drm/arm/malidp_drv.c | 5 +- + drivers/gpu/drm/armada/armada_drv.c | 2 - + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 6 +- + drivers/gpu/drm/ast/ast_dp501.c | 6 +- + drivers/gpu/drm/ast/ast_drv.h | 94 +- + drivers/gpu/drm/ast/ast_main.c | 333 ++++--- + drivers/gpu/drm/ast/ast_mm.c | 2 - + drivers/gpu/drm/ast/ast_mode.c | 35 +- + drivers/gpu/drm/ast/ast_post.c | 74 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 77 +- + .../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/lontium-lt9611uxc.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 79 -- + drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- + drivers/gpu/drm/bridge/sii902x.c | 40 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 35 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 28 +- + drivers/gpu/drm/bridge/tc358762.c | 63 +- + drivers/gpu/drm/bridge/tc358764.c | 14 +- + drivers/gpu/drm/bridge/tc358767.c | 25 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 43 + + drivers/gpu/drm/display/drm_hdcp_helper.c | 4 +- + drivers/gpu/drm/drm_atomic_uapi.c | 58 +- + drivers/gpu/drm/drm_bridge_connector.c | 2 +- + drivers/gpu/drm/drm_connector.c | 8 +- + drivers/gpu/drm/drm_edid.c | 3 +- + drivers/gpu/drm/drm_exec.c | 333 +++++++ + drivers/gpu/drm/drm_fbdev_dma.c | 6 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 226 ++--- + drivers/gpu/drm/drm_ioctl.c | 3 +- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_prime.c | 83 +- + drivers/gpu/drm/drm_sysfs.c | 23 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.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 | 5 +- + 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/gem/i915_gem_dmabuf.c | 2 - + drivers/gpu/drm/i915/i915_driver.c | 2 - + drivers/gpu/drm/ingenic/Kconfig | 2 + + drivers/gpu/drm/lima/lima_drv.c | 8 +- + drivers/gpu/drm/lima/lima_gem.c | 8 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 6 +- + 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 | 591 +++++++++++ + drivers/gpu/drm/loongson/lsdc_ttm.h | 99 ++ + drivers/gpu/drm/mcde/mcde_drv.c | 6 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 - + drivers/gpu/drm/meson/meson_drv.c | 6 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 3 - + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_gem.c | 8 + + drivers/gpu/drm/msm/msm_gem_prime.c | 15 - + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 9 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 29 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + 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/nouveau_connector.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 - + drivers/gpu/drm/nouveau/nouveau_encoder.h | 3 +- + drivers/gpu/drm/nouveau/nvif/mmu.c | 3 + + 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/ramga102.c | 40 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c | 3 +- + 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 | 8 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 - + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 1 + + drivers/gpu/drm/panel/panel-lvds.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 3 +- + 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 | 6 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 390 ++++++++ + drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 19 +- + drivers/gpu/drm/pl111/pl111_drv.c | 3 - + drivers/gpu/drm/qxl/qxl_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_drv.c | 3 - + drivers/gpu/drm/renesas/rcar-du/rcar_cmm.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 9 +- + 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 | 6 +- + drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c | 6 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 6 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 6 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +- + 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 | 124 ++- + drivers/gpu/drm/solomon/ssd130x.h | 6 + + drivers/gpu/drm/sti/sti_compositor.c | 5 +- + drivers/gpu/drm/sti/sti_drv.c | 6 +- + 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 | 6 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 6 +- + 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 | 6 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +- + drivers/gpu/drm/tegra/drm.c | 2 - + drivers/gpu/drm/tegra/gem.c | 2 - + drivers/gpu/drm/tests/Makefile | 3 +- + drivers/gpu/drm/tests/drm_exec_test.c | 159 +++ + drivers/gpu/drm/tests/drm_framebuffer_test.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 57 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 2 + + drivers/gpu/drm/tidss/tidss_drv.c | 7 +- + 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/tilcdc/tilcdc_panel.c | 6 +- + drivers/gpu/drm/tiny/ofdrm.c | 6 +- + drivers/gpu/drm/tiny/simpledrm.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/tve200/tve200_drv.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 5 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 5 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 6 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- + drivers/gpu/drm/vc4/vc4_txp.c | 5 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 5 +- + drivers/gpu/drm/vc4/vc4_vec.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 - + drivers/gpu/drm/virtio/virtgpu_submit.c | 30 +- + drivers/gpu/drm/vkms/vkms_composer.c | 10 +- + drivers/gpu/drm/vkms/vkms_drv.h | 4 +- + 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 | 3 - + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 6 +- + .../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/staging/fbtft/Kconfig | 1 + + drivers/staging/sm750fb/sm750.c | 1 - + drivers/staging/sm750fb/sm750_accel.c | 1 - + drivers/staging/sm750fb/sm750_cursor.c | 1 - + drivers/staging/sm750fb/sm750_hw.c | 1 - + drivers/video/backlight/bd6107.c | 2 +- + drivers/video/backlight/gpio_backlight.c | 6 +- + drivers/video/backlight/lv5207lp.c | 2 +- + drivers/video/fbdev/Kconfig | 44 +- + drivers/video/fbdev/aty/aty128fb.c | 12 +- + drivers/video/fbdev/aty/atyfb_base.c | 18 +- + drivers/video/fbdev/aty/radeon_backlight.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 3 +- + drivers/video/fbdev/broadsheetfb.c | 80 +- + drivers/video/fbdev/core/Makefile | 7 +- + drivers/video/fbdev/core/fb_backlight.c | 33 + + drivers/video/fbdev/core/fb_chrdev.c | 485 +++++++++ + drivers/video/fbdev/core/fb_info.c | 78 ++ + drivers/video/fbdev/core/fb_internal.h | 67 ++ + drivers/video/fbdev/core/fb_procfs.c | 62 ++ + drivers/video/fbdev/core/fbcon.c | 1 + + drivers/video/fbdev/core/fbmem.c | 592 +---------- + drivers/video/fbdev/core/fbsysfs.c | 138 +-- + drivers/video/fbdev/ep93xx-fb.c | 21 +- + drivers/video/fbdev/fsl-diu-fb.c | 26 +- + drivers/video/fbdev/hecubafb.c | 78 +- + drivers/video/fbdev/hyperv_fb.c | 1 + + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 9 +- + drivers/video/fbdev/metronomefb.c | 76 +- + drivers/video/fbdev/nvidia/nv_backlight.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 8 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 2 +- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 10 +- + drivers/video/fbdev/sh7760fb.c | 50 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 9 +- + drivers/video/fbdev/smscufx.c | 4 +- + drivers/video/fbdev/ssd1307fb.c | 69 +- + drivers/video/fbdev/tdfxfb.c | 4 +- + drivers/video/fbdev/xen-fbfront.c | 61 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drm_drv.h | 26 +- + include/drm/drm_exec.h | 123 +++ + 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_prime.h | 7 - + include/drm/drm_sysfs.h | 4 +- + include/linux/efi.h | 3 +- + include/linux/fb.h | 6 +- + 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_mode.h | 4 +- + 370 files changed, 11492 insertions(+), 3333 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml + 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 + create mode 100644 drivers/gpu/drm/drm_exec.c + 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 + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.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/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 +Merging drm-misc/for-linux-next (45b58669e532 drm/ssd130x: Allocate buffer in the plane's .atomic_check() callback) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +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/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 +Merge made by the 'ort' strategy. + Documentation/gpu/drm-mm.rst | 36 + + arch/sh/boards/mach-sh7763rdp/setup.c | 2 +- + arch/x86/Makefile | 2 +- + arch/x86/video/Makefile | 2 +- + drivers/Kconfig | 2 - + drivers/auxdisplay/cfag12864bfb.c | 1 - + drivers/auxdisplay/ht16k33.c | 1 - + drivers/gpu/drm/Kconfig | 9 +- + drivers/gpu/drm/Makefile | 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 | 55 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 11 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 3 + + drivers/gpu/drm/arm/malidp_drv.c | 1 + + drivers/gpu/drm/ast/ast_main.c | 21 - + 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/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 | 1 - + drivers/gpu/drm/bridge/chipone-icn6211.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/lvds-codec.c | 1 - + drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/bridge/samsung-dsim.c | 3 +- + drivers/gpu/drm/bridge/simple-bridge.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 6 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 40 + + drivers/gpu/drm/drm_drv.c | 8 +- + drivers/gpu/drm/drm_fbdev_dma.c | 5 +- + drivers/gpu/drm/drm_fbdev_generic.c | 1 - + drivers/gpu/drm/drm_gem.c | 3 + + drivers/gpu/drm/drm_gpuva_mgr.c | 1725 ++++++++++++++++++++ + drivers/gpu/drm/drm_internal.h | 2 + + drivers/gpu/drm/drm_ioctl.c | 2 + + drivers/gpu/drm/drm_managed.c | 2 +- + drivers/gpu/drm/drm_mipi_dsi.c | 1 + + drivers/gpu/drm/drm_syncobj.c | 148 +- + 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_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_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/gma500/fbdev.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 5 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 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 | 3 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 2 +- + drivers/gpu/drm/mcde/mcde_drv.c | 2 +- + 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 | 3 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 2 +- + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +- + drivers/gpu/drm/meson/meson_drv.h | 1 - + drivers/gpu/drm/meson/meson_dw_hdmi.c | 3 +- + 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/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_mdss.c | 2 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 1 - + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 12 +- + 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 | 7 +- + drivers/gpu/drm/panel/Kconfig | 1 + + 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-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 | 2 +- + 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 | 2 +- + .../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 | 1 - + 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-simple.c | 4 - + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +- + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 1 - + drivers/gpu/drm/panel/panel-truly-nt35597.c | 2 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 1 + + drivers/gpu/drm/radeon/radeon_fbdev.c | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 1 - + drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c | 1 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 3 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 + + drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 - + drivers/gpu/drm/solomon/ssd130x.c | 175 +- + 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_drv.c | 2 + + drivers/gpu/drm/stm/drv.c | 3 +- + drivers/gpu/drm/stm/ltdc.c | 1 - + drivers/gpu/drm/sun4i/sun4i_frontend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_frontend.h | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tegra/dc.c | 3 +- + drivers/gpu/drm/tegra/dpaux.c | 2 +- + drivers/gpu/drm/tegra/fbdev.c | 7 +- + drivers/gpu/drm/tegra/gr2d.c | 3 +- + drivers/gpu/drm/tegra/gr3d.c | 2 +- + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/nvdec.c | 2 - + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tegra/vic.c | 2 - + drivers/gpu/drm/tidss/tidss_dispc.c | 2 - + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 3 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 3 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/vc4/vc4_vec.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front.c | 1 - + drivers/gpu/host1x/bus.c | 29 +- + drivers/gpu/host1x/context.c | 2 +- + drivers/gpu/host1x/dev.c | 3 +- + drivers/gpu/ipu-v3/ipu-common.c | 2 +- + drivers/hid/hid-picolcd_fb.c | 1 - + drivers/media/pci/ivtv/ivtvfb.c | 1 - + drivers/media/test-drivers/vivid/vivid-osd.c | 1 - + drivers/of/device.c | 1 + + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/sm750fb/sm750.c | 1 - + drivers/video/Kconfig | 2 + + drivers/video/backlight/backlight.c | 6 +- + drivers/video/console/Kconfig | 2 +- + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/Kconfig | 197 +-- + drivers/video/fbdev/acornfb.c | 2 +- + drivers/video/fbdev/amba-clcd.c | 1 - + drivers/video/fbdev/amifb.c | 5 +- + drivers/video/fbdev/arcfb.c | 1 - + drivers/video/fbdev/asiliantfb.c | 1 - + drivers/video/fbdev/atafb.c | 1 - + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 1 - + drivers/video/fbdev/aty/atyfb_base.c | 3 +- + drivers/video/fbdev/aty/radeon_base.c | 3 +- + drivers/video/fbdev/broadsheetfb.c | 2 +- + drivers/video/fbdev/bw2.c | 1 - + drivers/video/fbdev/carminefb.c | 1 - + drivers/video/fbdev/cg14.c | 2 +- + drivers/video/fbdev/cg3.c | 1 - + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/chipsfb.c | 1 - + 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 | 10 +- + drivers/video/fbdev/core/fb_info.c | 3 +- + drivers/video/fbdev/cyber2000fb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 1 - + drivers/video/fbdev/efifb.c | 1 - + drivers/video/fbdev/ep93xx-fb.c | 1 - + drivers/video/fbdev/ffb.c | 3 +- + drivers/video/fbdev/fm2fb.c | 1 - + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/g364fb.c | 2 +- + drivers/video/fbdev/gbefb.c | 1 - + drivers/video/fbdev/geode/gx1fb_core.c | 1 - + drivers/video/fbdev/geode/gxfb_core.c | 1 - + drivers/video/fbdev/geode/lxfb_core.c | 1 - + drivers/video/fbdev/goldfishfb.c | 1 - + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/gxt4500.c | 3 +- + drivers/video/fbdev/hecubafb.c | 2 +- + drivers/video/fbdev/hgafb.c | 2 +- + drivers/video/fbdev/hitfb.c | 2 +- + drivers/video/fbdev/hpfb.c | 1 - + drivers/video/fbdev/hyperv_fb.c | 2 - + drivers/video/fbdev/i740fb.c | 2 +- + drivers/video/fbdev/i810/i810_main.c | 4 +- + drivers/video/fbdev/imsttfb.c | 3 +- + drivers/video/fbdev/imxfb.c | 3 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 5 +- + drivers/video/fbdev/kyro/fbdev.c | 1 - + drivers/video/fbdev/leo.c | 1 - + drivers/video/fbdev/macfb.c | 1 - + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 5 +- + drivers/video/fbdev/maxinefb.c | 1 - + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 2 +- + drivers/video/fbdev/mx3fb.c | 1 - + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 4 +- + drivers/video/fbdev/offb.c | 2 +- + drivers/video/fbdev/omap/omapfb_main.c | 1 - + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 - + drivers/video/fbdev/p9100.c | 1 - + drivers/video/fbdev/platinumfb.c | 1 - + drivers/video/fbdev/pm2fb.c | 3 +- + drivers/video/fbdev/pm3fb.c | 3 +- + drivers/video/fbdev/pmag-aa-fb.c | 1 - + drivers/video/fbdev/pmag-ba-fb.c | 1 - + drivers/video/fbdev/pmagb-b-fb.c | 1 - + drivers/video/fbdev/ps3fb.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/pxa168fb.c | 2 +- + drivers/video/fbdev/pxafb.c | 2 - + drivers/video/fbdev/q40fb.c | 1 - + drivers/video/fbdev/riva/fbdev.c | 3 +- + drivers/video/fbdev/s1d13xxxfb.c | 4 +- + drivers/video/fbdev/s3c-fb.c | 1 - + drivers/video/fbdev/sa1100fb.c | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 3 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 - + drivers/video/fbdev/simplefb.c | 1 - + drivers/video/fbdev/sis/sis_main.c | 5 +- + drivers/video/fbdev/skeletonfb.c | 2 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 1 - + drivers/video/fbdev/smscufx.c | 2 +- + drivers/video/fbdev/sstfb.c | 1 - + drivers/video/fbdev/sunxvr1000.c | 1 - + drivers/video/fbdev/sunxvr2500.c | 1 - + drivers/video/fbdev/sunxvr500.c | 1 - + drivers/video/fbdev/tcx.c | 1 - + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 2 +- + drivers/video/fbdev/uvesafb.c | 3 +- + drivers/video/fbdev/valkyriefb.c | 1 - + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/vesafb.c | 2 +- + 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 | 2 +- + drivers/video/fbdev/xilinxfb.c | 1 - + include/drm/drm_debugfs.h | 25 + + include/drm/drm_drv.h | 6 + + include/drm/drm_file.h | 8 +- + include/drm/drm_gem.h | 79 + + include/drm/drm_gpuva_mgr.h | 706 ++++++++ + include/drm/drm_syncobj.h | 6 +- + include/linux/fb.h | 32 +- + include/uapi/drm/drm.h | 23 + + samples/vfio-mdev/mdpy-fb.c | 1 - + 325 files changed, 3642 insertions(+), 910 deletions(-) + create mode 100644 drivers/gpu/drm/drm_gpuva_mgr.c + create mode 100644 drivers/video/fbdev/core/Kconfig + create mode 100644 include/drm/drm_gpuva_mgr.h +Merging amdgpu/drm-next (b5ac08806c07 drm/amdgpu: Restore HQD persistent state register) +$ 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.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.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_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/atom.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/atom.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 +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.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/radeon/radeon_atombios.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/atom.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.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 864ea0779c64] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/flashing.rst | 33 ++ + Documentation/gpu/amdgpu/index.rst | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 50 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 8 +- + .../gpu/drm/amd/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 | 3 +- + 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_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 196 +------ + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 183 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + 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 | 34 +- + 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 | 2 + + 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 | 164 +++--- + 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_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 | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 + + 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 | 36 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 121 +++-- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 9 +- + 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 | 38 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 33 +- + 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 | 6 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +- + 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 | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 36 +- + 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 | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 15 +- + 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 | 17 +- + .../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 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 3 + + .../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 | 52 +- + 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_dccg.c | 5 +- + 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 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109 +++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + + drivers/gpu/drm/radeon/atom.c | 18 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 8 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 18 +- + drivers/gpu/drm/radeon/radeon_drv.c | 51 +- + drivers/gpu/drm/radeon/radeon_drv.h | 13 + + drivers/gpu/drm/radeon/radeon_encoders.c | 22 +- + drivers/gpu/drm/radeon/radeon_gart.c | 37 +- + drivers/gpu/drm/radeon/radeon_kms.c | 10 +- + 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/sislands_smc.h | 51 +- + 203 files changed, 3590 insertions(+), 2087 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/flashing.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.h + 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 +Merging drm-intel/for-linux-next (4948738e296c drm/i915/hotplug: Reduce SHPD_FILTER to 250us) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr_regs.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c +Resolved 'drivers/gpu/drm/i915/display/intel_display_power_well.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/selftests/mock_gem_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a9eecdd359b9] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/rfc/i915_scheduler.rst | 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 | 134 +++++++------ + 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 | 12 +- + 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 | 106 +++++++++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 28 ++- + drivers/gpu/drm/i915/display/intel_display.c | 104 ++--------- + 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 | 187 +++++++++++++----- + .../gpu/drm/i915/display/intel_display_device.h | 6 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 47 +++-- + 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 | 13 +- + 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_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_fbdev.c | 4 +- + 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 | 72 +++++-- + 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_psr.c | 196 +++++++++++++++---- + 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 | 20 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 208 ++++++++++++++------- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 23 --- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 8 +- + drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 2 + + drivers/gpu/drm/i915/i915_drv.h | 11 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 + + drivers/gpu/drm/i915/i915_gpu_error.h | 3 + + drivers/gpu/drm/i915/i915_irq.c | 20 +- + drivers/gpu/drm/i915/i915_pci.c | 64 +++---- + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/i915_vma.c | 6 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 11 ++ + drivers/gpu/drm/i915/intel_device_info.c | 48 ++--- + drivers/gpu/drm/i915/intel_device_info.h | 11 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 2 +- + drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +- + 71 files changed, 1228 insertions(+), 710 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 (cd036d542afb drm/msm/a6xx: Add A610 speedbin support) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (1275b21a6c54 drm/msm/dsi: Enable BURST_MODE for command mode for DSI 6G v1.3+) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/msm/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 +Merge made by the 'ort' strategy. + .../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/qcom,sc7180-dpu.yaml | 14 + + .../bindings/display/msm/qcom,sm6125-mdss.yaml | 217 +++++++++ + .../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 | 327 +++++++++----- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 348 ++++++++++----- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 411 +++++++++++------ + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 448 +++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 230 ++++++++++ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 430 ++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 184 +++++--- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 88 ++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 188 +++++--- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 88 ++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 95 ++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 418 ++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 244 +++++++---- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 484 +++++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 445 +++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 467 ++++++++++++++------ + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 44 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 229 +++------- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 5 - + 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 | 82 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 34 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + 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_mdss.c | 8 + + 42 files changed, 4008 insertions(+), 1678 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 +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 (6995e2de6891 Linux 6.4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (ffb57ee9c0e2 regmap: Fix the type used for a bitmap pointer) +$ 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 (a32e0834df76 Merge tag 'asoc-v6.6-early' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/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 | 105 ++- + 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/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/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 | 16 +- + sound/drivers/serial-generic.c | 2 +- + sound/hda/hdac_i915.c | 7 +- + sound/hda/intel-dsp-config.c | 142 ++- + 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 | 290 ++++-- + sound/pci/hda/cs35l56_hda.c | 995 +++++++++++++++++++++ + 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 | 373 +++----- + sound/pci/hda/hda_tegra.c | 3 +- + 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 +- + tools/testing/kunit/configs/all_tests.config | 5 + + tools/testing/selftests/alsa/pcm-test.c | 8 +- + 289 files changed, 6912 insertions(+), 2937 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/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 (588b870db68f 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 +Merge made by the 'ort' strategy. + Documentation/core-api/kernel-api.rst | 1 - + sound/soc/codecs/Kconfig | 6 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cs42l51-i2c.c | 2 +- + sound/soc/codecs/es8326.c | 316 ++++++++++--- + sound/soc/codecs/es8326.h | 23 +- + sound/soc/codecs/rt1017-sdca-sdw.c | 824 ++++++++++++++++++++++++++++++++++ + sound/soc/codecs/rt1017-sdca-sdw.h | 188 ++++++++ + sound/soc/codecs/rt1316-sdw.c | 12 + + sound/soc/fsl/fsl_qmc_audio.c | 28 +- + sound/soc/intel/avs/topology.c | 6 +- + sound/soc/loongson/loongson_card.c | 2 +- + sound/soc/soc-dai.c | 11 + + 13 files changed, 1321 insertions(+), 100 deletions(-) + create mode 100644 sound/soc/codecs/rt1017-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt1017-sdca-sdw.h +Merging modules/modules-next (4b49df654cd0 samples/hw_breakpoint: mark sample_hbp as static) +$ 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. + include/linux/module_symbol.h | 4 +--- + kernel/params.c | 2 +- + samples/hw_breakpoint/data_breakpoint.c | 6 ++++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging input/next (92e24e0e57f7 Input: psmouse - add delay when deactivating for SMBus mode) +$ 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/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/sun4i-lradc-keys.c | 6 +- + 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/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 +- + 73 files changed, 4508 insertions(+), 787 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs7211.yaml + create mode 100644 drivers/input/touchscreen/iqs7211.c +Merging block/for-next (2d834f87d3e9 Merge branch 'for-6.6/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/blk-mq.c +Auto-merging include/linux/blk-mq.h +Auto-merging include/linux/fs.h +Auto-merging io_uring/io_uring.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 19 ++ + block/bio-integrity.c | 10 +- + block/bio.c | 124 ++++----- + block/blk-flush.c | 26 +- + block/blk-mq.c | 28 ++- + block/blk-settings.c | 7 +- + block/blk-sysfs.c | 21 +- + block/blk.h | 5 +- + drivers/block/nbd.c | 1 + + drivers/scsi/scsi_lib.c | 12 +- + fs/iomap/direct-io.c | 161 +++++++++--- + include/linux/blk-mq.h | 6 +- + include/linux/blkdev.h | 1 + + include/linux/fs.h | 35 ++- + include/linux/io_uring.h | 6 + + include/linux/io_uring_types.h | 5 + + include/trace/events/kyber.h | 8 +- + include/trace/events/wbt.h | 8 +- + include/uapi/linux/futex.h | 17 +- + include/uapi/linux/io_uring.h | 22 +- + io_uring/Makefile | 4 +- + io_uring/cancel.c | 86 +++++-- + io_uring/cancel.h | 7 +- + io_uring/futex.c | 376 ++++++++++++++++++++++++++++ + io_uring/futex.h | 36 +++ + io_uring/io_uring.c | 39 +++ + io_uring/opdef.c | 44 +++- + io_uring/poll.c | 17 +- + io_uring/rw.c | 27 +- + io_uring/timeout.c | 16 +- + io_uring/uring_cmd.c | 28 +++ + io_uring/waitid.c | 313 +++++++++++++++++++++++ + io_uring/waitid.h | 15 ++ + kernel/exit.c | 132 +++++----- + kernel/exit.h | 30 +++ + kernel/futex/futex.h | 90 ++++++- + kernel/futex/requeue.c | 3 +- + kernel/futex/syscalls.c | 41 +-- + kernel/futex/waitwake.c | 55 ++-- + net/socket.c | 2 + + 40 files changed, 1545 insertions(+), 338 deletions(-) + create mode 100644 io_uring/futex.c + create mode 100644 io_uring/futex.h + create mode 100644 io_uring/waitid.c + create mode 100644 io_uring/waitid.h + create mode 100644 kernel/exit.h +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 +Merge made by the 'ort' strategy. + drivers/md/dm-cache-policy-smq.c | 28 ++++++++++++++++++---------- + drivers/md/dm-integrity.c | 1 + + drivers/md/dm-raid.c | 20 +++++++++----------- + drivers/md/md.c | 2 ++ + 4 files changed, 30 insertions(+), 21 deletions(-) +Merging libata/for-next (5cff2dbd980d ata: pata_imx: Use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + 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 | 2 -- + drivers/ata/ahci_seattle.c | 4 +--- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 5 ++--- + drivers/ata/ahci_xgene.c | 9 +++------ + drivers/ata/libahci_platform.c | 1 + + drivers/ata/pata_ftide010.c | 9 ++------- + drivers/ata/pata_imx.c | 3 +-- + drivers/ata/pata_ixp4xx_cf.c | 24 +++++++++--------------- + drivers/ata/pata_mpc52xx.c | 3 ++- + drivers/ata/sata_dwc_460ex.c | 3 +-- + drivers/ata/sata_fsl.c | 6 +++--- + drivers/ata/sata_gemini.c | 3 +-- + drivers/ata/sata_highbank.c | 2 +- + drivers/ata/sata_rcar.c | 11 +++-------- + 20 files changed, 36 insertions(+), 62 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 (e8e2c7b0e695 mmc: davinci: Make SDIO irq truly optional) +$ 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. + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 ------ + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/meson-gx-mmc.c | 3 -- + drivers/mmc/host/mmci.c | 39 ++++++++++++++++++----- + drivers/mmc/host/mxcmmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 5 +-- + drivers/mmc/host/pxamci.c | 5 ++- + drivers/mmc/host/renesas_sdhi_core.c | 22 +++++++------ + drivers/mmc/host/sunplus-mmc.c | 16 +++++++--- + 9 files changed, 61 insertions(+), 44 deletions(-) +Merging mfd/for-mfd-next (b90e33b6116a mfd: wm8998: Update to use maple tree register cache) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/stmpe-keypad.txt | 41 --- + .../bindings/input/touchscreen/stmpe.txt | 108 -------- + .../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/qcom,spmi-pmic.yaml | 4 +- + .../devicetree/bindings/mfd/st,stmpe.yaml | 297 +++++++++++++++++++++ + Documentation/devicetree/bindings/mfd/stmpe.txt | 42 --- + drivers/mfd/Kconfig | 4 +- + drivers/mfd/atmel-hlcdc.c | 4 +- + drivers/mfd/axp20x.c | 12 +- + 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/exynos-lpass.c | 4 +- + drivers/mfd/hi655x-pmic.c | 3 +- + drivers/mfd/ipaq-micro.c | 5 +- + drivers/mfd/omap-usb-host.c | 4 +- + drivers/mfd/omap-usb-tll.c | 4 +- + drivers/mfd/rz-mtu3.c | 1 + + drivers/mfd/stm32-timers.c | 3 +- + drivers/mfd/ti_am335x_tscadc.c | 3 +- + drivers/mfd/wm5102-tables.c | 2 +- + drivers/mfd/wm5110-tables.c | 2 +- + drivers/mfd/wm8994-regmap.c | 6 +- + drivers/mfd/wm8997-tables.c | 2 +- + drivers/mfd/wm8998-tables.c | 2 +- + include/linux/mfd/hi655x-pmic.h | 1 - + 35 files changed, 358 insertions(+), 263 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 +Merging backlight/for-backlight-next (a33677b9211b backlight: led_bl: Take led_access lock when required) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (af73fd32b4f2 power: reset: oxnas-restart: remove obsolete restart driver) +$ 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/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 ++ + 43 files changed, 111 insertions(+), 311 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 (d9c0ee81cba8 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 +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 +- + .../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 + + .../regulator/richtek,rtq6752-regulator.yaml | 1 + + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- + .../devicetree/bindings/regulator/wlf,arizona.yaml | 2 + + drivers/regulator/Kconfig | 22 + + drivers/regulator/Makefile | 2 + + drivers/regulator/act8945a-regulator.c | 2 +- + drivers/regulator/atc260x-regulator.c | 7 +- + drivers/regulator/axp20x-regulator.c | 1 - + drivers/regulator/bd718x7-regulator.c | 22 +- + drivers/regulator/cpcap-regulator.c | 2 +- + drivers/regulator/da9062-regulator.c | 11 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 1 - + drivers/regulator/helpers.c | 15 +- + drivers/regulator/ltc3589.c | 1 - + drivers/regulator/max77541-regulator.c | 6 +- + drivers/regulator/max77650-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 1 - + drivers/regulator/max77857-regulator.c | 459 +++++++++++++++++++++ + drivers/regulator/max8893.c | 4 +- + drivers/regulator/mp5416.c | 2 +- + drivers/regulator/mp886x.c | 2 +- + drivers/regulator/mpq7920.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/pwm-regulator.c | 2 +- + drivers/regulator/qcom-refgen-regulator.c | 154 +++++++ + drivers/regulator/qcom-rpmh-regulator.c | 39 +- + drivers/regulator/qcom_smd-regulator.c | 1 - + drivers/regulator/qcom_usb_vbus-regulator.c | 1 - + drivers/regulator/raa215300.c | 18 +- + drivers/regulator/rk808-regulator.c | 3 +- + drivers/regulator/rohm-regulator.c | 2 +- + drivers/regulator/rt5739.c | 36 +- + drivers/regulator/rt5759-regulator.c | 2 +- + 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 | 2 +- + drivers/regulator/tps6287x-regulator.c | 6 +- + drivers/regulator/tps65218-regulator.c | 2 +- + drivers/regulator/tps65219-regulator.c | 2 +- + 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/vctrl-regulator.c | 2 +- + drivers/regulator/vexpress-regulator.c | 3 +- + include/linux/regulator/driver.h | 11 +- + 66 files changed, 1005 insertions(+), 161 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/adi,max77857.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,sdm845-refgen-regulator.yaml + create mode 100644 drivers/regulator/max77857-regulator.c + create mode 100644 drivers/regulator/qcom-refgen-regulator.c +Merging security/next (faf302f5a213 security: Fix ret values doc for security_inode_init_security()) +$ 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 security/security.c +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + include/linux/cred.h | 1 - + include/linux/evm.h | 14 ++++--- + include/linux/lsm_hook_defs.h | 6 +-- + include/linux/lsm_hooks.h | 20 ++++++++++ + security/integrity/evm/evm.h | 4 +- + security/integrity/evm/evm_crypto.c | 11 +++++- + security/integrity/evm/evm_main.c | 39 ++++++++++++++---- + security/security.c | 79 ++++++++++++++++++++++++------------- + security/selinux/hooks.c | 17 ++++---- + security/smack/smack.h | 2 +- + security/smack/smack_lsm.c | 68 ++++++++++++++++++------------- + 11 files changed, 177 insertions(+), 84 deletions(-) +Merging apparmor/apparmor-next (afad53575a93 apparmor: use passed in gfp flags in aa_alloc_null()) +$ 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 +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 +++ + security/apparmor/domain.c | 2 +- + security/apparmor/include/net.h | 1 - + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 4 ++-- + security/apparmor/task.c | 5 +---- + 6 files changed, 8 insertions(+), 9 deletions(-) +Merging integrity/next-integrity (95526d13038c ima: Fix build warnings) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging 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 (3876043ad9f7 selinux: fix a 0/NULL mistmatch in ad_net_init_from_iif()) +$ 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 | 144 +++++++++++++---------- + security/selinux/include/avc.h | 2 +- + security/selinux/include/avc_ss.h | 2 +- + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/include/objsec.h | 4 +- + security/selinux/include/policycap.h | 1 + + security/selinux/include/policycap_names.h | 3 +- + security/selinux/include/security.h | 45 +++---- + security/selinux/netif.c | 4 +- + security/selinux/selinuxfs.c | 7 +- + security/selinux/ss/avtab.c | 40 +------ + security/selinux/ss/avtab.h | 5 +- + 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 | 2 +- + security/selinux/ss/hashtab.h | 2 +- + security/selinux/ss/mls.c | 2 +- + security/selinux/ss/mls.h | 2 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 43 +++++-- + security/selinux/ss/policydb.h | 9 +- + security/selinux/ss/services.c | 17 ++- + security/selinux/ss/services.h | 2 +- + 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 +- + 34 files changed, 220 insertions(+), 194 deletions(-) +Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (a959dbd98d1a tomoyo: add format attributes to functions) +$ 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 | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging tpmdd/next (8447ac1ca47b tpm: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/st33zp24/i2c.c | 2 +- + drivers/char/tpm/tpm_i2c_atmel.c | 2 +- + drivers/char/tpm/tpm_i2c_infineon.c | 2 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +- + drivers/char/tpm/tpm_tis_i2c.c | 2 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 2 +- + security/keys/keyctl.c | 11 ++++++++--- + 7 files changed, 14 insertions(+), 9 deletions(-) +Merging watchdog/master (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (a5003e75a171 Merge branches 'iommu/fixes', 'arm/rockchip', '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 drivers/iommu/amd/iommu_v2.c +Merge made by the 'ort' strategy. + drivers/acpi/scan.c | 2 +- + drivers/iommu/amd/amd_iommu.h | 4 + + drivers/iommu/amd/amd_iommu_types.h | 14 +- + drivers/iommu/amd/init.c | 131 +++++++--- + drivers/iommu/amd/iommu.c | 86 ++++--- + drivers/iommu/amd/iommu_v2.c | 7 +- + drivers/iommu/dma-iommu.c | 26 +- + drivers/iommu/dma-iommu.h | 8 + + drivers/iommu/intel/iommu.c | 7 - + drivers/iommu/iommu-sysfs.c | 8 - + drivers/iommu/iommu.c | 464 +++++++++++++++++++----------------- + drivers/iommu/of_iommu.c | 2 +- + drivers/iommu/rockchip-iommu.c | 50 +--- + include/linux/iommu.h | 2 + + 14 files changed, 447 insertions(+), 364 deletions(-) +Merging audit/next (bf98354280bf audit: correct audit_filter_inodes() definition) +$ 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 +- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging devicetree/for-next (ac63227d0a4d dt-bindings: usb: samsung-hsotg: remove bindings already part of dwc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + .../devicetree/bindings/reset/altr,rst-mgr.yaml | 12 +++++-- + .../devicetree/bindings/usb/samsung-hsotg.txt | 38 ---------------------- + include/linux/of.h | 7 ++-- + 4 files changed, 14 insertions(+), 44 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 +++++++++++++++++ + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 + + arch/arm64/boot/dts/lg/lg1313.dtsi | 2 + + arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 2 + + 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 ++++++++++++++++++++ + 10 files changed, 649 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 (6a88e25213b6 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 +Merge made by the 'ort' strategy. + .../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-fsl-lpspi.yaml | 3 + + .../devicetree/bindings/spi/spi-pl022.yaml | 1 + + drivers/spi/spi-amd.c | 2 +- + drivers/spi/spi-amlogic-spifc-a1.c | 86 ++++---- + drivers/spi/spi-ar934x.c | 3 +- + drivers/spi/spi-armada-3700.c | 3 +- + drivers/spi/spi-at91-usart.c | 3 +- + drivers/spi/spi-ath79.c | 2 +- + drivers/spi/spi-atmel.c | 10 +- + drivers/spi/spi-bcm2835.c | 6 +- + drivers/spi/spi-bcm2835aux.c | 4 +- + drivers/spi/spi-bitbang-txrx.h | 16 +- + drivers/spi/spi-bitbang.c | 8 +- + drivers/spi/spi-cadence-quadspi.c | 1 - + drivers/spi/spi-cadence-xspi.c | 1 - + drivers/spi/spi-cadence.c | 2 - + drivers/spi/spi-cavium-thunderx.c | 2 +- + drivers/spi/spi-coldfire-qspi.c | 11 +- + drivers/spi/spi-davinci.c | 16 +- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-ep93xx.c | 13 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 10 +- + drivers/spi/spi-fsl-lib.c | 3 +- + drivers/spi/spi-fsl-lib.h | 3 - + drivers/spi/spi-fsl-lpspi.c | 39 ++-- + drivers/spi/spi-fsl-qspi.c | 1 - + drivers/spi/spi-gpio.c | 11 +- + drivers/spi/spi-gxp.c | 1 - + drivers/spi/spi-imx.c | 14 +- + drivers/spi/spi-ingenic.c | 2 +- + drivers/spi/spi-lantiq-ssc.c | 3 +- + drivers/spi/spi-loopback-test.c | 2 +- + drivers/spi/spi-lp8841-rtc.c | 11 +- + drivers/spi/spi-meson-spicc.c | 3 +- + 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 | 2 +- + drivers/spi/spi-nxp-fspi.c | 7 +- + drivers/spi/spi-omap-uwire.c | 2 +- + 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-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 | 10 +- + drivers/spi/spi-sc18is602.c | 1 - + 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 | 15 +- + 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-zynqmp-gqspi.c | 4 +- + drivers/spi/spi.c | 219 +++++++++------------ + include/linux/spi/spi.h | 173 ++++++++-------- + include/trace/events/spi.h | 2 +- + 83 files changed, 732 insertions(+), 639 deletions(-) + 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 +Merging tip/master (3f3422d644e1 Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + Documentation/admin-guide/hw-vuln/spectre.rst | 11 +- + arch/loongarch/include/asm/local.h | 4 +- + arch/mips/include/asm/local.h | 4 +- + arch/x86/entry/entry_64.S | 16 +- + arch/x86/events/amd/ibs.c | 30 +- + arch/x86/events/core.c | 10 +- + arch/x86/events/intel/cstate.c | 10 +- + arch/x86/events/msr.c | 8 +- + arch/x86/include/asm/local.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 11 +- + arch/x86/kernel/cpu/bugs.c | 15 +- + arch/x86/kernel/cpu/mce/amd.c | 4 +- + arch/x86/kernel/cpu/mce/core.c | 9 +- + arch/x86/kernel/cpu/mce/intel.c | 19 +- + arch/x86/kernel/cpu/mce/internal.h | 1 + + arch/x86/kernel/smpboot.c | 11 +- + include/linux/cgroup-defs.h | 2 + + include/linux/rbtree_augmented.h | 26 + + include/linux/sched.h | 21 +- + include/linux/sched/task.h | 38 +- + kernel/cgroup/cgroup.c | 34 + + kernel/events/core.c | 18 +- + kernel/events/ring_buffer.c | 5 +- + kernel/fork.c | 8 + + kernel/locking/rtmutex.c | 172 ++-- + kernel/locking/rtmutex_api.c | 2 +- + kernel/locking/rtmutex_common.h | 47 +- + kernel/locking/ww_mutex.h | 12 +- + kernel/sched/core.c | 59 ++ + kernel/sched/debug.c | 49 +- + kernel/sched/fair.c | 1267 +++++++++++++------------ + kernel/sched/features.h | 23 +- + kernel/sched/psi.c | 2 +- + kernel/sched/sched.h | 20 +- + kernel/sched/topology.c | 12 +- + kernel/softirq.c | 2 +- + 36 files changed, 1174 insertions(+), 812 deletions(-) +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 (c545f5e41225 EDAC/i10nm: Skip the absent memory controllers) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/i10nm_base.c | 54 ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 49 insertions(+), 5 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 (61c692f56fec Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (606c1a58664f rcu: Eliminate check_cpu_stall() duplicate code) +$ 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 kernel/rcu/rcu.h +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 ++- + arch/x86/kernel/tsc.c | 2 +- + fs/proc/cmdline.c | 25 ++ + include/linux/init.h | 16 +- + 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 | 7 +- + init/main.c | 11 +- + kernel/locking/locktorture.c | 12 +- + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcuscale.c | 83 ++++- + kernel/rcu/rcutorture.c | 7 +- + kernel/rcu/refscale.c | 37 +- + kernel/rcu/tasks.h | 120 ++++++- + kernel/rcu/tree.c | 16 +- + kernel/rcu/tree_nocb.h | 4 +- + kernel/rcu/tree_stall.h | 56 ++- + kernel/scftorture.c | 12 +- + kernel/smp.c | 13 +- + kernel/time/clocksource.c | 8 +- + kernel/torture.c | 44 ++- + scripts/checkpatch.pl | 24 ++ + .../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/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 ------ + 87 files changed, 729 insertions(+), 1818 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 (0c189708bfbf Merge tag 'kvm-s390-master-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (192df2aa0113 KVM: arm64: Fix misuse of KVM_ARM_VCPU_POWER_OFF bit index) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (db54dfc9f71c s390/uv: Update query for secret-UVCs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-riscv/riscv_kvm_next (07f225b58424 RISC-V: KVM: Remove unneeded semicolon) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (58f6259b7a08 xen/evtchn: Introduce new IOCTL to bind static evtchn) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + drivers/xen/events/events_base.c | 16 +++++----------- + drivers/xen/evtchn.c | 35 ++++++++++++++++++++++++++--------- + drivers/xen/xenbus/xenbus_probe.c | 3 +++ + include/uapi/xen/evtchn.h | 9 +++++++++ + include/xen/events.h | 11 ++++++++++- + 5 files changed, 53 insertions(+), 21 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (2ef92cb3bc82 Merge branch 'for-6.5-fixes' 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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +++ + include/linux/workqueue.h | 44 ++------------- + kernel/workqueue.c | 71 ++++++++++++++++++++++--- + lib/Kconfig.debug | 2 +- + 4 files changed, 75 insertions(+), 49 deletions(-) +Merging drivers-x86/for-next (9204fc5071bf platform/x86: hp-bioscfg: MAINTAINERS) +$ 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 +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 101 +- + MAINTAINERS | 6 + + 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 | 1055 ++++++++++++++++++++ + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 487 +++++++++ + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 447 +++++++++ + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 409 ++++++++ + .../x86/hp/hp-bioscfg/order-list-attributes.c | 436 ++++++++ + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 543 ++++++++++ + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 386 +++++++ + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 390 ++++++++ + .../x86/hp/hp-bioscfg/surestart-attributes.c | 132 +++ + 15 files changed, 4730 insertions(+), 2 deletions(-) + 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 +Merging chrome-platform/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/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 (7a2b85a76b05 leds: simatic-ipc-leds-gpio: Fix comment style in SPDX header) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 12 ++++++++++++ + Documentation/devicetree/bindings/leds/rohm,bd2606mvv.yaml | 4 ++-- + drivers/leds/led-class.c | 4 ++++ + drivers/leds/leds-aw200xx.c | 4 ++-- + drivers/leds/leds-ip30.c | 8 +------- + drivers/leds/leds-pwm.c | 2 +- + drivers/leds/simple/Kconfig | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio.h | 2 +- + 8 files changed, 24 insertions(+), 13 deletions(-) +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 (6eaae1980760 Linux 6.5-rc3) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (a85ff0db48c3 usb: gadget: midi2: More flexible MIDI 1.0 configuration) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/cdns3/cdns3-gadget.c +Auto-merging drivers/usb/gadget/udc/tegra-xudc.c +Auto-merging drivers/usb/host/ohci-at91.c +Auto-merging drivers/usb/host/xhci-tegra.c +Auto-merging drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c +Merge made by the 'ort' strategy. + .../ABI/testing/configfs-usb-gadget-midi2 | 54 + + .../devicetree/bindings/phy/realtek,usb2phy.yaml | 175 ++ + .../devicetree/bindings/phy/realtek,usb3phy.yaml | 107 + + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 12 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 36 +- + Documentation/driver-api/usb/usb.rst | 6 + + Documentation/usb/gadget-testing.rst | 154 ++ + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/realtek/Kconfig | 25 + + drivers/phy/realtek/Makefile | 3 + + drivers/phy/realtek/phy-rtk-usb2.c | 1329 +++++++++ + drivers/phy/realtek/phy-rtk-usb3.c | 766 ++++++ + 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 | 18 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 14 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 3 +- + drivers/usb/chipidea/udc.c | 10 + + drivers/usb/chipidea/usbmisc_imx.c | 18 +- + drivers/usb/common/common.c | 1 + + drivers/usb/core/file.c | 68 +- + drivers/usb/core/hub.c | 23 + + drivers/usb/core/message.c | 1 + + drivers/usb/core/of.c | 1 - + drivers/usb/core/usb.c | 7 + + drivers/usb/core/usb.h | 1 + + drivers/usb/dwc2/gadget.c | 1 - + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/dwc3-am62.c | 94 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 1 + + drivers/usb/dwc3/dwc3-keystone.c | 1 + + drivers/usb/gadget/Kconfig | 18 + + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_midi2.c | 2883 ++++++++++++++++++++ + drivers/usb/gadget/function/u_midi2.h | 81 + + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 + + drivers/usb/gadget/udc/fsl_udc_core.c | 1 - + drivers/usb/gadget/udc/gr_udc.c | 5 +- + drivers/usb/gadget/udc/max3420_udc.c | 4 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/gadget/udc/renesas_usbf.c | 5 +- + drivers/usb/gadget/udc/tegra-xudc.c | 1 - + drivers/usb/gadget/udc/udc-xilinx.c | 6 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ehci-orion.c | 2 - + drivers/usb/host/fhci-hcd.c | 3 +- + drivers/usb/host/fsl-mph-dr-of.c | 3 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-da8xx.c | 1 + + drivers/usb/host/ohci-ppc-of.c | 3 +- + drivers/usb/host/xhci-plat.c | 1 - + drivers/usb/host/xhci-rcar.c | 1 - + drivers/usb/host/xhci-tegra.c | 2 +- + drivers/usb/misc/onboard_usb_hub.c | 1 + + drivers/usb/misc/onboard_usb_hub.h | 1 + + drivers/usb/misc/usb251xb.c | 2 +- + drivers/usb/mtu3/mtu3.h | 1 + + drivers/usb/mtu3/mtu3_host.c | 1 + + drivers/usb/musb/jz4740.c | 2 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/musb/mpfs.c | 1 + + drivers/usb/musb/musb_dsps.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/ucsi/ucsi_glink.c | 1 - + include/linux/usb/phy.h | 13 + + 87 files changed, 5921 insertions(+), 222 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-midi2 + create mode 100644 Documentation/devicetree/bindings/phy/realtek,usb2phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/realtek,usb3phy.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 + create mode 100644 drivers/usb/gadget/function/f_midi2.c + create mode 100644 drivers/usb/gadget/function/u_midi2.h +Merging thunderbolt/next (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (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 (9b4e18f032db serial: st-asc: Use devm_platform_get_and_ioremap_resource()) +$ 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/powerpc/xmon/xmon.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/sifive.c +Auto-merging drivers/tty/serial/ucc_uart.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/tty/tty_io.c +Auto-merging kernel/rcu/tree_stall.h +Merge made by the 'ort' strategy. + .../bindings/serial/amlogic,meson-uart.yaml | 2 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 6 +- + arch/alpha/kernel/setup.c | 2 +- + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 4 +- + arch/loongarch/kernel/sysrq.c | 2 +- + arch/mips/kernel/sysrq.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/sparc/kernel/process_64.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/tty/hvc/hvc_opal.c | 2 +- + drivers/tty/n_tty.c | 48 +++-- + 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 | 204 +++++++++++++++------ + drivers/tty/serial/8250/8250_omap.c | 1 - + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/8250/8250_pxa.c | 1 + + drivers/tty/serial/altera_jtaguart.c | 2 +- + 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 +- + 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/lantiq.c | 3 +- + drivers/tty/serial/liteuart.c | 3 +- + drivers/tty/serial/ma35d1_serial.c | 2 +- + drivers/tty/serial/max3100.c | 3 +- + drivers/tty/serial/max310x.c | 3 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/meson_uart.c | 145 +++++++++------ + 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 | 10 +- + drivers/tty/serial/rp2.c | 4 +- + drivers/tty/serial/sa1100.c | 3 +- + drivers/tty/serial/samsung_tty.c | 3 +- + drivers/tty/serial/sb1250-duart.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 3 +- + drivers/tty/serial/sccnxp.c | 7 +- + drivers/tty/serial/serial-tegra.c | 23 +-- + drivers/tty/serial/serial_core.c | 15 +- + drivers/tty/serial/serial_txx9.c | 3 +- + drivers/tty/serial/sh-sci.c | 1 - + drivers/tty/serial/sifive.c | 9 +- + drivers/tty/serial/sprd_serial.c | 8 +- + drivers/tty/serial/st-asc.c | 5 +- + 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 | 3 +- + drivers/tty/serial/vt8500_serial.c | 8 +- + drivers/tty/serial/zs.c | 3 +- + drivers/tty/sysrq.c | 84 +++++---- + drivers/tty/tty_io.c | 4 +- + include/linux/serial_core.h | 18 +- + include/linux/sysrq.h | 18 +- + kernel/debug/debug_core.c | 2 +- + kernel/power/poweroff.c | 2 +- + kernel/rcu/tree_stall.h | 2 +- + 81 files changed, 521 insertions(+), 410 deletions(-) +Merging char-misc/char-misc-next (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (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 02afc66804e2] 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 (04e8429c5b4f coresight: Fix all W=1 build warnings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/acpi/acpi_amba.c | 1 - + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- + 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 +- + include/linux/coresight.h | 59 +++++++++++ + 8 files changed, 168 insertions(+), 30 deletions(-) +Merging fastrpc/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/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (3969f6458f78 fpga: add configuration for the FPGA KUnit test suites.) +$ 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/fpga-bridge.c | 23 +-- + drivers/fpga/fpga-region.c | 14 +- + 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 +- + 23 files changed, 789 insertions(+), 62 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/bcm-voter.c | 5 ++ + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/icc-rpmh.c | 2 +- + drivers/interconnect/qcom/icc-rpmh.h | 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 | 4 +- + 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 | 13 +++- + drivers/interconnect/qcom/sm8550.c | 21 +++++- + drivers/interconnect/qcom/smd-rpm.c | 2 - + include/dt-bindings/interconnect/qcom,sm8250.h | 7 ++ + 34 files changed, 183 insertions(+), 41 deletions(-) +Merging iio/togreg (3a06b2845a09 iio: adc: meson: support reading from channel 7 mux inputs) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/adc/ad7192.c +Auto-merging drivers/iio/adc/meson_saradc.c +Merge made by the 'ort' strategy. + .../iio/adc/allwinner,sun20i-d1-gpadc.yaml | 91 +++ + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 15 +- + .../bindings/iio/proximity/semtech,sx9310.yaml | 5 +- + .../bindings/iio/proximity/semtech,sx9324.yaml | 5 +- + drivers/iio/accel/da280.c | 11 +- + drivers/iio/adc/Kconfig | 12 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7192.c | 29 +- + drivers/iio/adc/meson_saradc.c | 173 +++-- + drivers/iio/adc/qcom-spmi-adc5.c | 2 + + drivers/iio/adc/stm32-adc-core.c | 3 +- + drivers/iio/adc/sun20i-gpadc-iio.c | 276 ++++++++ + drivers/iio/adc/ti-lmp92064.c | 53 ++ + 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/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-trigger.c | 2 +- + drivers/iio/light/vcnl4000.c | 710 +++++++++++++++++++-- + 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/iio/common/inv_sensors_timestamp.h | 95 +++ + 39 files changed, 1781 insertions(+), 578 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml + 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%) + delete mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_timestamp.h + create mode 100644 include/linux/iio/common/inv_sensors_timestamp.h +Merging phy-next/next (e7379477f447 phy: starfive: StarFive PHYs should depend on ARCH_STARFIVE) +$ 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/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-bcm63xx-usbh.c | 1 + + 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/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 | 11 +- + 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 +- + 113 files changed, 4435 insertions(+), 2864 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 (3f92da3ea448 soundwire: Explicitly include correct DT includes) +$ 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/qcom.c +Merge made by the 'ort' strategy. + drivers/soundwire/qcom.c | 1 - + 1 file changed, 1 deletion(-) +Merging extcon/extcon-next (a635f91c71d9 dt-bindings: extcon: siliconmitus,sm5502-muic: document connector) +$ 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 ++++ + include/linux/extcon.h | 12 ------------ + 3 files changed, 5 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 (094671300fea docs: vfio: Add vfio device cdev description) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +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 | 137 ++++++------- + 31 files changed, 1670 insertions(+), 343 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 (6eaae1980760 Linux 6.5-rc3) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (ba8d5d2b9f39 counter: Declare counter_priv() to be const) +$ 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. + drivers/counter/microchip-tcb-capture.c | 1 - + include/linux/counter.h | 2 +- + 2 files changed, 1 insertion(+), 2 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 (1b13e52c0c76 dmaengine: xilinx: dma: remove arch dependency) +$ 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 +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +- + .../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 | 2 +- + drivers/dma/idxd/device.c | 2 - + drivers/dma/idxd/sysfs.c | 2 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 1 - + drivers/dma/qcom/gpi.c | 3 +- + drivers/dma/qcom/hidma.c | 12 +-- + drivers/dma/qcom/hidma_mgmt.c | 5 +- + drivers/dma/sh/rz-dmac.c | 17 ++-- + drivers/dma/sh/shdmac.c | 7 +- + drivers/dma/stm32-dma.c | 3 +- + 14 files changed, 150 insertions(+), 122 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.yaml +Merging cgroup/for-next (a3fdeeb3f1c1 cgroup: fix obsolete comment above cgroup_create()) +$ 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 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 9f4baa5cd5fe] 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 +- + MAINTAINERS | 2 + + include/linux/misc_cgroup.h | 28 +-- + include/uapi/linux/cgroupstats.h | 2 - + kernel/cgroup/cgroup.c | 73 +++--- + kernel/cgroup/cpuset.c | 262 +++++++++++++-------- + kernel/cgroup/misc.c | 55 +++-- + 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 +- + 14 files changed, 526 insertions(+), 188 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 f7ea9d06363e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git + Date: Thu Jul 27 12:06:04 2023 +1000 +Merging scsi/for-next (d82cd15be581 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 247 --- + Documentation/scsi/scsi_mid_low_api.rst | 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 | 16 +- + 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/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/qlogicpti.c | 2 +- + drivers/scsi/sun_esp.c | 3 +- + drivers/target/iscsi/iscsi_target_configfs.c | 2 - + 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-mcq.c | 17 +- + drivers/ufs/core/ufs-sysfs.c | 22 - + drivers/ufs/core/ufshcd.c | 80 +- + drivers/ufs/core/ufshpb.c | 2668 -------------------------- + drivers/ufs/core/ufshpb.h | 318 --- + drivers/ufs/host/ti-j721e-ufs.c | 2 + + drivers/ufs/host/ufs-mediatek.c | 174 +- + drivers/ufs/host/ufs-mediatek.h | 33 + + drivers/ufs/host/ufs-qcom.c | 30 +- + drivers/ufs/host/ufs-qcom.h | 1 - + drivers/ufs/host/ufs-renesas.c | 2 +- + include/target/iscsi/iscsi_target_core.h | 4 - + include/ufs/ufs.h | 47 +- + include/ufs/ufs_quirks.h | 6 - + include/ufs/ufshcd.h | 33 +- + 49 files changed, 765 insertions(+), 3759 deletions(-) + delete mode 100644 drivers/ufs/core/ufshpb.c + delete mode 100644 drivers/ufs/core/ufshpb.h +Merging scsi-mkp/for-next (a615e93d6cfe scsi: iscsi: Remove unused extern declaration iscsi_lookup_iface()) +$ 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/ufs/core/ufshcd.c +Auto-merging include/ufs/ufs.h +Merge made by the 'ort' strategy. + drivers/infiniband/ulp/srp/ib_srp.c | 4 -- + drivers/scsi/be2iscsi/be_iscsi.c | 4 ++ + drivers/scsi/qla4xxx/ql4_os.c | 15 +++++++ + drivers/scsi/scsi_transport_iscsi.c | 80 +++++++++++++++++++++++-------------- + drivers/ufs/core/ufshcd.c | 12 +++++- + drivers/ufs/host/ufs-qcom.c | 1 - + include/scsi/scsi_transport_iscsi.h | 1 - + include/ufs/ufs.h | 6 +++ + 8 files changed, 86 insertions(+), 37 deletions(-) +Merging vhost/linux-next (373abdba01d4 vdpa_sim: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/vhost/vdpa.c +Resolved 'drivers/net/virtio_net.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f405a0b52862] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/virtio_net.c | 163 +++++++++++-- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 8 + + drivers/vhost/vdpa.c | 15 +- + drivers/virtio/virtio_ring.c | 491 ++++++++++++++++++++++++++++++++++----- + include/linux/vdpa.h | 4 + + include/linux/virtio.h | 34 +++ + include/uapi/linux/vhost_types.h | 4 + + 7 files changed, 641 insertions(+), 78 deletions(-) +Merging rpmsg/for-next (b666efef756a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../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 | 15 ++- + 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 ++ + 43 files changed, 433 insertions(+), 184 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 (6b4c76ded358 gpio: sifive: Allow building the driver as a module) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 4 + + drivers/gpio/Kconfig | 4 +- + drivers/gpio/gpio-ath79.c | 3 +- + drivers/gpio/gpio-bcm-kona.c | 24 +-- + drivers/gpio/gpio-brcmstb.c | 4 +- + drivers/gpio/gpio-creg-snps.c | 2 +- + drivers/gpio/gpio-eic-sprd.c | 2 +- + drivers/gpio/gpio-ge.c | 2 +- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-hlwd.c | 2 +- + drivers/gpio/gpio-logicvc.c | 1 - + 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 | 70 +++++++- + drivers/gpio/gpio-mxs.c | 1 - + drivers/gpio/gpio-omap.c | 1 - + drivers/gpio/gpio-palmas.c | 1 - + drivers/gpio/gpio-pisosr.c | 28 ++- + drivers/gpio/gpio-pmic-eic-sprd.c | 2 +- + drivers/gpio/gpio-pxa.c | 1 - + drivers/gpio/gpio-rcar.c | 1 - + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-sifive.c | 52 +++--- + drivers/gpio/gpio-sim.c | 2 +- + drivers/gpio/gpio-sprd.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 3 +- + drivers/gpio/gpio-syscon.c | 1 - + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-tegra186.c | 2 +- + drivers/gpio/gpio-tps6586x.c | 2 +- + drivers/gpio/gpio-tps65910.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-wcd934x.c | 3 +- + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-xra1403.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 2 +- + drivers/gpio/gpiolib-of.c | 6 +- + drivers/gpio/gpiolib.c | 188 +++++++++++---------- + drivers/gpio/gpiolib.h | 12 +- + 45 files changed, 263 insertions(+), 204 deletions(-) +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 (173b67f16e13 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 +Merge made by the 'ort' strategy. + .../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 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 6 + + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 2 +- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 5 - + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 5 +- + drivers/pinctrl/berlin/pinctrl-as370.c | 3 +- + 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.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-axp209.c | 1 - + drivers/pinctrl/pinctrl-cy8c95x0.c | 15 + + drivers/pinctrl/pinctrl-k210.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 4 +- + 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 | 3 +- + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/pxa/pinctrl-pxa25x.c | 1 - + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 1 - + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 9 +- + 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 | 3 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 3 +- + 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 | 3 +- + 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 ++ + 129 files changed, 1351 insertions(+), 176 deletions(-) + create mode 100644 drivers/pinctrl/meson/pinctrl-amlogic-c3.c + create mode 100644 include/dt-bindings/gpio/amlogic-c3-gpio.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 +Auto-merging drivers/pinctrl/renesas/pinctrl-rzg2l.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rzv2m.c +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 32 +++++--------------------------- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 32 +++++--------------------------- + 2 files changed, 10 insertions(+), 54 deletions(-) +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 (a2f68c7e312f pwm: atmel: Enable clk when pwm already enabled in bootloader) +$ 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 +Merge made by the 'ort' strategy. + drivers/pwm/core.c | 29 +++++++++--------- + drivers/pwm/pwm-apple.c | 1 + + drivers/pwm/pwm-atmel-hlcdc.c | 66 +++++++++++++++++++++------------------- + drivers/pwm/pwm-atmel-tcb.c | 3 +- + drivers/pwm/pwm-atmel.c | 48 +++++++++++++++++++++++++++-- + 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 | 1 + + 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-pxa.c | 1 + + drivers/pwm/pwm-rockchip.c | 4 +-- + drivers/pwm/pwm-sifive.c | 5 +-- + drivers/pwm/pwm-sl28cpld.c | 14 ++++++--- + drivers/pwm/pwm-sprd.c | 1 + + 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 ++-- + 33 files changed, 145 insertions(+), 98 deletions(-) +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 (7e4bf0c1d0f7 selftests:prctl: add set-process-name to .gitignore) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +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 +++++++++--------- + 14 files changed, 246 insertions(+), 238 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 (e588586675f6 kunit: Add documentation of KUnit test attributes) +$ 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 +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/test-bug.h | 2 + + include/kunit/test.h | 70 ++++- + kernel/time/time_test.c | 2 +- + lib/Kconfig.debug | 16 + + lib/kunit/Makefile | 3 +- + lib/kunit/attributes.c | 418 +++++++++++++++++++++++++ + lib/kunit/executor.c | 114 +++++-- + lib/kunit/executor_test.c | 128 +++++++- + lib/kunit/kunit-example-test.c | 9 + + lib/kunit/test.c | 27 +- + 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 +- + 36 files changed, 1654 insertions(+), 92 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 (1b733a9ebc3d rtc: Add rtc driver for the Loongson family chips) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (fd774e36fe87 nvdimm: Explicitly include correct DT includes) +$ 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 +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/pmem.c | 3 ++- + drivers/nvdimm/region_devs.c | 5 +++-- + 5 files changed, 11 insertions(+), 7 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 (7d5cb68af638 perf/benchmark: add a new benchmark for seccom_unotify) +$ 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 | 55 ++++++++ + 18 files changed, 357 insertions(+), 28 deletions(-) + create mode 100644 tools/perf/bench/sched-seccomp-notify.c +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +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 (8fd85ce6cfdf dt-bindings: nvmem: qfprom: Add compatible for MSM8226) +$ 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. + .../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/brcm_nvram.c | 3 +-- + drivers/nvmem/lpc18xx_otp.c | 4 +--- + drivers/nvmem/meson-mx-efuse.c | 4 +--- + drivers/nvmem/qfprom.c | 17 +++++--------- + drivers/nvmem/rockchip-efuse.c | 3 +-- + drivers/nvmem/stm32-romem.c | 3 +-- + drivers/nvmem/sunxi_sid.c | 4 +--- + drivers/nvmem/uniphier-efuse.c | 3 +-- + 12 files changed, 55 insertions(+), 30 deletions(-) +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (a494aef23dfc PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg) +$ 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 (d0184830e611 bus: mhi: host: use vmalloc_array and vcalloc) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/init.c | 2 +- + drivers/bus/mhi/host/pci_generic.c | 47 ++++++++++++++++++++++++++++++++++---- + drivers/bus/mhi/host/pm.c | 5 ++++ + 3 files changed, 49 insertions(+), 5 deletions(-) +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 (2e28a798c309 efi/libstub: Disable PCI DMA before grabbing the EFI memory map) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (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 +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 (341faf2b45ba rust: helpers: sort includes alphabetically in rust/helpers.c) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging rust/helpers.c +Merge made by the 'ort' strategy. + rust/helpers.c | 6 ++++-- + rust/kernel/sync/lock.rs | 6 +++--- + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging sysctl/sysctl-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +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 (94b154766896 lib: test for_each_numa_cpus()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging kernel/sched/topology.c +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 16 ++---- + include/linux/cpumask.h | 8 ++- + include/linux/find.h | 43 +++++++++++++++ + include/linux/topology.h | 45 ++++++++++------ + kernel/sched/topology.c | 49 +++++++++-------- + lib/Makefile | 6 +++ + lib/cpumask.c | 12 ++--- + lib/find_bit.c | 12 +++++ + lib/test_bitmap.c | 78 +++++++++++++++++++++++++--- + 9 files changed, 206 insertions(+), 63 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 (8453e7924a1a soc: fsl: qe: Replace all non-returning strlcpy with strscpy) +$ 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 +Merge made by the 'ort' strategy. + drivers/soc/fsl/qe/qe.c | 4 ++-- + lib/Kconfig.ubsan | 10 +++++++++- + 2 files changed, 11 insertions(+), 3 deletions(-) +Merging kspp-gustavo/for-next/kspp (6ae3f51825e3 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 +- + fs/udf/directory.c | 2 +- + 6 files changed, 14 insertions(+), 14 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 (6583c865dec5 iommufd/selftest: Add a selftest for IOMMU_HWPT_ALLOC) +$ 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 +Merge made by the 'ort' strategy. + drivers/iommu/iommu-priv.h | 10 + + drivers/iommu/iommu.c | 38 +- + drivers/iommu/iommufd/device.c | 558 ++++++++++++++++------- + drivers/iommu/iommufd/hw_pagetable.c | 112 ++++- + drivers/iommu/iommufd/io_pagetable.c | 32 +- + drivers/iommu/iommufd/iommufd_private.h | 52 ++- + drivers/iommu/iommufd/iommufd_test.h | 6 + + drivers/iommu/iommufd/main.c | 24 +- + drivers/iommu/iommufd/selftest.c | 40 ++ + include/linux/iommufd.h | 1 + + include/uapi/linux/iommufd.h | 26 ++ + tools/testing/selftests/iommu/iommufd.c | 67 ++- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 67 ++- + tools/testing/selftests/iommu/iommufd_utils.h | 63 ++- + 14 files changed, 869 insertions(+), 227 deletions(-) + create mode 100644 drivers/iommu/iommu-priv.h +Merging genpd-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ 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 genpd/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd/next +Already up to date. +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(+) +$ git am -3 ../patches/0001-fix-up-for-fs-proc-Add-proc-cmdline_load-for-boot-lo.patch +Applying: fix up for "fs/proc: Add /proc/cmdline_load for boot loader arguments" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..72c2d09a115d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230727 |