diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-06-07 14:14:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-06-07 14:14:27 +1000 |
| commit | abbd8bb42915d9ed06df11b430bf4ecb3d8ac5ad (patch) | |
| tree | 8f56a0cc49ff706ca1a538e78961a378a3ea3330 | |
| parent | d88425633b738279d966fbc6bdd6756ef9342b94 (diff) | |
| download | linux-next-20230607.tar.gz linux-next-20230607.tar.xz | |
Add linux-next specific files for 20230607next-20230607
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 365 | ||||
| -rw-r--r-- | Next/Trees | 367 | ||||
| -rw-r--r-- | Next/merge.log | 11009 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 11742 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d18ef8c0978f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,365 @@ +Name SHA1 +---- ---- +origin a4d7d701121981e3c3fe69ade376fe9f26324161 +fixes ac9a78681b921877518763ba0e89202254349d1b +mm-hotfixes d5b0611cfaf568ca85b6567d41c7fdc4c3dc447e +kbuild-current f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd +arm64-fixes 0e2aba694866b451db0932a6706683c48379134c +arm-soc-fixes 08425abbab9987ec48c78f418e61130b5dc9d22d +davinci-current ac9a78681b921877518763ba0e89202254349d1b +drivers-memory-fixes ac9a78681b921877518763ba0e89202254349d1b +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current b845b574f86dcb6a70dfa698aa87a237b0878d2a +powerpc-fixes 719dfd5925e186e09a2a6f23016936ac436f3d78 +s390-fixes 03c5c83b70dca3729a3eb488e668e5044bd9a5ea +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 42510dffd0e2c27046905f742172ed6662af5557 +bpf 69844e335d8c22454746c7903776533d8b4ab8fa +ipsec a287f5b0cfc6804c5b12a4be13c7c9fe27869e90 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs ad42a35bdfc6d3c0fc4cb4027d7b2757ce665665 +wireless f7e60032c6618dfd643c7210d5cba2789e2de2e2 +wpan bd4e3d82f4ccb422672029b099e402e5b3acd5ee +rdma-fixes 5842d1d9c1b0d17e0c29eae65ae1f245f83682dd +sound-current 08c9aa7c58e933787fa443389d540221ed9ed5cd +sound-asoc-fixes ad24919540fb4df83981d469b5253cc1aecca939 +regmap-fixes 0cc6578048e0980d254aee345130cced4912f723 +regulator-fixes 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +spi-fixes 947c70a213769f60e9d5aca2bc88b50a1cfaf5a6 +pci-current 40994ce0ea010b1843e620bacc26d29ddebfc08d +driver-core.current 9561de3a55bed6bdd44a12820ba81ec416e705a7 +tty.current 306320034e8fbe7ee1cc4f5269c55658b4612048 +usb.current 592295e61b5c51ea89fd1959932fd0f121f08c46 +usb-serial-fixes f1832e2b5e498e258b090af3b065b85cf8cc5161 +phy 2a881183dc5ab2474ef602e48fe7af34db460d95 +staging.current b3dad076a058916c443c93074dc3ee80baaff4ea +iio-fixes b410a9307bc3a7cdee3c930c98f6fc9cf1d2c484 +counter-current ac9a78681b921877518763ba0e89202254349d1b +char-misc.current 9561de3a55bed6bdd44a12820ba81ec416e705a7 +soundwire-fixes 99e09b9c0ab43346c52f2787ca4e5c4b1798362e +thunderbolt-fixes 9f9666e65359d5047089aef97ac87c50f624ecb0 +input-current feee70f4568650cf44c573488798ffc0a2faeea3 +crypto-current 6ab39f99927eed605728b02d512438d828183c97 +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes dbcf76390eb9a65d5d0c37b0cd57335218564e37 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes e14fd2af7a1d621c167dad761f729135a7a76ff4 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c4d28e30a8d0b979e4029465ab8f312ab6ce2644 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 81f3affa19d6ab0c32aef46b053838219eef7e71 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 4897a898a216058dec55e5e5902534e6e224fcdf +at91-fixes 6b0db163ff9200a55dc77a652dad1d4b0a853f63 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes f211b45057d8b0264b494f1acebf2e8d7f9432c9 +kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e +hwmon-fixes 0babf89c9cca7e074d6e59893e462e4886f481cc +nvdimm-fixes e5baf8c07707a601f978c02de958bbeb8cd6374a +cxl-fixes a70fc4ed20a6118837b0aecbbf789074935f473b +btrfs-fixes 7c902ab2c78a666d095a355fa834eb4c35fe2683 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes fb109fba728407fa4a84d659b5cb87cd8399d7b3 +samsung-krzk-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-samsung-fixes ac9a78681b921877518763ba0e89202254349d1b +devicetree-fixes 6997f847cbb72082a2e9aa0fef8ebfcc3bd4ddc5 +dt-krzk-fixes 8bbec86ce6d66fb33530c679f7bb3a123fc9e7da +scsi-fixes 6d074ce231772c66e648a61f6bd2245e7129d1f5 +drm-fixes 9561de3a55bed6bdd44a12820ba81ec416e705a7 +drm-intel-fixes 2d6f2f79e06571d41eb1223abebe9097511c9544 +mmc-fixes 0b5d5c436a5c572a45f976cfd34a6741e143e5d9 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 44c026a73be8038f03dbdeef028b642880cf1511 +hyperv-fixes ec97e112985c2581ee61854a4b74f080f6cdfc2c +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 6966d7988c4fb6af3e395868e9800c07f9e98a30 +riscv-dt-fixes ac9a78681b921877518763ba0e89202254349d1b +riscv-soc-fixes a7a041f2ddf300817ee6010f643424ef5efd2739 +fpga-fixes 44c026a73be8038f03dbdeef028b642880cf1511 +spdx 9561de3a55bed6bdd44a12820ba81ec416e705a7 +gpio-brgl-fixes 95ae9979bfe3174c2ee8d64409c44532f2881907 +gpio-intel-fixes ac9a78681b921877518763ba0e89202254349d1b +pinctrl-intel-fixes 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +erofs-fixes 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +kunit-fixes ac9a78681b921877518763ba0e89202254349d1b +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes c034203b6a9dae6751ef4371c18cb77983e30c28 +irqchip-fixes 91539341a3b6e9c868024a4292455dae36e6f58c +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 48b1320a674e1ff5de2fad8606bee38f724594dc +efi-fixes 36e4fc57fc1619f462e669e939209c45763bc8f5 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 95339f40a8b652b5b1773def31e63fc53c26378a +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +rust-fixes ac9a78681b921877518763ba0e89202254349d1b +v9fs-fixes 36896bc97c0e5fe9f52f578ac7986bf4a9cdfd71 +w1-fixes ac9a78681b921877518763ba0e89202254349d1b +drm-misc-fixes 411360257c1f4fccaa20143098b6d3fcc9d4e4dc +mm-stable 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +mm-nonmm-stable 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +mm a96b166927db5f49bd216569ec1081393102e2a0 +kbuild feb843a469fb0ab00d2d23cfb9bcc379791011bb +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf fe8e04348727f992f6fce3709639fb6d92a81137 +compiler-attributes eeac8ede17557680855031c6f305ece2378af326 +dma-mapping ec274aff21b6a94c7973384ca80a503c1bc3b173 +asm-generic 3b1ddbb62e7e7d2433781cd2f59d77c2f9aee934 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm fc6750b0d4a9942f85625aab5ae788ae9cf1030c +arm64 55f7e5a3107895ac3ed95b036c654ce0eced9025 +arm-perf 8be3593b9efa8903d2ee7bb9cdf57a8e56c66f36 +arm-soc e5047345bb6c8ee1e5d319c989dc9e3442f891c7 +amlogic 8fb90cd6a66fdfa82e4ea5eb216dca6fa5cd2862 +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed 7d4f0b0df7c5ec0cec834f87591423a7bbd1bab2 +at91 9c8457a847fafff5772c23140088958b9ebb6eb2 +broadcom 1ada87a05856fd84c8254c125335e2a2a0ad3420 +davinci ac9a78681b921877518763ba0e89202254349d1b +drivers-memory d3369a4b6f0164b8869a097547846ed4e5c9c47f +imx-mxs a5f80078e832206a8da903913fb5ada4987836a7 +mediatek 8a5cc5b87d9d833ffe7a2c65de5610da116ece03 +mvebu 64687391f64d581584034fdef080b0f007385fa3 +omap 972e3fc791a80148c472613d5bc7b60bad286fbd +qcom 8d5a57ea6a0b1722725170e32e511701ca7c454c +renesas 7762defcdaf029da668d5af3304d3d940d43199e +reset afb39e2bd36af1d80913bb6851caece829526217 +rockchip 4e4c0647490b8eb8dd6e12f80005c799cea61d18 +samsung-krzk a3119e95a0d193a0c13168ba48bd081ce11060ff +scmi 1e1dcfba96685141b19c5bbaf64ae0c52ca40ea4 +stm32 9da2bf3bcd8bbc0b700b44886a8e2a0036216748 +sunxi 1bcb932283c9664a2bc57bb74864b9ab0050981b +tee 86dfcfab4fe0c2c591bd43b038ae73ec9ce7567b +tegra b3a2be8d906b0922e5003c08e6f0cc4cfbe8d801 +ti 4e1be1fcbba1676270e0c7cdf9637b042c813ee8 +xilinx a736607599a56ad5e96b9cee894bfd6222343c49 +clk be2033a8660cf034dec905d4a7f8fcfb235663e7 +clk-imx 632c60ecd25dbacee54d5581fe3aeb834b57010a +clk-renesas 7df8eea64a417f1db6777cddc1d7eda3634b7175 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky ac9a78681b921877518763ba0e89202254349d1b +loongarch f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 +m68k 72b44f6577f15f37fe964c8dcc42a7c5736e604c +m68knommu 9561de3a55bed6bdd44a12820ba81ec416e705a7 +microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +mips c5e4d83872ae2900aa142b0505eeb2a5026173a7 +openrisc c91b4a07655d5ba67962a08dfac8bd7f45ad049c +parisc-hd fc49c9672cda27f2d42680d04264f64b8ff3b2c8 +powerpc 7d3ee229ea51a17afc1e53272e2a8f377cc82ba2 +soc-fsl 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 +risc-v 90502d51ab90032a3cd2e3268ba8f794fe85b534 +riscv-dt e2c510d6d630fe6593a0cf87531913b4b08ebeb1 +riscv-soc ac9a78681b921877518763ba0e89202254349d1b +s390 c561c922e24210a3f300ae0895692eceb3d19262 +sh bc9d1f0cecd2407cfb2364a7d4be2f52d1d46a9d +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa d0f94ebe18641ae0449993293d3943d5ad48a40d +pidfd 757777eef55b48b310603d0a1f6591f2a138691b +fscrypt d617ef039fb8eec48a3424f79327220e0b7cbff7 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 1f2e0de227654a0ecf13c79a6306fbc02c9b54b6 +ceph 870611e4877eff1e8413c3fb92a585e45d5291f6 +cifs 7d0ec2a3cdc5df6bfc7e70bf40ca38c95f240f9d +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs a050c691305bd53179a66bd47eb3abeeb07e97ba +exfat fe15c26ee26efa11741a7b632e9f23b01aca4cc6 +ext3 a811aa4333eb8bdb6cf3886e9be8251ced764dc2 +ext4 571bc93d3e2e298fccba7146ae2dc1144692a419 +f2fs 7aa6ef440cd70fa6992e651e276b965b0a035a80 +fsverity c61c38330e582e664fdb97bcb9faf9fa0e4ee175 +fuse c68ea140050e631d24d61b6e399ca8224a4a2219 +gfs2 f9da18cd4616fbc9816347b7b2be188653786058 +jfs fad376fce0af58deebc5075b8539dc05bf639af3 +ksmbd a55d20f1379e53d0bc8d6b04615a12f24b28218a +nfs 9561de3a55bed6bdd44a12820ba81ec416e705a7 +nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52 +nfsd ab83e9c0df5dbe3cf892ca7fcdcd8b5e3c6c92a4 +ntfs3 1f60ec8881023e21be22d75e5b5bdc111465700f +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh ac9a78681b921877518763ba0e89202254349d1b +xfs d4d12c02bf5f768f1b423c7ae2909c5afdfe0d5f +zonefs 7d6f61ae03547c1771261eac27417887da1d395d +iomap 3fd41721cd5c30af37c860e6201c98db0a568fd2 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs-brauner 2111b74e9d0ec1dbcfbc857f59468ad63f7a745f +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607 +pci f9dae2af6f947a299b4f32f70a936609b7914076 +pstore 48f2c681df4329b50fc92516c10e0398ca127242 +hid 462d72fec9cd7083aa8da58a6cbaa0362bc7c080 +i2c 6cd5bf0c57f61aa81e02b8b53c1001255a5f6ab2 +i3c 49b472ebc61de3d4aa7cc57539246bb39f6c5128 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 473595b01086f98e63e597b4821a965f02033129 +jc_docs a1d2c9b3029de24505c09430931966b96fe1b678 +v4l-dvb a23a3041c733e068bed5ece88acb45fe0edf0413 +v4l-dvb-next aafeeaf3d2a8a91a5407c774c578abec79dcff00 +pm e8195eaff86fd2ddb5f00646b5f76e40cd1164a8 +cpufreq-arm 3b062a086984d35a3c6d3a1c7841d0aa73aa76af +cpupower 25891bc945f715d2a796fc60d0000d0aaf9582a1 +devfreq a83bfdca8b2098999e3edfb87e98925e019eb818 +opp b2a2ab039bd58f51355e33d7d3fc64605d7f870d +thermal 2afa82d1fc648c8d4c2ef9e876626abb1089f9ab +dlm 57e2c2f2d94cfd551af91cedfa1af6d972487197 +rdma 8c1ee346da583718fb0a7791a1f84bdafb103caf +net-next 2dc476404efa8546a08561877e88bfb2006facab +bpf-next aa7881fcfe9d328484265d589bc2785533e33c4d +ipsec-next b2cbac9b9b28730e9e53be20b6cdf979d3b9f27e +mlx5-next 77f7eb9f3416aace703971156133926e44e2195b +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 4f325e26277b6a1381235008ca6fa97e6cc8f43b +bluetooth 817efd3cad7481ce2ee25fac5108afecbad56228 +wireless-next 7d528eafc5290bed18551a22ff25ce8587b603e0 +wpan-next 1af3de62f03f651c5e50c0e00f8fed34d07b9df3 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd a2c2690f0d747c973c6a384ab8cd88faa806e5a5 +nand ef1560b670bd28ca3230c7f5ad29c6a211fb1adb +spi-nor df6def86b9dcbc3e8ed4964c7b79b70c9b0c3040 +crypto 134e0dc6b73ab7e99464182356a8b3fa4ea3b499 +drm 2e1492835e439fceba57a5b0f9b17da8e78ffa3d +drm-misc 013413cdfeec53e06c43a239fb4e06a39ffedce3 +amdgpu 6bd4b01e8938779b0d959bdf33949a9aa258a363 +drm-intel 718551bbed3ca5308a9f9429305dd074727e8d46 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm ac7e7c9c65ecfb1fcc99de91cfd6b17a8d4cb9c1 +drm-msm-lumag 125c32ef4cac9b5133a6927b8552b7e7c971389d +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a +regmap 469859394c49c7223f65fef77f46775722e17690 +sound 306f3f78a5ff578bdfd97c658a862cb2c2419fb6 +ieee1394 06f45435d985d60d7d2fe2424fbb9909d177a63d +sound-asoc 615770258020bfbbc8ea775704f6d0e0b8a14779 +modules 4f521bab5bfc854ec0dab7ef560dfa75247e615d +input 8c9cce9cb81b5fdc6e66bf3f129727b89e8daab7 +block 35bbd38f8a13c0879b0f972b224b30a081b61901 +device-mapper 38d11da522aacaa05898c734a1cec86f1e611129 +libata 371b74c8ba8fa588ab9ba10d0504acf495b3490e +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc aee09fd999345541cc3a10e17e8272dc538f2b3a +mfd 84009765adb3a3c70c60c839828a1f3df69cb94e +backlight 29554f2e9138d60012d0e0d53e6792f5f4da1fb6 +battery fe20b1dcd2de47cdc983a47f4fb7a781e0b6c39c +regulator 416cc57da2408e2f55ee8953e83aa01759030b68 +security 55382134366e641e97cd83264c22c60c7dc10ccd +apparmor c96a8a8c021b7b8ee3832e4012cc609bcd5f5633 +integrity 95526d13038c2bbddd567a4d8e39fac42484e182 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 447a5688005e5b789633bd080016517a08f9fd8d +smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e +tomoyo 933fd4391e3def39551e26d2f8bfff4063278993 +tpmdd 224541f80952ab62510b65a9a725801d28c8c46d +watchdog fc4354c6e5c21257cf4a50b32f7c11c7d65c55b3 +iommu d11370bf64c57a3f50c68e2ee55e202ebdd396a2 +audit e455ca40dbcf2cd50d1e59bf4b2752b300bcdad4 +devicetree c50eb01940c75b848e0257cea3b521a6d4150c5d +dt-krzk 0ff3c07556e6316c3f87d2e2462002adb01a681d +mailbox 8fe72b76db79d694858e872370df49676bc3be8c +spi 70cba8b3666d9df82b934d663c77cf6f905bb1ed +tip 409bf2895d71bb68bc5b8589036e5ed1ca30bada +clockevents 158009f1b4a33bc0f354b994eea361362bd83226 +edac 6c79e42169fe10308d72051950c411b3524c7aa9 +irqchip 2b384e01fd12275b93ba777b40ec8b868c965e2d +ftrace 3862f86c1529fa0016de6344eb974877b4cd3838 +rcu 83545df658f6fe38147956cb378cd1b26ce06c20 +kvm 39428f6ea9eace95011681628717062ff7f5eb5f +kvm-arm 532b2ecfa547f02b1825108711565eff026bce5a +kvms390 85ae3d09f862f6e384c29562e22f84574354e32d +kvm-riscv 95c99104cb42bea5a0874c362f284ae4b91289dd +kvm-x86 31b4fc3bc64aadd660c5bfa5178c86a7ba61e0f7 +xen-tip 335b4223466dd75f9f3ea4918187afbadd22e5c8 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues ee360b1c50017fa1d2a7ca84e9dfe54091d7ee85 +drivers-x86 86f67fe2db439867f9476c9b78ea3ebd4a06a123 +chrome-platform f5bb4e381290883a014a9e865ee2c430447ef953 +hsi 42877c38ac78e456fd9e149842a96a3576fb36e5 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj e338a05e76cab377c9227c1d4f591b5879d6062a +ipmi e64c82b8064174a23434094d13a142254c138099 +driver-core 16b58423b4c33dfd9622dcfc93bc5ce35c17ce72 +usb d37537a1f7cf09e304fe7993cb5e732534a0fb22 +thunderbolt 033c2d8ab2835a7f13e1a9c6813b412935e77140 +usb-serial 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 +tty 2076b2a4a6b7e36a33dad178ff6f7c45657b00cc +char-misc 5959fe74c9932d18059811af0ec4870831821c79 +accel 6e0dd9fb1c2477f6bdc105882699d49656ae4e40 +coresight 9f37d3798026f9a7447d851a2cb356610852e426 +fastrpc ac9a78681b921877518763ba0e89202254349d1b +fpga 47147d56f92ee3f575e4b457413e0f2587b40e17 +icc 63cf621fde8c823fbc6a92e2c145d8bbcde26744 +iio 12a875055c15279c4f2db14cb0b593d81d16fc0b +phy-next 1eac0f956608e5bfb5a588ac2a7e98a8e1928e75 +soundwire 94f89950850e1421c46fb44bc94c433cbe5dba00 +extcon bcfa8e33064f1357e60a7c056a2e51cc5928d629 +gnss 44c026a73be8038f03dbdeef028b642880cf1511 +vfio d9824f70e52c736498c9177688cee5aa789e560c +w1 b332af5398a3aa1a2fdd69bb6968a8f866cc39aa +staging c6e9da9d556673b07e0ba4f00580904286787f22 +counter-next 98ffe02529117095fad0399ce16235d66b8b5f8d +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 907514a7dc4c574136e8fb576b014be05d25813a +cgroup f32b14ba70a963d7199f0dad9fa48514e1246a07 +scsi 28646fd24f4ec46e35e76ce33bf896aafd149e55 +scsi-mkp 467e6cc73ef290f0099b1b86cec4f14060984916 +vhost 853b05e8d8d90b647ea39665b84fd6d03c0c3a23 +rpmsg 1ca04f21b204e99dd704146231adfb79ea2fb366 +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl ba65c79fbb813423e7d42d99375e2045b27958a6 +gpio-intel ac9a78681b921877518763ba0e89202254349d1b +pinctrl 4ab0b8b357186731b3f3a09c12378460914fbb0f +pinctrl-intel 7e521093113b3920aff2f932221c87b6e910f33a +pinctrl-renesas 5d32cead772c3d074947cb7277dea7532133037b +pinctrl-samsung ac9a78681b921877518763ba0e89202254349d1b +pwm 247ee6c780406513c6031a7f4ea41f1648b03295 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest d909ae0a8562b404eb1aa9dae6b2f15c9e163984 +kunit ac9a78681b921877518763ba0e89202254349d1b +kunit-next fefdb43943c1a0d87e1b43ae4d03e5f9a1d058f4 +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 38e0689b27f8b9a0085815b2446b12f685d028aa +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 a3c10035d12f5ec10915d5c00c2e8f7d7c066182 +ntb 942cc9ceccb6178b56bf712b94d76190d8759823 +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus ac9a78681b921877518763ba0e89202254349d1b +nvmem ac1c0d15aedc0863031bc8d678d5f96ab11d3a41 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv a494aef23dfc732945cb42e22246a5c31174e4a5 +auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm ac9a78681b921877518763ba0e89202254349d1b +cfi 3123109284176b1532874591f7c81f3837bbdc17 +mhi a196d7ad4ca55b6454a4837cbff85fc3182aac56 +memblock de649e7f5edb2e61dbd3d64deae44cb165e657ad +cxl a70fc4ed20a6118837b0aecbbf789074935f473b +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 39c90699b3303fc25c0da077f37cc3bbd45c8f83 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 1ec98851d0f00b0290aed4e7d56336acb7fd3e95 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 663da89ec4521a4fbd0af81d5f641ae7a9660f8b +rust d09a61024f6b78c6a08892fc916cdafd87b50365 +sysctl a092d00be2fa4ddd856a8f542d769ac47829fbf1 +execve 36650a357eac3e525edbd31db4fe45841b05dc3b +bitmap 714f3af11b21b15d4bab91045928a8498bbbffa1 +hte ac9a78681b921877518763ba0e89202254349d1b +kspp b2f10148ec1eae7d63dd6a1a56afdf93a27daa74 +kspp-gustavo 4cac30138e5ee5afcbc20b2ac5535716f2679b2e +iommufd f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8d8261e5d13e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,367 @@ +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/pablo/nf.git#master +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 git://linuxtv.org/mchehab/media-next.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/acme/linux.git#perf/urgent +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/acme/linux.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 +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +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 +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-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/mszeredi/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/pablo/nf-next.git#master +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 +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/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 +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..4b2a1f8e85a9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,11009 @@ +$ date -R +Wed, 07 Jun 2023 08:24:37 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 66% (5186/7809)
Updating files: 67% (5233/7809)
Updating files: 68% (5311/7809)
Updating files: 69% (5389/7809)
Updating files: 70% (5467/7809)
Updating files: 71% (5545/7809)
Updating files: 72% (5623/7809)
Updating files: 73% (5701/7809)
Updating files: 74% (5779/7809)
Updating files: 75% (5857/7809)
Updating files: 76% (5935/7809)
Updating files: 77% (6013/7809)
Updating files: 78% (6092/7809)
Updating files: 79% (6170/7809)
Updating files: 80% (6248/7809)
Updating files: 81% (6326/7809)
Updating files: 82% (6404/7809)
Updating files: 83% (6482/7809)
Updating files: 84% (6560/7809)
Updating files: 85% (6638/7809)
Updating files: 86% (6716/7809)
Updating files: 87% (6794/7809)
Updating files: 88% (6872/7809)
Updating files: 89% (6951/7809)
Updating files: 90% (7029/7809)
Updating files: 91% (7107/7809)
Updating files: 92% (7185/7809)
Updating files: 93% (7263/7809)
Updating files: 94% (7341/7809)
Updating files: 95% (7419/7809)
Updating files: 96% (7497/7809)
Updating files: 97% (7575/7809)
Updating files: 98% (7653/7809)
Updating files: 99% (7731/7809)
Updating files: 100% (7809/7809)
Updating files: 100% (7809/7809), done. +HEAD is now at f8dba31b0a82 Merge tag 'asym-keys-fix-for-linus-v6.4-rc5' of https://github.com/robertosassu/linux +Merging origin/master (a4d7d7011219 Merge tag 'spi-fix-v6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating f8dba31b0a82..a4d7d7011219 +Fast-forward (no commit created; -m option ignored) + drivers/hid/hid-logitech-hidpp.c | 13 ++++---- + drivers/platform/surface/aggregator/controller.c | 2 +- + .../platform/surface/surface_aggregator_tabletsw.c | 10 ++++++ + .../platform/x86/intel/int3472/clk_and_regulator.c | 13 +++++--- + drivers/spi/spi-fsl-lpspi.c | 7 +++- + drivers/spi/spi-mt65xx.c | 3 ++ + drivers/spi/spi-qup.c | 37 +++++++++++----------- + fs/gfs2/file.c | 17 ++++++++-- + include/linux/surface_aggregator/device.h | 6 +--- + 9 files changed, 67 insertions(+), 41 deletions(-) +Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) +$ 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 (d5b0611cfaf5 page cache: fix page_cache_next/prev_miss off by one) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging include/linux/sched/task.h +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + arch/powerpc/mm/book3s64/radix_tlb.c | 6 +---- + arch/powerpc/purgatory/Makefile | 5 ++++ + arch/riscv/purgatory/Makefile | 5 ++++ + arch/x86/purgatory/Makefile | 5 ++++ + fs/eventpoll.c | 6 ++++- + fs/nilfs2/btnode.c | 12 ++++++++-- + fs/nilfs2/sufile.c | 9 ++++++++ + fs/nilfs2/the_nilfs.c | 43 ++++++++++++++++++++++++++++++++++- + fs/ocfs2/file.c | 8 ++++++- + fs/ocfs2/super.c | 6 +++-- + fs/userfaultfd.c | 13 +++++++++-- + include/linux/sched/hotplug.h | 2 ++ + include/linux/sched/task.h | 2 ++ + kernel/cpu.c | 11 +++++---- + kernel/fork.c | 7 ++---- + kernel/kexec_file.c | 14 +++++++++++- + kernel/sched/core.c | 44 +++++++++++++++++++++++++++++------- + lib/radix-tree.c | 2 ++ + lib/radix-tree.h | 8 +++++++ + lib/test_vmalloc.c | 2 +- + lib/xarray.c | 6 ++--- + mm/damon/core.c | 2 ++ + mm/filemap.c | 26 +++++++++++++-------- + mm/gup_test.c | 1 + + mm/memory.c | 3 +++ + mm/rmap.c | 6 ++--- + mm/shmem.c | 17 +++++++++++++- + mm/zswap.c | 11 +++++++-- + tools/testing/radix-tree/Makefile | 5 ++-- + 30 files changed, 233 insertions(+), 55 deletions(-) + create mode 100644 lib/radix-tree.h +Merging kbuild-current/fixes (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (0e2aba694866 arm64: mm: pass original fault address to handle_mm_fault() in PER_VMA_LOCK block) +$ 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/Kconfig | 2 +- + arch/arm64/mm/fault.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging arm-soc-fixes/arm/fixes (08425abbab99 Merge tag 'ffa-fix-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ 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. + .../devicetree/bindings/cache/qcom,llcc.yaml | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/at91-sama7g5ek.dts | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/imx7d-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 2 - + arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts | 1 - + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 3 - + arch/arm/boot/dts/qcom-apq8064.dtsi | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 + + .../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 1 - + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8960.dtsi | 1 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 - + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 1 - + arch/arm/boot/dts/qcom-msm8974.dtsi | 1 + + .../arm/boot/dts/qcom-msm8974pro-oneplus-bacon.dts | 1 - + arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 4 - + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 1 - + arch/arm/mach-at91/pm.c | 20 ++-- + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 1 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8976.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 + + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 1 + + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 10 ++ + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8155p.dtsi | 40 +++++++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 20 ++++ + arch/arm64/boot/dts/qcom/sc7180-lite.dtsi | 8 ++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 9 ++ + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 - + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 - + arch/arm64/boot/dts/qcom/sc7280.dtsi | 9 ++ + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 +++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 20 +++- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 13 ++- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 9 ++ + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 4 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 52 ++++++--- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 13 ++- + .../boot/dts/qcom/sm8250-xiaomi-elish-boe.dts | 2 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 61 ++++++----- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 61 ++++++----- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 26 ++++- + drivers/edac/qcom_edac.c | 118 ++++++++++----------- + drivers/firmware/arm_ffa/driver.c | 1 + + drivers/soc/qcom/Makefile | 3 +- + drivers/soc/qcom/icc-bwmon.c | 4 +- + drivers/soc/qcom/ramp_controller.c | 2 +- + drivers/soc/qcom/rmtfs_mem.c | 1 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/rpmhpd.c | 16 +++ + include/dt-bindings/power/qcom-rpmpd.h | 9 ++ + include/linux/soc/qcom/llcc-qcom.h | 6 -- + 77 files changed, 444 insertions(+), 205 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/sa8155p.dtsi +Merging davinci-current/davinci/for-current (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging 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 (b845b574f86d m68k: Move signal frame following exception on 68020/030) +$ 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 (719dfd5925e1 powerpc/xmon: Use KSYM_NAME_LEN in array size) +$ 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 (03c5c83b70dc s390/purgatory: disable branch profiling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/purgatory/Makefile | 1 + + drivers/s390/cio/device.c | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) +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 (42510dffd0e2 qed/qede: Fix scheduling while atomic) +$ 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/ip-sysctl.rst | 4 +- + drivers/net/dsa/lan9303-core.c | 4 -- + drivers/net/dsa/qca/Kconfig | 1 + + drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 16 +++++++- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede.h | 4 ++ + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 ++++++++++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 34 ++++++++++++++- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 +- + drivers/net/phy/phylink.c | 15 ++++--- + include/net/neighbour.h | 2 +- + include/net/netns/ipv6.h | 2 +- + include/net/ping.h | 6 +-- + net/can/j1939/main.c | 24 ++++++----- + net/can/j1939/socket.c | 5 +++ + net/ipv4/sysctl_net_ipv4.c | 8 ++-- + net/ipv6/route.c | 4 +- + net/mptcp/pm.c | 23 +++++++++-- + net/mptcp/pm_netlink.c | 18 ++++++++ + net/mptcp/pm_userspace.c | 48 +++++++++++++++++++++- + net/mptcp/protocol.h | 1 + + net/sched/sch_api.c | 2 + + net/sched/sch_fq_pie.c | 8 +++- + net/smc/smc_llc.c | 4 +- + tools/testing/selftests/net/.gitignore | 3 ++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 11 ++++- + 27 files changed, 228 insertions(+), 52 deletions(-) +Merging bpf/master (69844e335d8c selftests/bpf: Fix sockopt_sk selftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + include/uapi/linux/bpf.h | 1 + + kernel/bpf/map_in_map.c | 8 +++- + kernel/bpf/syscall.c | 9 +++++ + kernel/fork.c | 2 +- + net/core/skmsg.c | 3 +- + tools/include/uapi/linux/bpf.h | 1 + + tools/lib/bpf/libbpf.c | 3 +- + tools/lib/bpf/libbpf_probes.c | 2 + + .../selftests/bpf/prog_tests/inner_array_lookup.c | 31 +++++++++++++++ + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 2 +- + .../selftests/bpf/progs/inner_array_lookup.c | 45 ++++++++++++++++++++++ + 11 files changed, 101 insertions(+), 6 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/inner_array_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/inner_array_lookup.c +Merging ipsec/master (a287f5b0cfc6 xfrm: Ensure policies always checked on XFRM-I input path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + include/net/xfrm.h | 1 + + net/xfrm/xfrm_input.c | 1 + + net/xfrm/xfrm_interface_core.c | 54 ++++++++++++++++++++++++++++++++++++++---- + net/xfrm/xfrm_policy.c | 12 ++++++++++ + 4 files changed, 64 insertions(+), 4 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/main (ad42a35bdfc6 udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated().) +$ 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 (f7e60032c661 wifi: cfg80211: fix locking in regulatory disconnect) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 ++--- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 3 ++ + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 19 +++++++---- + drivers/net/wireless/realtek/rtw88/mac80211.c | 14 +++----- + drivers/net/wireless/realtek/rtw88/main.c | 4 +-- + drivers/net/wireless/realtek/rtw88/ps.c | 43 +++++++++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/ps.h | 2 ++ + drivers/net/wireless/realtek/rtw89/core.c | 3 -- + drivers/net/wireless/realtek/rtw89/mac80211.c | 15 ++++----- + drivers/net/wireless/realtek/rtw89/ps.c | 26 +++++++++++++++ + drivers/net/wireless/realtek/rtw89/ps.h | 1 + + net/mac80211/he.c | 15 ++++++--- + net/mac80211/mlme.c | 8 ++++- + net/mac80211/rx.c | 4 ++- + net/mac80211/tx.c | 2 +- + net/wireless/core.c | 4 +-- + net/wireless/nl80211.c | 2 ++ + net/wireless/reg.c | 4 +-- + 18 files changed, 129 insertions(+), 48 deletions(-) +Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +++-- + drivers/net/ieee802154/mac802154_hwsim.c | 6 ++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging rdma-fixes/for-rc (5842d1d9c1b0 RDMA/irdma: Fix Local Invalidate fencing) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (08c9aa7c58e9 Merge tag 'asoc-fix-v6.4-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ 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/isa/gus/gus_pcm.c | 2 +- + sound/pci/cmipci.c | 6 ++-- + sound/pci/hda/hda_codec.c | 6 +++- + sound/pci/hda/patch_realtek.c | 11 +++++++ + sound/pci/ice1712/aureon.c | 7 ++-- + sound/pci/ice1712/ice1712.c | 14 +++++--- + sound/pci/ice1712/ice1724.c | 16 +++++---- + sound/pci/ymfpci/ymfpci_main.c | 6 ++-- + sound/soc/amd/ps/pci-ps.c | 3 +- + sound/soc/amd/ps/ps-pdm-dma.c | 10 +++--- + sound/soc/amd/yc/acp6x-mach.c | 7 ++++ + sound/soc/codecs/cs35l56.c | 3 -- + sound/soc/codecs/max98363.c | 4 +-- + sound/soc/codecs/nau8824.c | 24 ++++++++++++++ + sound/soc/codecs/wcd938x-sdw.c | 1 - + sound/soc/codecs/wsa881x.c | 1 - + sound/soc/codecs/wsa883x.c | 1 - + sound/soc/fsl/fsl_sai.c | 11 +++++-- + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/generic/simple-card-utils.c | 2 +- + sound/soc/generic/simple-card.c | 1 + + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 7 ---- + sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 1 - + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 4 --- + sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 47 ++++++++++++++------------- + sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 1 - + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 5 --- + sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 1 - + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 4 --- + sound/soc/mediatek/mt8195/mt8195-audsys-clk.c | 47 ++++++++++++++------------- + sound/soc/mediatek/mt8195/mt8195-audsys-clk.h | 1 - + tools/testing/selftests/alsa/pcm-test.c | 10 +++--- + 32 files changed, 150 insertions(+), 115 deletions(-) +Merging sound-asoc-fixes/for-linus (ad24919540fb firmware: cs_dsp: Log correct region name in bin error messages) +$ 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. + drivers/firmware/cirrus/cs_dsp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging regmap-fixes/for-linus (0cc6578048e0 regmap: maple: Drop the RCU read lock while syncing registers) +$ 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 (7877cb91f108 Linux 6.4-rc4) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (947c70a21376 spi: cadence-quadspi: Add missing check for dma_set_mask) +$ 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-cadence-quadspi.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (40994ce0ea01 MAINTAINERS: Add Chuanhua Lei as Intel LGM GW PCIe maintainer) +$ 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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging driver-core.current/driver-core-linus (9561de3a55be Linux 6.4-rc5) +$ 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 (306320034e8f serial: lantiq: add missing interrupt ack) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/lantiq.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb.current/usb-linus (592295e61b5c Merge tag 'thunderbolt-for-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/dma_test.c | 8 ++++---- + drivers/thunderbolt/nhi.c | 11 ++++++++--- + drivers/thunderbolt/tb.c | 17 ++++++++++++----- + drivers/thunderbolt/tunnel.c | 2 +- + 4 files changed, 25 insertions(+), 13 deletions(-) +Merging usb-serial-fixes/usb-linus (f1832e2b5e49 USB: serial: option: add Quectel EM061KGL series) +$ 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 +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging phy/fixes (2a881183dc5a phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/octeon/TODO | 1 - + 1 file changed, 1 deletion(-) +Merging iio-fixes/fixes-togreg (b410a9307bc3 iio: accel: fxls8962af: errata bug only applicable for FXLS8962AF) +$ 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. + Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml | 5 +++++ + drivers/iio/accel/fxls8962af-core.c | 8 ++++---- + drivers/iio/adc/ad7192.c | 8 ++++---- + drivers/iio/addac/ad74413r.c | 11 ++++++----- + 4 files changed, 19 insertions(+), 13 deletions(-) +Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (9561de3a55be Linux 6.4-rc5) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (99e09b9c0ab4 soundwire: qcom: add proper error paths in qcom_swrm_startup()) +$ 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/dmi-quirks.c | 7 +++++++ + drivers/soundwire/qcom.c | 17 +++++++++++++---- + 2 files changed, 20 insertions(+), 4 deletions(-) +Merging thunderbolt-fixes/fixes (9f9666e65359 thunderbolt: Mask ring interrupt on Intel hardware as well) +$ 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 (feee70f45686 Input: xpad - delete a Razer DeathAdder mouse VID/PID entry) +$ 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/input.c | 2 +- + drivers/input/joystick/xpad.c | 1 - + drivers/input/misc/soc_button_array.c | 30 ++++++++++++++++++++++++++++++ + drivers/input/mouse/elantech.c | 9 +++++---- + drivers/input/touchscreen/cyttsp5.c | 2 +- + 5 files changed, 37 insertions(+), 7 deletions(-) +Merging crypto-current/master (6ab39f99927e crypto: x86/aria - Use 16 byte alignment for GFNI constant vectors) +$ 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 (dbcf76390eb9 selftests/ftrace: Improve integration with kselftest runner) +$ 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 (e14fd2af7a1d dmaengine: at_hdmac: Extend the Flow Controller bitfield to three bits) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c4d28e30a8d0 mtd: rawnand: marvell: don't set the NAND frequency select) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (81f3affa19d6 media: uvcvideo: Don't expose unsupported formats to userspace) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.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 (4897a898a216 mips: Move initrd_start check after initrd address sanitisation.) +$ 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 (6b0db163ff92 ARM: dts: at91: sama7g5ek: fix debounce delay property for shdwc) +$ 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 (f211b45057d8 Merge tag 'kvm-x86-fixes-6.4' of https://github.com/kvm-x86/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 (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected) +$ 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 (0babf89c9cca hwmon: (f71882fg) prevent possible division by zero) +$ 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/f71882fg.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (e5baf8c07707 libnvdimm: mark 'security_show' static again) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Merge made by the 'ort' strategy. + drivers/acpi/nfit/nfit.h | 2 ++ + drivers/dax/bus.h | 7 ------- + drivers/dax/dax-private.h | 7 +++++++ + drivers/dax/device.c | 3 +-- + drivers/nvdimm/dimm_devs.c | 2 +- + tools/testing/nvdimm/test/nfit_test.h | 29 +++++++++++++++++++++++++++++ + 6 files changed, 40 insertions(+), 10 deletions(-) +Merging cxl-fixes/fixes (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (7c902ab2c78a Merge branch 'misc-6.4' 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/disk-io.c | 9 +++++---- + fs/btrfs/super.c | 6 ++++++ + 2 files changed, 11 insertions(+), 4 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 (fb109fba7284 platform/x86: int3472: Avoid crash in unregistering regulator gpio) +$ 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 (ac9a78681b92 Linux 6.4-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 (ac9a78681b92 Linux 6.4-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 (6997f847cbb7 MAINTAINERS: add Conor as a dt-bindings maintainer) +$ 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 (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) +$ 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 (6d074ce23177 scsi: stex: Fix gcc 13 warnings) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (9561de3a55be Linux 6.4-rc5) +$ 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 (2d6f2f79e065 drm/i915: Use 18 fast wake AUX sync len) +$ 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_cdclk.c | 30 ++++++++++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 +++++++---- + 3 files changed, 35 insertions(+), 9 deletions(-) +Merging mmc-fixes/fixes (0b5d5c436a5c mmc: pwrseq: sd8787: Fix WILC CHIP_EN and RESETN toggling order) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +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 (44c026a73be8 Linux 6.4-rc3) +$ 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 (ec97e112985c Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_vtl.c | 2 ++ + drivers/hv/vmbus_drv.c | 5 ++--- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ 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 (6966d7988c4f riscv: Implement missing huge_ptep_get) +$ 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 (ac9a78681b92 Linux 6.4-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 (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests) +$ 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 +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (44c026a73be8 Linux 6.4-rc3) +$ 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 (9561de3a55be Linux 6.4-rc5) +$ 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 (95ae9979bfe3 gpio: sim: fix memory corruption when adding named lines and unnamed hogs) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-sim.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (ac9a78681b92 Linux 6.4-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 (7877cb91f108 Linux 6.4-rc4) +$ 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 (7877cb91f108 Linux 6.4-rc4) +$ 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 (ac9a78681b92 Linux 6.4-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 (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (c034203b6a9d nfsd: fix double fget() bug in __write_ports_addfd()) +$ 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 (91539341a3b6 irqchip/gic: Correctly validate OF quirk descriptors) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (48b1320a674e Merge tag 'for-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +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 (95339f40a8b6 power: supply: Fix logic checking if system is running from battery) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +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 (f1fcbaa18b28 Linux 6.4-rc2) +$ 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 (36896bc97c0e fs/9p: Fix a datatype used with V9FS_DIRECT_IO) +$ 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/v9fs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging w1-fixes/fixes (ac9a78681b92 Linux 6.4-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 (411360257c1f accel/ivpu: Reserve all non-command bo's using DMA_RESV_USAGE_BOOKKEEP) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/ivpu/Kconfig | 1 + + drivers/accel/ivpu/ivpu_job.c | 21 ++++++++++----- + drivers/gpu/drm/ast/ast_dp.c | 57 +++++++++++++---------------------------- + drivers/gpu/drm/ast/ast_drv.h | 5 +--- + drivers/gpu/drm/ast/ast_main.c | 11 ++++++-- + drivers/gpu/drm/ast/ast_mode.c | 15 +++++++++-- + drivers/gpu/drm/ast/ast_post.c | 3 ++- + drivers/gpu/drm/drm_fb_helper.c | 12 +++++---- + 8 files changed, 65 insertions(+), 60 deletions(-) +Merging mm-stable/mm-stable (7877cb91f108 Linux 6.4-rc4) +$ 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 (7877cb91f108 Linux 6.4-rc4) +$ 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 (a96b166927db 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 arch/arm64/Kconfig +Auto-merging arch/arm64/mm/fault.c +Auto-merging fs/gfs2/file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched/task.h +Auto-merging kernel/fork.c +Auto-merging kernel/trace/trace_events_user.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 7 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/dev-tools/kselftest.rst | 1 + + Documentation/mm/damon/design.rst | 305 +++- + Documentation/mm/damon/faq.rst | 23 - + Documentation/mm/damon/maintainer-profile.rst | 4 +- + Documentation/mm/page_migration.rst | 7 +- + .../translations/zh_CN/mm/page_migration.rst | 2 +- + MAINTAINERS | 7 + + arch/Kconfig | 3 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/include/asm/irq.h | 1 - + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 3 + + arch/arm64/include/asm/thread_info.h | 4 - + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/mte.c | 17 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/kernel/watchdog_hld.c | 36 + + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/init.c | 2 - + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/include/asm/setup.h | 2 - + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/include/asm/fw/cfe/cfe_api.h | 3 - + arch/mips/include/asm/irq.h | 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/smp.c | 1 - + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/include/asm/irq.h | 1 - + arch/powerpc/include/asm/nmi.h | 4 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/watchdog.c | 12 +- + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/riscv/include/asm/irq.h | 2 - + arch/riscv/include/asm/timex.h | 2 - + arch/s390/include/asm/thread_info.h | 3 - + arch/s390/kernel/entry.h | 2 - + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kvm/interrupt.c | 2 +- + arch/sh/include/asm/irq.h | 1 - + arch/sh/include/asm/rtc.h | 2 - + arch/sh/include/asm/thread_info.h | 3 - + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/include/asm/irq_32.h | 1 - + arch/sparc/include/asm/irq_64.h | 1 - + arch/sparc/include/asm/timer_64.h | 1 - + arch/sparc/kernel/kernel.h | 1 - + arch/sparc/kernel/nmi.c | 15 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/irq.h | 2 - + arch/x86/include/asm/mem_encrypt.h | 3 - + arch/x86/include/asm/thread_info.h | 3 - + arch/x86/include/asm/time.h | 1 - + arch/x86/include/asm/tsc.h | 1 - + arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/fops.c | 18 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/infiniband/sw/siw/siw_mem.c | 2 +- + drivers/iommu/iommufd/pages.c | 4 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- + drivers/misc/sgi-gru/grufault.c | 2 +- + drivers/perf/arm_pmu.c | 5 + + drivers/perf/arm_pmuv3.c | 12 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + fs/btrfs/file.c | 6 +- + fs/ceph/file.c | 6 - + fs/direct-io.c | 10 +- + fs/exec.c | 3 +- + fs/ext4/file.c | 11 +- + fs/f2fs/file.c | 3 - + fs/fs-writeback.c | 16 +- + fs/fuse/file.c | 45 +- + fs/gfs2/file.c | 6 +- + fs/hugetlbfs/inode.c | 5 +- + fs/iomap/buffered-io.c | 9 +- + fs/iomap/direct-io.c | 88 +- + fs/libfs.c | 41 + + fs/nfs/file.c | 6 +- + fs/ntfs/file.c | 2 - + fs/ntfs3/file.c | 3 - + fs/ocfs2/ocfs2_trace.h | 2 - + fs/ocfs2/quota_local.c | 9 +- + fs/proc/kcore.c | 2 +- + fs/proc/task_mmu.c | 12 +- + fs/squashfs/block.c | 118 +- + fs/squashfs/decompressor.c | 1 - + fs/squashfs/decompressor_multi_percpu.c | 1 - + fs/squashfs/squashfs_fs_sb.h | 1 + + fs/squashfs/super.c | 17 + + fs/userfaultfd.c | 35 +- + fs/xfs/xfs_file.c | 6 - + fs/zonefs/file.c | 4 +- + include/asm-generic/bug.h | 5 +- + include/linux/acpi.h | 3 +- + include/linux/cgroup.h | 1 - + include/linux/compaction.h | 100 +- + include/linux/delay.h | 1 + + include/linux/dma-map-ops.h | 6 - + include/linux/fault-inject.h | 9 + + include/linux/frontswap.h | 1 + + include/linux/fs.h | 7 +- + include/linux/gfp.h | 15 +- + include/linux/hugetlb.h | 23 +- + include/linux/init.h | 20 + + include/linux/kasan.h | 2 +- + include/linux/kcov.h | 17 + + include/linux/maple_tree.h | 153 +- + include/linux/math.h | 22 +- + include/linux/memcontrol.h | 5 - + include/linux/memory_hotplug.h | 3 - + include/linux/migrate.h | 32 +- + include/linux/mm.h | 159 +- + include/linux/mmdebug.h | 14 + + include/linux/mmzone.h | 25 +- + include/linux/mount.h | 2 + + include/linux/nmi.h | 77 +- + include/linux/page-isolation.h | 23 +- + include/linux/pagemap.h | 6 +- + include/linux/panic.h | 3 + + include/linux/percpu.h | 2 - + include/linux/perf/arm_pmu.h | 2 + + include/linux/sched.h | 3 - + include/linux/sched/task.h | 3 +- + include/linux/stackdepot.h | 9 + + include/linux/suspend.h | 9 +- + include/linux/swap.h | 5 +- + include/linux/syscalls.h | 5 + + include/linux/thread_info.h | 5 + + include/linux/time_namespace.h | 3 +- + include/linux/types.h | 1 + + include/linux/userfaultfd_k.h | 6 +- + include/trace/events/compaction.h | 11 + + include/trace/events/mmflags.h | 4 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/mman.h | 14 + + init/Kconfig | 10 + + init/do_mounts.c | 15 +- + init/main.c | 22 +- + io_uring/rsrc.c | 34 +- + kernel/Makefile | 3 +- + kernel/cgroup/rstat.c | 26 +- + kernel/dma/Kconfig | 6 +- + kernel/dma/contiguous.c | 8 +- + kernel/events/uprobes.c | 13 +- + kernel/fork.c | 30 +- + kernel/kcov.c | 7 +- + kernel/kexec_core.c | 93 +- + kernel/kexec_file.c | 7 +- + kernel/kthread.c | 6 +- + kernel/locking/lock_events.h | 4 + + kernel/panic.c | 3 +- + kernel/power/main.c | 27 + + kernel/power/power.h | 5 + + kernel/power/snapshot.c | 52 + + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 67 - + kernel/trace/trace_events_user.c | 2 +- + kernel/umh.c | 6 +- + kernel/watchdog.c | 354 ++-- + kernel/watchdog_buddy.c | 113 ++ + kernel/{watchdog_hld.c => watchdog_perf.c} | 109 +- + lib/Kconfig.debug | 62 +- + lib/Makefile | 2 +- + lib/debugobjects.c | 9 +- + lib/decompress_inflate.c | 2 +- + lib/decompress_unxz.c | 2 + + lib/decompress_unzstd.c | 2 + + lib/devmem_is_allowed.c | 1 + + lib/kunit/debugfs.c | 1 + + lib/maple_tree.c | 1722 ++++++++++---------- + lib/show_mem.c | 37 - + lib/stackdepot.c | 128 +- + lib/test_maple_tree.c | 939 +++++++++-- + lib/zstd/common/zstd_deps.h | 18 - + mm/Kconfig | 13 + + mm/Makefile | 4 +- + mm/compaction.c | 247 +-- + mm/damon/ops-common.c | 30 +- + mm/damon/ops-common.h | 4 +- + mm/damon/paddr.c | 4 +- + mm/damon/vaddr.c | 4 +- + mm/debug.c | 9 + + mm/debug_page_alloc.c | 59 + + mm/dmapool.c | 10 +- + mm/early_ioremap.c | 8 +- + mm/fail_page_alloc.c | 66 + + mm/filemap.c | 393 +++-- + mm/frontswap.c | 7 +- + mm/gup.c | 255 ++- + mm/gup_test.c | 14 +- + mm/huge_memory.c | 17 +- + mm/hugetlb.c | 24 +- + mm/hugetlb_vmemmap.c | 11 +- + mm/internal.h | 85 +- + mm/kasan/common.c | 2 +- + mm/kasan/generic.c | 76 +- + mm/kasan/kasan.h | 143 +- + mm/kasan/report.c | 17 +- + mm/kasan/report_generic.c | 12 +- + mm/kasan/report_hw_tags.c | 2 +- + mm/kasan/report_sw_tags.c | 2 +- + mm/kasan/shadow.c | 36 +- + mm/kasan/sw_tags.c | 20 +- + mm/kasan/tags.c | 2 +- + mm/khugepaged.c | 12 +- + mm/kmsan/core.c | 6 +- + mm/kmsan/instrumentation.c | 2 +- + mm/madvise.c | 8 +- + mm/memcontrol.c | 211 ++- + mm/memory-failure.c | 11 +- + mm/memory.c | 42 +- + mm/memory_hotplug.c | 23 +- + mm/mempolicy.c | 15 +- + mm/migrate.c | 334 ++-- + mm/mm_init.c | 116 +- + mm/mmap.c | 386 +++-- + mm/mremap.c | 2 +- + mm/nommu.c | 45 +- + mm/oom_kill.c | 8 +- + mm/page_alloc.c | 915 ++--------- + mm/page_isolation.c | 29 +- + mm/page_owner.c | 54 + + mm/process_vm_access.c | 2 +- + mm/rmap.c | 2 +- + mm/secretmem.c | 4 +- + mm/shmem.c | 5 +- + mm/show_mem.c | 429 +++++ + mm/sparse.c | 2 +- + mm/swap_state.c | 33 +- + mm/swapfile.c | 48 +- + mm/vmalloc.c | 136 +- + mm/vmscan.c | 97 +- + mm/workingset.c | 162 +- + mm/zsmalloc.c | 12 +- + mm/zswap.c | 40 +- + net/xdp/xdp_umem.c | 2 +- + samples/kmemleak/kmemleak-test.c | 2 +- + scripts/checkpatch.pl | 10 + + scripts/spelling.txt | 22 + + security/tomoyo/domain.c | 2 +- + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/maple.c | 225 +-- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/cachestat/.gitignore | 2 + + tools/testing/selftests/cachestat/Makefile | 8 + + tools/testing/selftests/cachestat/test_cachestat.c | 269 +++ + tools/testing/selftests/cgroup/test_memcontrol.c | 4 +- + tools/testing/selftests/lib.mk | 36 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 10 +- + tools/testing/selftests/mm/cow.c | 36 +- + tools/testing/selftests/mm/gup_longterm.c | 459 ++++++ + tools/testing/selftests/mm/hugepage-mremap.c | 2 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 8 +- + tools/testing/selftests/mm/khugepaged.c | 10 - + tools/testing/selftests/mm/ksm_functional_tests.c | 2 +- + tools/testing/selftests/mm/migration.c | 5 +- + tools/testing/selftests/mm/mlock2-tests.c | 1 - + tools/testing/selftests/mm/pkey-x86.h | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 10 +- + tools/testing/selftests/mm/uffd-common.c | 105 ++ + tools/testing/selftests/mm/uffd-common.h | 12 +- + tools/testing/selftests/mm/uffd-stress.c | 10 - + tools/testing/selftests/mm/uffd-unit-tests.c | 16 +- + tools/testing/selftests/mm/vm_util.c | 131 +- + tools/testing/selftests/mm/vm_util.h | 37 +- + virt/kvm/async_pf.c | 3 +- + virt/kvm/kvm_main.c | 2 +- + 283 files changed, 7485 insertions(+), 4555 deletions(-) + create mode 100644 arch/arm64/kernel/watchdog_hld.c + create mode 100644 kernel/watchdog_buddy.c + rename kernel/{watchdog_hld.c => watchdog_perf.c} (72%) + delete mode 100644 lib/show_mem.c + create mode 100644 mm/debug_page_alloc.c + create mode 100644 mm/fail_page_alloc.c + create mode 100644 mm/show_mem.c + create mode 100644 tools/testing/selftests/cachestat/.gitignore + create mode 100644 tools/testing/selftests/cachestat/Makefile + create mode 100644 tools/testing/selftests/cachestat/test_cachestat.c + create mode 100644 tools/testing/selftests/mm/gup_longterm.c +Merging kbuild/for-next (feb843a469fb kbuild: add $(CLANG_FLAGS) to KBUILD_CPPFLAGS) +$ 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. + Documentation/process/changes.rst | 14 + + arch/mips/Makefile | 2 +- + arch/powerpc/kernel/vdso/Makefile | 2 +- + kernel/gen_kheaders.sh | 9 +- + scripts/Makefile.clang | 3 +- + scripts/Makefile.compiler | 2 +- + scripts/Makefile.lib | 3 - + scripts/mod/modpost.c | 545 +++++++++++++++----------------------- + scripts/mod/modpost.h | 5 - + scripts/tags.sh | 9 +- + 10 files changed, 237 insertions(+), 357 deletions(-) +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ 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 (fe8e04348727 perf script: Increase PID/TID width for output) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/lib/api/fs/cgroup.c | 17 +- + tools/lib/api/fs/fs.c | 25 +- + tools/lib/api/fs/tracing_path.c | 17 +- + tools/lib/perf/cpumap.c | 125 +- + tools/lib/perf/evlist.c | 25 +- + tools/lib/perf/include/internal/evsel.h | 15 +- + tools/lib/perf/include/perf/cpumap.h | 19 + + tools/lib/perf/include/perf/event.h | 3 +- + tools/lib/subcmd/exec-cmd.c | 35 +- + tools/perf/Documentation/Makefile | 15 +- + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/Documentation/perf-stat.txt | 16 + + tools/perf/arch/arm/util/auxtrace.c | 7 +- + tools/perf/arch/arm/util/cs-etm.c | 4 +- + tools/perf/arch/arm64/util/pmu.c | 6 +- + tools/perf/arch/common.c | 18 + + tools/perf/arch/powerpc/util/kvm-stat.c | 4 +- + tools/perf/arch/x86/annotate/instructions.c | 4 + + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 1 + + tools/perf/arch/x86/tests/arch-tests.c | 10 + + tools/perf/arch/x86/tests/hybrid.c | 288 +++ + tools/perf/arch/x86/tests/insn-x86.c | 10 +- + tools/perf/arch/x86/tests/intel-pt-test.c | 14 +- + tools/perf/arch/x86/util/auxtrace.c | 5 +- + tools/perf/arch/x86/util/evlist.c | 29 +- + tools/perf/arch/x86/util/evsel.c | 27 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 4 +- + tools/perf/arch/x86/util/mem-events.c | 17 +- + tools/perf/arch/x86/util/perf_regs.c | 15 +- + tools/perf/arch/x86/util/topdown.c | 5 +- + tools/perf/bench/pmu-scan.c | 56 +- + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-c2c.c | 9 +- + tools/perf/builtin-config.c | 4 +- + tools/perf/builtin-daemon.c | 44 +- + tools/perf/builtin-ftrace.c | 2 + + tools/perf/builtin-help.c | 4 +- + tools/perf/builtin-list.c | 36 +- + tools/perf/builtin-lock.c | 20 +- + tools/perf/builtin-mem.c | 9 +- + tools/perf/builtin-probe.c | 133 +- + tools/perf/builtin-record.c | 42 +- + tools/perf/builtin-script.c | 66 +- + tools/perf/builtin-stat.c | 322 +++- + tools/perf/builtin-timechart.c | 48 +- + tools/perf/builtin-top.c | 15 +- + tools/perf/builtin-trace.c | 38 +- + .../arch/arm64/ampere/ampereone/branch.json | 17 + + .../arch/arm64/ampere/ampereone/bus.json | 32 + + .../arch/arm64/ampere/ampereone/cache.json | 104 ++ + .../arch/arm64/ampere/ampereone/core-imp-def.json | 698 +++++++ + .../arch/arm64/ampere/ampereone/exception.json | 44 + + .../arch/arm64/ampere/ampereone/instruction.json | 89 + + .../arch/arm64/ampere/ampereone/intrinsic.json | 14 + + .../arch/arm64/ampere/ampereone/memory.json | 44 + + .../arch/arm64/ampere/ampereone/pipeline.json | 23 + + .../arch/arm64/ampere/ampereone/spe.json | 14 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 1723 +++++++++-------- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 9 + + .../perf/pmu-events/arch/x86/alderlake/memory.json | 6 +- + .../arch/x86/alderlake/metricgroups.json | 122 ++ + .../arch/x86/alderlaken/adln-metrics.json | 404 ++-- + .../arch/x86/alderlaken/metricgroups.json | 26 + + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 640 +++---- + .../arch/x86/broadwell/floating-point.json | 15 + + .../arch/x86/broadwell/metricgroups.json | 107 ++ + .../arch/x86/broadwellde/bdwde-metrics.json | 608 +++--- + .../arch/x86/broadwellde/floating-point.json | 15 + + .../arch/x86/broadwellde/metricgroups.json | 107 ++ + .../arch/x86/broadwellx/bdx-metrics.json | 856 +++++---- + .../arch/x86/broadwellx/floating-point.json | 15 + + .../arch/x86/broadwellx/metricgroups.json | 107 ++ + .../arch/x86/cascadelakex/clx-metrics.json | 1629 ++++++++++------- + .../arch/x86/cascadelakex/floating-point.json | 31 + + .../arch/x86/cascadelakex/metricgroups.json | 114 ++ + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 23 +- + .../pmu-events/arch/x86/elkhartlake/cache.json | 7 + + .../pmu-events/arch/x86/elkhartlake/memory.json | 2 + + .../pmu-events/arch/x86/elkhartlake/other.json | 10 + + .../pmu-events/arch/x86/elkhartlake/pipeline.json | 3 + + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 510 +++--- + .../pmu-events/arch/x86/haswell/metricgroups.json | 107 ++ + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 726 +++++--- + .../pmu-events/arch/x86/haswellx/metricgroups.json | 107 ++ + tools/perf/pmu-events/arch/x86/icelake/cache.json | 18 + + .../pmu-events/arch/x86/icelake/icl-metrics.json | 1113 +++++------ + .../pmu-events/arch/x86/icelake/metricgroups.json | 113 ++ + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 1383 ++++++++------ + .../pmu-events/arch/x86/icelakex/metricgroups.json | 114 ++ + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 552 +++--- + .../arch/x86/ivybridge/metricgroups.json | 107 ++ + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 560 +++--- + .../pmu-events/arch/x86/ivytown/metricgroups.json | 107 ++ + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 276 +-- + .../pmu-events/arch/x86/jaketown/metricgroups.json | 100 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 26 +- + .../arch/x86/sandybridge/metricgroups.json | 100 + + .../arch/x86/sandybridge/snb-metrics.json | 232 +-- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 6 +- + .../arch/x86/sapphirerapids/metricgroups.json | 118 ++ + .../arch/x86/sapphirerapids/spr-metrics.json | 1454 +++++++++------ + .../x86/sapphirerapids/uncore-interconnect.json | 2 +- + .../arch/x86/sapphirerapids/uncore-memory.json | 8 +- + .../arch/x86/skylake/floating-point.json | 8 + + .../pmu-events/arch/x86/skylake/metricgroups.json | 113 ++ + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 15 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 1231 +++++++------ + .../arch/x86/skylakex/floating-point.json | 31 + + .../pmu-events/arch/x86/skylakex/metricgroups.json | 114 ++ + .../pmu-events/arch/x86/skylakex/pipeline.json | 23 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 1569 +++++++++------- + .../perf/pmu-events/arch/x86/snowridgex/cache.json | 7 + + .../pmu-events/arch/x86/snowridgex/memory.json | 2 + + .../perf/pmu-events/arch/x86/snowridgex/other.json | 10 + + .../pmu-events/arch/x86/snowridgex/pipeline.json | 3 + + .../arch/x86/snowridgex/uncore-interconnect.json | 14 +- + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 8 - + .../arch/x86/snowridgex/uncore-memory.json | 7 +- + .../arch/x86/snowridgex/uncore-power.json | 6 +- + .../perf/pmu-events/arch/x86/tigerlake/cache.json | 18 + + .../arch/x86/tigerlake/metricgroups.json | 113 ++ + .../pmu-events/arch/x86/tigerlake/pipeline.json | 1 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 1097 +++++------ + tools/perf/pmu-events/empty-pmu-events.c | 5 + + tools/perf/pmu-events/jevents.py | 57 +- + tools/perf/pmu-events/metric.py | 28 +- + tools/perf/pmu-events/metric_test.py | 6 +- + tools/perf/pmu-events/pmu-events.h | 3 + + tools/perf/tests/attr.c | 11 +- + tools/perf/tests/builtin-test.c | 4 +- + tools/perf/tests/cpumap.c | 92 +- + tools/perf/tests/event_groups.c | 7 +- + tools/perf/tests/evsel-roundtrip-name.c | 121 +- + tools/perf/tests/parse-events.c | 1931 ++++++++++---------- + tools/perf/tests/parse-metric.c | 9 +- + tools/perf/tests/pmu-events.c | 18 +- + tools/perf/tests/pmu.c | 17 +- + tools/perf/tests/python-use.c | 2 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 4 +- + tools/perf/tests/shell/stat+csv_output.sh | 14 + + tools/perf/tests/shell/stat+json_output.sh | 13 + + tools/perf/tests/shell/stat.sh | 44 + + .../tests/shell/test_perf_data_converter_json.sh | 72 + + tools/perf/tests/switch-tracking.c | 14 +- + tools/perf/tests/tests.h | 4 +- + tools/perf/tests/topology.c | 16 +- + tools/perf/trace/beauty/beauty.h | 2 +- + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 6 +- + tools/perf/ui/browsers/annotate.c | 4 +- + tools/perf/util/Build | 3 - + tools/perf/util/annotate.c | 13 + + tools/perf/util/cache.h | 2 +- + tools/perf/util/config.c | 3 +- + tools/perf/util/cpumap.c | 14 +- + tools/perf/util/cpumap.h | 11 +- + tools/perf/util/cputopo.c | 12 +- + tools/perf/util/dso.c | 33 + + tools/perf/util/dso.h | 8 +- + tools/perf/util/env.c | 5 +- + tools/perf/util/event.c | 7 +- + tools/perf/util/evlist-hybrid.c | 162 -- + tools/perf/util/evlist-hybrid.h | 15 - + tools/perf/util/evlist.c | 64 +- + tools/perf/util/evlist.h | 10 +- + tools/perf/util/evsel.c | 92 +- + tools/perf/util/evsel.h | 29 +- + tools/perf/util/evsel_fprintf.c | 17 +- + tools/perf/util/evsel_fprintf.h | 1 + + tools/perf/util/header.c | 132 +- + tools/perf/util/header.h | 4 + + tools/perf/util/map.c | 32 +- + tools/perf/util/map.h | 1 + + tools/perf/util/mem-events.c | 25 +- + tools/perf/util/metricgroup.c | 108 +- + tools/perf/util/metricgroup.h | 3 +- + tools/perf/util/parse-events-hybrid.c | 214 --- + tools/perf/util/parse-events-hybrid.h | 25 - + tools/perf/util/parse-events.c | 813 ++++---- + tools/perf/util/parse-events.h | 63 +- + tools/perf/util/parse-events.l | 108 +- + tools/perf/util/parse-events.y | 235 +-- + tools/perf/util/path.c | 35 +- + tools/perf/util/pfm.c | 6 +- + tools/perf/util/pmu-hybrid.c | 72 - + tools/perf/util/pmu-hybrid.h | 33 - + tools/perf/util/pmu.c | 519 +----- + tools/perf/util/pmu.h | 49 +- + tools/perf/util/pmus.c | 493 ++++- + tools/perf/util/pmus.h | 19 +- + tools/perf/util/print-events.c | 128 +- + tools/perf/util/python-ext-sources | 1 - + tools/perf/util/python.c | 14 + + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + .../util/scripting-engines/trace-event-python.c | 5 +- + tools/perf/util/setup.py | 4 + + tools/perf/util/stat-display.c | 36 +- + tools/perf/util/stat.h | 2 + + tools/perf/util/synthetic-events.c | 1 + + tools/perf/util/target.h | 1 - + 202 files changed, 16610 insertions(+), 11107 deletions(-) + create mode 100644 tools/perf/arch/x86/tests/hybrid.c + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/core-imp-def.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/intrinsic.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/ampere/ampereone/spe.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelake/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/metricgroups.json + create mode 100755 tools/perf/tests/shell/test_perf_data_converter_json.sh + delete mode 100644 tools/perf/util/evlist-hybrid.c + delete mode 100644 tools/perf/util/evlist-hybrid.h + delete mode 100644 tools/perf/util/parse-events-hybrid.c + delete mode 100644 tools/perf/util/parse-events-hybrid.h + delete mode 100644 tools/perf/util/pmu-hybrid.c + delete mode 100644 tools/perf/util/pmu-hybrid.h +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 (ec274aff21b6 swiotlb: Omit total_used and used_hiwater if !CONFIG_DEBUG_FS) +$ 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 (3b1ddbb62e7e Merge tag 'virt-to-pfn-for-arch-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/riscv/mm/init.c +Auto-merging fs/proc/kcore.c +Merge made by the 'ort' strategy. + arch/arc/mm/init.c | 2 +- + arch/arm/common/sharpsl_param.c | 2 +- + arch/arm/include/asm/delay.h | 2 +- + arch/arm/include/asm/io.h | 2 +- + arch/arm/include/asm/memory.h | 17 ++++++++++++----- + arch/arm/include/asm/page.h | 4 ++-- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/include/asm/proc-fns.h | 2 -- + arch/arm/include/asm/sparsemem.h | 2 +- + arch/arm/include/asm/uaccess-asm.h | 2 +- + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/kernel/asm-offsets.c | 2 +- + arch/arm/kernel/entry-armv.S | 2 +- + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/head-nommu.S | 3 +-- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/hibernate.c | 2 +- + arch/arm/kernel/suspend.c | 2 +- + arch/arm/kernel/tcm.c | 2 +- + arch/arm/kernel/vmlinux-xip.lds.S | 3 +-- + arch/arm/kernel/vmlinux.lds.S | 3 +-- + arch/arm/mach-berlin/platsmp.c | 2 +- + arch/arm/mach-keystone/keystone.c | 2 +- + arch/arm/mach-omap2/sleep33xx.S | 2 +- + arch/arm/mach-omap2/sleep43xx.S | 2 +- + arch/arm/mach-omap2/sleep44xx.S | 2 +- + arch/arm/mach-pxa/gumstix.c | 2 +- + arch/arm/mach-rockchip/sleep.S | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/headsmp-scu.S | 2 +- + arch/arm/mach-shmobile/headsmp.S | 2 +- + arch/arm/mach-socfpga/headsmp.S | 2 +- + arch/arm/mach-spear/spear.h | 2 +- + arch/arm/mm/cache-fa.S | 1 - + arch/arm/mm/cache-v4wb.S | 1 - + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/dump.c | 2 +- + arch/arm/mm/init.c | 2 +- + arch/arm/mm/kasan_init.c | 1 - + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/physaddr.c | 2 +- + arch/arm/mm/pmsa-v8.c | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-v7m.S | 2 +- + arch/arm/mm/pv-fixup-asm.S | 2 +- + arch/arm64/include/asm/memory.h | 9 ++++++++- + arch/m68k/include/asm/mcf_pgtable.h | 3 +-- + arch/m68k/include/asm/page_mm.h | 11 +++++++++-- + arch/m68k/include/asm/page_no.h | 11 +++++++++-- + arch/m68k/include/asm/sun3_pgtable.h | 4 ++-- + arch/m68k/mm/mcfmmu.c | 3 ++- + arch/m68k/mm/motorola.c | 4 ++-- + arch/m68k/mm/sun3mmu.c | 2 +- + arch/m68k/sun3/dvma.c | 2 +- + arch/m68k/sun3x/dvma.c | 2 +- + arch/riscv/mm/init.c | 4 ++-- + drivers/memory/ti-emif-sram-pm.S | 2 +- + drivers/net/xen-netback/netback.c | 2 +- + fs/netfs/iterator.c | 2 +- + fs/proc/kcore.c | 2 +- + fs/smb/client/cifsglob.h | 2 +- + fs/smb/client/smbdirect.c | 2 +- + include/asm-generic/page.h | 12 ++++++++++-- + 64 files changed, 108 insertions(+), 80 deletions(-) +Merging arc/for-next (f2906aa86338 Linux 5.19-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 (fc6750b0d4a9 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 (55f7e5a31078 Merge branch 'for-next/feat_s1pie' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/mm/fault.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/arm64/booting.rst | 32 +++ + Documentation/arm64/cpu-feature-registers.rst | 2 + + Documentation/arm64/elf_hwcaps.rst | 3 + + Documentation/arm64/memory.rst | 8 +- + arch/arm64/Kconfig | 28 +-- + arch/arm64/include/asm/alternative.h | 3 + + arch/arm64/include/asm/archrandom.h | 2 + + arch/arm64/include/asm/compat.h | 2 + + arch/arm64/include/asm/cpu.h | 1 + + arch/arm64/include/asm/efi.h | 2 + + arch/arm64/include/asm/el2_setup.h | 29 ++- + arch/arm64/include/asm/esr.h | 30 ++- + arch/arm64/include/asm/exception.h | 1 + + arch/arm64/include/asm/hw_breakpoint.h | 8 + + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kernel-pgtable.h | 8 +- + arch/arm64/include/asm/kvm_arm.h | 4 + + arch/arm64/include/asm/kvm_asm.h | 18 ++ + arch/arm64/include/asm/kvm_host.h | 7 +- + arch/arm64/include/asm/memory.h | 16 +- + arch/arm64/include/asm/module.h | 8 - + arch/arm64/include/asm/module.lds.h | 2 - + arch/arm64/include/asm/pgtable-hwdef.h | 8 + + arch/arm64/include/asm/pgtable-prot.h | 122 +++++++++--- + arch/arm64/include/asm/scs.h | 1 + + arch/arm64/include/asm/spectre.h | 16 ++ + arch/arm64/include/asm/syscall_wrapper.h | 4 + + arch/arm64/include/asm/sysreg.h | 35 ++-- + arch/arm64/include/asm/traps.h | 2 + + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/Makefile | 3 +- + arch/arm64/kernel/cpufeature.c | 53 ++++- + arch/arm64/kernel/cpuidle.c | 2 +- + arch/arm64/kernel/cpuinfo.c | 2 + + arch/arm64/kernel/entry-common.c | 17 +- + arch/arm64/kernel/entry.S | 57 ++---- + arch/arm64/kernel/ftrace.c | 8 +- + arch/arm64/kernel/head.S | 8 +- + arch/arm64/kernel/hw_breakpoint.c | 8 - + arch/arm64/kernel/hyp-stub.S | 18 ++ + arch/arm64/kernel/idreg-override.c | 2 + + arch/arm64/kernel/kaslr.c | 83 ++------ + arch/arm64/kernel/module-plts.c | 1 + + arch/arm64/kernel/module.c | 153 ++++++++++---- + arch/arm64/kernel/setup.c | 2 + + arch/arm64/kernel/signal.c | 1 + + arch/arm64/kernel/traps.c | 61 +++++- + arch/arm64/kvm/hyp/include/hyp/switch.h | 6 + + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 12 ++ + arch/arm64/kvm/sys_regs.c | 16 +- + arch/arm64/lib/xor-neon.c | 8 +- + arch/arm64/mm/fault.c | 20 +- + arch/arm64/mm/flush.c | 1 + + arch/arm64/mm/kasan_init.c | 17 +- + arch/arm64/mm/proc.S | 19 +- + arch/arm64/tools/cpucaps | 4 + + arch/arm64/tools/gen-cpucaps.awk | 4 +- + arch/arm64/tools/sysreg | 220 ++++++++++++++++++++- + tools/testing/selftests/arm64/abi/hwcap.c | 22 +++ + tools/testing/selftests/arm64/abi/ptrace.c | 32 ++- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 53 ++++- + 62 files changed, 1011 insertions(+), 309 deletions(-) +Merging arm-perf/for-next/perf (8be3593b9efa drivers/perf: apple_m1: Force 63bit counters for M2 CPUs) +$ 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 +Auto-merging drivers/perf/arm_pmu.c +Auto-merging include/linux/perf/arm_pmu.h +Merge made by the 'ort' strategy. + drivers/perf/apple_m1_cpu_pmu.c | 30 ++++++++++++++++++++++++------ + drivers/perf/arm-cci.c | 4 ++-- + drivers/perf/arm-cmn.c | 7 ++++--- + drivers/perf/arm_pmu.c | 2 ++ + drivers/perf/qcom_l2_pmu.c | 2 +- + include/linux/perf/arm_pmu.h | 2 ++ + 6 files changed, 35 insertions(+), 12 deletions(-) +Merging arm-soc/for-next (e5047345bb6c soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-sa1100/pm.c +Merge made by the 'ort' strategy. + .../bindings/arm/nuvoton/nuvoton,ma35d1.yaml | 30 + + .../{npcm/npcm.yaml => nuvoton/nuvoton,npcm.yaml} | 2 +- + .../bindings/arm/samsung/samsung-boards.yaml | 10 + + .../bindings/clock/nuvoton,ma35d1-clk.yaml | 63 ++ + .../bindings/reset/nuvoton,ma35d1-reset.yaml | 45 + + .../devicetree/bindings/reset/oxnas,reset.txt | 32 - + .../bindings/serial/nuvoton,ma35d1-serial.yaml | 48 ++ + .../nuvoton/nuvoton,npcm-gcr.yaml} | 2 +- + Documentation/devicetree/bindings/sram/sram.yaml | 1 + + Documentation/process/maintainer-handbooks.rst | 3 +- + Documentation/process/maintainer-soc.rst | 177 ++++ + MAINTAINERS | 14 +- + arch/arm/arm-soc-for-next-contents.txt | 80 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-myirtech-myc.dtsi | 1 + + arch/arm/boot/dts/at91-kizbox3-hs.dts | 2 +- + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 2 +- + arch/arm/boot/dts/at91-tse850-3.dts | 60 ++ + arch/arm/boot/dts/at91rm9200.dtsi | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g20.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 4 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 25 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 4 +- + arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 4 +- + arch/arm/boot/dts/en7523.dtsi | 2 + + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 4 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 6 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 - + arch/arm/boot/dts/exynos4210-universal_c210.dts | 3 - + arch/arm/boot/dts/exynos4212.dtsi | 157 ++++ + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 - + arch/arm/boot/dts/exynos4412.dtsi | 646 +------------- + ...os4412-pinctrl.dtsi => exynos4x12-pinctrl.dtsi} | 6 +- + arch/arm/boot/dts/exynos4x12.dtsi | 664 +++++++++++++++ + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5420.dtsi | 2 +- + arch/arm/boot/dts/exynos5800.dtsi | 2 +- + arch/arm/boot/dts/lan966x-pcb8309.dts | 14 + + arch/arm/boot/dts/mba6ulx.dtsi | 2 +- + arch/arm/boot/dts/omap4-epson-embt2ws.dts | 450 ++++++++++ + arch/arm/boot/dts/s3c6400.dtsi | 2 +- + arch/arm/boot/dts/s3c6410.dtsi | 2 +- + arch/arm/boot/dts/s3c64xx.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 14 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 8 + + arch/arm/boot/dts/s5pv210.dtsi | 14 +- + arch/arm/boot/dts/sam9x60.dtsi | 4 +- + arch/arm/boot/dts/sama5d2.dtsi | 5 +- + arch/arm/boot/dts/sama5d3.dtsi | 4 +- + arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 4 +- + arch/arm/boot/dts/sama7g5.dtsi | 2 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 79 +- + arch/arm/boot/dts/ste-href-ab8500.dtsi | 18 + + arch/arm/boot/dts/ste-href-stuib.dtsi | 5 +- + arch/arm/boot/dts/ste-href.dtsi | 6 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 18 +- + arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 6 +- + arch/arm/boot/dts/ste-snowball.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 +- + arch/arm/common/sa1111.c | 2 +- + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm/mach-davinci/common.c | 1 + + arch/arm/mach-davinci/common.h | 6 - + arch/arm/mach-ep93xx/timer-ep93xx.c | 3 +- + arch/arm/mach-highbank/pm.c | 2 + + arch/arm/mach-imx/pm-imx25.c | 1 + + arch/arm/mach-lpc32xx/serial.c | 1 + + arch/arm/mach-omap1/board-ams-delta.c | 1 - + arch/arm/mach-omap1/board-nokia770.c | 205 +++-- + arch/arm/mach-omap1/board-osk.c | 146 +++- + arch/arm/mach-omap1/board-palmte.c | 51 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 1 - + arch/arm/mach-omap1/board-sx1.c | 40 +- + arch/arm/mach-omap1/devices.c | 1 - + arch/arm/mach-omap1/gpio15xx.c | 1 - + arch/arm/mach-omap1/gpio16xx.c | 1 - + arch/arm/mach-omap1/irq.c | 1 - + arch/arm/mach-omap1/serial.c | 31 +- + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/board-n8x0.c | 156 +--- + arch/arm/mach-omap2/omap_device.c | 1 - + arch/arm/mach-omap2/pdata-quirks.c | 130 +-- + arch/arm/mach-omap2/usb-tusb6010.c | 20 +- + arch/arm/mach-omap2/usb-tusb6010.h | 12 + + arch/arm/mach-orion5x/board-dt.c | 3 + + arch/arm/mach-orion5x/common.h | 6 + + arch/arm/mach-pxa/generic.h | 15 - + arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + + arch/arm/mach-pxa/pxa25x.c | 1 + + arch/arm/mach-pxa/pxa27x.c | 3 + + arch/arm/mach-pxa/reset.c | 1 + + arch/arm/mach-pxa/spitz.c | 11 +- + arch/arm/mach-pxa/spitz_pm.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 + + arch/arm/mach-spear/pl080.c | 1 + + arch/arm/mach-versatile/versatile.c | 2 +- + arch/arm64/Kconfig.platforms | 8 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + + arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 4 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 8 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 + + arch/arm64/boot/dts/freescale/s32g2.dtsi | 2 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 4 + + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 16 + + arch/arm64/boot/dts/microchip/sparx5.dtsi | 10 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 26 +- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 10 +- + .../boot/dts/microchip/sparx5_pcb_common.dtsi | 12 + + arch/arm64/boot/dts/nuvoton/Makefile | 2 + + arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts | 56 ++ + arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts | 56 ++ + arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 234 ++++++ + arch/arm64/boot/dts/realtek/rtd1293.dtsi | 2 + + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 2 + + arch/arm64/boot/dts/realtek/rtd1296.dtsi | 2 + + arch/arm64/boot/dts/realtek/rtd1395.dtsi | 2 + + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 4 + + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 50 ++ + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 123 +++ + .../renesas/r9a07g044c2-smarc-cru-csi-ov5645.dtso | 21 + + .../renesas/r9a07g044l2-smarc-cru-csi-ov5645.dtso | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 203 +++++ + .../renesas/r9a07g054l2-smarc-cru-csi-ov5645.dtso | 1 + + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 79 ++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 79 ++ + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 2 + + arch/arm64/configs/defconfig | 4 + + arch/mips/alchemy/devboards/db1000.c | 11 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/nuvoton/Kconfig | 19 + + drivers/clk/nuvoton/Makefile | 4 + + drivers/clk/nuvoton/clk-ma35d1-divider.c | 135 +++ + drivers/clk/nuvoton/clk-ma35d1-pll.c | 361 ++++++++ + drivers/clk/nuvoton/clk-ma35d1.c | 933 +++++++++++++++++++++ + drivers/clk/pxa/clk-pxa25x.c | 2 + + drivers/clk/pxa/clk-pxa27x.c | 3 +- + drivers/gpio/gpio-twl4030.c | 52 +- + drivers/hwmon/max1111.c | 1 + + drivers/input/touchscreen/ads7846.c | 117 +-- + drivers/mfd/tps65010.c | 14 +- + drivers/misc/sram.c | 9 +- + drivers/mmc/host/omap.c | 46 +- + drivers/reset/Kconfig | 11 +- + drivers/reset/Makefile | 2 +- + drivers/reset/reset-ath79.c | 4 +- + drivers/reset/reset-axs10x.c | 4 +- + drivers/reset/reset-brcmstb-rescal.c | 4 +- + drivers/reset/reset-hsdk.c | 7 +- + drivers/reset/reset-lpc18xx.c | 4 +- + drivers/reset/reset-ma35d1.c | 235 ++++++ + drivers/reset/reset-meson-audio-arb.c | 7 +- + drivers/reset/reset-meson.c | 4 +- + drivers/reset/reset-oxnas.c | 114 --- + drivers/reset/starfive/Kconfig | 3 +- + drivers/reset/sti/Kconfig | 4 - + drivers/reset/sti/Makefile | 4 +- + drivers/reset/sti/reset-syscfg.c | 18 +- + drivers/soc/renesas/rcar-rst.c | 15 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 6 - + drivers/usb/host/ohci-pxa27x.c | 7 +- + drivers/usb/musb/musb_core.c | 1 - + drivers/usb/musb/musb_core.h | 2 - + drivers/usb/musb/tusb6010.c | 53 +- + drivers/video/fbdev/omap/lcd_mipid.c | 10 + + include/dt-bindings/clock/nuvoton,ma35d1-clk.h | 253 ++++++ + include/dt-bindings/reset/nuvoton,ma35d1-reset.h | 108 +++ + include/linux/arm-cci.h | 2 + + include/linux/mfd/tps65010.h | 11 +- + include/linux/mfd/twl.h | 3 - + include/linux/platform_data/asoc-pxa.h | 1 + + include/linux/platform_data/davinci-cpufreq.h | 6 + + include/linux/platform_data/lcd-mipid.h | 2 - + include/linux/platform_data/mmc-omap.h | 2 - + include/linux/platform_data/pxa2xx_udc.h | 6 + + include/linux/soc/pxa/smemc.h | 16 + + include/linux/spi/ads7846.h | 2 - + include/linux/usb/musb.h | 13 - + sound/arm/pxa2xx-ac97-lib.c | 2 - + 208 files changed, 5854 insertions(+), 1571 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/nuvoton/nuvoton,ma35d1.yaml + rename Documentation/devicetree/bindings/arm/{npcm/npcm.yaml => nuvoton/nuvoton,npcm.yaml} (93%) + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,ma35d1-clk.yaml + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,ma35d1-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/oxnas,reset.txt + create mode 100644 Documentation/devicetree/bindings/serial/nuvoton,ma35d1-serial.yaml + rename Documentation/devicetree/bindings/{arm/npcm/nuvoton,gcr.yaml => soc/nuvoton/nuvoton,npcm-gcr.yaml} (93%) + create mode 100644 Documentation/process/maintainer-soc.rst + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/exynos4212.dtsi + rename arch/arm/boot/dts/{exynos4412-pinctrl.dtsi => exynos4x12-pinctrl.dtsi} (99%) + create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi + create mode 100644 arch/arm/boot/dts/omap4-epson-embt2ws.dts + create mode 100644 arch/arm/mach-omap2/usb-tusb6010.h + create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts + create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts + create mode 100644 arch/arm64/boot/dts/nuvoton/ma35d1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc-cru-csi-ov5645.dtso + create mode 120000 arch/arm64/boot/dts/renesas/r9a07g054l2-smarc-cru-csi-ov5645.dtso + create mode 100644 drivers/clk/nuvoton/Kconfig + create mode 100644 drivers/clk/nuvoton/Makefile + create mode 100644 drivers/clk/nuvoton/clk-ma35d1-divider.c + create mode 100644 drivers/clk/nuvoton/clk-ma35d1-pll.c + create mode 100644 drivers/clk/nuvoton/clk-ma35d1.c + create mode 100644 drivers/reset/reset-ma35d1.c + delete mode 100644 drivers/reset/reset-oxnas.c + create mode 100644 include/dt-bindings/clock/nuvoton,ma35d1-clk.h + create mode 100644 include/dt-bindings/reset/nuvoton,ma35d1-reset.h +Merging amlogic/for-next (8fb90cd6a66f Merge branch 'v6.5/arm-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 | 9 ++++++++- + arch/arm/boot/dts/meson8.dtsi | 4 ++-- + arch/arm/boot/dts/meson8b.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 1 + + 9 files changed, 18 insertions(+), 5 deletions(-) +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 +Merge made by the 'ort' strategy. + 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 (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Already up to date. +Merging at91/at91-next (9c8457a847fa Merge branch 'clk-microchip' 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. + .../devicetree/bindings/clock/at91-clock.txt | 58 -------- + .../bindings/clock/atmel,at91rm9200-pmc.yaml | 154 +++++++++++++++++++++ + .../bindings/clock/atmel,at91sam9x5-sckc.yaml | 70 ++++++++++ + drivers/clk/microchip/Kconfig | 4 +- + drivers/clk/microchip/clk-pic32mzda.c | 2 +- + 5 files changed, 227 insertions(+), 61 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/atmel,at91rm9200-pmc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/atmel,at91sam9x5-sckc.yaml +Merging broadcom/next (1ada87a05856 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8064431e7fbe] Merge branch 'next' of https://github.com/Broadcom/stblinux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 14 +- + .../bindings/soc/bcm/brcm,bcm23550-cdc.yaml | 35 ++ + MAINTAINERS | 37 +- + arch/arm/boot/dts/Makefile | 18 + + arch/arm/boot/dts/bcm-ns.dtsi | 395 +++++++++++++++++++++ + arch/arm/boot/dts/bcm11351.dtsi | 8 +- + arch/arm/boot/dts/bcm21664-garnet.dts | 6 +- + arch/arm/boot/dts/bcm21664.dtsi | 8 +- + arch/arm/boot/dts/bcm23550.dtsi | 16 +- + arch/arm/boot/dts/bcm28155-ap.dts | 4 +- + .../dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 4 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 15 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 13 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 4 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 15 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 13 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 11 + + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 13 + + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 11 + + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 13 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 13 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 5 +- + arch/arm/boot/dts/bcm47622.dtsi | 1 + + arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 2 - + arch/arm/boot/dts/bcm5301x.dtsi | 390 +------------------- + arch/arm/boot/dts/bcm63148.dtsi | 1 + + arch/arm/boot/dts/bcm63178.dtsi | 1 + + arch/arm/boot/dts/bcm6756.dtsi | 1 + + arch/arm/boot/dts/bcm6846.dtsi | 1 + + arch/arm/boot/dts/bcm6855.dtsi | 1 + + arch/arm/boot/dts/bcm6878.dtsi | 1 + + arch/arm64/boot/dts/broadcom/Makefile | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 1 + + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 1 + + .../dts/broadcom/stingray/stingray-pinctrl.dtsi | 52 +-- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 + + 46 files changed, 673 insertions(+), 477 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm23550-cdc.yaml + create mode 100644 arch/arm/boot/dts/bcm-ns.dtsi +Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-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 (d3369a4b6f01 memory: atmel-sdramc: remove the driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-at91/Kconfig | 4 --- + drivers/memory/Kconfig | 11 ------ + drivers/memory/Makefile | 1 - + drivers/memory/atmel-sdramc.c | 74 ----------------------------------------- + drivers/memory/brcmstb_dpfe.c | 4 ++- + drivers/memory/renesas-rpc-if.c | 53 +++++++++++++++++++++-------- + 6 files changed, 42 insertions(+), 105 deletions(-) + delete mode 100644 drivers/memory/atmel-sdramc.c +Merging imx-mxs/for-next (a5f80078e832 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 +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/imx7d-sdb.dts +Auto-merging arch/arm/boot/dts/mba6ulx.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 14 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 10 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 6 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 6 +- + arch/arm/boot/dts/imx28-tx28.dts | 6 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx35.dtsi | 1 - + arch/arm/boot/dts/imx51-zii-rdu1.dts | 8 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 - + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-alti6p.dts | 10 + + arch/arm/boot/dts/imx6dl-lanmcu.dts | 9 + + arch/arm/boot/dts/imx6dl-plybas.dts | 2 +- + arch/arm/boot/dts/imx6dl-plym2m.dts | 24 + + arch/arm/boot/dts/imx6dl-prtmvt.dts | 11 +- + arch/arm/boot/dts/imx6dl-prtrvt.dts | 4 + + arch/arm/boot/dts/imx6dl-prtvt7.dts | 28 +- + arch/arm/boot/dts/imx6dl-qmx6.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 24 + + arch/arm/boot/dts/imx6q-cm-fx6.dts | 4 +- + arch/arm/boot/dts/imx6q-display5.dtsi | 6 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-h100.dts | 2 +- + arch/arm/boot/dts/imx6q-kp.dtsi | 4 +- + arch/arm/boot/dts/imx6q-novena.dts | 2 +- + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-prtwd2.dts | 3 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 61 ++- + arch/arm/boot/dts/imx6qdl-mba6a.dtsi | 6 + + arch/arm/boot/dts/imx6qdl-mba6b.dtsi | 6 + + arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-prti6q.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-vicut1-12inch.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl.dtsi | 2 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 2 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sll-evk.dts | 75 ++- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 2 +- + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 44 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-pico.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-prti6g.dts | 1 + + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 14 +- + arch/arm/boot/dts/imx6ull-dhcom-som.dtsi | 2 - + arch/arm/boot/dts/imx6ull-dhcor-maveo-box.dts | 359 +++++++++++++ + arch/arm/boot/dts/imx6ull-dhcor-som.dtsi | 5 + + arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi | 1 - + arch/arm/boot/dts/imx7d-flex-concentrator.dts | 2 - + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pico.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 58 +- + arch/arm/boot/dts/imx7d-smegw01.dts | 14 +- + arch/arm/boot/dts/imx7s-warp.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imx7ulp.dtsi | 2 + + arch/arm/boot/dts/mba6ulx.dtsi | 4 + + arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 8 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 12 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 32 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 +- + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 3 - + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 1 + + .../boot/dts/freescale/imx8mm-emtop-baseboard.dts | 15 + + .../arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi | 261 +++++++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 67 +++ + arch/arm64/boot/dts/freescale/imx8mm-evkb.dts | 128 +++++ + arch/arm64/boot/dts/freescale/imx8mm-phg.dts | 87 +++ + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 2 + + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 2 - + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 107 +++- + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 40 -- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 60 +++ + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 89 ++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 54 ++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 60 ++- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 72 +++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 80 +++ + .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 70 +++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 46 ++ + .../boot/dts/freescale/imx8mp-venice-gw702x.dtsi | 587 +++++++++++++++++++++ + .../boot/dts/freescale/imx8mp-venice-gw7905-2x.dts | 28 + + .../boot/dts/freescale/imx8mp-venice-gw7905.dtsi | 309 +++++++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 270 ++++++++++ + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 4 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 129 +++-- + arch/arm64/configs/defconfig | 5 + + 127 files changed, 3431 insertions(+), 241 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6ull-dhcor-maveo-box.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emtop-baseboard.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evkb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw702x.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw7905-2x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw7905.dtsi +Merging mediatek/for-next (8a5cc5b87d9d 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/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 4 + + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 4 +- + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 1 + + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 11 +- + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt6331.dtsi | 284 ++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt6755-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt6795-evb.dts | 1 + + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 101 +++++++ + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 94 +++++++ + arch/arm64/boot/dts/mediatek/mt6797-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts | 1 + + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 43 ++- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 1 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 7 +- + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 18 ++ + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 14 + + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts | 1 + + .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 4 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 1 + + .../mt8183-kukui-jacuzzi-juniper-sku16.dts | 1 + + .../dts/mediatek/mt8183-kukui-kakadu-sku22.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 1 + + .../dts/mediatek/mt8183-kukui-kodama-sku16.dts | 1 + + .../dts/mediatek/mt8183-kukui-kodama-sku272.dts | 1 + + .../dts/mediatek/mt8183-kukui-kodama-sku288.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-krane-sku0.dts | 1 + + .../dts/mediatek/mt8183-kukui-krane-sku176.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 6 + + arch/arm64/boot/dts/mediatek/mt8186-evb.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 227 ++++++++++++++++ + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 81 ++++++ + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 4 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 86 +++++- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 29 ++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 256 ++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 235 +++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 142 ++++++++++ + arch/arm64/configs/defconfig | 2 + + drivers/soc/mediatek/mtk-mutex.c | 1 - + drivers/soc/mediatek/mtk-pmic-wrap.c | 292 +++++++++++++++++++-- + 51 files changed, 1926 insertions(+), 47 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6331.dtsi +Merging mvebu/for-next (64687391f64d Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-388-clearfog.dts | 7 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 +- + arch/arm/boot/dts/kirkwood-4i-edge-200.dts | 205 +++++++++++++++++++++ + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 2 + + 8 files changed, 220 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/kirkwood-4i-edge-200.dts +Merging omap/for-next (972e3fc791a8 Merge branch '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 +Auto-merging arch/arm/boot/dts/am57xx-cl-som-am57x.dts +Auto-merging arch/arm/boot/dts/omap3-cm-t3x.dtsi +Auto-merging arch/arm/boot/dts/omap3-lilly-a83x.dtsi +Auto-merging arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi +Auto-merging arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi +Auto-merging arch/arm/boot/dts/omap3-pandora-common.dtsi +Auto-merging arch/arm/boot/dts/omap5-cm-t54.dts +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 4 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 8 +-- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 10 +-- + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 2 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 20 +++--- + arch/arm/boot/dts/am335x-base0033.dts | 6 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 22 +++--- + arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi | 6 +- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 8 +-- + arch/arm/boot/dts/am335x-boneblue.dts | 34 +++++----- + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 8 +-- + arch/arm/boot/dts/am335x-chiliboard.dts | 16 ++--- + arch/arm/boot/dts/am335x-chilisom.dtsi | 4 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 36 +++++----- + arch/arm/boot/dts/am335x-evm.dts | 40 +++++------ + arch/arm/boot/dts/am335x-evmsk.dts | 34 +++++----- + arch/arm/boot/dts/am335x-guardian.dts | 30 ++++----- + arch/arm/boot/dts/am335x-icev2.dts | 18 ++--- + arch/arm/boot/dts/am335x-igep0033.dtsi | 8 +-- + arch/arm/boot/dts/am335x-lxm.dts | 16 ++--- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 12 ++-- + arch/arm/boot/dts/am335x-moxa-uc-2101.dts | 4 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 24 +++---- + arch/arm/boot/dts/am335x-myirtech-myc.dtsi | 20 +++--- + arch/arm/boot/dts/am335x-myirtech-myd.dts | 50 +++++++------- + arch/arm/boot/dts/am335x-nano.dts | 20 +++--- + arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 4 +- + arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 4 +- + arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 6 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 18 ++--- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 18 ++--- + arch/arm/boot/dts/am335x-pdu001.dts | 28 ++++---- + arch/arm/boot/dts/am335x-pepper.dts | 34 +++++----- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 10 +-- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 26 ++++---- + arch/arm/boot/dts/am335x-regor.dtsi | 14 ++-- + arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi | 6 +- + .../boot/dts/am335x-sancloud-bbe-extended-wifi.dts | 6 +- + arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts | 2 +- + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 4 +- + arch/arm/boot/dts/am335x-sbc-t335.dts | 4 +- + arch/arm/boot/dts/am335x-shc.dts | 30 ++++----- + arch/arm/boot/dts/am335x-sl50.dts | 46 ++++++------- + arch/arm/boot/dts/am335x-wega.dtsi | 12 ++-- + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am3517-evm-ui.dtsi | 4 +- + arch/arm/boot/dts/am3517-evm.dts | 20 +++--- + arch/arm/boot/dts/am3517-som.dtsi | 14 ++-- + arch/arm/boot/dts/am3874-iceboard.dts | 16 ++--- + arch/arm/boot/dts/am437x-cm-t43.dts | 14 ++-- + arch/arm/boot/dts/am437x-gp-evm.dts | 78 +++++++++++----------- + arch/arm/boot/dts/am437x-idk-evm.dts | 32 ++++----- + arch/arm/boot/dts/am437x-sbc-t43.dts | 14 ++-- + arch/arm/boot/dts/am437x-sk-evm.dts | 54 +++++++-------- + arch/arm/boot/dts/am43x-epos-evm.dts | 72 ++++++++++---------- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 28 ++++---- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 +- + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 14 ++-- + arch/arm/boot/dts/dm8148-evm.dts | 6 +- + arch/arm/boot/dts/dm8148-t410.dts | 6 +- + arch/arm/boot/dts/dm8168-evm.dts | 10 +-- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 4 +- + arch/arm/boot/dts/dra7-evm.dts | 4 +- + arch/arm/boot/dts/dra7-mmc-iodelay.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 28 ++++---- + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 44 ++++++------ + arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 16 ++--- + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 2 +- + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 2 +- + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 16 ++--- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 24 +++---- + arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 2 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 6 +- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 26 ++++---- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 14 ++-- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 40 +++++------ + arch/arm/boot/dts/omap2420-n810.dts | 4 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 14 ++-- + arch/arm/boot/dts/omap3-beagle.dts | 14 ++-- + arch/arm/boot/dts/omap3-cm-t3517.dts | 14 ++-- + arch/arm/boot/dts/omap3-cm-t3530.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 6 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 20 +++--- + arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 4 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-echo.dts | 12 ++-- + arch/arm/boot/dts/omap3-evm-37xx.dts | 4 +- + arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 18 ++--- + arch/arm/boot/dts/omap3-evm.dts | 4 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 54 +++++++-------- + arch/arm/boot/dts/omap3-gta04a5.dts | 10 +-- + arch/arm/boot/dts/omap3-gta04a5one.dts | 6 +- + arch/arm/boot/dts/omap3-ha-common.dtsi | 16 ++--- + arch/arm/boot/dts/omap3-ha-lcd.dts | 10 +-- + arch/arm/boot/dts/omap3-igep.dtsi | 16 ++--- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 14 ++-- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 10 +-- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 4 +- + arch/arm/boot/dts/omap3-igep0030.dts | 2 +- + arch/arm/boot/dts/omap3-ldp.dts | 6 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 30 ++++----- + arch/arm/boot/dts/omap3-lilly-dbb056.dts | 12 ++-- + arch/arm/boot/dts/omap3-n900.dts | 34 +++++----- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 18 ++--- + arch/arm/boot/dts/omap3-n950.dts | 8 +-- + arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 14 ++-- + arch/arm/boot/dts/omap3-overo-chestnut43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-common-dvi.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 10 +-- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 10 +-- + .../boot/dts/omap3-overo-common-peripherals.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-gallop43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-palo35.dts | 4 +- + arch/arm/boot/dts/omap3-overo-palo43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-storm-gallop43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 4 +- + arch/arm/boot/dts/omap3-overo-storm-palo43.dts | 4 +- + arch/arm/boot/dts/omap3-overo-storm-summit.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-summit.dts | 2 +- + arch/arm/boot/dts/omap3-overo.dtsi | 4 +- + arch/arm/boot/dts/omap3-pandora-1ghz.dts | 6 +- + arch/arm/boot/dts/omap3-pandora-600mhz.dts | 6 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 16 ++--- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 8 +-- + arch/arm/boot/dts/omap3-sbc-t3517.dts | 4 +- + arch/arm/boot/dts/omap3-sbc-t3530.dts | 2 +- + arch/arm/boot/dts/omap3-sbc-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-sniper.dts | 20 +++--- + arch/arm/boot/dts/omap3-tao3530.dtsi | 20 +++--- + arch/arm/boot/dts/omap3-thunder.dts | 6 +- + arch/arm/boot/dts/omap3-zoom3.dts | 18 ++--- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 12 ++-- + arch/arm/boot/dts/omap4-duovero.dtsi | 18 ++--- + arch/arm/boot/dts/omap4-kc1.dts | 14 ++-- + arch/arm/boot/dts/omap4-mcpdm.dtsi | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 30 ++++----- + arch/arm/boot/dts/omap4-panda-es.dts | 8 +-- + arch/arm/boot/dts/omap4-sdp.dts | 36 +++++----- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 24 +++---- + arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 6 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 22 +++--- + arch/arm/boot/dts/omap5-board-common.dtsi | 42 ++++++------ + arch/arm/boot/dts/omap5-cm-t54.dts | 32 ++++----- + arch/arm/boot/dts/omap5-igep0050.dts | 4 +- + arch/arm/boot/dts/omap5-sbc-t54.dts | 4 +- + arch/arm/boot/dts/omap5-uevm.dts | 6 +- + arch/arm/boot/dts/twl4030_omap3.dtsi | 4 +- + arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap1/sram-init.c | 2 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 1 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 ++- + arch/arm/mach-omap2/omap_phy_internal.c | 12 ++-- + arch/arm/mach-omap2/sdrc2xxx.c | 2 - + arch/arm/mach-omap2/sram.c | 4 +- + arch/arm/mach-omap2/ti81xx-restart.c | 3 +- + drivers/bus/ti-sysc.c | 4 +- + 165 files changed, 1118 insertions(+), 1117 deletions(-) +Merging qcom/for-next (8d5a57ea6a0b Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'clk-for-6.5', 'drivers-fixes-for-6.4', 'drivers-for-6.5', 'dts-fixes-for-6.4' and 'dts-for-6.5' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 18 +- + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8953.yaml | 73 + + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 1 - + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 5 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 3 + + .../bindings/clock/qcom,ipq9574-gcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,sdx75-gcc.yaml | 65 + + .../bindings/clock/qcom,sm8350-videocc.yaml | 68 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 75 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 79 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 3 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,eud.yaml | 4 +- + .../bindings/soc/qcom/qcom,rpm-master-stats.yaml | 69 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + .../devicetree/bindings/sram/qcom,imem.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts | 28 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 82 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 83 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 8 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 12 +- + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 2 +- + arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 25 + + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 16 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 35 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 10 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 4 +- + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 42 + + arch/arm/boot/dts/qcom-sdx65.dtsi | 87 + + arch/arm64/boot/dts/qcom/Makefile | 12 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 213 +- + arch/arm64/boot/dts/qcom/apq8039-t2.dts | 492 +++ + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 117 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 7 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 32 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 51 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts | 124 + + .../{ipq9574-al02-c7.dts => ipq9574-rdp433.dts} | 21 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts | 80 + + arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts | 80 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 343 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 135 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 140 +- + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 136 +- + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 136 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 183 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 136 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 150 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 58 +- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 125 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 168 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 18 +- + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 6 +- + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +- + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 130 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 8 +- + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 125 +- + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 151 +- + arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 8 +- + arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 10 +- + arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 114 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 141 +- + .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 8 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 116 +- + arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 82 + + .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 183 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 2452 ++++++++++++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 56 +- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 6 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 5 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 29 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 311 +- + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 1 + + arch/arm64/boot/dts/qcom/pm8550.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi632.dtsi | 165 + + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 6 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 23 + + arch/arm64/boot/dts/qcom/pmk8550.dtsi | 23 + + arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 4 +- + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 277 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 56 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 238 ++ + arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 126 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 1321 ++++++- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 845 ++++ + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 4 - + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 37 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 583 +++ + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 326 ++ + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 706 ++++ + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 4030 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 109 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 28 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 139 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 29 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 36 + + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 22 + + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +- + .../arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 3 + + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 250 ++ + arch/arm64/boot/dts/qcom/sm6115.dtsi | 198 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 3 + + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 8 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 44 +- + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 335 ++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 39 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 5 + + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8250.dtsi | 34 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 76 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 54 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 73 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 93 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 64 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 237 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 72 +- + arch/arm64/configs/defconfig | 3 + + drivers/clk/qcom/Kconfig | 123 + + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/apss-ipq-pll.c | 19 + + drivers/clk/qcom/camcc-sc7180.c | 19 +- + drivers/clk/qcom/clk-alpha-pll.c | 2 + + drivers/clk/qcom/clk-alpha-pll.h | 1 + + drivers/clk/qcom/clk-branch.c | 6 +- + drivers/clk/qcom/clk-rcg.h | 2 + + drivers/clk/qcom/clk-rcg2.c | 2 + + drivers/clk/qcom/clk-rpmh.c | 19 + + drivers/clk/qcom/clk-smd-rpm.c | 58 +- + drivers/clk/qcom/dispcc-qcm2290.c | 12 +- + drivers/clk/qcom/gcc-ipq5332.c | 6 +- + drivers/clk/qcom/gcc-ipq6018.c | 43 +- + drivers/clk/qcom/gcc-ipq9574.c | 434 +-- + drivers/clk/qcom/gcc-qcm2290.c | 62 +- + drivers/clk/qcom/gcc-sdm660.c | 2 - + drivers/clk/qcom/gcc-sdx75.c | 2970 +++++++++++++++ + drivers/clk/qcom/gcc-sm8450.c | 39 + + drivers/clk/qcom/gpucc-sm8450.c | 766 ++++ + drivers/clk/qcom/gpucc-sm8550.c | 611 +++ + drivers/clk/qcom/mmcc-msm8974.c | 21 +- + drivers/clk/qcom/videocc-sm8350.c | 552 +++ + drivers/clk/qcom/videocc-sm8450.c | 463 +++ + drivers/clk/qcom/videocc-sm8550.c | 470 +++ + drivers/cpufreq/qcom-cpufreq-nvmem.c | 63 +- + drivers/soc/qcom/Kconfig | 11 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/mdt_loader.c | 41 +- + drivers/soc/qcom/ocmem.c | 10 + + drivers/soc/qcom/pmic_glink.c | 8 +- + drivers/soc/qcom/qmi_interface.c | 2 +- + drivers/soc/qcom/ramp_controller.c | 11 +- + drivers/soc/qcom/rpm_master_stats.c | 163 + + drivers/soc/qcom/rpmpd.c | 4 +- + drivers/soc/qcom/smem.c | 31 +- + drivers/soc/qcom/socinfo.c | 77 +- + include/dt-bindings/arm/qcom,ids.h | 10 + + include/dt-bindings/clock/qcom,sdx75-gcc.h | 193 + + include/dt-bindings/clock/qcom,sm8350-videocc.h | 35 + + include/dt-bindings/clock/qcom,sm8450-gpucc.h | 48 + + include/dt-bindings/clock/qcom,sm8450-videocc.h | 38 + + include/dt-bindings/clock/qcom,sm8550-gpucc.h | 48 + + include/dt-bindings/power/qcom-rpmpd.h | 38 +- + include/dt-bindings/reset/qcom,sm8350-videocc.h | 18 + + include/dt-bindings/reset/qcom,sm8450-gpucc.h | 20 + + include/linux/soc/qcom/smem.h | 2 + + include/linux/soc/qcom/socinfo.h | 70 + + 191 files changed, 23746 insertions(+), 2608 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8953.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdx75-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm-master-stats.yaml + create mode 100644 arch/arm64/boot/dts/qcom/apq8039-t2.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts + rename arch/arm64/boot/dts/qcom/{ipq9574-al02-c7.dts => ipq9574-rdp433.dts} (67%) + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8939.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi632.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc8180x-primus.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc8180x.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts + create mode 100644 drivers/clk/qcom/gcc-sdx75.c + create mode 100644 drivers/clk/qcom/gpucc-sm8450.c + create mode 100644 drivers/clk/qcom/gpucc-sm8550.c + create mode 100644 drivers/clk/qcom/videocc-sm8350.c + create mode 100644 drivers/clk/qcom/videocc-sm8450.c + create mode 100644 drivers/clk/qcom/videocc-sm8550.c + create mode 100644 drivers/soc/qcom/rpm_master_stats.c + create mode 100644 include/dt-bindings/clock/qcom,sdx75-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8350-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8450-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8450-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-gpucc.h + create mode 100644 include/dt-bindings/reset/qcom,sm8350-videocc.h + create mode 100644 include/dt-bindings/reset/qcom,sm8450-gpucc.h + create mode 100644 include/linux/soc/qcom/socinfo.h +Merging renesas/next (7762defcdaf0 Merge branch 'renesas-drivers-for-v6.5' 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. + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 6 ++++-- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 ++++++++---- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 5 ++++- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 ++++-- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 17 +++++++++++++++-- + arch/arm64/configs/defconfig | 3 +++ + drivers/soc/renesas/rmobile-sysc.c | 29 +++++++++-------------------- + include/linux/iopoll.h | 24 +++++++++++++++++++----- + 15 files changed, 115 insertions(+), 61 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 (4e4c0647490b Merge branch 'v6.5-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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 24 + + .../devicetree/bindings/media/rockchip-rga.yaml | 4 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + + .../boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts | 33 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + + .../boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 116 ++++ + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 39 +- + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 29 +- + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 27 + + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 484 +++++++++++++ + .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 112 +++ + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 18 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 27 + + .../boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi | 32 + + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 637 +++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 366 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3588j.dtsi | 7 + + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 763 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 118 ++++ + drivers/soc/rockchip/dtpm.c | 54 +- + drivers/soc/rockchip/pm_domains.c | 160 ++++- + 29 files changed, 2988 insertions(+), 126 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588j.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +Merging samsung-krzk/for-next (a3119e95a0d1 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 +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,exynos-clock.yaml | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 78 --------- + .../devicetree/bindings/media/samsung,s5p-mfc.yaml | 184 +++++++++++++++++++++ + .../bindings/soc/samsung/exynos-pmu.yaml | 5 + + arch/arm/mach-exynos/Kconfig | 5 + + arch/arm/mach-exynos/common.h | 8 + + arch/arm/mach-exynos/exynos.c | 2 + + arch/arm/mach-exynos/firmware.c | 8 +- + arch/arm/mach-exynos/pm.c | 2 +- + arch/arm/mach-exynos/suspend.c | 4 + + arch/arm/mach-s3c/Kconfig.s3c64xx | 6 - + arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 1 - + drivers/clk/samsung/clk-exynos-clkout.c | 3 + + drivers/clk/samsung/clk-exynos4.c | 44 ++++- + drivers/soc/samsung/exynos-pmu.c | 9 + + drivers/soc/samsung/exynos-pmu.h | 2 + + drivers/soc/samsung/exynos4-pmu.c | 15 +- + 18 files changed, 283 insertions(+), 96 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +Merging scmi/for-linux-next (1e1dcfba9668 Merge branch '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. + .../devicetree/bindings/firmware/arm,scmi.yaml | 8 +- + drivers/firmware/arm_scmi/driver.c | 1 + + drivers/firmware/arm_scmi/powercap.c | 173 ++++++++++++++++++--- + drivers/firmware/arm_scmi/smc.c | 30 +++- + drivers/powercap/arm_scmi_powercap.c | 16 ++ + include/linux/scmi_protocol.h | 18 +++ + 6 files changed, 219 insertions(+), 27 deletions(-) +Merging stm32/stm32-next (9da2bf3bcd8b ARM: dts: stm32: add required supplies of ov5640 in stm32mp157c-ev1) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 2 - + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/stm32f469-disco.dts | 4 +- + arch/arm/boot/dts/stm32f746.dtsi | 2 +- + arch/arm/boot/dts/stm32h750i-art-pi.dts | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 231 +++++++++ + arch/arm/boot/dts/stm32mp151.dtsi | 27 +- + arch/arm/boot/dts/stm32mp157.dtsi | 7 - + arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 7 +- + .../stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 6 +- + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 6 +- + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 3 +- + arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 4 +- + arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157c-dk2.dts | 8 + + arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 16 +- + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 6 +- + arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 7 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 12 +- + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 3 +- + .../boot/dts/stm32mp157c-phycore-stm32mp1-3.dts | 60 +++ + .../dts/stm32mp157c-phycore-stm32mp15-som.dtsi | 577 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 18 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 54 +- + .../boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 34 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 - + arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 36 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 42 +- + 30 files changed, 1104 insertions(+), 99 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp157c-phycore-stm32mp1-3.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-phycore-stm32mp15-som.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 +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 6 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/axp209.dtsi | 7 ++ + arch/arm/boot/dts/sun5i-r8-chip.dts | 6 + + arch/arm/boot/dts/sun5i.dtsi | 11 +- + arch/arm/boot/dts/sun7i-a20-icnova-a20-adb4006.dts | 137 +++++++++++++++++++++ + arch/arm/boot/dts/sun7i-a20-icnova-a20.dtsi | 62 ++++++++++ + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 2 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 +- + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 37 ++++++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 14 ++- + 13 files changed, 283 insertions(+), 6 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-a20-adb4006.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-a20.dtsi +Merging tee/next (86dfcfab4fe0 Merge branch 'optee_fix_async_notif_for-v6.3' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (b3a2be8d906b Merge branch for-6.5/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. + Documentation/devicetree/bindings/arm/tegra.yaml | 5 + + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 7 +- + arch/arm64/boot/dts/nvidia/Makefile | 2 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 2 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi | 111 ++++ + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 154 ++++++ + .../arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi | 137 +++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 276 ++++++++++ + drivers/memory/tegra/mc.c | 24 + + drivers/memory/tegra/mc.h | 1 + + drivers/memory/tegra/tegra186-emc.c | 133 +++++ + drivers/memory/tegra/tegra234.c | 595 ++++++++++++++++++++- + drivers/pci/controller/dwc/pcie-tegra194.c | 44 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 3 +- + include/dt-bindings/memory/tegra234-mc.h | 5 + + include/linux/tegra-icc.h | 65 +++ + include/soc/tegra/fuse.h | 3 +- + include/soc/tegra/mc.h | 8 + + 19 files changed, 1558 insertions(+), 18 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi + create mode 100644 include/linux/tegra-icc.h +Merging ti/ti-next (4e1be1fcbba1 Merge branch 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 141 +++++++++++ + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 56 +++++ + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 11 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 40 +++- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 144 +++++++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 45 ++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 16 -- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 76 +++++- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 69 ++++-- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 32 +-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 94 +++++++- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 1 + + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 29 ++- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 258 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 138 +++++++++++ + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 21 ++ + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 1 - + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + drivers/remoteproc/pru_rproc.c | 15 -- + drivers/soc/ti/Kconfig | 2 +- + drivers/soc/ti/pruss.c | 263 ++++++++++++++++++++- + drivers/soc/ti/pruss.h | 88 +++++++ + drivers/soc/ti/smartreflex.c | 4 +- + drivers/soc/ti/wkup_m3_ipc.c | 2 +- + include/linux/pruss_driver.h | 123 ++++++++++ + 34 files changed, 1573 insertions(+), 135 deletions(-) + create mode 100644 drivers/soc/ti/pruss.h +Merging xilinx/for-next (a736607599a5 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/xilinx.yaml | 8 +- + .../devicetree/bindings/ata/ceva,ahci-1v84.yaml | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 2 +- + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 4 +- + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 4 +- + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 2 +- + .../bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- + .../devicetree/bindings/fpga/xlnx,versal-fpga.yaml | 2 +- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-zynq.yaml | 2 +- + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 2 +- + .../bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 2 +- + .../bindings/media/xilinx/xlnx,csi2rxss.yaml | 2 +- + .../memory-controllers/snps,dw-umctl2-ddrc.yaml | 3 +- + .../memory-controllers/xlnx,zynq-ddrc-a05.yaml | 3 +- + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 2 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 3 +- + .../bindings/power/reset/xlnx,zynqmp-power.yaml | 2 +- + .../devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml | 2 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../devicetree/bindings/spi/xlnx,zynq-qspi.yaml | 2 +- + .../devicetree/bindings/timer/cdns,ttc.yaml | 2 +- + .../devicetree/bindings/usb/dwc3-xilinx.yaml | 2 +- + .../devicetree/bindings/usb/xlnx,usb2.yaml | 2 +- + .../bindings/watchdog/xlnx,xps-timebase-wdt.yaml | 4 +- + MAINTAINERS | 16 +- + arch/arm/boot/dts/zynq-7000.dtsi | 2 + + arch/arm/boot/dts/zynq-zc702.dts | 19 +- + arch/arm64/boot/dts/xilinx/Makefile | 18 +- + arch/arm64/boot/dts/xilinx/avnet-ultra96-rev1.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 21 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 28 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 22 +- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 327 ++++++++++++++++----- + arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 6 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 15 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 12 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 2 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 8 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 38 ++- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 2 +- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 48 ++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 27 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 48 ++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 48 ++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 35 ++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 35 ++- + ...qmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} | 10 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 40 ++- + drivers/firmware/xilinx/zynqmp.c | 12 +- + drivers/soc/xilinx/xlnx_event_manager.c | 6 +- + drivers/soc/xilinx/zynqmp_power.c | 4 +- + 63 files changed, 675 insertions(+), 266 deletions(-) + rename arch/arm64/boot/dts/xilinx/{zynqmp-zc1275-revA.dts => zynqmp-zcu1275-revA.dts} (73%) +Merging clk/clk-next (be2033a8660c Merge branch 'clk-i2cid' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-cdce925.c | 2 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-max9485.c | 2 +- + drivers/clk/clk-renesas-pcie.c | 6 +++--- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-versaclock5.c | 18 +++++++++--------- + drivers/clk/clk-versaclock7.c | 4 ++-- + drivers/clk/mediatek/Kconfig | 12 ++++++++++++ + drivers/clk/mediatek/clk-mt2701-aud.c | 6 +++--- + drivers/clk/mediatek/clk-mt2701-bdp.c | 2 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 2 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 2 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 2 +- + drivers/clk/mediatek/clk-mt2701-img.c | 2 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 2 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt2712-bdp.c | 2 +- + drivers/clk/mediatek/clk-mt2712-img.c | 2 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 2 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 2 +- + drivers/clk/mediatek/clk-mt2712.c | 2 +- + drivers/clk/mediatek/clk-mt6765-audio.c | 2 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 2 +- + drivers/clk/mediatek/clk-mt6765-img.c | 2 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 2 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 2 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 2 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 2 +- + drivers/clk/mediatek/clk-mt6779-img.c | 2 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 2 +- + drivers/clk/mediatek/clk-mt6779.c | 2 +- + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt6795-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt6795-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 2 +- + drivers/clk/mediatek/clk-mt6795-vencsys.c | 2 +- + drivers/clk/mediatek/clk-mt6797-img.c | 2 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 2 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt7622-aud.c | 6 +++--- + drivers/clk/mediatek/clk-mt7622-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 2 +- + drivers/clk/mediatek/clk-mt7622-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt7622.c | 2 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 2 +- + drivers/clk/mediatek/clk-mt7981-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 2 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8135.c | 2 +- + drivers/clk/mediatek/clk-mt8167-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8167-img.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8167.c | 2 +- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8173-img.c | 2 +- + drivers/clk/mediatek/clk-mt8173-infracfg.c | 6 ++---- + drivers/clk/mediatek/clk-mt8173-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 2 +- + drivers/clk/mediatek/clk-mt8173-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 2 +- + drivers/clk/mediatek/clk-mt8173-vencsys.c | 2 +- + drivers/clk/mediatek/clk-mt8183-audio.c | 6 +++--- + drivers/clk/mediatek/clk-mt8183-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8183-img.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 2 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 2 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 2 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8183.c | 2 +- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8186-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8186-img.c | 2 +- + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8186-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mdp.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8186-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8186-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8186-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 2 +- + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8188-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8188-ccu.c | 2 +- + drivers/clk/mediatek/clk-mt8188-img.c | 2 +- + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8188-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8188-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8188-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8188-peri_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8188-topckgen.c | 6 ++---- + drivers/clk/mediatek/clk-mt8188-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vdo0.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vdo1.c | 2 +- + drivers/clk/mediatek/clk-mt8188-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vpp0.c | 2 +- + drivers/clk/mediatek/clk-mt8188-vpp1.c | 2 +- + drivers/clk/mediatek/clk-mt8188-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8192-aud.c | 6 +++--- + 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-mm.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 | 2 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8195-ccu.c | 2 +- + drivers/clk/mediatek/clk-mt8195-img.c | 2 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8195-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 2 +- + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 2 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 6 ++---- + drivers/clk/mediatek/clk-mt8195-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 2 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 2 +- + drivers/clk/mediatek/clk-mt8195-wpe.c | 2 +- + drivers/clk/mediatek/clk-mt8365-apu.c | 2 +- + drivers/clk/mediatek/clk-mt8365-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8365-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8365-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8365-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8365.c | 2 +- + drivers/clk/mediatek/clk-mt8516-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8516.c | 2 +- + drivers/clk/mediatek/clk-mtk.c | 12 +++++------- + drivers/clk/mediatek/clk-mtk.h | 4 ++-- + 174 files changed, 225 insertions(+), 247 deletions(-) +Merging clk-imx/for-next (632c60ecd25d clk: imx: scu: use _safe list iterator to avoid a use after free) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-imx6sx.c | 8 ++++---- + drivers/clk/imx/clk-imx6ul.c | 2 ++ + drivers/clk/imx/clk-scu.c | 4 ++-- + drivers/clk/imx/clk.c | 8 -------- + drivers/clk/imx/clk.h | 1 - + 5 files changed, 8 insertions(+), 15 deletions(-) +Merging clk-renesas/renesas-clk (7df8eea64a41 clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic()) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/clk-mstp.c | 18 +++++++----------- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + drivers/clk/renesas/renesas-cpg-mssr.c | 31 +++++++++++-------------------- + drivers/clk/renesas/rzg2l-cpg.c | 22 +++++++--------------- + drivers/clk/renesas/rzg2l-cpg.h | 3 --- + 5 files changed, 26 insertions(+), 49 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (72b44f6577f1 nubus: Don't list slot resources by default) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + drivers/nubus/nubus.c | 13 ++++++++++--- + drivers/nubus/proc.c | 33 ++++++++++++++++++++++++--------- + include/linux/nubus.h | 1 + + 3 files changed, 35 insertions(+), 12 deletions(-) +Merging m68knommu/for-next (9561de3a55be Linux 6.4-rc5) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (c5e4d83872ae mips: dts: ingenic: x1000: Add AIC device tree node) +$ 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/boot/dts/ingenic/jz4725b.dtsi | 7 +--- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 7 +--- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 5 +-- + arch/mips/boot/dts/ingenic/x1000.dtsi | 18 ++++++++ + arch/mips/include/asm/mach-loongson32/loongson1.h | 1 - + arch/mips/include/asm/mach-loongson32/regs-wdt.h | 15 ------- + arch/mips/loongson32/common/Makefile | 2 +- + arch/mips/loongson32/common/reset.c | 51 ----------------------- + 8 files changed, 25 insertions(+), 81 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-loongson32/regs-wdt.h + delete mode 100644 arch/mips/loongson32/common/reset.c +Merging openrisc/for-next (c91b4a07655d openrisc: Add floating point regset) +$ 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 (fc49c9672cda parisc: Check if IRQs are disabled when calling arch_local_irq_restore()) +$ 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 +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 10 ------- + arch/parisc/Kconfig.debug | 20 ++++++++++++++ + arch/parisc/include/asm/assembly.h | 7 +++++ + arch/parisc/include/asm/irqflags.h | 9 +++++++ + arch/parisc/include/uapi/asm/cachectl.h | 12 +++++++++ + arch/parisc/kernel/cache.c | 46 +++++++++++++++++++++++++++++++++ + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/kernel/traps.c | 6 +++++ + 8 files changed, 101 insertions(+), 10 deletions(-) + create mode 100644 arch/parisc/include/uapi/asm/cachectl.h +Merging powerpc/next (7d3ee229ea51 powerpc: Drop MPC5200 LocalPlus bus FIFO driver) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/mpc52xx.h | 41 -- + arch/powerpc/platforms/52xx/Kconfig | 5 - + arch/powerpc/platforms/52xx/Makefile | 2 - + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 594 -------------------------- + arch/powerpc/platforms/86xx/Kconfig | 1 - + arch/powerpc/platforms/cell/spu_base.c | 6 - + 6 files changed, 649 deletions(-) + delete mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +Merging soc-fsl/next (7b1a78babd0d soc/fsl/qe: fix usb.c build errors) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging drivers/soc/fsl/qe/Kconfig +Merge made by the 'ort' strategy. + drivers/bus/fsl-mc/dprc-driver.c | 12 ++++------ + drivers/bus/fsl-mc/fsl-mc-allocator.c | 27 +++++++++++----------- + drivers/bus/fsl-mc/fsl-mc-bus.c | 7 +----- + drivers/crypto/caam/caamalg_qi2.c | 4 +--- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 4 +--- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +--- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +--- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 4 +--- + drivers/soc/fsl/dpio/dpio-driver.c | 8 +------ + drivers/soc/fsl/qe/Kconfig | 1 + + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 3 +-- + include/linux/fsl/mc.h | 2 +- + 12 files changed, 29 insertions(+), 51 deletions(-) +Merging risc-v/for-next (90502d51ab90 Merge patch series "Add basic ACPI support for RISC-V") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/Makefile +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d368d1352f41] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 +- + MAINTAINERS | 7 + + arch/riscv/Kconfig | 5 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/include/asm/acenv.h | 11 ++ + arch/riscv/include/asm/acpi.h | 84 ++++++++ + arch/riscv/include/asm/cpu.h | 8 + + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/acpi.c | 251 ++++++++++++++++++++++++ + arch/riscv/kernel/cpu.c | 30 ++- + arch/riscv/kernel/cpufeature.c | 42 +++- + arch/riscv/kernel/setup.c | 11 +- + arch/riscv/kernel/smpboot.c | 77 +++++++- + arch/riscv/kernel/time.c | 25 ++- + drivers/acpi/Makefile | 2 + + drivers/acpi/osl.c | 2 +- + drivers/acpi/processor_core.c | 29 +++ + drivers/acpi/riscv/Makefile | 2 + + drivers/acpi/riscv/rhct.c | 83 ++++++++ + drivers/acpi/tables.c | 10 + + drivers/clocksource/timer-riscv.c | 92 +++++---- + drivers/crypto/hisilicon/qm.c | 5 + + drivers/irqchip/irq-riscv-intc.c | 76 +++++-- + drivers/platform/surface/aggregator/Kconfig | 2 +- + 24 files changed, 775 insertions(+), 89 deletions(-) + create mode 100644 arch/riscv/include/asm/acenv.h + create mode 100644 arch/riscv/include/asm/acpi.h + create mode 100644 arch/riscv/include/asm/cpu.h + create mode 100644 arch/riscv/kernel/acpi.c + create mode 100644 drivers/acpi/riscv/Makefile + create mode 100644 drivers/acpi/riscv/rhct.c +Merging riscv-dt/riscv-dt-for-next (e2c510d6d630 riscv: dts: starfive: Add cpu scaling for JH7110 SoC) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 2 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 21 ++++----- + MAINTAINERS | 2 + + arch/riscv/boot/dts/starfive/jh7100.dtsi | 10 +++++ + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 33 ++++++++++++++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 50 ++++++++++++++++++++++ + 6 files changed, 104 insertions(+), 14 deletions(-) +Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (c561c922e242 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 1 + + arch/s390/crypto/paes_s390.c | 9 +- + arch/s390/include/asm/asm-prototypes.h | 4 + + arch/s390/include/asm/cpacf.h | 7 +- + arch/s390/include/asm/os_info.h | 7 +- + arch/s390/include/asm/pkey.h | 4 +- + arch/s390/include/uapi/asm/pkey.h | 15 +- + arch/s390/kernel/ipl.c | 16 ++ + arch/s390/kernel/perf_pai_crypto.c | 19 +- + arch/s390/kernel/perf_pai_ext.c | 23 +- + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/tishift.S | 63 ++++ + drivers/s390/char/zcore.c | 41 ++- + drivers/s390/cio/vfio_ccw_drv.c | 2 +- + drivers/s390/cio/vfio_ccw_private.h | 2 +- + drivers/s390/crypto/pkey_api.c | 509 ++++++++++++++++++++++----------- + drivers/s390/crypto/vfio_ap_ops.c | 134 ++++++++- + drivers/s390/crypto/vfio_ap_private.h | 3 + + include/uapi/linux/vfio.h | 9 + + 19 files changed, 661 insertions(+), 209 deletions(-) + create mode 100644 arch/s390/lib/tishift.S +Merging sh/for-next (bc9d1f0cecd2 sh: j2: Use ioremap() to translate device tree address into kernel memory) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Merge made by the 'ort' strategy. + arch/sh/kernel/cpu/sh2/probe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (d0f94ebe1864 xtensa: add asm-prototypes.h) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'ort' strategy. + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/asm-prototypes.h | 22 ++++++++++++++++++++++ + arch/xtensa/kernel/xtensa_ksyms.c | 16 +--------------- + 3 files changed, 24 insertions(+), 15 deletions(-) + create mode 100644 arch/xtensa/include/asm/asm-prototypes.h +Merging pidfd/for-next (757777eef55b pid: Replace struct pid 1-element array with flex-array) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Merge made by the 'ort' strategy. + include/linux/pid.h | 2 +- + kernel/pid.c | 13 ++++++++----- + kernel/pid_namespace.c | 2 +- + 3 files changed, 10 insertions(+), 7 deletions(-) +Merging fscrypt/for-next (d617ef039fb8 fscrypt: Replace 1-element array with flexible array) +$ 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. + fs/crypto/fscrypt_private.h | 2 +- + fs/crypto/hooks.c | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +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 (1f2e0de22765 Merge branch 'for-next-next-v6.4-20230606' into for-next-20230606) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Resolved 'fs/btrfs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c685175466d1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/async-thread.c | 44 +- + fs/btrfs/async-thread.h | 3 + + fs/btrfs/bio.c | 117 +++--- + fs/btrfs/bio.h | 29 +- + fs/btrfs/block-group.c | 38 +- + fs/btrfs/block-group.h | 9 +- + fs/btrfs/block-rsv.c | 19 + + fs/btrfs/block-rsv.h | 2 + + fs/btrfs/btrfs_inode.h | 21 - + fs/btrfs/check-integrity.c | 21 +- + fs/btrfs/compression.c | 48 +-- + fs/btrfs/compression.h | 7 +- + fs/btrfs/ctree.c | 211 +++++----- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/defrag.c | 3 +- + fs/btrfs/delayed-ref.c | 110 ++--- + fs/btrfs/delayed-ref.h | 25 +- + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/discard.c | 34 +- + fs/btrfs/discard.h | 1 - + fs/btrfs/disk-io.c | 451 ++++----------------- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-io-tree.c | 37 +- + fs/btrfs/extent-io-tree.h | 62 +-- + fs/btrfs/extent-tree.c | 182 ++++----- + fs/btrfs/extent-tree.h | 2 +- + fs/btrfs/extent_io.c | 848 +++++++++++---------------------------- + fs/btrfs/extent_io.h | 11 +- + fs/btrfs/extent_map.c | 110 ++++- + fs/btrfs/extent_map.h | 6 +- + fs/btrfs/file-item.c | 74 +--- + fs/btrfs/file.c | 9 - + fs/btrfs/free-space-cache.c | 122 +++--- + fs/btrfs/free-space-cache.h | 2 - + fs/btrfs/fs.h | 3 +- + fs/btrfs/inode-item.h | 16 + + fs/btrfs/inode.c | 570 +++++++++++++++----------- + fs/btrfs/ioctl.c | 23 +- + fs/btrfs/locking.c | 5 +- + fs/btrfs/lzo.c | 6 +- + fs/btrfs/messages.c | 8 - + fs/btrfs/messages.h | 15 +- + fs/btrfs/misc.h | 20 + + fs/btrfs/ordered-data.c | 442 +++++++++++--------- + fs/btrfs/ordered-data.h | 27 +- + fs/btrfs/print-tree.c | 16 +- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/raid56.c | 49 ++- + fs/btrfs/raid56.h | 3 + + fs/btrfs/relocation.c | 61 +-- + fs/btrfs/relocation.h | 3 +- + fs/btrfs/scrub.c | 92 ++--- + fs/btrfs/subpage.c | 97 ++--- + fs/btrfs/subpage.h | 12 +- + fs/btrfs/super.c | 1 - + fs/btrfs/tests/extent-io-tests.c | 16 +- + fs/btrfs/transaction.c | 11 - + fs/btrfs/transaction.h | 3 - + fs/btrfs/tree-checker.c | 158 ++++++-- + fs/btrfs/tree-checker.h | 29 +- + fs/btrfs/tree-log.c | 50 +-- + fs/btrfs/tree-log.h | 2 +- + fs/btrfs/tree-mod-log.c | 115 +++++- + fs/btrfs/volumes.c | 171 ++++---- + fs/btrfs/volumes.h | 57 ++- + fs/btrfs/zlib.c | 2 +- + fs/btrfs/zoned.c | 142 +++---- + fs/btrfs/zoned.h | 8 +- + fs/btrfs/zstd.c | 2 +- + include/trace/events/btrfs.h | 29 ++ + 70 files changed, 2380 insertions(+), 2565 deletions(-) +Merging ceph/master (870611e4877e rbd: get snapshot context after exclusive lock is ensured to be held) +$ 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 | 62 +++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 44 insertions(+), 18 deletions(-) +Merging cifs/for-next (7d0ec2a3cdc5 smb: remove obsolete comment) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/transport.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (a050c691305b erofs: fix compact 4B support for 16k block size) +$ 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/compress.h | 3 +- + fs/erofs/decompressor.c | 8 +- + fs/erofs/internal.h | 41 +------- + fs/erofs/super.c | 62 ----------- + fs/erofs/utils.c | 85 ++++++++-------- + fs/erofs/xattr.c | 25 ++--- + fs/erofs/zdata.c | 265 ++++++++++++++++++++++-------------------------- + fs/erofs/zmap.c | 6 +- + 8 files changed, 180 insertions(+), 315 deletions(-) +Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (a811aa4333eb Merge fixes for quota issues found by syzbot.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/ext4/fsync.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/nfs/exporting.rst | 4 +- + fs/buffer.c | 70 ++++++++++++++ + fs/exportfs/expfs.c | 33 ++++++- + fs/ext2/Makefile | 5 +- + fs/ext2/dir.c | 136 ++++++++++++---------------- + fs/ext2/ext2.h | 11 +-- + fs/ext2/file.c | 126 +++++++++++++++++++++++++- + fs/ext2/inode.c | 58 +++++++----- + fs/ext2/namei.c | 63 +++++-------- + fs/ext2/trace.c | 6 ++ + fs/ext2/trace.h | 94 +++++++++++++++++++ + fs/ext4/fsync.c | 33 ++++--- + fs/fhandle.c | 27 ++++-- + fs/nfsd/nfsfh.c | 7 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 7 +- + fs/notify/fdinfo.c | 2 +- + fs/quota/dquot.c | 5 +- + fs/quota/quota.c | 5 +- + fs/super.c | 4 - + fs/udf/balloc.c | 6 +- + fs/udf/dir.c | 6 +- + fs/udf/directory.c | 6 +- + fs/udf/file.c | 6 +- + fs/udf/ialloc.c | 6 +- + fs/udf/inode.c | 6 +- + fs/udf/lowlevel.c | 6 +- + fs/udf/misc.c | 6 +- + fs/udf/namei.c | 6 +- + fs/udf/partition.c | 6 +- + fs/udf/super.c | 6 +- + fs/udf/symlink.c | 6 +- + fs/udf/truncate.c | 6 +- + fs/udf/udftime.c | 18 +--- + fs/udf/unicode.c | 6 +- + include/linux/buffer_head.h | 4 + + include/linux/exportfs.h | 18 +++- + include/linux/fs.h | 1 - + include/uapi/linux/fcntl.h | 5 + + 39 files changed, 544 insertions(+), 288 deletions(-) + create mode 100644 fs/ext2/trace.c + create mode 100644 fs/ext2/trace.h +Merging ext4/dev (571bc93d3e2e ext4: Give symbolic names to mballoc criterias) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. + fs/ext4/balloc.c | 16 + + fs/ext4/ext4.h | 84 +++- + fs/ext4/inline.c | 27 +- + fs/ext4/inode.c | 60 +-- + fs/ext4/mballoc-test.c | 323 ++++++++++++ + fs/ext4/mballoc.c | 1143 ++++++++++++++++++++++++------------------- + fs/ext4/mballoc.h | 16 +- + fs/ext4/readpage.c | 2 +- + fs/ext4/super.c | 24 +- + fs/ext4/sysfs.c | 2 + + include/trace/events/ext4.h | 44 +- + 11 files changed, 1134 insertions(+), 607 deletions(-) + create mode 100644 fs/ext4/mballoc-test.c +Merging f2fs/dev (7aa6ef440cd7 f2fs: add async reset zone command support) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/file.c +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 16 +++ + fs/f2fs/checkpoint.c | 7 +- + fs/f2fs/compress.c | 11 +- + fs/f2fs/data.c | 70 ++++++++++++- + fs/f2fs/f2fs.h | 115 ++++++++++++--------- + fs/f2fs/file.c | 13 +-- + fs/f2fs/gc.c | 39 ++++++-- + fs/f2fs/inode.c | 110 ++++++++++++++------ + fs/f2fs/iostat.c | 1 + + fs/f2fs/node.c | 13 +-- + fs/f2fs/segment.c | 160 ++++++++++++++++++++++------- + fs/f2fs/super.c | 199 ++++++++++++++++++++++++++++++++----- + fs/f2fs/sysfs.c | 39 +++++--- + include/trace/events/f2fs.h | 24 ++++- + 14 files changed, 620 insertions(+), 197 deletions(-) +Merging fsverity/for-next (c61c38330e58 fsverity: use shash API instead of ahash API) +$ 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/enable.c | 19 ++----- + fs/verity/fsverity_private.h | 13 +---- + fs/verity/hash_algs.c | 131 +++++++------------------------------------ + fs/verity/verify.c | 106 ++++++++++++++-------------------- + 4 files changed, 70 insertions(+), 199 deletions(-) +Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/dir.c | 2 -- + fs/fuse/inode.c | 3 ++- + include/uapi/linux/fuse.h | 3 +++ + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging gfs2/for-next (f9da18cd4616 gfs2: Don't remember delete unless it's successful) +$ 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/bmap.c | 4 ++-- + fs/gfs2/lock_dlm.c | 23 ++++++++++------------- + fs/gfs2/quota.c | 1 + + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 10 ++++------ + 5 files changed, 18 insertions(+), 22 deletions(-) +Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (a55d20f1379e ksmbd: use kvzalloc instead of kvmalloc) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/connection.c | 17 ++++++++-- + fs/smb/server/mgmt/tree_connect.c | 11 ------- + fs/smb/server/mgmt/tree_connect.h | 3 -- + fs/smb/server/oplock.c | 66 ++++++++++++++------------------------- + fs/smb/server/smb2pdu.c | 25 +++++++-------- + fs/smb/server/smb_common.c | 18 +++++++++-- + fs/smb/server/smbacl.c | 4 +-- + fs/smb/server/transport_ipc.c | 4 +-- + fs/smb/server/vfs.c | 16 ++++------ + fs/smb/server/vfs.h | 2 +- + 10 files changed, 76 insertions(+), 90 deletions(-) +Merging nfs/linux-next (9561de3a55be Linux 6.4-rc5) +$ 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 (ab83e9c0df5d NFSD: Add "official" reviewers for this subsystem) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging fs/nfsd/nfsfh.c +Merge made by the 'ort' strategy. + .mailmap | 2 + + MAINTAINERS | 4 + + fs/lockd/svc.c | 1 - + fs/locks.c | 7 - + fs/nfsd/nfs3proc.c | 14 +- + fs/nfsd/nfs3xdr.c | 11 +- + fs/nfsd/nfs4state.c | 89 +++++++++-- + fs/nfsd/nfs4xdr.c | 254 ++++++++++++++---------------- + fs/nfsd/nfsctl.c | 83 ++++++---- + fs/nfsd/nfsfh.c | 26 +--- + fs/nfsd/nfsproc.c | 14 +- + fs/nfsd/nfsxdr.c | 11 +- + fs/nfsd/state.h | 3 + + fs/nfsd/stats.c | 2 + + fs/nfsd/stats.h | 7 + + fs/nfsd/trace.h | 260 +++++++++++++++++++++++++++++++ + fs/nfsd/vfs.c | 80 ++++++++-- + fs/nfsd/vfs.h | 9 +- + include/linux/sunrpc/svc.h | 21 +++ + include/linux/sunrpc/svc_rdma.h | 1 - + include/linux/sunrpc/xdr.h | 3 +- + include/trace/events/sunrpc.h | 41 +++-- + net/sunrpc/svc.c | 23 +-- + net/sunrpc/svc_xprt.c | 8 +- + net/sunrpc/svcsock.c | 38 ++--- + net/sunrpc/xdr.c | 26 ++-- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 18 +-- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 10 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 9 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 +-- + 30 files changed, 736 insertions(+), 357 deletions(-) +Merging ntfs3/master (1f60ec888102 fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 2 +- + fs/ntfs3/attrlist.c | 7 +- + fs/ntfs3/bitmap.c | 10 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/frecord.c | 58 ++++++----- + fs/ntfs3/fslog.c | 40 ++++---- + fs/ntfs3/fsntfs.c | 99 +++++++++++++++---- + fs/ntfs3/index.c | 20 ++-- + fs/ntfs3/inode.c | 23 +++-- + fs/ntfs3/lznt.c | 6 +- + fs/ntfs3/namei.c | 31 +++--- + fs/ntfs3/ntfs.h | 117 ++++++++++++---------- + fs/ntfs3/ntfs_fs.h | 31 +++--- + fs/ntfs3/record.c | 14 ++- + fs/ntfs3/run.c | 4 +- + fs/ntfs3/super.c | 279 +++++++++++++++++++++++++++++++++++++++++++++------- + fs/ntfs3/xattr.c | 20 ++-- + 17 files changed, 530 insertions(+), 237 deletions(-) +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 (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +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 (ac9a78681b92 Linux 6.4-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 (d4d12c02bf5f xfs: collect errors from inodegc for unlinked inode recovery) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 5 +- + fs/xfs/libxfs/xfs_alloc.c | 91 +++++++++++++++++------- + fs/xfs/libxfs/xfs_alloc.h | 6 +- + fs/xfs/libxfs/xfs_bmap.c | 10 ++- + fs/xfs/libxfs/xfs_bmap_btree.c | 7 +- + fs/xfs/libxfs/xfs_ialloc.c | 24 ++++--- + fs/xfs/libxfs/xfs_log_format.h | 9 ++- + fs/xfs/libxfs/xfs_refcount.c | 13 +++- + fs/xfs/libxfs/xfs_trans_inode.c | 113 +++--------------------------- + fs/xfs/scrub/bmap.c | 25 +++---- + fs/xfs/scrub/scrub.h | 8 +-- + fs/xfs/xfs_buf_item.c | 88 +++++++++++++++++------- + fs/xfs/xfs_filestream.c | 1 - + fs/xfs/xfs_icache.c | 46 ++++++++++--- + fs/xfs/xfs_icache.h | 4 +- + fs/xfs/xfs_inode.c | 20 ++---- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_inode_item.c | 149 ++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_inode_item.h | 1 + + fs/xfs/xfs_log_recover.c | 19 +++-- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_reflink.c | 4 +- + fs/xfs/xfs_super.c | 1 + + fs/xfs/xfs_trans.c | 9 ++- + 24 files changed, 427 insertions(+), 229 deletions(-) +Merging zonefs/for-next (7d6f61ae0354 zonefs: use iomap for synchronous direct writes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/file.c +Merge made by the 'ort' strategy. + fs/zonefs/file.c | 206 ++++++++++++++++++++++++++++------------------------- + fs/zonefs/super.c | 9 ++- + fs/zonefs/zonefs.h | 2 + + 3 files changed, 120 insertions(+), 97 deletions(-) +Merging iomap/iomap-for-next (3fd41721cd5c iomap: Add DIO tracepoints) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (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 (2111b74e9d0e Merge branches 'vfs.misc', 'v6.5/vfs.mount', 'fs.ntfs' and 'vfs.rename.locking' 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 fs/coredump.c +Auto-merging fs/eventpoll.c +Auto-merging fs/super.c +Auto-merging fs/udf/namei.c +Auto-merging include/linux/fs.h +Auto-merging init/do_mounts.c +Merge made by the 'ort' strategy. + Documentation/filesystems/directory-locking.rst | 26 +- + arch/parisc/include/asm/pgtable.h | 3 - + arch/powerpc/include/asm/pgtable.h | 3 - + arch/s390/include/asm/pgtable.h | 3 - + arch/s390/mm/pageattr.c | 1 + + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/pgtable_types.h | 3 - + arch/x86/mm/pat/set_memory.c | 1 + + fs/cachefiles/namei.c | 3 +- + fs/char_dev.c | 2 +- + fs/coredump.c | 2 +- + fs/d_path.c | 1 + + fs/eventfd.c | 2 +- + fs/eventpoll.c | 2 +- + fs/ext4/namei.c | 17 +- + fs/f2fs/namei.c | 16 +- + fs/inode.c | 60 +++- + fs/internal.h | 2 + + fs/jffs2/build.c | 5 +- + fs/jffs2/xattr.c | 13 +- + fs/jffs2/xattr.h | 4 +- + fs/jfs/namei.c | 6 +- + fs/namei.c | 26 +- + fs/namespace.c | 451 +++++++++++++++++++----- + fs/ntfs/attrib.c | 2 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/mft.c | 36 +- + fs/ntfs/super.c | 4 +- + fs/open.c | 14 +- + fs/overlayfs/file.c | 2 +- + fs/pnode.c | 42 ++- + fs/pnode.h | 3 + + fs/remap_range.c | 5 +- + fs/super.c | 4 +- + fs/sysv/dir.c | 22 +- + fs/sysv/itree.c | 4 + + fs/sysv/namei.c | 8 +- + fs/udf/namei.c | 14 +- + include/linux/eventfd.h | 2 +- + include/linux/fs.h | 16 +- + include/linux/highmem.h | 2 +- + include/linux/pipe_fs_i.h | 4 - + include/linux/proc_fs.h | 2 + + include/linux/watch_queue.h | 3 +- + include/uapi/linux/mount.h | 3 +- + init/do_mounts.c | 6 +- + kernel/watch_queue.c | 12 +- + 47 files changed, 609 insertions(+), 256 deletions(-) +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 (16bff6f075a1 Merge branch 'for-6.4' 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 +Merge made by the 'ort' strategy. +Merging pci/next (f9dae2af6f94 Merge branch 'pci/controller/endpoint') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/pci-ntb-howto.rst | 11 +- + Documentation/PCI/endpoint/pci-vntb-howto.rst | 13 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 + + MAINTAINERS | 1 + + drivers/misc/pci_endpoint_test.c | 25 +- + 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/controller/dwc/pcie-qcom-ep.c | 2 + + drivers/pci/controller/pci-ftpci100.c | 14 +- + drivers/pci/controller/pcie-rcar-host.c | 21 - + drivers/pci/controller/vmd.c | 8 + + drivers/pci/endpoint/functions/Kconfig | 12 +- + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-mhi.c | 460 +++++++++++++++++++++ + drivers/pci/endpoint/functions/pci-epf-ntb.c | 3 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 270 ++++++------ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +- + drivers/pci/endpoint/pci-ep-cfs.c | 81 +++- + drivers/pci/endpoint/pci-epc-core.c | 56 ++- + drivers/pci/endpoint/pci-epf-core.c | 44 +- + drivers/pci/hotplug/acpiphp_glue.c | 5 +- + drivers/pci/hotplug/pciehp_ctrl.c | 21 +- + drivers/pci/hotplug/pciehp_hpc.c | 5 +- + drivers/pci/pcie/aspm.c | 110 ++--- + drivers/pci/quirks.c | 10 +- + include/linux/pci-epc.h | 2 + + include/linux/pci-epf.h | 10 +- + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 4 +- + include/uapi/linux/pci_regs.h | 1 + + 31 files changed, 874 insertions(+), 355 deletions(-) + create mode 100644 drivers/pci/endpoint/functions/pci-epf-mhi.c +Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void) +$ 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/ram.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging hid/for-next (462d72fec9cd Merge branch 'for-6.4/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. + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 47 +++------- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 24 ++---- + drivers/hid/hid-asus.c | 42 ++++----- + drivers/hid/hid-core.c | 118 ++++++++++++++++---------- + drivers/hid/hid-ids.h | 1 + + include/linux/hid.h | 1 + + 6 files changed, 109 insertions(+), 124 deletions(-) +Merging i2c/i2c/for-next (6cd5bf0c57f6 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/i2c/busses/i2c-i801.rst | 2 +- + MAINTAINERS | 3 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/i2c/busses/i2c-altera.c | 6 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 5 +- + drivers/i2c/busses/i2c-aspeed.c | 6 +- + drivers/i2c/busses/i2c-at91-core.c | 6 +- + drivers/i2c/busses/i2c-au1550.c | 5 +- + drivers/i2c/busses/i2c-axxia.c | 6 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 6 +- + drivers/i2c/busses/i2c-bcm-kona.c | 6 +- + drivers/i2c/busses/i2c-bcm2835.c | 6 +- + drivers/i2c/busses/i2c-brcmstb.c | 5 +- + drivers/i2c/busses/i2c-cadence.c | 6 +- + drivers/i2c/busses/i2c-cbus-gpio.c | 6 +- + drivers/i2c/busses/i2c-cht-wc.c | 6 +- + drivers/i2c/busses/i2c-cpm.c | 6 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 6 +- + drivers/i2c/busses/i2c-davinci.c | 14 ++- + drivers/i2c/busses/i2c-designware-common.c | 8 ++ + drivers/i2c/busses/i2c-designware-core.h | 5 ++ + drivers/i2c/busses/i2c-designware-master.c | 89 +++++++++++++++++-- + drivers/i2c/busses/i2c-designware-platdrv.c | 21 ++++- + drivers/i2c/busses/i2c-designware-slave.c | 4 + + drivers/i2c/busses/i2c-digicolor.c | 6 +- + drivers/i2c/busses/i2c-dln2.c | 6 +- + drivers/i2c/busses/i2c-emev2.c | 6 +- + drivers/i2c/busses/i2c-exynos5.c | 6 +- + drivers/i2c/busses/i2c-gpio.c | 6 +- + drivers/i2c/busses/i2c-gxp.c | 6 +- + drivers/i2c/busses/i2c-highlander.c | 6 +- + drivers/i2c/busses/i2c-hix5hd2.c | 6 +- + drivers/i2c/busses/i2c-i801.c | 128 +++++++++++++++------------- + drivers/i2c/busses/i2c-ibm_iic.c | 6 +- + drivers/i2c/busses/i2c-img-scb.c | 8 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 6 +- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-iop3xx.c | 6 +- + drivers/i2c/busses/i2c-isch.c | 6 +- + drivers/i2c/busses/i2c-jz4780.c | 5 +- + drivers/i2c/busses/i2c-kempld.c | 6 +- + drivers/i2c/busses/i2c-lpc2k.c | 6 +- + drivers/i2c/busses/i2c-mchp-pci1xxxx.c | 6 +- + drivers/i2c/busses/i2c-meson.c | 6 +- + drivers/i2c/busses/i2c-microchip-corei2c.c | 6 +- + drivers/i2c/busses/i2c-mlxbf.c | 6 +- + drivers/i2c/busses/i2c-mlxcpld.c | 6 +- + drivers/i2c/busses/i2c-mpc.c | 6 +- + drivers/i2c/busses/i2c-mt65xx.c | 6 +- + drivers/i2c/busses/i2c-mt7621.c | 6 +- + drivers/i2c/busses/i2c-mv64xxx.c | 17 +++- + drivers/i2c/busses/i2c-mxs.c | 6 +- + drivers/i2c/busses/i2c-npcm7xx.c | 5 +- + drivers/i2c/busses/i2c-ocores.c | 6 +- + drivers/i2c/busses/i2c-octeon-platdrv.c | 5 +- + drivers/i2c/busses/i2c-omap.c | 6 +- + drivers/i2c/busses/i2c-opal.c | 6 +- + drivers/i2c/busses/i2c-pasemi-platform.c | 5 +- + drivers/i2c/busses/i2c-pca-platform.c | 6 +- + drivers/i2c/busses/i2c-pnx.c | 6 +- + drivers/i2c/busses/i2c-powermac.c | 6 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-qcom-cci.c | 6 +- + drivers/i2c/busses/i2c-qcom-geni.c | 5 +- + drivers/i2c/busses/i2c-qup.c | 5 +- + drivers/i2c/busses/i2c-rcar.c | 6 +- + drivers/i2c/busses/i2c-riic.c | 6 +- + drivers/i2c/busses/i2c-rk3x.c | 6 +- + drivers/i2c/busses/i2c-rzv2m.c | 49 +++++++---- + drivers/i2c/busses/i2c-s3c2410.c | 6 +- + drivers/i2c/busses/i2c-scmi.c | 6 +- + drivers/i2c/busses/i2c-sh7760.c | 6 +- + drivers/i2c/busses/i2c-sh_mobile.c | 5 +- + drivers/i2c/busses/i2c-simtec.c | 6 +- + drivers/i2c/busses/i2c-st.c | 6 +- + drivers/i2c/busses/i2c-stm32f4.c | 6 +- + drivers/i2c/busses/i2c-stm32f7.c | 6 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 6 +- + drivers/i2c/busses/i2c-synquacer.c | 6 +- + drivers/i2c/busses/i2c-tegra-bpmp.c | 6 +- + drivers/i2c/busses/i2c-tegra.c | 114 ++++++++++--------------- + drivers/i2c/busses/i2c-uniphier-f.c | 6 +- + drivers/i2c/busses/i2c-uniphier.c | 6 +- + drivers/i2c/busses/i2c-versatile.c | 5 +- + drivers/i2c/busses/i2c-viperboard.c | 6 +- + drivers/i2c/busses/i2c-wmt.c | 6 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 6 +- + drivers/i2c/busses/i2c-xiic.c | 6 +- + drivers/i2c/busses/i2c-xlp9xx.c | 6 +- + drivers/i2c/busses/scx200_acb.c | 6 +- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 5 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 6 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 6 +- + drivers/i2c/muxes/i2c-mux-gpmux.c | 6 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 5 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 6 +- + drivers/i2c/muxes/i2c-mux-reg.c | 6 +- + 97 files changed, 457 insertions(+), 494 deletions(-) +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 +Merge made by the 'ort' strategy. + drivers/i3c/master/svc-i3c-master.c | 51 ++++++++++++++++++++++++++++++------- + 1 file changed, 42 insertions(+), 9 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (473595b01086 hwmon: (hp-wmi-sensors) fix debugfs check) +$ 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/hwmon/adi,max31827.yaml | 54 + + Documentation/hwmon/aht10.rst | 20 +- + Documentation/hwmon/aquacomputer_d5next.rst | 9 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/hp-wmi-sensors.rst | 140 ++ + Documentation/hwmon/index.rst | 4 +- + Documentation/hwmon/max31827.rst | 90 + + Documentation/hwmon/oxp-sensors.rst | 2 + + MAINTAINERS | 16 + + drivers/hwmon/Kconfig | 28 +- + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/ad7418.c | 2 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm1021.c | 2 +- + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/adm1029.c | 2 +- + drivers/hwmon/adm1031.c | 2 +- + drivers/hwmon/adm1177.c | 2 +- + drivers/hwmon/adm9240.c | 2 +- + drivers/hwmon/ads7828.c | 2 +- + drivers/hwmon/adt7410.c | 2 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/hwmon/adt7475.c | 10 +- + drivers/hwmon/aht10.c | 154 +- + drivers/hwmon/amc6821.c | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 117 +- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/asc7621.c | 2 +- + drivers/hwmon/asus-ec-sensors.c | 30 + + drivers/hwmon/atxp1.c | 2 +- + drivers/hwmon/dme1737.c | 2 +- + drivers/hwmon/ds1621.c | 2 +- + drivers/hwmon/ds620.c | 2 +- + drivers/hwmon/emc1403.c | 2 +- + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/emc2305.c | 2 +- + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/f75375s.c | 2 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/g762.c | 2 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/hih6130.c | 2 +- + drivers/hwmon/hp-wmi-sensors.c | 2004 ++++++++++++++++++++ + drivers/hwmon/hwmon.c | 11 +- + drivers/hwmon/ina209.c | 2 +- + drivers/hwmon/ina238.c | 2 +- + drivers/hwmon/ina2xx.c | 2 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/it87.c | 73 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lineage-pem.c | 2 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/lm73.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm77.c | 2 +- + drivers/hwmon/lm78.c | 2 +- + drivers/hwmon/lm80.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm92.c | 2 +- + drivers/hwmon/lm93.c | 2 +- + drivers/hwmon/lm95234.c | 2 +- + drivers/hwmon/lm95241.c | 2 +- + drivers/hwmon/lm95245.c | 2 +- + drivers/hwmon/ltc2945.c | 2 +- + drivers/hwmon/ltc2947-i2c.c | 2 +- + drivers/hwmon/ltc2990.c | 2 +- + drivers/hwmon/ltc2992.c | 2 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4222.c | 2 +- + drivers/hwmon/ltc4245.c | 2 +- + drivers/hwmon/ltc4260.c | 2 +- + drivers/hwmon/ltc4261.c | 2 +- + drivers/hwmon/max127.c | 2 +- + drivers/hwmon/max16065.c | 2 +- + drivers/hwmon/max1619.c | 2 +- + drivers/hwmon/max1668.c | 2 +- + drivers/hwmon/max31730.c | 2 +- + drivers/hwmon/max31760.c | 2 +- + drivers/hwmon/max31790.c | 2 +- + drivers/hwmon/max31827.c | 466 +++++ + drivers/hwmon/max6620.c | 2 +- + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6639.c | 2 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/max6697.c | 2 +- + drivers/hwmon/mc34vr500.c | 2 +- + drivers/hwmon/mcp3021.c | 2 +- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775-i2c.c | 2 +- + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/occ/p8_i2c.c | 2 +- + drivers/hwmon/oxp-sensors.c | 55 +- + drivers/hwmon/pcf8591.c | 2 +- + drivers/hwmon/pmbus/acbel-fsg032.c | 2 +- + drivers/hwmon/pmbus/adm1266.c | 4 +- + drivers/hwmon/pmbus/adm1275.c | 2 +- + drivers/hwmon/pmbus/bel-pfe.c | 2 +- + drivers/hwmon/pmbus/bpa-rs600.c | 2 +- + drivers/hwmon/pmbus/delta-ahe50dc-fan.c | 2 +- + drivers/hwmon/pmbus/dps920ab.c | 2 +- + drivers/hwmon/pmbus/fsp-3y.c | 2 +- + drivers/hwmon/pmbus/ibm-cffps.c | 2 +- + drivers/hwmon/pmbus/inspur-ipsps.c | 2 +- + drivers/hwmon/pmbus/ir35221.c | 2 +- + drivers/hwmon/pmbus/ir36021.c | 2 +- + drivers/hwmon/pmbus/ir38064.c | 2 +- + drivers/hwmon/pmbus/irps5401.c | 2 +- + drivers/hwmon/pmbus/isl68137.c | 2 +- + drivers/hwmon/pmbus/lm25066.c | 2 +- + drivers/hwmon/pmbus/lt7182s.c | 2 +- + drivers/hwmon/pmbus/ltc2978.c | 2 +- + drivers/hwmon/pmbus/ltc3815.c | 2 +- + drivers/hwmon/pmbus/max15301.c | 2 +- + drivers/hwmon/pmbus/max16064.c | 2 +- + drivers/hwmon/pmbus/max16601.c | 2 +- + drivers/hwmon/pmbus/max20730.c | 2 +- + drivers/hwmon/pmbus/max20751.c | 2 +- + drivers/hwmon/pmbus/max31785.c | 2 +- + drivers/hwmon/pmbus/max34440.c | 2 +- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/mp2888.c | 2 +- + drivers/hwmon/pmbus/mp2975.c | 2 +- + drivers/hwmon/pmbus/mp5023.c | 2 +- + drivers/hwmon/pmbus/mpq7932.c | 2 +- + drivers/hwmon/pmbus/pim4328.c | 2 +- + drivers/hwmon/pmbus/pli1209bc.c | 2 +- + drivers/hwmon/pmbus/pm6764tr.c | 2 +- + drivers/hwmon/pmbus/pmbus.c | 2 +- + drivers/hwmon/pmbus/pxe1610.c | 2 +- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + drivers/hwmon/pmbus/stpddc60.c | 2 +- + drivers/hwmon/pmbus/tda38640.c | 2 +- + drivers/hwmon/pmbus/tps40422.c | 2 +- + drivers/hwmon/pmbus/tps53679.c | 2 +- + drivers/hwmon/pmbus/tps546d24.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 4 +- + drivers/hwmon/pmbus/ucd9200.c | 2 +- + drivers/hwmon/pmbus/xdpe12284.c | 2 +- + drivers/hwmon/pmbus/xdpe152c4.c | 2 +- + drivers/hwmon/pmbus/zl6100.c | 2 +- + drivers/hwmon/powr1220.c | 2 +- + drivers/hwmon/sbrmi.c | 2 +- + drivers/hwmon/sbtsi_temp.c | 2 +- + drivers/hwmon/sht21.c | 2 +- + drivers/hwmon/sht3x.c | 2 +- + drivers/hwmon/sht4x.c | 2 +- + drivers/hwmon/shtc1.c | 2 +- + drivers/hwmon/smm665.c | 2 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/tc654.c | 2 +- + drivers/hwmon/tc74.c | 2 +- + drivers/hwmon/thmc50.c | 2 +- + drivers/hwmon/tmp102.c | 2 +- + drivers/hwmon/tmp103.c | 2 +- + drivers/hwmon/tmp108.c | 2 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/tmp464.c | 2 +- + drivers/hwmon/tmp513.c | 2 +- + drivers/hwmon/tps23861.c | 2 +- + drivers/hwmon/w83773g.c | 2 +- + drivers/hwmon/w83781d.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/hwmon/w83795.c | 2 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + include/linux/hwmon.h | 10 + + 183 files changed, 3353 insertions(+), 273 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,max31827.yaml + create mode 100644 Documentation/hwmon/hp-wmi-sensors.rst + create mode 100644 Documentation/hwmon/max31827.rst + create mode 100644 drivers/hwmon/hp-wmi-sensors.c + create mode 100644 drivers/hwmon/max31827.c +Merging jc_docs/docs-next (a1d2c9b3029d docs: process: fix a typoed cross-reference) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 63 +++++++++++++++---------- + Documentation/conf.py | 1 + + Documentation/core-api/kernel-api.rst | 6 +++ + Documentation/process/2.Process.rst | 7 +-- + Documentation/process/submitting-patches.rst | 25 ++++++++++ + Documentation/subsystem-apis.rst | 17 +++++-- + MAINTAINERS | 6 +++ + include/linux/err.h | 48 +++++++++++++++++++ + 8 files changed, 141 insertions(+), 32 deletions(-) +Merging v4l-dvb/master (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvbdev.c | 157 ++++++++++----------- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 4 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 3 +- + drivers/media/usb/dvb-usb/az6027.c | 34 ++--- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 26 ++-- + drivers/media/usb/dvb-usb/opera1.c | 3 +- + drivers/media/usb/dvb-usb/pctv452e.c | 20 +-- + include/media/dvbdev.h | 6 +- + include/uapi/linux/dvb/frontend.h | 8 ++ + include/uapi/linux/dvb/version.h | 2 +- + 11 files changed, 129 insertions(+), 136 deletions(-) +Merging v4l-dvb-next/master (aafeeaf3d2a8 media: video-mux: update driver to active state) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/v4l2-core/v4l2-mc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/rkisp1.rst | 4 +- + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 59 ++ + .../bindings/display/tegra/nvidia,tegra20-vip.yaml | 41 + + .../bindings/media/i2c/maxim,max96712.yaml | 7 + + .../bindings/media/qcom,msm8916-camss.yaml | 2 +- + .../bindings/media/qcom,msm8996-camss.yaml | 2 +- + .../bindings/media/qcom,sdm660-camss.yaml | 2 +- + .../bindings/media/qcom,sdm845-camss.yaml | 2 +- + Documentation/driver-api/media/camera-sensor.rst | 22 + + .../userspace-api/media/frontend.h.rst.exceptions | 4 + + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 3 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 7 + + .../userspace-api/media/v4l/meta-formats.rst | 14 +- + .../v4l/{pixfmt-meta-d4xx.rst => metafmt-d4xx.rst} | 0 + ...-meta-intel-ipu3.rst => metafmt-intel-ipu3.rst} | 0 + .../{pixfmt-meta-rkisp1.rst => metafmt-rkisp1.rst} | 0 + .../v4l/{pixfmt-meta-uvc.rst => metafmt-uvc.rst} | 0 + .../{pixfmt-meta-vivid.rst => metafmt-vivid.rst} | 0 + ...xfmt-meta-vsp1-hgo.rst => metafmt-vsp1-hgo.rst} | 0 + ...xfmt-meta-vsp1-hgt.rst => metafmt-vsp1-hgt.rst} | 0 + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 4 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 2 +- + MAINTAINERS | 15 +- + drivers/media/cec/i2c/ch7322.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 6 +- + drivers/media/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb-frontends/a8293.c | 2 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/af9033.c | 2 +- + drivers/media/dvb-frontends/au8522_decoder.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/dvb-frontends/dvb-pll.c | 2 +- + drivers/media/dvb-frontends/helene.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mn88443x.c | 2 +- + drivers/media/dvb-frontends/mn88472.c | 2 +- + drivers/media/dvb-frontends/mn88473.c | 2 +- + drivers/media/dvb-frontends/mxl692.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 2 +- + drivers/media/dvb-frontends/sp2.c | 2 +- + drivers/media/dvb-frontends/stv090x.c | 2 +- + drivers/media/dvb-frontends/stv6110x.c | 2 +- + drivers/media/dvb-frontends/tc90522.c | 2 +- + drivers/media/dvb-frontends/tda10071.c | 2 +- + drivers/media/dvb-frontends/ts2020.c | 2 +- + drivers/media/i2c/Kconfig | 13 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad5820.c | 2 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7170.c | 2 +- + drivers/media/i2c/adv7175.c | 2 +- + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv748x/adv748x-core.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 2 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ak7375.c | 2 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/ar0521.c | 2 +- + drivers/media/i2c/bt819.c | 2 +- + drivers/media/i2c/bt856.c | 2 +- + drivers/media/i2c/bt866.c | 2 +- + drivers/media/i2c/ccs/ccs-core.c | 2 +- + drivers/media/i2c/cs3308.c | 2 +- + drivers/media/i2c/cs5345.c | 2 +- + drivers/media/i2c/cs53l32a.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 +- + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/dw9768.c | 2 +- + drivers/media/i2c/dw9807-vcm.c | 2 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 +- + drivers/media/i2c/hi556.c | 2 +- + drivers/media/i2c/hi846.c | 5 +- + drivers/media/i2c/hi847.c | 2 +- + drivers/media/i2c/imx208.c | 2 +- + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/imx219.c | 2 +- + drivers/media/i2c/imx258.c | 2 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/imx290.c | 4 +- + drivers/media/i2c/imx296.c | 6 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx334.c | 64 +- + drivers/media/i2c/imx335.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/imx412.c | 2 +- + drivers/media/i2c/imx415.c | 2 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/ks0127.c | 2 +- + drivers/media/i2c/lm3560.c | 2 +- + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/max9286.c | 2 +- + drivers/media/i2c/ml86v7667.c | 2 +- + drivers/media/i2c/msp3400-driver.c | 2 +- + drivers/media/i2c/mt9m001.c | 2 +- + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/mt9p031.c | 2 +- + drivers/media/i2c/mt9t112.c | 2 +- + drivers/media/i2c/mt9v011.c | 2 +- + drivers/media/i2c/mt9v032.c | 2 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/og01a1b.c | 2 +- + drivers/media/i2c/ov01a10.c | 1004 ++++++++++++++++++ + drivers/media/i2c/ov02a10.c | 4 +- + drivers/media/i2c/ov08d10.c | 2 +- + drivers/media/i2c/ov08x40.c | 2 +- + drivers/media/i2c/ov13858.c | 2 +- + drivers/media/i2c/ov13b10.c | 2 +- + drivers/media/i2c/ov2640.c | 2 +- + drivers/media/i2c/ov2659.c | 2 +- + drivers/media/i2c/ov2680.c | 2 +- + drivers/media/i2c/ov2685.c | 4 +- + drivers/media/i2c/ov2740.c | 2 +- + drivers/media/i2c/ov4689.c | 2 +- + drivers/media/i2c/ov5640.c | 21 +- + drivers/media/i2c/ov5645.c | 2 +- + drivers/media/i2c/ov5647.c | 2 +- + drivers/media/i2c/ov5648.c | 4 +- + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/i2c/ov5675.c | 2 +- + drivers/media/i2c/ov5693.c | 6 +- + drivers/media/i2c/ov5695.c | 4 +- + drivers/media/i2c/ov6650.c | 2 +- + drivers/media/i2c/ov7251.c | 2 +- + drivers/media/i2c/ov7640.c | 2 +- + drivers/media/i2c/ov7670.c | 2 +- + drivers/media/i2c/ov772x.c | 2 +- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/ov8856.c | 2 +- + drivers/media/i2c/ov8858.c | 4 +- + drivers/media/i2c/ov8865.c | 4 +- + drivers/media/i2c/ov9282.c | 2 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/i2c/ov9734.c | 2 +- + drivers/media/i2c/rdacm20.c | 2 +- + drivers/media/i2c/rdacm21.c | 2 +- + drivers/media/i2c/rj54n1cb0c.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/s5k6a3.c | 2 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa6752hs.c | 2 +- + drivers/media/i2c/saa7110.c | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/saa717x.c | 2 +- + drivers/media/i2c/saa7185.c | 2 +- + drivers/media/i2c/sony-btf-mpx.c | 2 +- + drivers/media/i2c/st-mipid02.c | 17 +- + drivers/media/i2c/st-vgxy61.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/tc358746.c | 2 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/i2c/tda7432.c | 2 +- + drivers/media/i2c/tda9840.c | 2 +- + drivers/media/i2c/tea6415c.c | 2 +- + drivers/media/i2c/tea6420.c | 2 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/ths8200.c | 2 +- + drivers/media/i2c/tlv320aic23b.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 2 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 2 +- + drivers/media/i2c/tw2804.c | 2 +- + drivers/media/i2c/tw9903.c | 2 +- + drivers/media/i2c/tw9906.c | 2 +- + drivers/media/i2c/tw9910.c | 2 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/video-i2c.c | 4 +- + drivers/media/i2c/vp27smpx.c | 2 +- + drivers/media/i2c/vpx3220.c | 2 +- + drivers/media/i2c/wm8739.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/mc/mc-entity.c | 18 +- + drivers/media/pci/bt8xx/dst_ca.c | 2 +- + drivers/media/pci/cx18/cx18-av-vbi.c | 2 +- + drivers/media/pci/cx18/cx18-dvb.c | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 31 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 4 +- + drivers/media/pci/ttpci/budget-core.c | 4 +- + drivers/media/platform/amphion/vdec.c | 7 +- + drivers/media/platform/amphion/venc.c | 4 +- + drivers/media/platform/amphion/vpu_malone.c | 12 + + drivers/media/platform/amphion/vpu_v4l2.c | 5 +- + drivers/media/platform/amphion/vpu_v4l2.h | 2 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 828 +++++++-------- + .../platform/mediatek/jpeg/mtk_jpeg_dec_parse.c | 17 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 15 +- + drivers/media/platform/mediatek/vcodec/Makefile | 1 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 1 - + .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.c | 26 +- + .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 61 +- + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 3 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 8 +- + .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 6 +- + .../mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c | 1097 ++++++++++++++++++++ + .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 4 +- + .../media/platform/mediatek/vcodec/vdec_drv_if.c | 4 + + .../media/platform/mediatek/vcodec/vdec_drv_if.h | 1 + + .../platform/mediatek/vcodec/vdec_msg_queue.c | 105 +- + .../platform/mediatek/vcodec/vdec_msg_queue.h | 28 +- + drivers/media/platform/nxp/imx7-media-csi.c | 94 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 6 +- + drivers/media/platform/renesas/rcar-isp.c | 1 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 13 + + .../media/platform/renesas/rcar-vin/rcar-csi2.c | 100 +- + drivers/media/platform/renesas/rcar_fdp1.c | 5 + + drivers/media/platform/renesas/rcar_jpu.c | 55 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 8 +- + drivers/media/platform/rockchip/rga/rga.c | 5 +- + drivers/media/platform/samsung/exynos4-is/Kconfig | 2 +- + .../media/platform/samsung/exynos4-is/fimc-core.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 2 +- + .../media/platform/samsung/s5p-jpeg/jpeg-core.h | 12 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 33 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.h | 4 +- + drivers/media/platform/st/sti/hva/hva-h264.c | 8 +- + drivers/media/platform/verisilicon/hantro_hevc.c | 23 +- + drivers/media/platform/video-mux.c | 104 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/saa7706h.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/tef6862.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 2 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 49 +- + drivers/media/tuners/e4000.c | 2 +- + drivers/media/tuners/fc2580.c | 2 +- + drivers/media/tuners/m88rs6000t.c | 2 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mxl301rf.c | 2 +- + drivers/media/tuners/qm1d1b0004.c | 2 +- + drivers/media/tuners/qm1d1c0042.c | 2 +- + drivers/media/tuners/si2157.c | 2 +- + drivers/media/tuners/tda18212.c | 2 +- + drivers/media/tuners/tda18250.c | 2 +- + drivers/media/tuners/tua9001.c | 2 +- + drivers/media/usb/au0828/au0828-core.c | 2 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 19 +- + drivers/media/usb/go7007/s2250-board.c | 2 +- + drivers/media/usb/siano/smsusb.c | 3 +- + drivers/media/usb/stk1160/Kconfig | 12 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/v4l2-core/tuner-core.c | 2 +- + drivers/media/v4l2-core/v4l2-mc.c | 38 +- + drivers/staging/media/av7110/av7110_av.c | 4 +- + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 45 + + drivers/staging/media/max96712/max96712.c | 40 +- + drivers/staging/media/tegra-video/Kconfig | 1 + + drivers/staging/media/tegra-video/Makefile | 2 + + drivers/staging/media/tegra-video/csi.c | 48 + + drivers/staging/media/tegra-video/csi.h | 4 - + drivers/staging/media/tegra-video/tegra20.c | 661 ++++++++++++ + drivers/staging/media/tegra-video/tegra210.c | 90 ++ + drivers/staging/media/tegra-video/vi.c | 220 ++-- + drivers/staging/media/tegra-video/vi.h | 71 +- + drivers/staging/media/tegra-video/video.c | 5 + + drivers/staging/media/tegra-video/video.h | 2 +- + drivers/staging/media/tegra-video/vip.c | 287 +++++ + drivers/staging/media/tegra-video/vip.h | 68 ++ + include/media/jpeg.h | 20 + + include/media/media-entity.h | 6 +- + include/media/v4l2-mem2mem.h | 18 +- + include/uapi/linux/media.h | 28 +- + include/uapi/linux/v4l2-controls.h | 6 +- + include/uapi/linux/videodev2.h | 6 +- + 285 files changed, 4917 insertions(+), 1324 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vip.yaml + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-d4xx.rst => metafmt-d4xx.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-intel-ipu3.rst => metafmt-intel-ipu3.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-rkisp1.rst => metafmt-rkisp1.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-uvc.rst => metafmt-uvc.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vivid.rst => metafmt-vivid.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vsp1-hgo.rst => metafmt-vsp1-hgo.rst} (100%) + rename Documentation/userspace-api/media/v4l/{pixfmt-meta-vsp1-hgt.rst => metafmt-vsp1-hgt.rst} (100%) + create mode 100644 drivers/media/i2c/ov01a10.c + create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c + create mode 100644 drivers/staging/media/tegra-video/tegra20.c + create mode 100644 drivers/staging/media/tegra-video/vip.c + create mode 100644 drivers/staging/media/tegra-video/vip.h + create mode 100644 include/media/jpeg.h +Merging pm/linux-next (e8195eaff86f Merge branches 'acpi-pm', 'acpi-scan', 'acpi-tables', 'acpi-apei' and 'acpi-resource' into linux-next) + 8f0e8597a7fa ("ACPI: NFIT: Add declaration in a local header") +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging include/linux/suspend.h +Auto-merging kernel/power/snapshot.c +Merge made by the 'ort' strategy. + drivers/acpi/acpi_lpss.c | 10 +- + drivers/acpi/apei/ghes.c | 2 - + drivers/acpi/button.c | 9 + + drivers/acpi/resource.c | 60 -- + drivers/acpi/scan.c | 81 +- + drivers/acpi/sleep.c | 2 +- + drivers/acpi/video_detect.c | 16 + + drivers/acpi/x86/s2idle.c | 14 +- + drivers/acpi/x86/utils.c | 26 +- + drivers/base/power/domain.c | 6 +- + drivers/base/power/wakeup.c | 5 - + drivers/powercap/Kconfig | 14 + + drivers/powercap/Makefile | 1 + + drivers/powercap/intel_rapl_common.c | 887 ++++++++++++--------- + drivers/powercap/intel_rapl_msr.c | 14 +- + drivers/powercap/intel_rapl_tpmi.c | 325 ++++++++ + .../intel/int340x_thermal/processor_thermal_rapl.c | 11 +- + include/acpi/acpi_bus.h | 2 + + include/linux/intel_rapl.h | 40 +- + include/linux/suspend.h | 6 +- + kernel/power/snapshot.c | 2 +- + 21 files changed, 1027 insertions(+), 506 deletions(-) + create mode 100644 drivers/powercap/intel_rapl_tpmi.c +Merging cpufreq-arm/cpufreq/arm/linux-next (3b062a086984 cpufreq: dt-platdev: Support building as module) +$ 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. + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 1 + + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 ++ + drivers/cpufreq/imx6q-cpufreq.c | 30 +++++------ + drivers/cpufreq/sparc-us2e-cpufreq.c | 58 +++++++--------------- + drivers/cpufreq/sparc-us3-cpufreq.c | 58 +++++++--------------- + drivers/cpufreq/tegra194-cpufreq.c | 6 ++- + drivers/cpufreq/ti-cpufreq.c | 1 + + 8 files changed, 62 insertions(+), 99 deletions(-) +Merging cpupower/cpupower (25891bc945f7 cpupower: Bump soname version) +$ 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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/exynos-bus.c | 1 + + drivers/devfreq/mtk-cci-devfreq.c | 3 ++- + include/linux/devfreq.h | 3 ++- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging opp/opp/linux-next (b2a2ab039bd5 opp: Fix use-after-free in lazy_opp_tables after probe deferral) +$ 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. + drivers/opp/core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging thermal/thermal/linux-next (2afa82d1fc64 dt-bindings: thermal: qcom-tsens: Correct unit address) +$ 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 (57e2c2f2d94c fs: dlm: fix mismatch of plock results from userspace) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/config.c | 4 +- + fs/dlm/plock.c | 115 ++++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 72 insertions(+), 47 deletions(-) +Merging rdma/for-next (8c1ee346da58 RDMA/bnxt_re: Remove unnecessary checks) +$ 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/hw/bnxt_re/main.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_fp.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_sp.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/sw/rxe/rxe_comp.c +Auto-merging drivers/infiniband/sw/rxe/rxe_req.c +Auto-merging drivers/infiniband/sw/rxe/rxe_resp.c +Merge made by the 'ort' strategy. + drivers/infiniband/hw/bnxt_re/main.c | 20 +++--- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 100 ++++++++++++-------------- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 29 ++++++-- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 8 --- + drivers/infiniband/hw/irdma/verbs.c | 41 +++++------ + drivers/infiniband/sw/rxe/rxe.c | 9 ++- + drivers/infiniband/sw/rxe/rxe_comp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 110 +++++++++++++++++------------ + drivers/infiniband/sw/rxe/rxe_task.h | 6 +- + 14 files changed, 176 insertions(+), 158 deletions(-) +Merging net-next/main (2dc476404efa Merge branch 'tools-ynl-user-space-c') +$ 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/networking/ip-sysctl.rst +Auto-merging MAINTAINERS +Auto-merging drivers/net/dsa/lan9303-core.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +Auto-merging drivers/net/phy/phylink.c +Auto-merging drivers/net/wireless/realtek/rtw88/mac80211.c +Auto-merging drivers/net/wireless/realtek/rtw89/core.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac80211.c +Auto-merging drivers/net/xen-netback/netback.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging kernel/bpf/syscall.c +Auto-merging net/ipv4/sysctl_net_ipv4.c +CONFLICT (content): Merge conflict in net/ipv4/sysctl_net_ipv4.c +Auto-merging net/mptcp/pm.c +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/libbpf_probes.c +Auto-merging tools/testing/selftests/net/mptcp/mptcp_join.sh +Resolved 'net/ipv4/sysctl_net_ipv4.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 779cf56bfc27] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 4 +- + Documentation/bpf/instruction-set.rst | 9 +- + Documentation/bpf/kfuncs.rst | 23 +- + Documentation/bpf/llvm_reloc.rst | 16 +- + Documentation/bpf/map_hash.rst | 53 +- + Documentation/bpf/map_lru_hash_update.dot | 172 ++ + Documentation/bpf/prog_cgroup_sockopt.rst | 57 +- + .../devicetree/bindings/net/dsa/marvell.txt | 2 +- + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 32 +- + .../bindings/net/pse-pd/pse-controller.yaml | 2 +- + Documentation/leds/leds-class.rst | 81 + + Documentation/netlink/genetlink-legacy.yaml | 8 + + Documentation/netlink/specs/ovs_flow.yaml | 831 +++++++++ + .../device_drivers/ethernet/intel/ice.rst | 18 - + .../device_drivers/ethernet/marvell/octeontx2.rst | 45 + + Documentation/networking/ip-sysctl.rst | 17 +- + .../userspace-api/netlink/intro-specs.rst | 79 + + MAINTAINERS | 25 +- + arch/arm64/net/bpf_jit_comp.c | 55 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 17 +- + drivers/leds/trigger/ledtrig-netdev.c | 276 +-- + drivers/net/Kconfig | 1 - + drivers/net/bonding/bond_main.c | 11 +- + drivers/net/bonding/bonding_priv.h | 4 +- + drivers/net/can/at91_can.c | 6 +- + drivers/net/can/bxcan.c | 17 +- + drivers/net/can/c_can/c_can_platform.c | 6 +- + drivers/net/can/cc770/cc770_isa.c | 6 +- + drivers/net/can/cc770/cc770_platform.c | 6 +- + drivers/net/can/ctucanfd/ctucanfd_platform.c | 6 +- + drivers/net/can/flexcan/flexcan-core.c | 6 +- + drivers/net/can/grcan.c | 6 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 6 +- + drivers/net/can/janz-ican3.c | 6 +- + drivers/net/can/m_can/m_can_platform.c | 6 +- + drivers/net/can/mscan/mpc5xxx_can.c | 6 +- + drivers/net/can/rcar/rcar_can.c | 5 +- + drivers/net/can/rcar/rcar_canfd.c | 6 +- + drivers/net/can/sja1000/sja1000_isa.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 6 +- + drivers/net/can/softing/softing_main.c | 5 +- + drivers/net/can/sun4i_can.c | 6 +- + drivers/net/can/ti_hecc.c | 6 +- + drivers/net/can/usb/Kconfig | 12 + + drivers/net/can/usb/Makefile | 1 + + drivers/net/can/usb/f81604.c | 1201 +++++++++++++ + drivers/net/can/xilinx_can.c | 6 +- + drivers/net/dsa/hirschmann/hellcreek.c | 14 +- + drivers/net/dsa/lan9303-core.c | 1 - + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/microchip/ksz8795.c | 28 +- + drivers/net/dsa/microchip/ksz8863_smi.c | 13 +- + drivers/net/dsa/microchip/ksz9477.c | 24 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 47 +- + drivers/net/dsa/microchip/ksz_common.h | 77 +- + drivers/net/dsa/microchip/ksz_spi.c | 2 +- + drivers/net/dsa/microchip/lan937x_main.c | 8 +- + drivers/net/dsa/mv88e6xxx/chip.c | 175 +- + drivers/net/dsa/mv88e6xxx/chip.h | 15 +- + drivers/net/dsa/mv88e6xxx/global2.c | 5 +- + drivers/net/dsa/mv88e6xxx/port.c | 26 +- + drivers/net/dsa/mv88e6xxx/port.h | 15 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 24 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 20 +- + drivers/net/dsa/qca/qca8k-leds.c | 181 ++ + drivers/net/dsa/sja1105/sja1105_mdio.c | 11 +- + drivers/net/dsa/sja1105/sja1105_tas.c | 7 +- + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 2 +- + drivers/net/ethernet/8390/8390.h | 2 + + drivers/net/ethernet/8390/apne.c | 7 +- + drivers/net/ethernet/8390/axnet_cs.c | 6 +- + drivers/net/ethernet/8390/hydra.c | 6 +- + drivers/net/ethernet/8390/lib8390.c | 5 +- + drivers/net/ethernet/8390/mac8390.c | 6 +- + drivers/net/ethernet/8390/mcf8390.c | 4 +- + drivers/net/ethernet/8390/ne.c | 4 +- + drivers/net/ethernet/8390/ne2k-pci.c | 1 + + drivers/net/ethernet/8390/pcnet_cs.c | 5 +- + drivers/net/ethernet/8390/smc-ultra.c | 4 +- + drivers/net/ethernet/8390/stnic.c | 5 +- + drivers/net/ethernet/8390/wd.c | 4 +- + drivers/net/ethernet/8390/zorro8390.c | 7 +- + drivers/net/ethernet/altera/Kconfig | 2 + + drivers/net/ethernet/altera/altera_tse_main.c | 62 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 40 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 6 +- + drivers/net/ethernet/arc/emac.h | 2 +- + drivers/net/ethernet/arc/emac_arc.c | 6 +- + drivers/net/ethernet/arc/emac_main.c | 4 +- + drivers/net/ethernet/arc/emac_rockchip.c | 5 +- + drivers/net/ethernet/broadcom/bnx2.c | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 14 + + drivers/net/ethernet/cadence/macb.h | 1 + + drivers/net/ethernet/cadence/macb_main.c | 12 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 4 +- + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 18 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 15 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 121 +- + drivers/net/ethernet/emulex/benet/be_main.c | 32 +- + drivers/net/ethernet/engleder/tsnep_selftests.c | 12 +- + drivers/net/ethernet/engleder/tsnep_tc.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 5 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 8 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 22 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 110 +- + drivers/net/ethernet/freescale/fec_main.c | 38 +- + drivers/net/ethernet/fungible/funeth/funeth_rx.c | 5 +- + drivers/net/ethernet/google/gve/gve_main.c | 5 + + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 4 + + drivers/net/ethernet/i825xx/82596.c | 5 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 5 +- + drivers/net/ethernet/i825xx/lib82596.c | 5 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 1 + + drivers/net/ethernet/i825xx/sun3_82586.h | 1 + + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/ice/Makefile | 1 + + drivers/net/ethernet/intel/ice/ice.h | 44 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 5 +- + drivers/net/ethernet/intel/ice/ice_base.c | 50 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 10 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 84 +- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 14 - + drivers/net/ethernet/intel/ice/ice_ethtool.c | 311 +--- + drivers/net/ethernet/intel/ice/ice_ethtool.h | 105 ++ + drivers/net/ethernet/intel/ice/ice_idc.c | 52 +- + drivers/net/ethernet/intel/ice/ice_irq.c | 378 +++++ + drivers/net/ethernet/intel/ice/ice_irq.h | 25 + + drivers/net/ethernet/intel/ice/ice_lag.c | 12 - + drivers/net/ethernet/intel/ice/ice_lag.h | 54 - + drivers/net/ethernet/intel/ice/ice_lib.c | 290 +--- + drivers/net/ethernet/intel/ice/ice_lib.h | 5 - + drivers/net/ethernet/intel/ice/ice_main.c | 266 +-- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 197 ++- + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 17 - + drivers/net/ethernet/intel/ice/ice_repr.h | 5 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 47 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 232 ++- + drivers/net/ethernet/intel/ice/ice_switch.h | 13 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 34 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 1 + + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 35 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 7 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 8 - + drivers/net/ethernet/intel/ice/ice_vlan_mode.c | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 5 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 + + drivers/net/ethernet/intel/igc/igc.h | 35 + + drivers/net/ethernet/intel/igc/igc_main.c | 137 +- + drivers/net/ethernet/marvell/mvneta.c | 171 +- + drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 + + drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 5 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 45 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 135 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 197 ++- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 92 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 29 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 125 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 13 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 29 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 43 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 4 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 +- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 1363 +++++++++++++++ + drivers/net/ethernet/marvell/octeontx2/nic/qos.h | 69 + + .../net/ethernet/marvell/octeontx2/nic/qos_sq.c | 296 ++++ + .../ethernet/marvell/prestera/prestera_flower.c | 6 + + drivers/net/ethernet/mellanox/mlx4/main.c | 65 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 9 - + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 137 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 193 ++- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 25 +- + .../ethernet/mellanox/mlx5/core/esw/acl/helper.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h | 1 + + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 30 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_mcast.c | 21 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 52 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 291 ++-- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 39 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 138 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 24 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 4 - + .../mellanox/mlx5/core/steering/dr_action.c | 5 +- + .../mellanox/mlx5/core/steering/dr_domain.c | 13 +- + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 9 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 9 +- + .../mellanox/mlx5/core/steering/dr_types.h | 2 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 5 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 3 +- + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 10 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 1 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 3 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 2 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 45 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 26 +- + drivers/net/ethernet/microchip/enc28j60.c | 28 +- + drivers/net/ethernet/microchip/lan743x_main.c | 20 +- + drivers/net/ethernet/microchip/lan966x/Kconfig | 11 + + drivers/net/ethernet/microchip/lan966x/Makefile | 1 + + .../net/ethernet/microchip/lan966x/lan966x_dcb.c | 365 ++++ + .../net/ethernet/microchip/lan966x/lan966x_main.c | 2 + + .../net/ethernet/microchip/lan966x/lan966x_main.h | 60 + + .../net/ethernet/microchip/lan966x/lan966x_port.c | 149 ++ + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 147 ++ + .../net/ethernet/microchip/lan966x/lan966x_tc.c | 10 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 61 + + .../microchip/lan966x/lan966x_vcap_ag_api.c | 264 ++- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 23 + + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 82 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 67 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 8 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 10 + + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 32 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 7 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 54 +- + drivers/net/ethernet/realtek/r8169_main.c | 41 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +- + drivers/net/ethernet/sfc/ef100_netdev.c | 53 +- + drivers/net/ethernet/sfc/efx_devlink.c | 80 +- + drivers/net/ethernet/sfc/mae.c | 28 +- + drivers/net/ethernet/sfc/mae.h | 1 + + drivers/net/ethernet/sfc/tc.c | 205 ++- + drivers/net/ethernet/sfc/tc.h | 27 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 3 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c | 257 --- + drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h | 29 - + drivers/net/ethernet/stmicro/stmmac/common.h | 2 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 93 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 18 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 7 +- + drivers/net/ethernet/sun/cassini.c | 8 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 11 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 272 ++- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 3 + + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 734 +++++++- + drivers/net/ethernet/wangxun/libwx/wx_lib.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 214 ++- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 20 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 23 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 1 + + drivers/net/ipvlan/ipvlan_core.c | 3 +- + drivers/net/mdio/Kconfig | 11 + + drivers/net/mdio/Makefile | 1 + + drivers/net/mdio/mdio-regmap.c | 93 + + drivers/net/pcs/Kconfig | 6 - + drivers/net/pcs/Makefile | 1 - + drivers/net/pcs/pcs-altera-tse.c | 160 -- + drivers/net/pcs/pcs-lynx.c | 31 + + drivers/net/pcs/pcs-xpcs.c | 192 +-- + drivers/net/pcs/pcs-xpcs.h | 3 - + drivers/net/phy/Kconfig | 5 +- + drivers/net/phy/bcm-phy-lib.c | 237 ++- + drivers/net/phy/bcm-phy-lib.h | 7 + + drivers/net/phy/broadcom.c | 133 +- + drivers/net/phy/dp83869.c | 13 +- + drivers/net/phy/micrel.c | 6 +- + drivers/net/phy/microchip_t1s.c | 278 ++- + drivers/net/phy/mscc/mscc.h | 1 + + drivers/net/phy/mscc/mscc_main.c | 51 +- + drivers/net/phy/phy.c | 11 +- + drivers/net/phy/phy_device.c | 21 +- + drivers/net/phy/phylink.c | 172 +- + drivers/net/phy/sfp-bus.c | 20 + + drivers/net/phy/sfp.c | 345 +++- + drivers/net/phy/sfp.h | 1 + + drivers/net/ppp/Kconfig | 34 + + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/veth.c | 26 +- + drivers/net/virtio_net.c | 667 +++++--- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 21 +- + drivers/net/wireless/marvell/mwifiex/11n.h | 4 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 6 +- + drivers/net/wireless/marvell/mwifiex/wmm.h | 15 - + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 - + drivers/net/wireless/microchip/wilc1000/hif.c | 8 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 2 - + drivers/net/wireless/microchip/wilc1000/wlan_cfg.h | 2 +- + drivers/net/wireless/microchip/wilc1000/wlan_if.h | 2 + + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 37 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 463 +++-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 5 + + drivers/net/wireless/realtek/rtw88/debug.c | 59 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw89/Makefile | 3 +- + drivers/net/wireless/realtek/rtw89/acpi.c | 52 + + drivers/net/wireless/realtek/rtw89/acpi.h | 21 + + drivers/net/wireless/realtek/rtw89/core.c | 131 +- + drivers/net/wireless/realtek/rtw89/core.h | 76 +- + drivers/net/wireless/realtek/rtw89/debug.c | 24 +- + drivers/net/wireless/realtek/rtw89/fw.c | 84 +- + drivers/net/wireless/realtek/rtw89/fw.h | 76 +- + drivers/net/wireless/realtek/rtw89/mac.c | 126 +- + drivers/net/wireless/realtek/rtw89/mac.h | 3 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 7 +- + drivers/net/wireless/realtek/rtw89/pci.c | 13 +- + drivers/net/wireless/realtek/rtw89/pci.h | 1 + + drivers/net/wireless/realtek/rtw89/phy.c | 283 +++- + drivers/net/wireless/realtek/rtw89/phy.h | 12 + + drivers/net/wireless/realtek/rtw89/reg.h | 49 +- + drivers/net/wireless/realtek/rtw89/regd.c | 61 + + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 174 ++ + drivers/net/wireless/realtek/rtw89/rtw8851b.h | 15 + + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 1775 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h | 18 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 86 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 12 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 +- + drivers/net/wireless/realtek/rtw89/ser.c | 43 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 19 +- + drivers/net/wireless/realtek/rtw89/wow.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_imem.h | 13 - + drivers/net/wwan/iosm/iosm_ipc_mux.h | 4 - + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 2 - + drivers/net/xen-netback/netback.c | 4 +- + drivers/nfc/fdp/i2c.c | 2 +- + drivers/nfc/microread/i2c.c | 2 +- + drivers/nfc/nfcmrvl/i2c.c | 2 +- + drivers/nfc/nxp-nci/i2c.c | 2 +- + drivers/nfc/pn533/i2c.c | 2 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 2 +- + drivers/nfc/st-nci/i2c.c | 2 +- + drivers/nfc/st21nfca/i2c.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + include/linux/bpf.h | 7 +- + include/linux/bpf_verifier.h | 27 +- + include/linux/brcmphy.h | 57 + + include/linux/btf.h | 18 +- + include/linux/can/length.h | 3 + + include/linux/leds.h | 53 + + include/linux/mdio.h | 49 + + include/linux/mdio/mdio-regmap.h | 26 + + include/linux/pcs-altera-tse.h | 17 - + include/linux/pcs-lynx.h | 1 + + include/linux/pcs/pcs-xpcs.h | 4 +- + include/linux/phy.h | 55 +- + include/linux/phylink.h | 11 +- + include/linux/ref_tracker.h | 25 +- + include/linux/sfp.h | 14 + + include/linux/skbuff.h | 57 +- + include/linux/socket.h | 3 + + include/net/bonding.h | 4 +- + include/net/devlink.h | 238 ++- + include/net/dsa.h | 6 + + include/net/flow.h | 3 +- + include/net/flow_dissector.h | 2 + + include/net/gro.h | 26 +- + include/net/inet_common.h | 2 + + include/net/ip.h | 22 +- + include/net/macsec.h | 10 + + include/net/netfilter/nf_conntrack_expect.h | 18 +- + include/net/netfilter/nf_flow_table.h | 4 +- + include/net/netns/ipv4.h | 1 + + include/net/pkt_cls.h | 1 + + include/net/pkt_sched.h | 54 +- + include/net/route.h | 6 +- + include/net/tcp.h | 6 +- + include/net/tls.h | 2 +- + include/net/udp.h | 1 - + include/net/vxlan.h | 4 +- + include/net/xsk_buff_pool.h | 2 +- + include/uapi/linux/bpf.h | 10 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/mdio.h | 24 + + include/uapi/linux/netfilter/nf_tables.h | 2 + + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/pkt_sched.h | 10 + + io_uring/net.c | 2 + + kernel/bpf/bpf_lru_list.c | 21 +- + kernel/bpf/bpf_lru_list.h | 7 +- + kernel/bpf/btf.c | 65 +- + kernel/bpf/cgroup.c | 15 + + kernel/bpf/helpers.c | 123 +- + kernel/bpf/inode.c | 27 +- + kernel/bpf/log.c | 3 - + kernel/bpf/syscall.c | 48 +- + kernel/bpf/trampoline.c | 32 +- + kernel/bpf/verifier.c | 800 ++++++--- + kernel/trace/bpf_trace.c | 4 +- + lib/net_utils.c | 3 +- + lib/ref_tracker.c | 179 +- + lib/test_ref_tracker.c | 2 +- + net/Kconfig | 2 +- + net/bpf/test_run.c | 204 +-- + net/bridge/br_device.c | 1 + + net/bridge/br_forward.c | 3 + + net/bridge/br_input.c | 1 + + net/bridge/br_private.h | 27 + + net/core/dev.c | 17 +- + net/core/filter.c | 65 + + net/core/flow_dissector.c | 10 + + net/core/gro.c | 23 +- + net/core/net_namespace.c | 4 +- + net/core/netdev-genl-gen.c | 2 +- + net/core/netdev-genl-gen.h | 2 +- + net/core/pktgen.c | 13 +- + net/core/skbuff.c | 116 +- + net/devlink/health.c | 2 +- + net/devlink/leftover.c | 191 +-- + net/dsa/port.c | 32 + + net/handshake/genl.c | 2 +- + net/handshake/genl.h | 2 +- + net/ipv4/af_inet.c | 32 +- + net/ipv4/fou_nl.c | 2 +- + net/ipv4/fou_nl.h | 2 +- + net/ipv4/ip_gre.c | 8 +- + net/ipv4/ip_output.c | 168 +- + net/ipv4/ipconfig.c | 10 +- + net/ipv4/ping.c | 56 +- + net/ipv4/raw.c | 10 +- + net/ipv4/sysctl_net_ipv4.c | 10 + + net/ipv4/tcp.c | 235 +-- + net/ipv4/tcp_bpf.c | 20 +- + net/ipv4/tcp_ipv4.c | 22 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_offload.c | 7 +- + net/ipv4/tcp_timer.c | 17 +- + net/ipv4/udp.c | 359 ++-- + net/ipv6/addrconf.c | 4 +- + net/ipv6/exthdrs.c | 3 - + net/ipv6/ip6_output.c | 17 + + net/ipv6/seg6_iptunnel.c | 3 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/ipv6/tcpv6_offload.c | 3 +- + net/kcm/kcmsock.c | 218 +-- + net/mptcp/mib.c | 6 + + net/mptcp/mib.h | 18 + + net/mptcp/options.c | 5 +- + net/mptcp/pm.c | 6 +- + net/mptcp/protocol.c | 21 +- + net/netfilter/ipvs/ip_vs_xmit.c | 4 +- + net/netfilter/nf_conntrack_proto_gre.c | 1 + + net/netfilter/nf_flow_table_core.c | 24 +- + net/netfilter/nf_flow_table_ip.c | 231 ++- + net/netfilter/nf_tables_api.c | 11 +- + net/netfilter/nft_exthdr.c | 106 ++ + net/netfilter/nft_flow_offload.c | 14 +- + net/netfilter/nft_lookup.c | 23 +- + net/netfilter/nft_set_pipapo.c | 6 +- + net/nfc/llcp_commands.c | 3 +- + net/openvswitch/meter.c | 4 +- + net/sched/cls_flower.c | 30 +- + net/sched/sch_htb.c | 7 +- + net/sched/sch_taprio.c | 88 +- + net/sctp/protocol.c | 4 +- + net/sctp/socket.c | 18 + + net/sctp/stream_sched.c | 9 +- + net/socket.c | 2 + + net/tipc/bearer.c | 4 +- + net/tipc/bearer.h | 4 +- + net/tipc/udp_media.c | 4 - + net/tls/tls_device.c | 10 +- + net/tls/tls_main.c | 59 +- + net/unix/af_unix.c | 183 +- + net/xdp/xsk_buff_pool.c | 7 +- + net/xfrm/espintcp.c | 10 +- + net/xfrm/xfrm_ipcomp.c | 5 +- + samples/bpf/tcp_basertt_kern.c | 2 +- + scripts/pahole-flags.sh | 3 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 11 +- + tools/bpf/bpftool/bash-completion/bpftool | 7 +- + tools/bpf/bpftool/common.c | 9 +- + tools/bpf/bpftool/feature.c | 24 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/link.c | 16 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/map.c | 19 +- + tools/bpf/bpftool/prog.c | 53 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/include/uapi/linux/bpf.h | 10 + + tools/lib/bpf/bpf.c | 17 +- + tools/lib/bpf/bpf.h | 18 +- + tools/lib/bpf/bpf_helpers.h | 15 +- + tools/lib/bpf/bpf_tracing.h | 3 +- + tools/lib/bpf/btf.c | 2 +- + tools/lib/bpf/btf_dump.c | 22 +- + tools/lib/bpf/gen_loader.c | 14 +- + tools/lib/bpf/libbpf.c | 154 +- + tools/lib/bpf/libbpf.h | 18 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_probes.c | 2 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/usdt.c | 5 +- + tools/net/ynl/Makefile | 19 + + tools/net/ynl/generated/Makefile | 45 + + tools/net/ynl/generated/fou-user.c | 340 ++++ + tools/net/ynl/generated/fou-user.h | 337 ++++ + tools/net/ynl/generated/netdev-user.c | 250 +++ + tools/net/ynl/generated/netdev-user.h | 88 + + tools/net/ynl/lib/Makefile | 28 + + tools/net/ynl/lib/nlspec.py | 6 +- + tools/net/ynl/lib/ynl.c | 901 ++++++++++ + tools/net/ynl/lib/ynl.h | 237 +++ + tools/net/ynl/lib/ynl.py | 109 +- + tools/net/ynl/samples/.gitignore | 1 + + tools/net/ynl/samples/Makefile | 28 + + tools/net/ynl/samples/netdev.c | 108 ++ + tools/net/ynl/ynl-gen-c.py | 264 ++- + tools/net/ynl/ynl-regen.sh | 2 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 83 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 6 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 166 ++ + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 100 ++ + tools/testing/selftests/bpf/network_helpers.c | 23 + + tools/testing/selftests/bpf/network_helpers.h | 1 + + .../testing/selftests/bpf/prog_tests/arg_parsing.c | 68 + + .../selftests/bpf/prog_tests/bpf_mod_race.c | 34 +- + .../selftests/bpf/prog_tests/bpf_obj_pinning.c | 268 +++ + .../bpf/prog_tests/cgroup_getset_retval.c | 20 + + tools/testing/selftests/bpf/prog_tests/dynptr.c | 8 + + .../selftests/bpf/prog_tests/global_map_resize.c | 227 +++ + .../selftests/bpf/prog_tests/module_attach.c | 12 +- + tools/testing/selftests/bpf/prog_tests/netcnt.c | 4 +- + .../selftests/bpf/prog_tests/sock_destroy.c | 221 +++ + tools/testing/selftests/bpf/prog_tests/sockopt.c | 100 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 61 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 108 +- + .../selftests/bpf/prog_tests/sockopt_qos_to_cc.c | 2 + + .../selftests/bpf/prog_tests/task_under_cgroup.c | 53 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 121 ++ + tools/testing/selftests/bpf/progs/bpf_misc.h | 4 + + tools/testing/selftests/bpf/progs/cb_refs.c | 4 +- + .../bpf/progs/cgroup_getset_retval_getsockopt.c | 13 + + .../bpf/progs/cgroup_getset_retval_setsockopt.c | 17 + + tools/testing/selftests/bpf/progs/dynptr_fail.c | 308 ++++ + tools/testing/selftests/bpf/progs/dynptr_success.c | 337 ++++ + tools/testing/selftests/bpf/progs/iters.c | 26 +- + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 4 +- + .../selftests/bpf/progs/kfunc_call_destructive.c | 3 +- + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 9 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 3 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 17 +- + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 9 +- + .../testing/selftests/bpf/progs/local_kptr_stash.c | 5 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 5 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 4 +- + .../selftests/bpf/progs/sock_destroy_prog.c | 145 ++ + .../selftests/bpf/progs/sock_destroy_prog_fail.c | 22 + + .../testing/selftests/bpf/progs/sockopt_inherit.c | 18 +- + tools/testing/selftests/bpf/progs/sockopt_multi.c | 26 +- + .../selftests/bpf/progs/sockopt_qos_to_cc.c | 10 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 25 +- + .../selftests/bpf/progs/test_global_func1.c | 2 + + .../selftests/bpf/progs/test_global_map_resize.c | 58 + + .../testing/selftests/bpf/progs/test_sock_fields.c | 5 +- + .../selftests/bpf/progs/test_task_under_cgroup.c | 51 + + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 1 + + .../bpf/progs/verifier_subprog_precision.c | 536 ++++++ + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 4 +- + tools/testing/selftests/bpf/test_progs.c | 113 +- + tools/testing/selftests/bpf/test_progs.h | 1 - + tools/testing/selftests/bpf/test_verifier.c | 170 +- + tools/testing/selftests/bpf/test_xsk.sh | 10 +- + tools/testing/selftests/bpf/testing_helpers.c | 286 +++- + tools/testing/selftests/bpf/testing_helpers.h | 12 + + tools/testing/selftests/bpf/verifier/precise.c | 143 +- + tools/testing/selftests/bpf/veristat.c | 9 + + tools/testing/selftests/bpf/xdp_hw_metadata.c | 47 +- + tools/testing/selftests/bpf/xdp_metadata.h | 1 + + tools/testing/selftests/bpf/xsk.h | 5 + + tools/testing/selftests/bpf/xskxceiver.c | 769 ++++----- + tools/testing/selftests/bpf/xskxceiver.h | 31 +- + .../drivers/net/bonding/bond-eth-type-change.sh | 1 - + .../drivers/net/mlxsw/egress_vid_classification.sh | 5 +- + .../drivers/net/mlxsw/ingress_rif_conf_1d.sh | 5 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fcnal-test.sh | 87 + + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../selftests/net/forwarding/router_bridge_vlan.sh | 24 +- + .../selftests/net/forwarding/tc_flower_l2_miss.sh | 350 ++++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 112 +- + tools/testing/selftests/net/nettest.c | 46 +- + .../selftests/net/test_vxlan_nolocalbypass.sh | 240 +++ + tools/testing/selftests/net/tls.c | 131 ++ + .../selftests/tc-testing/tc-tests/qdiscs/mq.json | 25 +- + 641 files changed, 27553 insertions(+), 7842 deletions(-) + create mode 100644 Documentation/bpf/map_lru_hash_update.dot + create mode 100644 Documentation/netlink/specs/ovs_flow.yaml + create mode 100644 drivers/net/can/usb/f81604.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_ethtool.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_irq.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_irq.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c + delete mode 100644 drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c + delete mode 100644 drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h + create mode 100644 drivers/net/mdio/mdio-regmap.c + delete mode 100644 drivers/net/pcs/pcs-altera-tse.c + create mode 100644 drivers/net/wireless/realtek/rtw89/acpi.c + create mode 100644 drivers/net/wireless/realtek/rtw89/acpi.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851be.c + create mode 100644 include/linux/mdio/mdio-regmap.h + delete mode 100644 include/linux/pcs-altera-tse.h + create mode 100644 tools/net/ynl/Makefile + create mode 100644 tools/net/ynl/generated/Makefile + create mode 100644 tools/net/ynl/generated/fou-user.c + create mode 100644 tools/net/ynl/generated/fou-user.h + create mode 100644 tools/net/ynl/generated/netdev-user.c + create mode 100644 tools/net/ynl/generated/netdev-user.h + create mode 100644 tools/net/ynl/lib/Makefile + create mode 100644 tools/net/ynl/lib/ynl.c + create mode 100644 tools/net/ynl/lib/ynl.h + create mode 100644 tools/net/ynl/samples/.gitignore + create mode 100644 tools/net/ynl/samples/Makefile + create mode 100644 tools/net/ynl/samples/netdev.c + create mode 100644 tools/testing/selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_obj_pinning.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/global_map_resize.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_destroy.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_destroy_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_destroy_prog_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_map_resize.c + create mode 100644 tools/testing/selftests/bpf/progs/test_task_under_cgroup.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_subprog_precision.c + create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_l2_miss.sh + create mode 100755 tools/testing/selftests/net/test_vxlan_nolocalbypass.sh +Merging bpf-next/for-next (aa7881fcfe9d bpf: Factor out a common helper free_all()) +$ 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 include/uapi/linux/bpf.h +Auto-merging tools/include/uapi/linux/bpf.h +Merge made by the 'ort' strategy. + include/linux/bpfilter.h | 1 - + include/linux/filter.h | 1 - + include/uapi/linux/bpf.h | 21 ++++++-- + kernel/bpf/btf.c | 23 ++++---- + kernel/bpf/helpers.c | 12 +++-- + kernel/bpf/memalloc.c | 31 +++++------ + kernel/bpf/preload/bpf_preload_kern.c | 4 +- + kernel/bpf/verifier.c | 42 ++++++++++----- + lib/test_bpf.c | 3 +- + net/bpfilter/bpfilter_kern.c | 2 +- + net/core/filter.c | 21 ++++++-- + net/ipv4/bpfilter/sockopt.c | 11 +--- + samples/bpf/xdp1_kern.c | 2 +- + samples/bpf/xdp2_kern.c | 2 +- + tools/bpf/resolve_btfids/Makefile | 4 +- + tools/include/uapi/linux/bpf.h | 21 ++++++-- + tools/testing/selftests/bpf/config | 4 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 40 ++++++++++++++ + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +- + tools/testing/selftests/bpf/prog_tests/cpumask.c | 1 + + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 61 +++++++++++++++++++--- + .../testing/selftests/bpf/progs/cpumask_success.c | 24 +++++++++ + .../testing/selftests/bpf/progs/refcounted_kptr.c | 2 + + .../selftests/bpf/progs/refcounted_kptr_fail.c | 4 +- + 24 files changed, 256 insertions(+), 83 deletions(-) +Merging ipsec-next/master (b2cbac9b9b28 net: Remove low_thresh in ip defrag) +$ 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/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/main (4f325e26277b ipvs: dynamically limit the connection hash table) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Merge made by the 'ort' strategy. + net/netfilter/ipvs/Kconfig | 27 ++++++++++++++------------- + net/netfilter/ipvs/ip_vs_conn.c | 26 +++++++++++++++++--------- + 2 files changed, 31 insertions(+), 22 deletions(-) +Merging bluetooth/master (817efd3cad74 Bluetooth: hci_sock: Forward credentials to monitor) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 177 ++++++++++++++++++----- + drivers/bluetooth/btrtl.h | 13 ++ + drivers/bluetooth/btusb.c | 76 ++++++++++ + drivers/bluetooth/hci_bcm.c | 3 +- + drivers/bluetooth/hci_qca.c | 6 +- + include/net/bluetooth/bluetooth.h | 3 + + include/net/bluetooth/hci.h | 2 + + include/net/bluetooth/hci_core.h | 39 ++++- + include/net/bluetooth/hci_sync.h | 2 +- + include/net/bluetooth/mgmt.h | 2 + + net/bluetooth/af_bluetooth.c | 45 ++++++ + net/bluetooth/bnep/sock.c | 10 +- + net/bluetooth/hci_conn.c | 297 ++++++++++++++++++++++++-------------- + net/bluetooth/hci_core.c | 10 +- + net/bluetooth/hci_event.c | 126 ++++++++++------ + net/bluetooth/hci_sock.c | 77 ++++++++-- + net/bluetooth/hci_sync.c | 141 +++++++++++------- + net/bluetooth/hidp/sock.c | 10 +- + net/bluetooth/iso.c | 40 ++--- + net/bluetooth/l2cap_core.c | 18 +++ + net/bluetooth/l2cap_sock.c | 31 +--- + net/bluetooth/mgmt.c | 6 + + net/bluetooth/rfcomm/sock.c | 13 +- + net/bluetooth/sco.c | 10 +- + 25 files changed, 817 insertions(+), 342 deletions(-) +Merging wireless-next/for-next (7d528eafc529 Revert "wifi: iwlwifi: update response for mcc_update command") +$ 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 +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/acpi.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/link.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +Auto-merging drivers/net/wireless/realtek/rtw88/sdio.c +Auto-merging drivers/net/wireless/realtek/rtw89/core.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac.c +Auto-merging drivers/net/wireless/realtek/rtw89/mac.h +Auto-merging drivers/net/wireless/realtek/rtw89/rtw8852b.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/chan.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/util.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/core.c | 3 + + drivers/net/wireless/ath/ath10k/core.h | 3 + + drivers/net/wireless/ath/ath10k/debug.c | 4 +- + drivers/net/wireless/ath/ath10k/mac.c | 6 +- + drivers/net/wireless/ath/ath10k/wmi.c | 34 +- + drivers/net/wireless/ath/ath10k/wmi.h | 2 - + drivers/net/wireless/ath/ath11k/hw.c | 3 + + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 419 +++- + drivers/net/wireless/ath/ath11k/wmi.c | 50 +- + drivers/net/wireless/ath/ath11k/wmi.h | 48 +- + drivers/net/wireless/ath/ath12k/core.c | 1 + + drivers/net/wireless/ath/ath12k/core.h | 1 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 19 +- + drivers/net/wireless/ath/ath12k/hw.c | 6 + + drivers/net/wireless/ath/ath12k/hw.h | 2 + + drivers/net/wireless/ath/ath12k/mac.c | 49 +- + drivers/net/wireless/ath/ath12k/qmi.c | 6 +- + drivers/net/wireless/ath/ath12k/qmi.h | 1 + + drivers/net/wireless/ath/ath12k/wmi.c | 8 +- + drivers/net/wireless/ath/ath12k/wmi.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 +- + drivers/net/wireless/ath/ath9k/wmi.c | 4 + + drivers/net/wireless/atmel/Kconfig | 2 +- + drivers/net/wireless/atmel/atmel_cs.c | 13 +- + .../broadcom/brcm80211/brcmfmac/wcc/core.c | 4 +- + .../wireless/broadcom/brcm80211/brcmutil/utils.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 38 +- + .../net/wireless/intel/iwlwifi/fw/api/binding.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 23 +- + .../net/wireless/intel/iwlwifi/fw/api/context.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 2 + + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 16 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 65 +- + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 24 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 3 +- + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 254 ++- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 284 +-- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 47 +- + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 32 +- + .../net/wireless/intel/iwlwifi/iwl-context-info.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 10 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 99 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 39 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 96 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 124 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 27 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 10 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 31 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 - + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 20 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 279 ++- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 49 +- + drivers/net/wireless/intersil/hostap/Kconfig | 2 +- + drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +- + .../net/wireless/intersil/orinoco/spectrum_cs.c | 13 +- + drivers/net/wireless/legacy/ray_cs.c | 31 +- + drivers/net/wireless/legacy/wl3501_cs.c | 16 +- + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 3 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 47 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 23 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 28 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 2090 ++++++++++++++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 37 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 110 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 47 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 11 + + drivers/net/wireless/realtek/rtw88/Makefile | 3 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 6 + + drivers/net/wireless/realtek/rtw88/rtw8723ds.c | 41 + + drivers/net/wireless/realtek/rtw88/sdio.c | 24 +- + drivers/net/wireless/realtek/rtw88/usb.c | 2 +- + drivers/net/wireless/realtek/rtw89/Kconfig | 14 + + drivers/net/wireless/realtek/rtw89/Makefile | 9 + + drivers/net/wireless/realtek/rtw89/coex.c | 9 +- + drivers/net/wireless/realtek/rtw89/core.c | 114 +- + drivers/net/wireless/realtek/rtw89/core.h | 26 +- + drivers/net/wireless/realtek/rtw89/debug.c | 23 +- + drivers/net/wireless/realtek/rtw89/efuse.c | 21 + + drivers/net/wireless/realtek/rtw89/efuse.h | 1 + + drivers/net/wireless/realtek/rtw89/fw.c | 31 +- + drivers/net/wireless/realtek/rtw89/fw.h | 102 +- + drivers/net/wireless/realtek/rtw89/mac.c | 26 +- + drivers/net/wireless/realtek/rtw89/mac.h | 2 + + drivers/net/wireless/realtek/rtw89/pci.c | 12 +- + drivers/net/wireless/realtek/rtw89/phy.c | 1 + + drivers/net/wireless/realtek/rtw89/reg.h | 56 + + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2263 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b.h | 61 + + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 1776 +++++++++++++++ + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h | 8 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + + drivers/net/wireless/realtek/rtw89/ser.c | 5 + + drivers/net/wireless/realtek/rtw89/txrx.h | 151 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 18 +- + include/linux/ieee80211.h | 75 +- + include/linux/mmc/sdio_ids.h | 3 +- + include/net/mac80211.h | 5 + + net/mac80211/cfg.c | 75 +- + net/mac80211/chan.c | 4 +- + net/mac80211/driver-ops.h | 10 +- + net/mac80211/ibss.c | 16 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/iface.c | 7 +- + net/mac80211/main.c | 4 +- + net/mac80211/mesh.c | 30 +- + net/mac80211/mesh.h | 19 +- + net/mac80211/mesh_plink.c | 37 +- + net/mac80211/mesh_ps.c | 7 +- + net/mac80211/mlme.c | 31 +- + net/mac80211/ocb.c | 4 +- + net/mac80211/sta_info.c | 235 +- + net/mac80211/tx.c | 30 +- + net/mac80211/util.c | 148 +- + 149 files changed, 9275 insertions(+), 1414 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723ds.c +Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging net/ieee802154/nl802154.c +Auto-merging net/mac802154/scan.c +Merge made by the 'ort' strategy. + drivers/net/ieee802154/ca8210.c | 3 +- + include/net/cfg802154.h | 3 ++ + include/net/ieee802154_netdev.h | 20 +++++++++++- + net/ieee802154/header_ops.c | 36 +++++++++++++++++++++ + net/ieee802154/nl802154.c | 13 +++++++- + net/mac802154/ieee802154_i.h | 21 +++++++++++++ + net/mac802154/main.c | 2 ++ + net/mac802154/rx.c | 70 ++++++++++++++++++++++++++++++++++++++++- + net/mac802154/scan.c | 68 +++++++++++++++++++++++++++++++++++---- + 9 files changed, 226 insertions(+), 10 deletions(-) +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 +Merge made by the 'ort' strategy. + drivers/net/ieee802154/ca8210.c | 1 - + 1 file changed, 1 deletion(-) +Merging mtd/mtd/next (a2c2690f0d74 mtd: st_spi_fsm: Use the devm_clk_get_enabled() helper function) +$ 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. + drivers/mtd/devices/st_spi_fsm.c | 28 ++++++---------------------- + 1 file changed, 6 insertions(+), 22 deletions(-) +Merging nand/nand/next (ef1560b670bd mtd: spinand: gigadevice: add support for GD5F2GQ5xExxH) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/gigadevice.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) +$ 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 +Already up to date. +Merging crypto/master (134e0dc6b73a crypto: qat - add missing function declaration in adf_dbgfs.h) +$ 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. + .../devicetree/bindings/crypto/qcom-qce.yaml | 52 +- + .../bindings/crypto/starfive,jh7110-crypto.yaml | 70 ++ + MAINTAINERS | 7 + + arch/arm/crypto/sha1_neon_glue.c | 12 +- + arch/arm/crypto/sha256_neon_glue.c | 12 +- + arch/arm/crypto/sha512-neon-glue.c | 12 +- + arch/arm64/crypto/sha256-glue.c | 3 +- + crypto/Kconfig | 24 + + crypto/Makefile | 1 + + crypto/aegis-neon.h | 17 + + crypto/aegis128-neon-inner.c | 1 + + crypto/aegis128-neon.c | 12 +- + crypto/ahash.c | 9 +- + crypto/cipher.c | 23 + + crypto/cmac.c | 36 +- + crypto/jitterentropy-kcapi.c | 192 ++++- + crypto/jitterentropy-testing.c | 294 +++++++ + crypto/jitterentropy.c | 152 ++-- + crypto/jitterentropy.h | 20 +- + crypto/shash.c | 12 +- + drivers/char/hw_random/Kconfig | 25 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/cn10k-rng.c | 63 +- + .../trng/trng-stb.c => char/hw_random/histb-rng.c} | 83 +- + drivers/char/hw_random/imx-rngc.c | 39 +- + drivers/char/hw_random/virtio-rng.c | 10 +- + drivers/crypto/Kconfig | 1 + + drivers/crypto/Makefile | 1 + + drivers/crypto/atmel-ecc.c | 2 +- + drivers/crypto/atmel-sha204a.c | 2 +- + drivers/crypto/caam/ctrl.c | 222 ++--- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/ccp/platform-access.c | 5 + + drivers/crypto/ccp/sp-pci.c | 43 + + drivers/crypto/hisilicon/Kconfig | 7 - + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/trng/Makefile | 3 - + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 2 +- + drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_c62x/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_common/Makefile | 4 +- + drivers/crypto/intel/qat/qat_common/adf_cfg.c | 28 +- + drivers/crypto/intel/qat/qat_common/adf_cfg.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_dbgfs.c | 69 ++ + drivers/crypto/intel/qat/qat_common/adf_dbgfs.h | 29 + + drivers/crypto/intel/qat/qat_common/adf_init.c | 6 + + drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c | 12 +- + drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c | 12 +- + drivers/crypto/marvell/cesa/cipher.c | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 15 + + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 3 + + drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 34 +- + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 33 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 7 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 41 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 247 +++++- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 10 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 1 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 8 +- + drivers/crypto/nx/Makefile | 2 +- + drivers/crypto/nx/nx.h | 4 +- + drivers/crypto/sa2ul.h | 2 +- + drivers/crypto/starfive/Kconfig | 19 + + drivers/crypto/starfive/Makefile | 4 + + drivers/crypto/starfive/jh7110-cryp.c | 240 ++++++ + drivers/crypto/starfive/jh7110-cryp.h | 127 +++ + drivers/crypto/starfive/jh7110-hash.c | 892 +++++++++++++++++++++ + include/crypto/engine.h | 2 +- + include/crypto/hash.h | 3 +- + include/crypto/internal/cipher.h | 2 + + include/crypto/internal/hash.h | 12 + + include/crypto/sha2.h | 2 +- + include/crypto/sha256_base.h | 50 +- + lib/crypto/sha256.c | 79 +- + 77 files changed, 2971 insertions(+), 565 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/starfive,jh7110-crypto.yaml + create mode 100644 crypto/aegis-neon.h + create mode 100644 crypto/jitterentropy-testing.c + rename drivers/{crypto/hisilicon/trng/trng-stb.c => char/hw_random/histb-rng.c} (53%) + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_dbgfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_dbgfs.h + create mode 100644 drivers/crypto/starfive/Kconfig + create mode 100644 drivers/crypto/starfive/Makefile + create mode 100644 drivers/crypto/starfive/jh7110-cryp.c + create mode 100644 drivers/crypto/starfive/jh7110-cryp.h + create mode 100644 drivers/crypto/starfive/jh7110-hash.c +Merging drm/drm-next (2e1492835e43 Merge tag 'drm-misc-next-2023-06-01' 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/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/arcfb.c +Auto-merging drivers/video/fbdev/au1200fb.c +Auto-merging drivers/video/fbdev/broadsheetfb.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/ssd1307fb.c +Auto-merging drivers/video/fbdev/stifb.c +Auto-merging drivers/video/fbdev/udlfb.c +Merge made by the 'ort' strategy. + .../bindings/display/bridge/fsl,ldb.yaml | 5 +- + .../bindings/display/bridge/samsung,mipi-dsim.yaml | 35 +- + .../bindings/display/bridge/toshiba,tc358767.yaml | 14 +- + .../bindings/display/connector/hdmi-connector.yaml | 3 + + .../devicetree/bindings/display/fsl,lcdif.yaml | 7 +- + .../bindings/display/panel/novatek,nt36523.yaml | 16 +- + .../bindings/display/panel/panel-simple.yaml | 6 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + .../bindings/display/panel/samsung,s6d7aa0.yaml | 70 +++ + Documentation/gpu/drm-usage-stats.rst | 91 +++- + Documentation/gpu/rfc/index.rst | 4 + + Documentation/gpu/rfc/xe.rst | 235 +++++++++ + Documentation/gpu/todo.rst | 7 +- + Documentation/gpu/vkms.rst | 7 +- + MAINTAINERS | 8 + + arch/arc/include/asm/fb.h | 16 +- + arch/arm/include/asm/fb.h | 15 +- + arch/arm64/include/asm/fb.h | 15 +- + arch/ia64/include/asm/fb.h | 27 +- + arch/loongarch/include/asm/fb.h | 24 +- + arch/m68k/include/asm/fb.h | 24 +- + arch/mips/include/asm/fb.h | 28 +- + arch/parisc/Makefile | 4 +- + arch/parisc/include/asm/fb.h | 20 +- + arch/parisc/video/Makefile | 3 + + arch/parisc/video/fbdev.c | 26 + + arch/powerpc/include/asm/fb.h | 8 +- + arch/sh/include/asm/fb.h | 15 +- + arch/sparc/Makefile | 1 + + arch/sparc/include/asm/fb.h | 51 +- + arch/sparc/video/Makefile | 3 + + arch/sparc/video/fbdev.c | 23 + + arch/x86/include/asm/fb.h | 21 +- + arch/x86/video/fbdev.c | 28 +- + drivers/auxdisplay/cfag12864bfb.c | 2 +- + drivers/auxdisplay/ht16k33.c | 2 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/firmware/sysfb.c | 2 +- + drivers/gpu/drm/Kconfig | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 2 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/armada/Kconfig | 1 + + drivers/gpu/drm/armada/Makefile | 3 +- + drivers/gpu/drm/armada/armada_drm.h | 10 +- + drivers/gpu/drm/armada/armada_drv.c | 14 +- + drivers/gpu/drm/armada/armada_fb.c | 1 - + drivers/gpu/drm/armada/armada_fbdev.c | 136 +++-- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 131 +++-- + drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 2 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 2 +- + drivers/gpu/drm/bridge/display-connector.c | 61 ++- + drivers/gpu/drm/bridge/fsl-ldb.c | 14 +- + drivers/gpu/drm/bridge/ite-it6505.c | 5 +- + drivers/gpu/drm/bridge/ite-it66121.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 194 ++++++- + drivers/gpu/drm/bridge/sii902x.c | 2 +- + drivers/gpu/drm/bridge/sii9234.c | 2 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 201 ++++++- + drivers/gpu/drm/bridge/tc358768.c | 99 +++- + drivers/gpu/drm/bridge/tc358775.c | 2 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 22 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 21 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/drm_aperture.c | 11 +- + drivers/gpu/drm/drm_atomic_helper.c | 13 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 402 +------------- + drivers/gpu/drm/drm_fbdev_dma.c | 11 +- + drivers/gpu/drm/drm_fbdev_generic.c | 11 +- + drivers/gpu/drm/drm_file.c | 132 +++++ + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 9 + + drivers/gpu/drm/drm_gem_vram_helper.c | 6 +- + drivers/gpu/drm/drm_sysfs.c | 51 ++ + drivers/gpu/drm/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 9 +- + drivers/gpu/drm/gma500/Kconfig | 1 + + drivers/gpu/drm/gma500/fbdev.c | 10 +- + drivers/gpu/drm/gma500/psb_drv.c | 43 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 - + drivers/gpu/drm/i2c/tda9950.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 14 +- + drivers/gpu/drm/i915/display/intel_fb.c | 9 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 52 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 65 ++- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 148 ++++-- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 60 ++- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 68 ++- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_region.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 13 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 108 +++- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 18 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 10 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 84 ++- + drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 3 +- + drivers/gpu/drm/i915/gt/intel_context.c | 5 +- + drivers/gpu/drm/i915/gt/intel_context.h | 8 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 84 ++- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 25 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 14 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 35 ++ + drivers/gpu/drm/i915/gt/intel_gtt.c | 47 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 36 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 51 +- + drivers/gpu/drm/i915/gt/intel_migrate.h | 13 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 70 ++- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 167 +++--- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 56 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 47 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 3 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 42 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_tlb.c | 4 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 23 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 424 +++++++++++++++ + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.h | 18 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 76 ++- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h | 17 +- + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 102 ++++ + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 27 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 36 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 266 +++++----- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 59 +++ + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 6 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 11 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 40 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 75 ++- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 244 ++++++--- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/i915_active.h | 14 +- + drivers/gpu/drm/i915/i915_debugfs.c | 51 +- + drivers/gpu/drm/i915/i915_drm_client.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 452 ++++++++-------- + drivers/gpu/drm/i915/i915_gem.c | 27 +- + drivers/gpu/drm/i915/i915_getparam.c | 7 + + drivers/gpu/drm/i915/i915_gpu_error.c | 153 +++++- + drivers/gpu/drm/i915/i915_gpu_error.h | 10 + + drivers/gpu/drm/i915/i915_hwmon.c | 89 +++- + drivers/gpu/drm/i915/i915_hwmon.h | 7 + + drivers/gpu/drm/i915/i915_irq.c | 17 +- + drivers/gpu/drm/i915/i915_pci.c | 81 ++- + drivers/gpu/drm/i915/i915_perf.c | 1 + + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 4 - + drivers/gpu/drm/i915/i915_pmu.c | 290 +++++++--- + drivers/gpu/drm/i915/i915_pmu.h | 28 +- + drivers/gpu/drm/i915/i915_request.h | 52 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 9 +- + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 16 +- + drivers/gpu/drm/i915/i915_vma.h | 4 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 46 +- + drivers/gpu/drm/i915/i915_vma_types.h | 2 - + drivers/gpu/drm/i915/intel_device_info.h | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 104 +++- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h | 24 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 444 ++++++++++++++++ + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h | 43 ++ + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 3 +- + drivers/gpu/drm/i915/pxp/intel_pxp_regs.h | 27 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 25 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 2 - + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 24 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 5 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 47 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 9 + + drivers/gpu/drm/i915/selftests/mock_gtt.c | 8 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/meson/meson_venc.c | 32 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/msm_drv.c | 15 +- + drivers/gpu/drm/msm/msm_fbdev.c | 23 +- + drivers/gpu/drm/msm/msm_gem.c | 15 + + drivers/gpu/drm/msm/msm_gpu.c | 2 - + drivers/gpu/drm/mxsfb/lcdif_drv.c | 69 ++- + drivers/gpu/drm/mxsfb/lcdif_drv.h | 3 - + drivers/gpu/drm/mxsfb/lcdif_kms.c | 201 ++++--- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 + + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 2 +- + drivers/gpu/drm/nouveau/nv50_display.h | 4 +- + .../drm/nouveau/nvkm/subdev/bios/power_budget.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 1 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 11 +- + drivers/gpu/drm/panel/Kconfig | 7 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 404 ++++++++------ + drivers/gpu/drm/panel/panel-edp.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 569 +++++++++++++++++++- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 2 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 585 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 43 +- + drivers/gpu/drm/panel/panel-simple.c | 106 +++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 102 +++- + drivers/gpu/drm/radeon/Kconfig | 1 + + drivers/gpu/drm/radeon/radeon_fbdev.c | 9 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- + drivers/gpu/drm/scheduler/sched_entity.c | 53 +- + drivers/gpu/drm/scheduler/sched_fence.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 37 +- + drivers/gpu/drm/shmobile/Kconfig | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 35 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 + + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 5 + + drivers/gpu/drm/solomon/ssd130x-i2c.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.h | 6 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 11 +- + drivers/gpu/drm/sti/sti_hdmi.h | 2 - + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 4 +- + drivers/gpu/drm/sun4i/Makefile | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 65 ++- + .../sun4i/{sun4i_dotclock.c => sun4i_tcon_dclk.c} | 2 +- + .../sun4i/{sun4i_dotclock.h => sun4i_tcon_dclk.h} | 0 + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/fbdev.c | 8 +- + drivers/gpu/drm/tests/drm_rect_test.c | 315 +++++++++++ + drivers/gpu/drm/ttm/ttm_device.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/udl/udl_main.c | 2 +- + drivers/gpu/drm/vc4/tests/vc4_mock.h | 3 + + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 4 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 65 +-- + drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 336 ++++++++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 25 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 +- + drivers/gpu/drm/vc4/vc4_plane.c | 3 +- + drivers/gpu/drm/vc4/vc4_txp.c | 12 +- + drivers/gpu/drm/vc4/vc4_vec.c | 14 +- + drivers/gpu/drm/vkms/vkms_composer.c | 38 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 5 +- + drivers/gpu/drm/vkms/vkms_drv.c | 6 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 +- + drivers/gpu/drm/vkms/vkms_formats.c | 149 +++--- + drivers/gpu/drm/vkms/vkms_formats.h | 2 +- + drivers/gpu/drm/vkms/vkms_plane.c | 50 +- + drivers/gpu/ipu-v3/ipu-prv.h | 1 + + drivers/hid/hid-picolcd_fb.c | 4 +- + drivers/media/pci/ivtv/ivtvfb.c | 4 +- + drivers/misc/mei/Kconfig | 2 +- + drivers/misc/mei/Makefile | 1 + + drivers/misc/mei/gsc_proxy/Kconfig | 14 + + drivers/misc/mei/gsc_proxy/Makefile | 7 + + drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 208 ++++++++ + drivers/staging/sm750fb/sm750.c | 2 +- + drivers/video/Kconfig | 7 + + drivers/video/Makefile | 1 + + drivers/video/aperture.c | 70 ++- + drivers/video/console/Kconfig | 1 + + drivers/video/console/Makefile | 4 +- + drivers/video/console/sticon.c | 6 +- + drivers/video/fbdev/Kconfig | 24 +- + drivers/video/fbdev/arcfb.c | 12 +- + drivers/video/fbdev/aty/atyfb.h | 2 + + drivers/video/fbdev/aty/mach64_cursor.c | 2 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 16 +- + drivers/video/fbdev/chipsfb.c | 2 +- + drivers/video/fbdev/cobalt_lcdfb.c | 6 + + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fb_io_fops.c | 133 +++++ + drivers/video/fbdev/core/fb_sys_fops.c | 36 +- + drivers/video/fbdev/core/fbcon.c | 1 - + drivers/video/fbdev/core/fbmem.c | 113 +--- + drivers/video/fbdev/hecubafb.c | 12 +- + drivers/video/fbdev/hitfb.c | 122 +++-- + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_accel.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_base.h | 4 +- + drivers/video/fbdev/metronomefb.c | 16 +- + drivers/video/fbdev/ps3fb.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 5 +- + drivers/video/fbdev/sm712fb.c | 10 +- + drivers/video/fbdev/smscufx.c | 14 +- + drivers/video/fbdev/ssd1307fb.c | 3 + + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/stifb.c | 6 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 12 +- + drivers/video/fbdev/vfb.c | 2 +- + drivers/video/fbdev/wmt_ge_rops.c | 2 + + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/video/{console => }/sticore.c | 123 ++--- + include/asm-generic/fb.h | 126 ++++- + include/drm/bridge/samsung-dsim.h | 6 + + include/drm/display/drm_dp.h | 3 + + include/drm/drm_aperture.h | 7 +- + include/drm/drm_connector.h | 5 + + include/drm/drm_drv.h | 7 + + include/drm/drm_fb_helper.h | 83 +-- + include/drm/drm_file.h | 32 ++ + include/drm/drm_fixed.h | 6 + + include/drm/drm_gem.h | 32 ++ + include/drm/gpu_scheduler.h | 7 +- + include/drm/i915_component.h | 3 +- + include/drm/i915_gsc_proxy_mei_interface.h | 53 ++ + include/drm/ttm/ttm_device.h | 4 +- + include/linux/aperture.h | 16 +- + include/linux/fb.h | 177 +++++-- + include/uapi/drm/drm_mode.h | 5 + + include/uapi/drm/i915_drm.h | 51 +- + {drivers/video/fbdev => include/video}/sticore.h | 16 +- + 378 files changed, 9673 insertions(+), 3374 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml + create mode 100644 Documentation/gpu/rfc/xe.rst + create mode 100644 arch/parisc/video/Makefile + create mode 100644 arch/parisc/video/fbdev.c + create mode 100644 arch/sparc/video/Makefile + create mode 100644 arch/sparc/video/fbdev.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c + rename drivers/gpu/drm/sun4i/{sun4i_dotclock.c => sun4i_tcon_dclk.c} (99%) + rename drivers/gpu/drm/sun4i/{sun4i_dotclock.h => sun4i_tcon_dclk.h} (100%) + create mode 100644 drivers/misc/mei/gsc_proxy/Kconfig + create mode 100644 drivers/misc/mei/gsc_proxy/Makefile + create mode 100644 drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c + create mode 100644 drivers/video/fbdev/core/fb_io_fops.c + rename drivers/video/{console => }/sticore.c (95%) + create mode 100644 include/drm/i915_gsc_proxy_mei_interface.h + rename {drivers/video/fbdev => include/video}/sticore.h (99%) +Merging drm-misc/for-linux-next (013413cdfeec drm/bridge: imx: turn imx8{qm,qxp}-ldb into single-object modules) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../display/amlogic,meson-g12a-dw-mipi-dsi.yaml | 118 ++++++ + .../bindings/display/amlogic,meson-vpu.yaml | 5 + + .../bindings/display/bridge/toshiba,tc358762.yaml | 3 + + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 4 + + MAINTAINERS | 2 + + drivers/gpu/drm/bridge/imx/Kconfig | 5 + + drivers/gpu/drm/bridge/imx/Makefile | 5 +- + drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 17 + + .../bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} | 0 + .../imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} | 0 + drivers/gpu/drm/bridge/tc358762.c | 15 + + drivers/gpu/drm/meson/Kconfig | 7 + + drivers/gpu/drm/meson/Makefile | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 62 ++- + drivers/gpu/drm/meson/meson_drv.h | 1 + + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 352 +++++++++++++++ + drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 +++++++ + drivers/gpu/drm/meson/meson_encoder_dsi.c | 174 ++++++++ + drivers/gpu/drm/meson/meson_encoder_dsi.h | 13 + + drivers/gpu/drm/meson/meson_registers.h | 25 ++ + drivers/gpu/drm/meson/meson_venc.c | 212 ++++++++- + drivers/gpu/drm/meson/meson_venc.h | 6 + + drivers/gpu/drm/meson/meson_vpp.h | 2 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 472 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-khadas-ts050.c | 16 +- + drivers/gpu/drm/virtio/Makefile | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 4 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 182 -------- + drivers/gpu/drm/virtio/virtgpu_submit.c | 311 ++++++++++++++ + 30 files changed, 1958 insertions(+), 221 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-g12a-dw-mipi-dsi.yaml + rename drivers/gpu/drm/bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} (100%) + rename drivers/gpu/drm/bridge/imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} (100%) + create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c + create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.h + create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.c + create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_submit.c +Merging amdgpu/drm-next (6bd4b01e8938 drm/amd/display: mark dml314's UseMinimumDCFCLK() as noinline_for_stack) +$ 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_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in 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_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_dpms.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +Auto-merging drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c +Auto-merging drivers/gpu/drm/amd/display/include/signal_types.h +Auto-merging drivers/gpu/drm/amd/display/modules/power/power_helpers.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/ttm/ttm_device.c +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging include/drm/display/drm_dp.h +CONFLICT (content): Merge conflict in include/drm/display/drm_dp.h +Auto-merging include/drm/ttm/ttm_pool.h +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h' using previous resolution. +Resolved 'include/drm/display/drm_dp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4c3779b9a19e] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 4 +- + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 10 + + drivers/gpu/drm/amd/amdgpu/Makefile | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 419 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 60 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 154 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 123 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 384 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 325 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 55 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 182 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 210 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 472 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 171 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 241 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 305 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 347 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 141 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 368 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 142 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 22 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 164 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 228 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 320 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 399 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 182 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 1 - + .../gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 661 ++ + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 280 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 314 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 51 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 114 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 250 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 24 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 4176 ++++++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 870 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 55 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 619 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 23 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 1074 ++ + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 51 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 36 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 58 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 883 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 12 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 134 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 9 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 4 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 477 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.h | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 - + drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.c | 103 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 94 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 69 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 14 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 1541 +++ + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 21 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 4 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 460 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 85 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 1120 ++ + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 123 + + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 466 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1036 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 35 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 405 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 112 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 64 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 9 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 425 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 86 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 73 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 318 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 283 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 98 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 303 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 211 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 14 +- + drivers/gpu/drm/amd/amdxcp/Makefile | 25 + + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 110 + + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 29 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 88 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 31 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 107 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 6 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 25 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 20 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 10 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 66 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 24 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 71 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 17 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 36 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 3 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 54 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 46 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 58 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 44 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 61 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 58 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 478 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 305 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 27 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 30 - + drivers/gpu/drm/amd/display/dc/dc.h | 32 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 328 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 15 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 90 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 10 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 38 - + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 282 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 252 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 46 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 28 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 5 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 5 + + .../amd/display/dc/dce112/dce112_hw_sequencer.c | 3 - + .../drm/amd/display/dc/dce112/dce112_resource.c | 5 + + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 3 - + .../drm/amd/display/dc/dce120/dce120_resource.c | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 153 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 - + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 23 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 103 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 34 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 39 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 77 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 2 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_optc.c | 7 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 68 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 6 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 38 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 70 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 14 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 33 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 2 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 34 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 30 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 29 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 113 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 7 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 4 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 45 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 11 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 5 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 33 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 8 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 36 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 164 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 45 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 5 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 79 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 51 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 17 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 74 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 54 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 9 + + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 66 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 15 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 68 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 246 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 3 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 45 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 11 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 22 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 6 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 34 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 269 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 16 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 2 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 20 +- + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 408 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 1 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 12 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 12 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 135 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 83 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 259 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 6 +- + .../display/dc/link/protocols/link_dp_capability.c | 36 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../display/dc/link/protocols/link_dp_training.c | 17 +- + .../dc/link/protocols/link_dp_training_128b_132b.c | 10 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 4 + + .../link_dp_training_fixed_vs_pe_retimer.c | 23 +- + .../dc/link/protocols/link_edp_panel_control.c | 29 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 19 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 40 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 6 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 4 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 5 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c | 62 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h | 33 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 16 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 49 +- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 2 +- + drivers/gpu/drm/amd/display/include/signal_types.h | 28 + + .../drm/amd/display/modules/freesync/freesync.c | 4 - + .../drm/amd/display/modules/power/power_helpers.c | 43 + + .../drm/amd/display/modules/power/power_helpers.h | 3 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 14 + + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 69 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 10 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 4 + + .../amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_9_4_3_offset.h | 192 + + .../drm/amd/include/asic_reg/gc/gc_9_4_3_sh_mask.h | 1112 ++ + .../include/asic_reg/mmhub/mmhub_1_8_0_offset.h | 56 +- + .../include/asic_reg/mmhub/mmhub_1_8_0_sh_mask.h | 325 +- + .../amd/include/asic_reg/nbio/nbio_7_9_0_offset.h | 2 + + .../amd/include/asic_reg/sdma/sdma_4_4_2_offset.h | 4 + + .../amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h | 24 + + .../include/asic_reg/smuio/smuio_13_0_3_offset.h | 177 + + .../include/asic_reg/smuio/smuio_13_0_3_sh_mask.h | 428 + + .../amd/include/asic_reg/vcn/vcn_4_0_3_offset.h | 2332 ++++ + .../amd/include/asic_reg/vcn/vcn_4_0_3_sh_mask.h | 10919 +++++++++++++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 1 + + drivers/gpu/drm/amd/include/discovery.h | 32 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 59 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 21 +- + drivers/gpu/drm/amd/include/v9_structs.h | 30 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 68 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 16 +- + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 6 +- + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 12 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 36 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 +- + .../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 2 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 51 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 2 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h | 2 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 15 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 31 +- + .../inc/pmfw_if/smu13_driver_if_yellow_carp.h | 2 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 17 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 12 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 16 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 92 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 56 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 489 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 386 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 488 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + + drivers/gpu/drm/radeon/ci_dpm.c | 28 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 8 +- + drivers/gpu/drm/radeon/ni_dpm.c | 8 +- + drivers/gpu/drm/radeon/r100.c | 8 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r420.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/radeon/radeon_fence.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_ib.c | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- + drivers/gpu/drm/radeon/rs400.c | 2 +- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/radeon/rv740_dpm.c | 8 +- + drivers/gpu/drm/ttm/ttm_device.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 14 +- + drivers/gpu/drm/ttm/ttm_tt.c | 6 + + include/drm/ttm/ttm_pool.h | 4 +- + include/drm/ttm/ttm_tt.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 22 + + include/uapi/linux/kfd_ioctl.h | 671 +- + include/uapi/linux/kfd_sysfs.h | 15 + + 467 files changed, 43998 insertions(+), 7552 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_debug.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_debug.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c + create mode 100644 drivers/gpu/drm/amd/amdxcp/Makefile + create mode 100644 drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c + create mode 100644 drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_3_sh_mask.h +Merging drm-intel/for-linux-next (718551bbed3c drm/i915: Fix error handling if driver creation fails during probe) +$ 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_cdclk.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c +Resolved 'drivers/gpu/drm/i915/display/intel_hdcp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4a759de6537f] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/display/drm_dp_mst_topology.c | 55 +- + drivers/gpu/drm/display/drm_dsc_helper.c | 1006 +++++++ + drivers/gpu/drm/drm_edid.c | 38 + + drivers/gpu/drm/i915/Makefile | 12 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 113 + + drivers/gpu/drm/i915/display/g4x_hdmi.h | 4 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 4 +- + drivers/gpu/drm/i915/display/i9xx_wm.h | 1 - + drivers/gpu/drm/i915/display/icl_dsi.c | 1 + + drivers/gpu/drm/i915/display/intel_atomic.c | 259 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 4 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 1 + + drivers/gpu/drm/i915/display/intel_bios.c | 251 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 +- + drivers/gpu/drm/i915/display/intel_bw.c | 3 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 179 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 1 + + drivers/gpu/drm/i915/display/intel_color.c | 733 ++++- + drivers/gpu/drm/i915/display/intel_connector.c | 18 +- + drivers/gpu/drm/i915/display/intel_connector.h | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 55 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 20 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 10 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 54 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 4 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 3046 ++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 50 + + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 274 ++ + drivers/gpu/drm/i915/display/intel_ddi.c | 498 +++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 80 +- + drivers/gpu/drm/i915/display/intel_display.c | 1153 ++------ + drivers/gpu/drm/i915/display/intel_display.h | 69 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 8 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 17 +- + .../gpu/drm/i915/display/intel_display_device.c | 917 ++++++ + .../gpu/drm/i915/display/intel_display_device.h | 129 + + .../gpu/drm/i915/display/intel_display_driver.c | 583 ++++ + .../gpu/drm/i915/display/intel_display_driver.h | 36 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 1668 +++++++++++ + drivers/gpu/drm/i915/display/intel_display_irq.h | 81 + + drivers/gpu/drm/i915/display/intel_display_power.c | 52 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 3 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 92 +- + .../drm/i915/display/intel_display_power_well.c | 5 +- + .../drm/i915/display/intel_display_power_well.h | 2 + + .../gpu/drm/i915/display/intel_display_reg_defs.h | 14 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 135 + + drivers/gpu/drm/i915/display/intel_display_reset.h | 14 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 - + drivers/gpu/drm/i915/display/intel_display_types.h | 73 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 9 + + drivers/gpu/drm/i915/display/intel_dkl_phy.h | 1 + + drivers/gpu/drm/i915/display/intel_dp.c | 361 ++- + drivers/gpu/drm/i915/display/intel_dp.h | 4 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 45 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 62 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 433 ++- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 37 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 92 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 + + drivers/gpu/drm/i915/display/intel_dvo.c | 1 + + drivers/gpu/drm/i915/display/intel_fb.c | 42 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 + + drivers/gpu/drm/i915/display/intel_fdi.c | 9 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 5 + + drivers/gpu/drm/i915/display/intel_gmbus.h | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 792 ++--- + drivers/gpu/drm/i915/display/intel_hdcp.h | 12 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 18 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 127 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 9 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 1 + + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1442 +++++++++ + drivers/gpu/drm/i915/display/intel_hotplug_irq.h | 35 + + drivers/gpu/drm/i915/display/intel_hti.c | 2 +- + drivers/gpu/drm/i915/display/intel_load_detect.c | 225 ++ + drivers/gpu/drm/i915/display/intel_load_detect.h | 20 + + drivers/gpu/drm/i915/display/intel_lvds.c | 16 +- + drivers/gpu/drm/i915/display/intel_modeset_lock.c | 50 + + drivers/gpu/drm/i915/display/intel_modeset_lock.h | 33 + + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 324 ++- + .../gpu/drm/i915/display/intel_modeset_verify.c | 36 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 16 +- + drivers/gpu/drm/i915/display/intel_panel.c | 117 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 20 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 16 +- + drivers/gpu/drm/i915/display/intel_psr.c | 261 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 207 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 108 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 7 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 10 - + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 416 ++- + drivers/gpu/drm/i915/display/intel_tc.h | 5 +- + drivers/gpu/drm/i915/display/intel_tv.c | 20 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 15 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 3 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 443 +-- + drivers/gpu/drm/i915/display/intel_vrr.c | 66 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 10 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 314 +- + drivers/gpu/drm/i915/display/skl_scaler.h | 16 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 26 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 5 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 + + drivers/gpu/drm/i915/gt/selftest_rps.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 10 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 98 +- + drivers/gpu/drm/i915/i915_drv.h | 73 +- + drivers/gpu/drm/i915/i915_hwmon.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 2658 +---------------- + drivers/gpu/drm/i915/i915_irq.h | 48 +- + drivers/gpu/drm/i915/i915_pci.c | 390 +-- + drivers/gpu/drm/i915/i915_reg.h | 502 ++-- + drivers/gpu/drm/i915/i915_reg_defs.h | 105 + + drivers/gpu/drm/i915/i915_vma.c | 2 + + drivers/gpu/drm/i915/intel_clock_gating.c | 5 +- + drivers/gpu/drm/i915/intel_device_info.c | 209 +- + drivers/gpu/drm/i915/intel_device_info.h | 69 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 6 - + drivers/gpu/drm/i915/intel_step.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 26 +- + include/drm/display/drm_dp_mst_helper.h | 14 +- + include/drm/display/drm_dsc_helper.h | 9 + + include/drm/drm_connector.h | 8 + + include/drm/drm_edid.h | 2 + + include/drm/i915_drm.h | 2 +- + include/drm/i915_hdcp_interface.h | 4 +- + include/uapi/drm/drm_fourcc.h | 43 + + 147 files changed, 15319 insertions(+), 7230 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.c + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_driver.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_irq.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_irq.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_reset.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hotplug_irq.c + create mode 100644 drivers/gpu/drm/i915/display/intel_hotplug_irq.h + create mode 100644 drivers/gpu/drm/i915/display/intel_load_detect.c + create mode 100644 drivers/gpu/drm/i915/display/intel_load_detect.h + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_lock.c + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_lock.h +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 (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog) +$ 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 (125c32ef4cac Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-mdp5' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/gmu.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 2 + + .../bindings/display/msm/dsi-phy-28nm.yaml | 3 +- + .../devicetree/bindings/display/msm/gmu.yaml | 1 + + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 1 + + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 1 + + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 2 +- + MAINTAINERS | 1 + + drivers/gpu/drm/msm/Makefile | 1 - + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 2 +- + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 39 ++- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 32 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 42 ++- + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 78 +++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 42 ++- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 20 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 14 +- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 14 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 30 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 24 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 47 ++- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 38 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 23 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 280 ++++++++------- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 28 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 247 +++++++------ + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 19 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 54 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 113 ++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 63 +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 76 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 46 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 38 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 184 +++++----- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 315 +++++++++++++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 38 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 43 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 51 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 33 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 125 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 80 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 386 +++++++-------------- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 66 +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 50 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 52 +++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 32 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 33 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 82 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 43 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 135 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 167 +++------ + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 63 +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 14 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 82 +++++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_debug.c | 6 +- + drivers/gpu/drm/msm/dp/dp_debug.h | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 34 +- + drivers/gpu/drm/msm/dp/dp_hpd.c | 67 ---- + drivers/gpu/drm/msm/dp/dp_hpd.h | 78 ----- + drivers/gpu/drm/msm/dp/dp_panel.h | 1 - + drivers/gpu/drm/msm/dp/dp_power.c | 78 +---- + drivers/gpu/drm/msm/dp/dp_power.h | 3 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 11 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 68 ++-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 3 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 3 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 97 ++++++ + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + 83 files changed, 1960 insertions(+), 2124 deletions(-) + delete mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c + delete mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (79a3908d1ea6 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/omap/lcd_mipid.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging regmap/for-next (469859394c49 Merge remote-tracking branch 'regmap/for-6.5' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache-maple.c | 58 +++++++- + drivers/base/regmap/regmap-irq.c | 273 ++++++----------------------------- + drivers/base/regmap/regmap-mmio.c | 2 +- + drivers/base/regmap/regmap.c | 26 ++-- + drivers/gpio/gpio-104-dio-48e.c | 37 +++-- + include/linux/regmap.h | 33 +---- + 6 files changed, 144 insertions(+), 285 deletions(-) +Merging sound/for-next (306f3f78a5ff ALSA: control: Keep the previous numid at snd_ctl_rename_id()) +$ 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 +Merge made by the 'ort' strategy. + Documentation/sound/cards/audigy-mixer.rst | 38 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + Documentation/sound/designs/index.rst | 1 + + Documentation/sound/designs/midi-2.0.rst | 351 +++++++ + include/linux/usb/midi-v2.h | 94 ++ + include/sound/asequencer.h | 4 + + include/sound/core.h | 2 +- + include/sound/emu10k1.h | 278 +++--- + include/sound/rawmidi.h | 15 +- + include/sound/seq_device.h | 1 + + include/sound/seq_kernel.h | 10 + + include/sound/ump.h | 175 ++++ + include/sound/ump_msg.h | 540 +++++++++++ + include/uapi/sound/asequencer.h | 83 +- + include/uapi/sound/asound.h | 66 +- + include/uapi/sound/emu10k1.h | 8 +- + sound/aoa/codecs/onyx.c | 2 +- + sound/aoa/codecs/tas.c | 2 +- + sound/core/Kconfig | 13 + + sound/core/Makefile | 3 + + sound/core/control.c | 12 +- + sound/core/control_compat.c | 14 +- + sound/core/pcm_native.c | 4 - + sound/core/rawmidi.c | 264 +++-- + sound/core/rawmidi_compat.c | 4 + + sound/core/seq/Kconfig | 14 + + sound/core/seq/Makefile | 3 + + sound/core/seq/seq_clientmgr.c | 577 +++++++---- + sound/core/seq/seq_clientmgr.h | 27 +- + sound/core/seq/seq_compat.c | 3 + + sound/core/seq/seq_dummy.c | 9 + + sound/core/seq/seq_memory.c | 98 +- + sound/core/seq/seq_memory.h | 19 +- + sound/core/seq/seq_midi.c | 12 +- + sound/core/seq/seq_ports.c | 47 +- + sound/core/seq/seq_ports.h | 23 +- + sound/core/seq/seq_ump_client.c | 464 +++++++++ + sound/core/seq/seq_ump_convert.c | 1203 +++++++++++++++++++++++ + sound/core/seq/seq_ump_convert.h | 22 + + sound/core/seq/seq_virmidi.c | 1 + + sound/core/ump.c | 668 +++++++++++++ + sound/core/ump_convert.c | 517 ++++++++++ + sound/core/ump_convert.h | 43 + + sound/drivers/Kconfig | 3 + + sound/isa/Kconfig | 1 + + sound/pci/Kconfig | 45 +- + sound/pci/emu10k1/emu10k1.c | 12 +- + sound/pci/emu10k1/emu10k1_callback.c | 248 +++-- + sound/pci/emu10k1/emu10k1_main.c | 448 +++------ + sound/pci/emu10k1/emufx.c | 849 ++++++++--------- + sound/pci/emu10k1/emumixer.c | 1374 ++++++++++++++------------- + sound/pci/emu10k1/emupcm.c | 929 ++++++++++-------- + sound/pci/emu10k1/emuproc.c | 483 ++++++---- + sound/pci/emu10k1/io.c | 282 ++++-- + sound/pci/emu10k1/irq.c | 36 +- + sound/pci/emu10k1/memory.c | 4 +- + sound/pci/emu10k1/timer.c | 6 - + sound/pci/emu10k1/voice.c | 136 ++- + sound/pci/hda/cs35l41_hda.c | 32 +- + sound/pci/hda/cs35l41_hda_i2c.c | 2 +- + sound/pci/hda/patch_realtek.c | 3 + + sound/pci/mixart/mixart.c | 8 +- + sound/pci/mixart/mixart_core.h | 7 +- + sound/pcmcia/Kconfig | 1 + + sound/ppc/keywest.c | 2 +- + sound/usb/Kconfig | 11 + + sound/usb/Makefile | 1 + + sound/usb/card.c | 12 +- + sound/usb/midi.c | 7 +- + sound/usb/midi.h | 5 +- + sound/usb/midi2.c | 1190 +++++++++++++++++++++++ + sound/usb/midi2.h | 33 + + sound/usb/quirks.c | 8 +- + sound/usb/usbaudio.h | 2 + + 74 files changed, 9009 insertions(+), 2907 deletions(-) + create mode 100644 Documentation/sound/designs/midi-2.0.rst + create mode 100644 include/linux/usb/midi-v2.h + create mode 100644 include/sound/ump.h + create mode 100644 include/sound/ump_msg.h + create mode 100644 sound/core/seq/seq_ump_client.c + create mode 100644 sound/core/seq/seq_ump_convert.c + create mode 100644 sound/core/seq/seq_ump_convert.h + create mode 100644 sound/core/ump.c + create mode 100644 sound/core/ump_convert.c + create mode 100644 sound/core/ump_convert.h + create mode 100644 sound/usb/midi2.c + create mode 100644 sound/usb/midi2.h +Merging ieee1394/for-next (06f45435d985 firewire: core: obsolete usage of GFP_ATOMIC at building node tree) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Auto-merging include/linux/firewire.h +Merge made by the 'ort' strategy. + drivers/firewire/.kunitconfig | 4 + + drivers/firewire/Kconfig | 16 +++ + drivers/firewire/Makefile | 3 + + drivers/firewire/core-cdev.c | 252 +++++++++++++++++++++++++++--------- + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core-transaction.c | 93 +++++++++---- + drivers/firewire/core.h | 7 + + drivers/firewire/ohci.c | 189 +++++++++++---------------- + drivers/firewire/uapi-test.c | 89 +++++++++++++ + include/linux/firewire.h | 82 +++++++++++- + include/uapi/linux/firewire-cdev.h | 180 ++++++++++++++++++++++---- + 12 files changed, 690 insertions(+), 229 deletions(-) + create mode 100644 drivers/firewire/.kunitconfig + create mode 100644 drivers/firewire/uapi-test.c +Merging sound-asoc/for-next (615770258020 Merge remote-tracking branch 'asoc/for-6.5' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,ssm2518.yaml | 47 + + .../devicetree/bindings/sound/adi,ssm3515.yaml | 49 + + Documentation/devicetree/bindings/sound/da7219.txt | 112 -- + .../devicetree/bindings/sound/dialog,da7219.yaml | 237 +++ + .../bindings/sound/google,chv3-codec.yaml | 31 + + .../devicetree/bindings/sound/google,chv3-i2s.yaml | 44 + + .../bindings/sound/google,sc7180-trogdor.yaml | 3 +- + .../devicetree/bindings/sound/ingenic,aic.yaml | 1 + + .../bindings/sound/mediatek,mt8188-afe.yaml | 66 +- + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 27 +- + .../devicetree/bindings/sound/nau8315.txt | 24 - + .../devicetree/bindings/sound/nau8540.txt | 16 - + .../devicetree/bindings/sound/nau8810.txt | 17 - + .../devicetree/bindings/sound/nau8824.txt | 88 -- + .../devicetree/bindings/sound/nau8825.txt | 111 -- + .../devicetree/bindings/sound/nuvoton,nau8315.yaml | 44 + + .../devicetree/bindings/sound/nuvoton,nau8540.yaml | 40 + + .../devicetree/bindings/sound/nuvoton,nau8810.yaml | 45 + + .../devicetree/bindings/sound/nuvoton,nau8824.yaml | 182 +++ + .../devicetree/bindings/sound/nuvoton,nau8825.yaml | 239 +++ + .../bindings/sound/nvidia,tegra-audio-common.yaml | 4 +- + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 4 +- + .../devicetree/bindings/sound/realtek,rt1016.yaml | 40 + + Documentation/devicetree/bindings/sound/rt1016.txt | 17 - + .../bindings/sound/snps,designware-i2s.yaml | 3 +- + .../devicetree/bindings/sound/ssm2518.txt | 20 - + .../bindings/sound/starfive,jh7110-tdm.yaml | 98 ++ + .../devicetree/bindings/sound/tas2562.yaml | 4 +- + .../devicetree/bindings/sound/tas2770.yaml | 4 +- + .../devicetree/bindings/sound/tas27xx.yaml | 4 +- + .../devicetree/bindings/sound/wlf,wm8903.yaml | 4 +- + MAINTAINERS | 6 + + drivers/firmware/cirrus/cs_dsp.c | 8 +- + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 8 + + include/sound/cs35l56.h | 1 + + include/sound/da7219-aad.h | 6 + + include/sound/simple_card_utils.h | 1 - + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-component.h | 4 + + include/sound/soc.h | 1 + + sound/hda/hdac_regmap.c | 1 - + sound/pci/hda/hda_bind.c | 1 - + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 2 + + sound/soc/amd/Kconfig | 2 + + sound/soc/amd/acp/acp-mach-common.c | 43 +- + sound/soc/amd/acp/acp-pci.c | 1 - + sound/soc/amd/acp/acp-platform.c | 1 - + sound/soc/amd/ps/acp63.h | 15 +- + sound/soc/amd/ps/pci-ps.c | 65 +- + sound/soc/amd/ps/ps-pdm-dma.c | 63 +- + sound/soc/amd/vangogh/acp5x.h | 2 + + sound/soc/amd/vangogh/pci-acp5x.c | 7 +- + sound/soc/amd/yc/acp6x-mach.c | 7 + + sound/soc/atmel/atmel-classd.c | 8 +- + sound/soc/atmel/atmel-pdmic.c | 8 +- + sound/soc/atmel/sam9g20_wm8731.c | 1 - + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad193x-i2c.c | 2 +- + sound/soc/codecs/adau1372-i2c.c | 2 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau1761-i2c.c | 2 +- + sound/soc/codecs/adau1781-i2c.c | 2 +- + sound/soc/codecs/adau17x1.c | 13 +- + sound/soc/codecs/adau1977-i2c.c | 2 +- + sound/soc/codecs/adau7118-i2c.c | 2 +- + sound/soc/codecs/adav803.c | 2 +- + sound/soc/codecs/ak4118.c | 13 +- + sound/soc/codecs/ak4375.c | 2 +- + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak4535.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4641.c | 2 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/ak5558.c | 2 +- + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/aw88395/aw88395.c | 2 +- + sound/soc/codecs/chv3-codec.c | 41 + + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs35l41-i2c.c | 2 +- + sound/soc/codecs/cs35l45-i2c.c | 6 +- + sound/soc/codecs/cs35l45-spi.c | 4 +- + sound/soc/codecs/cs35l45-tables.c | 2 +- + sound/soc/codecs/cs35l45.c | 4 +- + sound/soc/codecs/cs35l45.h | 2 +- + sound/soc/codecs/cs35l56.c | 65 +- + sound/soc/codecs/cs4234.c | 2 +- + sound/soc/codecs/cs4265.c | 2 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271-i2c.c | 2 +- + sound/soc/codecs/cs42l42-i2c.c | 2 +- + sound/soc/codecs/cs42l42.c | 7 + + sound/soc/codecs/cs42l51-i2c.c | 2 +- + sound/soc/codecs/cs42l51.c | 9 +- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs42l73.c | 2 +- + sound/soc/codecs/cs42l83-i2c.c | 2 +- + sound/soc/codecs/cs42xx8-i2c.c | 2 +- + sound/soc/codecs/cs43130.c | 2 +- + sound/soc/codecs/cs4341.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs53l30.c | 12 +- + sound/soc/codecs/cx2072x.c | 2 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da7218.c | 2 +- + sound/soc/codecs/da7219-aad.c | 42 +- + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/da732x.c | 2 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/es8316.c | 25 +- + sound/soc/codecs/es8326.c | 2 +- + sound/soc/codecs/es8328-i2c.c | 2 +- + sound/soc/codecs/isabelle.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/max9768.c | 2 +- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/max98090.c | 3 +- + sound/soc/codecs/max98095.c | 2 +- + sound/soc/codecs/max98371.c | 2 +- + sound/soc/codecs/max98373-i2c.c | 4 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max98396.c | 2 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/max98504.c | 2 +- + sound/soc/codecs/max98520.c | 2 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/max9877.c | 2 +- + sound/soc/codecs/max98925.c | 2 +- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/max98927.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/mt6359.c | 152 +- + sound/soc/codecs/mt6660.c | 2 +- + sound/soc/codecs/nau8540.c | 2 +- + sound/soc/codecs/nau8810.c | 2 +- + sound/soc/codecs/nau8821.c | 2 +- + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 150 +- + sound/soc/codecs/nau8825.h | 11 + + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm1789-i2c.c | 2 +- + sound/soc/codecs/pcm179x-i2c.c | 2 +- + sound/soc/codecs/pcm186x-i2c.c | 2 +- + sound/soc/codecs/pcm186x.c | 1 - + sound/soc/codecs/pcm3060-i2c.c | 2 +- + sound/soc/codecs/pcm3168a-i2c.c | 2 +- + sound/soc/codecs/pcm512x-i2c.c | 2 +- + sound/soc/codecs/rk3328_codec.c | 1 - + sound/soc/codecs/rt1011.c | 2 +- + sound/soc/codecs/rt1015.c | 2 +- + sound/soc/codecs/rt1016.c | 2 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1305.c | 2 +- + sound/soc/codecs/rt1308-sdw.c | 5 +- + sound/soc/codecs/rt1308-sdw.h | 1 - + sound/soc/codecs/rt1308.c | 2 +- + sound/soc/codecs/rt1316-sdw.c | 5 +- + sound/soc/codecs/rt1316-sdw.h | 1 - + sound/soc/codecs/rt1318-sdw.c | 5 +- + sound/soc/codecs/rt1318-sdw.h | 1 - + sound/soc/codecs/rt274.c | 2 +- + sound/soc/codecs/rt286.c | 2 +- + sound/soc/codecs/rt298.c | 2 +- + sound/soc/codecs/rt5514.c | 2 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5631.c | 2 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5645.c | 2 +- + sound/soc/codecs/rt5651.c | 2 +- + sound/soc/codecs/rt5659.c | 12 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 2 +- + sound/soc/codecs/rt5665.c | 2 +- + sound/soc/codecs/rt5668.c | 2 +- + sound/soc/codecs/rt5670.c | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 3 +- + sound/soc/codecs/rt5682-sdw.c | 7 +- + sound/soc/codecs/rt5682.h | 1 - + sound/soc/codecs/rt5682s.c | 16 +- + sound/soc/codecs/rt700-sdw.c | 5 +- + sound/soc/codecs/rt700.h | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 5 +- + sound/soc/codecs/rt711-sdca.h | 1 - + sound/soc/codecs/rt711-sdw.c | 5 +- + sound/soc/codecs/rt711.h | 1 - + sound/soc/codecs/rt712-sdca-dmic.c | 5 +- + sound/soc/codecs/rt712-sdca-dmic.h | 1 - + sound/soc/codecs/rt712-sdca-sdw.c | 5 +- + sound/soc/codecs/rt712-sdca.h | 1 - + sound/soc/codecs/rt715-sdca-sdw.c | 5 +- + sound/soc/codecs/rt715-sdca.h | 1 - + sound/soc/codecs/rt715-sdw.c | 6 +- + sound/soc/codecs/rt715.h | 1 - + sound/soc/codecs/rt722-sdca-sdw.c | 507 +++++++ + sound/soc/codecs/rt722-sdca-sdw.h | 124 ++ + sound/soc/codecs/rt722-sdca.c | 1555 ++++++++++++++++++++ + sound/soc/codecs/rt722-sdca.h | 237 +++ + sound/soc/codecs/rt9120.c | 2 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/ssm2518.c | 2 +- + sound/soc/codecs/ssm2602-i2c.c | 2 +- + sound/soc/codecs/ssm3515.c | 448 ++++++ + sound/soc/codecs/ssm4567.c | 2 +- + sound/soc/codecs/sta32x.c | 2 +- + sound/soc/codecs/sta350.c | 2 +- + sound/soc/codecs/sta529.c | 2 +- + sound/soc/codecs/tas2552.c | 2 +- + sound/soc/codecs/tas2562.c | 3 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tas2780.c | 2 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas571x.c | 2 +- + sound/soc/codecs/tas5720.c | 3 +- + sound/soc/codecs/tas5805m.c | 2 +- + sound/soc/codecs/tas6424.c | 3 +- + sound/soc/codecs/tda7419.c | 2 +- + sound/soc/codecs/tfa9879.c | 2 +- + sound/soc/codecs/tfa989x.c | 2 +- + sound/soc/codecs/tlv320adc3xxx.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 2 +- + sound/soc/codecs/tlv320aic23-i2c.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 2 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tpa6130a2.c | 2 +- + sound/soc/codecs/ts3a227e.c | 2 +- + sound/soc/codecs/tscs42xx.c | 2 +- + sound/soc/codecs/tscs454.c | 2 +- + sound/soc/codecs/uda1380.c | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 2 +- + sound/soc/codecs/wm1250-ev1.c | 2 +- + sound/soc/codecs/wm2000.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-i2c.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/wm8776.c | 2 +- + sound/soc/codecs/wm8804-i2c.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 | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8974.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/wm8990.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/wm_adsp.c | 21 +- + sound/soc/dwc/dwc-i2s.c | 33 +- + sound/soc/dwc/local.h | 1 + + sound/soc/fsl/fsl_sai.c | 24 +- + sound/soc/fsl/fsl_sai.h | 2 + + sound/soc/fsl/imx-audmix.c | 15 +- + sound/soc/fsl/imx-card.c | 11 +- + sound/soc/fsl/imx-rpmsg.c | 3 +- + sound/soc/fsl/imx-spdif.c | 8 +- + sound/soc/generic/simple-card-utils.c | 9 +- + sound/soc/google/Kconfig | 6 + + sound/soc/google/Makefile | 2 + + sound/soc/google/chv3-i2s.c | 338 +++++ + sound/soc/intel/atom/sst/sst_acpi.c | 1 - + sound/soc/intel/atom/sst/sst_ipc.c | 1 - + sound/soc/intel/atom/sst/sst_loader.c | 1 - + sound/soc/intel/atom/sst/sst_pci.c | 1 - + sound/soc/intel/atom/sst/sst_stream.c | 1 - + sound/soc/intel/avs/boards/i2s_test.c | 6 +- + sound/soc/intel/boards/Kconfig | 4 + + sound/soc/intel/boards/Makefile | 10 +- + sound/soc/intel/boards/ehl_rt5660.c | 8 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 +- + sound/soc/intel/boards/sof_cs42l42.c | 11 +- + sound/soc/intel/boards/sof_es8336.c | 11 +- + sound/soc/intel/boards/sof_nau8825.c | 21 +- + sound/soc/intel/boards/sof_pcm512x.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 25 +- + sound/soc/intel/boards/sof_sdw.c | 600 ++++++-- + sound/soc/intel/boards/sof_sdw_common.h | 86 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 131 ++ + .../boards/{sof_sdw_max98373.c => sof_sdw_maxim.c} | 58 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 4 +- + sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 102 ++ + ..._rt711_sdca.c => sof_sdw_rt_sdca_jack_common.c} | 73 +- + sound/soc/intel/boards/sof_ssp_amp.c | 29 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 46 +- + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 72 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 155 ++ + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 54 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 53 + + sound/soc/jz4740/jz4740-i2s.c | 9 + + sound/soc/mediatek/Kconfig | 4 + + sound/soc/mediatek/common/mtk-soundcard-driver.c | 53 +- + sound/soc/mediatek/mt8186/mt8186-afe-control.c | 1 - + .../mt8186/mt8186-mt6366-da7219-max98357.c | 1 - + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 1 - + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 150 +- + sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 15 + + sound/soc/mediatek/mt8188/mt8188-afe-common.h | 3 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 113 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 110 +- + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 922 +++++++----- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 386 ++++- + sound/soc/mediatek/mt8188/mt8188-reg.h | 2 + + sound/soc/mediatek/mt8192/mt8192-afe-control.c | 2 - + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 2 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 99 +- + sound/soc/meson/axg-card.c | 8 +- + sound/soc/meson/meson-card-utils.c | 10 +- + sound/soc/qcom/common.c | 11 +- + sound/soc/qcom/lpass-sc7180.c | 2 +- + sound/soc/qcom/lpass-sc7280.c | 2 +- + sound/soc/qcom/qdsp6/audioreach.c | 75 + + sound/soc/qcom/qdsp6/audioreach.h | 12 + + sound/soc/qcom/qdsp6/q6afe-dai.c | 34 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 39 + + sound/soc/qcom/qdsp6/q6dsp-common.c | 35 + + sound/soc/qcom/qdsp6/q6dsp-common.h | 1 + + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 43 +- + sound/soc/soc-component.c | 22 + + sound/soc/soc-compress.c | 1 - + sound/soc/soc-dapm.c | 16 + + sound/soc/soc-pcm.c | 59 +- + sound/soc/soc-topology.c | 93 +- + sound/soc/soc-utils.c | 7 + + sound/soc/sof/amd/acp.h | 3 + + sound/soc/sof/amd/pci-rmb.c | 3 + + sound/soc/sof/amd/pci-rn.c | 3 + + sound/soc/sof/intel/Kconfig | 3 +- + sound/soc/sof/intel/hda-bus.c | 11 +- + sound/soc/sof/intel/hda-dai-ops.c | 137 +- + sound/soc/sof/intel/hda-dai.c | 168 +-- + sound/soc/sof/intel/hda-loader-skl.c | 1 - + sound/soc/sof/intel/hda-stream.c | 1 - + sound/soc/sof/intel/hda.c | 31 +- + sound/soc/sof/intel/hda.h | 25 +- + sound/soc/sof/intel/mtl.c | 45 +- + sound/soc/sof/intel/mtl.h | 7 + + sound/soc/sof/intel/skl.c | 1 - + sound/soc/sof/intel/tgl.c | 10 +- + sound/soc/sof/ipc3-control.c | 54 +- + sound/soc/sof/ipc4-control.c | 39 +- + sound/soc/sof/ipc4-loader.c | 72 +- + sound/soc/sof/ipc4-pcm.c | 4 +- + sound/soc/sof/ipc4-priv.h | 10 +- + sound/soc/sof/ipc4-topology.c | 461 ++++-- + sound/soc/sof/ipc4-topology.h | 74 +- + sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 1 - + sound/soc/sof/mediatek/mt8186/mt8186.c | 119 +- + sound/soc/sof/mediatek/mt8186/mt8186.h | 5 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 1 - + sound/soc/sof/mediatek/mt8195/mt8195.c | 36 +- + sound/soc/sof/nocodec.c | 8 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/sof-audio.h | 1 + + sound/soc/sof/topology.c | 2 +- + sound/soc/starfive/Kconfig | 15 + + sound/soc/starfive/Makefile | 2 + + sound/soc/starfive/jh7110_tdm.c | 679 +++++++++ + sound/soc/stm/stm32_sai_sub.c | 9 +- + sound/soc/tegra/tegra20_ac97.c | 1 - + sound/soc/tegra/tegra210_adx.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 27 +- + sound/soc/ti/omap-hdmi.c | 8 +- + sound/soc/ti/omap-mcbsp-st.c | 1 - + 404 files changed, 9768 insertions(+), 2523 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2518.yaml + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm3515.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/da7219.txt + create mode 100644 Documentation/devicetree/bindings/sound/dialog,da7219.yaml + create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-codec.yaml + create mode 100644 Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nau8315.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8540.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8824.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8315.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8810.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8824.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8825.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt1016.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rt1016.txt + delete mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt + create mode 100644 Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml + create mode 100644 sound/soc/codecs/chv3-codec.c + create mode 100644 sound/soc/codecs/rt722-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt722-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt722-sdca.c + create mode 100644 sound/soc/codecs/rt722-sdca.h + create mode 100644 sound/soc/codecs/ssm3515.c + create mode 100644 sound/soc/google/Kconfig + create mode 100644 sound/soc/google/Makefile + create mode 100644 sound/soc/google/chv3-i2s.c + create mode 100644 sound/soc/intel/boards/sof_sdw_cs42l42.c + rename sound/soc/intel/boards/{sof_sdw_max98373.c => sof_sdw_maxim.c} (66%) + create mode 100644 sound/soc/intel/boards/sof_sdw_rt712_sdca.c + rename sound/soc/intel/boards/{sof_sdw_rt711_sdca.c => sof_sdw_rt_sdca_jack_common.c} (61%) + create mode 100644 sound/soc/intel/common/soc-acpi-intel-lnl-match.c + create mode 100644 sound/soc/starfive/Kconfig + create mode 100644 sound/soc/starfive/Makefile + create mode 100644 sound/soc/starfive/jh7110_tdm.c +Merging modules/modules-next (4f521bab5bfc kallsyms: remove unsed API lookup_symbol_attrs) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging kernel/module/main.c +Merge made by the 'ort' strategy. + include/linux/kallsyms.h | 6 --- + include/linux/module.h | 9 ---- + kernel/kallsyms.c | 56 +---------------------- + kernel/module/kallsyms.c | 28 ------------ + kernel/module/main.c | 7 --- + tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 4 +- + 6 files changed, 2 insertions(+), 108 deletions(-) +Merging input/next (8c9cce9cb81b Input: pm8941-powerkey - fix debounce on gen2+ PMICs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/input.c +Auto-merging drivers/input/joystick/xpad.c +Auto-merging drivers/input/touchscreen/cyttsp5.c +Auto-merging drivers/input/touchscreen/goodix.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/atmel,maxtouch.yaml | 7 + + .../devicetree/bindings/input/cypress,cyapa.txt | 42 --- + .../devicetree/bindings/input/cypress,cyapa.yaml | 49 ++++ + .../devicetree/bindings/input/pwm-vibrator.yaml | 2 + + .../input/touchscreen/cypress,tt21000.yaml | 2 + + Documentation/input/devices/xpad.rst | 10 +- + Documentation/input/gamepad.rst | 2 +- + MAINTAINERS | 2 +- + drivers/input/Kconfig | 2 +- + drivers/input/gameport/gameport.c | 18 +- + drivers/input/input.c | 6 +- + drivers/input/joystick/Kconfig | 14 +- + drivers/input/joystick/as5011.c | 2 +- + drivers/input/joystick/qwiic-joystick.c | 2 +- + drivers/input/joystick/xpad.c | 64 ++--- + drivers/input/keyboard/adp5588-keys.c | 2 +- + drivers/input/keyboard/adp5589-keys.c | 2 +- + drivers/input/keyboard/atkbd.c | 114 ++++---- + drivers/input/keyboard/cap11xx.c | 2 +- + drivers/input/keyboard/cypress-sf.c | 2 +- + drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 6 +- + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/keyboard/lm8333.c | 2 +- + drivers/input/keyboard/max7359_keypad.c | 2 +- + drivers/input/keyboard/mcs_touchkey.c | 2 +- + drivers/input/keyboard/mpr121_touchkey.c | 2 +- + drivers/input/keyboard/pinephone-keyboard.c | 2 +- + drivers/input/keyboard/qt1050.c | 2 +- + drivers/input/keyboard/qt1070.c | 2 +- + drivers/input/keyboard/qt2160.c | 2 +- + drivers/input/keyboard/tca6416-keypad.c | 2 +- + drivers/input/keyboard/tca8418_keypad.c | 2 +- + drivers/input/keyboard/tm2-touchkey.c | 2 +- + drivers/input/misc/ad714x-i2c.c | 2 +- + drivers/input/misc/adxl34x-i2c.c | 2 +- + drivers/input/misc/adxl34x.c | 3 +- + drivers/input/misc/apanel.c | 2 +- + drivers/input/misc/atmel_captouch.c | 2 +- + drivers/input/misc/bma150.c | 2 +- + drivers/input/misc/cma3000_d0x_i2c.c | 2 +- + drivers/input/misc/da7280.c | 2 +- + drivers/input/misc/drv260x.c | 58 +--- + drivers/input/misc/drv2665.c | 2 +- + drivers/input/misc/drv2667.c | 2 +- + drivers/input/misc/ibm-panel.c | 2 +- + drivers/input/misc/iqs269a.c | 2 +- + drivers/input/misc/iqs626a.c | 2 +- + drivers/input/misc/iqs7222.c | 2 +- + drivers/input/misc/kxtj9.c | 2 +- + drivers/input/misc/mma8450.c | 2 +- + drivers/input/misc/pcf8574_keypad.c | 2 +- + drivers/input/misc/pm8941-pwrkey.c | 19 +- + drivers/input/misc/pwm-vibra.c | 36 ++- + drivers/input/misc/tps65219-pwrbutton.c | 12 +- + drivers/input/misc/uinput.c | 34 +++ + drivers/input/mouse/cyapa.c | 2 +- + drivers/input/mouse/elan_i2c_core.c | 2 +- + drivers/input/mouse/psmouse-base.c | 86 +++--- + drivers/input/mouse/psmouse.h | 2 + + drivers/input/mouse/synaptics.c | 10 +- + drivers/input/mouse/synaptics_i2c.c | 2 +- + drivers/input/mouse/trackpoint.c | 2 +- + drivers/input/rmi4/rmi_i2c.c | 2 +- + drivers/input/rmi4/rmi_smbus.c | 2 +- + drivers/input/serio/Kconfig | 1 + + drivers/input/serio/libps2.c | 297 +++++++++++++++------ + drivers/input/tests/input_test.c | 38 ++- + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/ad7879-i2c.c | 2 +- + drivers/input/touchscreen/ar1021_i2c.c | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 87 +++++- + drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- + drivers/input/touchscreen/bu21013_ts.c | 2 +- + drivers/input/touchscreen/bu21029_ts.c | 2 +- + drivers/input/touchscreen/chipone_icn8318.c | 2 +- + drivers/input/touchscreen/chipone_icn8505.c | 2 +- + drivers/input/touchscreen/cy8ctma140.c | 2 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +- + drivers/input/touchscreen/cyttsp4_core.c | 3 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 84 +++++- + drivers/input/touchscreen/cyttsp_i2c.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/eeti_ts.c | 2 +- + drivers/input/touchscreen/egalax_ts.c | 2 +- + drivers/input/touchscreen/ektf2127.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/exc3000.c | 2 +- + drivers/input/touchscreen/goodix.c | 2 +- + drivers/input/touchscreen/hideep.c | 2 +- + drivers/input/touchscreen/himax_hx83112b.c | 2 +- + drivers/input/touchscreen/hycon-hy46xx.c | 2 +- + drivers/input/touchscreen/hynitron_cstxxx.c | 2 +- + drivers/input/touchscreen/ili210x.c | 38 ++- + drivers/input/touchscreen/ilitek_ts_i2c.c | 2 +- + drivers/input/touchscreen/imagis.c | 2 +- + drivers/input/touchscreen/iqs5xx.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 2 +- + drivers/input/touchscreen/mcs5000_ts.c | 2 +- + drivers/input/touchscreen/melfas_mip4.c | 2 +- + drivers/input/touchscreen/migor_ts.c | 2 +- + drivers/input/touchscreen/mms114.c | 2 +- + drivers/input/touchscreen/msg2638.c | 2 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 2 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/rohm_bu21023.c | 2 +- + drivers/input/touchscreen/s6sy761.c | 2 +- + drivers/input/touchscreen/silead.c | 2 +- + drivers/input/touchscreen/sis_i2c.c | 2 +- + drivers/input/touchscreen/st1232.c | 2 +- + drivers/input/touchscreen/stmfts.c | 2 +- + drivers/input/touchscreen/sx8654.c | 2 +- + drivers/input/touchscreen/tsc2004.c | 2 +- + drivers/input/touchscreen/tsc2007_core.c | 2 +- + drivers/input/touchscreen/wacom_i2c.c | 2 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- + drivers/input/touchscreen/zet6223.c | 2 +- + drivers/input/touchscreen/zforce_ts.c | 2 +- + drivers/input/touchscreen/zinitix.c | 2 +- + include/linux/gameport.h | 11 +- + include/linux/i8042.h | 1 + + include/linux/libps2.h | 62 +++-- + 124 files changed, 909 insertions(+), 493 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.txt + create mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.yaml +Merging block/for-next (35bbd38f8a13 Merge branch 'for-6.5/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging block/blk-core.c +Auto-merging block/blk-map.c +Auto-merging block/blk-wbt.c +Auto-merging block/fops.c +Auto-merging drivers/nvme/host/ioctl.c +Auto-merging fs/Makefile +Auto-merging fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/buffer.c +Auto-merging fs/ceph/file.c +Auto-merging fs/direct-io.c +Auto-merging fs/erofs/super.c +Auto-merging fs/ext2/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/nfs/file.c +Auto-merging fs/ntfs/file.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/ocfs2_trace.h +Auto-merging fs/overlayfs/file.c +Auto-merging fs/smb/client/file.c +Auto-merging fs/super.c +Auto-merging fs/udf/file.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_mount.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/zonefs/file.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mount.h +Auto-merging init/do_mounts.c +Auto-merging io_uring/net.c +Auto-merging kernel/power/power.h +Auto-merging kernel/trace/trace.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/core-api/pin_user_pages.rst | 6 + + arch/alpha/kernel/setup.c | 2 +- + arch/ia64/kernel/setup.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 3 +- + block/Makefile | 2 +- + block/bdev.c | 157 ++++---- + block/bfq-iosched.c | 9 + + block/bio.c | 37 +- + block/blk-cgroup-fc-appid.c | 2 +- + block/blk-cgroup.c | 9 + + block/blk-core.c | 1 + + block/blk-flush.c | 110 +++--- + block/blk-ioc.c | 30 +- + block/blk-iocost.c | 7 +- + block/blk-map.c | 22 +- + block/blk-mq-debugfs.c | 8 +- + block/blk-mq-sched.h | 8 +- + block/blk-mq.c | 121 +++--- + block/blk-mq.h | 11 +- + block/blk-rq-qos.c | 20 +- + block/blk-wbt.c | 2 + + block/blk-zoned.c | 8 +- + block/blk.h | 16 +- + block/early-lookup.c | 315 ++++++++++++++++ + block/elevator.c | 2 +- + block/fops.c | 12 +- + block/genhd.c | 172 +++------ + block/ioctl.c | 3 +- + block/mq-deadline.c | 125 +++++-- + block/partitions/core.c | 41 +- + drivers/base/dd.c | 6 +- + drivers/block/brd.c | 93 ++--- + drivers/block/drbd/drbd_bitmap.c | 4 +- + drivers/block/drbd/drbd_main.c | 1 - + drivers/block/drbd/drbd_nl.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 1 - + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/pktcdvd.c | 5 +- + drivers/block/rnbd/rnbd-srv.c | 2 +- + drivers/block/ublk_drv.c | 477 ++++++++++++++++++------ + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/zram/zram_drv.c | 4 +- + drivers/char/random.c | 4 +- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-init.c | 4 +- + drivers/md/dm-snap.c | 14 +- + drivers/md/dm-table.c | 28 +- + drivers/md/dm-zoned-metadata.c | 6 +- + drivers/md/dm.c | 2 +- + drivers/md/md-autodetect.c | 3 +- + drivers/md/md.c | 6 +- + drivers/md/raid1-10.c | 11 +- + drivers/md/raid1.c | 7 +- + drivers/md/raid10.c | 20 +- + drivers/md/raid5-cache.c | 2 +- + drivers/md/raid5-ppl.c | 4 +- + drivers/mtd/devices/block2mtd.c | 74 ++-- + drivers/nvme/host/ioctl.c | 4 +- + drivers/nvme/target/io-cmd-bdev.c | 2 +- + drivers/s390/block/dasd_genhd.c | 2 +- + drivers/target/target_core_iblock.c | 2 +- + drivers/target/target_core_pscsi.c | 3 +- + drivers/tty/tty_io.c | 4 +- + fs/9p/vfs_file.c | 26 +- + fs/Makefile | 10 +- + fs/adfs/file.c | 2 +- + fs/affs/file.c | 2 +- + fs/afs/file.c | 20 +- + fs/bfs/file.c | 2 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/volumes.c | 6 +- + fs/buffer.c | 3 +- + fs/ceph/file.c | 65 +++- + fs/coda/file.c | 29 +- + fs/cramfs/inode.c | 2 +- + fs/direct-io.c | 70 ++-- + fs/ecryptfs/file.c | 27 +- + fs/erofs/data.c | 2 +- + fs/erofs/super.c | 2 +- + fs/exfat/file.c | 2 +- + fs/ext2/file.c | 2 +- + fs/ext4/ext4.h | 1 + + fs/ext4/file.c | 13 +- + fs/ext4/ioctl.c | 24 +- + fs/ext4/super.c | 18 +- + fs/f2fs/file.c | 43 ++- + fs/f2fs/super.c | 4 +- + fs/fat/file.c | 2 +- + fs/fuse/file.c | 2 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/inode.c | 3 +- + fs/iomap/buffered-io.c | 6 +- + fs/iomap/direct-io.c | 1 - + fs/jffs2/file.c | 2 +- + fs/jfs/file.c | 2 +- + fs/jfs/jfs_logmgr.c | 6 +- + fs/kernfs/file.c | 2 +- + fs/minix/file.c | 2 +- + fs/nfs/blocklayout/dev.c | 5 +- + fs/nfs/file.c | 23 +- + fs/nfs/internal.h | 2 + + fs/nfs/nfs4file.c | 2 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/super.c | 2 +- + fs/no-block.c | 19 - + fs/ntfs/file.c | 2 +- + fs/ntfs3/file.c | 31 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/file.c | 43 ++- + fs/ocfs2/ocfs2_trace.h | 3 + + fs/omfs/file.c | 2 +- + fs/orangefs/file.c | 22 +- + fs/overlayfs/file.c | 23 +- + fs/proc/inode.c | 4 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/pstore/blk.c | 4 +- + fs/ramfs/file-mmu.c | 2 +- + fs/ramfs/file-nommu.c | 2 +- + fs/read_write.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/journal.c | 5 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/smb/client/cifsfs.c | 12 +- + fs/smb/client/cifsfs.h | 3 - + fs/smb/client/file.c | 16 - + fs/splice.c | 127 +++---- + fs/super.c | 21 +- + fs/sysv/file.c | 2 +- + fs/ubifs/file.c | 2 +- + fs/udf/file.c | 2 +- + fs/ufs/file.c | 2 +- + fs/vboxsf/file.c | 2 +- + fs/xfs/xfs_file.c | 30 +- + fs/xfs/xfs_fsops.c | 3 + + fs/xfs/xfs_mount.h | 4 +- + fs/xfs/xfs_super.c | 21 +- + fs/xfs/xfs_trace.h | 2 +- + fs/zonefs/file.c | 40 +- + fs/zonefs/super.c | 2 +- + include/linux/bio.h | 13 +- + include/linux/blk-mq.h | 62 +-- + include/linux/blk_types.h | 5 +- + include/linux/blkdev.h | 35 +- + include/linux/device-mapper.h | 2 - + include/linux/device/driver.h | 2 +- + include/linux/fs.h | 9 +- + include/linux/io_uring.h | 18 +- + include/linux/io_uring_types.h | 10 + + include/linux/mm.h | 27 +- + include/linux/mount.h | 1 - + include/linux/root_dev.h | 9 +- + include/linux/splice.h | 3 + + include/linux/uio.h | 14 - + include/trace/events/block.h | 26 ++ + include/uapi/linux/io_uring.h | 16 +- + include/uapi/linux/ublk_cmd.h | 33 +- + init/do_mounts.c | 420 ++++++--------------- + init/do_mounts.h | 14 +- + init/do_mounts_initrd.c | 11 +- + io_uring/io_uring.c | 195 +++++++--- + io_uring/io_uring.h | 3 + + io_uring/net.c | 49 +-- + io_uring/tctx.c | 41 +- + io_uring/timeout.c | 2 +- + io_uring/uring_cmd.c | 16 +- + kernel/power/hibernate.c | 167 +++++---- + kernel/power/power.h | 3 +- + kernel/power/swap.c | 6 +- + kernel/trace/trace.c | 2 +- + lib/iov_iter.c | 431 +-------------------- + mm/filemap.c | 31 +- + mm/gup.c | 58 ++- + mm/page_io.c | 8 +- + mm/shmem.c | 134 ++++++- + mm/swapfile.c | 3 +- + net/socket.c | 3 +- + 186 files changed, 2857 insertions(+), 2030 deletions(-) + create mode 100644 block/early-lookup.c + delete mode 100644 fs/no-block.c +Merging device-mapper/for-next (38d11da522aa dm: don't lock fs when the map is NULL in process of resume) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (371b74c8ba8f ata: libata-sata: Simplify ata_change_queue_depth()) +$ 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_brcm.c | 6 +- + drivers/ata/ahci_ceva.c | 2 +- + drivers/ata/ahci_da850.c | 2 +- + drivers/ata/ahci_dm816.c | 2 +- + drivers/ata/ahci_dwc.c | 2 +- + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/ahci_mtk.c | 2 +- + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_platform.c | 2 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_seattle.c | 2 +- + drivers/ata/ahci_st.c | 2 +- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/libata-core.c | 10 +- + drivers/ata/libata-eh.c | 17 +- + drivers/ata/libata-sata.c | 19 +- + drivers/ata/pata_ixp4xx_cf.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/pata_parport/aten.c | 103 ++++---- + drivers/ata/pata_parport/bpck.c | 466 ++++++++++++++++++++---------------- + drivers/ata/pata_parport/bpck6.c | 67 +++--- + drivers/ata/pata_parport/comm.c | 234 +++++++++--------- + drivers/ata/pata_parport/dstr.c | 301 ++++++++++++----------- + drivers/ata/pata_parport/epat.c | 336 ++++++++++++++------------ + drivers/ata/pata_parport/epia.c | 442 ++++++++++++++++++---------------- + drivers/ata/pata_parport/fit2.c | 131 +++++----- + drivers/ata/pata_parport/fit3.c | 206 ++++++++-------- + drivers/ata/pata_parport/friq.c | 312 ++++++++++++------------ + drivers/ata/pata_parport/frpw.c | 382 +++++++++++++++-------------- + drivers/ata/pata_parport/kbic.c | 314 ++++++++++++------------ + drivers/ata/pata_parport/ktti.c | 85 ++++--- + drivers/ata/pata_parport/on20.c | 141 ++++++----- + drivers/ata/pata_parport/on26.c | 412 ++++++++++++++++--------------- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/sata_highbank.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 3 +- + include/linux/libata.h | 6 +- + 39 files changed, 2126 insertions(+), 1903 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 (aee09fd99934 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/brcm,kona-sdhci.txt | 21 ---------- + .../devicetree/bindings/mmc/brcm,kona-sdhci.yaml | 48 ++++++++++++++++++++++ + .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 + + drivers/memstick/host/r592.c | 4 +- + drivers/mmc/core/block.c | 29 ++++--------- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc-pltfm.c | 5 +-- + drivers/mmc/host/dw_mmc-pltfm.h | 2 +- + drivers/mmc/host/dw_mmc-starfive.c | 2 +- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 8 +++- + drivers/mmc/host/mtk-sd.c | 2 +- + 12 files changed, 73 insertions(+), 54 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml +Merging mfd/for-mfd-next (84009765adb3 dt-bindings: mfd: Add bindings for AXP192 MFD device) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging .mailmap +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/mfd/tps65010.c +Auto-merging sound/soc/codecs/Kconfig +Merge made by the 'ort' strategy. + .mailmap | 4 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 4 + + .../devicetree/bindings/mfd/rockchip,rk806.yaml | 406 ++++++++ + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 1 + + drivers/clk/Kconfig | 2 +- + drivers/clk/clk-rk808.c | 34 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 47 +- + drivers/hwmon/intel-m10-bmc-hwmon.c | 1 + + drivers/input/misc/Kconfig | 2 +- + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm805.c | 2 +- + drivers/mfd/88pm80x.c | 1 - + drivers/mfd/88pm860x-core.c | 3 +- + drivers/mfd/Kconfig | 53 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/aat2870-core.c | 4 +- + drivers/mfd/acer-ec-a500.c | 2 +- + drivers/mfd/act8945a.c | 2 +- + drivers/mfd/adp5520.c | 2 +- + drivers/mfd/arizona-i2c.c | 2 +- + drivers/mfd/as3711.c | 2 +- + drivers/mfd/as3722.c | 2 +- + drivers/mfd/atc260x-i2c.c | 2 +- + drivers/mfd/axp20x-i2c.c | 6 +- + drivers/mfd/axp20x.c | 219 ++++- + drivers/mfd/bcm590xx.c | 2 +- + drivers/mfd/bd9571mwv.c | 2 +- + drivers/mfd/da903x.c | 2 +- + drivers/mfd/da9052-i2c.c | 2 +- + drivers/mfd/da9055-i2c.c | 2 +- + drivers/mfd/da9062-core.c | 2 +- + drivers/mfd/da9063-i2c.c | 2 +- + drivers/mfd/da9150-core.c | 2 +- + drivers/mfd/dln2.c | 1 - + drivers/mfd/ene-kb3930.c | 2 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/intel-m10-bmc-core.c | 90 +- + drivers/mfd/intel-m10-bmc-pmci.c | 1 + + drivers/mfd/intel-m10-bmc-spi.c | 15 + + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 2 +- + drivers/mfd/intel_soc_pmic_crc.c | 2 +- + drivers/mfd/iqs62x.c | 2 +- + drivers/mfd/khadas-mcu.c | 2 +- + drivers/mfd/lm3533-core.c | 4 +- + drivers/mfd/lochnagar-i2c.c | 2 +- + drivers/mfd/lp3943.c | 2 +- + drivers/mfd/lp873x.c | 2 +- + drivers/mfd/lp87565.c | 2 +- + drivers/mfd/lp8788.c | 2 +- + drivers/mfd/madera-i2c.c | 2 +- + drivers/mfd/max14577.c | 2 +- + drivers/mfd/max77620.c | 2 +- + drivers/mfd/max77650.c | 2 +- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max77693.c | 2 +- + drivers/mfd/max77714.c | 2 +- + drivers/mfd/max77843.c | 2 +- + drivers/mfd/max8907.c | 4 +- + drivers/mfd/max8925-i2c.c | 3 +- + drivers/mfd/max8997.c | 2 +- + drivers/mfd/max8998.c | 2 +- + drivers/mfd/mc13xxx-i2c.c | 2 +- + drivers/mfd/menelaus.c | 2 +- + drivers/mfd/menf21bmc.c | 2 +- + drivers/mfd/mp2629.c | 2 +- + drivers/mfd/mt6360-core.c | 2 +- + drivers/mfd/mt6370.c | 2 +- + drivers/mfd/ntxec.c | 2 +- + drivers/mfd/palmas.c | 2 +- + drivers/mfd/pcf50633-core.c | 2 +- + drivers/mfd/qcom-pm8008.c | 2 +- + drivers/mfd/rc5t583-irq.c | 2 +- + drivers/mfd/rc5t583.c | 2 +- + drivers/mfd/retu-mfd.c | 2 +- + drivers/mfd/{rk808.c => rk8xx-core.c} | 352 +++---- + drivers/mfd/rk8xx-i2c.c | 185 ++++ + drivers/mfd/rk8xx-spi.c | 124 +++ + drivers/mfd/rn5t618.c | 2 +- + drivers/mfd/rohm-bd71828.c | 2 +- + drivers/mfd/rohm-bd718x7.c | 2 +- + drivers/mfd/rohm-bd9576.c | 2 +- + drivers/mfd/rsmu_i2c.c | 2 +- + drivers/mfd/rt4831.c | 2 +- + drivers/mfd/rt5033.c | 2 +- + drivers/mfd/rt5120.c | 2 +- + drivers/mfd/sec-core.c | 2 +- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/simple-mfd-i2c.c | 2 +- + drivers/mfd/sky81452.c | 2 +- + drivers/mfd/smpro-core.c | 2 +- + drivers/mfd/stmfx.c | 2 +- + drivers/mfd/stmpe-i2c.c | 2 +- + drivers/mfd/stpmic1.c | 2 +- + drivers/mfd/stw481x.c | 2 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/ti-lmu.c | 2 +- + drivers/mfd/tps6105x.c | 2 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6507x.c | 2 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65217.c | 2 +- + drivers/mfd/tps65218.c | 2 +- + drivers/mfd/tps65219.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65910.c | 2 +- + drivers/mfd/tps65912-i2c.c | 2 +- + drivers/mfd/tps6594-core.c | 462 +++++++++ + drivers/mfd/tps6594-i2c.c | 244 +++++ + drivers/mfd/tps6594-spi.c | 129 +++ + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wl1273-core.c | 2 +- + drivers/mfd/wm831x-core.c | 2 +- + drivers/mfd/wm831x-i2c.c | 2 +- + drivers/mfd/wm8350-i2c.c | 2 +- + drivers/mfd/wm8400-core.c | 4 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/pinctrl-rk805.c | 189 +++- + drivers/power/supply/Kconfig | 2 +- + drivers/regulator/Kconfig | 2 +- + drivers/rtc/Kconfig | 2 +- + include/linux/mfd/axp20x.h | 116 +++ + include/linux/mfd/intel-m10-bmc.h | 45 +- + include/linux/mfd/rk808.h | 417 +++++++- + include/linux/mfd/tps6594.h | 1020 ++++++++++++++++++++ + sound/soc/codecs/Kconfig | 2 +- + 129 files changed, 3961 insertions(+), 428 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml + rename drivers/mfd/{rk808.c => rk8xx-core.c} (71%) + create mode 100644 drivers/mfd/rk8xx-i2c.c + create mode 100644 drivers/mfd/rk8xx-spi.c + create mode 100644 drivers/mfd/tps6594-core.c + create mode 100644 drivers/mfd/tps6594-i2c.c + create mode 100644 drivers/mfd/tps6594-spi.c + create mode 100644 include/linux/mfd/tps6594.h +Merging backlight/for-backlight-next (29554f2e9138 backlight: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/kinetic,ktz8866.yaml | 27 ++++++++++++++-------- + drivers/video/backlight/adp8860_bl.c | 4 ++-- + drivers/video/backlight/adp8870_bl.c | 4 ++-- + drivers/video/backlight/arcxcnn_bl.c | 2 +- + drivers/video/backlight/bd6107.c | 2 +- + drivers/video/backlight/ktz8866.c | 2 +- + drivers/video/backlight/lm3630a_bl.c | 10 +++++--- + drivers/video/backlight/lm3639_bl.c | 2 +- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/backlight/lv5207lp.c | 2 +- + 10 files changed, 35 insertions(+), 22 deletions(-) +Merging battery/for-next (fe20b1dcd2de power: supply: Switch i2c drivers back to use .probe()) +$ 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 +Auto-merging drivers/power/supply/bq24190_charger.c +Auto-merging drivers/power/supply/bq25890_charger.c +Auto-merging drivers/power/supply/bq27xxx_battery_i2c.c +Auto-merging drivers/power/supply/rt9467-charger.c +Auto-merging drivers/power/supply/sbs-charger.c +Merge made by the 'ort' strategy. + .../bindings/power/reset/nvmem-reboot-mode.txt | 26 -- + .../bindings/power/reset/nvmem-reboot-mode.yaml | 52 ++++ + .../devicetree/bindings/power/reset/qcom,pon.yaml | 4 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 18 ++ + .../supply/x-powers,axp20x-usb-power-supply.yaml | 1 + + drivers/power/reset/Kconfig | 1 + + drivers/power/reset/gpio-restart.c | 7 +- + drivers/power/supply/adp5061.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 307 ++++++++++----------- + drivers/power/supply/bd99954-charger.c | 2 +- + drivers/power/supply/bq2415x_charger.c | 2 +- + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq24735-charger.c | 2 +- + drivers/power/supply/bq2515x_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 30 +- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/bq25980_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 25 +- + drivers/power/supply/cw2015_battery.c | 2 +- + drivers/power/supply/ds2782_battery.c | 2 +- + drivers/power/supply/ip5xxx_power.c | 2 +- + drivers/power/supply/lp8727_charger.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/max17042_battery.c | 9 +- + drivers/power/supply/max77976_charger.c | 2 +- + drivers/power/supply/power_supply_hwmon.c | 2 +- + drivers/power/supply/rk817_charger.c | 2 +- + drivers/power/supply/rt5033_battery.c | 2 +- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/rt9467-charger.c | 2 +- + drivers/power/supply/rt9471.c | 2 +- + drivers/power/supply/sbs-battery.c | 2 +- + drivers/power/supply/sbs-charger.c | 2 +- + drivers/power/supply/sbs-manager.c | 2 +- + drivers/power/supply/smb347-charger.c | 2 +- + drivers/power/supply/twl4030_madc_battery.c | 8 +- + drivers/power/supply/ucs1002_power.c | 2 +- + drivers/power/supply/ug3105_battery.c | 2 +- + 43 files changed, 314 insertions(+), 236 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml +Merging regulator/for-next (416cc57da240 Merge remote-tracking branch 'regulator/for-6.5' into regulator-next) + 75c8cb2f4cb2 ("mfd: axp20x: Add support for AXP313a PMIC") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/mfd/axp20x-i2c.c +Auto-merging drivers/mfd/axp20x.c +Auto-merging include/linux/mfd/axp20x.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/pfuze100.yaml | 3 + + .../devicetree/bindings/regulator/ti,tps62870.yaml | 52 +++ + drivers/regulator/88pg86x.c | 2 +- + drivers/regulator/Kconfig | 11 + + drivers/regulator/Makefile | 1 + + drivers/regulator/act8865-regulator.c | 2 +- + drivers/regulator/ad5398.c | 2 +- + drivers/regulator/axp20x-regulator.c | 290 ++++++++++++++- + drivers/regulator/core.c | 30 +- + drivers/regulator/da9121-regulator.c | 2 +- + drivers/regulator/da9210-regulator.c | 2 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fan53880.c | 2 +- + drivers/regulator/helpers.c | 22 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/isl9305.c | 2 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp872x.c | 2 +- + drivers/regulator/lp8755.c | 2 +- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max20086-regulator.c | 2 +- + drivers/regulator/max20411-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8660.c | 2 +- + drivers/regulator/max8893.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mp5416.c | 2 +- + drivers/regulator/mp8859.c | 2 +- + drivers/regulator/mp886x.c | 2 +- + drivers/regulator/mpq7920.c | 2 +- + drivers/regulator/mt6311-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 2 +- + drivers/regulator/pf8x00-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/pv88060-regulator.c | 2 +- + drivers/regulator/pv88080-regulator.c | 2 +- + drivers/regulator/pv88090-regulator.c | 2 +- + drivers/regulator/rk808-regulator.c | 399 ++++++++++++++++++++- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/regulator/rt4801-regulator.c | 2 +- + drivers/regulator/rt5190a-regulator.c | 2 +- + drivers/regulator/rt5759-regulator.c | 2 +- + drivers/regulator/rt6160-regulator.c | 2 +- + drivers/regulator/rt6190-regulator.c | 2 +- + drivers/regulator/rt6245-regulator.c | 2 +- + drivers/regulator/rtmv20-regulator.c | 2 +- + drivers/regulator/rtq2134-regulator.c | 2 +- + drivers/regulator/rtq6752-regulator.c | 2 +- + drivers/regulator/slg51000-regulator.c | 2 +- + drivers/regulator/stm32-pwr.c | 2 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8824x.c | 2 +- + drivers/regulator/sy8827n.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/regulator/tps6286x-regulator.c | 2 +- + drivers/regulator/tps6287x-regulator.c | 189 ++++++++++ + drivers/regulator/tps65023-regulator.c | 2 +- + drivers/regulator/tps65132-regulator.c | 2 +- + drivers/regulator/tps65219-regulator.c | 6 +- + include/linux/regulator/driver.h | 2 + + 68 files changed, 1023 insertions(+), 96 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps62870.yaml + create mode 100644 drivers/regulator/tps6287x-regulator.c +Merging security/next (55382134366e capability: erase checker warnings about struct __user_cap_data_struct) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + fs/reiserfs/xattr_security.c | 1 + + include/uapi/linux/capability.h | 5 +++-- + kernel/capability.c | 2 ++ + security/commoncap.c | 20 ++++++++++---------- + security/device_cgroup.c | 2 +- + security/lsm_audit.c | 2 +- + security/security.c | 4 ++-- + 7 files changed, 20 insertions(+), 16 deletions(-) +Merging apparmor/apparmor-next (c96a8a8c021b apparmor: aa_buffer: Convert 1-element array to flexible array) +$ 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/domain.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/policy_compat.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/crypto.c | 10 +++++----- + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/lsm.c | 8 ++++---- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_compat.c | 2 ++ + security/apparmor/policy_unpack.c | 11 ++++++++--- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 11 files changed, 32 insertions(+), 33 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 +Merge made by the 'ort' strategy. + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/evm/evm_main.c | 4 +++- + security/integrity/iint.c | 15 +++++++++------ + security/integrity/ima/ima_api.c | 9 ++++++--- + security/integrity/ima/ima_main.c | 12 ++++++++---- + security/integrity/ima/ima_modsig.c | 3 +++ + security/integrity/ima/ima_policy.c | 3 ++- + 7 files changed, 32 insertions(+), 16 deletions(-) +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (447a5688005e selinux: avoid bool as identifier name) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging net/mptcp/subflow.c +Auto-merging security/security.c +Auto-merging security/selinux/Makefile +CONFLICT (content): Merge conflict in security/selinux/Makefile +Resolved 'security/selinux/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2db7536b284a] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/lsm_hook_defs.h | 1 + + include/linux/security.h | 6 ++ + net/mptcp/subflow.c | 6 ++ + security/security.c | 17 ++++++ + security/selinux/Makefile | 30 +++++---- + security/selinux/avc.c | 20 ------ + security/selinux/hooks.c | 78 ++++++++++++++++++------ + security/selinux/ima.c | 2 +- + security/selinux/include/audit.h | 2 +- + security/selinux/include/avc.h | 3 - + security/selinux/include/ibpkey.h | 1 + + security/selinux/include/ima.h | 2 +- + security/selinux/include/initial_sid_to_string.h | 3 + + security/selinux/include/security.h | 2 +- + security/selinux/netlabel.c | 8 ++- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/avtab.c | 2 +- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/conditional.c | 8 +-- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/context.h | 2 + + security/selinux/ss/policydb.c | 6 +- + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 40 ++++++------ + 24 files changed, 157 insertions(+), 92 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 +Merge made by the 'ort' strategy. + security/smack/smack.h | 1 + + security/smack/smack_lsm.c | 63 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 48 insertions(+), 16 deletions(-) +Merging tomoyo/master (933fd4391e3d workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (224541f80952 integrity: Enforce digitalSignature usage in the ima and evm keyrings) +$ 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. + certs/system_keyring.c | 50 +++++++++++++++++++++++++++++++++++++ + crypto/asymmetric_keys/restrict.c | 44 ++++++++++++++++++++++++++++++++ + drivers/char/tpm/tpm_tis.c | 1 + + drivers/char/tpm/tpm_tis_spi_main.c | 8 ++++++ + drivers/char/tpm/tpm_vtpm_proxy.c | 30 ++++++---------------- + include/crypto/public_key.h | 11 ++++++++ + include/keys/system_keyring.h | 11 ++++++++ + security/integrity/digsig.c | 4 +-- + security/integrity/evm/Kconfig | 3 ++- + security/integrity/ima/Kconfig | 3 ++- + security/keys/keyctl.c | 11 +++++--- + security/keys/request_key_auth.c | 2 +- + 12 files changed, 147 insertions(+), 31 deletions(-) +Merging watchdog/master (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (d11370bf64c5 Merge branches 'iommu/fixes', 'ppc/pamu', 'virtio', '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 +Merge made by the 'ort' strategy. + .clang-format | 1 + + arch/powerpc/sysdev/fsl_pci.c | 1 + + drivers/iommu/amd/io_pgtable.c | 4 +- + drivers/iommu/amd/io_pgtable_v2.c | 2 +- + drivers/iommu/amd/iommu.c | 2 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 4 +- + drivers/iommu/dma-iommu.c | 3 +- + drivers/iommu/fsl_pamu_domain.c | 123 ++--- + drivers/iommu/intel/iommu.c | 2 +- + drivers/iommu/iommu.c | 702 ++++++++++++++-------------- + drivers/iommu/iova.c | 8 +- + drivers/iommu/virtio-iommu.c | 57 ++- + include/linux/iommu.h | 6 + + 14 files changed, 456 insertions(+), 461 deletions(-) +Merging audit/next (e455ca40dbcf audit: avoid missing-prototype warnings) +$ 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. + include/linux/audit.h | 2 -- + include/linux/audit_arch.h | 2 ++ + kernel/audit.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging devicetree/for-next (c50eb01940c7 Merge branch 'dt/address-cleanups' into dt/next) +$ 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. +Merging dt-krzk/for-next (0ff3c07556e6 Merge branch 'next/dt64' 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. + .../devicetree/bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sm7150-tlmm.yaml | 11 +---------- + 4 files changed, 4 insertions(+), 41 deletions(-) +Merging mailbox/mailbox-for-next (8fe72b76db79 mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()) +$ 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 (70cba8b3666d Merge remote-tracking branch 'spi/for-6.5' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml +Merge made by the 'ort' strategy. + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 8 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 18 +- + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 18 +- + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 + + .../devicetree/bindings/spi/samsung,spi.yaml | 2 - + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 + + .../bindings/spi/socionext,uniphier-spi.yaml | 3 - + .../devicetree/bindings/spi/spi-controller.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 6 + + drivers/spi/spi-cadence-quadspi.c | 19 ++ + drivers/spi/spi-cadence.c | 1 + + drivers/spi/spi-dw-core.c | 14 +- + drivers/spi/spi-dw-dma.c | 76 +++++-- + drivers/spi/spi-dw-mmio.c | 29 +++ + drivers/spi/spi-dw.h | 1 + + drivers/spi/spi-fsl-lpspi.c | 8 +- + drivers/spi/spi-geni-qcom.c | 2 +- + drivers/spi/spi-hisi-kunpeng.c | 2 +- + drivers/spi/spi-imx.c | 65 +++--- + drivers/spi/spi-mt65xx.c | 33 ++-- + drivers/spi/spi-pl022.c | 4 +- + drivers/spi/spi-qcom-qspi.c | 218 ++++++++++++++++++++- + drivers/spi/spi-s3c64xx.c | 120 +++++++----- + drivers/spi/spi-sc18is602.c | 2 +- + drivers/spi/spi-sn-f-ospi.c | 17 +- + drivers/spi/spi-sun6i.c | 131 +++++++++---- + drivers/spi/spi-xcomm.c | 2 +- + drivers/spi/spidev.c | 3 +- + include/linux/platform_data/spi-s3c64xx.h | 1 + + include/uapi/linux/spi/spi.h | 3 +- + tools/spi/spidev_test.c | 107 ++++++---- + 31 files changed, 678 insertions(+), 242 deletions(-) +Merging tip/master (409bf2895d71 Merge x86/cc into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/parisc/kernel/smp.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/include/asm/tsc.h +Auto-merging arch/x86/video/fbdev.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/suspend.h +Auto-merging include/linux/types.h +Auto-merging init/main.c +Auto-merging kernel/cpu.c +Auto-merging kernel/power/power.h +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/internal.h +Auto-merging mm/mm_init.c +Auto-merging mm/page_alloc.c +Auto-merging tools/perf/arch/x86/include/arch-tests.h +CONFLICT (content): Merge conflict in tools/perf/arch/x86/include/arch-tests.h +Auto-merging tools/perf/arch/x86/tests/Build +Auto-merging tools/perf/arch/x86/tests/arch-tests.c +CONFLICT (content): Merge conflict in tools/perf/arch/x86/tests/arch-tests.c +Resolved 'tools/perf/arch/x86/include/arch-tests.h' using previous resolution. +Resolved 'tools/perf/arch/x86/tests/arch-tests.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5ed417974187] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 6 + + Documentation/admin-guide/kernel-parameters.txt | 30 +- + Documentation/core-api/cpu_hotplug.rst | 13 +- + Documentation/core-api/this_cpu_ops.rst | 2 - + Documentation/driver-api/edac.rst | 120 ++++ + Documentation/process/maintainer-tip.rst | 3 + + MAINTAINERS | 6 +- + arch/Kconfig | 23 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/smp.h | 2 +- + arch/arm/kernel/smp.c | 18 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/arch_timer.h | 8 +- + arch/arm64/include/asm/atomic_ll_sc.h | 56 +- + arch/arm64/include/asm/atomic_lse.h | 39 +- + arch/arm64/include/asm/cmpxchg.h | 48 +- + arch/arm64/include/asm/io.h | 12 +- + arch/arm64/include/asm/percpu.h | 30 +- + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/kernel/smp.c | 14 +- + arch/csky/Kconfig | 1 + + arch/csky/include/asm/smp.h | 2 +- + arch/csky/kernel/smp.c | 8 +- + arch/loongarch/include/asm/loongarch.h | 2 +- + arch/loongarch/kernel/time.c | 6 +- + arch/mips/Kconfig | 1 + + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/smp-ops.h | 1 + + arch/mips/kernel/smp-bmips.c | 1 + + arch/mips/kernel/smp-cps.c | 14 +- + arch/mips/kernel/smp.c | 8 + + arch/mips/loongson64/smp.c | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/process.c | 4 +- + arch/parisc/kernel/smp.c | 7 +- + arch/powerpc/kernel/smp.c | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/smp.h | 2 +- + arch/riscv/kernel/cpu-hotplug.c | 14 +- + arch/s390/include/asm/cmpxchg.h | 32 +- + arch/s390/include/asm/cpu_mf.h | 2 +- + arch/s390/include/asm/percpu.h | 34 +- + arch/s390/include/asm/timex.h | 13 +- + arch/s390/kernel/perf_cpum_sf.c | 16 +- + arch/s390/kernel/time.c | 5 + + arch/x86/Kconfig | 61 +- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/boot/Makefile | 2 - + arch/x86/boot/compressed/Makefile | 3 +- + arch/x86/boot/compressed/efi.h | 10 + + arch/x86/boot/compressed/error.c | 19 + + arch/x86/boot/compressed/error.h | 1 + + arch/x86/boot/compressed/kaslr.c | 40 +- + arch/x86/boot/compressed/mem.c | 86 +++ + arch/x86/boot/compressed/misc.c | 6 + + arch/x86/boot/compressed/misc.h | 10 + + arch/x86/boot/compressed/sev.c | 54 +- + arch/x86/boot/compressed/sev.h | 23 + + arch/x86/boot/compressed/tdx-shared.c | 2 + + arch/x86/boot/compressed/tdx.c | 4 +- + arch/x86/boot/cpu.c | 13 - + arch/x86/coco/core.c | 10 +- + arch/x86/coco/tdx/Makefile | 2 +- + arch/x86/coco/tdx/tdx-shared.c | 71 +++ + arch/x86/coco/tdx/tdx.c | 126 +---- + arch/x86/entry/vdso/vgetcpu.c | 1 + + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/amd/ibs.c | 53 +- + arch/x86/events/intel/core.c | 18 +- + arch/x86/hyperv/ivm.c | 6 +- + arch/x86/include/asm/apic.h | 5 +- + arch/x86/include/asm/apicdef.h | 11 +- + arch/x86/include/asm/cmpxchg.h | 25 - + arch/x86/include/asm/cmpxchg_32.h | 2 +- + arch/x86/include/asm/cmpxchg_64.h | 63 ++- + arch/x86/include/asm/coco.h | 19 +- + arch/x86/include/asm/cpu.h | 5 +- + arch/x86/include/asm/cpufeature.h | 5 - + arch/x86/include/asm/cpumask.h | 5 - + arch/x86/include/asm/doublefault.h | 4 + + arch/x86/include/asm/efi.h | 2 + + arch/x86/include/asm/ftrace.h | 3 + + arch/x86/include/asm/mce.h | 3 + + arch/x86/include/asm/mshyperv.h | 5 + + arch/x86/include/asm/mtrr.h | 51 +- + arch/x86/include/asm/nops.h | 16 +- + arch/x86/include/asm/nospec-branch.h | 6 +- + arch/x86/include/asm/percpu.h | 102 ++-- + arch/x86/include/asm/perf_event.h | 12 + + arch/x86/include/asm/pgtable_64.h | 4 +- + arch/x86/include/asm/processor.h | 1 - + arch/x86/include/asm/realmode.h | 3 + + arch/x86/include/asm/sev-common.h | 9 +- + arch/x86/include/asm/sev.h | 34 +- + arch/x86/include/asm/shared/tdx.h | 64 +++ + arch/x86/include/asm/smp.h | 24 +- + arch/x86/include/asm/syscall.h | 6 +- + arch/x86/include/asm/tdx.h | 21 +- + arch/x86/include/asm/topology.h | 22 +- + arch/x86/include/asm/tsc.h | 2 - + arch/x86/include/asm/unaccepted_memory.h | 27 + + arch/x86/include/asm/uv/uv_hub.h | 32 +- + arch/x86/include/asm/uv/uv_mmrs.h | 18 +- + arch/x86/include/asm/vdso/gettimeofday.h | 41 +- + arch/x86/include/asm/x86_init.h | 3 + + arch/x86/include/uapi/asm/mtrr.h | 14 +- + arch/x86/kernel/acpi/sleep.c | 9 +- + arch/x86/kernel/alternative.c | 465 ++++++++++----- + arch/x86/kernel/amd_nb.c | 50 +- + arch/x86/kernel/apic/apic.c | 42 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 316 +++++++---- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/cacheinfo.c | 21 +- + arch/x86/kernel/cpu/common.c | 54 +- + arch/x86/kernel/cpu/mce/amd.c | 6 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 11 +- + arch/x86/kernel/cpu/mtrr/Makefile | 2 +- + arch/x86/kernel/cpu/mtrr/amd.c | 2 +- + arch/x86/kernel/cpu/mtrr/centaur.c | 11 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 87 ++- + arch/x86/kernel/cpu/mtrr/cyrix.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 693 +++++++++++++++-------- + arch/x86/kernel/cpu/mtrr/legacy.c | 90 +++ + arch/x86/kernel/cpu/mtrr/mtrr.c | 204 ++----- + arch/x86/kernel/cpu/mtrr/mtrr.h | 31 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 +- + arch/x86/kernel/doublefault_32.c | 1 + + arch/x86/kernel/ftrace.c | 3 - + arch/x86/kernel/head32.c | 1 + + arch/x86/kernel/head_32.S | 14 - + arch/x86/kernel/head_64.S | 103 +++- + arch/x86/kernel/itmt.c | 23 +- + arch/x86/kernel/kvmclock.c | 4 +- + arch/x86/kernel/platform-quirks.c | 1 + + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/sev-shared.c | 103 ++++ + arch/x86/kernel/sev.c | 263 ++++----- + arch/x86/kernel/smp.c | 3 +- + arch/x86/kernel/smpboot.c | 631 ++++++++------------- + arch/x86/kernel/topology.c | 98 +--- + arch/x86/kernel/tsc.c | 58 +- + arch/x86/kernel/tsc_sync.c | 36 +- + arch/x86/kernel/unwind_orc.c | 54 +- + arch/x86/kernel/vmlinux.lds.S | 4 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/kvm/x86.c | 7 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/cmpxchg16b_emu.S | 43 +- + arch/x86/lib/cmpxchg8b_emu.S | 67 ++- + arch/x86/lib/csum-partial_64.c | 101 ++-- + arch/x86/lib/getuser.S | 32 +- + arch/x86/lib/memmove_64.S | 13 +- + arch/x86/lib/msr.c | 32 +- + arch/x86/lib/putuser.S | 24 +- + arch/x86/lib/retpoline.S | 2 +- + arch/x86/lib/usercopy_64.c | 1 + + arch/x86/math-emu/fpu_entry.c | 1 + + arch/x86/mm/highmem_32.c | 1 + + arch/x86/mm/mem_encrypt_amd.c | 15 + + arch/x86/mm/mem_encrypt_identity.c | 2 +- + arch/x86/mm/pgtable.c | 24 +- + arch/x86/pci/ce4100.c | 4 +- + arch/x86/platform/efi/efi.c | 3 + + arch/x86/platform/olpc/olpc_dt.c | 2 +- + arch/x86/power/cpu.c | 37 -- + arch/x86/realmode/init.c | 3 + + arch/x86/realmode/rm/trampoline_64.S | 27 +- + arch/x86/video/fbdev.c | 1 + + arch/x86/xen/enlighten_hvm.c | 11 +- + arch/x86/xen/enlighten_pv.c | 52 ++ + arch/x86/xen/smp_hvm.c | 16 +- + arch/x86/xen/smp_pv.c | 56 +- + arch/x86/xen/time.c | 3 +- + drivers/acpi/processor_idle.c | 4 - + drivers/base/node.c | 7 + + drivers/clocksource/arm_arch_timer.c | 54 +- + drivers/clocksource/hyperv_timer.c | 44 +- + drivers/cpuidle/cpuidle.c | 8 +- + drivers/cpuidle/poll_state.c | 4 +- + drivers/edac/amd64_edac.c | 386 ++++++++++++- + drivers/edac/amd64_edac.h | 1 + + drivers/edac/mce_amd.c | 3 +- + drivers/firmware/efi/Kconfig | 14 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 26 + + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/firmware/efi/libstub/bitmap.c | 41 ++ + drivers/firmware/efi/libstub/efistub.h | 6 + + drivers/firmware/efi/libstub/find.c | 43 ++ + drivers/firmware/efi/libstub/unaccepted_memory.c | 222 ++++++++ + drivers/firmware/efi/libstub/x86-stub.c | 75 ++- + drivers/firmware/efi/unaccepted_memory.c | 147 +++++ + drivers/iommu/amd/amd_iommu_types.h | 9 +- + drivers/iommu/amd/iommu.c | 10 +- + drivers/iommu/intel/irq_remapping.c | 8 +- + drivers/md/bcache/btree.c | 23 +- + drivers/md/bcache/btree.h | 4 +- + drivers/ras/debugfs.c | 2 +- + fs/proc/meminfo.c | 5 + + include/asm-generic/percpu.h | 209 +++++-- + include/clocksource/hyperv_timer.h | 24 +- + include/crypto/b128ops.h | 14 +- + include/linux/atomic/atomic-arch-fallback.h | 95 +++- + include/linux/atomic/atomic-instrumented.h | 93 ++- + include/linux/compiler_attributes.h | 12 + + include/linux/cpu.h | 4 - + include/linux/cpuhotplug.h | 17 + + include/linux/dmar.h | 117 ++-- + include/linux/efi.h | 16 +- + include/linux/io.h | 5 + + include/linux/irqdesc.h | 3 + + include/linux/lockdep.h | 8 + + include/linux/lockdep_types.h | 8 + + include/linux/math64.h | 2 +- + include/linux/mm.h | 19 + + include/linux/mmzone.h | 8 + + include/linux/olpc-ec.h | 2 + + include/linux/pci_ids.h | 1 + + include/linux/percpu-defs.h | 45 +- + include/linux/perf_event.h | 10 + + include/linux/rbtree_latch.h | 2 +- + include/linux/sched.h | 7 +- + include/linux/sched/clock.h | 17 +- + include/linux/sched/sd_flags.h | 5 +- + include/linux/sched/signal.h | 2 +- + include/linux/seqlock.h | 15 +- + include/linux/slub_def.h | 12 +- + include/linux/suspend.h | 4 + + include/linux/types.h | 5 + + include/uapi/linux/types.h | 4 + + init/main.c | 9 +- + kernel/cgroup/cgroup.c | 12 + + kernel/cpu.c | 416 +++++++++++++- + kernel/events/core.c | 114 ++-- + kernel/irq/chip.c | 1 + + kernel/irq/internals.h | 6 +- + kernel/irq/irqdesc.c | 77 ++- + kernel/irq/resend.c | 45 +- + kernel/locking/lockdep.c | 118 +++- + kernel/power/power.h | 5 - + kernel/printk/printk.c | 2 +- + kernel/sched/clock.c | 19 +- + kernel/sched/core.c | 269 +++++---- + kernel/sched/deadline.c | 7 - + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 220 +++---- + kernel/sched/psi.c | 19 +- + kernel/sched/sched.h | 29 +- + kernel/sched/topology.c | 7 +- + kernel/smp.c | 2 +- + kernel/smpboot.c | 163 ------ + kernel/softirq.c | 22 +- + kernel/time/posix-timers.c | 527 ++++++++++------- + kernel/time/sched_clock.c | 24 +- + kernel/time/timekeeping.c | 4 +- + lib/Kconfig.debug | 17 + + lib/Makefile | 1 + + lib/checksum_kunit.c | 334 +++++++++++ + lib/crypto/curve25519-hacl64.c | 2 - + lib/crypto/poly1305-donna64.c | 2 - + mm/internal.h | 6 - + mm/memblock.c | 9 + + mm/mm_init.c | 7 + + mm/page_alloc.c | 173 ++++++ + mm/slab.h | 53 +- + mm/slub.c | 139 +++-- + mm/vmstat.c | 3 + + scripts/atomic/gen-atomic-fallback.sh | 4 +- + scripts/atomic/gen-atomic-instrumented.sh | 19 +- + scripts/min-tool-version.sh | 6 +- + tools/arch/x86/include/asm/nops.h | 16 +- + tools/arch/x86/kcpuid/.gitignore | 1 + + tools/arch/x86/kcpuid/kcpuid.c | 7 +- + tools/lib/subcmd/parse-options.h | 8 +- + tools/lib/subcmd/subcmd-util.h | 5 +- + tools/objtool/Documentation/objtool.txt | 10 + + tools/objtool/arch/x86/special.c | 8 +- + tools/objtool/builtin-check.c | 5 + + tools/objtool/check.c | 195 +++++-- + tools/objtool/include/objtool/builtin.h | 1 + + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/warn.h | 21 +- + tools/objtool/noreturns.h | 46 ++ + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 1 + + tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c | 71 +++ + tools/perf/arch/x86/tests/arch-tests.c | 2 + + 289 files changed, 7393 insertions(+), 3840 deletions(-) + create mode 100644 arch/x86/boot/compressed/mem.c + create mode 100644 arch/x86/boot/compressed/sev.h + create mode 100644 arch/x86/boot/compressed/tdx-shared.c + create mode 100644 arch/x86/coco/tdx/tdx-shared.c + create mode 100644 arch/x86/include/asm/unaccepted_memory.h + create mode 100644 arch/x86/kernel/cpu/mtrr/legacy.c + create mode 100644 drivers/firmware/efi/libstub/bitmap.c + create mode 100644 drivers/firmware/efi/libstub/find.c + create mode 100644 drivers/firmware/efi/libstub/unaccepted_memory.c + create mode 100644 drivers/firmware/efi/unaccepted_memory.c + create mode 100644 lib/checksum_kunit.c + create mode 100644 tools/arch/x86/kcpuid/.gitignore + create mode 100644 tools/objtool/noreturns.h + create mode 100644 tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c +$ git am -3 ../patches/perf_test_amd_Fix_build_failure_with_amd-ibs-via-core-pmu_c.patch +Applying: perf test amd: Fix build failure with amd-ibs-via-core-pmu.c +$ git reset HEAD^ +Unstaged changes after reset: +M tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c +$ git add -A . +$ git commit -v -a --amend +[master 8021a207b4dd] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Wed Jun 7 10:44:24 2023 +1000 +Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns()) +$ 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 (6c79e42169fe EDAC/amd64: Add support for ECC on family 19h model 60h-7Fh) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/amd64_edac.c +Auto-merging drivers/edac/amd64_edac.h +Merge made by the 'ort' strategy. + drivers/edac/amd64_edac.c | 12 +++++++++--- + drivers/edac/amd64_edac.h | 1 - + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging irqchip/irq/irqchip-next (2b384e01fd12 Merge branch irq/gic-v3-asr8601 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 +Merge made by the 'ort' strategy. + Documentation/arm64/silicon-errata.rst | 4 +++ + drivers/irqchip/irq-gic-v3.c | 45 ++++++++++++++++++++++++++-------- + 2 files changed, 39 insertions(+), 10 deletions(-) +Merging ftrace/for-next (3862f86c1529 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 +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (83545df658f6 rcuscale: Add kfree_by_call_rcu and kfree_mult to documentation) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/core-api/kernel-api.rst +Auto-merging MAINTAINERS +Auto-merging kernel/smp.c +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 36 +- + Documentation/RCU/whatisRCU.rst | 1 - + Documentation/admin-guide/kernel-parameters.txt | 185 ++++++---- + Documentation/core-api/kernel-api.rst | 12 + + MAINTAINERS | 2 +- + include/linux/notifier.h | 10 + + include/linux/rcupdate.h | 54 +-- + include/linux/rcupdate_trace.h | 1 + + include/linux/rcupdate_wait.h | 5 + + include/linux/srcu.h | 8 +- + kernel/locking/locktorture.c | 51 ++- + kernel/rcu/Kconfig | 18 + + kernel/rcu/rcu.h | 6 + + kernel/rcu/rcuscale.c | 239 +++++++------ + kernel/rcu/rcutorture.c | 1 + + kernel/rcu/tasks.h | 116 ++++++- + kernel/rcu/tree.c | 139 +++++--- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 56 ++- + kernel/rcu/tree_plugin.h | 4 +- + kernel/scftorture.c | 12 +- + kernel/smp.c | 13 +- + tools/include/nolibc/arch-aarch64.h | 32 +- + tools/include/nolibc/arch-arm.h | 44 +-- + tools/include/nolibc/arch-i386.h | 40 +-- + tools/include/nolibc/arch-loongarch.h | 38 +-- + tools/include/nolibc/arch-mips.h | 54 +-- + tools/include/nolibc/arch-riscv.h | 36 +- + tools/include/nolibc/arch-s390.h | 11 +- + tools/include/nolibc/arch-x86_64.h | 34 +- + tools/include/nolibc/nolibc.h | 2 +- + tools/include/nolibc/stackprotector.h | 4 +- + tools/include/nolibc/stdio.h | 95 ++++-- + tools/include/nolibc/stdlib.h | 18 +- + tools/include/nolibc/string.h | 4 +- + tools/include/nolibc/sys.h | 34 +- + tools/include/nolibc/types.h | 8 - + tools/testing/selftests/nolibc/.gitignore | 1 + + tools/testing/selftests/nolibc/Makefile | 8 +- + tools/testing/selftests/nolibc/nolibc-test.c | 131 ++++++- + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 4 +- + .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 2 +- + .../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 ------ + 84 files changed, 1011 insertions(+), 2164 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 +$ git am -3 ../patches/0001-fixup-for-RDMA-rxe-Add-error-messages.patch +Applying: fixup for "RDMA/rxe: Add error messages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/sw/rxe/rxe_verbs.c +$ git add -A . +$ git commit -v -a --amend +[master 08955682568f] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Wed Jun 7 10:44:31 2023 +1000 +Merging kvm/next (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 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 (532b2ecfa547 Merge branch kvm-arm64/misc into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/include/asm/kvm_arm.h +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_pgtable.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/cpufeature.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kvm/hyp/nvhe/mem_protect.c +Auto-merging arch/arm64/kvm/hyp/pgtable.c +Auto-merging arch/arm64/tools/cpucaps +Auto-merging virt/kvm/kvm_main.c +Recorded preimage for 'arch/arm64/kernel/cpufeature.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/kernel/cpufeature.c'. +[master 9139fffb3ae9] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 27 +++++ + arch/arm64/include/asm/kvm_arm.h | 3 +- + arch/arm64/include/asm/kvm_asm.h | 4 + + arch/arm64/include/asm/kvm_emulate.h | 6 + + arch/arm64/include/asm/kvm_host.h | 15 +++ + arch/arm64/include/asm/kvm_mmu.h | 1 + + arch/arm64/include/asm/kvm_pgtable.h | 79 ++++++++++++- + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/kernel/cpufeature.c | 11 ++ + arch/arm64/kvm/arm.c | 28 +++++ + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 12 ++ + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 10 ++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 52 +++++++++ + arch/arm64/kvm/hyp/pgtable.c | 208 ++++++++++++++++++++++++++++++--- + arch/arm64/kvm/hyp/vhe/tlb.c | 32 ++++++ + arch/arm64/kvm/mmu.c | 209 ++++++++++++++++++++++++++++------ + arch/arm64/tools/cpucaps | 1 + + include/linux/kvm_host.h | 2 + + include/uapi/linux/kvm.h | 2 + + virt/kvm/kvm_main.c | 3 +- + 21 files changed, 652 insertions(+), 60 deletions(-) +Merging kvms390/next (85ae3d09f862 KVM: s390: selftests: add selftest for CMMA migration) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'ort' strategy. + arch/s390/kvm/kvm-s390.c | 4 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/s390x/cmma_test.c | 680 ++++++++++++++++++++++++++ + 3 files changed, 685 insertions(+) + create mode 100644 tools/testing/selftests/kvm/s390x/cmma_test.c +Merging kvm-riscv/riscv_kvm_next (95c99104cb42 RISC-V: KVM: Probe for SBI extension status) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Merge made by the 'ort' strategy. + arch/riscv/include/asm/csr.h | 2 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 8 +++- + arch/riscv/kvm/tlb.c | 2 +- + arch/riscv/kvm/vcpu_exit.c | 2 + + arch/riscv/kvm/vcpu_sbi.c | 76 ++++++++++++++++++++++++----------- + 5 files changed, 65 insertions(+), 25 deletions(-) +Merging kvm-x86/next (31b4fc3bc64a Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/cpuid.c | 13 +- + arch/x86/kvm/i8259.c | 3 + + arch/x86/kvm/mmu/mmu.c | 8 + + arch/x86/kvm/mmu/tdp_mmu.c | 5 +- + arch/x86/kvm/mtrr.c | 64 +++-- + arch/x86/kvm/svm/svm.c | 35 +-- + arch/x86/kvm/svm/svm.h | 1 - + arch/x86/kvm/vmx/capabilities.h | 4 +- + arch/x86/kvm/vmx/nested.c | 3 +- + arch/x86/kvm/vmx/pmu_intel.c | 2 - + arch/x86/kvm/vmx/sgx.c | 15 +- + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 27 ++- + arch/x86/kvm/x86.c | 17 +- + arch/x86/kvm/x86.h | 1 - + include/linux/kvm_host.h | 4 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/demand_paging_test.c | 17 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 84 +------ + tools/testing/selftests/kvm/include/memstress.h | 8 + + tools/testing/selftests/kvm/lib/memstress.c | 75 ++++++ + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 4 +- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 21 ++ + .../kvm/x86_64/dirty_log_page_splitting_test.c | 259 +++++++++++++++++++++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 +- + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 22 +- + virt/kvm/eventfd.c | 2 +- + virt/kvm/kvm_main.c | 5 +- + 28 files changed, 494 insertions(+), 210 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c +Merging xen-tip/linux-next (335b4223466d x86/pci/xen: populate MSI sysfs entries) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (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 (ee360b1c5001 Merge branch 'for-6.5-cleanup-ordered' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +Auto-merging drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/media/platform/amphion/vpu_v4l2.c +Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +Auto-merging drivers/net/wireless/ath/ath12k/qmi.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging include/linux/workqueue.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/workqueue.c +Auto-merging lib/Kconfig.debug +Auto-merging net/rxrpc/af_rxrpc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/core-api/workqueue.rst | 32 ++ + arch/powerpc/kernel/tau_6xx.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 3 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 12 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 6 +- + drivers/greybus/connection.c | 4 +- + drivers/greybus/svc.c | 2 +- + drivers/md/dm-integrity.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/media/platform/amphion/vpu_core.c | 2 +- + drivers/media/platform/amphion/vpu_v4l2.c | 2 +- + drivers/media/platform/chips-media/coda-common.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 5 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 13 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 +- + drivers/net/wireless/ath/ath10k/qmi.c | 3 +- + drivers/net/wireless/ath/ath11k/qmi.c | 3 +- + drivers/net/wireless/ath/ath12k/qmi.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 4 +- + drivers/net/wireless/marvell/mwifiex/main.c | 8 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 13 +- + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c | 5 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/virt/acrn/ioreq.c | 4 +- + drivers/xen/pvcalls-back.c | 4 +- + include/linux/workqueue.h | 2 +- + kernel/sched/core.c | 3 + + kernel/workqueue.c | 408 +++++++++++++++------ + kernel/workqueue_internal.h | 24 +- + lib/Kconfig.debug | 13 + + net/qrtr/ns.c | 2 +- + net/rxrpc/af_rxrpc.c | 2 +- + tools/workqueue/wq_monitor.py | 168 +++++++++ + 36 files changed, 600 insertions(+), 184 deletions(-) + create mode 100644 tools/workqueue/wq_monitor.py +Merging drivers-x86/for-next (86f67fe2db43 platform/x86/amd: pmc: Update metrics table info for Pink Sardine) +$ 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 Documentation/subsystem-apis.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-platform-wmi-bmof | 7 + + Documentation/ABI/testing/debugfs-dell-wmi-ddv | 29 +- + .../ABI/testing/sysfs-platform-dell-wmi-ddv | 4 +- + .../ABI/testing/sysfs-platform-mellanox-bootctl | 9 + + .../pm/intel_uncore_frequency_scaling.rst | 57 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/wmi.rst | 21 + + Documentation/subsystem-apis.rst | 1 + + Documentation/wmi/acpi-interface.rst | 96 ++++ + Documentation/wmi/devices/dell-wmi-ddv.rst | 296 +++++++++++ + Documentation/wmi/devices/index.rst | 22 + + Documentation/wmi/devices/wmi-bmof.rst | 25 + + Documentation/wmi/index.rst | 19 + + MAINTAINERS | 10 + + drivers/platform/mellanox/mlxbf-bootctl.c | 144 +++++- + drivers/platform/x86/Kconfig | 11 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/amd/pmc.c | 123 ++++- + drivers/platform/x86/amd/pmf/Kconfig | 11 + + drivers/platform/x86/amd/pmf/auto-mode.c | 143 +++++ + drivers/platform/x86/amd/pmf/cnqf.c | 75 +++ + drivers/platform/x86/amd/pmf/sps.c | 55 ++ + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 13 +- + drivers/platform/x86/gigabyte-wmi.c | 46 +- + drivers/platform/x86/hp/hp-wmi.c | 60 ++- + .../platform/x86/intel/uncore-frequency/Kconfig | 4 + + .../platform/x86/intel/uncore-frequency/Makefile | 2 + + .../uncore-frequency/uncore-frequency-common.c | 51 +- + .../uncore-frequency/uncore-frequency-common.h | 16 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 413 +++++++++++++++ + .../x86/intel/uncore-frequency/uncore-frequency.c | 1 + + drivers/platform/x86/lenovo-yogabook-wmi.c | 408 --------------- + drivers/platform/x86/lenovo-yogabook.c | 573 +++++++++++++++++++++ + drivers/platform/x86/system76_acpi.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/platform/x86/wmi.c | 104 +++- + drivers/platform/x86/x86-android-tablets/asus.c | 6 +- + drivers/platform/x86/x86-android-tablets/core.c | 32 +- + drivers/platform/x86/x86-android-tablets/dmi.c | 22 +- + drivers/platform/x86/x86-android-tablets/lenovo.c | 41 +- + drivers/platform/x86/x86-android-tablets/other.c | 112 +++- + .../x86/x86-android-tablets/x86-android-tablets.h | 5 +- + include/linux/acpi.h | 2 + + include/linux/wmi.h | 43 +- + 44 files changed, 2570 insertions(+), 549 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-platform-wmi-bmof + create mode 100644 Documentation/driver-api/wmi.rst + create mode 100644 Documentation/wmi/acpi-interface.rst + create mode 100644 Documentation/wmi/devices/dell-wmi-ddv.rst + create mode 100644 Documentation/wmi/devices/index.rst + create mode 100644 Documentation/wmi/devices/wmi-bmof.rst + create mode 100644 Documentation/wmi/index.rst + create mode 100644 drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c + delete mode 100644 drivers/platform/x86/lenovo-yogabook-wmi.c + create mode 100644 drivers/platform/x86/lenovo-yogabook.c +Merging chrome-platform/for-next (f5bb4e381290 platform/chrome: Switch i2c drivers back to use .probe()) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_i2c.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 15 ++++++++++----- + drivers/platform/chrome/cros_hps_i2c.c | 2 +- + drivers/platform/chrome/cros_typec_switch.c | 11 ++++++++--- + 4 files changed, 20 insertions(+), 10 deletions(-) +Merging hsi/for-next (42877c38ac78 HSI: omap_ssi_port: Drop error checking for debugfs_create_dir) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 2 -- + drivers/hsi/controllers/omap_ssi_core.c | 1 + + drivers/hsi/controllers/omap_ssi_port.c | 14 ++------------ + include/linux/hsi/ssi_protocol.h | 1 + + 4 files changed, 4 insertions(+), 14 deletions(-) +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 (e338a05e76ca dt-bindings: leds: Add binding for AW200xx) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +Auto-merging drivers/leds/rgb/leds-qcom-lpg.c +Auto-merging drivers/leds/trigger/ledtrig-netdev.c +Auto-merging drivers/power/supply/power_supply_leds.c +Auto-merging include/linux/leds.h +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-led-driver-aw200xx | 5 + + .../devicetree/bindings/leds/awinic,aw200xx.yaml | 126 +++++ + Documentation/devicetree/bindings/leds/common.yaml | 2 - + .../devicetree/bindings/leds/leds-lp55xx.yaml | 10 + + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 30 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 2 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-cht-wcove.rst | 38 ++ + Documentation/leds/well-known-leds.txt | 3 +- + drivers/leds/Kconfig | 37 +- + drivers/leds/Makefile | 2 + + drivers/leds/flash/leds-aat1290.c | 2 +- + drivers/leds/flash/leds-as3645a.c | 6 +- + drivers/leds/flash/leds-lm3601x.c | 2 +- + drivers/leds/flash/leds-qcom-flash.c | 13 +- + drivers/leds/flash/leds-rt4505.c | 2 +- + drivers/leds/led-class.c | 2 +- + drivers/leds/led-core.c | 81 ++- + drivers/leds/led-triggers.c | 17 +- + drivers/leds/leds-an30259a.c | 2 +- + drivers/leds/leds-aw200xx.c | 594 +++++++++++++++++++++ + drivers/leds/leds-aw2013.c | 2 +- + drivers/leds/leds-bd2606mvv.c | 2 +- + drivers/leds/leds-bd2802.c | 2 +- + drivers/leds/leds-blinkm.c | 4 +- + drivers/leds/leds-cht-wcove.c | 477 +++++++++++++++++ + drivers/leds/leds-gpio.c | 18 + + drivers/leds/leds-is31fl319x.c | 2 +- + drivers/leds/leds-is31fl32xx.c | 2 +- + drivers/leds/leds-lm3530.c | 2 +- + drivers/leds/leds-lm3532.c | 2 +- + drivers/leds/leds-lm355x.c | 2 +- + drivers/leds/leds-lm3642.c | 2 +- + drivers/leds/leds-lm3692x.c | 2 +- + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-lp3944.c | 2 +- + drivers/leds/leds-lp3952.c | 2 +- + drivers/leds/leds-lp50xx.c | 2 +- + drivers/leds/leds-lp5521.c | 13 +- + drivers/leds/leds-lp5523.c | 16 +- + drivers/leds/leds-lp5562.c | 2 +- + drivers/leds/leds-lp55xx-common.c | 9 + + drivers/leds/leds-lp8501.c | 10 +- + drivers/leds/leds-lp8860.c | 2 +- + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-pca963x.c | 2 +- + drivers/leds/leds-spi-byte.c | 2 +- + drivers/leds/leds-tca6507.c | 2 +- + drivers/leds/leds-tlc591xx.c | 2 +- + drivers/leds/leds-turris-omnia.c | 2 +- + drivers/leds/rgb/leds-qcom-lpg.c | 23 +- + drivers/leds/trigger/ledtrig-disk.c | 9 +- + drivers/leds/trigger/ledtrig-mtd.c | 8 +- + drivers/leds/trigger/ledtrig-netdev.c | 6 +- + drivers/net/arcnet/arcnet.c | 8 +- + drivers/power/supply/power_supply_leds.c | 5 +- + drivers/usb/common/led.c | 4 +- + include/dt-bindings/leds/leds-lp55xx.h | 10 + + include/linux/leds.h | 43 +- + include/linux/platform_data/leds-lp55xx.h | 3 + + net/mac80211/led.c | 2 +- + net/mac80211/led.h | 8 +- + net/netfilter/xt_LED.c | 3 +- + 65 files changed, 1560 insertions(+), 143 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-aw200xx + create mode 100644 Documentation/devicetree/bindings/leds/awinic,aw200xx.yaml + create mode 100644 Documentation/leds/leds-cht-wcove.rst + create mode 100644 drivers/leds/leds-aw200xx.c + create mode 100644 drivers/leds/leds-cht-wcove.c + create mode 100644 include/dt-bindings/leds/leds-lp55xx.h +Merging ipmi/for-next (e64c82b80641 ipmi: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 2 +- + drivers/char/ipmi/ipmi_ipmb.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/char/ipmi/ssif_bmc.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (16b58423b4c3 Merge 6.4-rc5 into driver-core-next) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/node.c +Merge made by the 'ort' strategy. + Documentation/driver-api/driver-model/devres.rst | 1 + + MAINTAINERS | 10 ++ + drivers/base/isa.c | 7 +- + drivers/base/node.c | 8 +- + drivers/hwmon/pmbus/pmbus_core.c | 6 +- + drivers/iio/adc/xilinx-ams.c | 9 +- + drivers/iio/adc/xilinx-xadc-core.c | 17 ++-- + drivers/tty/serial/qcom_geni_serial.c | 5 + + fs/debugfs/file.c | 9 -- + fs/kernfs/dir.c | 2 + + include/linux/device.h | 122 ++++++++++++++++++++++- + 11 files changed, 158 insertions(+), 38 deletions(-) +Merging usb/usb-next (d37537a1f7cf Merge 6.4-rc5 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging MAINTAINERS +Auto-merging drivers/usb/gadget/udc/pxa27x_udc.c +Auto-merging drivers/usb/host/ohci-pxa27x.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-eud | 2 +- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 6 + + .../regulator/qcom,usb-vbus-regulator.yaml | 10 +- + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/fsl,imx8qm-cdns3.yaml | 103 ++++ + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/generic-ohci.yaml | 17 +- + .../devicetree/bindings/usb/microchip,usb5744.yaml | 107 ++++ + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 190 +++++++ + .../devicetree/bindings/usb/usb251xb.yaml | 2 +- + MAINTAINERS | 14 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 13 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 3 + + drivers/platform/chrome/cros_ec_typec.c | 2 +- + drivers/soc/qcom/pmic_glink_altmode.c | 5 +- + drivers/usb/c67x00/c67x00-drv.c | 6 +- + drivers/usb/cdns3/Kconfig | 11 + + drivers/usb/cdns3/Makefile | 1 + + drivers/usb/cdns3/cdns3-gadget.c | 15 +- + drivers/usb/cdns3/cdns3-imx.c | 30 +- + drivers/usb/cdns3/cdns3-plat.c | 5 +- + drivers/usb/cdns3/cdns3-starfive.c | 246 +++++++++ + drivers/usb/cdns3/cdns3-ti.c | 6 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- + drivers/usb/chipidea/ci_hdrc_msm.c | 6 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 6 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 6 +- + drivers/usb/chipidea/core.c | 6 +- + drivers/usb/chipidea/usbmisc_imx.c | 1 - + drivers/usb/common/usb-conn-gpio.c | 6 +- + drivers/usb/core/devio.c | 2 + + drivers/usb/core/hcd-pci.c | 24 +- + drivers/usb/dwc2/params.c | 21 + + drivers/usb/dwc2/platform.c | 22 +- + drivers/usb/dwc3/core.c | 17 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/dwc3-am62.c | 5 +- + drivers/usb/dwc3/dwc3-exynos.c | 6 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 6 +- + drivers/usb/dwc3/dwc3-keystone.c | 6 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 22 +- + drivers/usb/dwc3/dwc3-of-simple.c | 6 +- + drivers/usb/dwc3/dwc3-omap.c | 6 +- + drivers/usb/dwc3/dwc3-qcom.c | 12 +- + drivers/usb/dwc3/dwc3-st.c | 6 +- + drivers/usb/dwc3/dwc3-xilinx.c | 6 +- + drivers/usb/dwc3/ep0.c | 3 + + drivers/usb/dwc3/gadget.c | 9 +- + drivers/usb/fotg210/fotg210-core.c | 6 +- + drivers/usb/gadget/function/u_serial.c | 16 +- + drivers/usb/gadget/function/uvc_video.c | 32 +- + drivers/usb/gadget/legacy/hid.c | 6 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 8 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 6 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 5 +- + drivers/usb/gadget/udc/dummy_hcd.c | 11 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 6 +- + drivers/usb/gadget/udc/fusb300_udc.c | 6 +- + drivers/usb/gadget/udc/m66592-udc.c | 5 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 6 +- + drivers/usb/gadget/udc/mv_udc_core.c | 6 +- + drivers/usb/gadget/udc/net2272.c | 6 +- + drivers/usb/gadget/udc/omap_udc.c | 6 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 6 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 6 +- + drivers/usb/gadget/udc/renesas_usb3.c | 6 +- + drivers/usb/gadget/udc/renesas_usbf.c | 6 +- + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 6 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 8 +- + drivers/usb/gadget/udc/tegra-xudc.c | 6 +- + drivers/usb/gadget/udc/udc-xilinx.c | 6 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-atmel.c | 6 +- + drivers/usb/host/ehci-brcm.c | 5 +- + drivers/usb/host/ehci-exynos.c | 6 +- + drivers/usb/host/ehci-fsl.c | 6 +- + drivers/usb/host/ehci-grlib.c | 6 +- + drivers/usb/host/ehci-mv.c | 6 +- + drivers/usb/host/ehci-npcm7xx.c | 6 +- + drivers/usb/host/ehci-omap.c | 6 +- + drivers/usb/host/ehci-orion.c | 6 +- + drivers/usb/host/ehci-pci.c | 3 +- + drivers/usb/host/ehci-platform.c | 6 +- + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/ehci-sh.c | 6 +- + drivers/usb/host/ehci-spear.c | 6 +- + drivers/usb/host/ehci-st.c | 6 +- + drivers/usb/host/ehci-xilinx-of.c | 6 +- + drivers/usb/host/fhci-hcd.c | 9 +- + drivers/usb/host/fsl-mph-dr-of.c | 5 +- + drivers/usb/host/isp116x-hcd.c | 7 +- + drivers/usb/host/isp1362-hcd.c | 6 +- + drivers/usb/host/octeon-hcd.c | 6 +- + drivers/usb/host/ohci-at91.c | 5 +- + drivers/usb/host/ohci-da8xx.c | 6 +- + drivers/usb/host/ohci-exynos.c | 6 +- + drivers/usb/host/ohci-nxp.c | 6 +- + drivers/usb/host/ohci-omap.c | 5 +- + drivers/usb/host/ohci-pci.c | 8 +- + drivers/usb/host/ohci-platform.c | 8 +- + drivers/usb/host/ohci-ppc-of.c | 6 +- + drivers/usb/host/ohci-pxa27x.c | 5 +- + drivers/usb/host/ohci-s3c2410.c | 5 +- + drivers/usb/host/ohci-sm501.c | 6 +- + drivers/usb/host/ohci-spear.c | 5 +- + drivers/usb/host/ohci-st.c | 6 +- + drivers/usb/host/oxu210hp-hcd.c | 6 +- + drivers/usb/host/r8a66597-hcd.c | 5 +- + drivers/usb/host/sl811-hcd.c | 5 +- + drivers/usb/host/uhci-grlib.c | 6 +- + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.h | 24 +- + drivers/usb/host/uhci-pci.c | 7 +- + drivers/usb/host/uhci-platform.c | 6 +- + drivers/usb/host/xhci-histb.c | 8 +- + drivers/usb/host/xhci-mtk.c | 6 +- + drivers/usb/host/xhci-pci.c | 4 +- + drivers/usb/host/xhci-plat.c | 14 +- + drivers/usb/host/xhci-plat.h | 2 +- + drivers/usb/host/xhci-rcar.c | 6 +- + drivers/usb/host/xhci-tegra.c | 11 +- + drivers/usb/host/xhci.c | 5 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/isp1760/isp1760-if.c | 6 +- + drivers/usb/misc/onboard_usb_hub.c | 6 +- + drivers/usb/misc/qcom_eud.c | 10 +- + drivers/usb/misc/usb251xb.c | 2 +- + drivers/usb/misc/usb3503.c | 8 +- + drivers/usb/misc/usb4604.c | 2 +- + drivers/usb/phy/phy-isp1301.c | 2 +- + drivers/usb/phy/phy-tahvo.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 6 +- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 6 +- + drivers/usb/typec/Kconfig | 13 - + drivers/usb/typec/Makefile | 1 - + drivers/usb/typec/anx7411.c | 2 +- + drivers/usb/typec/class.c | 4 +- + drivers/usb/typec/hd3ss3220.c | 4 +- + drivers/usb/typec/mux.c | 61 +-- + drivers/usb/typec/mux/fsa4480.c | 2 +- + drivers/usb/typec/mux/gpio-sbu-mux.c | 11 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 6 +- + drivers/usb/typec/mux/pi3usb30532.c | 2 +- + drivers/usb/typec/qcom-pmic-typec.c | 261 ---------- + drivers/usb/typec/rt1719.c | 2 +- + drivers/usb/typec/stusb160x.c | 2 +- + drivers/usb/typec/tcpm/Kconfig | 11 + + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/fusb302.c | 2 +- + drivers/usb/typec/tcpm/qcom/Makefile | 6 + + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 344 +++++++++++++ + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 528 +++++++++++++++++++ + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 119 +++++ + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 556 +++++++++++++++++++++ + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h | 195 ++++++++ + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 2 +- + drivers/usb/typec/tcpm/tcpci_mt6360.c | 5 +- + drivers/usb/typec/tcpm/tcpci_mt6370.c | 6 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 2 +- + drivers/usb/typec/tcpm/wcove.c | 6 +- + drivers/usb/typec/tipd/core.c | 2 +- + drivers/usb/typec/ucsi/psy.c | 14 + + drivers/usb/typec/ucsi/ucsi_acpi.c | 6 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 2 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +- + drivers/usb/typec/wusb3801.c | 2 +- + drivers/usb/usbip/vhci_hcd.c | 6 +- + include/linux/usb/hcd.h | 2 +- + include/linux/usb/typec_mux.h | 11 +- + tools/usb/usbip/configure.ac | 4 +- + tools/usb/usbip/src/usbip_attach.c | 2 +- + tools/usb/usbip/src/usbip_detach.c | 2 +- + tools/usb/usbip/src/usbip_port.c | 2 +- + 176 files changed, 2940 insertions(+), 851 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8qm-cdns3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,usb5744.yaml + create mode 100644 Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml + create mode 100644 drivers/usb/cdns3/cdns3-starfive.c + delete mode 100644 drivers/usb/typec/qcom-pmic-typec.c + create mode 100644 drivers/usb/typec/tcpm/qcom/Makefile + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h +Merging thunderbolt/next (033c2d8ab283 thunderbolt: Log DisplayPort adapter rate and lanes on discovery) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/dma_test.c +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/thunderbolt/tunnel.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/dma_test.c | 2 +- + drivers/thunderbolt/nhi.c | 1 + + drivers/thunderbolt/quirks.c | 2 ++ + drivers/thunderbolt/retimer.c | 6 ----- + drivers/thunderbolt/tunnel.c | 60 +++++++++++++++++++++++++++++++++++++++--- + 5 files changed, 60 insertions(+), 11 deletions(-) +Merging usb-serial/usb-next (7877cb91f108 Linux 6.4-rc4) +$ 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 +Already up to date. +Merging tty/tty-next (2076b2a4a6b7 Merge 6.4-rc5 into tty-next) +$ 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 drivers/tty/serial/lantiq.c +Merge made by the 'ort' strategy. + arch/mips/alchemy/common/platform.c | 10 +- + drivers/tty/serial/8250/8250.h | 10 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 3 + + drivers/tty/serial/8250/8250_bcm7271.c | 4 + + drivers/tty/serial/8250/8250_core.c | 91 +++++++++--- + drivers/tty/serial/8250/8250_early.c | 21 --- + drivers/tty/serial/8250/8250_em.c | 4 +- + drivers/tty/serial/8250/8250_exar.c | 4 + + drivers/tty/serial/8250/8250_fsl.c | 14 +- + drivers/tty/serial/8250/8250_mtk.c | 9 ++ + drivers/tty/serial/8250/8250_of.c | 4 +- + drivers/tty/serial/8250/8250_omap.c | 195 +++++++++++++++----------- + drivers/tty/serial/8250/8250_port.c | 156 ++++++++++----------- + drivers/tty/serial/8250/8250_pxa.c | 2 +- + drivers/tty/serial/8250/8250_rt288x.c | 136 ++++++++++++++++++ + drivers/tty/serial/8250/8250_uniphier.c | 4 +- + drivers/tty/serial/8250/Kconfig | 10 +- + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Makefile | 5 +- + drivers/tty/serial/amba-pl011.c | 7 + + drivers/tty/serial/atmel_serial.c | 5 +- + drivers/tty/serial/clps711x.c | 4 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 5 +- + drivers/tty/serial/fsl_lpuart.c | 56 +++++++- + drivers/tty/serial/imx.c | 4 +- + drivers/tty/serial/lantiq.c | 4 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/serial_base.h | 46 ++++++ + drivers/tty/serial/serial_base_bus.c | 209 +++++++++++++++++++++++++++ + drivers/tty/serial/serial_core.c | 210 ++++++++++++++++++++++++---- + drivers/tty/serial/serial_ctrl.c | 68 +++++++++ + drivers/tty/serial/serial_port.c | 105 ++++++++++++++ + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/uartlite.c | 12 +- + drivers/tty/serial/xilinx_uartps.c | 5 +- + include/linux/serial_8250.h | 44 +++++- + include/linux/serial_core.h | 7 +- + 39 files changed, 1198 insertions(+), 289 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_rt288x.c + create mode 100644 drivers/tty/serial/serial_base.h + create mode 100644 drivers/tty/serial/serial_base_bus.c + create mode 100644 drivers/tty/serial/serial_ctrl.c + create mode 100644 drivers/tty/serial/serial_port.c +Merging char-misc/char-misc-next (5959fe74c993 Merge 6.4-rc5 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging scripts/tags.sh +Merge made by the 'ort' strategy. + Documentation/fault-injection/provoke-crashes.rst | 2 +- + drivers/accessibility/speakup/Kconfig | 1 + + drivers/accessibility/speakup/main.c | 2 +- + drivers/android/binder.c | 15 +++- + drivers/android/binder_internal.h | 3 + + drivers/char/Kconfig | 3 +- + drivers/comedi/Kconfig | 103 ++++++++++++++-------- + drivers/counter/Kconfig | 1 + + drivers/firmware/dmi-sysfs.c | 4 + + drivers/firmware/xilinx/zynqmp-debug.c | 2 +- + drivers/firmware/xilinx/zynqmp-debug.h | 2 +- + drivers/firmware/xilinx/zynqmp.c | 2 +- + drivers/isdn/Kconfig | 1 - + drivers/isdn/hardware/mISDN/Kconfig | 12 +-- + drivers/misc/ad525x_dpot-i2c.c | 2 +- + drivers/misc/altera-stapl/Makefile | 3 +- + drivers/misc/altera-stapl/altera.c | 6 +- + drivers/misc/apds9802als.c | 2 +- + drivers/misc/apds990x.c | 4 +- + drivers/misc/bh1770glc.c | 4 +- + drivers/misc/ds1682.c | 2 +- + drivers/misc/eeprom/at24.c | 2 +- + drivers/misc/eeprom/ee1004.c | 2 +- + drivers/misc/eeprom/eeprom.c | 2 +- + drivers/misc/eeprom/idt_89hpesx.c | 2 +- + drivers/misc/eeprom/max6875.c | 2 +- + drivers/misc/hmc6352.c | 2 +- + drivers/misc/ics932s401.c | 2 +- + drivers/misc/isl29003.c | 2 +- + drivers/misc/isl29020.c | 2 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 2 +- + drivers/misc/lkdtm/core.c | 2 +- + drivers/misc/mei/bus-fixup.c | 4 +- + drivers/misc/mei/bus.c | 9 -- + drivers/misc/smpro-errmon.c | 1 - + drivers/misc/tsl2550.c | 2 +- + drivers/misc/uacce/uacce.c | 25 +++--- + drivers/misc/xilinx_sdfec.c | 12 --- + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + drivers/parport/Kconfig | 3 +- + drivers/pcmcia/Kconfig | 5 +- + drivers/uio/uio_dfl.c | 2 + + drivers/w1/masters/sgi_w1.c | 2 +- + drivers/w1/slaves/Kconfig | 4 +- + drivers/w1/slaves/w1_ds2438.c | 2 - + drivers/w1/slaves/w1_therm.c | 37 ++++---- + drivers/w1/w1.c | 55 +++++------- + include/dt-bindings/mux/ti-serdes.h | 62 +++++++++++++ + include/linux/amba/bus.h | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 2 +- + include/linux/parport.h | 2 +- + include/linux/uacce.h | 4 +- + scripts/tags.sh | 2 +- + 54 files changed, 261 insertions(+), 178 deletions(-) +Merging accel/habanalabs-next (6e0dd9fb1c24 accel/habanalabs: refactor error info reset) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Merge made by the 'ort' strategy. + drivers/accel/habanalabs/common/command_buffer.c | 6 - + .../accel/habanalabs/common/command_submission.c | 184 ++++++++---- + drivers/accel/habanalabs/common/debugfs.c | 60 ++-- + drivers/accel/habanalabs/common/device.c | 112 ++++--- + drivers/accel/habanalabs/common/firmware_if.c | 218 ++++++++++---- + drivers/accel/habanalabs/common/habanalabs.h | 77 ++--- + drivers/accel/habanalabs/common/habanalabs_drv.c | 9 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 35 +-- + drivers/accel/habanalabs/common/irq.c | 2 +- + drivers/accel/habanalabs/common/memory.c | 104 +------ + drivers/accel/habanalabs/common/mmu/mmu.c | 56 +--- + drivers/accel/habanalabs/common/security.c | 57 ++-- + drivers/accel/habanalabs/gaudi/gaudi.c | 13 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 334 ++++++++------------- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 2 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 15 +- + drivers/accel/habanalabs/goya/goya.c | 3 - + drivers/accel/habanalabs/goya/goya_coresight.c | 9 +- + drivers/accel/habanalabs/include/common/cpucp_if.h | 22 +- + .../accel/habanalabs/include/common/hl_boot_if.h | 41 +-- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 11 + + .../accel/habanalabs/include/gaudi2/gaudi2_fw_if.h | 2 +- + include/uapi/drm/habanalabs_accel.h | 11 + + 23 files changed, 661 insertions(+), 722 deletions(-) +Merging coresight/next (9f37d3798026 coresight: etm4x: Fix missing trctraceidr file in sysfs) +$ 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/hwtracing/coresight/coresight-catu.c | 21 +- + drivers/hwtracing/coresight/coresight-core.c | 623 +++++++++++---------- + drivers/hwtracing/coresight/coresight-cti-core.c | 52 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 4 +- + drivers/hwtracing/coresight/coresight-cti.h | 4 +- + drivers/hwtracing/coresight/coresight-etb10.c | 13 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 6 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 27 +- + drivers/hwtracing/coresight/coresight-funnel.c | 26 +- + drivers/hwtracing/coresight/coresight-platform.c | 269 ++++----- + drivers/hwtracing/coresight/coresight-priv.h | 17 +- + drivers/hwtracing/coresight/coresight-replicator.c | 23 +- + drivers/hwtracing/coresight/coresight-stm.c | 6 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 17 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 26 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 110 ++-- + drivers/hwtracing/coresight/coresight-tmc.h | 2 + + drivers/hwtracing/coresight/coresight-tpda.c | 23 +- + drivers/hwtracing/coresight/coresight-tpdm.c | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 7 +- + drivers/hwtracing/coresight/coresight-trbe.c | 3 +- + drivers/hwtracing/coresight/ultrasoc-smb.c | 11 +- + drivers/hwtracing/coresight/ultrasoc-smb.h | 2 +- + include/linux/coresight.h | 126 +++-- + 26 files changed, 741 insertions(+), 691 deletions(-) +Merging fastrpc/for-next (ac9a78681b92 Linux 6.4-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 (47147d56f92e fpga: zynq-fpga: Ensure proper xCAP interface switch) +$ 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/dfl-fme-main.c | 4 ++-- + drivers/fpga/zynq-fpga.c | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging icc/icc-next (63cf621fde8c Merge branch 'icc-qos' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Auto-merging drivers/clk/qcom/Kconfig +Merge made by the 'ort' strategy. + drivers/clk/qcom/Kconfig | 1 + + drivers/clk/qcom/clk-cbf-8996.c | 60 ++++++- + drivers/interconnect/Kconfig | 6 + + drivers/interconnect/Makefile | 2 + + drivers/interconnect/core.c | 52 +----- + drivers/interconnect/icc-clk.c | 174 +++++++++++++++++++++ + drivers/interconnect/qcom/icc-rpm.c | 112 ++++++------- + drivers/interconnect/qcom/icc-rpm.h | 22 ++- + drivers/interconnect/qcom/msm8996.c | 35 +++-- + drivers/interconnect/qcom/sdm660.c | 17 +- + .../dt-bindings/interconnect/qcom,msm8996-cbf.h | 12 ++ + include/linux/interconnect-clk.h | 22 +++ + include/linux/interconnect.h | 8 - + 13 files changed, 381 insertions(+), 142 deletions(-) + create mode 100644 drivers/interconnect/icc-clk.c + create mode 100644 include/dt-bindings/interconnect/qcom,msm8996-cbf.h + create mode 100644 include/linux/interconnect-clk.h +Merging iio/togreg (12a875055c15 iio: temperature: tmp006: Add OF device matching support) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/kionix-kx022a.c +Auto-merging drivers/iio/accel/st_accel_core.c +Auto-merging drivers/iio/adc/palmas_gpadc.c +Auto-merging drivers/iio/adc/stm32-adc.c +Auto-merging drivers/iio/dac/mcp4725.c +Auto-merging drivers/iio/light/rohm-bu27034.c +Auto-merging drivers/iio/light/vcnl4035.c +Auto-merging drivers/iio/magnetometer/tmag5273.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 28 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 3 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 1 + + .../bindings/iio/light/rohm,bu27008.yaml | 49 + + .../devicetree/bindings/iio/light/ti,opt4001.yaml | 68 ++ + .../bindings/iio/potentiometer/renesas,x9250.yaml | 78 ++ + .../iio/pressure/honeywell,mprls0025pa.yaml | 104 ++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + .../bindings/iio/temperature/melexis,mlx90614.yaml | 6 +- + .../bindings/iio/temperature/ti,tmp006.yaml | 42 + + MAINTAINERS | 17 +- + drivers/iio/accel/adxl313_i2c.c | 2 +- + drivers/iio/accel/adxl345_i2c.c | 2 +- + drivers/iio/accel/adxl355_i2c.c | 2 +- + drivers/iio/accel/adxl367_i2c.c | 2 +- + drivers/iio/accel/adxl372_i2c.c | 2 +- + drivers/iio/accel/bma180.c | 2 +- + drivers/iio/accel/bma400_core.c | 3 +- + drivers/iio/accel/bma400_i2c.c | 2 +- + drivers/iio/accel/bmc150-accel-i2c.c | 2 +- + drivers/iio/accel/da280.c | 2 +- + drivers/iio/accel/da311.c | 2 +- + drivers/iio/accel/dmard06.c | 2 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/dmard10.c | 2 +- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/kionix-kx022a-i2c.c | 3 +- + drivers/iio/accel/kionix-kx022a-spi.c | 1 + + drivers/iio/accel/kionix-kx022a.c | 13 +- + drivers/iio/accel/kxcjk-1013.c | 2 +- + drivers/iio/accel/kxsd9-i2c.c | 2 +- + drivers/iio/accel/mc3230.c | 2 +- + drivers/iio/accel/mma7455_i2c.c | 2 +- + drivers/iio/accel/mma7660.c | 2 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/mma9551.c | 2 +- + drivers/iio/accel/mma9553.c | 2 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/accel/mxc4005.c | 2 +- + drivers/iio/accel/mxc6255.c | 2 +- + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 2 +- + drivers/iio/accel/stk8312.c | 2 +- + drivers/iio/accel/stk8ba50.c | 2 +- + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/ad7091r5.c | 2 +- + drivers/iio/adc/ad7291.c | 2 +- + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 2 +- + drivers/iio/adc/ltc2471.c | 2 +- + drivers/iio/adc/ltc2485.c | 2 +- + drivers/iio/adc/ltc2497.c | 2 +- + drivers/iio/adc/max1363.c | 2 +- + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/adc/mcp3422.c | 2 +- + drivers/iio/adc/nau7802.c | 2 +- + drivers/iio/adc/palmas_gpadc.c | 1 - + drivers/iio/adc/qcom-spmi-adc5.c | 15 +- + drivers/iio/adc/qcom-spmi-vadc.c | 19 +- + drivers/iio/adc/rtq6056.c | 2 +- + drivers/iio/adc/stm32-adc.c | 2 + + drivers/iio/adc/ti-adc081c.c | 2 +- + drivers/iio/adc/ti-ads1015.c | 2 +- + drivers/iio/adc/ti-ads1100.c | 2 +- + drivers/iio/adc/ti-ads7924.c | 2 +- + drivers/iio/amplifiers/ad8366.c | 2 +- + drivers/iio/cdc/ad7150.c | 2 +- + drivers/iio/cdc/ad7746.c | 2 +- + drivers/iio/chemical/ams-iaq-core.c | 2 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 2 +- + drivers/iio/chemical/atlas-sensor.c | 2 +- + drivers/iio/chemical/bme680_i2c.c | 2 +- + drivers/iio/chemical/ccs811.c | 2 +- + drivers/iio/chemical/scd30_i2c.c | 2 +- + drivers/iio/chemical/scd4x.c | 2 +- + drivers/iio/chemical/sgp30.c | 2 +- + drivers/iio/chemical/sgp40.c | 2 +- + drivers/iio/chemical/sps30_i2c.c | 2 +- + drivers/iio/chemical/sunrise_co2.c | 2 +- + drivers/iio/chemical/vz89x.c | 2 +- + drivers/iio/dac/ad5064.c | 2 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5593r.c | 2 +- + drivers/iio/dac/ad5696-i2c.c | 2 +- + drivers/iio/dac/ds4424.c | 2 +- + drivers/iio/dac/m62332.c | 2 +- + drivers/iio/dac/max517.c | 2 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/gyro/bmg160_i2c.c | 2 +- + drivers/iio/gyro/fxas21002c_i2c.c | 2 +- + drivers/iio/gyro/itg3200_core.c | 2 +- + drivers/iio/gyro/mpu3050-i2c.c | 2 +- + drivers/iio/gyro/st_gyro_i2c.c | 2 +- + drivers/iio/health/afe4404.c | 2 +- + drivers/iio/health/max30100.c | 2 +- + drivers/iio/health/max30102.c | 2 +- + drivers/iio/humidity/am2315.c | 2 +- + drivers/iio/humidity/hdc100x.c | 2 +- + drivers/iio/humidity/hdc2010.c | 2 +- + drivers/iio/humidity/hts221_i2c.c | 2 +- + drivers/iio/humidity/htu21.c | 2 +- + drivers/iio/humidity/si7005.c | 2 +- + drivers/iio/humidity/si7020.c | 2 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 2 +- + drivers/iio/imu/bno055/bno055_i2c.c | 2 +- + drivers/iio/imu/fxos8700_i2c.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 2 +- + .../iio/imu/inv_icm42600/inv_icm42600_timestamp.c | 49 +- + drivers/iio/imu/inv_mpu6050/Kconfig | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 10 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 8 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 2 +- + drivers/iio/imu/st_lsm9ds0/Kconfig | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 14 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 98 +- + drivers/iio/industrialio-trigger.c | 22 +- + drivers/iio/light/Kconfig | 25 + + drivers/iio/light/Makefile | 2 + + drivers/iio/light/adjd_s311.c | 2 +- + drivers/iio/light/adux1020.c | 2 +- + drivers/iio/light/al3010.c | 2 +- + drivers/iio/light/al3320a.c | 10 +- + drivers/iio/light/apds9300.c | 2 +- + drivers/iio/light/apds9960.c | 2 +- + drivers/iio/light/as73211.c | 2 +- + drivers/iio/light/bh1750.c | 2 +- + drivers/iio/light/bh1780.c | 2 +- + drivers/iio/light/cm32181.c | 2 +- + drivers/iio/light/cm3232.c | 2 +- + drivers/iio/light/cm3323.c | 2 +- + drivers/iio/light/cm36651.c | 2 +- + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/light/gp2ap020a00f.c | 2 +- + drivers/iio/light/isl29018.c | 2 +- + drivers/iio/light/isl29028.c | 2 +- + drivers/iio/light/isl29125.c | 2 +- + drivers/iio/light/jsa1212.c | 2 +- + drivers/iio/light/ltr501.c | 2 +- + drivers/iio/light/ltrf216a.c | 2 +- + drivers/iio/light/lv0104cs.c | 2 +- + drivers/iio/light/max44000.c | 2 +- + drivers/iio/light/max44009.c | 2 +- + drivers/iio/light/noa1305.c | 2 +- + drivers/iio/light/opt3001.c | 2 +- + drivers/iio/light/opt4001.c | 467 +++++++++ + drivers/iio/light/pa12203001.c | 2 +- + drivers/iio/light/rohm-bu27008.c | 1026 ++++++++++++++++++++ + drivers/iio/light/rohm-bu27034.c | 3 +- + drivers/iio/light/rpr0521.c | 2 +- + drivers/iio/light/si1133.c | 2 +- + drivers/iio/light/si1145.c | 2 +- + drivers/iio/light/st_uvis25_i2c.c | 2 +- + drivers/iio/light/stk3310.c | 2 +- + drivers/iio/light/tcs3414.c | 2 +- + drivers/iio/light/tcs3472.c | 2 +- + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/light/tsl2583.c | 2 +- + drivers/iio/light/tsl2591.c | 2 +- + drivers/iio/light/tsl2772.c | 2 +- + drivers/iio/light/tsl4531.c | 2 +- + drivers/iio/light/us5182d.c | 2 +- + drivers/iio/light/vcnl4000.c | 2 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/light/veml6030.c | 2 +- + drivers/iio/light/veml6070.c | 2 +- + drivers/iio/light/vl6180.c | 2 +- + drivers/iio/light/zopt2201.c | 2 +- + drivers/iio/magnetometer/ak8974.c | 2 +- + drivers/iio/magnetometer/ak8975.c | 2 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 2 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 2 +- + drivers/iio/magnetometer/mag3110.c | 2 +- + drivers/iio/magnetometer/mmc35240.c | 2 +- + drivers/iio/magnetometer/rm3100-i2c.c | 2 +- + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/magnetometer/st_magn_i2c.c | 2 +- + drivers/iio/magnetometer/tmag5273.c | 2 +- + drivers/iio/magnetometer/yamaha-yas530.c | 2 +- + drivers/iio/potentiometer/Kconfig | 10 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/ad5110.c | 2 +- + drivers/iio/potentiometer/ad5272.c | 2 +- + drivers/iio/potentiometer/ds1803.c | 2 +- + drivers/iio/potentiometer/max5432.c | 2 +- + drivers/iio/potentiometer/mcp4018.c | 2 +- + drivers/iio/potentiometer/mcp4531.c | 2 +- + drivers/iio/potentiometer/tpl0102.c | 2 +- + drivers/iio/potentiometer/x9250.c | 220 +++++ + drivers/iio/potentiostat/lmp91000.c | 2 +- + drivers/iio/pressure/Kconfig | 13 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/abp060mg.c | 2 +- + drivers/iio/pressure/bmp280-i2c.c | 2 +- + drivers/iio/pressure/dlhl60d.c | 2 +- + drivers/iio/pressure/dps310.c | 2 +- + drivers/iio/pressure/hp03.c | 2 +- + drivers/iio/pressure/hp206c.c | 2 +- + drivers/iio/pressure/icp10100.c | 2 +- + drivers/iio/pressure/mpl115_i2c.c | 2 +- + drivers/iio/pressure/mpl3115.c | 2 +- + drivers/iio/pressure/mprls0025pa.c | 450 +++++++++ + drivers/iio/pressure/ms5611_i2c.c | 2 +- + drivers/iio/pressure/ms5637.c | 2 +- + drivers/iio/pressure/st_pressure_i2c.c | 2 +- + drivers/iio/pressure/t5403.c | 2 +- + drivers/iio/pressure/zpa2326_i2c.c | 2 +- + drivers/iio/proximity/isl29501.c | 2 +- + drivers/iio/proximity/mb1232.c | 2 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 +- + drivers/iio/proximity/rfd77402.c | 2 +- + drivers/iio/proximity/srf08.c | 2 +- + drivers/iio/proximity/sx9310.c | 2 +- + drivers/iio/proximity/sx9324.c | 2 +- + drivers/iio/proximity/sx9360.c | 2 +- + drivers/iio/proximity/sx9500.c | 2 +- + drivers/iio/proximity/vcnl3020.c | 2 +- + drivers/iio/proximity/vl53l0x-i2c.c | 2 +- + drivers/iio/temperature/max30208.c | 2 +- + drivers/iio/temperature/mlx90614.c | 241 +++-- + drivers/iio/temperature/mlx90632.c | 2 +- + drivers/iio/temperature/tmp006.c | 10 +- + drivers/iio/temperature/tmp007.c | 2 +- + drivers/iio/temperature/tmp117.c | 2 +- + drivers/iio/temperature/tsys01.c | 2 +- + drivers/iio/temperature/tsys02d.c | 2 +- + drivers/staging/iio/addac/adt7316-i2c.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- + include/linux/iio/common/st_sensors.h | 1 + + include/linux/iio/iio.h | 3 + + include/linux/iio/trigger.h | 1 + + include/linux/platform_data/st_sensors_pdata.h | 2 +- + 239 files changed, 3157 insertions(+), 382 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27008.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/ti,opt4001.yaml + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/renesas,x9250.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/honeywell,mprls0025pa.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/ti,tmp006.yaml + create mode 100644 drivers/iio/light/opt4001.c + create mode 100644 drivers/iio/light/rohm-bu27008.c + create mode 100644 drivers/iio/potentiometer/x9250.c + create mode 100644 drivers/iio/pressure/mprls0025pa.c +Merging phy-next/next (1eac0f956608 dt-bindings: phy: qcom,qmp-usb: fix bindings error) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/brcm,kona-usb2-phy.txt | 15 - + .../bindings/phy/brcm,kona-usb2-phy.yaml | 36 ++ + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 6 + + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 47 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 3 + + .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 +- + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 18 +- + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 - + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 3 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 65 +- + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 51 ++ + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 21 + + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 15 +- + drivers/phy/cadence/phy-cadence-salvo.c | 95 ++- + drivers/phy/cadence/phy-cadence-torrent.c | 720 +++++++++++++++------ + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 4 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 218 +++++++ + drivers/phy/hisilicon/Kconfig | 2 +- + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 60 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 356 ++++++++++ + drivers/phy/microchip/sparx5_serdes.c | 426 +++++++----- + drivers/phy/microchip/sparx5_serdes.h | 1 - + drivers/phy/microchip/sparx5_serdes_regs.h | 106 +++ + drivers/phy/phy-core.c | 14 + + drivers/phy/qualcomm/Kconfig | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 255 ++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 182 ++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/samsung/Kconfig | 2 +- + drivers/phy/ti/phy-gmii-sel.c | 34 +- + include/linux/phy/phy.h | 2 + + 33 files changed, 2288 insertions(+), 509 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.yaml +Merging soundwire/next (94f89950850e soundwire: cadence: revisit parity injection) +$ 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 +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 39 +- + drivers/soundwire/Makefile | 3 +- + drivers/soundwire/amd_manager.c | 9 +- + drivers/soundwire/bus.c | 15 +- + drivers/soundwire/cadence_master.c | 50 ++- + drivers/soundwire/cadence_master.h | 5 + + drivers/soundwire/debugfs.c | 3 +- + drivers/soundwire/intel.c | 57 +-- + drivers/soundwire/intel.h | 16 + + drivers/soundwire/intel_ace2x.c | 393 ++++++++++++++++ + drivers/soundwire/intel_ace2x_debugfs.c | 147 ++++++ + drivers/soundwire/intel_auxdevice.c | 17 + + drivers/soundwire/intel_bus_common.c | 96 ++-- + drivers/soundwire/intel_init.c | 21 +- + drivers/soundwire/qcom.c | 497 ++++++++++++++------- + include/linux/soundwire/sdw.h | 3 +- + include/linux/soundwire/sdw_intel.h | 94 +++- + sound/soc/sof/intel/hda.c | 33 +- + sound/soc/sof/intel/shim.h | 1 + + 19 files changed, 1187 insertions(+), 312 deletions(-) + create mode 100644 drivers/soundwire/intel_ace2x.c + create mode 100644 drivers/soundwire/intel_ace2x_debugfs.c +Merging extcon/extcon-next (bcfa8e33064f extcon: Switch i2c drivers back to use .probe()) +$ 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. + .../bindings/extcon/qcom,pm8941-misc.yaml | 14 +- + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-fsa9480.c | 2 +- + drivers/extcon/extcon-palmas.c | 1 - + drivers/extcon/extcon-ptn5150.c | 2 +- + drivers/extcon/extcon-qcom-spmi-misc.c | 4 +- + drivers/extcon/extcon-rt8973a.c | 2 +- + drivers/extcon/extcon-sm5502.c | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 159 +++++++-- + drivers/extcon/extcon.c | 368 ++++++++++++--------- + drivers/extcon/extcon.h | 8 +- + 12 files changed, 361 insertions(+), 204 deletions(-) +Merging gnss/gnss-next (44c026a73be8 Linux 6.4-rc3) +$ 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 (d9824f70e52c vfio/pci: Also demote hiding standard cap messages) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging include/uapi/linux/vfio.h +Merge made by the 'ort' strategy. + drivers/vfio/pci/vfio_pci_config.c | 8 +- + drivers/vfio/pci/vfio_pci_core.c | 8 +- + drivers/vfio/pci/vfio_pci_intrs.c | 307 +++++++++++++++++++++++++------------ + include/linux/vfio_pci_core.h | 26 ++-- + include/uapi/linux/vfio.h | 3 + + 5 files changed, 234 insertions(+), 118 deletions(-) +Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable) +$ 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 (c6e9da9d5566 staging: rtl8192e: clean unnecessary braces warning on r8192E_phy.c) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/most/i2c/i2c.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- + drivers/staging/pi433/pi433_if.c | 1 - + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 60 +++++------ + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 27 +++-- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 33 +----- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 118 ++++++++++---------- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 13 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 49 --------- + drivers/staging/rtl8192e/rtllib.h | 31 +----- + drivers/staging/rtl8192e/rtllib_rx.c | 14 ++- + drivers/staging/rtl8192e/rtllib_softmac.c | 120 ++++++--------------- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 21 +--- + drivers/staging/rtl8192e/rtllib_tx.c | 14 +-- + drivers/staging/rtl8192e/rtllib_wx.c | 25 ----- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 +- + drivers/staging/rtl8723bs/include/sta_info.h | 26 ++--- + drivers/staging/sm750fb/Kconfig | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +- + drivers/staging/vt6655/Kconfig | 2 +- + drivers/staging/wlan-ng/hfa384x.h | 21 ---- + drivers/staging/wlan-ng/hfa384x_usb.c | 21 ---- + drivers/staging/wlan-ng/p80211conv.c | 21 ---- + drivers/staging/wlan-ng/p80211conv.h | 21 ---- + drivers/staging/wlan-ng/p80211hdr.h | 21 ---- + drivers/staging/wlan-ng/p80211ioctl.h | 21 ---- + drivers/staging/wlan-ng/p80211metadef.h | 21 ---- + drivers/staging/wlan-ng/p80211metastruct.h | 39 +------ + drivers/staging/wlan-ng/p80211mgmt.h | 21 ---- + drivers/staging/wlan-ng/p80211msg.h | 21 ---- + drivers/staging/wlan-ng/p80211netdev.c | 21 ---- + drivers/staging/wlan-ng/p80211netdev.h | 21 ---- + drivers/staging/wlan-ng/p80211req.c | 21 ---- + drivers/staging/wlan-ng/p80211req.h | 21 ---- + drivers/staging/wlan-ng/p80211types.h | 21 ---- + drivers/staging/wlan-ng/p80211wep.c | 21 ---- + drivers/staging/wlan-ng/prism2fw.c | 21 ---- + drivers/staging/wlan-ng/prism2mgmt.c | 71 +++--------- + drivers/staging/wlan-ng/prism2mgmt.h | 21 ---- + drivers/staging/wlan-ng/prism2mib.c | 21 ---- + drivers/staging/wlan-ng/prism2sta.c | 21 ---- + 43 files changed, 200 insertions(+), 887 deletions(-) +Merging counter-next/counter-next (98ffe0252911 counter: 104-quad-8: Migrate to the regmap API) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging drivers/counter/Kconfig +Merge made by the 'ort' strategy. + drivers/counter/104-quad-8.c | 802 +++++++++++++++++++++----------------- + drivers/counter/Kconfig | 7 +- + drivers/counter/stm32-timer-cnt.c | 3 + + tools/counter/.gitignore | 2 + + tools/counter/Makefile | 1 + + 5 files changed, 449 insertions(+), 366 deletions(-) + create mode 100644 tools/counter/.gitignore +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 (907514a7dc4c dmaengine: sprd: Don't set chancnt) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/pci/controller/dwc/pcie-designware.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/stericsson,dma40.yaml | 36 ++- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 30 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 6 + + MAINTAINERS | 4 +- + drivers/dma/Kconfig | 1 + + drivers/dma/dma-axi-dmac.c | 1 - + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1 - + drivers/dma/dw-edma/Makefile | 8 +- + drivers/dma/dw-edma/dw-edma-core.c | 88 ++---- + drivers/dma/dw-edma/dw-edma-core.h | 58 ++++ + drivers/dma/dw-edma/dw-edma-pcie.c | 4 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 85 +++++- + drivers/dma/dw-edma/dw-edma-v0-core.h | 14 +- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 296 ++++++++++++++++++ + drivers/dma/dw-edma/dw-hdma-v0-core.h | 17 ++ + drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 170 +++++++++++ + drivers/dma/dw-edma/dw-hdma-v0-debugfs.h | 22 ++ + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 129 ++++++++ + drivers/dma/plx_dma.c | 1 - + drivers/dma/qcom/Kconfig | 1 + + drivers/dma/qcom/bam_dma.c | 18 +- + drivers/dma/qcom/hidma.c | 1 - + drivers/dma/sprd-dma.c | 1 - + drivers/dma/ste_dma40.c | 334 +++++++++------------ + .../dma-ste-dma40.h => drivers/dma/ste_dma40.h | 101 +------ + drivers/dma/ste_dma40_ll.c | 3 +- + drivers/dma/ti/k3-psil-j721s2.c | 11 + + drivers/dma/ti/k3-udma.c | 25 ++ + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + include/linux/dma/edma.h | 7 +- + 30 files changed, 1074 insertions(+), 401 deletions(-) + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-core.c + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-core.h + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.c + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-debugfs.h + create mode 100644 drivers/dma/dw-edma/dw-hdma-v0-regs.h + rename include/linux/platform_data/dma-ste-dma40.h => drivers/dma/ste_dma40.h (51%) +Merging cgroup/for-next (f32b14ba70a9 Merge branch 'for-6.4-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/sched/sched.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 22 ++- + include/linux/cpuset.h | 12 +- + include/linux/sched.h | 4 +- + kernel/cgroup/cgroup-internal.h | 2 - + kernel/cgroup/cgroup-v1.c | 8 +- + kernel/cgroup/cgroup.c | 48 +++--- + kernel/cgroup/cpuset.c | 265 +++++++++++++++++++------------- + kernel/cgroup/rdma.c | 2 + + kernel/sched/core.c | 41 +++-- + kernel/sched/deadline.c | 67 ++++++-- + kernel/sched/sched.h | 2 +- + 11 files changed, 276 insertions(+), 197 deletions(-) +Merging scsi/for-next (28646fd24f4e Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging block/bfq-iosched.c +Auto-merging block/blk-core.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sata.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/target/target_core_iblock.c +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/libata.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-block-device | 22 ++ + Documentation/scsi/arcmsr_spec.rst | 1 + + Documentation/scsi/dc395x.rst | 17 +- + Documentation/scsi/g_NCR5380.rst | 6 +- + Documentation/scsi/index.rst | 37 ++- + Documentation/scsi/megaraid.rst | 6 +- + Documentation/scsi/ncr53c8xx.rst | 6 +- + Documentation/scsi/scsi-changer.rst | 6 +- + Documentation/scsi/scsi-generic.rst | 53 ++-- + Documentation/scsi/scsi.rst | 23 +- + Documentation/scsi/scsi_fc_transport.rst | 8 +- + Documentation/scsi/sym53c8xx_2.rst | 6 +- + MAINTAINERS | 13 +- + block/bfq-iosched.c | 8 +- + block/blk-core.c | 5 +- + block/ioprio.c | 6 +- + drivers/ata/libata-core.c | 204 ++++++++++++- + drivers/ata/libata-eh.c | 130 ++++++++- + drivers/ata/libata-sata.c | 103 ++++++- + drivers/ata/libata-scsi.c | 382 +++++++++++++++++++----- + drivers/ata/libata.h | 2 +- + drivers/md/dm.c | 69 +++++ + drivers/nvme/host/Makefile | 2 +- + drivers/nvme/host/core.c | 149 +--------- + drivers/nvme/host/nvme.h | 2 + + drivers/nvme/host/pr.c | 315 ++++++++++++++++++++ + drivers/s390/block/dasd.c | 7 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/bfa/bfa_fcbuild.c | 4 +- + drivers/scsi/bfa/bfa_fcs.c | 4 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 20 +- + drivers/scsi/bfa/bfa_ioc.c | 2 +- + drivers/scsi/bfa/bfa_svc.c | 2 +- + drivers/scsi/bfa/bfad.c | 10 +- + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/bfa/bfad_bsg.c | 4 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 28 +- + drivers/scsi/libsas/sas_expander.c | 124 ++++---- + drivers/scsi/lpfc/lpfc_attr.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 30 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 24 +- + drivers/scsi/lpfc/lpfc_hw.h | 4 +- + drivers/scsi/lpfc/lpfc_hw4.h | 11 +- + drivers/scsi/lpfc/lpfc_init.c | 26 +- + drivers/scsi/lpfc/lpfc_nvme.c | 46 +-- + drivers/scsi/lpfc/lpfc_scsi.c | 3 +- + drivers/scsi/lpfc/lpfc_sli.c | 390 ++++++++++++++++--------- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 8 +- + drivers/scsi/mpi3mr/mpi3mr.h | 8 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 32 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 + + drivers/scsi/pm8001/pm80xx_hwi.c | 126 +++++--- + drivers/scsi/qedf/qedf_main.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 13 + + drivers/scsi/qla2xxx/qla_def.h | 21 ++ + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 264 +++++++++++++++-- + drivers/scsi/qla2xxx/qla_iocb.c | 33 ++- + drivers/scsi/qla2xxx/qla_isr.c | 64 +++- + drivers/scsi/qla2xxx/qla_mr.c | 20 +- + drivers/scsi/qla2xxx/qla_os.c | 130 ++++----- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 8 +- + drivers/scsi/qla4xxx/ql4_os.c | 14 +- + drivers/scsi/scsi.c | 169 ++++++++++- + drivers/scsi/scsi_common.c | 43 +++ + drivers/scsi/scsi_error.c | 48 ++- + drivers/scsi/scsi_lib.c | 17 +- + drivers/scsi/scsi_priv.h | 6 + + drivers/scsi/scsi_scan.c | 3 + + drivers/scsi/scsi_sysfs.c | 30 ++ + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/sd.c | 189 +++++++++--- + drivers/scsi/smartpqi/Kconfig | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 6 +- + drivers/scsi/smartpqi/smartpqi_init.c | 284 +++++++++--------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 34 +-- + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/target/iscsi/iscsi_target_parameters.c | 4 +- + drivers/target/iscsi/iscsi_target_util.c | 4 +- + drivers/target/target_core_configfs.c | 10 +- + drivers/target/target_core_device.c | 6 +- + drivers/target/target_core_file.c | 4 +- + drivers/target/target_core_iblock.c | 275 ++++++++++++++++- + drivers/target/target_core_pr.c | 79 ++++- + drivers/target/target_core_rd.c | 4 +- + drivers/target/target_core_sbc.c | 13 +- + drivers/target/target_core_spc.c | 113 ++++--- + drivers/ufs/core/ufs-hwmon.c | 2 +- + drivers/ufs/core/ufshcd.c | 28 +- + drivers/ufs/host/ufs-mediatek.c | 3 - + include/linux/ata.h | 11 +- + include/linux/blk_types.h | 10 +- + include/linux/libata.h | 38 ++- + include/linux/nvme.h | 51 +++- + include/linux/pr.h | 25 ++ + include/scsi/scsi_cmnd.h | 5 + + include/scsi/scsi_common.h | 13 + + include/scsi/scsi_device.h | 18 +- + include/scsi/scsi_proto.h | 5 + + include/target/target_core_backend.h | 8 +- + include/target/target_core_base.h | 3 +- + include/uapi/linux/ioprio.h | 68 ++++- + 112 files changed, 3559 insertions(+), 1183 deletions(-) + create mode 100644 drivers/nvme/host/pr.c +Merging scsi-mkp/for-next (467e6cc73ef2 Merge patch series "UFS host controller driver patches") +$ 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/ata/libata-scsi.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/ufs/core/ufs-mcq.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/ufs/ufshcd.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,ufs.yaml | 2 + + drivers/ata/libata-scsi.c | 1 + + drivers/message/fusion/Kconfig | 2 +- + drivers/message/fusion/mptbase.c | 4 +- + drivers/message/fusion/mptctl.c | 2 +- + drivers/scsi/Kconfig | 25 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +- + drivers/scsi/aic94xx/Kconfig | 2 +- + drivers/scsi/fcoe/fcoe_transport.c | 2 +- + drivers/scsi/fnic/fnic_debugfs.c | 8 +- + drivers/scsi/hosts.c | 1 + + drivers/scsi/lpfc/lpfc.h | 65 +--- + drivers/scsi/lpfc/lpfc_ct.c | 88 ++--- + drivers/scsi/lpfc/lpfc_els.c | 14 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 35 +- + drivers/scsi/lpfc/lpfc_hw.h | 16 +- + drivers/scsi/lpfc/lpfc_hw4.h | 3 - + drivers/scsi/lpfc/lpfc_init.c | 250 ++++-------- + drivers/scsi/lpfc/lpfc_logmsg.h | 6 +- + drivers/scsi/lpfc/lpfc_nvme.c | 17 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 65 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 54 +-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/Kconfig.megaraid | 6 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 5 + + drivers/scsi/mvsas/Kconfig | 2 +- + drivers/scsi/pcmcia/Kconfig | 6 +- + drivers/scsi/pm8001/pm8001_sas.c | 22 ++ + drivers/scsi/qla2xxx/Kconfig | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_common.c | 3 +- + drivers/scsi/scsi_lib.c | 40 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/ufs/core/ufs-fault-injection.c | 2 +- + drivers/ufs/core/ufs-mcq.c | 259 ++++++++++++- + drivers/ufs/core/ufs-sysfs.c | 2 +- + drivers/ufs/core/ufshcd-crypto.c | 2 +- + drivers/ufs/core/ufshcd-priv.h | 21 +- + drivers/ufs/core/ufshcd.c | 424 +++++++++++++-------- + drivers/ufs/core/ufshpb.c | 6 +- + drivers/ufs/core/ufshpb.h | 2 +- + drivers/ufs/host/cdns-pltfrm.c | 1 - + drivers/ufs/host/tc-dwc-g210-pci.c | 10 - + drivers/ufs/host/tc-dwc-g210-pltfrm.c | 1 - + drivers/ufs/host/ufs-exynos.c | 3 +- + drivers/ufs/host/ufs-hisi.c | 25 +- + drivers/ufs/host/ufs-mediatek.c | 1 - + drivers/ufs/host/ufs-qcom.c | 3 +- + drivers/ufs/host/ufs-sprd.c | 1 - + drivers/ufs/host/ufshcd-pci.c | 10 - + drivers/ufs/host/ufshcd-pltfrm.c | 6 - + drivers/ufs/host/ufshcd-pltfrm.h | 1 - + include/scsi/scsi_host.h | 6 + + include/trace/events/scsi.h | 21 +- + include/ufs/ufshcd.h | 8 +- + include/ufs/ufshci.h | 25 +- + 60 files changed, 949 insertions(+), 661 deletions(-) +Merging vhost/linux-next (853b05e8d8d9 vp_vdpa: Check queue number of vdpa device from add_config) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/vdpa/vdpa_user/vduse_dev.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/vhost.c +Merge made by the 'ort' strategy. + .../device_drivers/ethernet/amd/pds_vdpa.rst | 85 +++ + .../networking/device_drivers/ethernet/index.rst | 1 + + MAINTAINERS | 4 + + drivers/vdpa/Kconfig | 10 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 158 +++-- + drivers/vdpa/ifcvf/ifcvf_base.h | 19 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 98 +-- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + drivers/vdpa/pds/Makefile | 10 + + drivers/vdpa/pds/aux_drv.c | 140 ++++ + drivers/vdpa/pds/aux_drv.h | 26 + + drivers/vdpa/pds/cmds.c | 185 +++++ + drivers/vdpa/pds/cmds.h | 18 + + drivers/vdpa/pds/debugfs.c | 289 ++++++++ + drivers/vdpa/pds/debugfs.h | 17 + + drivers/vdpa/pds/vdpa_dev.c | 769 +++++++++++++++++++++ + drivers/vdpa/pds/vdpa_dev.h | 49 ++ + drivers/vdpa/solidrun/snet_ctrl.c | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 2 +- + drivers/vdpa/solidrun/snet_main.c | 15 + + drivers/vdpa/solidrun/snet_vdpa.h | 1 + + drivers/vdpa/vdpa_user/vduse_dev.c | 3 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 11 +- + drivers/vhost/net.c | 11 +- + drivers/vhost/vdpa.c | 34 +- + drivers/vhost/vhost.c | 23 +- + drivers/vhost/vhost.h | 8 +- + drivers/virtio/virtio_pci_common.h | 7 +- + drivers/virtio/virtio_pci_modern_dev.c | 33 +- + drivers/virtio/virtio_vdpa.c | 4 +- + include/linux/pds/pds_adminq.h | 247 +++++++ + include/linux/pds/pds_common.h | 21 +- + include/linux/virtio.h | 5 +- + include/linux/virtio_pci_modern.h | 6 + + tools/virtio/Makefile | 13 +- + tools/virtio/ringtest/.gitignore | 7 + + tools/virtio/ringtest/main.h | 11 + + tools/virtio/virtio-trace/README | 2 +- + tools/virtio/virtio-trace/trace-agent.c | 12 +- + 40 files changed, 2139 insertions(+), 224 deletions(-) + create mode 100644 Documentation/networking/device_drivers/ethernet/amd/pds_vdpa.rst + create mode 100644 drivers/vdpa/pds/Makefile + create mode 100644 drivers/vdpa/pds/aux_drv.c + create mode 100644 drivers/vdpa/pds/aux_drv.h + create mode 100644 drivers/vdpa/pds/cmds.c + create mode 100644 drivers/vdpa/pds/cmds.h + create mode 100644 drivers/vdpa/pds/debugfs.c + create mode 100644 drivers/vdpa/pds/debugfs.h + create mode 100644 drivers/vdpa/pds/vdpa_dev.c + create mode 100644 drivers/vdpa/pds/vdpa_dev.h + create mode 100644 tools/virtio/ringtest/.gitignore +Merging rpmsg/for-next (1ca04f21b204 remoteproc: stm32: Fix error code in stm32_rproc_parse_dt()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/remoteproc/pru_rproc.c +Merge made by the 'ort' strategy. + .../bindings/remoteproc/st,stm32-rproc.yaml | 44 ++++++++++-- + drivers/remoteproc/da8xx_remoteproc.c | 6 +- + drivers/remoteproc/imx_dsp_rproc.c | 17 ++--- + drivers/remoteproc/imx_rproc.c | 6 +- + drivers/remoteproc/keystone_remoteproc.c | 6 +- + drivers/remoteproc/meson_mx_ao_arc.c | 6 +- + drivers/remoteproc/mtk_scp.c | 6 +- + drivers/remoteproc/omap_remoteproc.c | 6 +- + drivers/remoteproc/pru_rproc.c | 6 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 6 +- + drivers/remoteproc/qcom_q6v5_mss.c | 6 +- + drivers/remoteproc/qcom_q6v5_pas.c | 6 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 6 +- + drivers/remoteproc/qcom_wcnss.c | 6 +- + drivers/remoteproc/rcar_rproc.c | 6 +- + drivers/remoteproc/remoteproc_virtio.c | 6 +- + drivers/remoteproc/st_remoteproc.c | 6 +- + drivers/remoteproc/stm32_rproc.c | 84 +++++++++++++++------- + drivers/remoteproc/wkup_m3_rproc.c | 6 +- + 19 files changed, 136 insertions(+), 105 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 (ba65c79fbb81 dt-bindings: gpio: gpio-delay: Spelling s/curcuit/circuit/) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + ...cm,bcm6345-gpio.yaml => brcm,bcm63xx-gpio.yaml} | 18 +-- + .../devicetree/bindings/gpio/gpio-delay.yaml | 79 ++++++++++ + .../devicetree/bindings/gpio/gpio-mmio.yaml | 117 +++++++++++++++ + .../devicetree/bindings/gpio/gpio-stmpe.txt | 17 --- + .../bindings/gpio/ni,169445-nand-gpio.txt | 38 ----- + .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 53 +++++++ + .../devicetree/bindings/gpio/wd,mbl-gpio.txt | 38 ----- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 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 +- + Documentation/driver-api/gpio/legacy.rst | 19 --- + .../translations/zh_CN/driver-api/gpio/legacy.rst | 17 --- + Documentation/translations/zh_TW/gpio.txt | 17 --- + drivers/gpio/Kconfig | 35 +++-- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-adnp.c | 2 +- + drivers/gpio/gpio-brcmstb.c | 3 +- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-delay.c | 164 +++++++++++++++++++++ + drivers/gpio/gpio-fxl6408.c | 2 +- + drivers/gpio/gpio-gw-pld.c | 2 +- + drivers/gpio/gpio-ixp4xx.c | 4 +- + drivers/gpio/gpio-max7300.c | 2 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pca9570.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-sa1100.c | 1 + + drivers/gpio/gpio-sch311x.c | 26 +--- + drivers/gpio/gpio-tangier.c | 4 +- + drivers/gpio/gpio-tegra186.c | 78 ++++++++++ + drivers/gpio/gpio-tpic2810.c | 27 +--- + drivers/gpio/gpio-tps65086.c | 27 +--- + drivers/gpio/gpio-ts4900.c | 2 +- + drivers/gpio/gpio-twl4030.c | 22 +-- + drivers/gpio/gpiolib-legacy.c | 12 -- + drivers/gpio/gpiolib.c | 37 ++--- + include/linux/gpio.h | 11 -- + 42 files changed, 575 insertions(+), 335 deletions(-) + rename Documentation/devicetree/bindings/gpio/{brcm,bcm6345-gpio.yaml => brcm,bcm63xx-gpio.yaml} (75%) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-delay.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mmio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-stmpe.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/ni,169445-nand-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/wd,mbl-gpio.txt + create mode 100644 drivers/gpio/gpio-delay.c +Merging gpio-intel/for-next (ac9a78681b92 Linux 6.4-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 (4ab0b8b35718 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 MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 3 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/qcom,sdx75-tlmm.yaml | 137 +++ + MAINTAINERS | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 + + drivers/pinctrl/nxp/pinctrl-s32.h | 14 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 30 +- + drivers/pinctrl/nxp/pinctrl-s32g2.c | 14 +- + drivers/pinctrl/pinctrl-amd.c | 50 +- + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/pinctrl-at91-pio4.c | 15 +- + drivers/pinctrl/pinctrl-at91.c | 8 +- + drivers/pinctrl/pinctrl-axp209.c | 42 + + drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 2 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 2 - + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 30 +- + drivers/pinctrl/qcom/Makefile | 3 +- + drivers/pinctrl/qcom/pinctrl-apq8064.c | 104 +- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 264 +++-- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 104 +- + drivers/pinctrl/qcom/pinctrl-ipq5332.c | 206 ++-- + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 260 +++-- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 114 +- + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 240 ++-- + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 176 ++- + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 276 +++-- + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 90 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 13 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 42 +- + drivers/pinctrl/qcom/pinctrl-msm8226.c | 156 ++- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 252 +++-- + drivers/pinctrl/qcom/pinctrl-msm8909.c | 268 +++-- + drivers/pinctrl/qcom/pinctrl-msm8916.c | 556 +++++----- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 424 ++++---- + drivers/pinctrl/qcom/pinctrl-msm8960.c | 464 ++++---- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 212 ++-- + drivers/pinctrl/qcom/pinctrl-msm8994.c | 564 +++++----- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 508 +++++---- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 380 ++++--- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 474 ++++---- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 230 ++-- + drivers/pinctrl/qcom/pinctrl-qcs404.c | 388 ++++--- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 6 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 249 +++-- + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 327 +++--- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 254 +++-- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 322 +++--- + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 292 +++-- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 358 +++--- + drivers/pinctrl/qcom/pinctrl-sdm660.c | 387 ++++--- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 284 +++-- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 286 +++-- + drivers/pinctrl/qcom/pinctrl-sdx55.c | 190 ++-- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 194 ++-- + drivers/pinctrl/qcom/pinctrl-sdx75.c | 1144 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm6115.c | 162 ++- + drivers/pinctrl/qcom/pinctrl-sm6125.c | 282 +++-- + drivers/pinctrl/qcom/pinctrl-sm6350.c | 296 +++-- + drivers/pinctrl/qcom/pinctrl-sm6375.c | 358 +++--- + drivers/pinctrl/qcom/pinctrl-sm7150.c | 247 ++--- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 286 +++-- + drivers/pinctrl/qcom/pinctrl-sm8250.c | 258 +++-- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 298 +++-- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 300 +++-- + drivers/pinctrl/qcom/pinctrl-sm8550.c | 320 +++--- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/renesas/pfc-r8a77970.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 6 +- + drivers/pinctrl/sunplus/sppctl.c | 24 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 30 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 7 +- + 80 files changed, 7673 insertions(+), 6668 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx75-tlmm.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx75.c +Merging pinctrl-intel/for-next (7e521093113b pinctrl: moorefield: Use BUFCFG_PINMODE_GPIO in ->pin_dbg_show()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 69 +++++++++++------------------- + drivers/pinctrl/intel/pinctrl-cherryview.c | 17 +++++--- + drivers/pinctrl/intel/pinctrl-merrifield.c | 16 +++++-- + drivers/pinctrl/intel/pinctrl-moorefield.c | 16 +++++-- + 4 files changed, 62 insertions(+), 56 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (ac9a78681b92 Linux 6.4-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 (247ee6c78040 pwm: Remove unused radix tree) +$ 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 +Already up to date. +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 (d909ae0a8562 kselftests: Sort the collections list to avoid duplicate tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging Documentation/dev-tools/kselftest.rst +Merge made by the 'ort' strategy. + Documentation/dev-tools/kselftest.rst | 22 ++++ + tools/testing/selftests/clone3/clone3.c | 5 +- + .../ftrace/test.d/kprobe/kprobe_opt_types.tc | 34 +++++++ + tools/testing/selftests/kselftest/runner.sh | 11 +- + .../selftests/media_tests/video_device_test.c | 113 +++++++++++++++------ + tools/testing/selftests/pidfd/pidfd.h | 1 - + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 1 + + tools/testing/selftests/pidfd/pidfd_test.c | 3 +- + .../selftests/prctl/set-anon-vma-name-test.c | 2 +- + tools/testing/selftests/run_kselftest.sh | 7 +- + .../selftests/vDSO/vdso_test_clock_getres.c | 4 +- + 11 files changed, 166 insertions(+), 37 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_opt_types.tc +Merging kunit/test (ac9a78681b92 Linux 6.4-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 (fefdb43943c1 Documentation: kunit: Rename references to kunit_abort()) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/architecture.rst | 4 +- + Documentation/dev-tools/kunit/start.rst | 7 +- + Documentation/dev-tools/kunit/usage.rst | 69 ++++++++++- + include/kunit/resource.h | 92 ++++++++++++++ + include/kunit/test.h | 34 ++++-- + lib/kunit/executor_test.c | 11 +- + lib/kunit/kunit-example-test.c | 56 +++++++++ + lib/kunit/kunit-test.c | 88 +++++++++++++- + lib/kunit/resource.c | 99 +++++++++++++++ + lib/kunit/test.c | 161 ++++++++++++++----------- + tools/testing/kunit/kunit_kernel.py | 6 +- + tools/testing/kunit/mypy.ini | 6 + + tools/testing/kunit/run_checks.py | 2 +- + 13 files changed, 538 insertions(+), 97 deletions(-) + create mode 100644 tools/testing/kunit/mypy.ini +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. + kernel/livepatch/transition.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (38e0689b27f8 rtc: stm32: remove dedicated wakeup management) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/rtc/rtc.yaml | 2 +- + drivers/rtc/Kconfig | 4 +++- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-ab-eoz9.c | 4 ++-- + drivers/rtc/rtc-abx80x.c | 2 +- + drivers/rtc/rtc-bq32k.c | 2 +- + drivers/rtc/rtc-ds1307.c | 2 +- + drivers/rtc/rtc-ds1374.c | 2 +- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-ds3232.c | 4 ++-- + drivers/rtc/rtc-em3027.c | 2 +- + drivers/rtc/rtc-fm3130.c | 2 +- + drivers/rtc/rtc-hym8563.c | 2 +- + drivers/rtc/rtc-isl12022.c | 4 ++-- + drivers/rtc/rtc-isl12026.c | 2 +- + drivers/rtc/rtc-isl1208.c | 2 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-max6900.c | 2 +- + drivers/rtc/rtc-nct3018y.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 2 +- + drivers/rtc/rtc-pcf8523.c | 2 +- + drivers/rtc/rtc-pcf85363.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pcf8583.c | 2 +- + drivers/rtc/rtc-rs5c372.c | 2 +- + drivers/rtc/rtc-rv3028.c | 2 +- + drivers/rtc/rtc-rv3029c2.c | 2 +- + drivers/rtc/rtc-rv3032.c | 4 ++-- + drivers/rtc/rtc-rv8803.c | 2 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-rx8581.c | 2 +- + drivers/rtc/rtc-s35390a.c | 2 +- + drivers/rtc/rtc-sd3078.c | 2 +- + drivers/rtc/rtc-stm32.c | 28 +++++--------------------- + drivers/rtc/rtc-x1205.c | 2 +- + 38 files changed, 48 insertions(+), 64 deletions(-) +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure) +$ 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 +Auto-merging drivers/misc/eeprom/at24.c +Merge made by the 'ort' strategy. + drivers/misc/eeprom/at24.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ntb/ntb-next (942cc9ceccb6 ntb: intel: Remove redundant pci_clear_master) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 9 ++++++--- + drivers/ntb/hw/epf/ntb_hw_epf.c | 12 ++++-------- + drivers/ntb/hw/idt/ntb_hw_idt.c | 24 +++++++++++------------- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 9 ++++++--- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_tool.c | 2 ++ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 8 files changed, 32 insertions(+), 29 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (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 (ac9a78681b92 Linux 6.4-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 (ac1c0d15aedc nvmem: core: add support for fixed cells *layout*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 15 ++ + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 5 +- + .../bindings/nvmem/layouts/fixed-cell.yaml | 31 ++++ + .../bindings/nvmem/layouts/fixed-layout.yaml | 50 ++++++ + .../bindings/nvmem/layouts/nvmem-layout.yaml | 5 +- + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 8 +- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 55 +++--- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 6 - + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 6 - + Documentation/devicetree/bindings/nvmem/rmem.yaml | 1 + + .../devicetree/bindings/nvmem/rockchip,otp.yaml | 122 +++++++++++++ + .../devicetree/bindings/nvmem/rockchip-otp.txt | 25 --- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 3 - + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 6 - + drivers/nvmem/Kconfig | 10 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 28 +++ + drivers/nvmem/core.c | 32 +++- + drivers/nvmem/imx-ocotp-ele.c | 175 +++++++++++++++++++ + drivers/nvmem/imx-ocotp.c | 10 +- + drivers/nvmem/rmem.c | 1 + + drivers/nvmem/rockchip-otp.c | 193 ++++++++++++++++----- + drivers/nvmem/zynqmp_nvmem.c | 2 +- + 24 files changed, 641 insertions(+), 151 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-otp.txt + create mode 100644 drivers/nvmem/imx-ocotp-ele.c +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 +Auto-merging drivers/auxdisplay/ht16k33.c +Merge made by the 'ort' strategy. + drivers/auxdisplay/ht16k33.c | 2 +- + drivers/auxdisplay/lcd2s.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ 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 (ac9a78681b92 Linux 6.4-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 (312310928417 Linux 5.18-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 (a196d7ad4ca5 bus: mhi: host: pci_generic: Add support for IP_SW0 channels) +$ 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/pci_generic.c | 26 ++++++++++++++++++++++---- + drivers/bus/mhi/host/pm.c | 5 +++++ + 2 files changed, 27 insertions(+), 4 deletions(-) +Merging memblock/for-next (de649e7f5edb memblock: Update nid info in memblock debugfs) +$ 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 | 34 +++++++++++++++++++---- + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+), 5 deletions(-) +Merging cxl/next (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port()) +$ 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 (39c90699b330 efi: Add tee-based EFI variable driver) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging drivers/firmware/efi/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/efi/Makefile +Auto-merging drivers/firmware/efi/efi.c +Auto-merging include/linux/efi.h +Recorded preimage for 'drivers/firmware/efi/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/firmware/efi/Makefile'. +[master 5f7a08603647] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/platform/efi/quirks.c | 8 + + arch/x86/platform/efi/runtime-map.c | 2 +- + drivers/firmware/efi/Kconfig | 15 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 13 + + drivers/firmware/efi/esrt.c | 6 +- + drivers/firmware/efi/stmm/mm_communication.h | 236 +++++++++++ + drivers/firmware/efi/stmm/tee_stmm_efi.c | 606 +++++++++++++++++++++++++++ + drivers/firmware/efi/vars.c | 12 + + fs/efivarfs/super.c | 39 +- + include/linux/efi.h | 15 + + 11 files changed, 946 insertions(+), 7 deletions(-) + create mode 100644 drivers/firmware/efi/stmm/mm_communication.h + create mode 100644 drivers/firmware/efi/stmm/tee_stmm_efi.c +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 (1ec98851d0f0 Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' 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 arch/arm/configs/shmobile_defconfig +Auto-merging mm/Kconfig +Auto-merging mm/slab.h +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/hsdk_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/mmp2_defconfig | 1 - + arch/arm/configs/mvebu_v7_defconfig | 1 - + arch/arm/configs/nhk8815_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/pxa168_defconfig | 1 - + arch/arm/configs/pxa3xx_defconfig | 1 - + arch/arm/configs/pxa910_defconfig | 1 - + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/configs/sama7_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/configs/sp7021_defconfig | 1 - + arch/arm/configs/tegra_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/microblaze/configs/mmu_defconfig | 1 - + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cu1000-neo_defconfig | 1 - + arch/mips/configs/cu1830-neo_defconfig | 1 - + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/decstation_64_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/decstation_r4k_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip28_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 1 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 1 - + arch/mips/configs/maltaup_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/pic32mzda_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 1 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/configs/rs90_defconfig | 1 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/nios2/configs/10m50_defconfig | 1 - + arch/nios2/configs/3c120_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/powerpc/configs/40x/klondike_defconfig | 1 - + arch/powerpc/configs/52xx/pcm030_defconfig | 1 - + arch/powerpc/configs/83xx/kmeter1_defconfig | 1 - + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 1 - + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - + arch/powerpc/configs/ep8248e_defconfig | 1 - + arch/powerpc/configs/gamecube_defconfig | 1 - + arch/powerpc/configs/mgcoge_defconfig | 1 - + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc83xx_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/wii_defconfig | 1 - + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/apsh4a3a_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/kfr2r09-romimage_defconfig | 1 - + arch/sh/configs/kfr2r09_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/magicpanelr2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sh/configs/rsk7269_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7619_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/se7780_defconfig | 1 - + arch/sh/configs/secureedge5410_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/sparc/configs/sparc32_defconfig | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/um/configs/i386_defconfig | 1 - + arch/um/configs/x86_64_defconfig | 1 - + include/linux/slab.h | 12 +++++++ + kernel/configs/tiny.config | 1 - + mm/Kconfig | 18 +++++++--- + mm/kfence/kfence_test.c | 7 ++-- + mm/slab.c | 37 ++++++------------- + mm/slab.h | 13 ++----- + mm/slab_common.c | 19 ++++------ + mm/slub.c | 47 ++++++++++--------------- + security/Kconfig | 8 ----- + 143 files changed, 67 insertions(+), 229 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 (663da89ec452 landlock: Document Landlock's network support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 89 +- + include/uapi/linux/landlock.h | 48 + + samples/landlock/sandboxer.c | 128 ++- + security/landlock/Kconfig | 1 + + security/landlock/Makefile | 2 + + security/landlock/fs.c | 232 ++--- + security/landlock/limits.h | 7 +- + security/landlock/net.c | 174 ++++ + security/landlock/net.h | 26 + + security/landlock/ruleset.c | 405 ++++++-- + security/landlock/ruleset.h | 185 +++- + security/landlock/setup.c | 2 + + security/landlock/syscalls.c | 163 +++- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/common.h | 10 + + tools/testing/selftests/landlock/config | 4 + + tools/testing/selftests/landlock/fs_test.c | 74 +- + tools/testing/selftests/landlock/net_test.c | 1317 ++++++++++++++++++++++++++ + 18 files changed, 2520 insertions(+), 349 deletions(-) + create mode 100644 security/landlock/net.c + create mode 100644 security/landlock/net.h + create mode 100644 tools/testing/selftests/landlock/net_test.c +Merging rust/rust-next (d09a61024f6b rust: task: add `Send` marker to `Task`) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/process/changes.rst +Auto-merging scripts/min-tool-version.sh +Merge made by the 'ort' strategy. + .gitattributes | 1 + + Documentation/process/changes.rst | 2 +- + Documentation/rust/quick-start.rst | 4 +- + rust/alloc/README.md | 3 + + rust/alloc/alloc.rs | 55 +++-- + rust/alloc/boxed.rs | 446 +++++++++++++++++++++++++++++++++-- + rust/alloc/collections/mod.rs | 5 +- + rust/alloc/lib.rs | 71 ++++-- + rust/alloc/raw_vec.rs | 16 +- + rust/alloc/slice.rs | 447 +++++------------------------------ + rust/alloc/vec/drain.rs | 81 ++++++- + rust/alloc/vec/drain_filter.rs | 60 ++++- + rust/alloc/vec/into_iter.rs | 125 +++++++--- + rust/alloc/vec/is_zero.rs | 96 +++++++- + rust/alloc/vec/mod.rs | 464 ++++++++++++++++++++++++++++--------- + rust/alloc/vec/set_len_on_drop.rs | 5 + + rust/alloc/vec/spec_extend.rs | 63 +---- + rust/bindings/lib.rs | 1 - + rust/kernel/build_assert.rs | 2 + + rust/kernel/error.rs | 22 +- + rust/kernel/init.rs | 5 + + rust/kernel/init/macros.rs | 85 ++++--- + rust/kernel/lib.rs | 4 - + rust/kernel/std_vendor.rs | 2 + + rust/kernel/str.rs | 22 ++ + rust/kernel/sync/arc.rs | 25 +- + rust/kernel/task.rs | 10 +- + rust/kernel/types.rs | 13 ++ + rust/macros/helpers.rs | 86 ++++++- + rust/macros/pin_data.rs | 168 +++++++++----- + rust/macros/quote.rs | 14 +- + rust/uapi/lib.rs | 1 - + scripts/Makefile.build | 2 +- + scripts/min-tool-version.sh | 2 +- + 34 files changed, 1612 insertions(+), 796 deletions(-) +Merging sysctl/sysctl-next (a092d00be2fa sysctl: replace child with a flags var) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging fs/proc/proc_sysctl.c +Auto-merging include/linux/parport.h +Auto-merging kernel/signal.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/umh.c +Merge made by the 'ort' strategy. + drivers/parport/procfs.c | 193 +++++++++++++----------- + drivers/parport/share.c | 2 +- + fs/proc/proc_sysctl.c | 244 +++---------------------------- + fs/sysctls.c | 5 +- + include/linux/key.h | 3 - + include/linux/parport.h | 2 + + include/linux/sysctl.h | 35 +---- + include/linux/umh.h | 2 - + kernel/signal.c | 23 +++ + kernel/sysctl.c | 40 +---- + kernel/umh.c | 11 +- + lib/test_sysctl.c | 91 +++++++++++- + scripts/check-sysctl-docs | 10 -- + security/keys/sysctl.c | 7 + + tools/testing/selftests/sysctl/sysctl.sh | 115 +++++++++++---- + 15 files changed, 345 insertions(+), 438 deletions(-) +Merging execve/for-next/execve (36650a357eac binfmt: Slightly simplify elf_fdpic_map_file()) +$ 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 +Merge made by the 'ort' strategy. + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 12 ++++-------- + fs/proc/vmcore.c | 4 ++-- + 3 files changed, 7 insertions(+), 11 deletions(-) +Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Auto-merging include/linux/find.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db2f62343586] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitmap.h | 54 +++++++++--------- + include/linux/cpumask.h | 140 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 +++++++------- + include/linux/nodemask.h | 88 ++++++++++++++--------------- + lib/bitmap.c | 2 +- + lib/cpumask.c | 2 +- + lib/test_bitmap.c | 18 +++++- + 7 files changed, 177 insertions(+), 167 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 (b2f10148ec1e kobject: Use return value of strreplace()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/riscv/purgatory/Makefile +Auto-merging arch/s390/purgatory/Makefile +Auto-merging arch/x86/purgatory/Makefile +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging include/linux/compiler_attributes.h +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace_events.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/filesystems/autofs-mount-control.rst | 2 +- + Documentation/filesystems/autofs.rst | 2 +- + MAINTAINERS | 1 + + Makefile | 6 + + arch/riscv/purgatory/Makefile | 2 +- + arch/s390/purgatory/Makefile | 2 +- + arch/x86/purgatory/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 2 +- + drivers/gpu/drm/display/drm_dp_helper.c | 2 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 4 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 2 +- + drivers/md/raid5.c | 4 +- + drivers/md/raid5.h | 2 +- + drivers/misc/lkdtm/bugs.c | 4 +- + drivers/most/configfs.c | 8 +- + drivers/net/ethernet/intel/ice/ice_ddp.h | 9 +- + drivers/nvme/host/fc.c | 8 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/bnx2i/bnx2i_init.c | 2 +- + drivers/scsi/hptiop.c | 4 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 12 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + fs/befs/btree.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/jbd2/journal.c | 6 +- + fs/nfs/nfsroot.c | 2 +- + fs/vboxsf/super.c | 2 +- + fs/xfs/libxfs/xfs_btree.h | 2 +- + fs/xfs/scrub/btree.h | 2 +- + include/acpi/actbl3.h | 2 +- + include/linux/compiler_attributes.h | 13 ++ + include/linux/fortify-string.h | 161 ++++++++++++++------- + include/linux/overflow.h | 18 ++- + include/linux/string.h | 2 +- + include/uapi/linux/auto_dev-ioctl.h | 2 +- + kernel/time/clocksource.c | 2 +- + kernel/trace/ftrace.c | 18 +-- + kernel/trace/trace.c | 8 +- + kernel/trace/trace_events.c | 4 +- + kernel/trace/trace_events_inject.c | 4 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/trace/trace_probe.c | 2 +- + lib/Kconfig.debug | 7 +- + lib/Kconfig.ubsan | 55 +++---- + lib/Makefile | 1 + + lib/fortify_kunit.c | 14 ++ + lib/kobject.c | 3 +- + lib/overflow_kunit.c | 2 +- + lib/strcat_kunit.c | 104 +++++++++++++ + lib/string.c | 4 +- + lib/string_helpers.c | 12 +- + lib/ubsan.c | 3 - + lib/ubsan.h | 11 ++ + scripts/Makefile.ubsan | 2 +- + scripts/checkpatch.pl | 14 +- + tools/testing/kunit/configs/all_tests.config | 2 + + tools/testing/kunit/configs/arch_uml.config | 3 + + 69 files changed, 432 insertions(+), 179 deletions(-) + create mode 100644 lib/strcat_kunit.c +Merging kspp-gustavo/for-next/kspp (4cac30138e5e media: venus: hfi_cmds: Replace fake flex-arrays with flexible-array members) +$ 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. + drivers/media/platform/qcom/venus/hfi_cmds.c | 18 +++++++++--------- + drivers/media/platform/qcom/venus/hfi_cmds.h | 12 ++++++------ + drivers/media/platform/qcom/venus/hfi_msgs.c | 4 ++-- + drivers/media/platform/qcom/venus/hfi_msgs.h | 14 +++++++------- + include/uapi/linux/wireless.h | 2 +- + 5 files changed, 25 insertions(+), 25 deletions(-) +Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..630e9b2d323d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230607 |