diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-02-20 16:37:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-02-20 16:37:39 +1100 |
| commit | d2af0fa4bfa4ec29d03b449ccd43fee39501112d (patch) | |
| tree | dfc3cbce0862e1ac5751cedbd9b13d58ec96bf53 | |
| parent | bb0c19ca1155be008156a33b878d456ac6a8972d (diff) | |
| download | linux-d2af0fa4bfa4ec29d03b449ccd43fee39501112d.tar.gz linux-d2af0fa4bfa4ec29d03b449ccd43fee39501112d.tar.xz | |
Add linux-next specific files for 20230220next-20230220
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 358 | ||||
| -rw-r--r-- | Next/Trees | 360 | ||||
| -rw-r--r-- | Next/merge.log | 18744 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 19463 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d5bbb3ac5564 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,358 @@ +Name SHA1 +---- ---- +origin 925cf0457d7e62ce08878ffb789189ac08ca8677 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 9aa923d2b9941054c958f5dc13db3bbcc10bfe6d +kbuild-current 22e46f6480e83bcf49b6d5e6b66c81872c97a902 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2f62847cf6ae49a54515421f67b1badffaa805f3 +arm64-fixes 853e2dac25c15f7431dfe59805de1bada34c96e9 +arm-soc-fixes afeff81765c62da857ff709309f7351a56113795 +davinci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +drivers-memory-fixes cb8fd6f75775165390ededea8799b60d93d9fe3e +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 553b20b211c4153f8af6096fd52069bbdf955e23 +powerpc-fixes 4302abc628fc0dc08e5855f21bbfaed407a72bc3 +s390-fixes 7ab41c2c08a32132ba8c14624910e2fe8ce4ba4b +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 31e1be62abdebc28bd51d0999a25f0eea535b5af +fsverity-current ef7592e466ef7b2595fdfdfd23559a779f4b211a +net ec35307e18ba8174e2a3f701956059f6a36f22fb +bpf ec35307e18ba8174e2a3f701956059f6a36f22fb +ipsec 8222d5910dae08213b6d9d4bc9a7f8502855e624 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 92f3e96d642f5e05b9dc710c06fedc669f1b4f00 +wireless 80f8a66dede0a4b4e9e846765a97809c6fe49ce5 +rdma-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +sound-current e97fc9cffbb9f372b53b42c36cd7b20aab44a554 +sound-asoc-fixes 1f810d2b6b2fbdc5279644d8b2c140b1f7c9d43d +regmap-fixes 697c3892d825fb78f42ec8e53bed065dd728db3e +regulator-fixes 4bb3d82a1820c1b609ede8eb2332f3cb038c5840 +spi-fixes 574fbb95cd9d88bdc9c9c4c64223a38a61d7de9a +pci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +driver-core.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +tty.current 4ec5183ec48656cec489c49f989c508b68b518e3 +usb.current ceaa837f96adb69c0df0397937cd74991d5d821a +usb-serial-fixes 4ec5183ec48656cec489c49f989c508b68b518e3 +phy 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +staging.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +iio-fixes 03fada47311a3e668f73efc9278c4a559e64ee85 +counter-current 1b929c02afd37871d5afb9d498426f83432e71c2 +char-misc.current 4ec5183ec48656cec489c49f989c508b68b518e3 +soundwire-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +input-current 9c445d2637c938a800fcc8b5f0b10e60c94460c7 +crypto-current 736f88689c6912f05d0116917910603a7ba97de7 +vfio-fixes 51cdc8bc120ef6e42f6fb758341f5d91bc955952 +kselftest-fixes a49fb7218ed84a4c5e6c56b9fd933498b9730912 +modules-fixes 0254127ab977e70798707a7a2b757c9f3c971210 +dmaengine-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c0f7ae27539fbac267384a7bfc58296ea7550d52 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 89c08aef8f8dcb5fc98ad8db7ca92c9dab1f26b0 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +at91-fixes 9bfa2544dbd1133f0b0af4e967de3bb9c1e3a497 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 2c10b61421a28e95a46ab489fd56c0f442ff6952 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes e2de0e6abd91b05411cb1f0953115dbbbe9b11ce +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes 711442e29f16f0d39dd0e2460c9baacfccb9d5a7 +btrfs-fixes 000f66519f1a5560b712ec42f3f18c95aa27ef66 +vfs-fixes 9c7417b5ec440242bb5b64521acd53d4e19130c1 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +drivers-x86-fixes eb4b55f2f26fc8a7b7dc6f06f1de91480d53485b +samsung-krzk-fixes a3583e92d188ec6c58c7f603ac5e72dd8a11c21a +pinctrl-samsung-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +devicetree-fixes 707344c8a188bb1d6704d3546229fc7a07c01a63 +dt-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +scsi-fixes 15600159bcc6abbeae6b33a849bef90dca28b78f +drm-fixes f7597e3c58eeb9ce534993f53c982f2e91e6dd4d +drm-intel-fixes d5a1224aa68c8b124a4c5c390186e571815ed390 +mmc-fixes 3f18c5046e633cc4bbad396b74c05d46d353033d +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 950b879b7f0251317d26bae0687e72592d607532 +riscv-dt-fixes 43d5f5d63699724d47f0d9e0eae516a260d232b4 +riscv-soc-fixes 730892135b7db8260195a31a676ef28e0972fe48 +fpga-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +spdx 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +gpio-brgl-fixes 79eeab1d85e0fee4c0bc36f3b6ddf3920f39f74b +gpio-intel-fixes a69982c37cd0586e6832268155349301b87f2e35 +pinctrl-intel-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +erofs-fixes e02ac3e7329f76c5de40cba2746cbe165f571dff +kunit-fixes 254c71374a70051a043676b67ba4f7ad392b5fe6 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes 4102db175b5d884d133270fdbd0e59111ce688fc +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current f883675bf6522b52cd75dc3de791680375961769 +efi-fixes 190233164cd77115f8dea718cbac561f557092c6 +zstd-fixes 7f18d6eececb3d4334acbc217a7e75ab50e1db82 +battery-fixes d137900f237ad41cf432f1e09c6ee3e584146757 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +rust-fixes 2a02b7a197943d218ad1cddba3501da1dad2059e +drm-misc-fixes 7245e629dcaaf308f1868aeffa218e9849c77893 +kbuild bf3a52637d300db4d375c55c5d2f3868d7c3f243 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf f9fa0778ee7349a9aa3d2ea10e9f2ab843a0b44e +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping 5e7b9a6ae8c352819a2d998a065910b536de0e8c +asm-generic a13408c205260716e925a734ef399899d69182ba +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm ba07b4efc9898cb2b1ee125c53d3b30711db7092 +arm64 ad4a4d3aff21539263326201d7f5806ea0c1de90 +arm-perf e8a709dc2a9156f223ec953ae70a919e87ad7e9a +arm-soc 1eebd1aaa62b8ed00c510feab76894b024462e4d +amlogic b6520fc7ee5777e46b7a1882aa77ef5afb28dee9 +asahi-soc 22991d8d57251509b8ee5c0b3dac04506fe5ed7a +aspeed af06aa236dd7ba3347af4364f385348be7f60097 +at91 05ccf9c9c2fc64dfdc6e1f341d23e5356519156c +broadcom b691373a1bec006892f21083e84c5d2ef92f4097 +davinci eaafab7e8e268c18a66e6dfbd5ecea55a7a129c2 +drivers-memory 957b573ea840b5f2a440ec858886916d9bc7df33 +imx-mxs fd5368f6f08b283f15b162a4b6f3608fa974df60 +mediatek 74ba8bb2bfb225b5e2c9bfdb345f8d021451999a +mvebu b80b042da86099ec9a822f9c475d335617531b31 +omap f68a6fc5807388854f3b54a5331c6cb3e88cc9b4 +qcom b836adb6d62dece244fb5a8008971b2a81ea6b4d +renesas 8dd3dae1705b14948974debe04021549519dfb0b +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip cc2b5be472c0ade7b8a61e6c4b2c15a3bf67fe32 +samsung-krzk dd3d835d31ed9b1147c3774e98102d78837e034e +scmi 6d796c50f84ca79f1722bb131799e5a5710c4700 +stm32 4e74ad9f3af69cc91c92b7286f1936752b4db13b +sunxi caea0128c038b85682838d1fef960c044da83e0f +tee 816477edfba6e7ab9411acec5f07cfa00e0882f7 +tegra de98d45290c7a1ef062b2fc1afd3b243d87cda6b +ti 47d72bbb6c0f7dc0901d7601d1aa6b1419282049 +xilinx a18426505c2b720ab37ccb23b7eb1d52c24e0f0d +clk 8a9fbf00acfeeeaac8efab8091bb464bd71b70ea +clk-imx 4e197ee880c24ecb63f7fe17449b3653bc64b03c +clk-renesas b1dec4e78599a2ce5bf8557056cd6dd72e1096b0 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch 2d94a107d0419cb47fa7860f35ac529c80f90d40 +m68k 1e5b5df65af99013b4d31607ddb3ca5731dbe44d +m68knommu 5aa52ccf692bfef7ddc23c2be1d48524a4427527 +microblaze 1b929c02afd37871d5afb9d498426f83432e71c2 +mips 85cc91e2ba4262a602ec65e2b76c4391a9e60d3d +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 3125e3b8f24c708b09232290359afe2f2b2e9ceb +powerpc 38d73b671a817328334f2a70a23fed4d1f4a952c +powerpc-objtool 1b929c02afd37871d5afb9d498426f83432e71c2 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 8658db0a4a0f84f50fe6643fe8665efe1a4bdb66 +riscv-dt d9c36d016f6112e636f18a49a5f779c7f8667deb +riscv-soc f3460326e38d6a084fb5b3348125a802567a3690 +s390 1a41151889b5d009987daabda9deb9505629369f +uml 04df97e150c83d4640540008e95d0229cb188135 +xtensa 4414c1f5c7a375eaa108676a56e12cc8234eb647 +pidfd 2372745ea25a5139a5f0d071f0b9fc7fc51822e7 +vfs-idmapping 9db35c4c2bc4492485f9fd72807de63350175021 +fscrypt 097d7c1fcb8d4b52c62a36f94b8f18bc21a24934 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs a9eb558a5bea66cc43950632f5fffec6b5795233 +btrfs 5c202ce4169d7220f67b0c8b3650f26ed5f9bcaf +ceph e7d84c6a1296d059389f7342d9b4b7defb518d3a +cifs e18f461adf109abca09344073e47ece287e9d601 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 8d1b80a79452630f157bf634ae9cfcd9f4eed161 +exfat 5742d6a467d1073b2515255c4a90287b2e87d4e6 +ext3 90e4f9e498261170f0e2e07e86d2c99d0f9c86a1 +ext4 1da18e38cb97e9521e93d63034521a9649524f64 +f2fs ddf1eca4fc5a4038cb323306f51fbba34ce3f4d2 +fsverity 51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1 +fuse 1cc4606d19e3710bfab3f6704b87ff9580493c69 +gfs2 b66f723bb552ad59c2acb5d45ea45c890f84498b +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd fb533473d1595fe79ecb528fda1de33552b07178 +nfs 896e090eefedeb8a715ea19938a2791c32679cc9 +nfs-anna 1683ed16ff1a51705f58e8083ed93a7428a543f2 +nfsd edba207d2781701035c9942736fa80618646c8b8 +ntfs3 b268663f49c37ffeb3cf41a5716444295dc50c3a +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs 8fcf2d012c8641c18adcd139dba6a1e556338d36 +v9fs 2ce10bad1e96757074071ed4c5096e992cbf3c5c +v9fs-ericvh 291ca06aad937245badbcf59517b700c0184035f +xfs 60b730a40c43fbcc034970d3e77eb0f25b8cc1cf +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 471859f57d42537626a56312cfb50cd6acee09ae +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks c65454a947263dfdf482076388aaed60af84ca2f +iversion 58a033c9a3e003e048a0431a296e58c6b363b02b +vfs e9f33f8668ab0982545b2b18b744fe93b7af869b +printk 10d639febe5629687dac17c4a7500a96537ce11a +pci dc444af6b8d4bff0bbfbfcc467cff609b47aa673 +pstore 88603b6dc419445847923fcb7fe5080067a30f98 +hid 432b0b5b0129e61cbff08cd6f91cfa34d9da366e +i2c dc67b2d9043871add05cbe9c584d8d736f3c4d2f +i3c e826acc18bc7bdf4278bf8928caa3a0cd4065432 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 5720a18baa4686d56d0a235e6ecbcc55f8d716d7 +jc_docs e076f253283c3e55a128fa9665c0e6cd8146948d +v4l-dvb 83e0f265aa8d0e37cc8e15d318b64da0ec03ff41 +v4l-dvb-next 5dd1c455130d5b04b2316f3003a9247c276d53cd +pm ea150b53b1fd250a0c49f9ade353634dd7976fbf +cpufreq-arm ba38f3cbe7db2cec802c6d60e2bef57a3ff095a4 +cpupower 1b929c02afd37871d5afb9d498426f83432e71c2 +devfreq 497e92ab8c8ea709edd846ebb8907e784ed00bf5 +opp eca4c0eea53432ec4b711b2a8ad282cbad231b4f +thermal a2c81dc59d41e92362ab7d41d0c15471ea50637d +dlm 723b197bbdf1e0adbab772b8e5e022c40db6a9fe +rdma 66fb1d5df6ace316a4a6e2c31e13fc123ea2b644 +net-next 675f176b4dcc2b75adbcea7ba0e9a649527f53bd +bpf-next 168de0233586fb06c5c5c56304aa9a928a09b0ba +ipsec-next 75da437a2f172759b2273091a938772e687242d0 +mlx5-next 22551e77e5507a06114c0af2b92bbf1a66ec33c5 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 46b5be95b5cbf839dffcac3005a57e962a9913f9 +bluetooth 58c6156a4d4bdf011a061ab814920e7e59f68328 +wireless-next 38ae3192296924181537544e7cfc43ca78eadcda +mtd 84549c816dc317f012798e706e58669b3b013604 +nand ef3e6327ff04af8527b3558e023e99f1cc241bce +spi-nor f047382519ca41702ebaee5a862e87390f687137 +crypto 8b84475318641c2b89320859332544cf187e1cbd +drm 8573df341545b7b66cfacf9526b1f7a0de917b9e +drm-misc fb073aa27a7e1b8c968c05c5447a77d49e832ec5 +amdgpu 80c6d6804f31451848a3956a70c2bcb1f07cfcb0 +drm-intel 8038510b1fe443ffbc0e356db5f47cbb8678a594 +drm-tegra b9930311641cf2ed905a84aabe27e8f3868aee4a +drm-msm dbd7a2a941b8cbf9e5f79a777ed9fe0090eebb61 +drm-msm-lumag 1d233b1cb149ec78c20fac58331b27bb460f9558 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 4ec5183ec48656cec489c49f989c508b68b518e3 +regmap 40f4b05868101e047a8502ebb94f05312186421b +sound 7933b90b42896f5b6596e6a829bb31c5121fc2a9 +sound-asoc aed2f3fb920c58d6e891d9c2d9cfcfedfa1a4655 +modules 2ece476a23461f1a50555ad5487640c73f33ced9 +input 04f8b4ea20c85f579e8bbcd9da138779e9d4d36f +block 7c866e4a066b75b4960272359a5b96d2224766ee +device-mapper a2f998a78a425edde5a1a1973c1d4854fe9d019f +libata 8844f0aa8dc42f54dc278c8d4ecbf32e92f2d6f1 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 571f235163ac83407e212b78719175236962aede +mfd a5f31a668da16af7e6736500868bcfc30e91a3cf +backlight 718c35c8d5947633a617cded7f78961616edfc5d +battery c142872ea40a99258e2a86bf5c471bcc81752f56 +regulator 3849d051e66d59bdd20acebb20346e4281b2f255 +security 88603b6dc419445847923fcb7fe5080067a30f98 +apparmor cb60752f0c37cba0d4a90fd62dfd3ba425df783f +integrity 4958db3245fa655bf18251bd2a83bcc164071c39 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 88603b6dc419445847923fcb7fe5080067a30f98 +smack c0e48d3f7722399dcdca4111b13e8a5c49fae1b3 +tomoyo 5fc44ba8be52c92b8fc87e9a8244e0bd737de6ab +tpmdd 85b93bbd1c9768d09adebbe9f33bab0d4ec94404 +watchdog 4443f6ce0d121779a851a6c1bbf9263b964ea0da +iommu bedd29d793da3312e1350a56245c4971a38d4453 +audit 6c6cd913accd77008f74a1a9d57b816db3651daa +devicetree 39459ce717b863556d7d75466fcbd904a6fbbbd8 +dt-krzk 8254755399744f71d613678fe5b85c139b1a0ea2 +mailbox 53c60d1004270045d63cdee91aa77c145282d7e4 +spi de82c25dab9ac0fa01c95b8914bde8d9ce528e93 +tip be97fc4ad26c6f74728b33e00787e485a952f299 +clockevents ab407a1919d2676ddc5761ed459d4cc5c7be18ed +edac feac08675023d0450929758744e866a9b1a2dc4a +irqchip a83bf176fed4ee88dad84d59f77dde153b9a442a +ftrace ca6cbe8c481a2a2d7528cb9c7246f957494948fe +rcu 905739f2b88752231f1613be9d74f5edf8e2560b +kvm 7cb79f433e75b05d1635aefaa851cfcd1cb7dc4f +kvm-arm 96a4627dbbd48144a65af936b321701c70876026 +kvms390 5fc5b94a273655128159186c87662105db8afeb5 +kvm-x86 62ef199250cd46fb66fe98267137b7f64e0b41b4 +xen-tip 4ecc96cba8d93d86abf46d17067e9b4c96241a29 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c63a2e52d5e08f01140d7b76c08a78e15e801f03 +drivers-x86 0d9bdd8a550170306c2021b8d6766c5343b870c2 +chrome-platform b0d8a67715dae445c065c83a40a581d6563a341f +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 4aea8f30475f472047d2b877e985b343ddc6882f +ipmi befb28f2676a65a5a4cc4626ae224461d8785af6 +driver-core 9f467f6375afd3c7667dbabcfff35c22961e1c0b +usb 1243741f6b02b5f2c06bca910f894c333838f994 +thunderbolt 06cbcbfaa6510eed406e3b6d5d071386b9830689 +usb-serial 617c331d91077f896111044628c096802551dc66 +tty 72206cc730b5c9208e9a99ace1c619f542035312 +char-misc 6ec363fc6142226b9ab5a6528f65333d729d2b6b +accel e195c1e076136c00f12891c976ce5ad11cf3e933 +coresight 669c4614236a7f78a2b693d0024cbdfa8536eb5a +fpga ffa562d000729dba5548e6c478355e5f5439820d +icc 7bf0008a52930e4d11ff1d6083cf13d9879bd2d0 +iio 91ba2700aa75859957613aedf307a04a83010cee +phy-next 3584f6392f09440769246d4936e1fcbff76ac3bc +soundwire 66f95de7c13be5e442d8ed4cf00e13f8dbdc1315 +extcon 2e85d0a0201d0cb466313ad434f7b25f14135300 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio c55365a09302516129b819c9031a0de0e33cfb31 +staging b5929325f06300d28696b9a030539a4009154788 +counter-next 01f714ee022ecb2667ca8ba909138b1af4cfff2c +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine e922bbf37564a4c67efca9dd6133eaadbffb65f5 +cgroup 14fffd51f9027fd393b3b074f11bc49c16fdf990 +scsi 1a10df75c93ff11bc7712474f1e571652f9c4bcf +scsi-mkp 833f7d4819a88f027033e0033ea44f7ae3e45a9b +vhost c76a6fa50447b6a93064ae325f248f8f17f15d61 +rpmsg c7ed92130c40c122aef56c201f609569d59d8675 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 4827aae061337251bb91801b316157a78b845ec7 +gpio-intel 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl 099f37a539e616f762241ab999495fb8aa2f5971 +pinctrl-intel 88f8ac47bddc1674b2840c733f1120a548037199 +pinctrl-renesas 698485cd875be1109b2130e0ff6c927010a6b56b +pinctrl-samsung 1b929c02afd37871d5afb9d498426f83432e71c2 +pwm 7a77daf8223e772a225d6aa6202a5b1ae2392caf +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest bbf45b2ab4677d1d3a23f11bfe7f81e1d96291a4 +kselftest 0eb15a47bf437a268b69ab1a1a45fdf1f609b69f +kunit 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit-next 82649c7c0da431d147a75c6ae768ee42c1053f53 +livepatching b2e118419db38dcbb9bf51e7e4367bbaaae63545 +rtc e8c9efd5d52f1da1c9e012466b9df94a38cc1c00 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 1b929c02afd37871d5afb9d498426f83432e71c2 +ntb 0310a30a9395cb535fd47151ae18eb6891897f2d +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 1b929c02afd37871d5afb9d498426f83432e71c2 +nvmem fa7876365ad2e53445a8793ce9f1f2aae2781208 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv b14033a3e6ba73a5c68974a80b05cba55553ed5b +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 1b929c02afd37871d5afb9d498426f83432e71c2 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 3c54a3ff0a2cdcd902482a62fef813f1d46e5eaf +memblock 2fe03412e2e1be3d5ab37b8351a37c3aec506556 +cxl e686c32590f40bffc45f105c04c836ffad3e531a +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi e1d447157f232c650e6f32c9fb89ff3d0207c69a +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 603c592a005a49eb64e4cc81c9367e20eb031ecb +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 1c1ea1c3e21d5ba0867f84f6ad04090bd477df25 +rust 7ea01d3169a28d090fc8f22e7fcb4e4f1090c2d2 +sysctl 0dff89c4488f90c01807d9c12023433703206523 +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 18e93f4dc09976df5d818b45a81af8f02424cbaa +hte 1b929c02afd37871d5afb9d498426f83432e71c2 +kspp 78f7a3fd6dc66cb788c21d7705977ed13c879351 +kspp-gustavo b942a520d9e43bc31f0808d2f2267a1ddba75518 +iommufd b4ff830eca097df51af10a9be29e8cc817327919 +mm-stable f7a449f779608efe1941a0e0c4bd7b5f57000be7 +mm-nonmm-stable 817013880a6883f7ab08030d1f8cfef5f07ba467 +mm 23de16dd868f939a99bbf4095430d209ef4d0c79 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8ab189a5823f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,360 @@ +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#master +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#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +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/core +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 +powerpc-objtool git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/objtool +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 +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 +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.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 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#master +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#master +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 +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 +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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +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-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 +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 +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 +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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 +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 diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..12bcb0aa387e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,18744 @@ +$ date -R +Mon, 20 Feb 2023 08:01:39 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 55% (7319/13109)
Updating files: 56% (7342/13109)
Updating files: 57% (7473/13109)
Updating files: 58% (7604/13109)
Updating files: 59% (7735/13109)
Updating files: 60% (7866/13109)
Updating files: 61% (7997/13109)
Updating files: 62% (8128/13109)
Updating files: 63% (8259/13109)
Updating files: 64% (8390/13109)
Updating files: 65% (8521/13109)
Updating files: 66% (8652/13109)
Updating files: 67% (8784/13109)
Updating files: 68% (8915/13109)
Updating files: 69% (9046/13109)
Updating files: 70% (9177/13109)
Updating files: 71% (9308/13109)
Updating files: 72% (9439/13109)
Updating files: 73% (9570/13109)
Updating files: 74% (9701/13109)
Updating files: 75% (9832/13109)
Updating files: 76% (9963/13109)
Updating files: 77% (10094/13109)
Updating files: 78% (10226/13109)
Updating files: 79% (10357/13109)
Updating files: 80% (10488/13109)
Updating files: 81% (10619/13109)
Updating files: 82% (10750/13109)
Updating files: 83% (10881/13109)
Updating files: 84% (11012/13109)
Updating files: 85% (11143/13109)
Updating files: 86% (11274/13109)
Updating files: 87% (11405/13109)
Updating files: 88% (11536/13109)
Updating files: 89% (11668/13109)
Updating files: 90% (11799/13109)
Updating files: 90% (11898/13109)
Updating files: 91% (11930/13109)
Updating files: 92% (12061/13109)
Updating files: 93% (12192/13109)
Updating files: 94% (12323/13109)
Updating files: 95% (12454/13109)
Updating files: 96% (12585/13109)
Updating files: 97% (12716/13109)
Updating files: 98% (12847/13109)
Updating files: 99% (12978/13109)
Updating files: 100% (13109/13109)
Updating files: 100% (13109/13109), done. +HEAD is now at 3ac88fa4605e Merge tag 'net-6.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net +Merging origin/master (925cf0457d7e Merge tag 'x86-urgent-2023-02-19' 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/torvalds/linux.git origin/master +Updating 3ac88fa4605e..925cf0457d7e +Fast-forward (no commit created; -m option ignored) + .../admin-guide/hw-vuln/cross-thread-rsb.rst | 3 +- + MAINTAINERS | 2 +- + arch/arm64/kernel/perf_event.c | 15 +++++----- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 4 +-- + arch/x86/events/core.c | 12 ++++---- + arch/x86/kvm/pmu.h | 26 ++++++++++++----- + arch/x86/kvm/x86.c | 3 +- + arch/x86/mm/pat/memtype.c | 3 +- + drivers/ata/ahci.c | 1 + + drivers/ata/libata-core.c | 3 ++ + drivers/ata/pata_octeon_cf.c | 16 +++++------ + drivers/gpio/gpio-sim.c | 2 +- + drivers/gpu/drm/Kconfig | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++ + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++- + drivers/gpu/drm/ast/ast_mode.c | 4 +-- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 14 ++++----- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 18 ++++++------ + drivers/gpu/drm/vc4/vc4_plane.c | 6 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 12 +++++--- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 8 +++--- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 10 ++++--- + drivers/mmc/core/sdio_bus.c | 17 +++++++++-- + drivers/mmc/core/sdio_cis.c | 12 -------- + drivers/mmc/host/jz4740_mmc.c | 10 +++++++ + drivers/mmc/host/meson-gx-mmc.c | 23 ++++++++------- + drivers/mmc/host/mmc_spi.c | 8 +++--- + drivers/nvme/host/pci.c | 8 ++++++ + drivers/perf/arm_pmu.c | 8 +----- + drivers/video/fbdev/core/fb_defio.c | 10 ++++++- + drivers/video/fbdev/core/fbmem.c | 4 +++ + fs/nfs/Kconfig | 8 +++--- + fs/nilfs2/ioctl.c | 7 +++++ + fs/nilfs2/super.c | 9 ++++++ + fs/nilfs2/the_nilfs.c | 8 +++++- + include/linux/fb.h | 1 + + include/linux/hugetlb.h | 5 +++- + include/linux/pci.h | 12 ++++++++ + include/linux/perf/arm_pmu.h | 1 - + kernel/sched/core.c | 5 +++- + kernel/sched/psi.c | 7 +++-- + kernel/time/alarmtimer.c | 33 +++++++++++++++++++--- + kernel/umh.c | 20 ++++++++----- + mm/filemap.c | 5 ++-- + mm/huge_memory.c | 6 ++-- + mm/khugepaged.c | 1 + + mm/migrate.c | 2 ++ + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_realtek.c | 9 +++++- + sound/soc/sof/intel/hda-dai.c | 8 +++--- + sound/soc/sof/ops.h | 2 +- + 58 files changed, 294 insertions(+), 144 deletions(-) +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ 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 (9aa923d2b994 mailmap: map Georgi Djakov's old Linaro address to his current one) + 341c123a625d ("hugetlb: check for undefined shift on 32 bit architectures") + 52331c6bd496 ("mm/page_alloc.c: fix page corruption caused by racy check in __free_pages") + 6282dd51ab8d ("nilfs2: fix underflow in second superblock position calculations") + 648c684aeecd ("mm/migrate: fix wrongly apply write bit after mkdirty on sparc64") +$ 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 .mailmap +Merge made by the 'ort' strategy. + .mailmap | 1 + + 1 file changed, 1 insertion(+) +Merging kbuild-current/fixes (22e46f6480e8 kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI) +$ 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 (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) +$ 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 (853e2dac25c1 arm64: perf: reject CHAIN events at creation time) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (afeff81765c6 Merge tag 'davinci-fixes-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-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 (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()) +$ 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 (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (4302abc628fc powerpc/64s: Prevent fallthrough to hash TLB flush when using radix) +$ 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 (7ab41c2c08a3 s390/decompressor: specify __decompress() buf len to avoid overflow) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo) +$ 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 (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork) +$ 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/master (ec35307e18ba Merge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Already up to date. +Merging bpf/master (ec35307e18ba Merge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (8222d5910dae xfrm: Zero padding when dumping algos and encap) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_user.c | 45 +++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 41 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/master (92f3e96d642f netfilter: nf_tables: allow to fetch set elements when table has an owner) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Merge made by the 'ort' strategy. + net/netfilter/nf_tables_api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless/for-next (80f8a66dede0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (ceaa837f96ad Linux 6.2-rc8) +$ 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 (e97fc9cffbb9 Merge tag 'asoc-fix-v6.2-rc8-2' 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 +Already up to date. +Merging sound-asoc-fixes/for-linus (1f810d2b6b2f ASoC: SOF: Intel: hda-dai: fix possible stream_tag leak) +$ 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 +Already up to date. +Merging regmap-fixes/for-linus (697c3892d825 regmap: apply reg_base and reg_downshift for single register ops) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging regulator-fixes/for-linus (4bb3d82a1820 regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios) +$ 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 (574fbb95cd9d spi: intel: Check number of chip selects after reading the descriptor) +$ 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-intel.c | 8 ++++---- + drivers/spi/spidev.c | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging pci-current/for-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (2241ab53cbb5 Linux 6.2-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 (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (03fada47311a iio: accel: kionix-kx022a: Get the timestamp from the driver's private data in the trigger_handler) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/adc/ad7791.c | 2 +- + drivers/iio/adc/ltc2497.c | 6 ++---- + drivers/iio/adc/qcom-spmi-adc5.c | 10 +++++++++- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/industrialio-buffer.c | 21 ++++++++++++--------- + drivers/iio/light/vcnl4000.c | 3 ++- + 7 files changed, 28 insertions(+), 17 deletions(-) +Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-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 (4ec5183ec486 Linux 6.2-rc7) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ 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 (9c445d2637c9 Input: i8042 - add Clevo PCX0DX to i8042 quirk table) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possible crash with CFI enabled) +$ 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 (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock) +$ 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 (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile) +$ 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 (0254127ab977 module: Don't wait for GOING modules) +$ 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 (2241ab53cbb5 Linux 6.2-rc5) +$ 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 (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus) +$ 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 (89c08aef8f8d media: videobuf2: set q->streaming later) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60) +$ 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 (2c10b61421a2 kvm: initialize all of the kvm_debugregs structure before sending it to userspace) +$ 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 (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ 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 (e2de0e6abd91 hwmon: (asus-ec-sensors) add missing mutex path) +$ 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. + Documentation/hwmon/ftsteutates.rst | 4 ++++ + drivers/hwmon/asus-ec-sensors.c | 1 + + drivers/hwmon/ftsteutates.c | 19 +++++++++++++------ + drivers/hwmon/nct6775-core.c | 2 +- + drivers/hwmon/peci/cputemp.c | 2 +- + 5 files changed, 20 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (711442e29f16 cxl/region: Fix passthrough-decoder detection) +$ 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 (000f66519f1a Merge branch 'misc-6.2' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (9c7417b5ec44 coredump: Move dump_emit_page() to kill unused warning) +$ 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 (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ 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 (eb4b55f2f26f platform/x86/intel/vsec: Add support for Meteor Lake) +$ 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 (a3583e92d188 ARM: dts: exynos: correct TMU phandle in Odroid XU3 family) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/exynos4-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 1 - + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 - + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 10 +++++----- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 10 +++++----- + 6 files changed, 12 insertions(+), 14 deletions(-) +Merging pinctrl-samsung-fixes/fixes (1b929c02afd3 Linux 6.2-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 (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (15600159bcc6 scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT") +$ 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 (f7597e3c58ee Merge tag 'drm-intel-fixes-2023-02-16' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (d5a1224aa68c drm/i915/gen11: Wa_1408615072/Wa_1407596294 should be on GT list) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (3f18c5046e63 mmc: jz4740: Work around bug on JZ4760(B)) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (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 (950b879b7f02 riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte) +$ 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 (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory) +$ 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 (730892135b7d 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (5dc4c995db9e Linux 6.2-rc4) +$ 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 (79eeab1d85e0 gpio: sim: fix a memory leak) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (a69982c37cd0 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NH5xAx) +$ 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 (ceaa837f96ad Linux 6.2-rc8) +$ 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 (e02ac3e7329f erofs: clean up parsing of fscache related options) +$ 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 (254c71374a70 kunit: fix kunit_test_init_section_suites(...)) +$ 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 (4102db175b5d nfsd: don't destroy global nfs4_file table in per-net shutdown) +$ 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 (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ 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 (f883675bf652 Merge tag 'gpio-fixes-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/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 (190233164cd7 arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines) +$ 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 (7f18d6eececb lib: zstd: Backport fix for in-place decompression) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + lib/zstd/decompress/huf_decompress.c | 2 +- + lib/zstd/decompress/zstd_decompress.c | 25 ++++++++++++++++++++++--- + 2 files changed, 23 insertions(+), 4 deletions(-) +Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/axp288_fuel_gauge.c | 2 ++ + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/rk817_charger.c | 4 ---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ 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 (88603b6dc419 Linux 6.2-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 (2a02b7a19794 rust: kernel: Mark rust_fmt_argument as extern "C") +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + rust/kernel/print.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging drm-misc-fixes/for-linux-next-fixes (7245e629dcaa drm/cirrus: NULL-check pipe->plane.state->fb in cirrus_pipe_update()) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/tiny/cirrus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (bf3a52637d30 kbuild: deb-pkg: improve the usability of source package) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Merge made by the 'ort' strategy. + .gitignore | 4 +- + Documentation/Makefile | 2 +- + Documentation/dontdiff | 1 - + Documentation/kbuild/llvm.rst | 15 +- + Documentation/kbuild/makefiles.rst | 2148 +++++++++++++-------------- + MAINTAINERS | 2 +- + Makefile | 93 +- + arch/arm/mach-s3c/Makefile | 4 +- + arch/ia64/kernel/Makefile | 2 +- + arch/mips/Kbuild | 2 +- + arch/mips/Makefile | 13 +- + arch/mips/Makefile.postlink | 2 +- + arch/mips/include/asm/asmmacro-32.h | 4 +- + arch/mips/include/asm/asmmacro.h | 42 +- + arch/mips/include/asm/fpregdef.h | 14 - + arch/mips/include/asm/mipsregs.h | 20 +- + arch/mips/kernel/genex.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 4 +- + arch/mips/kernel/r4k_fpu.S | 12 +- + arch/mips/kvm/fpu.S | 6 +- + arch/mips/loongson2ef/Platform | 2 +- + arch/powerpc/Makefile | 2 +- + arch/powerpc/Makefile.postlink | 2 +- + arch/powerpc/kernel/prom_init_check.sh | 9 +- + arch/powerpc/kernel/vdso/Makefile | 27 +- + arch/s390/kernel/vdso64/Makefile | 4 +- + arch/s390/purgatory/Makefile | 2 +- + arch/sh/boot/compressed/Makefile | 7 - + arch/um/drivers/Makefile | 2 +- + arch/um/kernel/Makefile | 2 +- + arch/um/kernel/skas/Makefile | 2 +- + arch/um/os-Linux/Makefile | 2 +- + arch/um/os-Linux/drivers/Makefile | 2 +- + arch/um/os-Linux/skas/Makefile | 2 +- + arch/x86/Makefile.um | 2 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/tools/Makefile | 2 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/os-Linux/Makefile | 2 +- + certs/extract-cert.c | 9 +- + drivers/Makefile | 5 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +- + fs/hostfs/Makefile | 2 +- + init/Kconfig | 4 - + kernel/gen_kheaders.sh | 2 +- + rust/.gitignore | 1 - + rust/Makefile | 27 +- + scripts/.gitignore | 3 +- + scripts/Kbuild.include | 50 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile | 11 +- + scripts/Makefile.build | 26 +- + scripts/Makefile.clang | 2 + + scripts/Makefile.compiler | 8 +- + scripts/Makefile.host | 24 +- + scripts/Makefile.lib | 45 +- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.modpost | 8 +- + scripts/Makefile.package | 241 +-- + scripts/as-version.sh | 2 +- + scripts/asn1_compiler.c | 4 +- + scripts/basic/fixdep.c | 238 ++- + scripts/bin2c.c | 36 - + scripts/checkkconfigsymbols.py | 13 +- + scripts/clang-tools/gen_compile_commands.py | 2 +- + scripts/clang-tools/run-clang-tools.py | 21 +- + scripts/diffconfig | 16 +- + scripts/kernel-doc | 4 +- + scripts/list-gitignored.c | 1057 +++++++++++++ + scripts/misc-check | 19 + + scripts/package/builddeb | 8 +- + scripts/package/buildtar | 52 +- + scripts/package/deb-build-option | 16 + + scripts/package/mkdebian | 40 +- + scripts/package/mkspec | 16 +- + scripts/remove-stale-files | 30 +- + scripts/setlocalversion | 132 +- + scripts/tags.sh | 2 +- + 78 files changed, 2876 insertions(+), 1776 deletions(-) + delete mode 100644 scripts/bin2c.c + create mode 100644 scripts/list-gitignored.c + create mode 100755 scripts/misc-check + create mode 100755 scripts/package/deb-build-option +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/core (f9fa0778ee73 perf tests stat_all_metrics: Change true workload to sleep workload for system wide check) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + tools/arch/x86/include/uapi/asm/unistd_32.h | 23 +- + tools/arch/x86/include/uapi/asm/unistd_64.h | 23 +- + tools/build/Makefile.build | 1 + + tools/perf/.gitignore | 1 + + tools/perf/Documentation/itrace.txt | 3 +- + tools/perf/Documentation/perf-bench.txt | 2 +- + tools/perf/Documentation/perf-c2c.txt | 16 +- + tools/perf/Documentation/perf-intel-pt.txt | 66 ++- + tools/perf/Documentation/perf-list.txt | 2 +- + tools/perf/Documentation/perf-lock.txt | 11 + + tools/perf/Documentation/perf-mem.txt | 7 +- + tools/perf/Documentation/perf-probe.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 4 +- + tools/perf/Documentation/perf-script-perl.txt | 2 +- + tools/perf/Documentation/perf-script-python.txt | 4 +- + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Documentation/perf-test.txt | 3 + + tools/perf/Documentation/perf-top.txt | 2 +- + tools/perf/Makefile.config | 4 - + tools/perf/Makefile.perf | 1 + + tools/perf/arch/arm/util/auxtrace.c | 5 +- + tools/perf/arch/arm/util/cs-etm.c | 103 +++- + tools/perf/arch/arm64/util/pmu.c | 44 +- + tools/perf/arch/powerpc/util/header.c | 4 +- + tools/perf/arch/x86/tests/sample-parsing.c | 5 +- + tools/perf/arch/x86/util/event.c | 21 + + tools/perf/arch/x86/util/pmu.c | 12 +- + tools/perf/bench/bench.h | 2 + + tools/perf/bench/syscall.c | 76 ++- + tools/perf/builtin-bench.c | 4 +- + tools/perf/builtin-c2c.c | 21 +- + tools/perf/builtin-inject.c | 6 +- + tools/perf/builtin-list.c | 20 +- + tools/perf/builtin-lock.c | 147 +++++- + tools/perf/builtin-probe.c | 9 + + tools/perf/builtin-record.c | 16 +- + tools/perf/builtin-script.c | 40 +- + tools/perf/builtin-stat.c | 1 - + tools/perf/builtin-trace.c | 4 +- + tools/perf/perf-completion.sh | 11 +- + tools/perf/pmu-events/Build | 16 +- + .../arch/arm64/arm/neoverse-n2-v2/metrics.json | 273 +++++++++++ + tools/perf/pmu-events/arch/arm64/sbsa.json | 30 ++ + .../pmu-events/arch/powerpc/power10/metrics.json | 8 +- + .../pmu-events/arch/powerpc/power10/others.json | 2 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 108 ++++- + tools/perf/pmu-events/jevents.py | 359 +++++++++++--- + tools/perf/pmu-events/metric.py | 79 ++- + tools/perf/pmu-events/metric_test.py | 15 +- + tools/perf/pmu-events/pmu-events.h | 26 +- + tools/perf/scripts/python/flamegraph.py | 107 ++++- + tools/perf/tests/Build | 1 + + tools/perf/tests/bpf-script-example.c | 2 +- + tools/perf/tests/bpf.c | 28 +- + tools/perf/tests/builtin-test.c | 3 + + tools/perf/tests/dwarf-unwind.c | 5 +- + tools/perf/tests/expand-cgroup.c | 4 +- + tools/perf/tests/parse-metric.c | 4 +- + tools/perf/tests/pmu-events.c | 69 +-- + tools/perf/tests/sample-parsing.c | 2 +- + tools/perf/tests/shell/buildid.sh | 18 +- + tools/perf/tests/shell/lib/coresight.sh | 18 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 8 + + tools/perf/tests/shell/lock_contention.sh | 66 ++- + .../tests/shell/record+probe_libc_inet_pton.sh | 11 + + .../tests/shell/record+script_probe_vfs_getname.sh | 3 + + tools/perf/tests/shell/stat_all_metrics.sh | 2 +- + tools/perf/tests/shell/test_brstack.sh | 18 +- + tools/perf/tests/shell/test_intel_pt.sh | 17 + + tools/perf/tests/symbols.c | 150 ++++++ + tools/perf/tests/tests.h | 3 + + tools/perf/tests/workloads/thloop.c | 2 +- + tools/perf/util/Build | 5 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 6 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 4 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 1 + + tools/perf/util/auxtrace.c | 12 +- + tools/perf/util/auxtrace.h | 7 +- + tools/perf/util/bpf_lock_contention.c | 183 ++++--- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 104 +++- + tools/perf/util/bpf_skel/lock_data.h | 4 +- + tools/perf/util/branch.c | 15 + + tools/perf/util/branch.h | 2 + + tools/perf/util/cacheline.h | 25 +- + tools/perf/util/cgroup.c | 1 - + tools/perf/util/cputopo.c | 9 +- + tools/perf/util/cs-etm-base.c | 34 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 71 ++- + tools/perf/util/cs-etm.c | 95 +++- + tools/perf/util/cs-etm.h | 16 +- + tools/perf/util/data-convert-bt.c | 4 +- + tools/perf/util/debug.c | 15 + + tools/perf/util/evsel.c | 21 +- + tools/perf/util/evsel.h | 2 - + tools/perf/util/evswitch.h | 4 +- + tools/perf/util/expr.c | 5 + + tools/perf/util/expr.h | 1 + + tools/perf/util/expr.l | 8 +- + tools/perf/util/intel-pt.c | 73 ++- + tools/perf/util/llvm-utils.c | 25 +- + tools/perf/util/lock-contention.h | 7 + + tools/perf/util/metricgroup.c | 207 ++++---- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/parse-events.c | 2 - + tools/perf/util/pfm.c | 6 +- + tools/perf/util/pmu-hybrid.c | 27 +- + tools/perf/util/pmu.c | 227 ++++----- + tools/perf/util/pmu.h | 21 +- + tools/perf/util/print-events.c | 32 +- + tools/perf/util/print-events.h | 3 +- + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/python.c | 19 +- + tools/perf/util/sample.h | 5 +- + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/session.c | 14 +- + tools/perf/util/sort.c | 20 +- + tools/perf/util/sort.h | 3 + + tools/perf/util/stat-display.c | 51 +- + tools/perf/util/stat-shadow.c | 114 +---- + tools/perf/util/stat.h | 1 - + tools/perf/util/symbol-elf.c | 527 +++++++++++++++++---- + tools/perf/util/symbol.c | 26 +- + tools/perf/util/symbol.h | 3 + + tools/perf/util/symsrc.h | 1 + + tools/perf/util/synthetic-events.c | 4 +- + tools/perf/util/trace-event.h | 19 + + 129 files changed, 3210 insertions(+), 1092 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/sbsa.json + mode change 100644 => 100755 tools/perf/pmu-events/metric_test.py + create mode 100644 tools/perf/tests/symbols.c +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (5e7b9a6ae8c3 swiotlb: remove swiotlb_max_segment) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + include/linux/swiotlb.h | 5 ----- + kernel/dma/swiotlb.c | 8 -------- + 2 files changed, 13 deletions(-) +Merging asm-generic/master (a13408c20526 char/agp: introduce asm-generic/agp.h) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/agp.h | 19 ------------------- + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/agp.h | 27 --------------------------- + arch/parisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/agp.h | 21 --------------------- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/agp.h | 19 ------------------- + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/agp.h | 17 ----------------- + arch/x86/include/asm/agp.h | 6 ------ + drivers/char/agp/agp.h | 6 ++++++ + include/asm-generic/agp.h | 11 +++++++++++ + include/asm-generic/cmpxchg-local.h | 6 +++--- + 14 files changed, 25 insertions(+), 112 deletions(-) + delete mode 100644 arch/alpha/include/asm/agp.h + delete mode 100644 arch/ia64/include/asm/agp.h + delete mode 100644 arch/parisc/include/asm/agp.h + delete mode 100644 arch/powerpc/include/asm/agp.h + delete mode 100644 arch/sparc/include/asm/agp.h + create mode 100644 include/asm-generic/agp.h +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 (ba07b4efc989 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. + arch/arm/Kconfig | 32 ++- + arch/arm/Kconfig.debug | 4 +- + arch/arm/Makefile | 1 - + arch/arm/crypto/Kconfig | 2 + + arch/arm/crypto/ghash-ce-core.S | 382 +++++++++++++++++++++++++++++++++-- + arch/arm/crypto/ghash-ce-glue.c | 423 ++++++++++++++++++++++++++++++++++++++- + arch/arm/include/asm/assembler.h | 19 +- + arch/arm/include/asm/simd.h | 8 + + arch/arm/kernel/asm-offsets.c | 1 + + arch/arm/mach-rda/Makefile | 2 - + arch/arm/mm/Kconfig | 2 +- + arch/arm/vfp/entry.S | 4 +- + arch/arm/vfp/vfphw.S | 4 +- + arch/arm/vfp/vfpmodule.c | 19 +- + 14 files changed, 855 insertions(+), 48 deletions(-) + create mode 100644 arch/arm/include/asm/simd.h + delete mode 100644 arch/arm/mach-rda/Makefile +Merging arm64/for-next/core (ad4a4d3aff21 Merge branch 'for-next/signal' 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 arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/efi.h +Auto-merging arch/arm64/include/asm/esr.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/tools/cpucaps +Auto-merging drivers/firmware/efi/libstub/arm64.c +Auto-merging drivers/perf/arm-cmn.c +Auto-merging include/linux/compiler_attributes.h +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/ftrace.c +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b36284a5b37] Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/booting.rst | 12 +- + Documentation/arm64/elf_hwcaps.rst | 20 +- + Documentation/arm64/sme.rst | 55 +- + Documentation/arm64/sve.rst | 4 +- + arch/arm/include/asm/arch_gicv3.h | 5 + + arch/arm64/Kconfig | 25 +- + arch/arm64/Kconfig.platforms | 2 +- + arch/arm64/Makefile | 70 ++- + arch/arm64/include/asm/arch_gicv3.h | 5 + + arch/arm64/include/asm/barrier.h | 11 +- + arch/arm64/include/asm/cpufeature.h | 14 +- + arch/arm64/include/asm/efi.h | 2 + + arch/arm64/include/asm/el2_setup.h | 8 +- + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/fpsimd.h | 30 +- + arch/arm64/include/asm/fpsimdmacros.h | 22 + + arch/arm64/include/asm/ftrace.h | 15 +- + arch/arm64/include/asm/hwcap.h | 14 + + arch/arm64/include/asm/insn.h | 1 + + arch/arm64/include/asm/irqflags.h | 191 ++++--- + arch/arm64/include/asm/linkage.h | 4 +- + arch/arm64/include/asm/patching.h | 2 + + arch/arm64/include/asm/pgtable.h | 8 +- + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/ptrace.h | 2 +- + arch/arm64/include/asm/scs.h | 7 +- + arch/arm64/include/asm/sysreg.h | 106 +--- + arch/arm64/include/uapi/asm/hwcap.h | 6 + + arch/arm64/include/uapi/asm/sigcontext.h | 27 + + arch/arm64/kernel/asm-offsets.c | 4 + + arch/arm64/kernel/cpufeature.c | 293 ++++++----- + arch/arm64/kernel/cpuinfo.c | 14 + + arch/arm64/kernel/entry-fpsimd.S | 30 +- + arch/arm64/kernel/entry-ftrace.S | 32 +- + arch/arm64/kernel/entry.S | 41 +- + arch/arm64/kernel/fpsimd.c | 52 +- + arch/arm64/kernel/ftrace.c | 158 +++++- + arch/arm64/kernel/head.S | 112 ++++- + arch/arm64/kernel/hyp-stub.S | 7 + + arch/arm64/kernel/idreg-override.c | 1 + + arch/arm64/kernel/image-vars.h | 7 +- + arch/arm64/kernel/patch-scs.c | 11 +- + arch/arm64/kernel/patching.c | 17 + + arch/arm64/kernel/probes/kprobes.c | 4 - + arch/arm64/kernel/process.c | 21 +- + arch/arm64/kernel/ptrace.c | 64 ++- + arch/arm64/kernel/setup.c | 17 +- + arch/arm64/kernel/signal.c | 259 ++++++++-- + arch/arm64/kernel/sleep.S | 6 +- + arch/arm64/kernel/syscall.c | 8 +- + arch/arm64/kernel/traps.c | 6 +- + arch/arm64/kernel/vmlinux.lds.S | 8 +- + arch/arm64/kvm/debug.c | 2 +- + arch/arm64/kvm/fpsimd.c | 2 +- + arch/arm64/kvm/hyp/entry.S | 2 +- + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 2 +- + arch/arm64/mm/cache.S | 1 + + arch/arm64/mm/mmu.c | 8 +- + arch/arm64/mm/proc.S | 2 - + arch/arm64/tools/cpucaps | 6 +- + arch/arm64/tools/gen-sysreg.awk | 29 ++ + arch/arm64/tools/sysreg | 560 ++++++++++++++------- + drivers/acpi/acpica/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile | 4 +- + drivers/firmware/efi/libstub/arm64-entry.S | 67 --- + drivers/firmware/efi/libstub/arm64-stub.c | 26 +- + drivers/firmware/efi/libstub/arm64.c | 41 +- + drivers/irqchip/irq-gic-v3.c | 19 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/perf/arm-cmn.c | 1 + + drivers/perf/arm_spe_pmu.c | 160 +++--- + drivers/perf/fsl_imx8_ddr_perf.c | 3 - + drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 16 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 9 +- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 4 +- + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 2 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 10 + + drivers/perf/marvell_cn10k_tad_pmu.c | 22 +- + include/linux/compiler_attributes.h | 6 - + include/linux/compiler_types.h | 27 + + include/linux/ftrace.h | 18 +- + include/uapi/linux/elf.h | 1 + + include/uapi/linux/perf_event.h | 3 + + kernel/exit.c | 9 +- + kernel/trace/Kconfig | 7 + + kernel/trace/ftrace.c | 109 +++- + tools/testing/selftests/arm64/abi/hwcap.c | 115 +++++ + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 57 ++- + tools/testing/selftests/arm64/abi/syscall-abi.c | 179 ++++--- + tools/testing/selftests/arm64/bti/test.c | 25 +- + tools/testing/selftests/arm64/fp/.gitignore | 2 + + tools/testing/selftests/arm64/fp/Makefile | 5 + + tools/testing/selftests/arm64/fp/assembler.h | 2 +- + tools/testing/selftests/arm64/fp/fp-pidbench.S | 1 - + tools/testing/selftests/arm64/fp/fp-stress.c | 34 +- + tools/testing/selftests/arm64/fp/fpsimd-test.S | 1 - + tools/testing/selftests/arm64/fp/sme-inst.h | 20 + + tools/testing/selftests/arm64/fp/sve-ptrace.c | 14 +- + tools/testing/selftests/arm64/fp/sve-test.S | 1 - + tools/testing/selftests/arm64/fp/za-ptrace.c | 14 +- + tools/testing/selftests/arm64/fp/za-test.S | 1 - + tools/testing/selftests/arm64/fp/zt-ptrace.c | 365 ++++++++++++++ + tools/testing/selftests/arm64/fp/zt-test.S | 316 ++++++++++++ + tools/testing/selftests/arm64/mte/Makefile | 21 +- + tools/testing/selftests/arm64/signal/.gitignore | 2 + + tools/testing/selftests/arm64/signal/Makefile | 8 +- + .../testing/selftests/arm64/signal/test_signals.c | 4 +- + .../testing/selftests/arm64/signal/test_signals.h | 2 + + .../selftests/arm64/signal/test_signals_utils.c | 9 +- + .../selftests/arm64/signal/testcases/ssve_regs.c | 16 +- + .../arm64/signal/testcases/ssve_za_regs.c | 161 ++++++ + .../selftests/arm64/signal/testcases/testcases.c | 40 ++ + .../selftests/arm64/signal/testcases/testcases.h | 1 + + .../arm64/signal/testcases/tpidr2_siginfo.c | 90 ++++ + .../selftests/arm64/signal/testcases/za_regs.c | 4 + + .../selftests/arm64/signal/testcases/zt_no_regs.c | 51 ++ + .../selftests/arm64/signal/testcases/zt_regs.c | 85 ++++ + 121 files changed, 3629 insertions(+), 1050 deletions(-) + delete mode 100644 drivers/firmware/efi/libstub/arm64-entry.S + create mode 100644 tools/testing/selftests/arm64/fp/zt-ptrace.c + create mode 100644 tools/testing/selftests/arm64/fp/zt-test.S + create mode 100644 tools/testing/selftests/arm64/signal/testcases/ssve_za_regs.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/tpidr2_siginfo.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/zt_no_regs.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/zt_regs.c +Merging arm-perf/for-next/perf (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (1eebd1aaa62b 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/Kconfig +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/boot/dts/exynos4210.dtsi +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging arch/arm/boot/dts/exynos5410-odroidxu.dts +Auto-merging arch/arm/mach-s3c/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Makefile +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging drivers/gpio/Kconfig +Resolved 'arch/arm/mach-s3c/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 58de603ad658] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-driver-dcc | 127 + + Documentation/ABI/testing/debugfs-scmi | 70 + + Documentation/ABI/testing/debugfs-scmi-raw | 117 + + Documentation/admin-guide/media/davinci-vpbe.rst | 65 - + .../admin-guide/media/platform-cardlist.rst | 1 - + Documentation/admin-guide/media/v4l-drivers.rst | 1 - + Documentation/arm/index.rst | 1 - + Documentation/arm/samsung-s3c24xx/cpufreq.rst | 77 - + Documentation/arm/samsung-s3c24xx/eb2410itx.rst | 59 - + Documentation/arm/samsung-s3c24xx/gpio.rst | 172 - + Documentation/arm/samsung-s3c24xx/h1940.rst | 41 - + Documentation/arm/samsung-s3c24xx/index.rst | 20 - + Documentation/arm/samsung-s3c24xx/nand.rst | 30 - + Documentation/arm/samsung-s3c24xx/overview.rst | 311 -- + Documentation/arm/samsung-s3c24xx/s3c2412.rst | 121 - + Documentation/arm/samsung-s3c24xx/s3c2413.rst | 22 - + Documentation/arm/samsung-s3c24xx/smdk2440.rst | 57 - + Documentation/arm/samsung-s3c24xx/suspend.rst | 137 - + Documentation/arm/samsung-s3c24xx/usb-host.rst | 91 - + Documentation/arm/samsung/gpio.rst | 8 - + Documentation/arm/samsung/overview.rst | 13 - + Documentation/devicetree/bindings/arm/altera.yaml | 1 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + .../devicetree/bindings/arm/atmel-at91.yaml | 6 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 96 +- + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + + Documentation/devicetree/bindings/arm/qcom.yaml | 79 + + .../devicetree/bindings/arm/rockchip.yaml | 61 + + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 15 + + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 4 +- + .../bindings/clock/qcom,qdu1000-gcc.yaml | 51 + + .../bindings/clock/qcom,sm6350-camcc.yaml | 49 + + .../bindings/clock/qcom,sm8550-dispcc.yaml | 105 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 55 + + .../bindings/clock/samsung,s3c2410-clock.txt | 49 - + .../bindings/clock/samsung,s3c2412-clock.txt | 49 - + .../bindings/clock/samsung,s3c2443-clock.txt | 55 - + .../display/tegra/nvidia,tegra186-display.yaml | 4 +- + .../bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 + + .../bindings/firmware/meson/meson_sm.txt | 15 - + .../devicetree/bindings/firmware/qcom,scm.yaml | 68 +- + .../bindings/input/mediatek,pmic-keys.yaml | 1 + + .../bindings/interconnect/qcom,qdu1000-rpmh.yaml | 70 + + .../bindings/interconnect/qcom,sm8550-rpmh.yaml | 139 + + .../interrupt-controller/samsung,s3c24xx-irq.txt | 53 - + .../devicetree/bindings/leds/leds-mt6323.txt | 2 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 111 + + Documentation/devicetree/bindings/mfd/mt6397.txt | 2 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 -- + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 - + .../devicetree/bindings/mmc/samsung,s3cmci.txt | 42 - + ...p-inno-usb2.yaml => rockchip,inno-usb2phy.yaml} | 2 +- + .../bindings/phy/rockchip,rk3288-dp-phy.yaml | 41 + + .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 - + .../bindings/phy/samsung,dp-video-phy.yaml | 5 +- + .../bindings/phy/samsung,mipi-video-phy.yaml | 11 +- + .../bindings/power/allwinner,sun20i-d1-ppu.yaml | 54 + + .../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +- + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 19 +- + .../bindings/power/mediatek,power-controller.yaml | 2 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +- + .../bindings/power/starfive,jh7110-pmu.yaml | 45 + + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- + .../devicetree/bindings/riscv/microchip.yaml | 1 + + .../devicetree/bindings/riscv/sifive,ccache0.yaml | 9 +- + .../devicetree/bindings/riscv/starfive.yaml | 6 + + Documentation/devicetree/bindings/riscv/sunxi.yaml | 69 + + .../bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 57 + + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 4 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 147 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 75 - + .../devicetree/bindings/soc/qcom/qcom,dcc.yaml | 44 + + .../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 95 + + .../devicetree/bindings/soc/qcom/qcom,rpm.yaml | 101 + + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 3 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + .../bindings/soc/renesas/renesas,rzv2m-pwc.yaml | 56 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 12 +- + .../bindings/soc/samsung/exynos-pmu.yaml | 71 +- + .../soc/samsung/samsung,exynos-sysreg.yaml | 87 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-ope.yaml | 4 +- + .../devicetree/bindings/vendor-prefixes.yaml | 20 + + .../media/drivers/davinci-vpbe-devel.rst | 39 - + Documentation/driver-api/media/drivers/index.rst | 1 - + Documentation/power/power_supply_class.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 222 +- + arch/arm/Kconfig | 26 +- + arch/arm/Kconfig.debug | 129 +- + arch/arm/Makefile | 10 +- + arch/arm/arm-soc-for-next-contents.txt | 313 ++ + arch/arm/boot/compressed/head-sa1100.S | 4 - + arch/arm/boot/compressed/misc-ep93xx.h | 13 +- + arch/arm/boot/dts/Makefile | 13 +- + arch/arm/boot/dts/alpine.dtsi | 4 +- + arch/arm/boot/dts/am335x-nano.dts | 32 +- + arch/arm/boot/dts/am3874-iceboard.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 25 +- + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 +- + .../boot/dts/aspeed-bmc-facebook-greatlakes.dts | 241 + + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-tyan-s8036.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-ufispace-ncplite.dts | 360 ++ + arch/arm/boot/dts/at91-gatwick.dts | 12 +- + arch/arm/boot/dts/at91-sam9x60_curiosity.dts | 503 ++ + arch/arm/boot/dts/at91-sam9x60ek.dts | 50 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 6 +- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 6 +- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 6 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 4 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 6 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 6 +- + arch/arm/boot/dts/at91-tse850-3.dts | 16 +- + arch/arm/boot/dts/axm55xx.dtsi | 8 +- + arch/arm/boot/dts/bcm11351.dtsi | 8 +- + arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 6 +- + arch/arm/boot/dts/bcm28155-ap.dts | 2 +- + arch/arm/boot/dts/berlin2q.dtsi | 4 +- + arch/arm/boot/dts/cx92755.dtsi | 6 +- + arch/arm/boot/dts/dm814x.dtsi | 6 +- + arch/arm/boot/dts/dm816x.dtsi | 6 +- + arch/arm/boot/dts/dove-cm-a510.dtsi | 16 +- + arch/arm/boot/dts/dove-cubox.dts | 17 +- + arch/arm/boot/dts/dove-d2plug.dts | 6 +- + arch/arm/boot/dts/dove-d3plug.dts | 6 +- + arch/arm/boot/dts/dove.dtsi | 5 - + arch/arm/boot/dts/e70k02.dtsi | 11 +- + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 5 +- + arch/arm/boot/dts/exynos3250.dtsi | 386 +- + arch/arm/boot/dts/exynos4.dtsi | 66 +- + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 326 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 19 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroidx2.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 7 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 8 + + arch/arm/boot/dts/exynos4412.dtsi | 381 +- + arch/arm/boot/dts/exynos5.dtsi | 22 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 35 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 84 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 +- + arch/arm/boot/dts/exynos5260.dtsi | 36 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 3 +- + arch/arm/boot/dts/exynos5410.dtsi | 2 +- + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 1 - + arch/arm/boot/dts/exynos5420.dtsi | 299 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 34 +- + arch/arm/boot/dts/exynos5422-samsung-k3g.dts | 674 +++ + arch/arm/boot/dts/exynos54xx.dtsi | 16 +- + arch/arm/boot/dts/exynos5800.dtsi | 4 + + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 19 + + arch/arm/boot/dts/gemini-wbd111.dts | 31 +- + arch/arm/boot/dts/gemini-wbd222.dts | 31 +- + arch/arm/boot/dts/gemini.dtsi | 8 +- + arch/arm/boot/dts/imx23.dtsi | 2 - + arch/arm/boot/dts/imx28.dtsi | 8 - + arch/arm/boot/dts/imx50-kobo-aura.dts | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53-cx9020.dts | 10 +- + arch/arm/boot/dts/imx53-m53evk.dts | 4 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 6 +- + arch/arm/boot/dts/imx53-sk-imx53.dts | 357 ++ + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 3 + + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 2 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 6 +- + arch/arm/boot/dts/imx6q-h100.dts | 6 +- + arch/arm/boot/dts/imx6q-kp.dtsi | 4 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 4 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl-tolino-vision5.dts | 7 + + arch/arm/boot/dts/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 7 + + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 4 +- + arch/arm/boot/dts/imx6sx.dtsi | 1 - + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 4 +- + arch/arm/boot/dts/imx6ull-dhcom-drc02.dts | 99 + + arch/arm/boot/dts/imx6ull-dhcom-pdk2.dts | 222 + + arch/arm/boot/dts/imx6ull-dhcom-picoitx.dts | 101 + + .../arm/boot/dts/imx6ull-dhcom-som-cfg-sdcard.dtsi | 97 + + arch/arm/boot/dts/imx6ull-dhcom-som.dtsi | 633 +++ + arch/arm/boot/dts/imx6ull-dhcor-som.dtsi | 255 ++ + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-colibri-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris.dts | 1 + + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 3 +- + arch/arm/boot/dts/imxrt1050.dtsi | 2 +- + arch/arm/boot/dts/integrator.dtsi | 4 +- + arch/arm/boot/dts/integratorap-im-pd1.dts | 4 +- + arch/arm/boot/dts/integratorap.dts | 4 +- + arch/arm/boot/dts/integratorcp.dts | 4 +- + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 18 + + arch/arm/boot/dts/keystone-k2hk-evm.dts | 8 +- + arch/arm/boot/dts/ls1021a.dtsi | 4 + + arch/arm/boot/dts/mba6ulx.dtsi | 2 +- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +- + arch/arm/boot/dts/meson8.dtsi | 5 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 5 +- + arch/arm/boot/dts/moxart.dtsi | 2 +- + arch/arm/boot/dts/mstar-v7.dtsi | 2 +- + arch/arm/boot/dts/mt2701.dtsi | 1 - + arch/arm/boot/dts/mt7623.dtsi | 1 - + arch/arm/boot/dts/mt7629.dtsi | 3 +- + arch/arm/boot/dts/mt8135.dtsi | 1 - + arch/arm/boot/dts/omap3-gta04a5.dts | 19 +- + arch/arm/boot/dts/omap3-n900.dts | 59 +- + .../boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 71 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 16 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 99 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 331 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 35 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 10 +- + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 2 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 7 + + arch/arm/boot/dts/qcom-msm8960.dtsi | 7 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 11 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 11 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 435 +- + .../arm/boot/dts/qcom-msm8974pro-oneplus-bacon.dts | 96 + + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 38 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 46 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 6 + + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 6 +- + arch/arm/boot/dts/qcom-sdx55-t55.dts | 12 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 12 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 21 +- + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 2 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 31 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 11 +- + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 4 +- + .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 4 +- + arch/arm/boot/dts/r8a7742.dtsi | 2 +- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/boot/dts/r9a06g032.dtsi | 12 + + arch/arm/boot/dts/rk3066a-mk808.dts | 7 + + arch/arm/boot/dts/rk3128-evb.dts | 109 + + arch/arm/boot/dts/rk3128.dtsi | 916 ++++ + arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts | 79 + + arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi | 338 ++ + arch/arm/boot/dts/rv1126-pinctrl.dtsi | 253 ++ + arch/arm/boot/dts/rv1126.dtsi | 487 ++ + arch/arm/boot/dts/s3c2410-pinctrl.h | 19 - + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 172 - + arch/arm/boot/dts/s3c2416-smdk2416.dts | 77 - + arch/arm/boot/dts/s3c2416.dtsi | 124 - + arch/arm/boot/dts/s3c24xx.dtsi | 92 - + arch/arm/boot/dts/s5pv210-aries.dtsi | 4 +- + arch/arm/boot/dts/sam9x60.dtsi | 622 +++ + arch/arm/boot/dts/sama5d31ek.dts | 2 +- + arch/arm/boot/dts/sama5d34ek.dts | 2 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 2 +- + arch/arm/boot/dts/sama7g5.dtsi | 51 + + arch/arm/boot/dts/socfpga.dtsi | 6 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 4 +- + arch/arm/boot/dts/socfpga_arria10_mercury_pe1.dts | 55 + + arch/arm/boot/dts/socfpga_vt.dts | 4 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 + + arch/arm/boot/dts/ste-href.dtsi | 12 +- + arch/arm/boot/dts/stih410.dtsi | 2 +- + arch/arm/boot/dts/stih418-b2264.dts | 2 +- + arch/arm/boot/dts/stm32429i-eval.dts | 3 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 1 - + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 1 - + arch/arm/boot/dts/stm32h743.dtsi | 1 - + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 60 + + arch/arm/boot/dts/stm32mp131.dtsi | 710 ++- + arch/arm/boot/dts/stm32mp135f-dk.dts | 60 +- + arch/arm/boot/dts/stm32mp151.dtsi | 2 - + arch/arm/boot/dts/stm32mp157c-ev1.dts | 3 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 1 + + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 15 + + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 2 +- + arch/arm/boot/dts/tegra114-asus-tf701t.dts | 240 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 26 +- + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 14 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 20 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 20 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 60 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 60 +- + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 15 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 8 +- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 27 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 22 +- + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 19 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 14 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 71 +- + arch/arm/boot/dts/tegra124.dtsi | 20 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 1257 ++--- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 114 +- + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 38 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 12 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 60 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 8 +- + arch/arm/boot/dts/tegra20-paz00.dts | 130 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 72 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 58 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 20 +- + arch/arm/boot/dts/tegra20-ventana.dts | 58 +- + arch/arm/boot/dts/tegra20.dtsi | 70 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 20 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 20 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 20 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 20 +- + arch/arm/boot/dts/tegra30-asus-lvds-display.dtsi | 2 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 82 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 14 +- + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 20 +- + arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi | 28 +- + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 32 +- + arch/arm/boot/dts/tegra30-asus-tf201.dts | 34 +- + arch/arm/boot/dts/tegra30-asus-tf300t.dts | 24 +- + arch/arm/boot/dts/tegra30-asus-tf300tg.dts | 20 +- + arch/arm/boot/dts/tegra30-asus-tf700t.dts | 52 +- + .../boot/dts/tegra30-asus-transformer-common.dtsi | 54 +- + arch/arm/boot/dts/tegra30-beaver.dts | 44 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 54 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 30 +- + arch/arm/boot/dts/tegra30-ouya.dts | 207 +- + arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 130 +- + arch/arm/boot/dts/tegra30.dtsi | 88 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 25 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 44 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 42 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 49 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 26 +- + arch/arm/boot/dts/versatile-ab.dts | 6 +- + arch/arm/boot/dts/versatile-pb.dts | 2 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 8 +- + arch/arm/boot/dts/vf610-bk4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 2 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 20 +- + arch/arm/boot/dts/zynq-7000.dtsi | 24 +- + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/badge4_defconfig | 105 - + arch/arm/configs/bcm2835_defconfig | 3 +- + arch/arm/configs/cerfcube_defconfig | 73 - + arch/arm/configs/cm_x300_defconfig | 163 - + arch/arm/configs/cns3420vb_defconfig | 63 - + arch/arm/configs/colibri_pxa270_defconfig | 157 - + arch/arm/configs/colibri_pxa300_defconfig | 60 - + arch/arm/configs/corgi_defconfig | 247 - + arch/arm/configs/dove_defconfig | 6 +- + arch/arm/configs/eseries_pxa_defconfig | 97 - + arch/arm/configs/exynos_defconfig | 10 +- + arch/arm/configs/ezx_defconfig | 389 -- + arch/arm/configs/gemini_defconfig | 2 +- + arch/arm/configs/h5000_defconfig | 74 - + arch/arm/configs/hackkit_defconfig | 48 - + arch/arm/configs/imx_v6_v7_defconfig | 3 +- + arch/arm/configs/iop32x_defconfig | 126 - + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lart_defconfig | 64 - + arch/arm/configs/lpae.config | 2 + + arch/arm/configs/lpd270_defconfig | 58 - + arch/arm/configs/lubbock_defconfig | 53 - + arch/arm/configs/magician_defconfig | 151 - + arch/arm/configs/mainstone_defconfig | 51 - + arch/arm/configs/milbeaut_m10v_defconfig | 22 +- + arch/arm/configs/mini2440_defconfig | 338 -- + arch/arm/configs/multi_v5_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 43 +- + arch/arm/configs/mv78xx0_defconfig | 5 +- + arch/arm/configs/nhk8815_defconfig | 2 +- + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/omap2plus_defconfig | 14 +- + arch/arm/configs/palmz72_defconfig | 75 - + arch/arm/configs/pcm027_defconfig | 90 - + arch/arm/configs/pleb_defconfig | 53 - + arch/arm/configs/pxa168_defconfig | 3 - + arch/arm/configs/pxa255-idp_defconfig | 55 - + arch/arm/configs/pxa910_defconfig | 2 - + arch/arm/configs/pxa_defconfig | 29 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/s3c2410_defconfig | 437 -- + arch/arm/configs/sama5_defconfig | 2 +- + arch/arm/configs/shannon_defconfig | 45 - + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/configs/simpad_defconfig | 100 - + arch/arm/configs/spitz_defconfig | 10 +- + arch/arm/configs/tct_hammer_defconfig | 59 - + arch/arm/configs/trizeps4_defconfig | 207 - + arch/arm/configs/viper_defconfig | 160 - + arch/arm/configs/wpcm450_defconfig | 211 + + arch/arm/configs/xcep_defconfig | 90 - + arch/arm/configs/zeus_defconfig | 173 - + arch/arm/include/debug/s3c24xx.S | 10 - + arch/arm/kernel/entry-common.S | 15 - + arch/arm/kernel/head.S | 2 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 3 +- + arch/arm/mach-cns3xxx/Kconfig | 21 - + arch/arm/mach-cns3xxx/Makefile | 6 - + arch/arm/mach-cns3xxx/cns3420vb.c | 252 - + arch/arm/mach-cns3xxx/cns3xxx.h | 593 --- + arch/arm/mach-cns3xxx/core.c | 410 -- + arch/arm/mach-cns3xxx/core.h | 32 - + arch/arm/mach-cns3xxx/devices.c | 108 - + arch/arm/mach-cns3xxx/devices.h | 17 - + arch/arm/mach-cns3xxx/pcie.c | 290 -- + arch/arm/mach-cns3xxx/pm.c | 120 - + arch/arm/mach-cns3xxx/pm.h | 20 - + arch/arm/mach-davinci/Kconfig | 142 - + arch/arm/mach-davinci/Makefile | 18 +- + arch/arm/mach-davinci/asp.h | 57 - + arch/arm/mach-davinci/board-da830-evm.c | 690 --- + arch/arm/mach-davinci/board-da850-evm.c | 1550 ------- + arch/arm/mach-davinci/board-dm355-evm.c | 444 -- + arch/arm/mach-davinci/board-dm355-leopard.c | 278 -- + arch/arm/mach-davinci/board-dm365-evm.c | 855 ---- + arch/arm/mach-davinci/board-mityomapl138.c | 638 --- + arch/arm/mach-davinci/board-omapl138-hawk.c | 451 -- + arch/arm/mach-davinci/common.h | 7 +- + arch/arm/mach-davinci/cputype.h | 53 - + arch/arm/mach-davinci/da830.c | 274 -- + arch/arm/mach-davinci/da850.c | 400 +- + arch/arm/mach-davinci/da8xx.h | 95 +- + arch/arm/mach-davinci/davinci.h | 136 - + arch/arm/mach-davinci/devices-da8xx.c | 1095 ----- + arch/arm/mach-davinci/devices.c | 303 -- + arch/arm/mach-davinci/dm355.c | 832 ---- + arch/arm/mach-davinci/dm365.c | 1094 ----- + arch/arm/mach-davinci/irqs.h | 217 - + arch/arm/mach-davinci/mux.c | 15 - + arch/arm/mach-davinci/mux.h | 315 -- + arch/arm/mach-davinci/psc.h | 64 - + arch/arm/mach-davinci/serial.c | 92 - + arch/arm/mach-davinci/serial.h | 35 - + arch/arm/mach-davinci/usb-da8xx.c | 146 - + arch/arm/mach-davinci/usb.c | 87 - + arch/arm/mach-dove/Kconfig | 8 - + arch/arm/mach-dove/Makefile | 1 - + arch/arm/mach-dove/dove-db-setup.c | 101 - + arch/arm/mach-ep93xx/Kconfig | 63 - + arch/arm/mach-ep93xx/Makefile | 5 - + arch/arm/mach-ep93xx/adssphere.c | 41 - + arch/arm/mach-ep93xx/core.c | 13 +- + arch/arm/mach-ep93xx/gesbc9312.c | 41 - + arch/arm/mach-ep93xx/micro9.c | 125 - + arch/arm/mach-ep93xx/simone.c | 128 - + arch/arm/mach-ep93xx/snappercl15.c | 162 - + arch/arm/mach-footbridge/Kconfig | 12 - + arch/arm/mach-footbridge/Makefile | 2 - + arch/arm/mach-footbridge/cats-hw.c | 98 - + arch/arm/mach-footbridge/cats-pci.c | 64 - + arch/arm/mach-footbridge/common.c | 3 - + arch/arm/mach-imx/mach-imx6ul.c | 1 + + arch/arm/mach-imx/mmdc.c | 24 +- + arch/arm/mach-iop32x/Kconfig | 54 - + arch/arm/mach-iop32x/Makefile | 20 - + arch/arm/mach-iop32x/adma.c | 163 - + arch/arm/mach-iop32x/cp6.c | 48 - + arch/arm/mach-iop32x/em7210.c | 232 - + arch/arm/mach-iop32x/glantank.c | 214 - + arch/arm/mach-iop32x/glantank.h | 12 - + arch/arm/mach-iop32x/gpio-iop32x.h | 11 - + arch/arm/mach-iop32x/hardware.h | 38 - + arch/arm/mach-iop32x/i2c.c | 92 - + arch/arm/mach-iop32x/iop3xx.h | 326 -- + arch/arm/mach-iop32x/iq31244.c | 333 -- + arch/arm/mach-iop32x/iq31244.h | 16 - + arch/arm/mach-iop32x/iq80321.c | 192 - + arch/arm/mach-iop32x/iq80321.h | 16 - + arch/arm/mach-iop32x/irq.c | 95 - + arch/arm/mach-iop32x/irqs.h | 48 - + arch/arm/mach-iop32x/n2100.c | 367 -- + arch/arm/mach-iop32x/n2100.h | 18 - + arch/arm/mach-iop32x/pci.c | 404 -- + arch/arm/mach-iop32x/pmu.c | 29 - + arch/arm/mach-iop32x/restart.c | 17 - + arch/arm/mach-iop32x/setup.c | 31 - + arch/arm/mach-iop32x/time.c | 179 - + arch/arm/mach-mmp/Kconfig | 96 - + arch/arm/mach-mmp/Makefile | 21 +- + arch/arm/mach-mmp/aspenite.c | 284 -- + arch/arm/mach-mmp/avengers_lite.c | 55 - + arch/arm/mach-mmp/brownstone.c | 237 - + arch/arm/mach-mmp/common.c | 5 - + arch/arm/mach-mmp/common.h | 2 - + arch/arm/mach-mmp/devices.c | 359 -- + arch/arm/mach-mmp/devices.h | 57 - + arch/arm/mach-mmp/flint.c | 131 - + arch/arm/mach-mmp/gplugd.c | 206 - + arch/arm/mach-mmp/irqs.h | 240 - + arch/arm/mach-mmp/jasper.c | 185 - + arch/arm/mach-mmp/mfp-mmp2.h | 396 -- + arch/arm/mach-mmp/mfp-pxa168.h | 355 -- + arch/arm/mach-mmp/mfp-pxa910.h | 170 - + arch/arm/mach-mmp/mfp.h | 35 - + arch/arm/mach-mmp/mmp2.c | 175 - + arch/arm/mach-mmp/mmp2.h | 104 - + arch/arm/mach-mmp/pm-mmp2.c | 248 - + arch/arm/mach-mmp/pm-mmp2.h | 59 - + arch/arm/mach-mmp/pm-pxa910.c | 272 -- + arch/arm/mach-mmp/pm-pxa910.h | 75 - + arch/arm/mach-mmp/pxa168.c | 175 - + arch/arm/mach-mmp/pxa168.h | 139 - + arch/arm/mach-mmp/pxa910.c | 190 - + arch/arm/mach-mmp/pxa910.h | 90 - + arch/arm/mach-mmp/regs-apbc.h | 19 - + arch/arm/mach-mmp/regs-apmu.h | 28 - + arch/arm/mach-mmp/regs-icu.h | 69 - + arch/arm/mach-mmp/regs-timers.h | 5 - + arch/arm/mach-mmp/regs-usb.h | 155 - + arch/arm/mach-mmp/sram.c | 167 - + arch/arm/mach-mmp/teton_bga.c | 100 - + arch/arm/mach-mmp/teton_bga.h | 22 - + arch/arm/mach-mmp/time.c | 9 +- + arch/arm/mach-mmp/ttc_dkb.c | 315 -- + arch/arm/mach-mv78xx0/Kconfig | 14 +- + arch/arm/mach-mv78xx0/Makefile | 2 - + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 101 - + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 86 - + arch/arm/mach-omap1/Kconfig | 99 - + arch/arm/mach-omap1/Makefile | 18 - + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 366 -- + arch/arm/mach-omap1/board-generic.c | 85 - + arch/arm/mach-omap1/board-h2-mmc.c | 74 - + arch/arm/mach-omap1/board-h2.c | 448 -- + arch/arm/mach-omap1/board-h2.h | 38 - + arch/arm/mach-omap1/board-h3-mmc.c | 64 - + arch/arm/mach-omap1/board-h3.c | 455 -- + arch/arm/mach-omap1/board-h3.h | 35 - + arch/arm/mach-omap1/board-htcherald.c | 585 --- + arch/arm/mach-omap1/board-innovator.c | 481 -- + arch/arm/mach-omap1/board-nand.c | 33 - + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 269 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 285 -- + arch/arm/mach-omap1/board-palmz71.c | 300 -- + arch/arm/mach-omap1/board-perseus2.c | 333 -- + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/clock_data.c | 17 +- + arch/arm/mach-omap1/common.h | 29 +- + arch/arm/mach-omap1/devices.c | 59 +- + arch/arm/mach-omap1/dma.c | 25 +- + arch/arm/mach-omap1/fpga.c | 186 - + arch/arm/mach-omap1/fpga.h | 49 - + arch/arm/mach-omap1/gpio7xx.c | 272 -- + arch/arm/mach-omap1/hardware.h | 48 +- + arch/arm/mach-omap1/i2c.c | 14 +- + arch/arm/mach-omap1/io.c | 84 +- + arch/arm/mach-omap1/irq.c | 20 +- + arch/arm/mach-omap1/irqs.h | 9 - + arch/arm/mach-omap1/mcbsp.c | 76 - + arch/arm/mach-omap1/mtd-xip.h | 4 - + arch/arm/mach-omap1/mux.c | 52 - + arch/arm/mach-omap1/omap1510.h | 162 - + arch/arm/mach-omap1/omap16xx.h | 201 - + arch/arm/mach-omap1/omap7xx.h | 106 - + arch/arm/mach-omap1/pm.c | 76 +- + arch/arm/mach-omap1/pm.h | 35 - + arch/arm/mach-omap1/serial.c | 15 - + arch/arm/mach-omap1/sleep.S | 80 - + arch/arm/mach-omap1/sram-init.c | 7 +- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap1/usb.c | 34 +- + arch/arm/mach-omap2/Makefile | 3 +- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 1 + + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 14 +- + arch/arm/mach-omap2/clock.c | 2 - + arch/arm/mach-omap2/clock.h | 7 - + arch/arm/mach-omap2/clock2xxx.h | 29 - + arch/arm/mach-omap2/clock3xxx.h | 21 - + arch/arm/mach-omap2/clockdomain.c | 44 +- + arch/arm/mach-omap2/clockdomain.h | 4 - + arch/arm/mach-omap2/cm2xxx.c | 101 +- + arch/arm/mach-omap2/cm2xxx.h | 7 - + arch/arm/mach-omap2/cm2xxx_3xxx.h | 5 - + arch/arm/mach-omap2/common.h | 28 - + arch/arm/mach-omap2/control.c | 73 - + arch/arm/mach-omap2/control.h | 5 - + arch/arm/mach-omap2/devices.c | 1 - + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/id.h | 2 - + arch/arm/mach-omap2/io.c | 21 +- + arch/arm/mach-omap2/omap-secure.c | 7 +- + arch/arm/mach-omap2/omap-secure.h | 3 - + arch/arm/mach-omap2/omap4-common.c | 1 + + arch/arm/mach-omap2/omap_device.c | 74 +- + arch/arm/mach-omap2/omap_device.h | 14 - + arch/arm/mach-omap2/omap_hwmod.c | 94 +- + arch/arm/mach-omap2/omap_hwmod.h | 21 - + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 2 +- + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 12 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_common_data.h | 6 - + arch/arm/mach-omap2/omap_hwmod_reset.c | 98 - + arch/arm/mach-omap2/omap_opp_data.h | 5 - + arch/arm/mach-omap2/omap_phy_internal.c | 87 - + arch/arm/mach-omap2/pm.c | 8 +- + arch/arm/mach-omap2/pm.h | 25 - + arch/arm/mach-omap2/pm24xx.c | 312 -- + arch/arm/mach-omap2/pm33xx-core.c | 1 - + arch/arm/mach-omap2/powerdomain.c | 108 +- + arch/arm/mach-omap2/powerdomain.h | 8 - + arch/arm/mach-omap2/prcm-common.h | 1 - + arch/arm/mach-omap2/prcm_mpu44xx.c | 12 - + arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 2 - + arch/arm/mach-omap2/prm.h | 4 - + arch/arm/mach-omap2/prm2xxx_3xxx.h | 3 - + arch/arm/mach-omap2/prm3xxx.c | 5 +- + arch/arm/mach-omap2/prm3xxx.h | 2 - + arch/arm/mach-omap2/prm_common.c | 55 +- + arch/arm/mach-omap2/sdrc.c | 51 +- + arch/arm/mach-omap2/sdrc.h | 5 - + arch/arm/mach-omap2/serial.h | 66 - + arch/arm/mach-omap2/sleep34xx.S | 2 +- + arch/arm/mach-omap2/sr_device.c | 13 - + arch/arm/mach-omap2/sram.h | 4 - + arch/arm/mach-omap2/timer.c | 1 + + arch/arm/mach-omap2/usb-tusb6010.c | 6 +- + arch/arm/mach-omap2/usb.h | 71 - + arch/arm/mach-omap2/vc.c | 15 - + arch/arm/mach-omap2/voltage.c | 2 +- + arch/arm/mach-omap2/voltage.h | 2 - + arch/arm/mach-orion5x/Kconfig | 59 - + arch/arm/mach-orion5x/Makefile | 8 - + arch/arm/mach-orion5x/common.c | 10 - + arch/arm/mach-orion5x/common.h | 2 - + arch/arm/mach-orion5x/db88f5281-setup.c | 376 -- + arch/arm/mach-orion5x/ls_hgl-setup.c | 275 -- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 172 - + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 183 - + arch/arm/mach-orion5x/rd88f5182-setup.c | 288 -- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 120 - + arch/arm/mach-orion5x/wnr854t-setup.c | 175 - + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 263 -- + arch/arm/mach-pxa/Kconfig | 571 +-- + arch/arm/mach-pxa/Makefile | 59 +- + arch/arm/mach-pxa/balloon3-pcmcia.c | 137 - + arch/arm/mach-pxa/balloon3.c | 821 ---- + arch/arm/mach-pxa/balloon3.h | 181 - + arch/arm/mach-pxa/capc7117.c | 159 - + arch/arm/mach-pxa/cm-x300.c | 883 ---- + arch/arm/mach-pxa/colibri-evalboard.c | 138 - + arch/arm/mach-pxa/colibri-pcmcia.c | 165 - + arch/arm/mach-pxa/colibri-pxa270-income.c | 236 - + arch/arm/mach-pxa/colibri-pxa270.c | 330 -- + arch/arm/mach-pxa/colibri-pxa300.c | 193 - + arch/arm/mach-pxa/colibri-pxa320.c | 264 -- + arch/arm/mach-pxa/colibri-pxa3xx.c | 147 - + arch/arm/mach-pxa/colibri.h | 70 - + arch/arm/mach-pxa/corgi.c | 826 ---- + arch/arm/mach-pxa/corgi.h | 110 - + arch/arm/mach-pxa/corgi_pm.c | 221 - + arch/arm/mach-pxa/csb701.c | 67 - + arch/arm/mach-pxa/csb726.c | 291 -- + arch/arm/mach-pxa/csb726.h | 24 - + arch/arm/mach-pxa/devices.c | 408 -- + arch/arm/mach-pxa/devices.h | 2 - + arch/arm/mach-pxa/e740-pcmcia.c | 127 - + arch/arm/mach-pxa/eseries-gpio.h | 63 - + arch/arm/mach-pxa/eseries-irq.h | 24 - + arch/arm/mach-pxa/eseries.c | 1001 ---- + arch/arm/mach-pxa/ezx.c | 1254 ----- + arch/arm/mach-pxa/h5000.c | 210 - + arch/arm/mach-pxa/h5000.h | 109 - + arch/arm/mach-pxa/himalaya.c | 166 - + arch/arm/mach-pxa/hx4700-pcmcia.c | 118 - + arch/arm/mach-pxa/hx4700.c | 942 ---- + arch/arm/mach-pxa/hx4700.h | 129 - + arch/arm/mach-pxa/icontrol.c | 218 - + arch/arm/mach-pxa/idp.c | 285 -- + arch/arm/mach-pxa/idp.h | 195 - + arch/arm/mach-pxa/littleton.c | 462 -- + arch/arm/mach-pxa/littleton.h | 14 - + arch/arm/mach-pxa/lpd270.c | 518 --- + arch/arm/mach-pxa/lpd270.h | 40 - + arch/arm/mach-pxa/lubbock.c | 649 --- + arch/arm/mach-pxa/lubbock.h | 47 - + arch/arm/mach-pxa/magician.c | 1112 ----- + arch/arm/mach-pxa/magician.h | 125 - + arch/arm/mach-pxa/mainstone.c | 738 --- + arch/arm/mach-pxa/mainstone.h | 140 - + arch/arm/mach-pxa/mfp-pxa25x.h | 33 - + arch/arm/mach-pxa/mfp-pxa2xx.c | 4 - + arch/arm/mach-pxa/mfp-pxa930.h | 495 -- + arch/arm/mach-pxa/mioa701.c | 784 ---- + arch/arm/mach-pxa/mioa701.h | 76 - + arch/arm/mach-pxa/mioa701_bootresume.S | 38 - + arch/arm/mach-pxa/mp900.c | 101 - + arch/arm/mach-pxa/mxm8x10.c | 477 -- + arch/arm/mach-pxa/mxm8x10.h | 22 - + arch/arm/mach-pxa/palm27x.c | 473 -- + arch/arm/mach-pxa/palm27x.h | 77 - + arch/arm/mach-pxa/palmld-pcmcia.c | 111 - + arch/arm/mach-pxa/palmld.c | 392 -- + arch/arm/mach-pxa/palmld.h | 107 - + arch/arm/mach-pxa/palmt5.c | 234 - + arch/arm/mach-pxa/palmt5.h | 82 - + arch/arm/mach-pxa/palmtc-pcmcia.c | 162 - + arch/arm/mach-pxa/palmtc.c | 539 --- + arch/arm/mach-pxa/palmtc.h | 84 - + arch/arm/mach-pxa/palmte2.c | 383 -- + arch/arm/mach-pxa/palmte2.h | 64 - + arch/arm/mach-pxa/palmtreo.c | 548 --- + arch/arm/mach-pxa/palmtreo.h | 64 - + arch/arm/mach-pxa/palmtx-pcmcia.c | 111 - + arch/arm/mach-pxa/palmtx.c | 390 -- + arch/arm/mach-pxa/palmtx.h | 110 - + arch/arm/mach-pxa/palmz72.c | 319 -- + arch/arm/mach-pxa/palmz72.h | 80 - + arch/arm/mach-pxa/pcm027.c | 266 -- + arch/arm/mach-pxa/pcm027.h | 73 - + arch/arm/mach-pxa/pcm990-baseboard.c | 408 -- + arch/arm/mach-pxa/pcm990_baseboard.h | 199 - + arch/arm/mach-pxa/pm.c | 2 - + arch/arm/mach-pxa/pm.h | 10 - + arch/arm/mach-pxa/poodle.c | 484 -- + arch/arm/mach-pxa/poodle.h | 92 - + arch/arm/mach-pxa/pxa25x.c | 7 - + arch/arm/mach-pxa/pxa27x.c | 18 +- + arch/arm/mach-pxa/pxa27x.h | 3 - + arch/arm/mach-pxa/pxa2xx.c | 29 - + arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 -- + arch/arm/mach-pxa/pxa3xx.c | 89 - + arch/arm/mach-pxa/pxa930.c | 217 - + arch/arm/mach-pxa/pxa930.h | 8 - + arch/arm/mach-pxa/pxa_cplds_irqs.c | 200 - + arch/arm/mach-pxa/regs-u2d.h | 199 - + arch/arm/mach-pxa/regs-uart.h | 146 - + arch/arm/mach-pxa/saar.c | 604 --- + arch/arm/mach-pxa/sharpsl_pm.c | 4 - + arch/arm/mach-pxa/spitz.c | 23 - + arch/arm/mach-pxa/tavorevb.c | 506 --- + arch/arm/mach-pxa/tosa-bt.c | 134 - + arch/arm/mach-pxa/tosa.c | 946 ---- + arch/arm/mach-pxa/tosa.h | 165 - + arch/arm/mach-pxa/tosa_bt.h | 18 - + arch/arm/mach-pxa/trizeps4-pcmcia.c | 200 - + arch/arm/mach-pxa/trizeps4.c | 575 --- + arch/arm/mach-pxa/trizeps4.h | 166 - + arch/arm/mach-pxa/viper-pcmcia.c | 180 - + arch/arm/mach-pxa/viper-pcmcia.h | 12 - + arch/arm/mach-pxa/viper.c | 1034 ----- + arch/arm/mach-pxa/viper.h | 91 - + arch/arm/mach-pxa/vpac270-pcmcia.c | 137 - + arch/arm/mach-pxa/vpac270.c | 736 --- + arch/arm/mach-pxa/vpac270.h | 38 - + arch/arm/mach-pxa/xcep.c | 190 - + arch/arm/mach-pxa/z2.c | 781 ---- + arch/arm/mach-pxa/z2.h | 37 - + arch/arm/mach-pxa/zeus.c | 974 ---- + arch/arm/mach-pxa/zeus.h | 82 - + arch/arm/mach-pxa/zylonite.c | 495 -- + arch/arm/mach-pxa/zylonite.h | 45 - + arch/arm/mach-pxa/zylonite_pxa300.c | 281 -- + arch/arm/mach-pxa/zylonite_pxa320.c | 213 - + arch/arm/mach-qcom/platsmp.c | 2 +- + arch/arm/mach-s3c/Kconfig | 92 +- + arch/arm/mach-s3c/Kconfig.s3c24xx | 604 --- + arch/arm/mach-s3c/Kconfig.s3c64xx | 210 - + arch/arm/mach-s3c/Makefile | 12 - + arch/arm/mach-s3c/Makefile.s3c24xx | 102 - + arch/arm/mach-s3c/Makefile.s3c64xx | 15 - + arch/arm/mach-s3c/adc-core.h | 24 - + arch/arm/mach-s3c/adc.c | 510 --- + arch/arm/mach-s3c/anubis.h | 50 - + arch/arm/mach-s3c/ata-core-s3c64xx.h | 24 - + arch/arm/mach-s3c/backlight-s3c64xx.h | 22 - + arch/arm/mach-s3c/bast-ide.c | 82 - + arch/arm/mach-s3c/bast-irq.c | 137 - + arch/arm/mach-s3c/bast.h | 194 - + arch/arm/mach-s3c/common-smdk-s3c24xx.c | 228 - + arch/arm/mach-s3c/common-smdk-s3c24xx.h | 11 - + arch/arm/mach-s3c/cpu.h | 47 - + arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c | 94 - + arch/arm/mach-s3c/dev-audio-s3c64xx.c | 127 - + arch/arm/mach-s3c/dev-backlight-s3c64xx.c | 137 - + arch/arm/mach-s3c/devs.c | 726 --- + arch/arm/mach-s3c/devs.h | 37 - + arch/arm/mach-s3c/dma-s3c24xx.h | 51 - + arch/arm/mach-s3c/dma-s3c64xx.h | 57 - + arch/arm/mach-s3c/dma.h | 9 - + arch/arm/mach-s3c/fb-core-s3c24xx.h | 24 - + arch/arm/mach-s3c/gpio-cfg-helpers.h | 124 - + arch/arm/mach-s3c/gpio-cfg.h | 19 - + arch/arm/mach-s3c/gpio-core.h | 3 - + arch/arm/mach-s3c/gpio-samsung-s3c24xx.h | 103 - + arch/arm/mach-s3c/gpio-samsung.c | 443 +- + arch/arm/mach-s3c/gpio-samsung.h | 7 - + arch/arm/mach-s3c/gta02.h | 20 - + arch/arm/mach-s3c/h1940-bluetooth.c | 140 - + arch/arm/mach-s3c/h1940.h | 52 - + arch/arm/mach-s3c/hardware-s3c24xx.h | 14 - + arch/arm/mach-s3c/iic-core.h | 7 - + arch/arm/mach-s3c/init.c | 26 +- + arch/arm/mach-s3c/iotiming-s3c2410.c | 472 -- + arch/arm/mach-s3c/iotiming-s3c2412.c | 278 -- + arch/arm/mach-s3c/irq-pm-s3c24xx.c | 115 - + arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 - + arch/arm/mach-s3c/irq-s3c24xx-fiq.S | 112 - + arch/arm/mach-s3c/irq-s3c24xx.c | 1352 ------ + arch/arm/mach-s3c/irqs-s3c24xx.h | 219 - + arch/arm/mach-s3c/irqs.h | 7 - + arch/arm/mach-s3c/mach-amlm5900.c | 248 - + arch/arm/mach-s3c/mach-anubis.c | 422 -- + arch/arm/mach-s3c/mach-anw6410.c | 230 - + arch/arm/mach-s3c/mach-at2440evb.c | 233 - + arch/arm/mach-s3c/mach-bast.c | 583 --- + arch/arm/mach-s3c/mach-crag6410.c | 1 - + arch/arm/mach-s3c/mach-gta02.c | 588 --- + arch/arm/mach-s3c/mach-h1940.c | 809 ---- + arch/arm/mach-s3c/mach-hmt.c | 282 -- + arch/arm/mach-s3c/mach-jive.c | 693 --- + arch/arm/mach-s3c/mach-mini2440.c | 804 ---- + arch/arm/mach-s3c/mach-mini6410.c | 365 -- + arch/arm/mach-s3c/mach-n30.c | 682 --- + arch/arm/mach-s3c/mach-ncp.c | 100 - + arch/arm/mach-s3c/mach-nexcoder.c | 162 - + arch/arm/mach-s3c/mach-osiris-dvs.c | 178 - + arch/arm/mach-s3c/mach-osiris.c | 405 -- + arch/arm/mach-s3c/mach-otom.c | 124 - + arch/arm/mach-s3c/mach-qt2410.c | 375 -- + arch/arm/mach-s3c/mach-real6410.c | 333 -- + arch/arm/mach-s3c/mach-rx1950.c | 884 ---- + arch/arm/mach-s3c/mach-rx3715.c | 213 - + arch/arm/mach-s3c/mach-s3c2416-dt.c | 48 - + arch/arm/mach-s3c/mach-smartq.c | 424 -- + arch/arm/mach-s3c/mach-smartq.h | 16 - + arch/arm/mach-s3c/mach-smartq5.c | 154 - + arch/arm/mach-s3c/mach-smartq7.c | 170 - + arch/arm/mach-s3c/mach-smdk2410.c | 112 - + arch/arm/mach-s3c/mach-smdk2413.c | 169 - + arch/arm/mach-s3c/mach-smdk2416.c | 248 - + arch/arm/mach-s3c/mach-smdk2440.c | 180 - + arch/arm/mach-s3c/mach-smdk2443.c | 126 - + arch/arm/mach-s3c/mach-smdk6400.c | 90 - + arch/arm/mach-s3c/mach-smdk6410.c | 706 --- + arch/arm/mach-s3c/mach-tct_hammer.c | 157 - + arch/arm/mach-s3c/mach-vr1000.c | 364 -- + arch/arm/mach-s3c/mach-vstms.c | 166 - + arch/arm/mach-s3c/map-s3c.h | 37 - + arch/arm/mach-s3c/map-s3c24xx.h | 159 - + arch/arm/mach-s3c/map.h | 7 - + arch/arm/mach-s3c/nand-core-s3c24xx.h | 24 - + arch/arm/mach-s3c/onenand-core-s3c64xx.h | 32 - + arch/arm/mach-s3c/osiris.h | 50 - + arch/arm/mach-s3c/otom.h | 25 - + arch/arm/mach-s3c/pll-s3c2410.c | 83 - + arch/arm/mach-s3c/pll-s3c2440-12000000.c | 95 - + arch/arm/mach-s3c/pll-s3c2440-16934400.c | 122 - + arch/arm/mach-s3c/pm-core-s3c24xx.h | 96 - + arch/arm/mach-s3c/pm-core-s3c64xx.h | 17 - + arch/arm/mach-s3c/pm-core.h | 7 - + arch/arm/mach-s3c/pm-h1940.S | 19 - + arch/arm/mach-s3c/pm-s3c2410.c | 170 - + arch/arm/mach-s3c/pm-s3c2412.c | 126 - + arch/arm/mach-s3c/pm-s3c2416.c | 81 - + arch/arm/mach-s3c/pm-s3c24xx.c | 121 - + arch/arm/mach-s3c/pm-s3c64xx.c | 83 - + arch/arm/mach-s3c/pm.c | 7 +- + arch/arm/mach-s3c/pm.h | 12 - + arch/arm/mach-s3c/regs-adc.h | 64 - + arch/arm/mach-s3c/regs-clock-s3c24xx.h | 146 - + arch/arm/mach-s3c/regs-clock.h | 7 - + arch/arm/mach-s3c/regs-dsc-s3c24xx.h | 22 - + arch/arm/mach-s3c/regs-gpio-s3c24xx.h | 608 --- + arch/arm/mach-s3c/regs-gpio.h | 7 - + arch/arm/mach-s3c/regs-irq-s3c24xx.h | 51 - + arch/arm/mach-s3c/regs-irq.h | 7 - + arch/arm/mach-s3c/regs-mem-s3c24xx.h | 53 - + arch/arm/mach-s3c/regs-s3c2443-clock.h | 238 - + arch/arm/mach-s3c/regs-srom-s3c64xx.h | 55 - + arch/arm/mach-s3c/rtc-core-s3c24xx.h | 23 - + arch/arm/mach-s3c/s3c2410.c | 130 - + arch/arm/mach-s3c/s3c2412-power.h | 34 - + arch/arm/mach-s3c/s3c2412.c | 175 - + arch/arm/mach-s3c/s3c2412.h | 25 - + arch/arm/mach-s3c/s3c2416.c | 132 - + arch/arm/mach-s3c/s3c2440.c | 71 - + arch/arm/mach-s3c/s3c2442.c | 62 - + arch/arm/mach-s3c/s3c2443.c | 112 - + arch/arm/mach-s3c/s3c244x.c | 128 - + arch/arm/mach-s3c/s3c24xx.c | 687 --- + arch/arm/mach-s3c/s3c24xx.h | 124 - + arch/arm/mach-s3c/s3c6400.c | 90 - + arch/arm/mach-s3c/s3c6410.c | 9 - + arch/arm/mach-s3c/s3c64xx.c | 11 +- + arch/arm/mach-s3c/sdhci.h | 25 - + arch/arm/mach-s3c/setup-i2c-s3c24xx.c | 23 - + arch/arm/mach-s3c/setup-ide-s3c64xx.c | 40 - + arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c | 31 - + arch/arm/mach-s3c/setup-spi-s3c24xx.c | 27 - + arch/arm/mach-s3c/setup-ts-s3c24xx.c | 29 - + arch/arm/mach-s3c/simtec-audio.c | 76 - + arch/arm/mach-s3c/simtec-nor.c | 74 - + arch/arm/mach-s3c/simtec-pm.c | 60 - + arch/arm/mach-s3c/simtec-usb.c | 125 - + arch/arm/mach-s3c/simtec.h | 17 - + arch/arm/mach-s3c/sleep-s3c2410.S | 54 - + arch/arm/mach-s3c/sleep-s3c2412.S | 53 - + arch/arm/mach-s3c/sleep-s3c24xx.S | 69 - + arch/arm/mach-s3c/sleep-s3c64xx.S | 27 - + arch/arm/mach-s3c/spi-core-s3c24xx.h | 21 - + arch/arm/mach-s3c/vr1000.h | 113 - + arch/arm/mach-sa1100/Kconfig | 112 - + arch/arm/mach-sa1100/Makefile | 21 - + arch/arm/mach-sa1100/assabet.c | 34 - + arch/arm/mach-sa1100/badge4.c | 338 -- + arch/arm/mach-sa1100/cerf.c | 181 - + arch/arm/mach-sa1100/collie.c | 33 - + arch/arm/mach-sa1100/generic.c | 19 - + arch/arm/mach-sa1100/generic.h | 3 - + arch/arm/mach-sa1100/h3100.c | 140 - + arch/arm/mach-sa1100/h3600.c | 38 - + arch/arm/mach-sa1100/hackkit.c | 184 - + arch/arm/mach-sa1100/include/mach/badge4.h | 71 - + arch/arm/mach-sa1100/include/mach/cerf.h | 20 - + arch/arm/mach-sa1100/include/mach/nanoengine.h | 48 - + arch/arm/mach-sa1100/include/mach/shannon.h | 40 - + arch/arm/mach-sa1100/include/mach/simpad.h | 159 - + arch/arm/mach-sa1100/lart.c | 177 - + arch/arm/mach-sa1100/nanoengine.c | 136 - + arch/arm/mach-sa1100/pci-nanoengine.c | 191 - + arch/arm/mach-sa1100/pleb.c | 148 - + arch/arm/mach-sa1100/shannon.c | 157 - + arch/arm/mach-sa1100/simpad.c | 423 -- + arch/arm/mach-tegra/tegra.c | 1 - + arch/arm/mach-zynq/slcr.c | 1 + + arch/arm/plat-orion/common.c | 31 - + arch/arm/plat-orion/include/plat/common.h | 3 - + arch/arm64/Kconfig.platforms | 10 +- + arch/arm64/Makefile | 6 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 21 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 23 + + arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 4 - + arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 16 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 24 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 +- + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 20 - + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 448 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 125 + + arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 445 ++ + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 489 ++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 + + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 2 +- + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 1 - + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 15 - + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 68 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 21 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 9 +- + .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 97 + + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 428 +- + .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 435 ++ + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 16 +- + arch/arm64/boot/dts/apm/apm-mustang.dts | 16 +- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 1 - + arch/arm64/boot/dts/apm/apm-storm.dtsi | 16 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 26 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 52 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 16 +- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 2 - + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 9 +- + arch/arm64/boot/dts/freescale/Makefile | 10 + + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 12 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 2 + + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 + + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 2 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 2 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 5 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 5 +- + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 7 +- + .../boot/dts/freescale/imx8mm-innocomm-wb15.dtsi | 3 - + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 4 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 1 + + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 3 - + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 5 +- + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 5 +- + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 + + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 96 +- + .../dts/freescale/imx8mm-verdin-nonwifi-yavia.dts | 18 + + .../dts/freescale/imx8mm-verdin-wifi-yavia.dts | 18 + + .../boot/dts/freescale/imx8mm-verdin-yavia.dtsi | 169 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 13 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 34 +- + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 28 +- + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 550 +++ + .../boot/dts/freescale/imx8mp-beacon-som.dtsi | 416 ++ + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 506 +++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 21 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 7 - + .../freescale/imx8mp-tqma8mpql-mba8mpxl-lvds.dtso | 61 + + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 5 +- + .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 5 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 7 - + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +- + .../dts/freescale/imx8mp-verdin-nonwifi-yavia.dts | 18 + + .../dts/freescale/imx8mp-verdin-wifi-yavia.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 213 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 349 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 10 +- + .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 10 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 32 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 5 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 10 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 32 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 12 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 41 + + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 12 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 2 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 19 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- + .../dts/marvell/armada-3720-espressobin-emmc.dts | 2 +- + .../dts/marvell/armada-3720-espressobin-ultra.dts | 2 +- + .../marvell/armada-3720-espressobin-v7-emmc.dts | 2 +- + .../dts/marvell/armada-3720-espressobin-v7.dts | 2 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 2 +- + .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 5 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 50 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + .../dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso | 29 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 55 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 68 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso | 23 + + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 450 ++ + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 120 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 125 +- + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 8 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 41 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 - + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 2 +- + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 28 +- + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 6 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 6 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 6 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 86 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 579 ++- + .../mt8192-asurada-audio-rt1015p-rt5682.dtsi | 19 + + .../dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi | 26 + + .../dts/mediatek/mt8192-asurada-audio-rt5682.dtsi | 21 + + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 465 ++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 107 +- + .../boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 10 + + .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 10 + + .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 10 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 109 + + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 77 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 309 +- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 3 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 2 +- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 16 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 232 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 2564 +++++------ + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 86 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 1730 +++---- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 486 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2418 +++++----- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 2495 +++++----- + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1623 ++++--- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 66 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 278 +- + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 3 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 86 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 384 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 66 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 310 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 130 +- + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 2683 +++++------ + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 24 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 2099 +++++---- + arch/arm64/boot/dts/qcom/Makefile | 22 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 4 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 548 ++- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 73 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 295 ++ + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 299 ++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 +- + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +- + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 296 ++ + arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 113 + + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 75 + + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 262 ++ + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 196 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts | 19 + + arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 39 + + arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 39 + + arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 250 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 115 +- + .../boot/dts/qcom/msm8953-motorola-potter.dts | 305 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 325 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts | 329 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 325 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 361 ++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 94 +- + arch/arm64/boot/dts/qcom/msm8956.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8976.dtsi | 153 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 48 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 52 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 1 - + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 38 +- + arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi | 2 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 90 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 21 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 4 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 6 +- + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 4 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 48 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 8 + + arch/arm64/boot/dts/qcom/pm8005.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8010.dtsi | 84 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8550.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550b.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 194 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm8950.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmk8550.dtsi | 55 + + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmp8074.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735d.dtsi | 104 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 226 +- + arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 453 ++ + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 1333 ++++++ + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 12 +- + arch/arm64/boot/dts/qcom/qru1000-idp.dts | 453 ++ + arch/arm64/boot/dts/qcom/qru1000.dtsi | 26 + + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 6 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 336 +- + .../dts/qcom/{pm8450a.dtsi => sa8540p-pmics.dtsi} | 33 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 190 +- + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 36 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 18 + + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 +- + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 20 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 23 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 20 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 54 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 339 +- + .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 19 +- + .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 4 - + .../boot/dts/qcom/sc7280-herobrine-crd-pro.dts | 14 + + .../boot/dts/qcom/sc7280-herobrine-evoker.dtsi | 1 + + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 30 +- + .../boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi | 14 + + .../boot/dts/qcom/sc7280-herobrine-pro-sku.dtsi | 8 + + .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 1 + + .../dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts | 17 + + .../boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts | 17 + + .../boot/dts/qcom/sc7280-herobrine-zombie.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 22 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 104 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 435 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 730 ++- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2838 ++++++++++-- + arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 252 + + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 5 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 35 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 15 + + arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts | 291 ++ + arch/arm64/boot/dts/qcom/sdm660.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 70 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 409 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 146 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 83 +- + arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 86 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 302 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 40 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 29 + + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 175 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 87 + + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 54 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 54 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 1417 +++--- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 83 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 136 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 1249 ++++- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 289 ++ + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 214 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 643 ++- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 18 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 426 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 138 +- + arch/arm64/boot/dts/qcom/sm7225.dtsi | 19 + + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 6 +- + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 6 +- + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 90 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 426 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 56 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts | 630 +++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 196 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 424 +- + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 8 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 8 +- + .../dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts | 23 + + .../dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts | 87 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 110 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 2650 +++++++---- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 189 +- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 15 +- + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 61 + + .../dts/qcom/sm8450-sony-xperia-nagara-pdx224.dts | 38 +- + .../boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 202 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 484 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 568 +++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 4806 ++++++++++++++++++++ + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 6 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 45 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 21 - + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 29 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 29 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 12 + + arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 38 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 63 + + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 94 + + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 136 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 + + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 72 + + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 5 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 58 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 11 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 - + .../renesas/ulcb-audio-graph-card-mix+split.dtsi | 91 + + .../boot/dts/renesas/ulcb-audio-graph-card.dtsi | 85 + + .../renesas/ulcb-audio-graph-card2-mix+split.dtsi | 111 + + .../boot/dts/renesas/ulcb-audio-graph-card2.dtsi | 26 + + .../ulcb-kf-audio-graph-card-mix+split.dtsi | 171 + + .../boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi | 88 + + .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 178 + + .../dts/renesas/ulcb-kf-audio-graph-card2.dtsi | 30 + + .../ulcb-kf-simple-audio-card-mix+split.dtsi | 153 + + .../dts/renesas/ulcb-kf-simple-audio-card.dtsi | 85 + + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 76 +- + .../renesas/ulcb-simple-audio-card-mix+split.dtsi | 92 + + .../boot/dts/renesas/ulcb-simple-audio-card.dtsi | 89 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 68 +- + arch/arm64/boot/dts/rockchip/Makefile | 9 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 33 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 41 +- + .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 373 ++ + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 19 + + .../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 12 + + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 55 + + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 24 +- + arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 595 +++ + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 272 ++ + arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 425 ++ + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 44 +- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 13 + + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 733 +++ + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 94 + + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 415 ++ + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 228 + + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 5 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 27 + + .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 32 + + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 129 + + arch/arm64/boot/dts/rockchip/rk3588-pinctrl.dtsi | 516 +++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 44 + + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 58 + + arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi | 3403 ++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 73 + + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 1703 +++++++ + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 35 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 45 +- + .../dts/socionext/uniphier-pxs3-ref-gadget0.dts | 2 +- + .../dts/socionext/uniphier-pxs3-ref-gadget1.dts | 2 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 48 +- + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 2 +- + arch/arm64/boot/dts/tesla/fsd-evb.dts | 69 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 54 +- + arch/arm64/boot/dts/tesla/fsd.dtsi | 124 + + arch/arm64/boot/dts/ti/Makefile | 35 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 98 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 27 + + arch/arm64/boot/dts/ti/k3-am625.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 365 ++ + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 51 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 70 + + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 231 + + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 277 ++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 46 + + arch/arm64/boot/dts/ti/k3-am654.dtsi | 2 + + .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 121 + + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 335 ++ + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 29 + + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 180 + + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 196 + + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 1007 ++++ + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 311 ++ + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 287 ++ + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 - + ...sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 + ...sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 +- + arch/arm64/configs/defconfig | 115 +- + arch/arm64/configs/virt.config | 39 + + arch/powerpc/Makefile | 12 +- + arch/riscv/Kconfig.socs | 48 +- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/Makefile | 3 +- + arch/riscv/boot/dts/allwinner/Makefile | 9 + + .../dts/allwinner/sun20i-common-regulators.dtsi | 28 + + .../dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 117 + + .../sun20i-d1-lichee-rv-86-panel-480p.dts | 29 + + .../sun20i-d1-lichee-rv-86-panel-720p.dts | 10 + + .../allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 119 + + .../dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 97 + + .../boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 87 + + .../dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 142 + + arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 166 + + arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 66 + + .../boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 128 + + arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 76 + + arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 15 + + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 834 ++++ + arch/riscv/boot/dts/canaan/Makefile | 14 +- + arch/riscv/boot/dts/microchip/Makefile | 9 +- + .../boot/dts/microchip/mpfs-tysom-m-fabric.dtsi | 18 + + arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts | 165 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 20 +- + arch/riscv/boot/dts/sifive/Makefile | 4 +- + arch/riscv/boot/dts/starfive/Makefile | 2 +- + arch/riscv/configs/defconfig | 22 +- + drivers/ata/Kconfig | 19 - + drivers/ata/Makefile | 2 - + drivers/ata/pata_palmld.c | 137 - + drivers/ata/pata_samsung_cf.c | 662 --- + drivers/bus/imx-weim.c | 4 +- + drivers/clk/davinci/Makefile | 4 - + drivers/clk/davinci/pll-dm355.c | 77 - + drivers/clk/davinci/pll-dm365.c | 146 - + drivers/clk/davinci/pll.c | 8 - + drivers/clk/davinci/pll.h | 5 - + drivers/clk/davinci/psc-dm355.c | 89 - + drivers/clk/davinci/psc-dm365.c | 111 - + drivers/clk/davinci/psc.c | 6 - + drivers/clk/davinci/psc.h | 7 - + drivers/clk/samsung/Kconfig | 32 - + drivers/clk/samsung/Makefile | 4 - + drivers/clk/samsung/clk-pll.c | 181 - + drivers/clk/samsung/clk-pll.h | 21 - + drivers/clk/samsung/clk-s3c2410-dclk.c | 440 -- + drivers/clk/samsung/clk-s3c2410.c | 446 -- + drivers/clk/samsung/clk-s3c2412.c | 254 -- + drivers/clk/samsung/clk-s3c2443.c | 438 -- + drivers/clocksource/Kconfig | 2 +- + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/Kconfig.arm | 81 - + drivers/cpufreq/Makefile | 7 - + drivers/cpufreq/s3c2410-cpufreq.c | 155 - + drivers/cpufreq/s3c2412-cpufreq.c | 240 - + drivers/cpufreq/s3c2416-cpufreq.c | 492 -- + drivers/cpufreq/s3c2440-cpufreq.c | 321 -- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 163 - + drivers/cpufreq/s3c24xx-cpufreq.c | 648 --- + drivers/cpufreq/sa1100-cpufreq.c | 206 - + drivers/cpufreq/sa1110-cpufreq.c | 6 - + drivers/cpuidle/cpuidle-qcom-spm.c | 2 +- + drivers/dma/Kconfig | 12 - + drivers/dma/Makefile | 1 - + drivers/dma/mmp_tdma.c | 7 +- + drivers/dma/s3c24xx-dma.c | 1428 ------ + drivers/firmware/arm_scmi/Kconfig | 32 + + drivers/firmware/arm_scmi/Makefile | 9 +- + drivers/firmware/arm_scmi/bus.c | 395 +- + drivers/firmware/arm_scmi/common.h | 100 +- + drivers/firmware/arm_scmi/driver.c | 1223 +++-- + drivers/firmware/arm_scmi/mailbox.c | 6 +- + drivers/firmware/arm_scmi/optee.c | 6 +- + drivers/firmware/arm_scmi/protocols.h | 7 + + drivers/firmware/arm_scmi/raw_mode.c | 1443 ++++++ + drivers/firmware/arm_scmi/raw_mode.h | 31 + + drivers/firmware/arm_scmi/smc.c | 6 +- + drivers/firmware/arm_scmi/virtio.c | 4 +- + drivers/firmware/meson/meson_sm.c | 2 +- + drivers/firmware/qcom_scm-legacy.c | 2 +- + drivers/firmware/qcom_scm-smc.c | 88 +- + drivers/firmware/qcom_scm.c | 92 +- + drivers/firmware/qcom_scm.h | 8 + + drivers/firmware/xilinx/zynqmp.c | 27 +- + drivers/gpio/Kconfig | 17 - + drivers/gpio/Makefile | 2 - + drivers/gpio/gpio-iop.c | 59 - + drivers/gpio/gpio-ucb1400.c | 85 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/hwmon/Kconfig | 17 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/s3c-hwmon.c | 379 -- + drivers/i2c/busses/Kconfig | 11 +- + drivers/i2c/busses/i2c-s3c2410.c | 72 - + drivers/iio/adc/Kconfig | 6 +- + drivers/input/keyboard/Kconfig | 19 - + drivers/input/keyboard/Makefile | 2 - + drivers/input/keyboard/davinci_keyscan.c | 315 -- + drivers/input/keyboard/mtk-pmic-keys.c | 17 + + drivers/input/keyboard/pxa930_rotary.c | 195 - + drivers/input/mouse/Kconfig | 6 - + drivers/input/mouse/Makefile | 1 - + drivers/input/mouse/pxa930_trkball.c | 250 - + drivers/input/touchscreen/Kconfig | 42 - + drivers/input/touchscreen/Makefile | 3 - + drivers/input/touchscreen/mainstone-wm97xx.c | 10 - + drivers/input/touchscreen/s3c2410_ts.c | 464 -- + drivers/input/touchscreen/ucb1400_ts.c | 458 -- + drivers/input/touchscreen/zylonite-wm97xx.c | 220 - + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/qdu1000.c | 1067 +++++ + drivers/interconnect/qcom/qdu1000.h | 95 + + drivers/interconnect/qcom/sm8550.c | 2318 ++++++++++ + drivers/interconnect/qcom/sm8550.h | 178 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 2 +- + drivers/irqchip/Kconfig | 5 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-davinci-aintc.c | 163 - + drivers/leds/Kconfig | 8 - + drivers/leds/Makefile | 1 - + drivers/leds/leds-s3c24xx.c | 83 - + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/media/platform/samsung/s3c-camif/Kconfig | 8 +- + drivers/media/platform/ti/davinci/Kconfig | 16 - + drivers/media/platform/ti/davinci/Makefile | 3 - + drivers/media/platform/ti/davinci/vpbe.c | 840 ---- + drivers/media/platform/ti/davinci/vpbe_display.c | 1510 ------ + drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 ------- + drivers/media/platform/ti/davinci/vpbe_osd_regs.h | 352 -- + drivers/media/platform/ti/davinci/vpbe_venc.c | 676 --- + drivers/media/platform/ti/davinci/vpbe_venc_regs.h | 165 - + drivers/media/platform/ti/davinci/vpss.c | 529 --- + drivers/memory/renesas-rpc-if.c | 155 +- + drivers/memory/ti-emif-pm.c | 7 +- + drivers/mfd/Kconfig | 62 +- + drivers/mfd/Makefile | 7 - + drivers/mfd/asic3.c | 1071 ----- + drivers/mfd/htc-pasic3.c | 210 - + drivers/mfd/t7l66xb.c | 427 -- + drivers/mfd/tc6387xb.c | 228 - + drivers/mfd/tc6393xb.c | 907 ---- + drivers/mfd/tmio_core.c | 70 - + drivers/mfd/ucb1400_core.c | 158 - + drivers/misc/fastrpc.c | 2 +- + drivers/mmc/host/Kconfig | 68 +- + drivers/mmc/host/Makefile | 3 - + drivers/mmc/host/s3cmci.c | 1777 -------- + drivers/mmc/host/s3cmci.h | 75 - + drivers/mmc/host/sdhci-cns3xxx.c | 113 - + drivers/mmc/host/sdhci-msm.c | 2 +- + drivers/mmc/host/tmio_mmc.c | 227 - + drivers/mtd/hyperbus/rpc-if.c | 18 +- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/nand/raw/s3c2410.c | 60 - + drivers/net/ipa/ipa_main.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 2 +- + drivers/parport/Kconfig | 11 - + drivers/parport/Makefile | 1 - + drivers/parport/parport_ax88796.c | 418 -- + drivers/pcmcia/Kconfig | 12 +- + drivers/pcmcia/Makefile | 5 - + drivers/pcmcia/pxa2xx_base.c | 8 +- + drivers/pcmcia/pxa2xx_mainstone.c | 122 - + drivers/pcmcia/sa1100_generic.c | 5 +- + drivers/pcmcia/sa1100_h3600.c | 2 +- + drivers/pcmcia/sa1100_simpad.c | 115 - + drivers/pcmcia/sa1111_badge4.c | 158 - + drivers/pcmcia/sa1111_generic.c | 8 - + drivers/pcmcia/sa1111_lubbock.c | 155 - + drivers/phy/samsung/phy-exynos-dp-video.c | 7 +- + drivers/phy/samsung/phy-exynos-mipi-video.c | 7 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/pinctrl/samsung/Kconfig | 5 - + drivers/pinctrl/samsung/Makefile | 1 - + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 653 --- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 - + drivers/power/supply/Kconfig | 37 +- + drivers/power/supply/Makefile | 5 +- + drivers/power/supply/ds2760_battery.c | 8 - + drivers/power/supply/pda_power.c | 520 --- + drivers/power/supply/qcom_battmgr.c | 1411 ++++++ + drivers/power/supply/s3c_adc_battery.c | 453 -- + drivers/power/supply/tosa_battery.c | 512 --- + drivers/power/supply/z2_battery.c | 318 -- + drivers/remoteproc/qcom_q6v5_mss.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/rtc/Kconfig | 17 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-v3020.c | 369 -- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 4 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 17 + + drivers/soc/apple/apple-pmgr-pwrstate.c | 11 +- + drivers/soc/apple/rtkit-crashlog.c | 93 + + drivers/soc/apple/rtkit.c | 36 +- + drivers/soc/atmel/soc.c | 9 + + drivers/soc/atmel/soc.h | 3 + + drivers/soc/bcm/bcm2835-power.c | 6 - + drivers/soc/imx/Kconfig | 11 + + drivers/soc/imx/Makefile | 6 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 27 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 108 + + drivers/soc/imx/imx93-pd.c | 1 - + drivers/soc/imx/imx93-src.c | 1 - + drivers/soc/mediatek/Kconfig | 7 +- + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mt8186-pm-domains.h | 4 +- + drivers/soc/mediatek/mt8188-mmsys.h | 149 + + drivers/soc/mediatek/mt8188-pm-domains.h | 623 +++ + drivers/soc/mediatek/mt8195-mmsys.h | 146 + + drivers/soc/mediatek/mtk-devapc.c | 11 +- + drivers/soc/mediatek/mtk-mmsys.c | 200 +- + drivers/soc/mediatek/mtk-mmsys.h | 2 + + drivers/soc/mediatek/mtk-mutex.c | 113 +- + drivers/soc/mediatek/mtk-pm-domains.c | 13 + + drivers/soc/mediatek/mtk-pm-domains.h | 5 + + drivers/soc/mediatek/mtk-regulator-coupler.c | 159 + + drivers/soc/mediatek/mtk-svs.c | 155 +- + drivers/soc/nuvoton/Kconfig | 11 + + drivers/soc/nuvoton/Makefile | 2 + + drivers/soc/nuvoton/wpcm450-soc.c | 109 + + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 3 + + drivers/soc/qcom/mdt_loader.c | 2 +- + drivers/soc/qcom/ocmem.c | 2 +- + drivers/soc/qcom/pmic_glink.c | 336 ++ + drivers/soc/qcom/pmic_glink_altmode.c | 478 ++ + drivers/soc/qcom/qcom_stats.c | 10 +- + drivers/soc/qcom/ramp_controller.c | 343 ++ + drivers/soc/qcom/rmtfs_mem.c | 31 +- + drivers/soc/qcom/rpmhpd.c | 34 + + drivers/soc/qcom/rpmpd.c | 18 - + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/socinfo.c | 112 +- + drivers/soc/renesas/Kconfig | 4 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/pwc-rzv2m.c | 141 + + drivers/soc/renesas/r8a779g0-sysc.c | 1 + + drivers/soc/samsung/Kconfig | 26 +- + drivers/soc/samsung/Makefile | 1 - + drivers/soc/samsung/s3c-pm-debug.c | 79 - + drivers/soc/sifive/Kconfig | 2 +- + drivers/soc/starfive/Kconfig | 12 + + drivers/soc/starfive/Makefile | 3 + + drivers/soc/starfive/jh71xx_pmu.c | 383 ++ + drivers/soc/sunxi/Kconfig | 9 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sun20i-ppu.c | 207 + + drivers/soc/sunxi/sunxi_sram.c | 3 + + drivers/soc/ti/smartreflex.c | 4 - + drivers/soc/xilinx/xlnx_event_manager.c | 4 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 2 +- + drivers/spi/Kconfig | 24 - + drivers/spi/Makefile | 3 - + drivers/spi/spi-omap-100k.c | 490 -- + drivers/spi/spi-omap-uwire.c | 16 +- + drivers/spi/spi-rpc-if.c | 14 +- + drivers/spi/spi-s3c24xx-regs.h | 41 - + drivers/spi/spi-s3c24xx.c | 596 --- + drivers/staging/media/Kconfig | 1 - + drivers/staging/media/Makefile | 1 - + .../staging/media/deprecated/vpfe_capture/Kconfig | 58 - + .../staging/media/deprecated/vpfe_capture/Makefile | 4 - + drivers/staging/media/deprecated/vpfe_capture/TODO | 7 - + .../media/deprecated/vpfe_capture/ccdc_hw_device.h | 80 - + .../media/deprecated/vpfe_capture/dm355_ccdc.c | 934 ---- + .../media/deprecated/vpfe_capture/dm355_ccdc.h | 308 -- + .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 -- + .../media/deprecated/vpfe_capture/dm644x_ccdc.c | 879 ---- + .../media/deprecated/vpfe_capture/dm644x_ccdc.h | 171 - + .../deprecated/vpfe_capture/dm644x_ccdc_regs.h | 140 - + .../staging/media/deprecated/vpfe_capture/isif.c | 1127 ----- + .../staging/media/deprecated/vpfe_capture/isif.h | 518 --- + .../media/deprecated/vpfe_capture/isif_regs.h | 256 -- + .../media/deprecated/vpfe_capture/vpfe_capture.c | 1902 -------- + drivers/thermal/qcom/lmh.c | 2 +- + drivers/tty/serial/Kconfig | 8 +- + drivers/tty/serial/samsung_tty.c | 199 - + drivers/ufs/host/ufs-qcom-ice.c | 2 +- + drivers/usb/gadget/udc/Kconfig | 26 - + drivers/usb/gadget/udc/Makefile | 2 - + drivers/usb/gadget/udc/omap_udc.c | 24 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 62 - + drivers/usb/gadget/udc/s3c-hsudc.c | 1319 ------ + drivers/usb/gadget/udc/s3c2410_udc.c | 1980 -------- + drivers/usb/gadget/udc/s3c2410_udc.h | 99 - + drivers/usb/gadget/udc/s3c2410_udc_regs.h | 146 - + drivers/usb/host/Kconfig | 32 +- + drivers/usb/host/ohci-hcd.c | 18 - + drivers/usb/host/ohci-omap.c | 14 +- + drivers/usb/host/ohci-pxa27x.c | 9 - + drivers/usb/host/ohci-sa1111.c | 5 +- + drivers/usb/host/ohci-tmio.c | 364 -- + drivers/usb/phy/Kconfig | 17 - + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-isp1301-omap.c | 1639 ------- + drivers/video/backlight/locomolcd.c | 10 - + drivers/video/fbdev/Kconfig | 72 +- + drivers/video/fbdev/Makefile | 3 - + drivers/video/fbdev/omap/Kconfig | 9 - + drivers/video/fbdev/omap/Makefile | 6 - + drivers/video/fbdev/omap/lcd_h3.c | 82 - + drivers/video/fbdev/omap/lcd_htcherald.c | 59 - + drivers/video/fbdev/omap/lcd_inn1510.c | 69 - + drivers/video/fbdev/omap/lcd_inn1610.c | 99 - + drivers/video/fbdev/omap/lcd_palmtt.c | 65 - + drivers/video/fbdev/omap/lcd_palmz71.c | 59 - + drivers/video/fbdev/omap/lcdc.c | 2 - + drivers/video/fbdev/s3c2410fb-regs-lcd.h | 143 - + drivers/video/fbdev/s3c2410fb.c | 1142 ----- + drivers/video/fbdev/s3c2410fb.h | 48 - + drivers/video/fbdev/sa1100fb.c | 1 - + drivers/video/fbdev/tmiofb.c | 1040 ----- + drivers/video/fbdev/w100fb.c | 1644 ------- + drivers/video/fbdev/w100fb.h | 924 ---- + drivers/w1/masters/Kconfig | 7 - + drivers/w1/masters/Makefile | 1 - + drivers/w1/masters/ds1wm.c | 675 --- + drivers/watchdog/Kconfig | 9 +- + drivers/watchdog/s3c2410_wdt.c | 84 +- + drivers/watchdog/wdt285.c | 2 - + fs/debugfs/file.c | 1 + + include/dt-bindings/arm/qcom,ids.h | 83 + + include/dt-bindings/clock/qcom,qdu1000-gcc.h | 175 + + include/dt-bindings/clock/qcom,sm6350-camcc.h | 109 + + include/dt-bindings/clock/qcom,sm8550-dispcc.h | 101 + + include/dt-bindings/clock/qcom,sm8550-tcsr.h | 18 + + include/dt-bindings/clock/s3c2410.h | 59 - + include/dt-bindings/clock/s3c2412.h | 70 - + include/dt-bindings/clock/s3c2443.h | 91 - + include/dt-bindings/firmware/qcom,scm.h | 16 + + .../dt-bindings/interconnect/qcom,qdu1000-rpmh.h | 98 + + .../dt-bindings/interconnect/qcom,sm8550-rpmh.h | 189 + + include/dt-bindings/pinctrl/k3.h | 3 + + .../dt-bindings/power/allwinner,sun20i-d1-ppu.h | 10 + + include/dt-bindings/power/mediatek,mt8188-power.h | 44 + + include/dt-bindings/power/meson-g12a-power.h | 1 + + include/dt-bindings/power/qcom-rpmpd.h | 31 +- + include/dt-bindings/power/r8a779g0-sysc.h | 1 + + include/dt-bindings/power/starfive,jh7110-pmu.h | 17 + + .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 +- + include/dt-bindings/reset/mt8195-resets.h | 45 + + include/linux/amba/pl093.h | 77 - + include/linux/clk/davinci.h | 9 - + include/linux/clk/samsung.h | 32 - + include/linux/{ => firmware/qcom}/qcom_scm.h | 6 +- + include/linux/firmware/xlnx-zynqmp.h | 4 + + include/linux/mfd/asic3.h | 313 -- + include/linux/mfd/htc-pasic3.h | 54 - + include/linux/mfd/t7l66xb.h | 29 - + include/linux/mfd/tc6387xb.h | 19 - + include/linux/mfd/tc6393xb.h | 53 - + include/linux/mfd/tmio.h | 5 - + include/linux/parport.h | 5 - + include/linux/pda_power.h | 39 - + include/linux/platform_data/asoc-palm27x.h | 9 - + include/linux/platform_data/asoc-poodle.h | 16 - + include/linux/platform_data/asoc-s3c24xx_simtec.h | 30 - + include/linux/platform_data/ata-samsung_cf.h | 31 - + include/linux/platform_data/clk-s3c2410.h | 19 - + include/linux/platform_data/dma-mmp_tdma.h | 36 - + include/linux/platform_data/dma-s3c24xx.h | 48 - + include/linux/platform_data/fb-s3c2410.h | 99 - + include/linux/platform_data/irda-pxaficp.h | 26 - + include/linux/platform_data/irda-sa11x0.h | 17 - + .../linux/platform_data/keyboard-pxa930_rotary.h | 21 - + include/linux/platform_data/leds-omap.h | 19 - + include/linux/platform_data/leds-s3c24xx.h | 18 - + include/linux/platform_data/media/s5p_hdmi.h | 32 - + include/linux/platform_data/mmc-s3cmci.h | 51 - + include/linux/platform_data/mmp_audio.h | 18 - + include/linux/platform_data/mouse-pxa930_trkball.h | 11 - + include/linux/platform_data/rtc-v3020.h | 41 - + include/linux/platform_data/s3c-hsudc.h | 33 - + include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 - + include/linux/platform_data/usb-s3c2410_udc.h | 33 - + include/linux/platform_data/voltage-omap.h | 1 - + include/linux/power/smartreflex.h | 3 - + include/linux/s3c_adc_battery.h | 39 - + include/linux/scmi_protocol.h | 5 - + include/linux/soc/apple/rtkit.h | 26 + + include/linux/soc/mediatek/infracfg.h | 121 + + include/linux/soc/mediatek/mtk-mmsys.h | 25 + + include/linux/soc/mmp/cputype.h | 24 +- + include/linux/soc/qcom/apr.h | 2 +- + include/linux/soc/qcom/pmic_glink.h | 32 + + include/linux/soc/samsung/s3c-adc.h | 32 - + include/linux/soc/samsung/s3c-cpu-freq.h | 145 - + include/linux/soc/samsung/s3c-cpufreq-core.h | 299 -- + include/linux/soc/samsung/s3c-pm.h | 58 - + include/linux/soc/ti/omap1-soc.h | 35 - + include/linux/spi/s3c24xx-fiq.h | 33 - + include/linux/spi/s3c24xx.h | 20 - + include/linux/ucb1400.h | 160 - + include/linux/usb/musb.h | 2 - + include/linux/z2_battery.h | 17 - + include/media/davinci/vpbe.h | 184 - + include/media/davinci/vpbe_display.h | 122 - + include/media/davinci/vpbe_osd.h | 382 -- + include/media/davinci/vpbe_types.h | 74 - + include/media/davinci/vpbe_venc.h | 37 - + include/media/davinci/vpfe_capture.h | 177 - + include/media/davinci/vpss.h | 111 - + include/memory/renesas-rpc-if.h | 34 +- + include/sound/s3c24xx_uda134x.h | 14 - + include/trace/events/scmi.h | 18 +- + include/video/w100fb.h | 147 - + scripts/Makefile.defconf | 29 + + scripts/kconfig/merge_config.sh | 25 +- + sound/Kconfig | 1 - + sound/pci/ac97/ac97_codec.c | 1 - + sound/pci/ac97/ac97_patch.c | 40 - + sound/soc/cirrus/Kconfig | 23 - + sound/soc/cirrus/Makefile | 6 - + sound/soc/cirrus/ep93xx-ac97.c | 446 -- + sound/soc/cirrus/simone.c | 86 - + sound/soc/cirrus/snappercl15.c | 134 - + sound/soc/pxa/Kconfig | 176 - + sound/soc/pxa/Makefile | 33 - + sound/soc/pxa/brownstone.c | 133 - + sound/soc/pxa/corgi.c | 332 -- + sound/soc/pxa/e740_wm9705.c | 168 - + sound/soc/pxa/e750_wm9705.c | 147 - + sound/soc/pxa/e800_wm9712.c | 147 - + sound/soc/pxa/em-x270.c | 92 - + sound/soc/pxa/hx4700.c | 207 - + sound/soc/pxa/magician.c | 366 -- + sound/soc/pxa/mioa701_wm9713.c | 201 - + sound/soc/pxa/mmp-pcm.c | 267 -- + sound/soc/pxa/palm27x.c | 162 - + sound/soc/pxa/poodle.c | 291 -- + sound/soc/pxa/tosa.c | 255 -- + sound/soc/pxa/ttc-dkb.c | 143 - + sound/soc/pxa/z2.c | 218 - + sound/soc/pxa/zylonite.c | 266 -- + sound/soc/qcom/qdsp6/q6core.c | 4 +- + sound/soc/samsung/Kconfig | 93 - + sound/soc/samsung/Makefile | 26 - + sound/soc/samsung/h1940_uda1380.c | 224 - + sound/soc/samsung/jive_wm8750.c | 143 - + sound/soc/samsung/neo1973_wm8753.c | 360 -- + sound/soc/samsung/regs-i2s-v2.h | 111 - + sound/soc/samsung/regs-iis.h | 66 - + sound/soc/samsung/rx1950_uda1380.c | 245 - + sound/soc/samsung/s3c-i2s-v2.c | 670 --- + sound/soc/samsung/s3c-i2s-v2.h | 108 - + sound/soc/samsung/s3c2412-i2s.c | 251 - + sound/soc/samsung/s3c2412-i2s.h | 22 - + sound/soc/samsung/s3c24xx-i2s.c | 463 -- + sound/soc/samsung/s3c24xx-i2s.h | 31 - + sound/soc/samsung/s3c24xx_simtec.c | 372 -- + sound/soc/samsung/s3c24xx_simtec.h | 18 - + sound/soc/samsung/s3c24xx_simtec_hermes.c | 112 - + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 100 - + sound/soc/samsung/s3c24xx_uda134x.c | 257 -- + sound/soc/samsung/smartq_wm8987.c | 224 - + sound/soc/samsung/smdk_wm8580.c | 211 - + sound/soc/ti/Kconfig | 40 - + sound/soc/ti/Makefile | 2 - + sound/soc/ti/davinci-evm.c | 267 +- + sound/soc/ti/davinci-vcif.c | 247 - + 1976 files changed, 88865 insertions(+), 174681 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc + create mode 100644 Documentation/ABI/testing/debugfs-scmi + create mode 100644 Documentation/ABI/testing/debugfs-scmi-raw + delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/cpufreq.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/eb2410itx.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/gpio.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/h1940.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/index.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/nand.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/overview.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/s3c2412.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/s3c2413.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/smdk2440.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/suspend.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/usb-host.rst + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qdu1000-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8550-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt + create mode 100644 Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8550-rpmh.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/samsung,s3cmci.txt + rename Documentation/devicetree/bindings/phy/{phy-rockchip-inno-usb2.yaml => rockchip,inno-usb2phy.yaml} (98%) + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt + create mode 100644 Documentation/devicetree/bindings/power/allwinner,sun20i-d1-ppu.yaml + create mode 100644 Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml + create mode 100644 Documentation/devicetree/bindings/riscv/sunxi.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,rzv2m-pwc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml + delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-greatlakes.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ufispace-ncplite.dts + create mode 100644 arch/arm/boot/dts/at91-sam9x60_curiosity.dts + create mode 100644 arch/arm/boot/dts/exynos5422-samsung-k3g.dts + create mode 100644 arch/arm/boot/dts/imx53-sk-imx53.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-drc02.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-picoitx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-som-cfg-sdcard.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-dhcor-som.dtsi + create mode 100644 arch/arm/boot/dts/rk3128-evb.dts + create mode 100644 arch/arm/boot/dts/rk3128.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/rv1126.dtsi + delete mode 100644 arch/arm/boot/dts/s3c2410-pinctrl.h + delete mode 100644 arch/arm/boot/dts/s3c2416-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/s3c2416-smdk2416.dts + delete mode 100644 arch/arm/boot/dts/s3c2416.dtsi + delete mode 100644 arch/arm/boot/dts/s3c24xx.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_pe1.dts + delete mode 100644 arch/arm/configs/badge4_defconfig + delete mode 100644 arch/arm/configs/cerfcube_defconfig + delete mode 100644 arch/arm/configs/cm_x300_defconfig + delete mode 100644 arch/arm/configs/cns3420vb_defconfig + delete mode 100644 arch/arm/configs/colibri_pxa270_defconfig + delete mode 100644 arch/arm/configs/colibri_pxa300_defconfig + delete mode 100644 arch/arm/configs/corgi_defconfig + delete mode 100644 arch/arm/configs/eseries_pxa_defconfig + delete mode 100644 arch/arm/configs/ezx_defconfig + delete mode 100644 arch/arm/configs/h5000_defconfig + delete mode 100644 arch/arm/configs/hackkit_defconfig + delete mode 100644 arch/arm/configs/iop32x_defconfig + delete mode 100644 arch/arm/configs/lart_defconfig + create mode 100644 arch/arm/configs/lpae.config + delete mode 100644 arch/arm/configs/lpd270_defconfig + delete mode 100644 arch/arm/configs/lubbock_defconfig + delete mode 100644 arch/arm/configs/magician_defconfig + delete mode 100644 arch/arm/configs/mainstone_defconfig + delete mode 100644 arch/arm/configs/mini2440_defconfig + delete mode 100644 arch/arm/configs/palmz72_defconfig + delete mode 100644 arch/arm/configs/pcm027_defconfig + delete mode 100644 arch/arm/configs/pleb_defconfig + delete mode 100644 arch/arm/configs/pxa255-idp_defconfig + delete mode 100644 arch/arm/configs/s3c2410_defconfig + delete mode 100644 arch/arm/configs/shannon_defconfig + delete mode 100644 arch/arm/configs/simpad_defconfig + delete mode 100644 arch/arm/configs/tct_hammer_defconfig + delete mode 100644 arch/arm/configs/trizeps4_defconfig + delete mode 100644 arch/arm/configs/viper_defconfig + create mode 100644 arch/arm/configs/wpcm450_defconfig + delete mode 100644 arch/arm/configs/xcep_defconfig + delete mode 100644 arch/arm/configs/zeus_defconfig + delete mode 100644 arch/arm/mach-cns3xxx/Kconfig + delete mode 100644 arch/arm/mach-cns3xxx/Makefile + delete mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c + delete mode 100644 arch/arm/mach-cns3xxx/cns3xxx.h + delete mode 100644 arch/arm/mach-cns3xxx/core.c + delete mode 100644 arch/arm/mach-cns3xxx/core.h + delete mode 100644 arch/arm/mach-cns3xxx/devices.c + delete mode 100644 arch/arm/mach-cns3xxx/devices.h + delete mode 100644 arch/arm/mach-cns3xxx/pcie.c + delete mode 100644 arch/arm/mach-cns3xxx/pm.c + delete mode 100644 arch/arm/mach-cns3xxx/pm.h + delete mode 100644 arch/arm/mach-davinci/asp.h + delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c + delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c + delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c + delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c + delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c + delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c + delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c + delete mode 100644 arch/arm/mach-davinci/davinci.h + delete mode 100644 arch/arm/mach-davinci/devices.c + delete mode 100644 arch/arm/mach-davinci/dm355.c + delete mode 100644 arch/arm/mach-davinci/dm365.c + delete mode 100644 arch/arm/mach-davinci/serial.c + delete mode 100644 arch/arm/mach-davinci/serial.h + delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c + delete mode 100644 arch/arm/mach-davinci/usb.c + delete mode 100644 arch/arm/mach-dove/dove-db-setup.c + delete mode 100644 arch/arm/mach-ep93xx/adssphere.c + delete mode 100644 arch/arm/mach-ep93xx/gesbc9312.c + delete mode 100644 arch/arm/mach-ep93xx/micro9.c + delete mode 100644 arch/arm/mach-ep93xx/simone.c + delete mode 100644 arch/arm/mach-ep93xx/snappercl15.c + delete mode 100644 arch/arm/mach-footbridge/cats-hw.c + delete mode 100644 arch/arm/mach-footbridge/cats-pci.c + delete mode 100644 arch/arm/mach-iop32x/Kconfig + delete mode 100644 arch/arm/mach-iop32x/Makefile + delete mode 100644 arch/arm/mach-iop32x/adma.c + delete mode 100644 arch/arm/mach-iop32x/cp6.c + delete mode 100644 arch/arm/mach-iop32x/em7210.c + delete mode 100644 arch/arm/mach-iop32x/glantank.c + delete mode 100644 arch/arm/mach-iop32x/glantank.h + delete mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h + delete mode 100644 arch/arm/mach-iop32x/hardware.h + delete mode 100644 arch/arm/mach-iop32x/i2c.c + delete mode 100644 arch/arm/mach-iop32x/iop3xx.h + delete mode 100644 arch/arm/mach-iop32x/iq31244.c + delete mode 100644 arch/arm/mach-iop32x/iq31244.h + delete mode 100644 arch/arm/mach-iop32x/iq80321.c + delete mode 100644 arch/arm/mach-iop32x/iq80321.h + delete mode 100644 arch/arm/mach-iop32x/irq.c + delete mode 100644 arch/arm/mach-iop32x/irqs.h + delete mode 100644 arch/arm/mach-iop32x/n2100.c + delete mode 100644 arch/arm/mach-iop32x/n2100.h + delete mode 100644 arch/arm/mach-iop32x/pci.c + delete mode 100644 arch/arm/mach-iop32x/pmu.c + delete mode 100644 arch/arm/mach-iop32x/restart.c + delete mode 100644 arch/arm/mach-iop32x/setup.c + delete mode 100644 arch/arm/mach-iop32x/time.c + delete mode 100644 arch/arm/mach-mmp/aspenite.c + delete mode 100644 arch/arm/mach-mmp/avengers_lite.c + delete mode 100644 arch/arm/mach-mmp/brownstone.c + delete mode 100644 arch/arm/mach-mmp/devices.c + delete mode 100644 arch/arm/mach-mmp/devices.h + delete mode 100644 arch/arm/mach-mmp/flint.c + delete mode 100644 arch/arm/mach-mmp/gplugd.c + delete mode 100644 arch/arm/mach-mmp/irqs.h + delete mode 100644 arch/arm/mach-mmp/jasper.c + delete mode 100644 arch/arm/mach-mmp/mfp-mmp2.h + delete mode 100644 arch/arm/mach-mmp/mfp-pxa168.h + delete mode 100644 arch/arm/mach-mmp/mfp-pxa910.h + delete mode 100644 arch/arm/mach-mmp/mfp.h + delete mode 100644 arch/arm/mach-mmp/mmp2.c + delete mode 100644 arch/arm/mach-mmp/mmp2.h + delete mode 100644 arch/arm/mach-mmp/pm-mmp2.c + delete mode 100644 arch/arm/mach-mmp/pm-mmp2.h + delete mode 100644 arch/arm/mach-mmp/pm-pxa910.c + delete mode 100644 arch/arm/mach-mmp/pm-pxa910.h + delete mode 100644 arch/arm/mach-mmp/pxa168.c + delete mode 100644 arch/arm/mach-mmp/pxa168.h + delete mode 100644 arch/arm/mach-mmp/pxa910.c + delete mode 100644 arch/arm/mach-mmp/pxa910.h + delete mode 100644 arch/arm/mach-mmp/regs-apbc.h + delete mode 100644 arch/arm/mach-mmp/regs-apmu.h + delete mode 100644 arch/arm/mach-mmp/regs-icu.h + delete mode 100644 arch/arm/mach-mmp/regs-usb.h + delete mode 100644 arch/arm/mach-mmp/sram.c + delete mode 100644 arch/arm/mach-mmp/teton_bga.c + delete mode 100644 arch/arm/mach-mmp/teton_bga.h + delete mode 100644 arch/arm/mach-mmp/ttc_dkb.c + delete mode 100644 arch/arm/mach-mv78xx0/db78x00-bp-setup.c + delete mode 100644 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c + delete mode 100644 arch/arm/mach-omap1/board-fsample.c + delete mode 100644 arch/arm/mach-omap1/board-generic.c + delete mode 100644 arch/arm/mach-omap1/board-h2-mmc.c + delete mode 100644 arch/arm/mach-omap1/board-h2.c + delete mode 100644 arch/arm/mach-omap1/board-h2.h + delete mode 100644 arch/arm/mach-omap1/board-h3-mmc.c + delete mode 100644 arch/arm/mach-omap1/board-h3.c + delete mode 100644 arch/arm/mach-omap1/board-h3.h + delete mode 100644 arch/arm/mach-omap1/board-htcherald.c + delete mode 100644 arch/arm/mach-omap1/board-innovator.c + delete mode 100644 arch/arm/mach-omap1/board-nand.c + delete mode 100644 arch/arm/mach-omap1/board-palmtt.c + delete mode 100644 arch/arm/mach-omap1/board-palmz71.c + delete mode 100644 arch/arm/mach-omap1/board-perseus2.c + delete mode 100644 arch/arm/mach-omap1/fpga.c + delete mode 100644 arch/arm/mach-omap1/fpga.h + delete mode 100644 arch/arm/mach-omap1/gpio7xx.c + delete mode 100644 arch/arm/mach-omap1/omap1510.h + delete mode 100644 arch/arm/mach-omap1/omap16xx.h + delete mode 100644 arch/arm/mach-omap1/omap7xx.h + delete mode 100644 arch/arm/mach-omap2/clock3xxx.h + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c + delete mode 100644 arch/arm/mach-omap2/pm24xx.c + delete mode 100644 arch/arm/mach-omap2/serial.h + delete mode 100644 arch/arm/mach-omap2/usb.h + delete mode 100644 arch/arm/mach-orion5x/db88f5281-setup.c + delete mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5182-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c + delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c + delete mode 100644 arch/arm/mach-orion5x/wrt350n-v2-setup.c + delete mode 100644 arch/arm/mach-pxa/balloon3-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/balloon3.c + delete mode 100644 arch/arm/mach-pxa/balloon3.h + delete mode 100644 arch/arm/mach-pxa/capc7117.c + delete mode 100644 arch/arm/mach-pxa/cm-x300.c + delete mode 100644 arch/arm/mach-pxa/colibri-evalboard.c + delete mode 100644 arch/arm/mach-pxa/colibri-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa270-income.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa270.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa300.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa320.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa3xx.c + delete mode 100644 arch/arm/mach-pxa/colibri.h + delete mode 100644 arch/arm/mach-pxa/corgi.c + delete mode 100644 arch/arm/mach-pxa/corgi.h + delete mode 100644 arch/arm/mach-pxa/corgi_pm.c + delete mode 100644 arch/arm/mach-pxa/csb701.c + delete mode 100644 arch/arm/mach-pxa/csb726.c + delete mode 100644 arch/arm/mach-pxa/csb726.h + delete mode 100644 arch/arm/mach-pxa/e740-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/eseries-gpio.h + delete mode 100644 arch/arm/mach-pxa/eseries-irq.h + delete mode 100644 arch/arm/mach-pxa/eseries.c + delete mode 100644 arch/arm/mach-pxa/ezx.c + delete mode 100644 arch/arm/mach-pxa/h5000.c + delete mode 100644 arch/arm/mach-pxa/h5000.h + delete mode 100644 arch/arm/mach-pxa/himalaya.c + delete mode 100644 arch/arm/mach-pxa/hx4700-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/hx4700.c + delete mode 100644 arch/arm/mach-pxa/hx4700.h + delete mode 100644 arch/arm/mach-pxa/icontrol.c + delete mode 100644 arch/arm/mach-pxa/idp.c + delete mode 100644 arch/arm/mach-pxa/idp.h + delete mode 100644 arch/arm/mach-pxa/littleton.c + delete mode 100644 arch/arm/mach-pxa/littleton.h + delete mode 100644 arch/arm/mach-pxa/lpd270.c + delete mode 100644 arch/arm/mach-pxa/lpd270.h + delete mode 100644 arch/arm/mach-pxa/lubbock.c + delete mode 100644 arch/arm/mach-pxa/lubbock.h + delete mode 100644 arch/arm/mach-pxa/magician.c + delete mode 100644 arch/arm/mach-pxa/magician.h + delete mode 100644 arch/arm/mach-pxa/mainstone.c + delete mode 100644 arch/arm/mach-pxa/mainstone.h + delete mode 100644 arch/arm/mach-pxa/mfp-pxa930.h + delete mode 100644 arch/arm/mach-pxa/mioa701.c + delete mode 100644 arch/arm/mach-pxa/mioa701.h + delete mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S + delete mode 100644 arch/arm/mach-pxa/mp900.c + delete mode 100644 arch/arm/mach-pxa/mxm8x10.c + delete mode 100644 arch/arm/mach-pxa/mxm8x10.h + delete mode 100644 arch/arm/mach-pxa/palm27x.c + delete mode 100644 arch/arm/mach-pxa/palm27x.h + delete mode 100644 arch/arm/mach-pxa/palmld-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmld.c + delete mode 100644 arch/arm/mach-pxa/palmld.h + delete mode 100644 arch/arm/mach-pxa/palmt5.c + delete mode 100644 arch/arm/mach-pxa/palmt5.h + delete mode 100644 arch/arm/mach-pxa/palmtc-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmtc.c + delete mode 100644 arch/arm/mach-pxa/palmtc.h + delete mode 100644 arch/arm/mach-pxa/palmte2.c + delete mode 100644 arch/arm/mach-pxa/palmte2.h + delete mode 100644 arch/arm/mach-pxa/palmtreo.c + delete mode 100644 arch/arm/mach-pxa/palmtreo.h + delete mode 100644 arch/arm/mach-pxa/palmtx-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmtx.c + delete mode 100644 arch/arm/mach-pxa/palmtx.h + delete mode 100644 arch/arm/mach-pxa/palmz72.c + delete mode 100644 arch/arm/mach-pxa/palmz72.h + delete mode 100644 arch/arm/mach-pxa/pcm027.c + delete mode 100644 arch/arm/mach-pxa/pcm027.h + delete mode 100644 arch/arm/mach-pxa/pcm990-baseboard.c + delete mode 100644 arch/arm/mach-pxa/pcm990_baseboard.h + delete mode 100644 arch/arm/mach-pxa/poodle.c + delete mode 100644 arch/arm/mach-pxa/poodle.h + delete mode 100644 arch/arm/mach-pxa/pxa3xx-ulpi.c + delete mode 100644 arch/arm/mach-pxa/pxa930.c + delete mode 100644 arch/arm/mach-pxa/pxa930.h + delete mode 100644 arch/arm/mach-pxa/pxa_cplds_irqs.c + delete mode 100644 arch/arm/mach-pxa/regs-u2d.h + delete mode 100644 arch/arm/mach-pxa/regs-uart.h + delete mode 100644 arch/arm/mach-pxa/saar.c + delete mode 100644 arch/arm/mach-pxa/tavorevb.c + delete mode 100644 arch/arm/mach-pxa/tosa-bt.c + delete mode 100644 arch/arm/mach-pxa/tosa.c + delete mode 100644 arch/arm/mach-pxa/tosa.h + delete mode 100644 arch/arm/mach-pxa/tosa_bt.h + delete mode 100644 arch/arm/mach-pxa/trizeps4-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/trizeps4.c + delete mode 100644 arch/arm/mach-pxa/trizeps4.h + delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.h + delete mode 100644 arch/arm/mach-pxa/viper.c + delete mode 100644 arch/arm/mach-pxa/viper.h + delete mode 100644 arch/arm/mach-pxa/vpac270-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/vpac270.c + delete mode 100644 arch/arm/mach-pxa/vpac270.h + delete mode 100644 arch/arm/mach-pxa/xcep.c + delete mode 100644 arch/arm/mach-pxa/z2.c + delete mode 100644 arch/arm/mach-pxa/z2.h + delete mode 100644 arch/arm/mach-pxa/zeus.c + delete mode 100644 arch/arm/mach-pxa/zeus.h + delete mode 100644 arch/arm/mach-pxa/zylonite.c + delete mode 100644 arch/arm/mach-pxa/zylonite.h + delete mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c + delete mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c + delete mode 100644 arch/arm/mach-s3c/Kconfig.s3c24xx + delete mode 100644 arch/arm/mach-s3c/Makefile.s3c24xx + delete mode 100644 arch/arm/mach-s3c/adc-core.h + delete mode 100644 arch/arm/mach-s3c/adc.c + delete mode 100644 arch/arm/mach-s3c/anubis.h + delete mode 100644 arch/arm/mach-s3c/ata-core-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/backlight-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/bast-ide.c + delete mode 100644 arch/arm/mach-s3c/bast-irq.c + delete mode 100644 arch/arm/mach-s3c/bast.h + delete mode 100644 arch/arm/mach-s3c/common-smdk-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/common-smdk-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/dev-backlight-s3c64xx.c + delete mode 100644 arch/arm/mach-s3c/dma-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/dma-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/dma.h + delete mode 100644 arch/arm/mach-s3c/fb-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/gpio-samsung-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/gta02.h + delete mode 100644 arch/arm/mach-s3c/h1940-bluetooth.c + delete mode 100644 arch/arm/mach-s3c/h1940.h + delete mode 100644 arch/arm/mach-s3c/hardware-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/iotiming-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/iotiming-s3c2412.c + delete mode 100644 arch/arm/mach-s3c/irq-pm-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq.S + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/irqs-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/mach-amlm5900.c + delete mode 100644 arch/arm/mach-s3c/mach-anubis.c + delete mode 100644 arch/arm/mach-s3c/mach-anw6410.c + delete mode 100644 arch/arm/mach-s3c/mach-at2440evb.c + delete mode 100644 arch/arm/mach-s3c/mach-bast.c + delete mode 100644 arch/arm/mach-s3c/mach-gta02.c + delete mode 100644 arch/arm/mach-s3c/mach-h1940.c + delete mode 100644 arch/arm/mach-s3c/mach-hmt.c + delete mode 100644 arch/arm/mach-s3c/mach-jive.c + delete mode 100644 arch/arm/mach-s3c/mach-mini2440.c + delete mode 100644 arch/arm/mach-s3c/mach-mini6410.c + delete mode 100644 arch/arm/mach-s3c/mach-n30.c + delete mode 100644 arch/arm/mach-s3c/mach-ncp.c + delete mode 100644 arch/arm/mach-s3c/mach-nexcoder.c + delete mode 100644 arch/arm/mach-s3c/mach-osiris-dvs.c + delete mode 100644 arch/arm/mach-s3c/mach-osiris.c + delete mode 100644 arch/arm/mach-s3c/mach-otom.c + delete mode 100644 arch/arm/mach-s3c/mach-qt2410.c + delete mode 100644 arch/arm/mach-s3c/mach-real6410.c + delete mode 100644 arch/arm/mach-s3c/mach-rx1950.c + delete mode 100644 arch/arm/mach-s3c/mach-rx3715.c + delete mode 100644 arch/arm/mach-s3c/mach-s3c2416-dt.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq.h + delete mode 100644 arch/arm/mach-s3c/mach-smartq5.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq7.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2410.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2413.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2416.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2440.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2443.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk6400.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk6410.c + delete mode 100644 arch/arm/mach-s3c/mach-tct_hammer.c + delete mode 100644 arch/arm/mach-s3c/mach-vr1000.c + delete mode 100644 arch/arm/mach-s3c/mach-vstms.c + delete mode 100644 arch/arm/mach-s3c/map-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/nand-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/onenand-core-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/osiris.h + delete mode 100644 arch/arm/mach-s3c/otom.h + delete mode 100644 arch/arm/mach-s3c/pll-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/pll-s3c2440-12000000.c + delete mode 100644 arch/arm/mach-s3c/pll-s3c2440-16934400.c + delete mode 100644 arch/arm/mach-s3c/pm-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/pm-h1940.S + delete mode 100644 arch/arm/mach-s3c/pm-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c2412.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c2416.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/regs-adc.h + delete mode 100644 arch/arm/mach-s3c/regs-clock-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-dsc-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-gpio-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-irq-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-mem-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-s3c2443-clock.h + delete mode 100644 arch/arm/mach-s3c/regs-srom-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/rtc-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/s3c2410.c + delete mode 100644 arch/arm/mach-s3c/s3c2412-power.h + delete mode 100644 arch/arm/mach-s3c/s3c2412.c + delete mode 100644 arch/arm/mach-s3c/s3c2412.h + delete mode 100644 arch/arm/mach-s3c/s3c2416.c + delete mode 100644 arch/arm/mach-s3c/s3c2440.c + delete mode 100644 arch/arm/mach-s3c/s3c2442.c + delete mode 100644 arch/arm/mach-s3c/s3c2443.c + delete mode 100644 arch/arm/mach-s3c/s3c244x.c + delete mode 100644 arch/arm/mach-s3c/s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/s3c6400.c + delete mode 100644 arch/arm/mach-s3c/setup-i2c-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-ide-s3c64xx.c + delete mode 100644 arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-spi-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-ts-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/simtec-audio.c + delete mode 100644 arch/arm/mach-s3c/simtec-nor.c + delete mode 100644 arch/arm/mach-s3c/simtec-pm.c + delete mode 100644 arch/arm/mach-s3c/simtec-usb.c + delete mode 100644 arch/arm/mach-s3c/simtec.h + delete mode 100644 arch/arm/mach-s3c/sleep-s3c2410.S + delete mode 100644 arch/arm/mach-s3c/sleep-s3c2412.S + delete mode 100644 arch/arm/mach-s3c/sleep-s3c24xx.S + delete mode 100644 arch/arm/mach-s3c/spi-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/vr1000.h + delete mode 100644 arch/arm/mach-sa1100/badge4.c + delete mode 100644 arch/arm/mach-sa1100/cerf.c + delete mode 100644 arch/arm/mach-sa1100/h3100.c + delete mode 100644 arch/arm/mach-sa1100/hackkit.c + delete mode 100644 arch/arm/mach-sa1100/include/mach/badge4.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/cerf.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/shannon.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/simpad.h + delete mode 100644 arch/arm/mach-sa1100/lart.c + delete mode 100644 arch/arm/mach-sa1100/nanoengine.c + delete mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c + delete mode 100644 arch/arm/mach-sa1100/pleb.c + delete mode 100644 arch/arm/mach-sa1100/shannon.c + delete mode 100644 arch/arm/mach-sa1100/simpad.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-yavia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-yavia.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm8010.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550ve.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qdu1000-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/qdu1000.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qru1000-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/qru1000.dtsi + rename arch/arm64/boot/dts/qcom/{pm8450a.dtsi => sa8540p-pmics.dtsi} (69%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd-pro.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-pro-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am69-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4.dtsi + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) + create mode 100644 arch/arm64/configs/virt.config + create mode 100644 arch/riscv/boot/dts/allwinner/Makefile + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi + create mode 100644 arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi + create mode 100644 arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-tysom-m-fabric.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts + delete mode 100644 drivers/ata/pata_palmld.c + delete mode 100644 drivers/ata/pata_samsung_cf.c + delete mode 100644 drivers/clk/davinci/pll-dm355.c + delete mode 100644 drivers/clk/davinci/pll-dm365.c + delete mode 100644 drivers/clk/davinci/psc-dm355.c + delete mode 100644 drivers/clk/davinci/psc-dm365.c + delete mode 100644 drivers/clk/samsung/clk-s3c2410-dclk.c + delete mode 100644 drivers/clk/samsung/clk-s3c2410.c + delete mode 100644 drivers/clk/samsung/clk-s3c2412.c + delete mode 100644 drivers/clk/samsung/clk-s3c2443.c + delete mode 100644 drivers/cpufreq/s3c2410-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2412-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2416-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2440-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c24xx-cpufreq-debugfs.c + delete mode 100644 drivers/cpufreq/s3c24xx-cpufreq.c + delete mode 100644 drivers/cpufreq/sa1100-cpufreq.c + delete mode 100644 drivers/dma/s3c24xx-dma.c + create mode 100644 drivers/firmware/arm_scmi/raw_mode.c + create mode 100644 drivers/firmware/arm_scmi/raw_mode.h + delete mode 100644 drivers/gpio/gpio-iop.c + delete mode 100644 drivers/gpio/gpio-ucb1400.c + delete mode 100644 drivers/hwmon/s3c-hwmon.c + delete mode 100644 drivers/input/keyboard/davinci_keyscan.c + delete mode 100644 drivers/input/keyboard/pxa930_rotary.c + delete mode 100644 drivers/input/mouse/pxa930_trkball.c + delete mode 100644 drivers/input/touchscreen/s3c2410_ts.c + delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c + delete mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c + create mode 100644 drivers/interconnect/qcom/qdu1000.c + create mode 100644 drivers/interconnect/qcom/qdu1000.h + create mode 100644 drivers/interconnect/qcom/sm8550.c + create mode 100644 drivers/interconnect/qcom/sm8550.h + delete mode 100644 drivers/irqchip/irq-davinci-aintc.c + delete mode 100644 drivers/leds/leds-s3c24xx.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h + delete mode 100644 drivers/media/platform/ti/davinci/vpss.c + delete mode 100644 drivers/mfd/asic3.c + delete mode 100644 drivers/mfd/htc-pasic3.c + delete mode 100644 drivers/mfd/t7l66xb.c + delete mode 100644 drivers/mfd/tc6387xb.c + delete mode 100644 drivers/mfd/tc6393xb.c + delete mode 100644 drivers/mfd/tmio_core.c + delete mode 100644 drivers/mfd/ucb1400_core.c + delete mode 100644 drivers/mmc/host/s3cmci.c + delete mode 100644 drivers/mmc/host/s3cmci.h + delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c + delete mode 100644 drivers/mmc/host/tmio_mmc.c + delete mode 100644 drivers/parport/parport_ax88796.c + delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c + delete mode 100644 drivers/pcmcia/sa1100_simpad.c + delete mode 100644 drivers/pcmcia/sa1111_badge4.c + delete mode 100644 drivers/pcmcia/sa1111_lubbock.c + delete mode 100644 drivers/pinctrl/samsung/pinctrl-s3c24xx.c + delete mode 100644 drivers/power/supply/pda_power.c + create mode 100644 drivers/power/supply/qcom_battmgr.c + delete mode 100644 drivers/power/supply/s3c_adc_battery.c + delete mode 100644 drivers/power/supply/tosa_battery.c + delete mode 100644 drivers/power/supply/z2_battery.c + delete mode 100644 drivers/rtc/rtc-v3020.c + create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h + create mode 100644 drivers/soc/mediatek/mt8188-pm-domains.h + create mode 100644 drivers/soc/mediatek/mtk-regulator-coupler.c + create mode 100644 drivers/soc/nuvoton/Kconfig + create mode 100644 drivers/soc/nuvoton/Makefile + create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c + create mode 100644 drivers/soc/qcom/pmic_glink.c + create mode 100644 drivers/soc/qcom/pmic_glink_altmode.c + create mode 100644 drivers/soc/qcom/ramp_controller.c + create mode 100644 drivers/soc/renesas/pwc-rzv2m.c + delete mode 100644 drivers/soc/samsung/s3c-pm-debug.c + create mode 100644 drivers/soc/starfive/Kconfig + create mode 100644 drivers/soc/starfive/Makefile + create mode 100644 drivers/soc/starfive/jh71xx_pmu.c + create mode 100644 drivers/soc/sunxi/sun20i-ppu.c + delete mode 100644 drivers/spi/spi-omap-100k.c + delete mode 100644 drivers/spi/spi-s3c24xx-regs.h + delete mode 100644 drivers/spi/spi-s3c24xx.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c + delete mode 100644 drivers/usb/gadget/udc/s3c-hsudc.c + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc.c + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc.h + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc_regs.h + delete mode 100644 drivers/usb/host/ohci-tmio.c + delete mode 100644 drivers/usb/phy/phy-isp1301-omap.c + delete mode 100644 drivers/video/fbdev/omap/lcd_h3.c + delete mode 100644 drivers/video/fbdev/omap/lcd_htcherald.c + delete mode 100644 drivers/video/fbdev/omap/lcd_inn1510.c + delete mode 100644 drivers/video/fbdev/omap/lcd_inn1610.c + delete mode 100644 drivers/video/fbdev/omap/lcd_palmtt.c + delete mode 100644 drivers/video/fbdev/omap/lcd_palmz71.c + delete mode 100644 drivers/video/fbdev/s3c2410fb-regs-lcd.h + delete mode 100644 drivers/video/fbdev/s3c2410fb.c + delete mode 100644 drivers/video/fbdev/s3c2410fb.h + delete mode 100644 drivers/video/fbdev/tmiofb.c + delete mode 100644 drivers/video/fbdev/w100fb.c + delete mode 100644 drivers/video/fbdev/w100fb.h + delete mode 100644 drivers/w1/masters/ds1wm.c + create mode 100644 include/dt-bindings/clock/qcom,qdu1000-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6350-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-tcsr.h + delete mode 100644 include/dt-bindings/clock/s3c2410.h + delete mode 100644 include/dt-bindings/clock/s3c2412.h + delete mode 100644 include/dt-bindings/clock/s3c2443.h + create mode 100644 include/dt-bindings/firmware/qcom,scm.h + create mode 100644 include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8550-rpmh.h + create mode 100644 include/dt-bindings/power/allwinner,sun20i-d1-ppu.h + create mode 100644 include/dt-bindings/power/mediatek,mt8188-power.h + create mode 100644 include/dt-bindings/power/starfive,jh7110-pmu.h + delete mode 100644 include/linux/amba/pl093.h + rename include/linux/{ => firmware/qcom}/qcom_scm.h (96%) + delete mode 100644 include/linux/mfd/asic3.h + delete mode 100644 include/linux/mfd/htc-pasic3.h + delete mode 100644 include/linux/mfd/t7l66xb.h + delete mode 100644 include/linux/mfd/tc6387xb.h + delete mode 100644 include/linux/mfd/tc6393xb.h + delete mode 100644 include/linux/pda_power.h + delete mode 100644 include/linux/platform_data/asoc-palm27x.h + delete mode 100644 include/linux/platform_data/asoc-poodle.h + delete mode 100644 include/linux/platform_data/asoc-s3c24xx_simtec.h + delete mode 100644 include/linux/platform_data/ata-samsung_cf.h + delete mode 100644 include/linux/platform_data/clk-s3c2410.h + delete mode 100644 include/linux/platform_data/dma-mmp_tdma.h + delete mode 100644 include/linux/platform_data/dma-s3c24xx.h + delete mode 100644 include/linux/platform_data/fb-s3c2410.h + delete mode 100644 include/linux/platform_data/irda-pxaficp.h + delete mode 100644 include/linux/platform_data/irda-sa11x0.h + delete mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h + delete mode 100644 include/linux/platform_data/leds-omap.h + delete mode 100644 include/linux/platform_data/leds-s3c24xx.h + delete mode 100644 include/linux/platform_data/media/s5p_hdmi.h + delete mode 100644 include/linux/platform_data/mmc-s3cmci.h + delete mode 100644 include/linux/platform_data/mmp_audio.h + delete mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h + delete mode 100644 include/linux/platform_data/rtc-v3020.h + delete mode 100644 include/linux/platform_data/s3c-hsudc.h + delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h + delete mode 100644 include/linux/platform_data/usb-s3c2410_udc.h + delete mode 100644 include/linux/s3c_adc_battery.h + create mode 100644 include/linux/soc/qcom/pmic_glink.h + delete mode 100644 include/linux/soc/samsung/s3c-adc.h + delete mode 100644 include/linux/soc/samsung/s3c-cpu-freq.h + delete mode 100644 include/linux/soc/samsung/s3c-cpufreq-core.h + delete mode 100644 include/linux/spi/s3c24xx-fiq.h + delete mode 100644 include/linux/spi/s3c24xx.h + delete mode 100644 include/linux/ucb1400.h + delete mode 100644 include/linux/z2_battery.h + delete mode 100644 include/media/davinci/vpbe.h + delete mode 100644 include/media/davinci/vpbe_display.h + delete mode 100644 include/media/davinci/vpbe_osd.h + delete mode 100644 include/media/davinci/vpbe_types.h + delete mode 100644 include/media/davinci/vpbe_venc.h + delete mode 100644 include/media/davinci/vpfe_capture.h + delete mode 100644 include/media/davinci/vpss.h + delete mode 100644 include/sound/s3c24xx_uda134x.h + delete mode 100644 include/video/w100fb.h + create mode 100644 scripts/Makefile.defconf + delete mode 100644 sound/soc/cirrus/ep93xx-ac97.c + delete mode 100644 sound/soc/cirrus/simone.c + delete mode 100644 sound/soc/cirrus/snappercl15.c + delete mode 100644 sound/soc/pxa/brownstone.c + delete mode 100644 sound/soc/pxa/corgi.c + delete mode 100644 sound/soc/pxa/e740_wm9705.c + delete mode 100644 sound/soc/pxa/e750_wm9705.c + delete mode 100644 sound/soc/pxa/e800_wm9712.c + delete mode 100644 sound/soc/pxa/em-x270.c + delete mode 100644 sound/soc/pxa/hx4700.c + delete mode 100644 sound/soc/pxa/magician.c + delete mode 100644 sound/soc/pxa/mioa701_wm9713.c + delete mode 100644 sound/soc/pxa/mmp-pcm.c + delete mode 100644 sound/soc/pxa/palm27x.c + delete mode 100644 sound/soc/pxa/poodle.c + delete mode 100644 sound/soc/pxa/tosa.c + delete mode 100644 sound/soc/pxa/ttc-dkb.c + delete mode 100644 sound/soc/pxa/z2.c + delete mode 100644 sound/soc/pxa/zylonite.c + delete mode 100644 sound/soc/samsung/h1940_uda1380.c + delete mode 100644 sound/soc/samsung/jive_wm8750.c + delete mode 100644 sound/soc/samsung/neo1973_wm8753.c + delete mode 100644 sound/soc/samsung/regs-i2s-v2.h + delete mode 100644 sound/soc/samsung/regs-iis.h + delete mode 100644 sound/soc/samsung/rx1950_uda1380.c + delete mode 100644 sound/soc/samsung/s3c-i2s-v2.c + delete mode 100644 sound/soc/samsung/s3c-i2s-v2.h + delete mode 100644 sound/soc/samsung/s3c2412-i2s.c + delete mode 100644 sound/soc/samsung/s3c2412-i2s.h + delete mode 100644 sound/soc/samsung/s3c24xx-i2s.c + delete mode 100644 sound/soc/samsung/s3c24xx-i2s.h + delete mode 100644 sound/soc/samsung/s3c24xx_simtec.c + delete mode 100644 sound/soc/samsung/s3c24xx_simtec.h + delete mode 100644 sound/soc/samsung/s3c24xx_simtec_hermes.c + delete mode 100644 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c + delete mode 100644 sound/soc/samsung/s3c24xx_uda134x.c + delete mode 100644 sound/soc/samsung/smartq_wm8987.c + delete mode 100644 sound/soc/samsung/smdk_wm8580.c + delete mode 100644 sound/soc/ti/davinci-vcif.c +Merging amlogic/for-next (b6520fc7ee57 Merge branch 'v6.2/fixes' 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. +Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (af06aa236dd7 ARM: Add wpcm450_defconfig for Nuvoton WPCM450) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. +Merging at91/at91-next (05ccf9c9c2fc Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + drivers/clk/at91/Makefile | 16 ++++++++-------- + drivers/clk/at91/at91rm9200.c | 2 +- + drivers/clk/at91/at91sam9260.c | 2 +- + drivers/clk/at91/at91sam9g45.c | 10 ++++++++-- + drivers/clk/at91/at91sam9n12.c | 12 +++++++++--- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 17 ++++++++++++----- + drivers/clk/at91/clk-peripheral.c | 8 ++++---- + drivers/clk/at91/clk-system.c | 4 ++-- + drivers/clk/at91/dt-compat.c | 25 +++++++++++++++++++++++-- + drivers/clk/at91/pmc.h | 4 ++-- + drivers/clk/at91/sam9x60.c | 20 ++++++++++++++++---- + drivers/clk/at91/sama5d2.c | 22 +++++++++++++++++----- + drivers/clk/at91/sama5d3.c | 20 ++++++++++++++++---- + drivers/clk/at91/sama5d4.c | 22 +++++++++++++++++----- + drivers/clk/at91/sama7g5.c | 4 ++-- + 16 files changed, 139 insertions(+), 51 deletions(-) +Merging broadcom/next (b691373a1bec Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm47622.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63138.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63148.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63178.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6756.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6846.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm6855.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6878.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm947622.dts | 4 ++++ + arch/arm/boot/dts/bcm963138.dts | 4 ++++ + arch/arm/boot/dts/bcm963138dvt.dts | 4 ++++ + arch/arm/boot/dts/bcm963148.dts | 4 ++++ + arch/arm/boot/dts/bcm963178.dts | 4 ++++ + arch/arm/boot/dts/bcm96756.dts | 4 ++++ + arch/arm/boot/dts/bcm96846.dts | 4 ++++ + arch/arm/boot/dts/bcm96855.dts | 4 ++++ + arch/arm/boot/dts/bcm96878.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 ++++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 +++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 +++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 ++++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + drivers/bus/brcmstb_gisb.c | 4 +--- + 33 files changed, 346 insertions(+), 4 deletions(-) +Merging davinci/davinci/for-next (eaafab7e8e26 MAINTAINERS: make me the maintainer of DaVinci platforms) + eaafab7e8e26 ("MAINTAINERS: make me the maintainer of DaVinci platforms") +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (957b573ea840 Merge branch 'mem-ctrl-next' into for-next) +$ 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. +Merging imx-mxs/for-next (fd5368f6f08b Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (74ba8bb2bfb2 Merge branch 'v6.2-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 +Merge made by the 'ort' strategy. +Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (b836adb6d62d Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' 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 +Merge made by the 'ort' strategy. + .../bindings/clock/qcom,camcc-sm8250.yaml | 20 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 44 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 38 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 8 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 - + .../bindings/clock/qcom,gpucc-sm8350.yaml | 71 - + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 46 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 6 +- + .../bindings/clock/qcom,msm8996-cbf.yaml | 53 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sa8775p-gcc.yaml | 84 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 - + .../bindings/clock/qcom,spmi-clkdiv.yaml | 71 + + .../devicetree/bindings/clock/qcom,videocc.yaml | 59 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 +- + drivers/base/power/domain.c | 26 + + drivers/clk/clk.c | 57 +- + drivers/clk/qcom/Kconfig | 40 + + drivers/clk/qcom/Makefile | 7 +- + drivers/clk/qcom/apcs-msm8996.c | 88 + + drivers/clk/qcom/camcc-sc7280.c | 268 +- + drivers/clk/qcom/camcc-sdm845.c | 1 + + drivers/clk/qcom/camcc-sm6350.c | 1906 ++++++++ + drivers/clk/qcom/camcc-sm8450.c | 324 +- + drivers/clk/qcom/clk-alpha-pll.c | 5 + + drivers/clk/qcom/clk-alpha-pll.h | 1 + + drivers/clk/qcom/clk-cbf-8996.c | 315 ++ + drivers/clk/qcom/clk-cpu-8996.c | 146 +- + drivers/clk/qcom/clk-rpmh.c | 56 + + drivers/clk/qcom/clk-smd-rpm.c | 1445 +++--- + drivers/clk/qcom/clk-spmi-pmic-div.c | 10 +- + drivers/clk/qcom/dispcc-qcm2290.c | 6 - + drivers/clk/qcom/dispcc-sc7180.c | 8 +- + drivers/clk/qcom/dispcc-sc8280xp.c | 1 + + drivers/clk/qcom/dispcc-sdm845.c | 1 + + drivers/clk/qcom/dispcc-sm6115.c | 4 +- + drivers/clk/qcom/dispcc-sm6125.c | 2 +- + drivers/clk/qcom/dispcc-sm6375.c | 4 +- + drivers/clk/qcom/dispcc-sm8250.c | 9 +- + drivers/clk/qcom/dispcc-sm8450.c | 221 +- + drivers/clk/qcom/dispcc-sm8550.c | 1807 ++++++++ + drivers/clk/qcom/gcc-apq8084.c | 1024 +++-- + drivers/clk/qcom/gcc-ipq8074.c | 4 +- + drivers/clk/qcom/gcc-msm8939.c | 32 +- + drivers/clk/qcom/gcc-msm8974.c | 10 +- + drivers/clk/qcom/gcc-msm8976.c | 30 +- + drivers/clk/qcom/gcc-msm8998.c | 13 - + drivers/clk/qcom/gcc-qcs404.c | 842 ++-- + drivers/clk/qcom/gcc-qdu1000.c | 2653 +++++++++++ + drivers/clk/qcom/gcc-sa8775p.c | 4785 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sc7180.c | 19 +- + drivers/clk/qcom/gcc-sc7280.c | 10 +- + drivers/clk/qcom/gcc-sc8280xp.c | 1 + + drivers/clk/qcom/gcc-sdm845.c | 1 + + drivers/clk/qcom/gcc-sdx55.c | 64 +- + drivers/clk/qcom/gcc-sdx65.c | 109 +- + drivers/clk/qcom/gcc-sm6115.c | 4 +- + drivers/clk/qcom/gcc-sm6375.c | 257 +- + drivers/clk/qcom/gcc-sm8150.c | 17 - + drivers/clk/qcom/gcc-sm8250.c | 10 +- + drivers/clk/qcom/gcc-sm8350.c | 15 - + drivers/clk/qcom/gcc-sm8450.c | 236 +- + drivers/clk/qcom/gcc-sm8550.c | 252 +- + drivers/clk/qcom/gdsc.c | 11 +- + drivers/clk/qcom/gpucc-msm8998.c | 8 +- + drivers/clk/qcom/gpucc-sc7180.c | 11 +- + drivers/clk/qcom/gpucc-sdm845.c | 8 +- + drivers/clk/qcom/krait-cc.c | 4 +- + drivers/clk/qcom/lpasscc-sc7280.c | 10 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 20 +- + drivers/clk/qcom/mmcc-apq8084.c | 1189 ++--- + drivers/clk/qcom/mmcc-msm8998.c | 25 - + drivers/clk/qcom/tcsrcc-sm8550.c | 192 + + drivers/clk/qcom/videocc-sm8250.c | 9 +- + include/dt-bindings/clock/qcom,gcc-apq8084.h | 1 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + + include/dt-bindings/clock/qcom,gcc-sm8350.h | 1 - + include/dt-bindings/clock/qcom,gcc-sm8450.h | 1 - + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/clock/qcom,sa8775p-gcc.h | 320 ++ + include/linux/clk-provider.h | 1 + + include/linux/pm_domain.h | 5 + + include/linux/soc/qcom/smd-rpm.h | 1 - + 87 files changed, 15865 insertions(+), 3699 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc-sm8350.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8996-cbf.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sa8775p-gcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.yaml + create mode 100644 drivers/clk/qcom/apcs-msm8996.c + create mode 100644 drivers/clk/qcom/camcc-sm6350.c + create mode 100644 drivers/clk/qcom/clk-cbf-8996.c + create mode 100644 drivers/clk/qcom/dispcc-sm8550.c + create mode 100644 drivers/clk/qcom/gcc-qdu1000.c + create mode 100644 drivers/clk/qcom/gcc-sa8775p.c + create mode 100644 drivers/clk/qcom/tcsrcc-sm8550.c + create mode 100644 include/dt-bindings/clock/qcom,sa8775p-gcc.h +Merging renesas/next (8dd3dae1705b Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (cc2b5be472c0 Merge branch 'v6.3-armsoc/dts32' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + drivers/clk/rockchip/clk-rk3399.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging samsung-krzk/for-next (dd3d835d31ed Merge branch 'fixes' 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. +Merging scmi/for-linux-next (6d796c50f84c Linux 6.2-rc6) +$ 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 +Already up to date. +Merging stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (caea0128c038 Merge branch 'sunxi/dt-for-6.3' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/Kconfig | 71 ++++++++++++++++--------------- + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 13 +++++- + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 15 ++++--- + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 8 ++-- + drivers/clk/sunxi-ng/ccu_mp.c | 11 ++--- + drivers/clk/sunxi-ng/ccu_nk.c | 9 ++-- + drivers/clk/sunxi-ng/ccu_nkm.c | 10 ++--- + drivers/clk/sunxi-ng/ccu_nkmp.c | 10 ++--- + drivers/clk/sunxi-ng/ccu_nm.c | 9 ++-- + include/dt-bindings/clock/sun20i-d1-ccu.h | 2 + + include/dt-bindings/reset/sun20i-d1-ccu.h | 2 + + 12 files changed, 93 insertions(+), 69 deletions(-) +Merging tee/next (816477edfba6 mm: Remove get_kernel_pages()) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging include/linux/mm.h +Merge made by the 'ort' strategy. + drivers/tee/tee_shm.c | 37 ++++++++++--------------------------- + include/linux/highmem-internal.h | 5 ++++- + include/linux/mm.h | 2 -- + mm/swap.c | 30 ------------------------------ + 4 files changed, 14 insertions(+), 60 deletions(-) +Merging tegra/for-next (de98d45290c7 Merge branch for-6.3/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging ti/ti-next (47d72bbb6c0f arm64: dts: ti: Makefile: Rearrange entries alphabetically) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (8a9fbf00acfe Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/clk.c +Merge made by the 'ort' strategy. + .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 1 + + .../arm/mediatek/mediatek,mt8195-clock.yaml | 16 - + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + + .../devicetree/bindings/clock/idt,versaclock5.yaml | 1 + + .../devicetree/bindings/clock/imx8m-clock.yaml | 2 +- + .../bindings/clock/loongson,ls2k-clk.yaml | 63 ++ + .../bindings/clock/mediatek,apmixedsys.yaml | 1 + + .../bindings/clock/mediatek,topckgen.yaml | 1 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 1 + + MAINTAINERS | 8 + + drivers/clk/Kconfig | 1 - + drivers/clk/clk-renesas-pcie.c | 1 - + drivers/clk/clk-versaclock5.c | 28 +- + drivers/clk/clk.c | 11 + + drivers/clk/imx/Kconfig | 2 +- + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-gpr-mux.c | 119 +++ + drivers/clk/imx/clk-imx25.c | 2 +- + drivers/clk/imx/clk-imx27.c | 2 +- + drivers/clk/imx/clk-imx35.c | 2 +- + drivers/clk/imx/clk-imx5.c | 6 +- + drivers/clk/imx/clk-imx6q.c | 15 +- + drivers/clk/imx/clk-imx6sl.c | 2 +- + drivers/clk/imx/clk-imx6sll.c | 2 +- + drivers/clk/imx/clk-imx6sx.c | 2 +- + drivers/clk/imx/clk-imx6ul.c | 33 +- + drivers/clk/imx/clk-imx7d.c | 2 +- + drivers/clk/imx/clk-imx7ulp.c | 4 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx8mq.c | 2 +- + drivers/clk/imx/clk-imx8ulp.c | 2 +- + drivers/clk/imx/clk-imx93.c | 2 + + drivers/clk/imx/clk-imxrt1050.c | 4 + + drivers/clk/imx/clk-pfd.c | 2 + + drivers/clk/imx/clk-pll14xx.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 2 + + drivers/clk/imx/clk.c | 31 +- + drivers/clk/imx/clk.h | 12 +- + drivers/clk/mediatek/Kconfig | 49 +- + drivers/clk/mediatek/Makefile | 10 +- + drivers/clk/mediatek/clk-cpumux.c | 8 +- + drivers/clk/mediatek/clk-cpumux.h | 2 +- + drivers/clk/mediatek/clk-gate.c | 23 +- + drivers/clk/mediatek/clk-gate.h | 7 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 31 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 36 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 56 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 38 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 4 +- + drivers/clk/mediatek/clk-mt2701.c | 24 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 4 +- + drivers/clk/mediatek/clk-mt2712.c | 99 +- + drivers/clk/mediatek/clk-mt6765.c | 13 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 59 +- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 6 +- + drivers/clk/mediatek/clk-mt6795-mm.c | 3 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 6 +- + drivers/clk/mediatek/clk-mt6795-topckgen.c | 84 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6797.c | 7 +- + drivers/clk/mediatek/clk-mt7622-aud.c | 54 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 82 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 85 +- + drivers/clk/mediatek/clk-mt7622.c | 26 +- + drivers/clk/mediatek/clk-mt7629-eth.c | 7 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 85 +- + drivers/clk/mediatek/clk-mt7629.c | 22 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 102 ++ + drivers/clk/mediatek/clk-mt7981-eth.c | 118 ++ + drivers/clk/mediatek/clk-mt7981-infracfg.c | 207 ++++ + drivers/clk/mediatek/clk-mt7981-topckgen.c | 422 ++++++++ + drivers/clk/mediatek/clk-mt7986-eth.c | 10 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 7 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 100 +- + drivers/clk/mediatek/clk-mt8135.c | 18 +- + 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 | 4 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 3 +- + drivers/clk/mediatek/clk-mt8167.c | 12 +- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 157 +++ + drivers/clk/mediatek/clk-mt8173-img.c | 55 + + drivers/clk/mediatek/clk-mt8173-infracfg.c | 155 +++ + drivers/clk/mediatek/clk-mt8173-mm.c | 22 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 122 +++ + drivers/clk/mediatek/clk-mt8173-topckgen.c | 653 ++++++++++++ + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 57 + + drivers/clk/mediatek/clk-mt8173-vencsys.c | 64 ++ + drivers/clk/mediatek/clk-mt8173.c | 1125 -------------------- + drivers/clk/mediatek/clk-mt8183-audio.c | 27 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 4 +- + drivers/clk/mediatek/clk-mt8183.c | 130 +-- + drivers/clk/mediatek/clk-mt8186-mcu.c | 3 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 3 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 112 +- + drivers/clk/mediatek/clk-mt8192-aud.c | 30 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 3 +- + drivers/clk/mediatek/clk-mt8192.c | 182 +--- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 3 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 9 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 3 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 3 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 5 +- + drivers/clk/mediatek/clk-mt8365.c | 14 +- + drivers/clk/mediatek/clk-mt8516-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8516.c | 12 +- + drivers/clk/mediatek/clk-mtk.c | 136 ++- + drivers/clk/mediatek/clk-mtk.h | 35 +- + drivers/clk/mediatek/clk-mux.c | 14 +- + drivers/clk/mediatek/clk-mux.h | 3 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 9 +- + drivers/clk/meson/clk-dualdiv.c | 21 +- + drivers/clk/meson/clk-mpll.c | 20 +- + drivers/clk/meson/sclk-div.c | 11 +- + drivers/clk/ralink/clk-mt7621.c | 10 +- + drivers/clk/renesas/Kconfig | 2 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 126 +-- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 37 +- + drivers/clk/renesas/r9a06g032-clocks.c | 28 + + drivers/clk/renesas/r9a07g044-cpg.c | 26 +- + drivers/clk/renesas/r9a09g011-cpg.c | 73 ++ + drivers/clk/renesas/rcar-gen3-cpg.c | 17 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 156 +++ + drivers/clk/renesas/rcar-gen4-cpg.h | 3 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 35 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 14 - + drivers/clk/sprd/Kconfig | 2 + + include/dt-bindings/clock/imx6qdl-clock.h | 4 +- + include/dt-bindings/clock/imx6sll-clock.h | 2 +- + include/dt-bindings/clock/imx6ul-clock.h | 7 +- + include/dt-bindings/clock/imx8ulp-clock.h | 4 +- + include/dt-bindings/clock/loongson,ls2k-clk.h | 29 + + include/dt-bindings/clock/mediatek,mt7981-clk.h | 215 ++++ + include/dt-bindings/clock/stih416-clks.h | 17 - + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 +- + 143 files changed, 3972 insertions(+), 2509 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml + create mode 100644 drivers/clk/imx/clk-gpr-mux.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-apmixed.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-eth.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-pericfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-vdecsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-vencsys.c + delete mode 100644 drivers/clk/mediatek/clk-mt8173.c + create mode 100644 include/dt-bindings/clock/loongson,ls2k-clk.h + create mode 100644 include/dt-bindings/clock/mediatek,mt7981-clk.h + delete mode 100644 include/dt-bindings/clock/stih416-clks.h +Merging clk-imx/for-next (4e197ee880c2 clk: imx6ul: add ethernet refclock mux support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (b1dec4e78599 clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging 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 (4a3ec00957fd csky: delay: Add function alignment) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/lib/delay.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging loongarch/loongarch-next (2d94a107d041 selftests/ftrace: Add LoongArch kprobe args string tests support) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 22 ++ + arch/loongarch/Makefile | 5 + + arch/loongarch/include/asm/asm.h | 10 + + arch/loongarch/include/asm/cpu.h | 2 +- + arch/loongarch/include/asm/inst.h | 20 + + arch/loongarch/include/asm/kprobes.h | 61 ++++ + arch/loongarch/include/asm/ptrace.h | 1 + + arch/loongarch/kernel/Makefile | 6 +- + arch/loongarch/kernel/entry.S | 1 + + arch/loongarch/kernel/ftrace_dyn.c | 64 ++++ + arch/loongarch/kernel/inst.c | 123 +++++++ + arch/loongarch/kernel/kprobes.c | 406 +++++++++++++++++++++ + arch/loongarch/kernel/kprobes_trampoline.S | 96 +++++ + arch/loongarch/kernel/time.c | 11 +- + arch/loongarch/kernel/traps.c | 23 +- + arch/loongarch/lib/memcpy.S | 3 + + arch/loongarch/lib/memmove.S | 4 + + arch/loongarch/lib/memset.S | 3 + + arch/loongarch/mm/fault.c | 3 + + samples/kprobes/kprobe_example.c | 8 + + .../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 + + tools/scripts/Makefile.arch | 11 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 + + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 + + 25 files changed, 889 insertions(+), 16 deletions(-) + create mode 100644 arch/loongarch/include/asm/kprobes.h + create mode 100644 arch/loongarch/kernel/kprobes.c + create mode 100644 arch/loongarch/kernel/kprobes_trampoline.S + create mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h +Merging m68k/for-next (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'ort' strategy. + .../seccomp/seccomp-filter/arch-support.txt | 2 +- + arch/m68k/68000/entry.S | 2 + + arch/m68k/Kconfig | 2 + + arch/m68k/Kconfig.devices | 1 + + arch/m68k/coldfire/entry.S | 2 + + arch/m68k/configs/amiga_defconfig | 3 -- + arch/m68k/configs/apollo_defconfig | 3 -- + arch/m68k/configs/atari_defconfig | 3 -- + arch/m68k/configs/bvme6000_defconfig | 3 -- + arch/m68k/configs/hp300_defconfig | 3 -- + arch/m68k/configs/mac_defconfig | 3 -- + arch/m68k/configs/multi_defconfig | 4 +- + arch/m68k/configs/mvme147_defconfig | 3 -- + arch/m68k/configs/mvme16x_defconfig | 3 -- + arch/m68k/configs/q40_defconfig | 3 -- + arch/m68k/configs/sun3_defconfig | 3 -- + arch/m68k/configs/sun3x_defconfig | 3 -- + arch/m68k/include/asm/seccomp.h | 11 +++++ + arch/m68k/include/asm/syscall.h | 57 ++++++++++++++++++++++ + arch/m68k/include/asm/thread_info.h | 2 + + arch/m68k/kernel/entry.S | 6 +++ + arch/m68k/kernel/ptrace.c | 6 ++- + arch/m68k/q40/q40ints.c | 4 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 ++- + 24 files changed, 99 insertions(+), 41 deletions(-) + create mode 100644 arch/m68k/include/asm/seccomp.h +Merging m68knommu/for-next (5aa52ccf692b m68k: nommu: Fix misspellings of "DragonEngine") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/dragen2.c | 2 +- + arch/m68k/Kconfig.machine | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (1b929c02afd3 Linux 6.2-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 (85cc91e2ba42 mips: fix syscall_get_nr) +$ 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/Kconfig | 1 + + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 9 +++++ + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 10 +++--- + .../mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts | 6 ++-- + arch/mips/boot/dts/img/boston.dts | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 10 +++--- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 ++ + arch/mips/boot/dts/lantiq/danube.dtsi | 1 - + arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 6 ++-- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 8 ++--- + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 8 ++--- + arch/mips/boot/dts/qca/ar9331_omega.dts | 2 +- + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 8 ++--- + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 22 ++++++------ + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 20 ++++------- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 21 +++++++---- + arch/mips/boot/dts/ralink/mt7621.dtsi | 19 +++++++++- + arch/mips/cavium-octeon/octeon-usb.c | 42 +++++++++++----------- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-rc32434/pci.h | 2 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/kernel/smp-cps.c | 8 +++-- + arch/mips/lantiq/xway/dcdc.c | 5 +-- + arch/mips/lantiq/xway/dma.c | 4 +-- + arch/mips/lantiq/xway/gptu.c | 5 +-- + arch/mips/pci/pci-lantiq.c | 8 ++--- + arch/mips/pci/pci-mt7620.c | 8 ++--- + arch/mips/ralink/Kconfig | 5 +-- + arch/mips/ralink/timer.c | 3 +- + arch/mips/vdso/Kconfig | 14 +------- + arch/mips/vdso/Makefile | 3 -- + 32 files changed, 133 insertions(+), 133 deletions(-) +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ 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 (3125e3b8f24c parisc: update kbuild doc. aliases for parisc64) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + Documentation/kbuild/kbuild.rst | 1 + + arch/Kconfig | 10 ++++++++++ + arch/parisc/include/asm/cacheflush.h | 3 +++ + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/kernel/cache.c | 7 ++++++- + fs/readdir.c | 18 ++++++++++++++++++ + 6 files changed, 40 insertions(+), 1 deletion(-) +Merging powerpc/next (38d73b671a81 powerpc/64: Fix unannotated intra-function call warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/kernel/vdso/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-secvar | 75 +- + arch/powerpc/Kconfig | 19 +- + arch/powerpc/Makefile | 26 +- + arch/powerpc/boot/Makefile | 14 +- + arch/powerpc/configs/ps3_defconfig | 39 +- + arch/powerpc/crypto/crc32-vpmsum_core.S | 13 +- + arch/powerpc/include/asm/barrier.h | 12 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/hw_irq.h | 6 +- + arch/powerpc/include/asm/interrupt.h | 35 +- + arch/powerpc/include/asm/irq.h | 3 - + arch/powerpc/include/asm/machdep.h | 16 +- + arch/powerpc/include/asm/paca.h | 1 - + arch/powerpc/include/asm/papr-sysparm.h | 38 + + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/include/asm/plpks.h | 195 ++++ + arch/powerpc/include/asm/rtas-types.h | 2 - + arch/powerpc/include/asm/rtas-work-area.h | 96 ++ + arch/powerpc/include/asm/rtas.h | 184 ++++ + arch/powerpc/include/asm/secvar.h | 21 +- + arch/powerpc/include/asm/smp.h | 1 + + arch/powerpc/include/asm/trace.h | 103 ++ + arch/powerpc/kernel/Makefile | 10 + + arch/powerpc/kernel/eeh_driver.c | 4 +- + arch/powerpc/kernel/epapr_hcalls.S | 6 + + arch/powerpc/kernel/head_64.S | 51 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/irq_64.c | 105 +- + arch/powerpc/kernel/mce.c | 10 +- + arch/powerpc/kernel/module_64.c | 29 +- + arch/powerpc/kernel/pci_32.c | 17 +- + arch/powerpc/kernel/process.c | 14 +- + arch/powerpc/kernel/prom.c | 16 +- + arch/powerpc/kernel/rtas-proc.c | 24 +- + arch/powerpc/kernel/rtas-rtc.c | 6 +- + arch/powerpc/kernel/rtas.c | 1056 +++++++++++++++----- + arch/powerpc/kernel/rtas_flash.c | 21 +- + arch/powerpc/kernel/rtas_pci.c | 8 +- + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/secvar-ops.c | 10 +- + arch/powerpc/kernel/secvar-sysfs.c | 178 ++-- + arch/powerpc/kernel/setup-common.c | 4 + + arch/powerpc/kernel/setup_64.c | 16 +- + arch/powerpc/kernel/time.c | 4 +- + arch/powerpc/kernel/trace/Makefile | 1 + + arch/powerpc/kernel/vdso/Makefile | 1 + + arch/powerpc/kexec/file_load_64.c | 21 +- + arch/powerpc/lib/Makefile | 2 + + arch/powerpc/mm/book3s64/hash_utils.c | 3 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 73 +- + arch/powerpc/mm/nohash/e500_hugetlbpage.c | 5 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 2 +- + arch/powerpc/net/bpf_jit.h | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 91 +- + arch/powerpc/net/bpf_jit_comp32.c | 400 ++++---- + arch/powerpc/net/bpf_jit_comp64.c | 16 +- + arch/powerpc/perf/hv-24x7.c | 44 +- + arch/powerpc/platforms/44x/fsp2.c | 2 +- + arch/powerpc/platforms/52xx/efika.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 20 +- + arch/powerpc/platforms/cell/ras.c | 4 +- + arch/powerpc/platforms/cell/smp.c | 4 +- + arch/powerpc/platforms/chrp/nvram.c | 4 +- + arch/powerpc/platforms/chrp/pci.c | 4 +- + arch/powerpc/platforms/chrp/setup.c | 4 +- + arch/powerpc/platforms/maple/setup.c | 4 +- + arch/powerpc/platforms/powernv/opal-secvar.c | 60 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 3 +- + arch/powerpc/platforms/ps3/htab.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 20 +- + arch/powerpc/platforms/pseries/Makefile | 6 +- + arch/powerpc/platforms/pseries/dlpar.c | 29 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 22 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 +- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 37 +- + arch/powerpc/platforms/pseries/lparcfg.c | 104 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/nvram.c | 4 +- + arch/powerpc/platforms/pseries/papr-sysparm.c | 151 +++ + arch/powerpc/platforms/pseries/pci.c | 2 +- + arch/powerpc/platforms/pseries/plpks-secvar.c | 217 ++++ + arch/powerpc/platforms/pseries/plpks.c | 381 +++++-- + arch/powerpc/platforms/pseries/plpks.h | 71 -- + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/rtas-work-area.c | 209 ++++ + arch/powerpc/platforms/pseries/setup.c | 29 +- + arch/powerpc/platforms/pseries/smp.c | 12 +- + arch/powerpc/purgatory/Makefile | 1 + + arch/powerpc/sysdev/xics/ics-rtas.c | 8 +- + arch/powerpc/xmon/Makefile | 1 + + arch/powerpc/xmon/xmon.c | 16 +- + drivers/macintosh/windfarm_lm75_sensor.c | 4 +- + drivers/macintosh/windfarm_smu_sensors.c | 4 +- + security/integrity/platform_certs/load_powerpc.c | 47 +- + tools/testing/selftests/powerpc/dscr/dscr.h | 34 +- + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 25 +- + tools/testing/selftests/powerpc/include/utils.h | 20 +- + .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 52 +- + tools/testing/selftests/powerpc/pmu/lib.c | 34 +- + tools/testing/selftests/powerpc/ptrace/Makefile | 2 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 28 +- + tools/testing/selftests/powerpc/security/Makefile | 2 +- + .../selftests/powerpc/security/entry_flush.c | 12 +- + .../testing/selftests/powerpc/security/rfi_flush.c | 12 +- + .../selftests/powerpc/security/uaccess_flush.c | 18 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 4 +- + .../selftests/powerpc/syscalls/rtas_filter.c | 81 +- + tools/testing/selftests/powerpc/tm/Makefile | 2 +- + tools/testing/selftests/powerpc/utils.c | 412 ++++++-- + 111 files changed, 3822 insertions(+), 1582 deletions(-) + create mode 100644 arch/powerpc/include/asm/papr-sysparm.h + create mode 100644 arch/powerpc/include/asm/plpks.h + create mode 100644 arch/powerpc/include/asm/rtas-work-area.h + create mode 100644 arch/powerpc/platforms/pseries/papr-sysparm.c + create mode 100644 arch/powerpc/platforms/pseries/plpks-secvar.c + delete mode 100644 arch/powerpc/platforms/pseries/plpks.h + create mode 100644 arch/powerpc/platforms/pseries/rtas-work-area.c +Merging powerpc-objtool/topic/objtool (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'topic/objtool' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-objtool/topic/objtool +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (8658db0a4a0f RISC-V: move some stray __RISCV_INSN_FUNCS definitions from kprobes) +$ 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 arch/riscv/Kconfig.socs +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/include/asm/hwcap.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/vdso/processor.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/vdso/processor.h +Resolved 'arch/riscv/include/asm/hwcap.h' using previous resolution. +Resolved 'arch/riscv/include/asm/vdso/processor.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f1d6df87332f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.yaml | 2 +- + .../bindings/{arm => cpu}/cpu-capacity.txt | 4 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + Documentation/riscv/uabi.rst | 42 +++ + Documentation/scheduler/sched-capacity.rst | 2 +- + .../zh_CN/scheduler/sched-capacity.rst | 2 +- + arch/riscv/Kconfig | 76 +++-- + arch/riscv/Kconfig.socs | 5 +- + arch/riscv/Makefile | 9 +- + arch/riscv/errata/sifive/errata.c | 3 +- + arch/riscv/errata/thead/errata.c | 9 +- + arch/riscv/include/asm/alternative-macros.h | 20 +- + arch/riscv/include/asm/alternative.h | 20 +- + arch/riscv/include/asm/errata_list.h | 12 +- + arch/riscv/include/asm/ftrace.h | 50 ++- + arch/riscv/include/asm/hwcap.h | 98 +++--- + arch/riscv/include/asm/insn-def.h | 58 ++++ + arch/riscv/include/asm/insn.h | 377 +++++++++++++++++++++ + arch/riscv/include/asm/module.h | 16 + + arch/riscv/include/asm/parse_asm.h | 219 ------------ + arch/riscv/include/asm/pgtable.h | 2 +- + arch/riscv/include/asm/signal.h | 2 +- + arch/riscv/include/asm/string.h | 10 + + arch/riscv/include/asm/switch_to.h | 3 +- + arch/riscv/include/asm/vdso.h | 4 + + arch/riscv/kernel/alternative.c | 112 ++++++ + arch/riscv/kernel/cpu.c | 54 ++- + arch/riscv/kernel/cpufeature.c | 81 +---- + arch/riscv/kernel/ftrace.c | 65 ++-- + arch/riscv/kernel/kgdb.c | 63 ++-- + arch/riscv/kernel/mcount-dyn.S | 42 +-- + arch/riscv/kernel/module.c | 31 +- + arch/riscv/kernel/probes/simulate-insn.c | 19 +- + arch/riscv/kernel/probes/simulate-insn.h | 29 +- + arch/riscv/kernel/riscv_ksyms.c | 3 + + arch/riscv/kernel/setup.c | 3 + + arch/riscv/kernel/vdso.c | 5 - + arch/riscv/kernel/vdso/vdso.lds.S | 7 + + arch/riscv/kvm/tlb.c | 3 +- + arch/riscv/lib/Makefile | 3 + + arch/riscv/lib/strcmp.S | 121 +++++++ + arch/riscv/lib/strlen.S | 133 ++++++++ + arch/riscv/lib/strncmp.S | 139 ++++++++ + arch/riscv/purgatory/Makefile | 13 + + 44 files changed, 1380 insertions(+), 597 deletions(-) + rename Documentation/devicetree/bindings/{arm => cpu}/cpu-capacity.txt (98%) + create mode 100644 arch/riscv/include/asm/insn.h + delete mode 100644 arch/riscv/include/asm/parse_asm.h + create mode 100644 arch/riscv/lib/strcmp.S + create mode 100644 arch/riscv/lib/strlen.S + create mode 100644 arch/riscv/lib/strncmp.S +Merging riscv-dt/riscv-dt-for-next (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM") +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (f3460326e38d Merge patch series "JH7110 PMU Support") +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (1a41151889b5 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-css | 15 +- + Documentation/s390/pci.rst | 4 +- + Documentation/s390/vfio-ccw.rst | 6 +- + MAINTAINERS | 8 + + arch/s390/Kconfig | 1 + + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 40 +- + arch/s390/boot/decompressor.c | 1 + + arch/s390/boot/decompressor.h | 26 - + arch/s390/boot/kaslr.c | 20 +- + arch/s390/boot/mem_detect.c | 72 +- + arch/s390/boot/startup.c | 86 +- + arch/s390/boot/vmem.c | 278 ++++ + arch/s390/crypto/arch_random.c | 1 + + arch/s390/include/asm/abs_lowcore.h | 16 +- + arch/s390/include/asm/ap.h | 12 +- + arch/s390/include/asm/asm-extable.h | 4 + + arch/s390/include/asm/ccwdev.h | 2 + + arch/s390/include/asm/cmpxchg.h | 109 +- + arch/s390/include/asm/cpu_mcf.h | 112 -- + arch/s390/include/asm/cpu_mf.h | 53 - + arch/s390/include/asm/cputime.h | 19 - + arch/s390/include/asm/diag.h | 16 +- + arch/s390/include/asm/fpu/internal.h | 4 +- + arch/s390/include/asm/idals.h | 12 + + arch/s390/include/asm/idle.h | 5 - + arch/s390/include/asm/kasan.h | 12 +- + arch/s390/include/asm/kprobes.h | 2 - + arch/s390/include/asm/maccess.h | 2 +- + arch/s390/include/asm/mem_detect.h | 39 +- + arch/s390/include/asm/pgtable.h | 69 +- + arch/s390/include/asm/processor.h | 29 +- + arch/s390/include/asm/ptrace.h | 2 +- + arch/s390/include/asm/setup.h | 6 + + arch/s390/include/asm/syscall_wrapper.h | 144 +- + arch/s390/include/asm/uaccess.h | 208 +++ + arch/s390/include/asm/unwind.h | 10 +- + arch/s390/include/uapi/asm/fs3270.h | 25 + + arch/s390/include/uapi/asm/raw3270.h | 75 + + arch/s390/include/uapi/asm/types.h | 15 +- + arch/s390/include/uapi/asm/zcrypt.h | 3 +- + arch/s390/kernel/Makefile | 3 +- + arch/s390/kernel/abs_lowcore.c | 49 - + arch/s390/kernel/cache.c | 2 +- + arch/s390/kernel/compat_signal.c | 4 +- + arch/s390/kernel/crash_dump.c | 2 +- + arch/s390/kernel/diag.c | 26 + + arch/s390/kernel/early.c | 8 +- + arch/s390/kernel/entry.S | 6 - + arch/s390/kernel/entry.h | 1 - + arch/s390/kernel/head64.S | 1 + + arch/s390/kernel/idle.c | 91 +- + arch/s390/kernel/ipl.c | 101 +- + arch/s390/kernel/irq.c | 8 +- + arch/s390/kernel/kprobes.c | 30 - + arch/s390/kernel/machine_kexec.c | 5 +- + arch/s390/kernel/mcount.S | 12 +- + arch/s390/kernel/os_info.c | 5 +- + arch/s390/kernel/perf_cpum_cf.c | 308 +++- + arch/s390/kernel/perf_cpum_cf_common.c | 233 --- + arch/s390/kernel/perf_cpum_sf.c | 148 +- + arch/s390/kernel/perf_pai_ext.c | 2 +- + arch/s390/kernel/process.c | 4 +- + arch/s390/kernel/ptrace.c | 6 +- + arch/s390/kernel/rethook.c | 34 + + arch/s390/kernel/rethook.h | 7 + + arch/s390/kernel/setup.c | 96 +- + arch/s390/kernel/signal.c | 4 +- + arch/s390/kernel/smp.c | 14 +- + arch/s390/kernel/stacktrace.c | 6 +- + arch/s390/kernel/text_amode31.S | 13 + + arch/s390/kernel/vmlinux.lds.S | 4 + + arch/s390/lib/test_unwind.c | 12 +- + arch/s390/mm/dump_pagetables.c | 16 +- + arch/s390/mm/extable.c | 9 +- + arch/s390/mm/fault.c | 63 +- + arch/s390/mm/init.c | 35 +- + arch/s390/mm/kasan_init.c | 246 +--- + arch/s390/mm/maccess.c | 28 +- + arch/s390/mm/pgtable.c | 25 + + arch/s390/mm/vmem.c | 103 +- + drivers/s390/char/Kconfig | 11 +- + drivers/s390/char/Makefile | 4 +- + drivers/s390/char/con3270.c | 2409 +++++++++++++++++++++++++------ + drivers/s390/char/diag_ftp.c | 4 +- + drivers/s390/char/fs3270.c | 124 +- + drivers/s390/char/raw3270.c | 376 ++--- + drivers/s390/char/raw3270.h | 227 +-- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_ftp.c | 6 +- + drivers/s390/char/tty3270.c | 1963 ------------------------- + drivers/s390/char/tty3270.h | 15 - + drivers/s390/cio/css.c | 21 +- + drivers/s390/cio/css.h | 2 +- + drivers/s390/cio/device.c | 9 + + drivers/s390/cio/vfio_ccw_cp.c | 365 ++--- + drivers/s390/cio/vfio_ccw_cp.h | 3 +- + drivers/s390/cio/vfio_ccw_drv.c | 2 +- + drivers/s390/cio/vfio_ccw_fsm.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 116 +- + drivers/s390/crypto/zcrypt_api.c | 6 +- + drivers/watchdog/diag288_wdt.c | 162 +-- + 102 files changed, 4581 insertions(+), 4583 deletions(-) + create mode 100644 arch/s390/boot/vmem.c + delete mode 100644 arch/s390/include/asm/cpu_mcf.h + create mode 100644 arch/s390/include/uapi/asm/fs3270.h + create mode 100644 arch/s390/include/uapi/asm/raw3270.h + delete mode 100644 arch/s390/kernel/perf_cpum_cf_common.c + create mode 100644 arch/s390/kernel/rethook.c + create mode 100644 arch/s390/kernel/rethook.h + delete mode 100644 drivers/s390/char/tty3270.c + delete mode 100644 drivers/s390/char/tty3270.h +Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/x86/Makefile.um +Merge made by the 'ort' strategy. + Documentation/rust/arch-support.rst | 2 + + arch/um/Kconfig | 7 ++ + arch/um/Makefile | 7 +- + arch/um/drivers/Kconfig | 2 + + arch/um/drivers/pcap_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1 + + arch/um/drivers/vector_user.h | 2 - + arch/um/drivers/virt-pci.c | 139 ++++++++++++++++++++++++++++++-- + arch/um/drivers/virtio_uml.c | 20 ++++- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/kernel/exec.c | 4 +- + arch/um/kernel/tlb.c | 6 +- + arch/um/kernel/um_arch.c | 2 +- + arch/um/kernel/vmlinux.lds.S | 2 +- + arch/um/os-Linux/irq.c | 4 +- + arch/um/os-Linux/skas/mem.c | 19 ++--- + arch/um/os-Linux/skas/process.c | 121 ++++++++++++++------------- + arch/x86/Makefile.um | 6 ++ + arch/x86/um/vdso/Makefile | 2 +- + arch/x86/um/vdso/um_vdso.c | 12 ++- + fs/hostfs/hostfs_kern.c | 15 ++-- + 21 files changed, 268 insertions(+), 111 deletions(-) +Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (2372745ea25a selftests: add tests for prctl(SET_HIDE_SELF_EXE)) +$ 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. + fs/exec.c | 1 + + fs/proc/base.c | 4 + + include/linux/sched.h | 5 ++ + include/uapi/linux/prctl.h | 3 + + kernel/sys.c | 9 ++ + tools/include/uapi/linux/prctl.h | 3 + + tools/testing/selftests/prctl/Makefile | 2 +- + tools/testing/selftests/prctl/hide-self-exe.c | 114 ++++++++++++++++++++++++++ + 8 files changed, 140 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/prctl/hide-self-exe.c +Merging vfs-idmapping/for-next (9db35c4c2bc4 Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/ceph/super.h +Auto-merging fs/cifs/link.c +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/fuse/acl.c +CONFLICT (content): Merge conflict in fs/fuse/acl.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/fuse_i.h +CONFLICT (content): Merge conflict in fs/fuse/fuse_i.h +Auto-merging fs/fuse/xattr.c +CONFLICT (content): Merge conflict in fs/fuse/xattr.c +Auto-merging fs/hfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/ksmbd/ndr.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nilfs2/ioctl.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/proc/base.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/fs.h +Auto-merging mm/madvise.c +Auto-merging mm/shmem.c +Auto-merging net/socket.c +Resolved 'fs/btrfs/inode.c' using previous resolution. +Resolved 'fs/fuse/acl.c' using previous resolution. +Resolved 'fs/fuse/fuse_i.h' using previous resolution. +Resolved 'fs/fuse/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5e63b1a79e52] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/locking.rst | 24 +- + Documentation/filesystems/vfs.rst | 24 +- + MAINTAINERS | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + drivers/android/binderfs.c | 4 +- + drivers/base/devtmpfs.c | 12 +- + fs/9p/acl.c | 10 +- + fs/9p/acl.h | 4 +- + fs/9p/v9fs.h | 2 +- + fs/9p/v9fs_vfs.h | 2 +- + fs/9p/vfs_inode.c | 38 +- + fs/9p/vfs_inode_dotl.c | 32 +- + fs/9p/xattr.c | 2 +- + fs/Makefile | 2 +- + fs/adfs/adfs.h | 2 +- + fs/adfs/inode.c | 4 +- + fs/affs/affs.h | 10 +- + fs/affs/inode.c | 6 +- + fs/affs/namei.c | 8 +- + fs/afs/dir.c | 16 +- + fs/afs/inode.c | 6 +- + fs/afs/internal.h | 6 +- + fs/afs/security.c | 2 +- + fs/afs/xattr.c | 4 +- + fs/attr.c | 129 ++++--- + fs/autofs/root.c | 14 +- + fs/bad_inode.c | 20 +- + fs/bfs/dir.c | 6 +- + fs/btrfs/acl.c | 4 +- + fs/btrfs/acl.h | 2 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/inode.c | 52 +-- + fs/btrfs/ioctl.c | 70 ++-- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/xattr.c | 4 +- + fs/cachefiles/interface.c | 4 +- + fs/cachefiles/namei.c | 12 +- + fs/cachefiles/xattr.c | 10 +- + fs/ceph/acl.c | 4 +- + fs/ceph/dir.c | 12 +- + fs/ceph/inode.c | 14 +- + fs/ceph/super.h | 8 +- + fs/ceph/xattr.c | 2 +- + fs/cifs/cifsacl.c | 4 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsproto.h | 4 +- + fs/cifs/dir.c | 4 +- + fs/cifs/inode.c | 18 +- + fs/cifs/link.c | 2 +- + fs/cifs/xattr.c | 2 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 10 +- + fs/coda/inode.c | 6 +- + fs/coda/pioctl.c | 4 +- + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 2 +- + fs/configfs/inode.c | 4 +- + fs/configfs/symlink.c | 4 +- + fs/coredump.c | 8 +- + fs/crypto/policy.c | 2 +- + fs/debugfs/inode.c | 6 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/inode.c | 70 ++-- + fs/ecryptfs/mmap.c | 2 +- + fs/efivarfs/inode.c | 4 +- + fs/erofs/inode.c | 4 +- + fs/erofs/internal.h | 2 +- + fs/exec.c | 14 +- + fs/exfat/exfat_fs.h | 4 +- + fs/exfat/file.c | 10 +- + fs/exfat/namei.c | 6 +- + fs/exportfs/expfs.c | 4 +- + fs/ext2/acl.c | 4 +- + fs/ext2/acl.h | 2 +- + fs/ext2/ext2.h | 6 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 20 +- + fs/ext2/ioctl.c | 6 +- + fs/ext2/namei.c | 12 +- + fs/ext2/xattr_security.c | 2 +- + fs/ext2/xattr_trusted.c | 2 +- + fs/ext2/xattr_user.c | 2 +- + fs/ext4/acl.c | 4 +- + fs/ext4/acl.h | 2 +- + fs/ext4/ext4.h | 16 +- + fs/ext4/ialloc.c | 6 +- + fs/ext4/inode.c | 28 +- + fs/ext4/ioctl.c | 20 +- + fs/ext4/namei.c | 32 +- + fs/ext4/symlink.c | 4 +- + fs/ext4/xattr_hurd.c | 2 +- + fs/ext4/xattr_security.c | 2 +- + fs/ext4/xattr_trusted.c | 2 +- + fs/ext4/xattr_user.c | 2 +- + fs/f2fs/acl.c | 14 +- + fs/f2fs/acl.h | 2 +- + fs/f2fs/f2fs.h | 8 +- + fs/f2fs/file.c | 50 +-- + fs/f2fs/namei.c | 50 +-- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/xattr.c | 6 +- + fs/fat/fat.h | 4 +- + fs/fat/file.c | 26 +- + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 6 +- + fs/fcntl.c | 2 +- + fs/fuse/acl.c | 14 +- + fs/fuse/dir.c | 32 +- + fs/fuse/file.c | 3 +- + fs/fuse/fuse_i.h | 6 +- + fs/fuse/ioctl.c | 2 +- + fs/fuse/xattr.c | 2 +- + fs/gfs2/acl.c | 4 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/inode.c | 58 +-- + fs/gfs2/inode.h | 4 +- + fs/gfs2/xattr.c | 2 +- + fs/hfs/attr.c | 2 +- + fs/hfs/dir.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 6 +- + fs/hfsplus/dir.c | 14 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/inode.c | 14 +- + fs/hfsplus/xattr.c | 2 +- + fs/hfsplus/xattr_security.c | 2 +- + fs/hfsplus/xattr_trusted.c | 2 +- + fs/hfsplus/xattr_user.c | 2 +- + fs/hostfs/hostfs_kern.c | 20 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 6 +- + fs/hpfs/namei.c | 10 +- + fs/hugetlbfs/inode.c | 22 +- + fs/init.c | 14 +- + fs/inode.c | 57 ++- + fs/internal.h | 15 +- + fs/ioctl.c | 16 +- + fs/jffs2/acl.c | 4 +- + fs/jffs2/acl.h | 2 +- + fs/jffs2/dir.c | 20 +- + fs/jffs2/fs.c | 6 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/security.c | 2 +- + fs/jffs2/xattr_trusted.c | 2 +- + fs/jffs2/xattr_user.c | 2 +- + fs/jfs/acl.c | 4 +- + fs/jfs/file.c | 12 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_inode.h | 4 +- + fs/jfs/namei.c | 10 +- + fs/jfs/xattr.c | 4 +- + fs/kernfs/dir.c | 4 +- + fs/kernfs/inode.c | 18 +- + fs/kernfs/kernfs-internal.h | 6 +- + fs/ksmbd/ndr.c | 6 +- + fs/ksmbd/ndr.h | 2 +- + fs/ksmbd/oplock.c | 6 +- + fs/ksmbd/smb2pdu.c | 122 +++--- + fs/ksmbd/smb_common.c | 4 +- + fs/ksmbd/smbacl.c | 72 ++-- + fs/ksmbd/smbacl.h | 12 +- + fs/ksmbd/vfs.c | 172 ++++----- + fs/ksmbd/vfs.h | 36 +- + fs/ksmbd/vfs_cache.c | 4 +- + fs/libfs.c | 20 +- + fs/minix/bitmap.c | 2 +- + fs/minix/file.c | 6 +- + fs/minix/inode.c | 4 +- + fs/minix/minix.h | 2 +- + fs/minix/namei.c | 14 +- + fs/mnt_idmapping.c | 273 ++++++++++++++ + fs/namei.c | 450 +++++++++++------------ + fs/namespace.c | 118 +----- + fs/nfs/dir.c | 14 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 10 +- + fs/nfs/namespace.c | 10 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs4proc.c | 10 +- + fs/nfsd/nfs2acl.c | 4 +- + fs/nfsd/nfs3acl.c | 4 +- + fs/nfsd/nfs3proc.c | 2 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/vfs.c | 41 ++- + fs/nilfs2/inode.c | 12 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 10 +- + fs/nilfs2/nilfs.h | 6 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/inode.h | 2 +- + fs/ntfs3/file.c | 12 +- + fs/ntfs3/inode.c | 6 +- + fs/ntfs3/namei.c | 24 +- + fs/ntfs3/ntfs_fs.h | 16 +- + fs/ntfs3/xattr.c | 24 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 14 +- + fs/ocfs2/file.c | 20 +- + fs/ocfs2/file.h | 6 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/ioctl.h | 2 +- + fs/ocfs2/namei.c | 18 +- + fs/ocfs2/refcounttree.c | 4 +- + fs/ocfs2/xattr.c | 6 +- + fs/omfs/dir.c | 6 +- + fs/omfs/file.c | 6 +- + fs/omfs/inode.c | 2 +- + fs/open.c | 40 +- + fs/orangefs/acl.c | 4 +- + fs/orangefs/inode.c | 18 +- + fs/orangefs/namei.c | 8 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/xattr.c | 2 +- + fs/overlayfs/dir.c | 12 +- + fs/overlayfs/export.c | 4 +- + fs/overlayfs/file.c | 8 +- + fs/overlayfs/inode.c | 46 +-- + fs/overlayfs/namei.c | 6 +- + fs/overlayfs/overlayfs.h | 55 +-- + fs/overlayfs/ovl_entry.h | 4 +- + fs/overlayfs/readdir.c | 4 +- + fs/overlayfs/super.c | 4 +- + fs/overlayfs/util.c | 14 +- + fs/posix_acl.c | 106 +++--- + fs/proc/base.c | 22 +- + fs/proc/fd.c | 8 +- + fs/proc/fd.h | 2 +- + fs/proc/generic.c | 10 +- + fs/proc/internal.h | 4 +- + fs/proc/proc_net.c | 4 +- + fs/proc/proc_sysctl.c | 12 +- + fs/proc/root.c | 4 +- + fs/quota/dquot.c | 10 +- + fs/ramfs/file-nommu.c | 8 +- + fs/ramfs/inode.c | 16 +- + fs/reiserfs/acl.h | 2 +- + fs/reiserfs/inode.c | 10 +- + fs/reiserfs/ioctl.c | 4 +- + fs/reiserfs/namei.c | 12 +- + fs/reiserfs/reiserfs.h | 4 +- + fs/reiserfs/xattr.c | 12 +- + fs/reiserfs/xattr.h | 2 +- + fs/reiserfs/xattr_acl.c | 6 +- + fs/reiserfs/xattr_security.c | 2 +- + fs/reiserfs/xattr_trusted.c | 2 +- + fs/reiserfs/xattr_user.c | 2 +- + fs/remap_range.c | 6 +- + fs/stat.c | 24 +- + fs/super.c | 21 +- + fs/sysv/file.c | 6 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/itree.c | 4 +- + fs/sysv/namei.c | 12 +- + fs/sysv/sysv.h | 2 +- + fs/tracefs/inode.c | 2 +- + fs/ubifs/dir.c | 18 +- + fs/ubifs/file.c | 8 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/ubifs.h | 8 +- + fs/ubifs/xattr.c | 2 +- + fs/udf/file.c | 6 +- + fs/udf/ialloc.c | 2 +- + fs/udf/namei.c | 12 +- + fs/udf/symlink.c | 4 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 6 +- + fs/ufs/namei.c | 10 +- + fs/ufs/ufs.h | 2 +- + fs/utimes.c | 2 +- + fs/vboxsf/dir.c | 8 +- + fs/vboxsf/utils.c | 6 +- + fs/vboxsf/vfsmod.h | 4 +- + fs/xattr.c | 83 +++-- + fs/xfs/xfs_acl.c | 4 +- + fs/xfs/xfs_acl.h | 2 +- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_inode.c | 32 +- + fs/xfs/xfs_inode.h | 8 +- + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_ioctl.h | 2 +- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_iops.c | 85 +++-- + fs/xfs/xfs_iops.h | 2 +- + fs/xfs/xfs_itable.c | 14 +- + fs/xfs/xfs_itable.h | 2 +- + fs/xfs/xfs_pnfs.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_symlink.c | 8 +- + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_xattr.c | 2 +- + fs/zonefs/super.c | 10 +- + include/linux/capability.h | 9 +- + include/linux/evm.h | 26 +- + include/linux/fileattr.h | 2 +- + include/linux/fs.h | 174 +++++---- + include/linux/ima.h | 22 +- + include/linux/lsm_hook_defs.h | 14 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/mnt_idmapping.h | 226 ++---------- + include/linux/mount.h | 2 - + include/linux/namei.h | 6 +- + include/linux/nfs_fs.h | 6 +- + include/linux/poison.h | 3 + + include/linux/posix_acl.h | 24 +- + include/linux/quotaops.h | 10 +- + include/linux/security.h | 46 ++- + include/linux/xattr.h | 20 +- + ipc/mqueue.c | 6 +- + kernel/auditsc.c | 4 +- + kernel/bpf/inode.c | 8 +- + kernel/capability.c | 10 +- + kernel/cgroup/cgroup.c | 2 +- + mm/madvise.c | 2 +- + mm/mincore.c | 2 +- + mm/secretmem.c | 4 +- + mm/shmem.c | 69 ++-- + net/socket.c | 6 +- + net/unix/af_unix.c | 8 +- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/domain.c | 4 +- + security/apparmor/file.c | 2 +- + security/apparmor/lsm.c | 16 +- + security/commoncap.c | 68 ++-- + security/integrity/evm/evm_crypto.c | 10 +- + security/integrity/evm/evm_main.c | 46 +-- + security/integrity/evm/evm_secfs.c | 2 +- + security/integrity/ima/ima.h | 10 +- + security/integrity/ima/ima_api.c | 6 +- + security/integrity/ima/ima_appraise.c | 18 +- + security/integrity/ima/ima_asymmetric_keys.c | 2 +- + security/integrity/ima/ima_main.c | 26 +- + security/integrity/ima/ima_policy.c | 14 +- + security/integrity/ima/ima_queue_keys.c | 2 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/security.c | 46 +-- + security/selinux/hooks.c | 22 +- + security/smack/smack_lsm.c | 30 +- + tools/testing/selftests/bpf/progs/profiler.inc.h | 2 +- + 347 files changed, 2649 insertions(+), 2650 deletions(-) + create mode 100644 fs/mnt_idmapping.c +Merging fscrypt/for-next (097d7c1fcb8d fscrypt: clean up fscrypt_add_test_dummy_key()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging fs/crypto/policy.c +Auto-merging fs/super.c +Merge made by the 'ort' strategy. + fs/crypto/fscrypt_private.h | 4 ++++ + fs/crypto/keyring.c | 26 +++++++------------------- + fs/crypto/keysetup.c | 23 +++++++++++++++++++++-- + fs/crypto/policy.c | 3 +-- + fs/ext4/super.c | 13 +------------ + fs/f2fs/super.c | 6 ------ + fs/super.c | 1 - + include/linux/fscrypt.h | 9 --------- + 8 files changed, 34 insertions(+), 51 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 (a9eb558a5bea afs: Stop implementing ->writepage()) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (5c202ce4169d Merge branch 'for-next-next-v6.2-20230217' into for-next-20230217) +$ 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/btrfs_inode.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Merge made by the 'ort' strategy. + block/blk-merge.c | 3 +- + fs/btrfs/Makefile | 6 +- + fs/btrfs/backref.c | 33 +- + fs/btrfs/bio.c | 557 +++++++++++++++++++++++++++---- + fs/btrfs/bio.h | 67 +--- + fs/btrfs/block-group.c | 273 +++++++++++++-- + fs/btrfs/block-group.h | 24 +- + fs/btrfs/btrfs_inode.h | 22 +- + fs/btrfs/compression.c | 276 +++------------ + fs/btrfs/compression.h | 3 - + fs/btrfs/ctree.c | 117 ++++--- + fs/btrfs/ctree.h | 15 + + fs/btrfs/defrag.c | 4 +- + fs/btrfs/delayed-ref.c | 24 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/discard.c | 41 ++- + fs/btrfs/disk-io.c | 241 ++------------ + fs/btrfs/disk-io.h | 14 +- + fs/btrfs/extent-io-tree.c | 10 +- + fs/btrfs/extent-io-tree.h | 1 - + fs/btrfs/extent-tree.c | 191 ++++------- + fs/btrfs/extent-tree.h | 81 +++++ + fs/btrfs/extent_io.c | 582 ++++---------------------------- + fs/btrfs/extent_io.h | 36 +- + fs/btrfs/file-item.c | 72 ++-- + fs/btrfs/file-item.h | 8 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/free-space-tree.c | 2 +- + fs/btrfs/fs.c | 4 + + fs/btrfs/fs.h | 11 +- + fs/btrfs/inode.c | 646 ++++++----------------------------- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/locking.c | 25 +- + fs/btrfs/locking.h | 5 +- + fs/btrfs/lru_cache.c | 166 +++++++++ + fs/btrfs/lru_cache.h | 80 +++++ + fs/btrfs/lzo.c | 2 +- + fs/btrfs/messages.c | 30 -- + fs/btrfs/messages.h | 34 -- + fs/btrfs/ordered-data.c | 25 +- + fs/btrfs/ordered-data.h | 3 +- + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/raid56.c | 452 ++++++++++--------------- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 79 +++-- + fs/btrfs/send.c | 684 ++++++++++++++++++++------------------ + fs/btrfs/super.c | 4 +- + fs/btrfs/sysfs.c | 41 +-- + fs/btrfs/sysfs.h | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/transaction.c | 34 ++ + fs/btrfs/transaction.h | 31 ++ + fs/btrfs/tree-log.c | 87 ++--- + fs/btrfs/tree-log.h | 9 +- + fs/btrfs/volumes.c | 374 ++++++++------------- + fs/btrfs/volumes.h | 93 ++++-- + fs/btrfs/zoned.c | 146 ++++---- + fs/btrfs/zoned.h | 20 +- + fs/iomap/direct-io.c | 10 +- + include/linux/bio.h | 4 + + include/linux/iomap.h | 3 +- + include/trace/events/btrfs.h | 129 +++++-- + 63 files changed, 2765 insertions(+), 3188 deletions(-) + create mode 100644 fs/btrfs/lru_cache.c + create mode 100644 fs/btrfs/lru_cache.h +Merging ceph/master (e7d84c6a1296 ceph: flush cap releases when the session is flushed) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (180e64e15be0 cifs: DIO to/from KVEC-type iterators should now work) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsfs.h +Auto-merging fs/cifs/cifsproto.h +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/link.c +Auto-merging include/linux/fs.h +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 049430535a46] Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git +$ git diff -M --stat --summary HEAD^.. + block/bio.c | 6 +- + block/blk-map.c | 8 +- + fs/cifs/Kconfig | 66 +- + fs/cifs/cached_dir.c | 43 +- + fs/cifs/cifs_debug.c | 27 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifsacl.c | 34 +- + fs/cifs/cifsencrypt.c | 172 ++++- + fs/cifs/cifsfs.c | 12 +- + fs/cifs/cifsfs.h | 6 + + fs/cifs/cifsglob.h | 78 +- + fs/cifs/cifspdu.h | 98 ++- + fs/cifs/cifsproto.h | 11 +- + fs/cifs/cifssmb.c | 48 +- + fs/cifs/connect.c | 108 ++- + fs/cifs/dir.c | 19 +- + fs/cifs/file.c | 1810 ++++++++++++++++++++------------------------- + fs/cifs/fscache.c | 22 +- + fs/cifs/fscache.h | 10 +- + fs/cifs/inode.c | 53 +- + fs/cifs/link.c | 66 +- + fs/cifs/misc.c | 128 +--- + fs/cifs/ntlmssp.h | 4 +- + fs/cifs/readdir.c | 6 +- + fs/cifs/sess.c | 99 ++- + fs/cifs/smb1ops.c | 72 +- + fs/cifs/smb2inode.c | 17 +- + fs/cifs/smb2ops.c | 582 ++++++++------- + fs/cifs/smb2pdu.c | 271 ++++--- + fs/cifs/smb2pdu.h | 2 +- + fs/cifs/smbdirect.c | 539 ++++++++------ + fs/cifs/smbdirect.h | 7 +- + fs/cifs/transport.c | 76 +- + fs/netfs/Makefile | 1 + + fs/netfs/iterator.c | 371 ++++++++++ + fs/splice.c | 93 +++ + include/linux/fs.h | 6 + + include/linux/netfs.h | 8 + + include/linux/pagemap.h | 10 - + include/linux/pipe_fs_i.h | 20 + + include/linux/uio.h | 35 +- + lib/iov_iter.c | 284 ++++++- + mm/filemap.c | 157 +++- + mm/internal.h | 6 + + mm/vmalloc.c | 1 + + 45 files changed, 3234 insertions(+), 2260 deletions(-) + create mode 100644 fs/netfs/iterator.c +$ git reset --hard HEAD^ +HEAD is now at 5fb72c5b9afa Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +Merging next-20230217 version of cifs +$ git merge -m next-20230217/cifs e18f461adf109abca09344073e47ece287e9d601 +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/link.c +Merge made by the 'ort' strategy. + fs/cifs/Kconfig | 65 +++++++------- + fs/cifs/cached_dir.c | 13 +-- + fs/cifs/cifs_debug.c | 27 +++++- + fs/cifs/cifsacl.c | 34 ++++---- + fs/cifs/cifsglob.h | 14 +-- + fs/cifs/cifssmb.c | 17 ++-- + fs/cifs/dir.c | 19 ++-- + fs/cifs/file.c | 52 +++++------ + fs/cifs/inode.c | 53 ++++++------ + fs/cifs/link.c | 66 +++++++------- + fs/cifs/ntlmssp.h | 4 +- + fs/cifs/sess.c | 99 +++++++++++++++++---- + fs/cifs/smb1ops.c | 72 ++++++++-------- + fs/cifs/smb2inode.c | 17 ++-- + fs/cifs/smb2ops.c | 224 ++++++++++++++++++++++++++---------------------- + fs/cifs/smb2pdu.c | 216 +++++++++++++++++++++++++++++----------------- + fs/cifs/transport.c | 22 ++++- + include/linux/pagemap.h | 10 --- + 18 files changed, 607 insertions(+), 417 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ 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 | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (8d1b80a79452 erofs: fix an error code in z_erofs_init_zip_subsystem()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging MAINTAINERS +Auto-merging fs/erofs/inode.c +Auto-merging fs/erofs/internal.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-erofs | 3 +- + MAINTAINERS | 1 + + fs/erofs/Kconfig | 18 ++ + fs/erofs/data.c | 23 +- + fs/erofs/dir.c | 17 -- + fs/erofs/fscache.c | 146 +++++------ + fs/erofs/inode.c | 42 +-- + fs/erofs/internal.h | 146 ++++------- + fs/erofs/namei.c | 18 +- + fs/erofs/super.c | 3 +- + fs/erofs/sysfs.c | 6 +- + fs/erofs/tagptr.h | 107 -------- + fs/erofs/xattr.c | 20 +- + fs/erofs/zdata.c | 424 ++++++++++++++++++++++++++----- + fs/erofs/zdata.h | 178 ------------- + fs/erofs/zmap.c | 253 +++++++++--------- + include/trace/events/erofs.h | 17 +- + 17 files changed, 667 insertions(+), 755 deletions(-) + delete mode 100644 fs/erofs/tagptr.h + delete mode 100644 fs/erofs/zdata.h +Merging exfat/dev (5742d6a467d1 exfat: handle unreconized benign secondary entries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/namei.c +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 90 ++++++++++++++++++++++++++++++++++------------------ + fs/exfat/exfat_fs.h | 4 ++- + fs/exfat/exfat_raw.h | 21 ++++++++++++ + fs/exfat/file.c | 3 +- + fs/exfat/inode.c | 6 ++-- + fs/exfat/namei.c | 2 +- + fs/exfat/super.c | 3 +- + 7 files changed, 89 insertions(+), 40 deletions(-) +Merging ext3/for_next (90e4f9e49826 Pull udf fixup for syzbot allocation failure handling bug.) +$ 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/ext2/ext2.h +Auto-merging fs/ext2/namei.c +Auto-merging fs/udf/file.c +Auto-merging fs/udf/ialloc.c +Auto-merging fs/udf/namei.c +Auto-merging fs/udf/symlink.c +Auto-merging kernel/auditsc.c +Merge made by the 'ort' strategy. + fs/ext2/dir.c | 17 +- + fs/ext2/ext2.h | 5 +- + fs/ext2/namei.c | 21 +- + fs/mpage.c | 2 + + fs/notify/fanotify/fanotify.c | 8 +- + fs/notify/fanotify/fanotify.h | 6 +- + fs/notify/fanotify/fanotify_user.c | 88 ++- + fs/udf/balloc.c | 33 +- + fs/udf/dir.c | 148 +---- + fs/udf/directory.c | 579 ++++++++++++++----- + fs/udf/file.c | 176 +++--- + fs/udf/ialloc.c | 31 +- + fs/udf/inode.c | 602 ++++++++++---------- + fs/udf/lowlevel.c | 7 +- + fs/udf/misc.c | 18 +- + fs/udf/namei.c | 1093 +++++++++++++----------------------- + fs/udf/partition.c | 9 +- + fs/udf/super.c | 77 +-- + fs/udf/symlink.c | 28 +- + fs/udf/truncate.c | 6 +- + fs/udf/udf_i.h | 3 +- + fs/udf/udf_sb.h | 3 +- + fs/udf/udfdecl.h | 57 +- + include/linux/audit.h | 9 +- + include/linux/fanotify.h | 5 + + include/uapi/linux/fanotify.h | 30 +- + kernel/auditsc.c | 18 +- + 27 files changed, 1493 insertions(+), 1586 deletions(-) +Merging ext4/dev (2c2dec1e86cc ext4: fix incorrect options show of original mount_opt and extend mount_opt2) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/xattr.c +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 1 + + fs/ext4/extents.c | 2 +- + fs/ext4/fast_commit.c | 44 +++-- + fs/ext4/file.c | 34 ++-- + fs/ext4/inode.c | 429 +++++++++++++------------------------------- + fs/ext4/ioctl.c | 3 - + fs/ext4/namei.c | 11 +- + fs/ext4/page-io.c | 10 +- + fs/ext4/super.c | 56 +++--- + fs/ext4/sysfs.c | 7 +- + fs/ext4/xattr.c | 172 ++++++++++++------ + fs/jbd2/transaction.c | 50 +++--- + include/trace/events/ext4.h | 7 - + 13 files changed, 378 insertions(+), 448 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f7dfa80c655c Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git +Merging next-20230217 version of ext4 +$ git merge -m next-20230217/ext4 1da18e38cb97e9521e93d63034521a9649524f64 +Already up to date. +Merging f2fs/dev (ddf1eca4fc5a f2fs: drop unnecessary arg for f2fs_ioc_*()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging MAINTAINERS +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +CONFLICT (content): Merge conflict in fs/f2fs/namei.c +Auto-merging fs/f2fs/super.c +Resolved 'fs/f2fs/file.c' using previous resolution. +Resolved 'fs/f2fs/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ccd975fd2aa6] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 80 +++- + Documentation/filesystems/f2fs.rst | 2 +- + MAINTAINERS | 1 + + fs/f2fs/checkpoint.c | 37 +- + fs/f2fs/compress.c | 24 +- + fs/f2fs/data.c | 624 ++++++++++++++++---------------- + fs/f2fs/debug.c | 64 +++- + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 60 ++- + fs/f2fs/f2fs.h | 128 +++---- + fs/f2fs/file.c | 173 ++++----- + fs/f2fs/gc.c | 22 +- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 14 +- + fs/f2fs/inode.c | 78 ++-- + fs/f2fs/iostat.c | 186 +++++----- + fs/f2fs/iostat.h | 19 +- + fs/f2fs/namei.c | 5 +- + fs/f2fs/node.c | 9 +- + fs/f2fs/segment.c | 225 ++++++------ + fs/f2fs/segment.h | 41 ++- + fs/f2fs/super.c | 63 ++-- + fs/f2fs/sysfs.c | 49 ++- + fs/f2fs/verity.c | 2 +- + include/linux/f2fs_fs.h | 2 +- + include/trace/events/f2fs.h | 104 ++++-- + 26 files changed, 1090 insertions(+), 928 deletions(-) +Merging fsverity/for-next (51e4e3153ebc fscrypt: support decrypting data from large folios) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/verity.c +Auto-merging include/linux/fscrypt.h +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 4 +- + Documentation/filesystems/fsverity.rst | 96 +++++---- + fs/btrfs/verity.c | 19 +- + fs/buffer.c | 72 +++++-- + fs/crypto/bio.c | 10 +- + fs/crypto/crypto.c | 28 +-- + fs/ext4/inode.c | 6 +- + fs/ext4/readpage.c | 3 +- + fs/ext4/super.c | 5 - + fs/ext4/verity.c | 6 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/verity.c | 6 +- + fs/verity/Kconfig | 8 - + fs/verity/enable.c | 271 ++++++++++++-------------- + fs/verity/fsverity_private.h | 24 +-- + fs/verity/hash_algs.c | 24 ++- + fs/verity/init.c | 1 - + fs/verity/open.c | 163 +++++++++------- + fs/verity/signature.c | 2 - + fs/verity/verify.c | 346 ++++++++++++++++++++++----------- + include/linux/fscrypt.h | 9 +- + include/linux/fsverity.h | 93 +++++++-- + 22 files changed, 699 insertions(+), 500 deletions(-) +Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/ioctl.c +Merge made by the 'ort' strategy. + fs/fuse/cuse.c | 2 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 126 +++++++++++++++++++++++++++++++++++----------- + fs/fuse/file.c | 91 +++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 9 +++- + fs/fuse/inode.c | 4 +- + fs/fuse/ioctl.c | 6 +++ + include/uapi/linux/fuse.h | 45 ++++++++++++++++- + 8 files changed, 225 insertions(+), 62 deletions(-) +Merging gfs2/for-next (b66f723bb552 gfs2: Improve gfs2_make_fs_rw error handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/inode.c +Auto-merging include/linux/iomap.h +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 38 ++++++++++----- + fs/gfs2/dentry.c | 18 ------- + fs/gfs2/glock.c | 128 ++++++++++++++++++++++++------------------------- + fs/gfs2/glock.h | 4 +- + fs/gfs2/glops.c | 21 ++++---- + fs/gfs2/incore.h | 11 ++++- + fs/gfs2/inode.c | 8 ++++ + fs/gfs2/ops_fstype.c | 71 ++++++++++++++++++++++++++- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 49 +++++++++++++------ + fs/gfs2/sys.c | 2 + + fs/iomap/buffered-io.c | 91 +++++++++++++++++++++++------------ + fs/xfs/xfs_iomap.c | 4 +- + include/linux/iomap.h | 27 ++++++----- + 14 files changed, 299 insertions(+), 175 deletions(-) +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ 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 (fb533473d159 ksmbd: do not allow the actual frame length to be smaller than the rfc1002 length) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/ksmbd/vfs.c +Merge made by the 'ort' strategy. + fs/ksmbd/Kconfig | 8 +++- + fs/ksmbd/asn1.c | 23 +++++------ + fs/ksmbd/connection.c | 6 +-- + fs/ksmbd/ksmbd_work.h | 2 +- + fs/ksmbd/mgmt/user_session.c | 98 +++++++++++++++++--------------------------- + fs/ksmbd/mgmt/user_session.h | 6 +-- + fs/ksmbd/smb2misc.c | 31 ++++++-------- + fs/ksmbd/smb2pdu.c | 38 ++++------------- + fs/ksmbd/vfs.c | 6 +-- + 9 files changed, 84 insertions(+), 134 deletions(-) +Merging nfs/linux-next (896e090eefed Revert "NFSv4.2: Change the default KConfig value for READ_PLUS") +$ 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 (1683ed16ff1a fs/nfs: Replace kmap_atomic() with kmap_local_page() in dir.c) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging include/linux/nfs_fs.h +Merge made by the 'ort' strategy. + .../filesystems/nfs/client-identifier.rst | 4 +- + fs/nfs/dir.c | 28 +- + fs/nfs/direct.c | 12 +- + fs/nfs/file.c | 124 ++++--- + fs/nfs/filelayout/filelayout.c | 2 + + fs/nfs/internal.h | 38 ++- + fs/nfs/nfs42proc.c | 3 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/nfs4trace.h | 42 +-- + fs/nfs/nfstrace.h | 58 +++- + fs/nfs/pagelist.c | 217 +++++++++--- + fs/nfs/pnfs.c | 2 +- + fs/nfs/pnfs.h | 10 +- + fs/nfs/pnfs_nfs.c | 18 +- + fs/nfs/read.c | 94 +++-- + fs/nfs/write.c | 380 +++++++++++---------- + include/linux/nfs_fs.h | 7 +- + include/linux/nfs_page.h | 79 ++++- + net/sunrpc/clnt.c | 2 + + net/sunrpc/sysfs.c | 8 +- + 20 files changed, 698 insertions(+), 434 deletions(-) +Merging nfsd/nfsd-next (edba207d2781 NFSD: Clean up nfsd_symlink()) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/namei.c +Auto-merging fs/nfsd/nfs2acl.c +Auto-merging fs/nfsd/nfs3acl.c +Auto-merging fs/nfsd/nfs3proc.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/namei.h +Merge made by the 'ort' strategy. + fs/lockd/svc.c | 21 +- + fs/namei.c | 6 +- + fs/nfs/callback_xdr.c | 13 +- + fs/nfs/export.c | 2 +- + fs/nfsd/fault_inject.c | 142 --- + fs/nfsd/filecache.c | 49 +- + fs/nfsd/nfs2acl.c | 5 +- + fs/nfsd/nfs3acl.c | 5 +- + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4layouts.c | 4 +- + fs/nfsd/nfs4proc.c | 202 ++- + fs/nfsd/nfs4state.c | 130 +- + fs/nfsd/nfscache.c | 4 +- + fs/nfsd/nfsctl.c | 77 +- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 23 +- + fs/nfsd/state.h | 2 - + fs/nfsd/trace.h | 31 - + fs/nfsd/vfs.c | 8 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/lockd/lockd.h | 4 +- + include/linux/namei.h | 2 +- + include/linux/nfs_ssc.h | 2 +- + include/linux/sunrpc/gss_krb5.h | 196 +-- + include/linux/sunrpc/gss_krb5_enctypes.h | 41 - + include/linux/sunrpc/msg_prot.h | 5 + + include/linux/sunrpc/svc.h | 133 +- + include/linux/sunrpc/svc_xprt.h | 1 - + include/linux/sunrpc/xdr.h | 28 +- + include/trace/events/rpcgss.h | 22 + + include/trace/events/sunrpc.h | 28 +- + net/sunrpc/.kunitconfig | 30 + + net/sunrpc/Kconfig | 100 +- + net/sunrpc/auth_gss/Makefile | 2 + + net/sunrpc/auth_gss/auth_gss.c | 17 + + net/sunrpc/auth_gss/gss_krb5_crypto.c | 656 +++++++--- + net/sunrpc/auth_gss/gss_krb5_internal.h | 232 ++++ + net/sunrpc/auth_gss/gss_krb5_keys.c | 416 +++++- + net/sunrpc/auth_gss/gss_krb5_mech.c | 730 +++++++---- + net/sunrpc/auth_gss/gss_krb5_seal.c | 122 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 + + net/sunrpc/auth_gss/gss_krb5_test.c | 2040 ++++++++++++++++++++++++++++++ + net/sunrpc/auth_gss/gss_krb5_unseal.c | 63 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 124 +- + net/sunrpc/auth_gss/svcauth_gss.c | 1081 +++++++++------- + net/sunrpc/netns.h | 1 + + net/sunrpc/stats.c | 11 +- + net/sunrpc/svc.c | 158 +-- + net/sunrpc/svc_xprt.c | 20 +- + net/sunrpc/svcauth.c | 13 +- + net/sunrpc/svcauth_unix.c | 178 ++- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xdr.c | 79 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 - + 56 files changed, 5218 insertions(+), 2070 deletions(-) + delete mode 100644 fs/nfsd/fault_inject.c + delete mode 100644 include/linux/sunrpc/gss_krb5_enctypes.h + create mode 100644 net/sunrpc/.kunitconfig + create mode 100644 net/sunrpc/auth_gss/gss_krb5_internal.h + create mode 100644 net/sunrpc/auth_gss/gss_krb5_test.c +Merging ntfs3/master (b268663f49c3 fs/ntfs3: Print details about mount fails) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/file.c' using previous resolution. +Resolved 'fs/ntfs3/ntfs_fs.h' using previous resolution. +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f3b88bd48201] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 11 -- + fs/ntfs3/attrib.c | 17 +- + fs/ntfs3/bitmap.c | 25 +-- + fs/ntfs3/file.c | 50 +++--- + fs/ntfs3/frecord.c | 46 +++--- + fs/ntfs3/fslog.c | 83 +++++----- + fs/ntfs3/fsntfs.c | 84 +++++----- + fs/ntfs3/index.c | 81 +++++++--- + fs/ntfs3/inode.c | 165 +++++++++++--------- + fs/ntfs3/lznt.c | 10 +- + fs/ntfs3/namei.c | 19 ++- + fs/ntfs3/ntfs.h | 3 - + fs/ntfs3/ntfs_fs.h | 17 +- + fs/ntfs3/record.c | 15 +- + fs/ntfs3/run.c | 6 +- + fs/ntfs3/super.c | 301 ++++++++++++++++++++---------------- + fs/ntfs3/xattr.c | 70 ++++----- + 17 files changed, 531 insertions(+), 472 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 (8fcf2d012c86 ubi: block: Fix a possible use-after-free bug in ubiblock_create()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging fs/jffs2/fs.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/ubifs.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 109 ++++++++++++++----------------------------- + drivers/mtd/ubi/build.c | 32 +++++++++++-- + drivers/mtd/ubi/debug.c | 19 ++++---- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 12 +++-- + drivers/mtd/ubi/fastmap.c | 2 +- + drivers/mtd/ubi/kapi.c | 1 + + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/vmt.c | 18 +++---- + drivers/mtd/ubi/wl.c | 27 +++++++++-- + fs/jffs2/compr.c | 50 +++++++++++--------- + fs/jffs2/compr.h | 26 ++++++++--- + fs/jffs2/file.c | 15 +++--- + fs/jffs2/fs.c | 2 +- + fs/ubifs/budget.c | 9 ++-- + fs/ubifs/dir.c | 18 ++++++- + fs/ubifs/file.c | 31 ++++++++---- + fs/ubifs/io.c | 6 +-- + fs/ubifs/journal.c | 8 +++- + fs/ubifs/super.c | 17 +++++-- + fs/ubifs/sysfs.c | 6 ++- + fs/ubifs/tnc.c | 24 +++++++++- + fs/ubifs/ubifs.h | 5 ++ + include/linux/mtd/ubi.h | 1 + + 24 files changed, 274 insertions(+), 168 deletions(-) +Merging v9fs/9p-next (2ce10bad1e96 9p/rdma: unmap receive dma buffer in rdma_request()/post_recv()) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + net/9p/trans_rdma.c | 15 ++++++++++++--- + net/9p/trans_xen.c | 48 +++++++++++++++++++++++++++++++----------------- + 2 files changed, 43 insertions(+), 20 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (291ca06aad93 fs/9p: Fix revalidate) +$ 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 +Auto-merging fs/9p/v9fs.h +Auto-merging fs/9p/v9fs_vfs.h +Auto-merging fs/9p/vfs_inode.c +CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c +Resolved 'fs/9p/vfs_inode.c' using previous resolution. +Resolved 'fs/9p/vfs_inode_dotl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9264e62bc7df] Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/9p.rst | 26 ++--- + fs/9p/fid.c | 49 ++++------ + fs/9p/fid.h | 33 ++++++- + fs/9p/v9fs.c | 49 ++++++---- + fs/9p/v9fs.h | 10 +- + fs/9p/v9fs_vfs.h | 4 - + fs/9p/vfs_addr.c | 24 ++--- + fs/9p/vfs_dentry.c | 3 +- + fs/9p/vfs_dir.c | 10 +- + fs/9p/vfs_file.c | 205 ++++++++------------------------------- + fs/9p/vfs_inode.c | 102 ++++++++++--------- + fs/9p/vfs_inode_dotl.c | 69 ++++++------- + fs/9p/vfs_super.c | 28 +++--- + include/net/9p/9p.h | 5 + + net/9p/client.c | 8 +- + net/9p/trans_virtio.c | 6 ++ + 16 files changed, 290 insertions(+), 341 deletions(-) +Merging xfs/for-next (60b730a40c43 xfs: fix uninitialized variable access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/xfs.rst | 2 +- + fs/xfs/libxfs/xfs_ag.c | 93 ++++- + fs/xfs/libxfs/xfs_ag.h | 111 +++++- + fs/xfs/libxfs/xfs_ag_resv.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 715 +++++++++++++++++++++++-------------- + fs/xfs/libxfs/xfs_alloc.h | 61 ++-- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 696 +++++++++++++++++------------------- + fs/xfs/libxfs/xfs_bmap.h | 12 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 64 ++-- + fs/xfs/libxfs/xfs_btree.c | 18 +- + fs/xfs/libxfs/xfs_ialloc.c | 241 ++++++------- + fs/xfs/libxfs/xfs_ialloc.h | 5 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 47 ++- + fs/xfs/libxfs/xfs_ialloc_btree.h | 20 +- + fs/xfs/libxfs/xfs_refcount.c | 96 +++-- + fs/xfs/libxfs/xfs_refcount.h | 4 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 10 +- + fs/xfs/libxfs/xfs_rmap.c | 50 ++- + fs/xfs/libxfs/xfs_rmap.h | 6 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_sb.c | 3 +- + fs/xfs/scrub/agheader_repair.c | 35 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/common.c | 21 +- + fs/xfs/scrub/fscounters.c | 13 +- + fs/xfs/scrub/repair.c | 7 +- + fs/xfs/xfs_bmap_item.c | 137 +++---- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_discard.c | 50 ++- + fs/xfs/xfs_error.c | 2 +- + fs/xfs/xfs_error.h | 12 +- + fs/xfs/xfs_extfree_item.c | 99 ++--- + fs/xfs/xfs_filestream.c | 455 +++++++++++------------ + fs/xfs/xfs_filestream.h | 6 +- + fs/xfs/xfs_fsmap.c | 5 +- + fs/xfs/xfs_globals.c | 3 +- + fs/xfs/xfs_icache.c | 8 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_iwalk.c | 10 +- + fs/xfs/xfs_mount.h | 3 +- + fs/xfs/xfs_refcount_item.c | 110 +++--- + fs/xfs/xfs_reflink.c | 4 +- + fs/xfs/xfs_rmap_item.c | 142 ++++---- + fs/xfs/xfs_super.c | 47 ++- + fs/xfs/xfs_sysfs.c | 12 +- + fs/xfs/xfs_sysfs.h | 10 +- + fs/xfs/xfs_trace.h | 96 +++-- + fs/xfs/xfs_trans.c | 8 +- + fs/xfs/xfs_trans.h | 2 +- + 50 files changed, 1910 insertions(+), 1653 deletions(-) +Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) +$ 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/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d93e547efd38] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. + fs/zonefs/Makefile | 2 +- + fs/zonefs/file.c | 878 ++++++++++++++++++++++++ + fs/zonefs/super.c | 1931 +++++++++++++++++++--------------------------------- + fs/zonefs/sysfs.c | 2 +- + fs/zonefs/trace.h | 20 +- + fs/zonefs/zonefs.h | 110 ++- + 6 files changed, 1678 insertions(+), 1265 deletions(-) + create mode 100644 fs/zonefs/file.c +Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops) +$ 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 (c65454a94726 fs: remove locks_inode) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/9p/vfs_file.c +Auto-merging fs/afs/internal.h +Auto-merging fs/attr.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/file.c +Auto-merging fs/fcntl.c +Auto-merging fs/fuse/file.c +CONFLICT (content): Merge conflict in fs/fuse/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/inode.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/ksmbd/vfs_cache.c +Auto-merging fs/namei.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/pagelist.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfsd/netns.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/open.c +Auto-merging fs/posix_acl.c +Auto-merging fs/proc/fd.c +Auto-merging fs/utimes.c +Auto-merging fs/xattr.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/lockd/lockd.h +Resolved 'fs/fuse/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f9a673e773a7] Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/sys_oabi-compat.c | 1 + + fs/9p/vfs_file.c | 1 + + fs/afs/flock.c | 14 +- + fs/afs/internal.h | 1 + + fs/attr.c | 1 + + fs/ceph/caps.c | 1 + + fs/ceph/locks.c | 1 + + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifssmb.c | 1 + + fs/cifs/file.c | 1 + + fs/cifs/smb2file.c | 1 + + fs/dlm/plock.c | 1 + + fs/fcntl.c | 1 + + fs/file_table.c | 1 + + fs/fuse/file.c | 1 + + fs/gfs2/file.c | 1 + + fs/inode.c | 1 + + fs/ksmbd/smb2pdu.c | 1 + + fs/ksmbd/vfs.c | 1 + + fs/ksmbd/vfs_cache.c | 1 + + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 3 +- + fs/lockd/netns.h | 1 + + fs/locks.c | 29 +-- + fs/namei.c | 1 + + fs/nfs/file.c | 1 + + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/pagelist.c | 1 + + fs/nfs/write.c | 1 + + fs/nfs_common/grace.c | 1 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4state.c | 4 +- + fs/ocfs2/locks.c | 1 + + fs/ocfs2/stack_user.c | 1 + + fs/open.c | 3 +- + fs/orangefs/file.c | 1 + + fs/posix_acl.c | 1 + + fs/proc/fd.c | 1 + + fs/utimes.c | 1 + + fs/xattr.c | 1 + + fs/xfs/xfs_linux.h | 1 + + include/linux/filelock.h | 439 ++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 429 ------------------------------------- + include/linux/lockd/lockd.h | 4 +- + include/linux/lockd/xdr.h | 1 + + 46 files changed, 507 insertions(+), 457 deletions(-) + create mode 100644 include/linux/filelock.h +Merging iversion/iversion-next (58a033c9a3e0 nfsd: remove fetch_iversion export operation) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Auto-merging fs/ceph/inode.c +Auto-merging fs/libfs.c +Auto-merging fs/nfs/export.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/stat.c +CONFLICT (content): Merge conflict in fs/stat.c +Resolved 'fs/stat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b7181b21533b] Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/ceph/inode.c | 16 +++++++++---- + fs/libfs.c | 36 +++++++++++++++++++++++++++++ + fs/nfs/export.c | 7 ------ + fs/nfs/inode.c | 16 +++++++++---- + fs/nfsd/nfs4xdr.c | 4 +++- + fs/nfsd/nfsfh.c | 42 +++++++++++++++++++++++++++++++++ + fs/nfsd/nfsfh.h | 29 +---------------------- + fs/nfsd/vfs.h | 7 +++++- + fs/stat.c | 17 ++++++++++++-- + include/linux/exportfs.h | 1 - + include/linux/iversion.h | 60 ++++++++++++++++++------------------------------ + include/linux/stat.h | 9 ++++++++ + 12 files changed, 157 insertions(+), 87 deletions(-) +Merging vfs/for-next (e9f33f8668ab Merge branches 'work.misc', 'work.namespace', 'work.alpha', 'work.minix' and 'work.sysv' 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 +Auto-merging fs/minix/bitmap.c +Auto-merging fs/minix/minix.h +Auto-merging fs/minix/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/sysv/namei.c +Auto-merging fs/sysv/sysv.h +Auto-merging include/linux/mount.h +Auto-merging ipc/mqueue.c +Merge made by the 'ort' strategy. + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/boot/misc.c | 2 - + arch/alpha/boot/stdio.c | 4 +- + arch/alpha/boot/tools/objstrip.c | 2 +- + arch/alpha/kernel/traps.c | 30 ++++---- + fs/cramfs/inode.c | 9 +-- + fs/minix/bitmap.c | 16 ++-- + fs/minix/dir.c | 62 +++++++++------- + fs/minix/minix.h | 5 +- + fs/minix/namei.c | 100 ++++++++++++------------- + fs/namespace.c | 18 ++++- + fs/nsfs.c | 3 +- + fs/sysv/dir.c | 154 ++++++++++++++++++++++----------------- + fs/sysv/namei.c | 42 ++++++----- + fs/sysv/sysv.h | 3 +- + include/linux/mount.h | 1 + + ipc/mqueue.c | 5 -- + ipc/namespace.c | 35 ++++++--- + ipc/util.h | 2 - + 21 files changed, 270 insertions(+), 229 deletions(-) +Merging printk/for-next (10d639febe56 Merge branch 'for-6.3' 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. + Documentation/admin-guide/kdump/gdbmacros.txt | 2 +- + include/linux/console.h | 100 ++++++--- + include/linux/printk.h | 2 - + kernel/printk/index.c | 2 +- + kernel/printk/internal.h | 45 ++++ + kernel/printk/printk.c | 308 +++++++++++++++----------- + lib/errname.c | 22 +- + 7 files changed, 313 insertions(+), 168 deletions(-) +Merging pci/next (dc444af6b8d4 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/controller/dwc/Kconfig +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 3 + + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 6 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 103 ++++-- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 76 +++-- + drivers/acpi/device_pm.c | 19 ++ + drivers/dma/dw-edma/Kconfig | 5 +- + drivers/dma/dw-edma/dw-edma-core.c | 196 ++++++----- + drivers/dma/dw-edma/dw-edma-core.h | 10 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 56 +-- + drivers/dma/dw-edma/dw-edma-v0-core.c | 100 +++--- + drivers/dma/dw-edma/dw-edma-v0-core.h | 1 - + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 374 ++++++++++----------- + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 5 - + drivers/misc/pci_endpoint_test.c | 4 +- + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/dwc/Kconfig | 23 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 200 ++++++++++- + drivers/pci/controller/dwc/pcie-bt1.c | 4 + + drivers/pci/controller/dwc/pcie-designware-ep.c | 12 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 25 +- + drivers/pci/controller/dwc/pcie-designware.c | 195 +++++++++++ + drivers/pci/controller/dwc/pcie-designware.h | 21 ++ + drivers/pci/controller/dwc/pcie-histb.c | 1 - + drivers/pci/controller/dwc/pcie-qcom.c | 15 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 +- + .../pci/controller/mobiveil/pcie-mobiveil-plat.c | 1 - + drivers/pci/controller/pci-loongson.c | 71 ++-- + drivers/pci/controller/pci-tegra.c | 1 - + drivers/pci/controller/pci-versatile.c | 1 - + drivers/pci/controller/pcie-hisi-error.c | 1 - + drivers/pci/controller/pcie-microchip-host.c | 1 - + drivers/pci/controller/pcie-mt7621.c | 2 + + drivers/pci/controller/vmd.c | 97 ++++-- + drivers/pci/endpoint/functions/pci-epf-test.c | 38 +-- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + drivers/pci/endpoint/pci-ep-cfs.c | 1 - + drivers/pci/endpoint/pci-epc-core.c | 33 +- + drivers/pci/endpoint/pci-epc-mem.c | 1 - + drivers/pci/endpoint/pci-epf-core.c | 1 - + drivers/pci/hotplug/pciehp_hpc.c | 2 + + drivers/pci/hotplug/shpchp_core.c | 1 - + drivers/pci/iov.c | 2 +- + drivers/pci/p2pdma.c | 8 +- + drivers/pci/pci-acpi.c | 45 ++- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci.c | 69 ++-- + drivers/pci/pci.h | 59 ++-- + drivers/pci/pcie/aer.c | 51 +-- + drivers/pci/pcie/aspm.c | 54 +++ + drivers/pci/pcie/dpc.c | 4 +- + drivers/pci/pcie/portdrv.c | 16 +- + drivers/pci/probe.c | 4 +- + drivers/pci/quirks.c | 23 ++ + drivers/pci/setup-bus.c | 236 +++++++++---- + drivers/pci/slot.c | 2 +- + drivers/pci/switch/switchtec.c | 13 +- + include/acpi/acpi_bus.h | 1 + + include/linux/dma/edma.h | 25 +- + include/linux/dmaengine.h | 2 +- + include/linux/pci-epc.h | 10 +- + include/linux/pci-epf.h | 19 +- + include/linux/pci.h | 8 + + include/linux/pci_ids.h | 2 + + 65 files changed, 1569 insertions(+), 809 deletions(-) +Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (432b0b5b0129 Merge branch 'for-6.3/bigben' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/goodix,gt7375p.yaml | 7 + + Documentation/hid/hid-alps.rst | 2 +- + Documentation/hid/hid-bpf.rst | 522 ++++++++++ + Documentation/hid/hiddev.rst | 2 +- + Documentation/hid/hidraw.rst | 2 +- + Documentation/hid/index.rst | 1 + + Documentation/hid/intel-ish-hid.rst | 2 +- + MAINTAINERS | 10 + + drivers/Makefile | 2 +- + drivers/hid/.kunitconfig | 1 + + drivers/hid/Kconfig | 39 +- + drivers/hid/Makefile | 3 + + drivers/hid/amd-sfh-hid/Kconfig | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 2 +- + drivers/hid/bpf/Kconfig | 18 + + drivers/hid/bpf/Makefile | 11 + + drivers/hid/bpf/entrypoints/Makefile | 93 ++ + drivers/hid/bpf/entrypoints/README | 4 + + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 25 + + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 248 +++++ + drivers/hid/bpf/hid_bpf_dispatch.c | 551 +++++++++++ + drivers/hid/bpf/hid_bpf_dispatch.h | 25 + + drivers/hid/bpf/hid_bpf_jmp_table.c | 565 +++++++++++ + drivers/hid/hid-asus.c | 37 +- + drivers/hid/hid-bigbenff.c | 75 +- + drivers/hid/hid-core.c | 46 +- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-evision.c | 53 + + drivers/hid/hid-hyperv.c | 2 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input-test.c | 80 ++ + drivers/hid/hid-input.c | 48 +- + drivers/hid/hid-letsketch.c | 2 +- + drivers/hid/hid-logitech-dj.c | 4 +- + drivers/hid/hid-logitech-hidpp.c | 152 +-- + drivers/hid/hid-multitouch.c | 39 +- + drivers/hid/hid-playstation.c | 41 +- + drivers/hid/hid-quirks.c | 2 +- + drivers/hid/hid-sensor-custom.c | 242 +++-- + drivers/hid/hid-sensor-hub.c | 6 +- + drivers/hid/hid-sony.c | 1021 +------------------- + drivers/hid/hid-steam.c | 385 +++++++- + drivers/hid/hid-uclogic-core-test.c | 105 ++ + drivers/hid/hid-uclogic-core.c | 61 +- + drivers/hid/hid-uclogic-params-test.c | 16 + + drivers/hid/hid-uclogic-params.c | 124 ++- + drivers/hid/hid-uclogic-params.h | 40 + + drivers/hid/hid-uclogic-rdesc-test.c | 3 +- + drivers/hid/hid-uclogic-rdesc.c | 6 + + drivers/hid/hid-uclogic-rdesc.h | 5 + + drivers/hid/i2c-hid/Kconfig | 31 +- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 26 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 24 +- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 42 + + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 98 +- + drivers/hid/i2c-hid/i2c-hid.h | 3 + + drivers/hid/intel-ish-hid/Kconfig | 2 +- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + drivers/hid/surface-hid/surface_hid_core.c | 2 +- + drivers/hid/uhid.c | 3 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/iio/light/hid-sensor-als.c | 27 +- + drivers/iio/light/hid-sensor-prox.c | 37 +- + drivers/platform/x86/asus-tf103c-dock.c | 4 +- + drivers/staging/greybus/hid.c | 2 +- + include/linux/hid-sensor-ids.h | 1 + + include/linux/hid.h | 34 +- + include/linux/hid_bpf.h | 170 ++++ + net/bluetooth/hidp/Kconfig | 2 +- + net/bluetooth/hidp/core.c | 3 +- + samples/hid/.gitignore | 8 + + samples/hid/Makefile | 250 +++++ + samples/hid/Makefile.target | 75 ++ + samples/hid/hid_bpf_attach.bpf.c | 18 + + samples/hid/hid_bpf_attach.h | 14 + + samples/hid/hid_bpf_helpers.h | 21 + + samples/hid/hid_mouse.bpf.c | 112 +++ + samples/hid/hid_mouse.c | 155 +++ + samples/hid/hid_surface_dial.bpf.c | 134 +++ + samples/hid/hid_surface_dial.c | 226 +++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/hid/.gitignore | 5 + + tools/testing/selftests/hid/Makefile | 231 +++++ + tools/testing/selftests/hid/config | 21 + + tools/testing/selftests/hid/config.common | 241 +++++ + tools/testing/selftests/hid/config.x86_64 | 4 + + tools/testing/selftests/hid/hid_bpf.c | 869 +++++++++++++++++ + tools/testing/selftests/hid/progs/hid.c | 209 ++++ + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 21 + + tools/testing/selftests/hid/vmtest.sh | 284 ++++++ + 90 files changed, 6733 insertions(+), 1428 deletions(-) + create mode 100644 Documentation/hid/hid-bpf.rst + create mode 100644 drivers/hid/bpf/Kconfig + create mode 100644 drivers/hid/bpf/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/README + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.c + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.h + create mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c + create mode 100644 drivers/hid/hid-evision.c + create mode 100644 drivers/hid/hid-input-test.c + create mode 100644 drivers/hid/hid-uclogic-core-test.c + create mode 100644 include/linux/hid_bpf.h + create mode 100644 samples/hid/.gitignore + create mode 100644 samples/hid/Makefile + create mode 100644 samples/hid/Makefile.target + create mode 100644 samples/hid/hid_bpf_attach.bpf.c + create mode 100644 samples/hid/hid_bpf_attach.h + create mode 100644 samples/hid/hid_bpf_helpers.h + create mode 100644 samples/hid/hid_mouse.bpf.c + create mode 100644 samples/hid/hid_mouse.c + create mode 100644 samples/hid/hid_surface_dial.bpf.c + create mode 100644 samples/hid/hid_surface_dial.c + create mode 100644 tools/testing/selftests/hid/.gitignore + create mode 100644 tools/testing/selftests/hid/Makefile + create mode 100644 tools/testing/selftests/hid/config + create mode 100644 tools/testing/selftests/hid/config.common + create mode 100644 tools/testing/selftests/hid/config.x86_64 + create mode 100644 tools/testing/selftests/hid/hid_bpf.c + create mode 100644 tools/testing/selftests/hid/progs/hid.c + create mode 100644 tools/testing/selftests/hid/progs/hid_bpf_helpers.h + create mode 100755 tools/testing/selftests/hid/vmtest.sh +Merging i2c/i2c/for-next (dc67b2d90438 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 +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/hpe,gxp-i2c.yaml | 59 ++ + .../devicetree/bindings/i2c/i2c-gpio.yaml | 26 + + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 4 + + Documentation/devicetree/bindings/i2c/i2c-st.txt | 41 -- + .../devicetree/bindings/i2c/loongson,ls2x-i2c.yaml | 51 ++ + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 49 +- + .../bindings/i2c/socionext,uniphier-fi2c.yaml | 3 + + .../bindings/i2c/socionext,uniphier-i2c.yaml | 3 + + .../devicetree/bindings/i2c/st,sti-i2c.yaml | 71 +++ + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 11 +- + Documentation/i2c/gpio-fault-injection.rst | 2 +- + Documentation/i2c/smbus-protocol.rst | 2 +- + MAINTAINERS | 11 +- + drivers/i2c/algos/i2c-algo-bit.c | 77 ++- + drivers/i2c/busses/Kconfig | 18 + + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-aspeed.c | 4 +- + drivers/i2c/busses/i2c-au1550.c | 4 +- + drivers/i2c/busses/i2c-bcm2835.c | 4 +- + drivers/i2c/busses/i2c-cadence.c | 23 +- + drivers/i2c/busses/i2c-designware-common.c | 13 +- + drivers/i2c/busses/i2c-designware-core.h | 5 +- + drivers/i2c/busses/i2c-designware-master.c | 33 +- + drivers/i2c/busses/i2c-designware-slave.c | 4 +- + drivers/i2c/busses/i2c-gpio.c | 47 +- + drivers/i2c/busses/i2c-gxp.c | 620 +++++++++++++++++++++ + drivers/i2c/busses/i2c-i801.c | 310 +++++------ + drivers/i2c/busses/i2c-ls2x.c | 370 ++++++++++++ + drivers/i2c/busses/i2c-mt65xx.c | 7 +- + drivers/i2c/busses/i2c-qcom-cci.c | 8 +- + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + drivers/i2c/busses/i2c-st.c | 9 +- + drivers/i2c/busses/i2c-xiic.c | 586 +++++++++++++++++-- + drivers/i2c/i2c-core-acpi.c | 13 +- + drivers/i2c/i2c-core-base.c | 103 +++- + drivers/i2c/i2c-core-of.c | 66 --- + drivers/i2c/i2c-dev.c | 16 +- + include/linux/i2c.h | 24 +- + include/linux/pinctrl/devinfo.h | 15 + + include/linux/platform_data/i2c-gpio.h | 9 + + 40 files changed, 2248 insertions(+), 477 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-st.txt + create mode 100644 Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-gxp.c + create mode 100644 drivers/i2c/busses/i2c-ls2x.c +Merging i3c/i3c/next (e826acc18bc7 i3c: transfer pid from boardinfo to device info) +$ 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.c | 1 + + 1 file changed, 1 insertion(+) +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 (5720a18baa46 hwmon: Deprecate [devm_]hwmon_device_register_with_groups) +$ 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 +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2fde19f2b847] Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-hwmon | 9 + + .../devicetree/bindings/hwmon/adi,adm1177.yaml | 12 +- + .../devicetree/bindings/hwmon/adi,adm1266.yaml | 6 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 20 +- + .../devicetree/bindings/hwmon/adi,ltc2945.yaml | 49 ++ + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 20 +- + .../devicetree/bindings/hwmon/adi,ltc2992.yaml | 28 +- + .../devicetree/bindings/hwmon/amd,sbrmi.yaml | 6 +- + .../devicetree/bindings/hwmon/amd,sbtsi.yaml | 6 +- + .../bindings/hwmon/hpe,gxp-fan-ctrl.yaml | 45 ++ + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 8 +- + .../devicetree/bindings/hwmon/national,lm90.yaml | 44 +- + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 2 +- + .../devicetree/bindings/hwmon/nuvoton,nct7802.yaml | 16 +- + .../devicetree/bindings/hwmon/nxp,mc34vr500.yaml | 36 ++ + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 22 +- + .../devicetree/bindings/hwmon/ti,tps23861.yaml | 16 +- + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/aht10.rst | 2 +- + Documentation/hwmon/aquacomputer_d5next.rst | 13 + + Documentation/hwmon/aspeed-pwm-tacho.rst | 2 +- + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/corsair-psu.rst | 2 +- + Documentation/hwmon/ftsteutates.rst | 5 + + Documentation/hwmon/gsc-hwmon.rst | 6 +- + Documentation/hwmon/gxp-fan-ctrl.rst | 28 ++ + Documentation/hwmon/hwmon-kernel-api.rst | 6 +- + Documentation/hwmon/index.rst | 4 + + Documentation/hwmon/it87.rst | 47 +- + Documentation/hwmon/ltc2978.rst | 2 +- + Documentation/hwmon/max16601.rst | 11 +- + Documentation/hwmon/max6697.rst | 2 +- + Documentation/hwmon/mc34vr500.rst | 32 ++ + Documentation/hwmon/menf21bmc.rst | 2 +- + Documentation/hwmon/oxp-sensors.rst | 17 +- + Documentation/hwmon/pmbus-core.rst | 2 +- + Documentation/hwmon/sht4x.rst | 2 +- + Documentation/hwmon/smm665.rst | 2 +- + Documentation/hwmon/stpddc60.rst | 2 +- + Documentation/hwmon/submitting-patches.rst | 2 +- + Documentation/hwmon/vexpress.rst | 2 +- + Documentation/hwmon/via686a.rst | 2 +- + MAINTAINERS | 5 + + drivers/hwmon/Kconfig | 18 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/aht10.c | 3 +- + drivers/hwmon/aquacomputer_d5next.c | 444 ++++++++++++++-- + drivers/hwmon/asus-ec-sensors.c | 2 + + drivers/hwmon/coretemp.c | 132 +++-- + drivers/hwmon/emc2305.c | 24 +- + drivers/hwmon/ftsteutates.c | 560 ++++++++------------- + drivers/hwmon/gxp-fan-ctrl.c | 253 ++++++++++ + drivers/hwmon/hih6130.c | 4 +- + drivers/hwmon/ibmpex.c | 2 +- + drivers/hwmon/iio_hwmon.c | 8 +- + drivers/hwmon/intel-m10-bmc-hwmon.c | 229 +++++++++ + drivers/hwmon/it87.c | 195 +++++-- + drivers/hwmon/ltc2945.c | 132 +++-- + drivers/hwmon/mc34vr500.c | 263 ++++++++++ + drivers/hwmon/mlxreg-fan.c | 6 + + drivers/hwmon/nct6775-platform.c | 150 ++++-- + drivers/hwmon/nzxt-smart2.c | 1 + + drivers/hwmon/oxp-sensors.c | 52 +- + drivers/hwmon/pmbus/Kconfig | 36 +- + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/ltc2978.c | 16 +- + drivers/hwmon/pmbus/max16601.c | 14 +- + drivers/hwmon/pmbus/mpq7932.c | 156 ++++++ + drivers/hwmon/pmbus/pmbus.h | 5 +- + drivers/hwmon/pmbus/tda38640.c | 74 +++ + drivers/hwmon/sht15.c | 8 +- + drivers/hwmon/sht21.c | 4 +- + include/linux/hwmon.h | 4 + + 73 files changed, 2566 insertions(+), 781 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,ltc2945.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/nxp,mc34vr500.yaml + create mode 100644 Documentation/hwmon/gxp-fan-ctrl.rst + create mode 100644 Documentation/hwmon/mc34vr500.rst + create mode 100644 drivers/hwmon/gxp-fan-ctrl.c + create mode 100644 drivers/hwmon/mc34vr500.c + create mode 100644 drivers/hwmon/pmbus/mpq7932.c + create mode 100644 drivers/hwmon/pmbus/tda38640.c +Merging jc_docs/docs-next (e076f253283c Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/mm/zswap.rst +Auto-merging Documentation/hid/intel-ish-hid.rst +Auto-merging Documentation/hwmon/index.rst +CONFLICT (content): Merge conflict in Documentation/hwmon/index.rst +Auto-merging lib/Kconfig.debug +Auto-merging scripts/kernel-doc +Resolved 'Documentation/hwmon/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 52e3e32c4b83] Merge branch 'docs-next' of git://git.lwn.net/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/Kconfig | 10 +- + Documentation/PCI/index.rst | 6 +- + Documentation/accel/introduction.rst | 2 +- + Documentation/admin-guide/bcache.rst | 2 +- + .../admin-guide/cgroup-v1/blkio-controller.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 10 +- + Documentation/admin-guide/cifs/usage.rst | 4 +- + .../admin-guide/device-mapper/cache-policies.rst | 2 +- + Documentation/admin-guide/device-mapper/dm-ebs.rst | 2 +- + .../admin-guide/device-mapper/dm-zoned.rst | 2 +- + .../admin-guide/device-mapper/unstriped.rst | 10 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 2 +- + Documentation/admin-guide/gpio/gpio-sim.rst | 2 +- + Documentation/admin-guide/hw-vuln/mds.rst | 4 +- + Documentation/admin-guide/index.rst | 11 + + Documentation/admin-guide/kernel-parameters.txt | 148 ++--- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 2 +- + Documentation/admin-guide/md.rst | 2 +- + Documentation/admin-guide/media/bttv.rst | 2 +- + Documentation/admin-guide/media/building.rst | 2 +- + Documentation/admin-guide/media/si476x.rst | 2 +- + Documentation/admin-guide/media/vivid.rst | 2 +- + Documentation/admin-guide/mm/concepts.rst | 13 +- + Documentation/admin-guide/mm/damon/lru_sort.rst | 4 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 6 +- + .../admin-guide/mm/idle_page_tracking.rst | 7 +- + Documentation/admin-guide/mm/index.rst | 3 +- + Documentation/admin-guide/mm/ksm.rst | 2 - + Documentation/admin-guide/mm/memory-hotplug.rst | 2 - + .../admin-guide/mm/numa_memory_policy.rst | 6 +- + Documentation/admin-guide/mm/numaperf.rst | 2 - + Documentation/admin-guide/mm/pagemap.rst | 11 +- + Documentation/admin-guide/mm/shrinker_debugfs.rst | 2 - + Documentation/admin-guide/mm/soft-dirty.rst | 2 - + Documentation/admin-guide/mm/swap_numa.rst | 2 - + Documentation/admin-guide/mm/transhuge.rst | 2 - + Documentation/admin-guide/mm/userfaultfd.rst | 2 - + Documentation/admin-guide/mm/zswap.rst | 2 - + Documentation/admin-guide/perf/hns3-pmu.rst | 2 +- + Documentation/admin-guide/pm/amd-pstate.rst | 2 +- + Documentation/admin-guide/pm/intel_pstate.rst | 4 +- + Documentation/admin-guide/spkguide.txt | 4 +- + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/admin-guide/sysrq.rst | 2 +- + Documentation/admin-guide/workload-tracing.rst | 606 +++++++++++++++++++++ + Documentation/conf.py | 5 +- + Documentation/core-api/workqueue.rst | 4 +- + Documentation/cpu-freq/index.rst | 6 +- + Documentation/crypto/index.rst | 6 +- + Documentation/dev-tools/coccinelle.rst | 8 +- + Documentation/dev-tools/gdb-kernel-debugging.rst | 4 + + Documentation/driver-api/dma-buf.rst | 6 +- + Documentation/driver-api/dmaengine/client.rst | 2 +- + Documentation/driver-api/dmaengine/dmatest.rst | 2 +- + Documentation/driver-api/hsi.rst | 4 +- + Documentation/driver-api/index.rst | 8 +- + Documentation/driver-api/io-mapping.rst | 4 +- + Documentation/driver-api/md/md-cluster.rst | 2 +- + Documentation/driver-api/md/raid5-cache.rst | 2 +- + Documentation/driver-api/media/drivers/vidtv.rst | 2 +- + Documentation/driver-api/media/dtv-demux.rst | 2 +- + Documentation/driver-api/media/v4l2-subdev.rst | 4 +- + Documentation/driver-api/mei/nfc.rst | 2 +- + Documentation/driver-api/nfc/nfc-hci.rst | 2 +- + Documentation/driver-api/nvdimm/nvdimm.rst | 2 +- + Documentation/driver-api/nvdimm/security.rst | 2 +- + Documentation/driver-api/pin-control.rst | 2 +- + Documentation/driver-api/pldmfw/index.rst | 2 +- + Documentation/driver-api/serial/driver.rst | 2 +- + .../driver-api/surface_aggregator/ssh.rst | 2 +- + .../driver-api/thermal/intel_powerclamp.rst | 2 +- + Documentation/driver-api/usb/dwc3.rst | 2 +- + Documentation/driver-api/usb/usb3-debug-port.rst | 2 +- + Documentation/filesystems/proc.rst | 1 + + Documentation/gpu/index.rst | 6 +- + Documentation/hid/intel-ish-hid.rst | 4 +- + Documentation/hwmon/index.rst | 6 +- + Documentation/input/index.rst | 6 +- + Documentation/leds/index.rst | 1 + + Documentation/mm/active_mm.rst | 2 - + Documentation/mm/arch_pgtable_helpers.rst | 2 - + Documentation/mm/balance.rst | 2 - + Documentation/mm/free_page_reporting.rst | 2 - + Documentation/mm/frontswap.rst | 2 - + Documentation/mm/highmem.rst | 2 - + Documentation/mm/hmm.rst | 4 +- + Documentation/mm/hugetlbfs_reserv.rst | 4 +- + Documentation/mm/hwpoison.rst | 2 - + Documentation/mm/index.rst | 6 +- + Documentation/mm/ksm.rst | 4 +- + Documentation/mm/memory-model.rst | 2 - + Documentation/mm/mmu_notifier.rst | 2 - + Documentation/mm/numa.rst | 6 +- + Documentation/mm/page_frags.rst | 2 - + Documentation/mm/page_migration.rst | 6 +- + Documentation/mm/page_owner.rst | 6 +- + Documentation/mm/page_table_check.rst | 2 - + Documentation/mm/physical_memory.rst | 347 ++++++++++++ + Documentation/mm/remap_file_pages.rst | 2 - + Documentation/mm/slub.rst | 2 - + Documentation/mm/split_page_table_lock.rst | 2 - + Documentation/mm/transhuge.rst | 2 - + Documentation/mm/unevictable-lru.rst | 2 - + Documentation/mm/z3fold.rst | 2 - + Documentation/mm/zsmalloc.rst | 2 - + .../device_drivers/ethernet/mellanox/mlx5.rst | 92 ++-- + Documentation/peci/index.rst | 6 +- + Documentation/process/botching-up-ioctls.rst | 2 +- + Documentation/process/deprecated.rst | 26 + + Documentation/process/email-clients.rst | 20 + + Documentation/process/maintainer-pgp-guide.rst | 102 +--- + Documentation/scheduler/index.rst | 6 +- + Documentation/scsi/index.rst | 6 +- + Documentation/sound/hd-audio/notes.rst | 6 +- + Documentation/sound/index.rst | 8 +- + Documentation/sparc/adi.rst | 4 +- + Documentation/sparc/oradax/dax-hv-api.txt | 44 +- + Documentation/sphinx-static/custom.css | 48 +- + Documentation/sphinx/templates/kernel-toc.html | 16 + + Documentation/trace/events-msr.rst | 4 +- + Documentation/trace/events-nmi.rst | 6 +- + Documentation/trace/events.rst | 78 +-- + Documentation/trace/ftrace.rst | 6 +- + Documentation/trace/histogram-design.rst | 12 +- + Documentation/trace/histogram.rst | 190 +++---- + Documentation/trace/kprobetrace.rst | 49 +- + Documentation/trace/mmiotrace.rst | 20 +- + .../postprocess/trace-pagealloc-postprocess.pl | 4 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 4 +- + Documentation/trace/tracepoint-analysis.rst | 8 +- + Documentation/trace/uprobetracer.rst | 22 +- + Documentation/trace/user_events.rst | 18 +- + .../translations/it_IT/admin-guide/README.rst | 2 +- + .../translations/it_IT/doc-guide/kernel-doc.rst | 2 + + .../translations/it_IT/doc-guide/sphinx.rst | 14 +- + Documentation/translations/it_IT/index.rst | 89 ++- + .../translations/it_IT/kernel-hacking/hacking.rst | 2 +- + .../translations/it_IT/process/2.Process.rst | 15 +- + .../it_IT/process/7.AdvancedTopics.rst | 8 +- + .../it_IT/process/botching-up-ioctls.rst | 249 +++++++++ + .../translations/it_IT/process/changes.rst | 11 + + .../translations/it_IT/process/email-clients.rst | 69 ++- + Documentation/translations/it_IT/process/index.rst | 1 + + .../translations/it_IT/process/kernel-docs.rst | 4 +- + .../it_IT/process/maintainer-pgp-guide.rst | 6 +- + .../it_IT/process/submitting-patches.rst | 2 +- + .../translations/sp_SP/process/code-of-conduct.rst | 97 ++++ + .../translations/sp_SP/process/email-clients.rst | 374 +++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 4 + + .../sp_SP/process/kernel-enforcement-statement.rst | 174 ++++++ + .../translations/sp_SP/process/magic-number.rst | 90 +++ + Documentation/translations/zh_CN/PCI/msi-howto.rst | 11 + + .../zh_CN/accounting/delay-accounting.rst | 7 +- + .../zh_CN/admin-guide/mm/damon/index.rst | 1 + + .../zh_CN/admin-guide/mm/damon/lru_sort.rst | 263 +++++++++ + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 8 +- + .../zh_CN/admin-guide/mm/damon/start.rst | 12 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 68 ++- + .../translations/zh_CN/admin-guide/mm/index.rst | 2 +- + .../translations/zh_CN/admin-guide/mm/ksm.rst | 50 ++ + .../translations/zh_CN/core-api/kernel-api.rst | 10 +- + .../translations/zh_CN/core-api/mm-api.rst | 2 +- + .../translations/zh_CN/core-api/workqueue.rst | 4 +- + .../translations/zh_CN/dev-tools/kasan.rst | 74 +-- + .../zh_CN/dev-tools/testing-overview.rst | 27 + + Documentation/translations/zh_CN/glossary.rst | 36 ++ + Documentation/translations/zh_CN/index.rst | 9 + + Documentation/translations/zh_CN/mm/highmem.rst | 20 +- + Documentation/translations/zh_CN/mm/hmm.rst | 2 +- + .../translations/zh_CN/mm/hugetlbfs_reserv.rst | 2 +- + Documentation/translations/zh_CN/mm/numa.rst | 2 +- + Documentation/translations/zh_CN/mm/page_owner.rst | 17 +- + .../translations/zh_CN/power/energy-model.rst | 36 +- + Documentation/translations/zh_CN/process/howto.rst | 2 +- + Documentation/userspace-api/iommufd.rst | 2 +- + .../userspace-api/media/drivers/st-vgxy61.rst | 2 +- + .../media/rc/lirc-set-wideband-receiver.rst | 2 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 2 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 2 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 2 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 2 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 2 +- + Documentation/userspace-api/seccomp_filter.rst | 2 +- + .../userspace-api/sysfs-platform_profile.rst | 2 +- + Documentation/virt/index.rst | 6 +- + .../virt/kvm/x86/amd-memory-encryption.rst | 2 +- + .../virt/kvm/x86/running-nested-guests.rst | 2 +- + Documentation/watchdog/index.rst | 6 +- + Documentation/x86/resctrl.rst | 18 +- + Documentation/x86/x86_64/mm.rst | 2 +- + lib/Kconfig.debug | 2 - + scripts/kernel-doc | 11 - + 197 files changed, 3334 insertions(+), 893 deletions(-) + create mode 100644 Documentation/admin-guide/workload-tracing.rst + create mode 100644 Documentation/sphinx/templates/kernel-toc.html + create mode 100644 Documentation/translations/it_IT/process/botching-up-ioctls.rst + create mode 100644 Documentation/translations/sp_SP/process/code-of-conduct.rst + create mode 100644 Documentation/translations/sp_SP/process/email-clients.rst + create mode 100644 Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst + create mode 100644 Documentation/translations/sp_SP/process/magic-number.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/mm/damon/lru_sort.rst + create mode 100644 Documentation/translations/zh_CN/glossary.rst +Merging v4l-dvb/master (83e0f265aa8d Merge git://git.linuxtv.org/media_stage into media_tree) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging Documentation/admin-guide/media/platform-cardlist.rst +Auto-merging Documentation/admin-guide/media/v4l-drivers.rst +Auto-merging Documentation/driver-api/media/drivers/index.rst +Auto-merging Documentation/driver-api/media/v4l2-subdev.rst +Auto-merging MAINTAINERS +CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_display.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/ti/davinci/vpbe_display.c left in tree. +CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_osd.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/ti/davinci/vpbe_osd.c left in tree. +CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_venc.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/ti/davinci/vpbe_venc.c left in tree. +Auto-merging drivers/staging/media/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig +Auto-merging drivers/staging/media/Makefile +CONFLICT (content): Merge conflict in drivers/staging/media/Makefile +Resolved 'drivers/staging/media/Kconfig' using previous resolution. +Resolved 'drivers/staging/media/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/media/platform/ti/davinci/vpbe_display.c drivers/media/platform/ti/davinci/vpbe_osd.c drivers/media/platform/ti/davinci/vpbe_venc.c +rm 'drivers/media/platform/ti/davinci/vpbe_display.c' +rm 'drivers/media/platform/ti/davinci/vpbe_osd.c' +rm 'drivers/media/platform/ti/davinci/vpbe_venc.c' +$ git commit --no-edit -v -a +[master 76a23ad46511] Merge branch 'master' of git://linuxtv.org/media_tree.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 + + Documentation/admin-guide/media/cec.rst | 4 +- + Documentation/admin-guide/media/cpia2.rst | 145 -- + Documentation/admin-guide/media/dvb-drivers.rst | 1 - + Documentation/admin-guide/media/meye.rst | 93 - + .../admin-guide/media/other-usb-cardlist.rst | 14 - + Documentation/admin-guide/media/pci-cardlist.rst | 1 - + .../admin-guide/media/platform-cardlist.rst | 1 - + .../admin-guide/media/tm6000-cardlist.rst | 83 - + Documentation/admin-guide/media/usb-cardlist.rst | 7 - + Documentation/admin-guide/media/v4l-drivers.rst | 2 - + Documentation/admin-guide/media/zr364xx.rst | 102 - + .../devicetree/bindings/media/cec-gpio.txt | 42 - + Documentation/devicetree/bindings/media/cec.txt | 8 - + .../media/{ => cec}/amlogic,meson-gx-ao-cec.yaml | 11 +- + .../devicetree/bindings/media/cec/cec-common.yaml | 28 + + .../devicetree/bindings/media/cec/cec-gpio.yaml | 74 + + .../bindings/media/cec/nvidia,tegra114-cec.yaml | 58 + + .../bindings/media/cec/samsung,s5p-cec.yaml | 66 + + .../devicetree/bindings/media/cec/st,stih-cec.yaml | 66 + + .../bindings/media/cec/st,stm32-cec.yaml | 53 + + .../devicetree/bindings/media/fsl,imx6ull-pxp.yaml | 88 + + .../devicetree/bindings/media/fsl-pxp.txt | 26 - + .../devicetree/bindings/media/i2c/ak7375.txt | 8 - + .../bindings/media/i2c/asahi-kasei,ak7375.yaml | 52 + + .../bindings/media/i2c/chrontel,ch7322.yaml | 11 +- + .../bindings/media/i2c/maxim,max9286.yaml | 51 +- + .../devicetree/bindings/media/i2c/ovti,ov5670.yaml | 93 + + .../devicetree/bindings/media/i2c/ovti,ov5675.yaml | 122 + + .../devicetree/bindings/media/i2c/ovti,ov8858.yaml | 106 + + .../devicetree/bindings/media/i2c/sony,imx296.yaml | 106 + + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 122 + + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 15 + + .../devicetree/bindings/media/s5p-cec.txt | 36 - + .../devicetree/bindings/media/stih-cec.txt | 27 - + .../devicetree/bindings/media/tegra-cec.txt | 27 - + .../driver-api/media/drivers/cpia2_devel.rst | 56 - + Documentation/driver-api/media/drivers/index.rst | 1 - + Documentation/driver-api/media/mc-core.rst | 10 +- + Documentation/driver-api/media/v4l2-subdev.rst | 8 + + .../userspace-api/media/drivers/aspeed-video.rst | 2 +- + .../userspace-api/media/drivers/index.rst | 1 - + .../userspace-api/media/drivers/meye-uapi.rst | 53 - + .../userspace-api/media/v4l/dev-subdev.rst | 166 ++ + .../userspace-api/media/v4l/pixfmt-reserved.rst | 2 +- + .../userspace-api/media/v4l/user-func.rst | 1 + + .../v4l/vidioc-subdev-enum-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 5 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 5 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 5 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 147 ++ + .../media/v4l/vidioc-subdev-g-selection.rst | 5 +- + MAINTAINERS | 73 +- + drivers/media/common/Kconfig | 1 + + drivers/media/common/Makefile | 2 +- + .../common => media/common/saa7146}/Kconfig | 0 + .../common => media/common/saa7146}/Makefile | 0 + .../common => media/common/saa7146}/saa7146_core.c | 2 +- + .../common => media/common/saa7146}/saa7146_fops.c | 2 +- + .../common => media/common/saa7146}/saa7146_hlp.c | 2 +- + .../common => media/common/saa7146}/saa7146_i2c.c | 2 +- + .../common => media/common/saa7146}/saa7146_vbi.c | 2 +- + .../common/saa7146}/saa7146_video.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 25 +- + .../media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c | 4 +- + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.c | 14 +- + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.c | 14 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 9 +- + drivers/media/dvb-frontends/dvb-pll.c | 5 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/mb86a16.c | 9 +- + drivers/media/dvb-frontends/mn88443x.c | 6 +- + drivers/media/dvb-frontends/tc90522.c | 6 +- + drivers/media/i2c/Kconfig | 40 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv7604.c | 6 +- + drivers/media/i2c/ak7375.c | 38 + + drivers/media/i2c/cs53l32a.c | 6 +- + drivers/media/i2c/imx219.c | 311 ++- + drivers/media/i2c/imx290.c | 1059 +++++---- + drivers/media/i2c/imx296.c | 1172 ++++++++++ + drivers/media/i2c/imx415.c | 1300 +++++++++++ + drivers/media/i2c/ir-kbd-i2c.c | 5 +- + drivers/media/i2c/max9286.c | 463 +++- + drivers/media/i2c/msp3400-driver.c | 5 +- + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9v032.c | 6 +- + drivers/media/i2c/ov2740.c | 4 +- + drivers/media/i2c/ov5640.c | 86 +- + drivers/media/i2c/ov5670.c | 312 ++- + drivers/media/i2c/ov5675.c | 198 +- + drivers/media/i2c/ov7670.c | 8 +- + drivers/media/i2c/ov772x.c | 3 +- + drivers/media/i2c/ov8858.c | 2008 ++++++++++++++++ + drivers/media/i2c/ov9282.c | 9 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 22 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 - + drivers/media/i2c/s5c73m3/s5c73m3.h | 1 - + drivers/media/i2c/saa7115.c | 6 +- + drivers/media/i2c/saa7127.c | 6 +- + drivers/media/i2c/st-vgxy61.c | 4 +- + drivers/media/i2c/tc358746.c | 9 +- + drivers/media/i2c/tda1997x.c | 6 +- + drivers/media/i2c/tvaudio.c | 5 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/video-i2c.c | 6 +- + drivers/media/mc/mc-entity.c | 86 +- + drivers/media/pci/Kconfig | 2 + + drivers/media/pci/Makefile | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 3 + + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + .../saa7146 => media/pci}/saa7146/Kconfig | 15 +- + .../saa7146 => media/pci}/saa7146/Makefile | 0 + .../saa7146 => media/pci}/saa7146/hexium_gemini.c | 2 +- + .../saa7146 => media/pci}/saa7146/hexium_orion.c | 2 +- + .../deprecated/saa7146 => media/pci}/saa7146/mxb.c | 2 +- + .../deprecated/saa7146 => media/pci}/ttpci/Kconfig | 17 +- + .../saa7146 => media/pci}/ttpci/Makefile | 0 + .../saa7146 => media/pci}/ttpci/budget-av.c | 2 +- + .../saa7146 => media/pci}/ttpci/budget-ci.c | 0 + .../saa7146 => media/pci}/ttpci/budget-core.c | 0 + .../saa7146 => media/pci}/ttpci/budget.c | 0 + .../saa7146 => media/pci}/ttpci/budget.h | 2 +- + drivers/media/platform/amphion/venc.c | 18 +- + drivers/media/platform/amphion/vpu_color.c | 6 +- + drivers/media/platform/chips-media/imx-vdoa.c | 6 - + drivers/media/platform/marvell/mmp-driver.c | 2 +- + drivers/media/platform/mediatek/mdp3/Kconfig | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 3 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 7 +- + .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.c | 6 +- + .../platform/mediatek/vcodec/venc/venc_h264_if.c | 4 +- + .../media/platform/microchip/microchip-isc-base.c | 109 +- + drivers/media/platform/nxp/dw100/dw100.c | 2 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 35 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 4 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 249 +- + drivers/media/platform/nxp/imx-pxp.c | 359 ++- + drivers/media/platform/nxp/imx7-media-csi.c | 239 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 3 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 2 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 2 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 15 +- + .../media/platform/samsung/exynos4-is/fimc-is.h | 3 - + .../media/platform/samsung/exynos4-is/media-dev.h | 1 - + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 4 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 4 +- + drivers/media/platform/ti/cal/cal.c | 4 +- + drivers/media/platform/ti/davinci/vpif.c | 2 +- + drivers/media/platform/ti/omap3isp/isp.c | 9 + + drivers/media/platform/ti/omap3isp/ispvideo.c | 20 +- + drivers/media/platform/verisilicon/hantro_drv.c | 2 - + drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +- + drivers/media/platform/xilinx/xilinx-dma.c | 28 +- + drivers/media/radio/wl128x/fmdrv_common.c | 2 +- + drivers/media/rc/Kconfig | 4 +- + drivers/media/rc/ene_ir.c | 3 +- + drivers/media/rc/gpio-ir-recv.c | 18 + + drivers/media/rc/ir-rx51.c | 6 - + drivers/media/rc/pwm-ir-tx.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 2 +- + drivers/media/test-drivers/visl/visl-video.c | 2 +- + drivers/media/tuners/si2157.c | 6 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 4 +- + drivers/media/usb/go7007/go7007-v4l2.c | 6 +- + drivers/media/usb/siano/smsusb.c | 1 + + drivers/media/usb/uvc/uvc_ctrl.c | 340 ++- + drivers/media/usb/uvc/uvc_driver.c | 181 +- + drivers/media/usb/uvc/uvc_entity.c | 2 +- + drivers/media/usb/uvc/uvc_status.c | 125 +- + drivers/media/usb/uvc/uvc_v4l2.c | 111 +- + drivers/media/usb/uvc/uvc_video.c | 58 +- + drivers/media/usb/uvc/uvcvideo.h | 39 +- + drivers/media/v4l2-core/v4l2-h264.c | 4 + + drivers/media/v4l2-core/v4l2-ioctl.c | 25 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 4 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +- + drivers/media/v4l2-core/v4l2-subdev.c | 1002 +++++++- + drivers/staging/media/Kconfig | 9 +- + drivers/staging/media/Makefile | 8 +- + drivers/staging/media/atomisp/Kconfig | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 249 -- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 176 -- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 206 -- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 1280 ++++------ + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 195 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 10 - + drivers/staging/media/atomisp/i2c/gc2235.h | 31 - + drivers/staging/media/atomisp/i2c/mt9m114.h | 15 - + drivers/staging/media/atomisp/i2c/ov2680.h | 836 +------ + drivers/staging/media/atomisp/i2c/ov2722.h | 36 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 195 -- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 61 - + .../staging/media/atomisp/include/linux/atomisp.h | 50 - + .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - + .../media/atomisp/include/linux/atomisp_platform.h | 11 +- + drivers/staging/media/atomisp/notes.txt | 6 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 90 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 9 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 41 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.h | 5 - + drivers/staging/media/atomisp/pci/atomisp_fops.c | 89 +- + drivers/staging/media/atomisp/pci/atomisp_fops.h | 3 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 120 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 7 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 60 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 171 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 13 - + drivers/staging/media/atomisp/pci/atomisp_tpg.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 165 +- + .../pci/css_2401_system/host/isys_dma_private.h | 2 - + .../atomisp/pci/hive_isp_css_common/host/vmem.c | 20 +- + drivers/staging/media/atomisp/pci/sh_css.c | 7 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 38 +- + .../media/{deprecated/saa7146 => }/av7110/Kconfig | 20 +- + .../media/{deprecated/saa7146 => }/av7110/Makefile | 3 +- + drivers/staging/media/av7110/TODO | 3 + + .../av7110/audio-bilingual-channel-select.rst | 0 + .../saa7146 => }/av7110/audio-channel-select.rst | 0 + .../saa7146 => }/av7110/audio-clear-buffer.rst | 0 + .../saa7146 => }/av7110/audio-continue.rst | 0 + .../saa7146 => }/av7110/audio-fclose.rst | 0 + .../saa7146 => }/av7110/audio-fopen.rst | 0 + .../saa7146 => }/av7110/audio-fwrite.rst | 0 + .../saa7146 => }/av7110/audio-get-capabilities.rst | 0 + .../saa7146 => }/av7110/audio-get-status.rst | 0 + .../saa7146 => }/av7110/audio-pause.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio-play.rst | 0 + .../saa7146 => }/av7110/audio-select-source.rst | 0 + .../saa7146 => }/av7110/audio-set-av-sync.rst | 0 + .../saa7146 => }/av7110/audio-set-bypass-mode.rst | 0 + .../saa7146 => }/av7110/audio-set-id.rst | 0 + .../saa7146 => }/av7110/audio-set-mixer.rst | 0 + .../saa7146 => }/av7110/audio-set-mute.rst | 0 + .../saa7146 => }/av7110/audio-set-streamtype.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio-stop.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio.rst | 0 + .../saa7146 => }/av7110/audio_data_types.rst | 0 + .../saa7146 => }/av7110/audio_function_calls.rst | 0 + .../media/{deprecated/saa7146 => }/av7110/av7110.c | 0 + .../media/{deprecated/saa7146 => }/av7110/av7110.h | 2 +- + .../{deprecated/saa7146 => }/av7110/av7110_av.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_av.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ca.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ca.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_hw.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_hw.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ipack.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ipack.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ir.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_v4l.c | 0 + .../{deprecated/saa7146 => }/av7110/budget-patch.c | 0 + .../{deprecated/saa7146 => }/av7110/dvb_filter.c | 0 + .../{deprecated/saa7146 => }/av7110/dvb_filter.h | 0 + .../media/{deprecated/saa7146 => }/av7110/sp8870.c | 0 + .../media/{deprecated/saa7146 => }/av7110/sp8870.h | 0 + .../saa7146 => }/av7110/video-clear-buffer.rst | 0 + .../saa7146 => }/av7110/video-command.rst | 0 + .../saa7146 => }/av7110/video-continue.rst | 0 + .../saa7146 => }/av7110/video-fast-forward.rst | 0 + .../saa7146 => }/av7110/video-fclose.rst | 0 + .../saa7146 => }/av7110/video-fopen.rst | 0 + .../saa7146 => }/av7110/video-freeze.rst | 0 + .../saa7146 => }/av7110/video-fwrite.rst | 0 + .../saa7146 => }/av7110/video-get-capabilities.rst | 0 + .../saa7146 => }/av7110/video-get-event.rst | 0 + .../saa7146 => }/av7110/video-get-frame-count.rst | 0 + .../saa7146 => }/av7110/video-get-pts.rst | 0 + .../saa7146 => }/av7110/video-get-size.rst | 0 + .../saa7146 => }/av7110/video-get-status.rst | 0 + .../{deprecated/saa7146 => }/av7110/video-play.rst | 0 + .../saa7146 => }/av7110/video-select-source.rst | 0 + .../saa7146 => }/av7110/video-set-blank.rst | 0 + .../av7110/video-set-display-format.rst | 0 + .../saa7146 => }/av7110/video-set-format.rst | 0 + .../saa7146 => }/av7110/video-set-streamtype.rst | 0 + .../saa7146 => }/av7110/video-slowmotion.rst | 0 + .../saa7146 => }/av7110/video-stillpicture.rst | 0 + .../{deprecated/saa7146 => }/av7110/video-stop.rst | 0 + .../saa7146 => }/av7110/video-try-command.rst | 0 + .../{deprecated/saa7146 => }/av7110/video.rst | 0 + .../saa7146 => }/av7110/video_function_calls.rst | 0 + .../saa7146 => }/av7110/video_types.rst | 0 + drivers/staging/media/deprecated/cpia2/Kconfig | 13 - + drivers/staging/media/deprecated/cpia2/Makefile | 4 - + drivers/staging/media/deprecated/cpia2/TODO | 6 - + drivers/staging/media/deprecated/cpia2/cpia2.h | 475 ---- + .../staging/media/deprecated/cpia2/cpia2_core.c | 2434 -------------------- + .../media/deprecated/cpia2/cpia2_registers.h | 463 ---- + drivers/staging/media/deprecated/cpia2/cpia2_usb.c | 966 -------- + drivers/staging/media/deprecated/cpia2/cpia2_v4l.c | 1226 ---------- + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 - + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 - + drivers/staging/media/deprecated/fsl-viu/TODO | 7 - + drivers/staging/media/deprecated/fsl-viu/fsl-viu.c | 1599 ------------- + drivers/staging/media/deprecated/meye/Kconfig | 19 - + drivers/staging/media/deprecated/meye/Makefile | 2 - + drivers/staging/media/deprecated/meye/TODO | 6 - + drivers/staging/media/deprecated/meye/meye.c | 1814 --------------- + drivers/staging/media/deprecated/meye/meye.h | 311 --- + drivers/staging/media/deprecated/saa7146/Kconfig | 5 - + drivers/staging/media/deprecated/saa7146/Makefile | 2 - + .../staging/media/deprecated/saa7146/av7110/TODO | 9 - + .../staging/media/deprecated/saa7146/saa7146/TODO | 7 - + .../staging/media/deprecated/saa7146/ttpci/TODO | 7 - + drivers/staging/media/deprecated/stkwebcam/Kconfig | 18 - + .../staging/media/deprecated/stkwebcam/Makefile | 5 - + drivers/staging/media/deprecated/stkwebcam/TODO | 12 - + .../media/deprecated/stkwebcam/stk-sensor.c | 587 ----- + .../media/deprecated/stkwebcam/stk-webcam.c | 1434 ------------ + .../media/deprecated/stkwebcam/stk-webcam.h | 123 - + drivers/staging/media/deprecated/tm6000/Kconfig | 37 - + drivers/staging/media/deprecated/tm6000/Makefile | 14 - + drivers/staging/media/deprecated/tm6000/TODO | 7 - + .../staging/media/deprecated/tm6000/tm6000-alsa.c | 440 ---- + .../staging/media/deprecated/tm6000/tm6000-cards.c | 1397 ----------- + .../staging/media/deprecated/tm6000/tm6000-core.c | 916 -------- + .../staging/media/deprecated/tm6000/tm6000-dvb.c | 454 ---- + .../staging/media/deprecated/tm6000/tm6000-i2c.c | 317 --- + .../staging/media/deprecated/tm6000/tm6000-input.c | 503 ---- + .../staging/media/deprecated/tm6000/tm6000-regs.h | 588 ----- + .../staging/media/deprecated/tm6000/tm6000-stds.c | 623 ----- + .../media/deprecated/tm6000/tm6000-usb-isoc.h | 38 - + .../staging/media/deprecated/tm6000/tm6000-video.c | 1703 -------------- + drivers/staging/media/deprecated/tm6000/tm6000.h | 396 ---- + drivers/staging/media/deprecated/zr364xx/Kconfig | 18 - + drivers/staging/media/deprecated/zr364xx/Makefile | 3 - + drivers/staging/media/deprecated/zr364xx/TODO | 7 - + drivers/staging/media/deprecated/zr364xx/zr364xx.c | 1635 ------------- + drivers/staging/media/imx/imx-media-csi.c | 7 +- + drivers/staging/media/imx/imx-media-fim.c | 13 +- + drivers/staging/media/imx/imx-media.h | 6 +- + drivers/staging/media/meson/vdec/esparser.c | 3 +- + drivers/staging/media/omap4iss/iss_video.c | 66 +- + include/media/davinci/ccdc_types.h | 30 - + .../common => include/media/drv-intf}/saa7146.h | 0 + .../common => include/media/drv-intf}/saa7146_vv.h | 2 +- + include/media/i2c/s5c73m3.h | 41 - + include/media/media-entity.h | 102 +- + include/media/ov_16bit_addr_reg_helpers.h | 92 + + include/media/v4l2-subdev.h | 377 +++ + include/uapi/linux/meye.h | 65 - + include/uapi/linux/uvcvideo.h | 6 +- + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/v4l2-subdev.h | 74 +- + 349 files changed, 11554 insertions(+), 27052 deletions(-) + delete mode 100644 Documentation/admin-guide/media/cpia2.rst + delete mode 100644 Documentation/admin-guide/media/meye.rst + delete mode 100644 Documentation/admin-guide/media/tm6000-cardlist.rst + delete mode 100644 Documentation/admin-guide/media/zr364xx.rst + delete mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt + delete mode 100644 Documentation/devicetree/bindings/media/cec.txt + rename Documentation/devicetree/bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml (86%) + create mode 100644 Documentation/devicetree/bindings/media/cec/cec-common.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/cec-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra114-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx6ull-pxp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/fsl-pxp.txt + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ak7375.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5670.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5675.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml + delete mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt + delete mode 100644 Documentation/devicetree/bindings/media/stih-cec.txt + delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt + delete mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst + delete mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/Kconfig (100%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_core.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_fops.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_hlp.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_i2c.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_vbi.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_video.c (99%) + create mode 100644 drivers/media/i2c/imx296.c + create mode 100644 drivers/media/i2c/imx415.c + create mode 100644 drivers/media/i2c/ov8858.c + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/Kconfig (67%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/hexium_gemini.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/hexium_orion.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/mxb.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/Kconfig (83%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-av.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-ci.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-core.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget.h (98%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/Kconfig (82%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/Makefile (78%) + create mode 100644 drivers/staging/media/av7110/TODO + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-bilingual-channel-select.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-channel-select.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-clear-buffer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-continue.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fclose.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fopen.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fwrite.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-get-capabilities.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-get-status.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-pause.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-play.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-select-source.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-av-sync.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-bypass-mode.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-id.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-mixer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-mute.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-streamtype.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-stop.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio_data_types.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio_function_calls.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110.h (99%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_av.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_av.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ca.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ca.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_hw.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_hw.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ipack.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ipack.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ir.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_v4l.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/budget-patch.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/dvb_filter.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/dvb_filter.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/sp8870.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/sp8870.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-clear-buffer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-command.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-continue.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fast-forward.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fclose.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fopen.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-freeze.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fwrite.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-capabilities.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-event.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-frame-count.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-pts.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-size.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-status.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-play.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-select-source.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-blank.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-display-format.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-format.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-streamtype.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-slowmotion.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-stillpicture.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-stop.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-try-command.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video_function_calls.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video_types.rst (100%) + delete mode 100644 drivers/staging/media/deprecated/cpia2/Kconfig + delete mode 100644 drivers/staging/media/deprecated/cpia2/Makefile + delete mode 100644 drivers/staging/media/deprecated/cpia2/TODO + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_core.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_registers.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_usb.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_v4l.c + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/fsl-viu.c + delete mode 100644 drivers/staging/media/deprecated/meye/Kconfig + delete mode 100644 drivers/staging/media/deprecated/meye/Makefile + delete mode 100644 drivers/staging/media/deprecated/meye/TODO + delete mode 100644 drivers/staging/media/deprecated/meye/meye.c + delete mode 100644 drivers/staging/media/deprecated/meye/meye.h + delete mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig + delete mode 100644 drivers/staging/media/deprecated/saa7146/Makefile + delete mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO + delete mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO + delete mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Kconfig + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Makefile + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/TODO + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-sensor.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/Kconfig + delete mode 100644 drivers/staging/media/deprecated/tm6000/Makefile + delete mode 100644 drivers/staging/media/deprecated/tm6000/TODO + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-alsa.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-cards.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-core.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-dvb.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-i2c.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-input.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-regs.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-stds.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-video.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000.h + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Kconfig + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Makefile + delete mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + delete mode 100644 drivers/staging/media/deprecated/zr364xx/zr364xx.c + delete mode 100644 include/media/davinci/ccdc_types.h + rename {drivers/staging/media/deprecated/saa7146/common => include/media/drv-intf}/saa7146.h (100%) + rename {drivers/staging/media/deprecated/saa7146/common => include/media/drv-intf}/saa7146_vv.h (99%) + delete mode 100644 include/media/i2c/s5c73m3.h + create mode 100644 include/media/ov_16bit_addr_reg_helpers.h + delete mode 100644 include/uapi/linux/meye.h +Merging v4l-dvb-next/master (5dd1c455130d media: imx-mipi-csis: Check csis_fmt validity before use) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + drivers/media/platform/nxp/imx-mipi-csis.c | 3 +++ + drivers/media/v4l2-core/v4l2-subdev.c | 15 +++++++++++++++ + 2 files changed, 18 insertions(+) +Merging pm/linux-next (ea150b53b1fd Merge branch 'thermal' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/admin-guide/index.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/pm/amd-pstate.rst +Auto-merging Documentation/admin-guide/thermal/intel_powerclamp.rst +Auto-merging MAINTAINERS +Auto-merging drivers/base/power/domain.c +Auto-merging drivers/cpufreq/Kconfig +Auto-merging drivers/cpufreq/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/admin-guide/pm/amd-pstate.rst | 74 +- + Documentation/admin-guide/thermal/index.rst | 8 + + .../thermal/intel_powerclamp.rst | 35 +- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 5 + + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 81 +- + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 18 +- + .../devicetree/bindings/opp/opp-v2-qcom-level.yaml | 4 +- + .../bindings/thermal/mediatek,lvts-thermal.yaml | 142 +++ + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 1 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 153 ++- + .../bindings/thermal/rcar-gen3-thermal.yaml | 3 + + Documentation/driver-api/thermal/index.rst | 1 - + Documentation/driver-api/thermal/intel_dptf.rst | 3 + + Documentation/firmware-guide/acpi/acpi-lid.rst | 2 +- + Documentation/firmware-guide/acpi/namespace.rst | 2 +- + Documentation/power/suspend-and-interrupts.rst | 2 +- + MAINTAINERS | 6 +- + arch/mips/include/asm/mach-loongson32/cpufreq.h | 18 - + arch/mips/include/asm/mach-loongson32/platform.h | 1 - + arch/mips/loongson32/common/platform.c | 16 - + arch/mips/loongson32/ls1b/board.c | 1 - + arch/x86/kernel/process.c | 1 + + drivers/acpi/acpi_lpit.c | 1 + + drivers/acpi/acpi_pnp.c | 14 +- + drivers/acpi/acpica/hwvalid.c | 7 +- + drivers/acpi/acpica/nsrepair.c | 12 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/apei/einj.c | 4 + + drivers/acpi/battery.c | 35 +- + drivers/acpi/cppc_acpi.c | 69 ++ + drivers/acpi/ioapic.c | 1 + + drivers/acpi/pmic/intel_pmic_bytcrc.c | 1 + + drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 26 +- + drivers/acpi/processor_idle.c | 2 +- + drivers/acpi/processor_perflib.c | 38 +- + drivers/acpi/resource.c | 26 +- + drivers/acpi/tables.c | 3 +- + drivers/acpi/video_detect.c | 2 +- + drivers/base/power/domain.c | 5 +- + drivers/base/power/runtime.c | 4 + + drivers/cpufreq/Kconfig | 10 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/amd-pstate.c | 704 ++++++++++- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 +- + drivers/cpufreq/cpufreq.c | 10 +- + drivers/cpufreq/davinci-cpufreq.c | 4 +- + drivers/cpufreq/intel_pstate.c | 14 - + drivers/cpufreq/loongson1-cpufreq.c | 222 ---- + drivers/cpufreq/mediatek-cpufreq-hw.c | 5 +- + drivers/cpufreq/omap-cpufreq.c | 4 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 4 +- + drivers/cpufreq/tegra194-cpufreq.c | 3 +- + drivers/cpuidle/Kconfig | 1 + + drivers/cpuidle/Kconfig.arm | 10 + + drivers/cpuidle/cpuidle-haltpoll.c | 2 +- + drivers/cpuidle/cpuidle-psci-domain.c | 7 +- + drivers/cpuidle/cpuidle-psci.c | 3 + + drivers/cpuidle/driver.c | 4 + + drivers/cpuidle/governors/teo.c | 102 +- + drivers/cpuidle/sysfs.c | 6 +- + drivers/idle/intel_idle.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 39 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 209 +--- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 +- + drivers/opp/Kconfig | 1 - + drivers/opp/debugfs.c | 2 +- + drivers/platform/x86/acerhdf.c | 73 +- + drivers/powercap/idle_inject.c | 65 +- + drivers/powercap/intel_rapl_common.c | 13 +- + drivers/powercap/powercap_sys.c | 14 +- + drivers/thermal/Kconfig | 18 +- + drivers/thermal/Makefile | 7 +- + drivers/thermal/amlogic_thermal.c | 1 - + drivers/thermal/armada_thermal.c | 32 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 11 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 4 +- + drivers/thermal/da9062-thermal.c | 52 +- + drivers/thermal/dove_thermal.c | 7 +- + drivers/thermal/gov_bang_bang.c | 37 +- + drivers/thermal/gov_fair_share.c | 18 +- + drivers/thermal/gov_power_allocator.c | 51 +- + drivers/thermal/gov_step_wise.c | 22 +- + drivers/thermal/hisi_thermal.c | 18 +- + drivers/thermal/imx8mm_thermal.c | 1 - + drivers/thermal/imx_sc_thermal.c | 9 +- + drivers/thermal/imx_thermal.c | 72 +- + drivers/thermal/intel/Kconfig | 11 + + drivers/thermal/intel/Makefile | 1 + + drivers/thermal/intel/int340x_thermal/Kconfig | 2 + + .../intel/int340x_thermal/int3400_thermal.c | 58 +- + .../intel/int340x_thermal/int3403_thermal.c | 2 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 352 +++--- + .../intel/int340x_thermal/int340x_thermal_zone.h | 17 +- + .../int340x_thermal/processor_thermal_device.c | 129 +-- + .../int340x_thermal/processor_thermal_device_pci.c | 53 +- + drivers/thermal/intel/intel_hfi.c | 3 +- + drivers/thermal/intel/intel_menlow.c | 12 +- + drivers/thermal/intel/intel_pch_thermal.c | 410 +++---- + drivers/thermal/intel/intel_powerclamp.c | 545 +++++---- + drivers/thermal/intel/intel_quark_dts_thermal.c | 55 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 35 +- + drivers/thermal/intel/intel_tcc.c | 139 +++ + drivers/thermal/intel/intel_tcc_cooling.c | 37 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 176 +-- + drivers/thermal/kirkwood_thermal.c | 4 +- + drivers/thermal/mediatek/Kconfig | 37 + + drivers/thermal/mediatek/Makefile | 2 + + .../{mtk_thermal.c => mediatek/auxadc_thermal.c} | 151 ++- + drivers/thermal/mediatek/lvts_thermal.c | 1224 ++++++++++++++++++++ + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 45 +- + drivers/thermal/qcom/tsens-v0_1.c | 655 +++-------- + drivers/thermal/qcom/tsens-v1.c | 340 ++---- + drivers/thermal/qcom/tsens.c | 219 +++- + drivers/thermal/qcom/tsens.h | 46 +- + drivers/thermal/qoriq_thermal.c | 1 - + drivers/thermal/rcar_gen3_thermal.c | 43 +- + drivers/thermal/rcar_thermal.c | 53 +- + drivers/thermal/rockchip_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 65 +- + drivers/thermal/spear_thermal.c | 4 +- + drivers/thermal/st/Kconfig | 4 - + drivers/thermal/st/Makefile | 1 - + drivers/thermal/st/st_thermal.c | 47 +- + drivers/thermal/st/st_thermal_syscfg.c | 174 --- + drivers/thermal/st/stm_thermal.c | 1 - + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 35 +- + drivers/thermal/tegra/tegra30-tsensor.c | 18 +- + drivers/thermal/thermal_acpi.c | 117 ++ + drivers/thermal/thermal_core.c | 145 ++- + drivers/thermal/thermal_core.h | 28 +- + drivers/thermal/thermal_helpers.c | 70 +- + drivers/thermal/thermal_mmio.c | 4 +- + drivers/thermal/thermal_netlink.c | 24 +- + drivers/thermal/thermal_netlink.h | 3 + + drivers/thermal/thermal_of.c | 116 -- + drivers/thermal/thermal_sysfs.c | 135 +-- + drivers/thermal/thermal_trip.c | 182 +++ + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 - + drivers/thermal/uniphier_thermal.c | 31 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 4 +- + include/acpi/cppc_acpi.h | 12 + + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 19 + + include/linux/amd-pstate.h | 32 + + include/linux/cpufreq.h | 2 +- + include/linux/idle_inject.h | 3 + + include/linux/intel_tcc.h | 18 + + include/linux/pm.h | 4 + + include/linux/thermal.h | 19 + + kernel/power/Kconfig | 1 - + kernel/power/energy_model.c | 5 +- + kernel/power/swap.c | 16 +- + tools/lib/thermal/libthermal.pc.template | 2 +- + tools/lib/thermal/sampling.c | 2 +- + tools/power/pm-graph/sleepgraph.py | 4 +- + .../x86/amd_pstate_tracer/amd_pstate_trace.py | 4 +- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 10 +- + 163 files changed, 5436 insertions(+), 3627 deletions(-) + create mode 100644 Documentation/admin-guide/thermal/index.rst + rename Documentation/{driver-api => admin-guide}/thermal/intel_powerclamp.rst (91%) + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.yaml + delete mode 100644 arch/mips/include/asm/mach-loongson32/cpufreq.h + delete mode 100644 drivers/cpufreq/loongson1-cpufreq.c + create mode 100644 drivers/thermal/intel/intel_tcc.c + create mode 100644 drivers/thermal/mediatek/Kconfig + create mode 100644 drivers/thermal/mediatek/Makefile + rename drivers/thermal/{mtk_thermal.c => mediatek/auxadc_thermal.c} (88%) + create mode 100644 drivers/thermal/mediatek/lvts_thermal.c + delete mode 100644 drivers/thermal/st/st_thermal_syscfg.c + create mode 100644 drivers/thermal/thermal_acpi.c + create mode 100644 drivers/thermal/thermal_trip.c + create mode 100644 include/dt-bindings/thermal/mediatek,lvts-thermal.h + create mode 100644 include/linux/intel_tcc.h +Merging cpufreq-arm/cpufreq/arm/linux-next (ba38f3cbe7db dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum) +$ 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 +Already up to date. +Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU") +$ 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/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging opp/opp/linux-next (eca4c0eea534 OPP: fix error checking in opp_migrate_dentry()) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (a2c81dc59d41 Merge back thermal control material for 6.3.) +$ 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 (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls) +$ 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/Kconfig | 1 - + fs/dlm/lockspace.c | 21 +++++---- + fs/dlm/lowcomms.c | 77 ++++++++++++++++++++++--------- + fs/dlm/memory.c | 2 +- + fs/dlm/midcomms.c | 131 +++++++++++++++++++++++++++-------------------------- + fs/dlm/midcomms.h | 1 + + 6 files changed, 136 insertions(+), 97 deletions(-) +Merging rdma/for-next (66fb1d5df6ac IB/mlx5: Extend debug control for CC parameters) +$ 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/hfi1/file_ops.c +Auto-merging drivers/infiniband/hw/hfi1/user_exp_rcv.c +Auto-merging drivers/infiniband/sw/rxe/rxe_pool.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging include/linux/mlx5/driver.h +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 300 +++++----- + drivers/infiniband/core/sa_query.c | 171 ++---- + drivers/infiniband/hw/cxgb4/cm.c | 7 + + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/cxgb4/restrack.c | 2 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 26 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +- + drivers/infiniband/hw/hfi1/chip.c | 59 +- + drivers/infiniband/hw/hfi1/exp_rcv.h | 5 +- + drivers/infiniband/hw/hfi1/file_ops.c | 81 ++- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 4 +- + drivers/infiniband/hw/hfi1/sdma.h | 15 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 46 +- + drivers/infiniband/hw/hfi1/user_pages.c | 61 ++- + drivers/infiniband/hw/hfi1/verbs.c | 81 ++- + drivers/infiniband/hw/hns/hns_roce_device.h | 19 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 109 ++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 66 +-- + drivers/infiniband/hw/irdma/hw.c | 2 + + drivers/infiniband/hw/irdma/verbs.c | 313 +++++++---- + drivers/infiniband/hw/mana/main.c | 22 +- + drivers/infiniband/hw/mlx4/main.c | 8 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 + + drivers/infiniband/hw/mlx4/qp.c | 121 ++-- + drivers/infiniband/hw/mlx5/cmd.c | 45 +- + drivers/infiniband/hw/mlx5/cmd.h | 3 +- + drivers/infiniband/hw/mlx5/cong.c | 28 +- + drivers/infiniband/hw/mlx5/main.c | 102 ++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 54 +- + drivers/infiniband/hw/mlx5/mr.c | 490 +++++++++++++---- + drivers/infiniband/hw/mlx5/odp.c | 67 +-- + drivers/infiniband/hw/mlx5/qp.c | 164 ++++-- + drivers/infiniband/hw/mlx5/qp.h | 4 +- + drivers/infiniband/hw/mlx5/qpc.c | 7 +- + drivers/infiniband/hw/mlx5/srq.c | 2 +- + drivers/infiniband/hw/mlx5/umr.c | 4 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/sw/rxe/rxe.h | 38 ++ + drivers/infiniband/sw/rxe/rxe_loc.h | 12 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 606 ++++++++++++--------- + drivers/infiniband/sw/rxe/rxe_pool.c | 46 -- + drivers/infiniband/sw/rxe/rxe_pool.h | 3 - + drivers/infiniband/sw/rxe/rxe_queue.h | 108 ++-- + drivers/infiniband/sw/rxe/rxe_resp.c | 202 +++---- + drivers/infiniband/sw/rxe/rxe_verbs.c | 115 ++-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 32 +- + drivers/infiniband/sw/siw/siw_mem.c | 23 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 5 + + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 1 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 2 + + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 54 +- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 44 +- + .../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 368 +++++++++++++ + .../mellanox/mlx5/core/lib/ipsec_fs_roce.h | 25 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 20 + + include/linux/mlx4/qp.h | 1 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/fs.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 81 ++- + include/linux/mlx5/qp.h | 2 +- + include/rdma/ib_sa.h | 2 +- + include/rdma/ib_umem.h | 1 - + include/rdma/ib_verbs.h | 2 +- + include/rdma/rdma_cm.h | 1 - + include/rdma/restrack.h | 4 +- + include/uapi/rdma/hns-abi.h | 4 + + 82 files changed, 2777 insertions(+), 1663 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.h +Merging net-next/master (675f176b4dcc Merge ra.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/netdev/net-next.git net-next/master +Auto-merging Documentation/conf.py +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +CONFLICT (modify/delete): Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst deleted in net-next/master and modified in HEAD. Version HEAD of Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst left in tree. +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ipa/ipa_main.c +Auto-merging fs/dlm/lowcomms.c +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/poison.h +Auto-merging init/Kconfig +Auto-merging kernel/trace/ftrace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/testing/selftests/bpf/progs/profiler.inc.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst +rm 'Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst' +$ git commit --no-edit -v -a +[master 28881149ca0e] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-peak_usb | 19 + + Documentation/admin-guide/sysctl/net.rst | 6 + + Documentation/bpf/bpf_design_QA.rst | 25 +- + Documentation/bpf/cpumasks.rst | 393 ++ + Documentation/bpf/index.rst | 1 + + Documentation/bpf/instruction-set.rst | 136 +- + Documentation/bpf/kfuncs.rst | 219 +- + .../bpf/libbpf/libbpf_naming_convention.rst | 6 +- + Documentation/bpf/map_sockmap.rst | 498 ++ + Documentation/bpf/map_xskmap.rst | 2 +- + Documentation/bpf/ringbuf.rst | 4 +- + Documentation/bpf/verifier.rst | 297 +- + Documentation/conf.py | 3 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/netlink.rst | 101 + + Documentation/core-api/packing.rst | 2 +- + .../devicetree/bindings/mfd/mscc,ocelot.yaml | 9 + + .../bindings/net/amlogic,g12a-mdio-mux.yaml | 80 + + .../bindings/net/amlogic,gxl-mdio-mux.yaml | 64 + + .../devicetree/bindings/net/asix,ax88796c.yaml | 3 +- + .../bindings/net/can/renesas,rcar-canfd.yaml | 16 +- + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 +- + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +- + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 15 +- + .../devicetree/bindings/net/dsa/dsa-port.yaml | 30 +- + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 49 +- + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 2 +- + .../bindings/net/dsa/mediatek,mt7530.yaml | 58 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 +- + .../bindings/net/dsa/microchip,lan937x.yaml | 2 +- + .../devicetree/bindings/net/dsa/mscc,ocelot.yaml | 2 +- + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 14 +- + .../devicetree/bindings/net/dsa/realtek.yaml | 2 +- + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- + .../bindings/net/ethernet-switch-port.yaml | 26 + + .../devicetree/bindings/net/ethernet-switch.yaml | 62 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 1 + + .../devicetree/bindings/net/maxlinear,gpy2xx.yaml | 47 + + .../bindings/net/mdio-mux-meson-g12a.txt | 48 - + .../devicetree/bindings/net/micrel-ksz90x1.txt | 1 + + .../devicetree/bindings/net/motorcomm,yt8xxx.yaml | 117 + + .../bindings/net/mscc,vsc7514-switch.yaml | 140 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 +- + .../devicetree/bindings/net/rfkill-gpio.yaml | 51 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 33 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 8 + + .../bindings/net/wireless/esp,esp8089.yaml | 20 +- + .../bindings/net/wireless/ieee80211.yaml | 1 - + .../bindings/net/wireless/marvell-8xxx.txt | 4 +- + .../bindings/net/wireless/mediatek,mt76.yaml | 1 - + .../bindings/net/wireless/qcom,ath11k.yaml | 12 +- + .../bindings/net/wireless/silabs,wfx.yaml | 1 - + .../bindings/net/wireless/ti,wlcore.yaml | 70 +- + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/isdn/interface_capi.rst | 2 +- + Documentation/isdn/m_isdn.rst | 2 +- + Documentation/netlink/genetlink-c.yaml | 331 + + Documentation/netlink/genetlink-legacy.yaml | 361 + + Documentation/netlink/genetlink.yaml | 296 + + Documentation/netlink/specs/ethtool.yaml | 397 ++ + Documentation/netlink/specs/fou.yaml | 128 + + Documentation/netlink/specs/netdev.yaml | 100 + + Documentation/networking/af_xdp.rst | 4 +- + Documentation/networking/arcnet-hardware.rst | 2 +- + Documentation/networking/batman-adv.rst | 2 +- + Documentation/networking/can.rst | 2 +- + Documentation/networking/can_ucan_protocol.rst | 2 +- + Documentation/networking/cdc_mbim.rst | 2 +- + .../networking/device_drivers/atm/iphase.rst | 2 +- + .../device_drivers/can/ctu/ctucanfd-driver.rst | 4 +- + .../device_drivers/can/ctu/fsm_txt_buffer_user.svg | 4 +- + .../device_drivers/ethernet/3com/vortex.rst | 2 +- + .../device_drivers/ethernet/aquantia/atlantic.rst | 6 +- + .../ethernet/freescale/dpaa2/mac-phy-support.rst | 2 +- + .../networking/device_drivers/ethernet/index.rst | 2 +- + .../device_drivers/ethernet/intel/ice.rst | 16 +- + .../device_drivers/ethernet/marvell/octeontx2.rst | 2 +- + .../device_drivers/ethernet/mellanox/mlx5.rst | 746 --- + .../ethernet/mellanox/mlx5/counters.rst | 1302 ++++ + .../ethernet/mellanox/mlx5/devlink.rst | 224 + + .../ethernet/mellanox/mlx5/index.rst | 26 + + .../ethernet/mellanox/mlx5/kconfig.rst | 168 + + .../ethernet/mellanox/mlx5/switchdev.rst | 239 + + .../ethernet/mellanox/mlx5/tracepoints.rst | 229 + + .../device_drivers/ethernet/pensando/ionic.rst | 2 +- + .../ethernet/ti/am65_nuss_cpsw_switchdev.rst | 2 +- + .../device_drivers/ethernet/ti/cpsw_switchdev.rst | 2 +- + .../networking/device_drivers/wwan/iosm.rst | 2 +- + .../networking/devlink/devlink-health.rst | 23 +- + Documentation/networking/devlink/ice.rst | 4 +- + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/mlx5.rst | 18 + + Documentation/networking/devlink/netdevsim.rst | 2 +- + Documentation/networking/devlink/prestera.rst | 2 +- + Documentation/networking/devlink/sfc.rst | 57 + + Documentation/networking/dsa/configuration.rst | 2 +- + Documentation/networking/ethtool-netlink.rst | 272 +- + Documentation/networking/gtp.rst | 2 +- + Documentation/networking/ieee802154.rst | 2 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.rst | 17 +- + Documentation/networking/ipvlan.rst | 2 +- + Documentation/networking/j1939.rst | 2 +- + Documentation/networking/net_failover.rst | 2 +- + Documentation/networking/netconsole.rst | 2 +- + Documentation/networking/page_pool.rst | 6 +- + Documentation/networking/phonet.rst | 2 +- + Documentation/networking/phy.rst | 2 +- + Documentation/networking/regulatory.rst | 4 +- + Documentation/networking/rxrpc.rst | 2 +- + Documentation/networking/snmp_counter.rst | 4 +- + Documentation/networking/statistics.rst | 1 + + Documentation/networking/sysfs-tagging.rst | 2 +- + Documentation/networking/xdp-rx-metadata.rst | 110 + + Documentation/networking/xfrm_device.rst | 4 +- + Documentation/userspace-api/netlink/c-code-gen.rst | 107 + + .../userspace-api/netlink/genetlink-legacy.rst | 178 + + Documentation/userspace-api/netlink/index.rst | 6 + + .../userspace-api/netlink/intro-specs.rst | 80 + + Documentation/userspace-api/netlink/specs.rst | 425 ++ + MAINTAINERS | 34 +- + arch/arm/include/asm/checksum.h | 1 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 78 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 48 + + arch/s390/net/bpf_jit_comp.c | 715 +- + arch/sh/include/asm/checksum_32.h | 1 + + arch/x86/include/asm/checksum_64.h | 1 - + arch/x86/net/bpf_jit_comp.c | 171 +- + crypto/asymmetric_keys/x509_loader.c | 1 + + drivers/base/regmap/regmap-mdio.c | 41 +- + drivers/bluetooth/btintel.c | 116 + + drivers/bluetooth/btintel.h | 13 + + drivers/bluetooth/btusb.c | 16 + + drivers/bluetooth/hci_qca.c | 11 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 10 +- + drivers/infiniband/hw/bnxt_re/main.c | 635 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 3 + + drivers/infiniband/hw/mlx5/ib_rep.c | 18 +- + drivers/infiniband/sw/siw/siw_cm.c | 5 + + drivers/infiniband/sw/siw/siw_qp.c | 3 + + drivers/mfd/ocelot-core.c | 68 +- + drivers/net/Kconfig | 13 +- + drivers/net/Makefile | 4 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/can/dev/bittiming.c | 120 +- + drivers/net/can/dev/calc_bittiming.c | 34 +- + drivers/net/can/dev/dev.c | 21 + + drivers/net/can/dev/netlink.c | 49 +- + drivers/net/can/rcar/rcar_canfd.c | 225 +- + drivers/net/can/sja1000/ems_pci.c | 154 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 18 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 26 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 44 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 122 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 12 +- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 68 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 30 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 1 + + drivers/net/dsa/lan9303-core.c | 169 +- + drivers/net/dsa/microchip/Kconfig | 10 + + drivers/net/dsa/microchip/Makefile | 5 + + drivers/net/dsa/microchip/ksz9477.c | 25 + + drivers/net/dsa/microchip/ksz9477.h | 2 + + drivers/net/dsa/microchip/ksz9477_reg.h | 33 +- + drivers/net/dsa/microchip/ksz_common.c | 246 +- + drivers/net/dsa/microchip/ksz_common.h | 69 + + drivers/net/dsa/microchip/ksz_ptp.c | 1201 ++++ + drivers/net/dsa/microchip/ksz_ptp.h | 86 + + drivers/net/dsa/microchip/ksz_ptp_reg.h | 142 + + drivers/net/dsa/microchip/lan937x.h | 1 + + drivers/net/dsa/microchip/lan937x_main.c | 9 + + drivers/net/dsa/microchip/lan937x_reg.h | 3 + + drivers/net/dsa/mt7530.c | 87 +- + drivers/net/dsa/mt7530.h | 15 +- + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 201 +- + drivers/net/dsa/mv88e6xxx/chip.h | 23 + + drivers/net/dsa/mv88e6xxx/global1.c | 12 + + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global1_atu.c | 24 +- + drivers/net/dsa/mv88e6xxx/global2.c | 66 +- + drivers/net/dsa/mv88e6xxx/global2.h | 18 +- + drivers/net/dsa/mv88e6xxx/phy.c | 32 + + drivers/net/dsa/mv88e6xxx/phy.h | 4 + + drivers/net/dsa/mv88e6xxx/ptp.c | 46 + + drivers/net/dsa/mv88e6xxx/ptp.h | 2 + + drivers/net/dsa/mv88e6xxx/serdes.c | 8 +- + drivers/net/dsa/mv88e6xxx/switchdev.c | 83 + + drivers/net/dsa/mv88e6xxx/switchdev.h | 19 + + drivers/net/dsa/ocelot/Kconfig | 32 + + drivers/net/dsa/ocelot/Makefile | 13 +- + drivers/net/dsa/ocelot/felix.c | 59 +- + drivers/net/dsa/ocelot/felix.h | 2 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 64 +- + drivers/net/dsa/ocelot/ocelot_ext.c | 163 + + drivers/net/dsa/ocelot/seville_vsc9953.c | 1 + + drivers/net/dsa/qca/qca8k-8xxx.c | 92 +- + drivers/net/dsa/qca/qca8k-common.c | 49 +- + drivers/net/dsa/qca/qca8k.h | 5 +- + drivers/net/dsa/rzn1_a5psw.c | 6 - + drivers/net/dsa/sja1105/sja1105.h | 16 +- + drivers/net/dsa/sja1105/sja1105_mdio.c | 137 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 24 +- + drivers/net/ethernet/actions/owl-emac.c | 6 - + drivers/net/ethernet/adi/adin1110.c | 1 - + drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 + + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 49 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 94 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 415 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 14 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 5 + + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/b44.c | 22 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 8 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 474 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 51 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 + + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 + + drivers/net/ethernet/cadence/macb.h | 29 +- + drivers/net/ethernet/cadence/macb_main.c | 177 +- + drivers/net/ethernet/cadence/macb_ptp.c | 83 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 8 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 2 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 34 +- + drivers/net/ethernet/engleder/Makefile | 2 +- + drivers/net/ethernet/engleder/tsnep.h | 16 +- + drivers/net/ethernet/engleder/tsnep_main.c | 479 +- + drivers/net/ethernet/engleder/tsnep_tc.c | 21 + + drivers/net/ethernet/engleder/tsnep_xdp.c | 19 + + drivers/net/ethernet/faraday/ftmac100.c | 6 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 + + drivers/net/ethernet/freescale/enetc/Kconfig | 14 +- + drivers/net/ethernet/freescale/enetc/Makefile | 7 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 746 ++- + drivers/net/ethernet/freescale/enetc/enetc.h | 40 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 8 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 232 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 137 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 119 +- + .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 113 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 27 +- + drivers/net/ethernet/freescale/fec_main.c | 182 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 149 +- + drivers/net/ethernet/fungible/funeth/Kconfig | 2 +- + drivers/net/ethernet/fungible/funeth/funeth_main.c | 6 + + drivers/net/ethernet/google/gve/gve_main.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 20 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 1 - + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 + + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 1 - + drivers/net/ethernet/hisilicon/hns_mdio.c | 192 +- + drivers/net/ethernet/ibm/ibmvnic.c | 29 +- + drivers/net/ethernet/intel/Kconfig | 3 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 10 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 7 - + drivers/net/ethernet/intel/e1000e/phy.c | 9 + + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 - + drivers/net/ethernet/intel/i40e/i40e.h | 9 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 68 +- + drivers/net/ethernet/intel/i40e/i40e_alloc.h | 22 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 1038 ++- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 60 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 28 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_diag.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_diag.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 65 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 56 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 46 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 94 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 34 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 421 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 252 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 643 +- + drivers/net/ethernet/intel/i40e/i40e_status.h | 35 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 157 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 6 +- + drivers/net/ethernet/intel/iavf/iavf.h | 7 +- + drivers/net/ethernet/intel/iavf/iavf_client.c | 32 +- + drivers/net/ethernet/intel/iavf/iavf_client.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 7 +- + drivers/net/ethernet/intel/iavf/iavf_status.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 6 +- + drivers/net/ethernet/intel/ice/Makefile | 3 +- + drivers/net/ethernet/intel/ice/ice.h | 15 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 18 +- + drivers/net/ethernet/intel/ice/ice_base.c | 21 +- + drivers/net/ethernet/intel/ice/ice_common.c | 49 +- + drivers/net/ethernet/intel/ice/ice_common.h | 4 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 43 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 2 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 70 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 1897 ++++++ + drivers/net/ethernet/intel/ice/ice_ddp.h | 445 ++ + drivers/net/ethernet/intel/ice/ice_devlink.c | 124 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 26 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 69 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 2258 +------ + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 69 - + drivers/net/ethernet/intel/ice/ice_flex_type.h | 328 +- + drivers/net/ethernet/intel/ice/ice_fltr.c | 5 + + drivers/net/ethernet/intel/ice/ice_gnss.c | 377 +- + drivers/net/ethernet/intel/ice/ice_gnss.h | 18 +- + drivers/net/ethernet/intel/ice/ice_idc.c | 53 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 1052 ++- + drivers/net/ethernet/intel/ice/ice_lib.h | 50 +- + drivers/net/ethernet/intel/ice/ice_main.c | 1225 ++-- + drivers/net/ethernet/intel/ice/ice_nvm.c | 1 - + drivers/net/ethernet/intel/ice/ice_ptp.c | 74 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 7 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 133 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 50 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 10 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 414 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 54 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 236 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 75 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 183 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 12 +- + .../net/ethernet/intel/ice/ice_vf_lib_private.h | 3 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 24 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 8 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 213 +- + drivers/net/ethernet/intel/igb/igb_main.c | 32 +- + drivers/net/ethernet/intel/igc/igc_base.c | 29 + + drivers/net/ethernet/intel/igc/igc_base.h | 2 + + drivers/net/ethernet/intel/igc/igc_defines.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 39 +- + drivers/net/ethernet/intel/igc/igc_tsn.c | 56 +- + drivers/net/ethernet/intel/igc/igc_xdp.c | 5 + + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 21 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 27 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 237 +- + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 21 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + + drivers/net/ethernet/marvell/mvmdio.c | 30 +- + drivers/net/ethernet/marvell/mvneta.c | 8 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 33 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 8 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 18 + + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 309 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 46 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 18 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 8 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 482 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 38 + + drivers/net/ethernet/mediatek/mtk_ppe.c | 27 + + drivers/net/ethernet/mediatek/mtk_ppe.h | 1 + + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 6 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 6 - + drivers/net/ethernet/mediatek/mtk_wed.c | 43 +- + drivers/net/ethernet/mediatek/mtk_wed.h | 9 + + drivers/net/ethernet/mediatek/mtk_wed_wo.c | 11 - + drivers/net/ethernet/mediatek/mtk_wed_wo.h | 1 - + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 63 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 81 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 124 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 288 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 5 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 79 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 14 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 68 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 72 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 6 + + .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 222 +- + .../ethernet/mellanox/mlx5/core/en/port_buffer.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 10 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 15 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 35 +- + .../ethernet/mellanox/mlx5/core/en/tc/act_stats.c | 197 + + .../ethernet/mellanox/mlx5/core/en/tc/act_stats.h | 27 + + .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 4 + + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 31 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 47 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 2 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 19 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 126 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 10 + + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 23 + + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 49 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 19 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 21 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 37 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 10 + + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 97 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 44 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 105 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 398 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 30 +- + .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h | 4 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 213 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.h | 4 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 9 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 337 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 7 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 87 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 10 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/health.c | 30 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 2 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 164 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.h | 30 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 56 +- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 755 ++- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.h | 34 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 12 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 48 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 3 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 5 +- + .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 27 + + .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 1 + + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 109 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 178 +- + .../mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h | 53 + + .../mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h | 54 + + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h | 22 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 166 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 4 - + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/emad.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 12 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 63 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 21 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 244 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 5 - + drivers/net/ethernet/microchip/lan743x_main.c | 167 +- + drivers/net/ethernet/microchip/lan743x_main.h | 1 + + drivers/net/ethernet/microchip/lan966x/Makefile | 2 + + .../net/ethernet/microchip/lan966x/lan966x_goto.c | 10 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 9 + + .../net/ethernet/microchip/lan966x/lan966x_main.h | 32 +- + .../net/ethernet/microchip/lan966x/lan966x_tc.c | 3 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 196 +- + .../microchip/lan966x/lan966x_tc_matchall.c | 16 +- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 94 + + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 46 +- + drivers/net/ethernet/microchip/sparx5/Makefile | 3 +- + drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c | 121 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 7 +- + .../net/ethernet/microchip/sparx5/sparx5_main.h | 124 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 2511 +++++-- + .../net/ethernet/microchip/sparx5/sparx5_police.c | 53 + + .../net/ethernet/microchip/sparx5/sparx5_pool.c | 81 + + .../net/ethernet/microchip/sparx5/sparx5_port.c | 102 + + .../net/ethernet/microchip/sparx5/sparx5_port.h | 41 + + .../net/ethernet/microchip/sparx5/sparx5_psfp.c | 332 + + drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 3 +- + drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 59 + + .../net/ethernet/microchip/sparx5/sparx5_sdlb.c | 335 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 1 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.h | 74 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 1262 ++-- + .../ethernet/microchip/sparx5/sparx5_tc_matchall.c | 16 +- + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.c | 3489 ++++++++-- + .../microchip/sparx5/sparx5_vcap_debugfs.c | 291 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 1356 +++- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 120 + + .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 4 +- + drivers/net/ethernet/microchip/vcap/Makefile | 2 +- + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 499 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 1203 +++- + drivers/net/ethernet/microchip/vcap/vcap_api.h | 13 +- + .../net/ethernet/microchip/vcap/vcap_api_client.h | 13 +- + .../net/ethernet/microchip/vcap/vcap_api_debugfs.c | 77 +- + .../microchip/vcap/vcap_api_debugfs_kunit.c | 19 +- + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 101 +- + .../net/ethernet/microchip/vcap/vcap_api_private.h | 15 +- + .../net/ethernet/microchip/vcap/vcap_model_kunit.c | 2348 ++----- + .../net/ethernet/microchip/vcap/vcap_model_kunit.h | 10 +- + drivers/net/ethernet/microchip/vcap/vcap_tc.c | 412 ++ + drivers/net/ethernet/microchip/vcap/vcap_tc.h | 32 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 + + drivers/net/ethernet/mscc/Kconfig | 1 + + drivers/net/ethernet/mscc/Makefile | 1 + + drivers/net/ethernet/mscc/ocelot.c | 66 +- + drivers/net/ethernet/mscc/ocelot.h | 2 + + drivers/net/ethernet/mscc/ocelot_devlink.c | 31 + + drivers/net/ethernet/mscc/ocelot_mm.c | 215 + + drivers/net/ethernet/mscc/ocelot_stats.c | 332 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 190 +- + drivers/net/ethernet/mscc/vsc7514_regs.c | 159 +- + drivers/net/ethernet/netronome/Kconfig | 2 +- + drivers/net/ethernet/netronome/nfp/Makefile | 4 +- + drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 50 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 8 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 24 + + drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 11 +- + drivers/net/ethernet/netronome/nfp/nfdk/dp.c | 49 +- + drivers/net/ethernet/netronome/nfp/nfdk/ipsec.c | 17 + + drivers/net/ethernet/netronome/nfp/nfdk/nfdk.h | 8 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 35 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 7 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 3 + + drivers/net/ethernet/netronome/nfp/nic/dcb.c | 571 ++ + drivers/net/ethernet/netronome/nfp/nic/main.c | 43 +- + drivers/net/ethernet/netronome/nfp/nic/main.h | 46 + + drivers/net/ethernet/ni/nixge.c | 141 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 67 + + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 13 + + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 117 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 3 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 165 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 40 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 22 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 6 - + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 3 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 20 + + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 18 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 6 + + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 191 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 54 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 24 +- + drivers/net/ethernet/renesas/rswitch.c | 554 +- + drivers/net/ethernet/renesas/rswitch.h | 50 +- + drivers/net/ethernet/renesas/sh_eth.c | 37 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c | 105 +- + drivers/net/ethernet/sfc/Kconfig | 1 + + drivers/net/ethernet/sfc/Makefile | 3 +- + drivers/net/ethernet/sfc/ef100_netdev.c | 30 + + drivers/net/ethernet/sfc/ef100_nic.c | 93 +- + drivers/net/ethernet/sfc/ef100_nic.h | 7 + + drivers/net/ethernet/sfc/ef100_rep.c | 57 +- + drivers/net/ethernet/sfc/ef100_rep.h | 10 + + drivers/net/ethernet/sfc/efx.c | 4 + + drivers/net/ethernet/sfc/efx_devlink.c | 731 ++ + drivers/net/ethernet/sfc/efx_devlink.h | 47 + + drivers/net/ethernet/sfc/mae.c | 218 +- + drivers/net/ethernet/sfc/mae.h | 40 + + drivers/net/ethernet/sfc/mcdi.c | 72 + + drivers/net/ethernet/sfc/mcdi.h | 8 + + drivers/net/ethernet/sfc/net_driver.h | 8 + + drivers/net/ethernet/sfc/siena/efx.c | 4 + + drivers/net/ethernet/socionext/netsec.c | 3 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 21 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 55 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 334 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 20 + + drivers/net/ethernet/sunplus/spl2sw_mdio.c | 6 - + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 85 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 1 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 22 + + drivers/net/ethernet/ti/am65-cpts.c | 170 +- + drivers/net/ethernet/ti/am65-cpts.h | 5 + + drivers/net/ethernet/ti/cpsw.c | 4 + + drivers/net/ethernet/ti/cpsw_new.c | 4 + + drivers/net/ethernet/ti/cpsw_priv.c | 1 + + drivers/net/ethernet/ti/davinci_mdio.c | 50 +- + drivers/net/ethernet/wangxun/Kconfig | 2 + + drivers/net/ethernet/wangxun/libwx/Makefile | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 18 + + drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 8 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 1197 +++- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 42 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2004 ++++++ + drivers/net/ethernet/wangxun/libwx/wx_lib.h | 32 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 409 +- + drivers/net/ethernet/wangxun/ngbe/Makefile | 2 +- + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 79 - + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 22 + + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.h | 9 + + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c | 70 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h | 5 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 583 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 286 + + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h | 12 + + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 98 +- + drivers/net/ethernet/wangxun/txgbe/Makefile | 3 +- + drivers/net/ethernet/wangxun/txgbe/txgbe.h | 43 - + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 19 + + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.h | 9 + + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 116 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h | 6 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 569 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 35 +- + drivers/net/hamradio/baycom_epp.c | 8 +- + drivers/net/hyperv/netvsc.c | 18 + + drivers/net/hyperv/netvsc_drv.c | 3 + + drivers/net/ipa/Makefile | 9 +- + drivers/net/ipa/gsi.c | 486 +- + drivers/net/ipa/gsi.h | 4 +- + drivers/net/ipa/gsi_reg.c | 176 + + drivers/net/ipa/gsi_reg.h | 495 +- + drivers/net/ipa/ipa.h | 4 +- + drivers/net/ipa/ipa_cmd.c | 38 +- + drivers/net/ipa/ipa_endpoint.c | 585 +- + drivers/net/ipa/ipa_endpoint.h | 4 +- + drivers/net/ipa/ipa_interrupt.c | 142 +- + drivers/net/ipa/ipa_interrupt.h | 48 +- + drivers/net/ipa/ipa_main.c | 122 +- + drivers/net/ipa/ipa_mem.c | 22 +- + drivers/net/ipa/ipa_mem.h | 8 +- + drivers/net/ipa/ipa_power.c | 19 +- + drivers/net/ipa/ipa_power.h | 12 + + drivers/net/ipa/ipa_reg.c | 90 +- + drivers/net/ipa/ipa_reg.h | 190 +- + drivers/net/ipa/ipa_resource.c | 16 +- + drivers/net/ipa/ipa_table.c | 68 +- + drivers/net/ipa/ipa_uc.c | 27 +- + drivers/net/ipa/ipa_uc.h | 8 + + drivers/net/ipa/ipa_version.h | 6 +- + drivers/net/ipa/reg.h | 133 + + drivers/net/ipa/reg/gsi_reg-v3.1.c | 289 + + drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 301 + + drivers/net/ipa/reg/gsi_reg-v4.0.c | 306 + + drivers/net/ipa/reg/gsi_reg-v4.11.c | 311 + + drivers/net/ipa/reg/gsi_reg-v4.5.c | 309 + + drivers/net/ipa/reg/gsi_reg-v4.9.c | 310 + + drivers/net/ipa/reg/ipa_reg-v3.1.c | 283 +- + drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 269 +- + drivers/net/ipa/reg/ipa_reg-v4.11.c | 271 +- + drivers/net/ipa/reg/ipa_reg-v4.2.c | 255 +- + drivers/net/ipa/reg/ipa_reg-v4.5.c | 287 +- + drivers/net/ipa/reg/ipa_reg-v4.7.c | 271 +- + drivers/net/ipa/reg/ipa_reg-v4.9.c | 271 +- + drivers/net/ipvlan/ipvlan_core.c | 2 +- + drivers/net/macsec.c | 125 +- + drivers/net/mdio/Kconfig | 11 + + drivers/net/mdio/Makefile | 1 + + drivers/net/mdio/fwnode_mdio.c | 8 +- + drivers/net/mdio/mdio-aspeed.c | 48 +- + drivers/net/mdio/mdio-bitbang.c | 77 +- + drivers/net/mdio/mdio-cavium.c | 111 +- + drivers/net/mdio/mdio-cavium.h | 9 +- + drivers/net/mdio/mdio-i2c.c | 38 +- + drivers/net/mdio/mdio-ipq4019.c | 154 +- + drivers/net/mdio/mdio-ipq8064.c | 8 - + drivers/net/mdio/mdio-mscc-miim.c | 6 - + drivers/net/mdio/mdio-mux-bcm-iproc.c | 54 +- + drivers/net/mdio/mdio-mux-meson-g12a.c | 38 +- + drivers/net/mdio/mdio-mux-meson-gxl.c | 164 + + drivers/net/mdio/mdio-mvusb.c | 6 - + drivers/net/mdio/mdio-octeon.c | 6 +- + drivers/net/mdio/mdio-thunder.c | 6 +- + drivers/net/netdevsim/bpf.c | 4 - + drivers/net/netdevsim/dev.c | 50 +- + drivers/net/netdevsim/health.c | 20 +- + drivers/net/netdevsim/ipsec.c | 14 +- + drivers/net/netdevsim/netdev.c | 1 + + drivers/net/pcs/pcs-lynx.c | 20 +- + drivers/net/pcs/pcs-rzn1-miic.c | 6 +- + drivers/net/pcs/pcs-xpcs.c | 4 +- + drivers/net/phy/Kconfig | 9 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mdio-open-alliance.h | 46 + + drivers/net/phy/mdio_bus.c | 464 +- + drivers/net/phy/micrel.c | 870 ++- + drivers/net/phy/microchip_t1.c | 70 +- + drivers/net/phy/motorcomm.c | 559 +- + drivers/net/phy/mxl-gpy.c | 5 + + drivers/net/phy/ncn26000.c | 171 + + drivers/net/phy/phy-c45.c | 514 +- + drivers/net/phy/phy-core.c | 5 +- + drivers/net/phy/phy.c | 345 +- + drivers/net/phy/phy_device.c | 52 +- + drivers/net/phy/phylink.c | 23 +- + drivers/net/phy/sfp.c | 39 +- + drivers/net/tap.c | 2 +- + drivers/net/thunderbolt/Kconfig | 12 + + drivers/net/thunderbolt/Makefile | 6 + + drivers/net/{thunderbolt.c => thunderbolt/main.c} | 48 +- + drivers/net/thunderbolt/trace.c | 10 + + drivers/net/thunderbolt/trace.h | 141 + + drivers/net/tun.c | 7 +- + drivers/net/usb/cdc_ether.c | 114 - + drivers/net/usb/r8152.c | 179 +- + drivers/net/usb/usbnet.c | 29 +- + drivers/net/veth.c | 91 +- + drivers/net/virtio_net.c | 428 +- + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 1 + + drivers/net/wireless/ath/ath10k/ce.c | 8 - + drivers/net/wireless/ath/ath11k/ahb.c | 47 +- + drivers/net/wireless/ath/ath11k/ce.h | 16 + + drivers/net/wireless/ath/ath11k/core.c | 93 + + drivers/net/wireless/ath/ath11k/core.h | 18 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 48 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 24 +- + drivers/net/wireless/ath/ath11k/hal.c | 17 +- + drivers/net/wireless/ath/ath11k/hal.h | 5 + + drivers/net/wireless/ath/ath11k/hw.c | 371 ++ + drivers/net/wireless/ath/ath11k/hw.h | 12 + + drivers/net/wireless/ath/ath11k/mac.c | 104 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 + + drivers/net/wireless/ath/ath11k/wmi.c | 4 +- + drivers/net/wireless/ath/ath11k/wmi.h | 1 + + drivers/net/wireless/ath/ath12k/Kconfig | 34 + + drivers/net/wireless/ath/ath12k/Makefile | 27 + + drivers/net/wireless/ath/ath12k/ce.c | 964 +++ + drivers/net/wireless/ath/ath12k/ce.h | 184 + + drivers/net/wireless/ath/ath12k/core.c | 939 +++ + drivers/net/wireless/ath/ath12k/core.h | 822 +++ + drivers/net/wireless/ath/ath12k/dbring.c | 357 + + drivers/net/wireless/ath/ath12k/dbring.h | 80 + + drivers/net/wireless/ath/ath12k/debug.c | 102 + + drivers/net/wireless/ath/ath12k/debug.h | 67 + + drivers/net/wireless/ath/ath12k/dp.c | 1580 +++++ + drivers/net/wireless/ath/ath12k/dp.h | 1816 +++++ + drivers/net/wireless/ath/ath12k/dp_mon.c | 2596 ++++++++ + drivers/net/wireless/ath/ath12k/dp_mon.h | 106 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 4234 ++++++++++++ + drivers/net/wireless/ath/ath12k/dp_rx.h | 145 + + drivers/net/wireless/ath/ath12k/dp_tx.c | 1211 ++++ + drivers/net/wireless/ath/ath12k/dp_tx.h | 41 + + drivers/net/wireless/ath/ath12k/hal.c | 2222 ++++++ + drivers/net/wireless/ath/ath12k/hal.h | 1142 ++++ + drivers/net/wireless/ath/ath12k/hal_desc.h | 2961 ++++++++ + drivers/net/wireless/ath/ath12k/hal_rx.c | 850 +++ + drivers/net/wireless/ath/ath12k/hal_rx.h | 704 ++ + drivers/net/wireless/ath/ath12k/hal_tx.c | 145 + + drivers/net/wireless/ath/ath12k/hal_tx.h | 194 + + drivers/net/wireless/ath/ath12k/hif.h | 144 + + drivers/net/wireless/ath/ath12k/htc.c | 789 +++ + drivers/net/wireless/ath/ath12k/htc.h | 316 + + drivers/net/wireless/ath/ath12k/hw.c | 1041 +++ + drivers/net/wireless/ath/ath12k/hw.h | 312 + + drivers/net/wireless/ath/ath12k/mac.c | 7038 ++++++++++++++++++++ + drivers/net/wireless/ath/ath12k/mac.h | 76 + + drivers/net/wireless/ath/ath12k/mhi.c | 616 ++ + drivers/net/wireless/ath/ath12k/mhi.h | 46 + + drivers/net/wireless/ath/ath12k/pci.c | 1374 ++++ + drivers/net/wireless/ath/ath12k/pci.h | 135 + + drivers/net/wireless/ath/ath12k/peer.c | 342 + + drivers/net/wireless/ath/ath12k/peer.h | 67 + + drivers/net/wireless/ath/ath12k/qmi.c | 3087 +++++++++ + drivers/net/wireless/ath/ath12k/qmi.h | 569 ++ + drivers/net/wireless/ath/ath12k/reg.c | 732 ++ + drivers/net/wireless/ath/ath12k/reg.h | 95 + + drivers/net/wireless/ath/ath12k/rx_desc.h | 1441 ++++ + drivers/net/wireless/ath/ath12k/trace.c | 10 + + drivers/net/wireless/ath/ath12k/trace.h | 152 + + drivers/net/wireless/ath/ath12k/wmi.c | 6600 ++++++++++++++++++ + drivers/net/wireless/ath/ath12k/wmi.h | 4803 +++++++++++++ + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 30 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 14 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 74 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 64 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 12 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 12 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 56 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 26 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 82 +- + drivers/net/wireless/ath/ath9k/ar9003_wow.c | 18 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 14 +- + drivers/net/wireless/ath/ath9k/calib.c | 32 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 12 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 10 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 33 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 6 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 4 +- + drivers/net/wireless/ath/ath9k/hw.c | 128 +- + drivers/net/wireless/ath/ath9k/mac.c | 42 +- + drivers/net/wireless/ath/ath9k/pci.c | 4 +- + drivers/net/wireless/ath/ath9k/reg.h | 148 +- + drivers/net/wireless/ath/ath9k/rng.c | 6 +- + drivers/net/wireless/ath/ath9k/wmi.c | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 7 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 5 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 33 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 8 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 11 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 16 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 12 +- + drivers/net/wireless/intel/iwlegacy/common.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 1 + + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 145 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 59 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 19 +- + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 21 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 + + drivers/net/wireless/intel/iwlwifi/mei/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 6 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 80 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 5 + + drivers/net/wireless/intersil/orinoco/hermes.c | 1 + + drivers/net/wireless/intersil/orinoco/hw.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/net/wireless/marvell/libertas/cfg.c | 76 +- + drivers/net/wireless/marvell/libertas/cmdresp.c | 2 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 +- + drivers/net/wireless/marvell/libertas/main.c | 3 +- + drivers/net/wireless/marvell/libertas/types.h | 21 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 2 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 6 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +- + drivers/net/wireless/marvell/mwifiex/Kconfig | 5 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 5 + + drivers/net/wireless/marvell/mwifiex/fw.h | 23 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 26 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 1 + + drivers/net/wireless/mediatek/mt76/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/dma.c | 132 +- + drivers/net/wireless/mediatek/mt76/dma.h | 1 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 1 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 124 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 67 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 85 + + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 16 - + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 + + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 62 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 1 + + .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 1 - + .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 1 - + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 5 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 9 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 46 + + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 16 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 7 +- + .../net/wireless/mediatek/mt76/mt76x0/usb_mcu.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 35 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 45 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 24 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 194 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 39 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 193 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 99 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 7 + + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 13 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 3 + + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.c | 62 +- + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.h | 12 + + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 15 + + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 116 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 110 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 16 + + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 8 + + .../net/wireless/mediatek/mt76/mt7921/testmode.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 4 +- + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 45 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 416 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 149 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 24 - + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 249 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 16 + + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 26 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 16 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 4 + + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 4 + + drivers/net/wireless/mediatek/mt76/usb.c | 42 +- + drivers/net/wireless/mediatek/mt76/util.c | 10 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 3 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 8 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 - + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 3 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 142 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1899 ++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 24 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 13 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 45 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 28 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 18 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 450 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 46 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +- + .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 52 +- + drivers/net/wireless/realtek/rtw88/bf.c | 13 +- + drivers/net/wireless/realtek/rtw88/mac.c | 4 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw88/main.c | 6 +- + drivers/net/wireless/realtek/rtw88/pci.c | 50 +- + drivers/net/wireless/realtek/rtw88/tx.c | 41 + + drivers/net/wireless/realtek/rtw88/tx.h | 3 + + drivers/net/wireless/realtek/rtw88/usb.c | 18 +- + drivers/net/wireless/realtek/rtw89/coex.c | 1813 +++-- + drivers/net/wireless/realtek/rtw89/coex.h | 1 + + drivers/net/wireless/realtek/rtw89/core.c | 83 +- + drivers/net/wireless/realtek/rtw89/core.h | 295 +- + drivers/net/wireless/realtek/rtw89/debug.c | 43 + + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/fw.c | 146 +- + drivers/net/wireless/realtek/rtw89/fw.h | 54 +- + drivers/net/wireless/realtek/rtw89/mac.c | 99 +- + drivers/net/wireless/realtek/rtw89/mac.h | 19 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + + drivers/net/wireless/realtek/rtw89/pci.c | 17 +- + drivers/net/wireless/realtek/rtw89/pci.h | 15 +- + drivers/net/wireless/realtek/rtw89/phy.c | 19 +- + drivers/net/wireless/realtek/rtw89/reg.h | 25 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 26 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 27 +- + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 353 +- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 1 + + drivers/net/wireless/realtek/rtw89/ser.c | 1 + + drivers/net/wireless/realtek/rtw89/txrx.h | 2 + + drivers/net/wireless/realtek/rtw89/wow.c | 26 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 1 + + drivers/net/wireless/rsi/rsi_91x_hal.c | 4 +- + drivers/net/wireless/rsi/rsi_hal.h | 2 +- + drivers/net/wireless/ti/wl1251/init.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_rf.h | 3 - + drivers/net/xen-netfront.c | 2 + + drivers/nvme/host/tcp.c | 3 + + drivers/nvme/target/tcp.c | 5 + + drivers/ptp/ptp_qoriq.c | 50 +- + drivers/s390/net/ctcm_fsms.c | 32 +- + drivers/s390/net/ctcm_main.c | 16 +- + drivers/s390/net/ctcm_mpc.c | 15 +- + drivers/s390/net/ism.h | 19 +- + drivers/s390/net/ism_drv.c | 376 +- + drivers/s390/net/qeth_core_main.c | 14 +- + drivers/s390/net/qeth_core_sys.c | 66 +- + drivers/s390/net/qeth_ethtool.c | 6 +- + drivers/s390/net/qeth_l2_main.c | 53 +- + drivers/s390/net/qeth_l2_sys.c | 28 +- + drivers/s390/net/qeth_l3_main.c | 7 +- + drivers/s390/net/qeth_l3_sys.c | 83 +- + drivers/scsi/iscsi_tcp.c | 3 + + drivers/scsi/lpfc/lpfc_init.c | 1 + + drivers/soc/qcom/qmi_interface.c | 3 + + drivers/target/iscsi/iscsi_target_nego.c | 2 + + drivers/vhost/vsock.c | 214 +- + drivers/xen/pvcalls-back.c | 5 + + fs/dlm/lowcomms.c | 5 + + fs/ocfs2/cluster/tcp.c | 5 + + include/linux/acpi.h | 15 + + include/linux/avf/virtchnl.h | 159 +- + include/linux/bitfield.h | 26 + + include/linux/bpf.h | 109 +- + include/linux/bpf_verifier.h | 45 +- + include/linux/btf.h | 23 +- + include/linux/can/bittiming.h | 12 +- + include/linux/cpumask.h | 20 + + include/linux/dsa/ksz_common.h | 53 + + include/linux/ethtool.h | 265 +- + include/linux/ethtool_netlink.h | 42 + + include/linux/filter.h | 1 + + include/linux/find.h | 33 + + include/linux/fsl/enetc_mdio.h | 21 +- + include/linux/fsl/ptp_qoriq.h | 1 + + include/linux/ieee80211.h | 1 + + include/linux/igmp.h | 1 + + include/linux/ip.h | 21 + + include/linux/ism.h | 98 + + include/linux/mdio-bitbang.h | 6 +- + include/linux/mdio.h | 150 +- + include/linux/micrel_phy.h | 3 + + include/linux/mlx5/device.h | 5 + + include/linux/mlx5/driver.h | 19 +- + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 238 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/module.h | 6 +- + include/linux/netdevice.h | 23 +- + include/linux/netlink.h | 14 + + include/linux/phy.h | 116 +- + include/linux/poison.h | 3 + + include/linux/ptp_classify.h | 73 + + include/linux/regmap.h | 8 + + include/linux/skbuff.h | 43 +- + include/linux/soc/mediatek/mtk_wed.h | 3 +- + include/linux/string_helpers.h | 5 + + include/linux/topology.h | 33 + + include/linux/u64_stats_sync.h | 12 - + include/linux/virtio_vsock.h | 129 +- + include/net/bluetooth/hci.h | 4 +- + include/net/bluetooth/mgmt.h | 2 + + include/net/cfg80211.h | 148 +- + include/net/checksum.h | 4 +- + include/net/dcbnl.h | 18 + + include/net/devlink.h | 55 +- + include/net/dropreason.h | 18 + + include/net/dsa.h | 11 + + include/net/dst_ops.h | 2 +- + include/net/flow.h | 5 +- + include/net/flow_offload.h | 3 + + include/net/inet_sock.h | 4 + + include/net/ip.h | 3 +- + include/net/ip6_route.h | 4 - + include/net/ipv6.h | 3 +- + include/net/mac80211.h | 81 +- + include/net/ndisc.h | 2 +- + include/net/netfilter/nf_conntrack.h | 4 + + include/net/netfilter/nf_flow_table.h | 8 +- + include/net/netfilter/nf_tables_core.h | 16 + + include/net/netfilter/nf_tables_ipv4.h | 4 +- + include/net/netlink.h | 3 +- + include/net/page_pool.h | 4 +- + include/net/pkt_cls.h | 40 +- + include/net/pkt_sched.h | 21 + + include/net/raw.h | 13 +- + include/net/route.h | 3 - + include/net/smc.h | 24 +- + include/net/sock.h | 35 +- + include/net/tc_act/tc_connmark.h | 9 +- + include/net/tc_act/tc_nat.h | 10 +- + include/net/tc_act/tc_pedit.h | 81 +- + include/net/tc_wrapper.h | 15 - + include/net/xdp.h | 36 + + include/net/xsk_buff_pool.h | 5 + + include/soc/mscc/ocelot.h | 64 + + include/soc/mscc/ocelot_dev.h | 23 + + include/soc/mscc/vsc7514_regs.h | 18 +- + include/trace/events/bridge.h | 58 + + include/trace/events/devlink.h | 2 +- + include/trace/events/rxrpc.h | 491 +- + include/trace/events/sock.h | 69 + + include/uapi/linux/batadv_packet.h | 2 + + include/uapi/linux/bpf.h | 18 +- + include/uapi/linux/dcbnl.h | 2 + + include/uapi/linux/ethtool.h | 48 +- + include/uapi/linux/ethtool_netlink.h | 79 + + include/uapi/linux/fou.h | 54 +- + include/uapi/linux/if_bridge.h | 2 + + include/uapi/linux/if_link.h | 5 + + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/in.h | 1 + + include/uapi/linux/ioam6.h | 2 +- + include/uapi/linux/mdio.h | 8 + + include/uapi/linux/netdev.h | 59 + + include/uapi/linux/netfilter/nf_tables.h | 14 + + include/uapi/linux/nl80211.h | 36 +- + include/uapi/linux/rpl.h | 4 +- + include/uapi/linux/rtnetlink.h | 1 + + include/uapi/linux/snmp.h | 3 + + init/Kconfig | 2 +- + kernel/bpf/Makefile | 1 + + kernel/bpf/bpf_local_storage.c | 4 +- + kernel/bpf/btf.c | 197 +- + kernel/bpf/core.c | 12 +- + kernel/bpf/cpumap.c | 2 +- + kernel/bpf/cpumask.c | 479 ++ + kernel/bpf/devmap.c | 16 +- + kernel/bpf/helpers.c | 109 +- + kernel/bpf/offload.c | 419 +- + kernel/bpf/preload/bpf_preload_kern.c | 6 +- + kernel/bpf/preload/iterators/Makefile | 12 +- + kernel/bpf/preload/iterators/README | 5 +- + .../preload/iterators/iterators.lskel-big-endian.h | 419 ++ + ...ors.lskel.h => iterators.lskel-little-endian.h} | 0 + kernel/bpf/syscall.c | 58 +- + kernel/bpf/verifier.c | 697 +- + kernel/cgroup/rstat.c | 4 +- + kernel/kexec_core.c | 3 +- + kernel/livepatch/core.c | 10 +- + kernel/module/kallsyms.c | 13 +- + kernel/sched/topology.c | 90 + + kernel/trace/bpf_trace.c | 157 +- + kernel/trace/ftrace.c | 2 +- + lib/Kconfig.debug | 9 + + lib/cpumask.c | 52 +- + lib/find_bit.c | 9 + + net/Makefile | 1 + + net/batman-adv/bat_iv_ogm.c | 1 - + net/batman-adv/bat_v_elp.c | 1 - + net/batman-adv/bat_v_ogm.c | 5 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/gateway_common.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 251 +- + net/batman-adv/multicast.h | 38 +- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/routing.c | 7 +- + net/batman-adv/soft-interface.c | 26 +- + net/batman-adv/translation-table.c | 4 +- + net/batman-adv/tvlv.c | 71 +- + net/batman-adv/tvlv.h | 9 +- + net/batman-adv/types.h | 6 + + net/bluetooth/hci_conn.c | 23 +- + net/bluetooth/l2cap_core.c | 24 - + net/bluetooth/l2cap_sock.c | 8 + + net/bluetooth/mgmt.c | 12 + + net/bluetooth/rfcomm/core.c | 4 + + net/bpf/bpf_dummy_struct_ops.c | 18 + + net/bpf/test_run.c | 75 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_mdb.c | 66 +- + net/bridge/br_multicast.c | 179 +- + net/bridge/br_netfilter_hooks.c | 2 +- + net/bridge/br_netlink.c | 19 +- + net/bridge/br_netlink_tunnel.c | 3 + + net/bridge/br_private.h | 12 +- + net/bridge/br_switchdev.c | 10 +- + net/bridge/br_vlan.c | 11 +- + net/bridge/br_vlan_options.c | 27 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 4 +- + net/caif/caif_socket.c | 4 - + net/can/gw.c | 7 + + net/can/isotp.c | 3 + + net/can/raw.c | 11 +- + net/ceph/messenger.c | 4 + + net/core/Makefile | 4 +- + net/core/dev.c | 28 +- + net/core/dev.h | 20 + + net/core/dst.c | 8 +- + net/core/filter.c | 73 +- + net/core/gro.c | 12 +- + net/core/neighbour.c | 14 +- + net/core/net-sysfs.c | 83 +- + net/core/net-traces.c | 3 + + net/core/netdev-genl-gen.c | 48 + + net/core/netdev-genl-gen.h | 23 + + net/core/netdev-genl.c | 179 + + net/core/netpoll.c | 12 +- + net/core/page_pool.c | 6 +- + net/core/rtnetlink.c | 35 +- + net/core/skbuff.c | 231 +- + net/core/skmsg.c | 5 + + net/core/sock.c | 56 +- + net/core/sysctl_net_core.c | 86 +- + net/core/xdp.c | 88 +- + net/dcb/dcbnl.c | 272 +- + net/devlink/Makefile | 3 + + net/devlink/core.c | 320 + + net/devlink/dev.c | 1346 ++++ + net/devlink/devl_internal.h | 239 + + net/devlink/health.c | 1333 ++++ + net/{core/devlink.c => devlink/leftover.c} | 6816 +++++-------------- + net/devlink/netlink.c | 251 + + net/dsa/master.c | 6 +- + net/dsa/slave.c | 50 +- + net/dsa/tag_ksz.c | 216 +- + net/ethtool/Makefile | 4 +- + net/ethtool/channels.c | 92 +- + net/ethtool/coalesce.c | 114 +- + net/ethtool/common.c | 8 + + net/ethtool/common.h | 2 + + net/ethtool/debug.c | 71 +- + net/ethtool/eee.c | 78 +- + net/ethtool/fec.c | 83 +- + net/ethtool/linkinfo.c | 81 +- + net/ethtool/linkmodes.c | 91 +- + net/ethtool/mm.c | 251 + + net/ethtool/module.c | 89 +- + net/ethtool/netlink.c | 135 +- + net/ethtool/netlink.h | 74 +- + net/ethtool/pause.c | 125 +- + net/ethtool/plca.c | 248 + + net/ethtool/privflags.c | 84 +- + net/ethtool/pse-pd.c | 79 +- + net/ethtool/rings.c | 118 +- + net/ethtool/stats.c | 159 +- + net/ethtool/wol.c | 79 +- + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 10 +- + net/ipv4/bpf_tcp_ca.c | 3 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/{fou.c => fou_core.c} | 47 +- + net/ipv4/fou_nl.c | 48 + + net/ipv4/fou_nl.h | 25 + + net/ipv4/icmp.c | 3 + + net/ipv4/inet_connection_sock.c | 27 +- + net/ipv4/inet_hashtables.c | 14 +- + net/ipv4/inet_timewait_sock.c | 3 - + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ip_sockglue.c | 18 + + net/ipv4/netfilter/Kconfig | 14 - + net/ipv4/netfilter/Makefile | 1 - + net/ipv4/netfilter/ipt_CLUSTERIP.c | 929 --- + net/ipv4/proc.c | 8 +- + net/ipv4/raw.c | 21 +- + net/ipv4/tcp_bbr.c | 16 +- + net/ipv4/tcp_cong.c | 10 +- + net/ipv4/tcp_cubic.c | 12 +- + net/ipv4/tcp_dctcp.c | 12 +- + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/udp.c | 2 +- + net/ipv6/af_inet6.c | 10 - + net/ipv6/icmp.c | 36 +- + net/ipv6/ipv6_sockglue.c | 12 - + net/ipv6/ndisc.c | 13 +- + net/ipv6/proc.c | 1 + + net/ipv6/raw.c | 16 +- + net/ipv6/route.c | 23 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/ipv6/seg6_local.c | 352 +- + net/ipv6/tcp_ipv6.c | 3 +- + net/kcm/kcmsock.c | 3 + + net/mac80211/cfg.c | 86 +- + net/mac80211/chan.c | 2 +- + net/mac80211/debugfs_netdev.c | 3 - + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/link.c | 3 + + net/mac80211/mlme.c | 167 +- + net/mac80211/rx.c | 416 +- + net/mac80211/sta_info.c | 14 +- + net/mac80211/sta_info.h | 27 +- + net/mac80211/tx.c | 2 +- + net/mac80211/util.c | 26 +- + net/mac80211/vht.c | 25 +- + net/mptcp/options.c | 3 +- + net/mptcp/pm_netlink.c | 63 +- + net/mptcp/pm_userspace.c | 5 +- + net/mptcp/protocol.c | 39 +- + net/mptcp/protocol.h | 2 +- + net/mptcp/sockopt.c | 3 +- + net/mptcp/subflow.c | 3 + + net/mptcp/token.c | 14 +- + net/mptcp/token_test.c | 3 + + net/netfilter/Kconfig | 3 + + net/netfilter/Makefile | 7 + + net/netfilter/ipset/Kconfig | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_conntrack_bpf.c | 20 +- + net/netfilter/nf_conntrack_core.c | 57 +- + net/netfilter/nf_conntrack_helper.c | 98 - + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_ovs.c | 178 + + net/netfilter/nf_conntrack_proto.c | 20 +- + net/netfilter/nf_conntrack_proto_sctp.c | 44 +- + net/netfilter/nf_conntrack_proto_tcp.c | 9 - + net/netfilter/nf_conntrack_proto_udp.c | 10 +- + net/netfilter/nf_flow_table_core.c | 5 +- + net/netfilter/nf_flow_table_inet.c | 2 +- + net/netfilter/nf_flow_table_offload.c | 18 +- + net/netfilter/nf_log_syslog.c | 2 +- + net/netfilter/nf_nat_bpf.c | 6 +- + net/netfilter/nf_tables_api.c | 111 +- + net/netfilter/nf_tables_core.c | 35 +- + net/netfilter/nft_ct.c | 39 +- + net/netfilter/nft_ct_fast.c | 56 + + net/netfilter/nft_objref.c | 12 +- + net/netfilter/xt_length.c | 2 +- + net/netlink/genetlink.c | 4 +- + net/openvswitch/Kconfig | 1 + + net/openvswitch/conntrack.c | 85 +- + net/openvswitch/flow.c | 9 +- + net/openvswitch/flow.h | 2 +- + net/openvswitch/flow_table.c | 8 +- + net/packet/af_packet.c | 8 +- + net/phonet/pep-gprs.c | 4 + + net/qrtr/ns.c | 3 + + net/rds/ib_recv.c | 1 + + net/rds/message.c | 2 +- + net/rds/recv.c | 1 + + net/rds/tcp_listen.c | 2 + + net/rds/tcp_recv.c | 2 + + net/rfkill/core.c | 16 +- + net/rfkill/rfkill-gpio.c | 20 +- + net/rxrpc/Kconfig | 9 + + net/rxrpc/af_rxrpc.c | 2 +- + net/rxrpc/ar-internal.h | 15 +- + net/rxrpc/call_accept.c | 2 +- + net/rxrpc/call_event.c | 15 +- + net/rxrpc/call_object.c | 13 +- + net/rxrpc/conn_event.c | 2 +- + net/rxrpc/conn_service.c | 7 - + net/rxrpc/input.c | 60 +- + net/rxrpc/io_thread.c | 48 +- + net/rxrpc/local_object.c | 7 +- + net/rxrpc/misc.c | 7 + + net/rxrpc/output.c | 79 +- + net/rxrpc/proc.c | 4 +- + net/rxrpc/recvmsg.c | 20 +- + net/rxrpc/skbuff.c | 4 +- + net/rxrpc/sysctl.c | 17 +- + net/rxrpc/txbuf.c | 12 +- + net/sched/Kconfig | 91 +- + net/sched/Makefile | 7 +- + net/sched/act_api.c | 29 +- + net/sched/act_connmark.c | 107 +- + net/sched/act_ct.c | 141 +- + net/sched/act_gate.c | 30 +- + net/sched/act_mirred.c | 23 +- + net/sched/act_nat.c | 72 +- + net/sched/act_pedit.c | 300 +- + net/sched/cls_api.c | 63 +- + net/sched/cls_flower.c | 7 +- + net/sched/cls_matchall.c | 6 +- + net/sched/cls_rsvp.c | 26 - + net/sched/cls_rsvp.h | 764 --- + net/sched/cls_rsvp6.c | 26 - + net/sched/cls_tcindex.c | 742 --- + net/sched/sch_api.c | 87 +- + net/sched/sch_atm.c | 706 -- + net/sched/sch_cake.c | 2 +- + net/sched/sch_cbq.c | 1727 ----- + net/sched/sch_dsmark.c | 518 -- + net/sched/sch_mqprio.c | 291 +- + net/sched/sch_mqprio_lib.c | 117 + + net/sched/sch_mqprio_lib.h | 18 + + net/sched/sch_taprio.c | 709 +- + net/sctp/ipv6.c | 2 - + net/sctp/protocol.c | 2 - + net/sctp/socket.c | 5 +- + net/smc/af_smc.c | 38 +- + net/smc/smc_clc.c | 11 +- + net/smc/smc_core.c | 88 +- + net/smc/smc_core.h | 6 +- + net/smc/smc_diag.c | 3 +- + net/smc/smc_ism.c | 180 +- + net/smc/smc_ism.h | 3 +- + net/smc/smc_llc.c | 34 +- + net/smc/smc_pnet.c | 40 +- + net/smc/smc_rx.c | 4 + + net/socket.c | 33 +- + net/sunrpc/svcsock.c | 5 + + net/sunrpc/xprtsock.c | 3 + + net/tipc/netlink_compat.c | 16 +- + net/tipc/socket.c | 3 + + net/tipc/topsrv.c | 5 + + net/tls/tls_sw.c | 3 + + net/unix/af_unix.c | 21 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/vmw_vsock/virtio_transport.c | 149 +- + net/vmw_vsock/virtio_transport_common.c | 422 +- + net/vmw_vsock/vsock_loopback.c | 51 +- + net/wireless/ap.c | 2 +- + net/wireless/chan.c | 69 + + net/wireless/core.h | 4 +- + net/wireless/ibss.c | 5 +- + net/wireless/mlme.c | 5 +- + net/wireless/nl80211.c | 162 +- + net/wireless/nl80211.h | 2 +- + net/wireless/reg.c | 57 +- + net/wireless/sme.c | 54 +- + net/wireless/trace.h | 309 +- + net/wireless/util.c | 185 +- + net/wireless/wext-compat.c | 2 +- + net/wireless/wext-core.c | 20 +- + net/wireless/wext-sme.c | 2 +- + net/xdp/xsk.c | 4 - + net/xdp/xsk_buff_pool.c | 7 +- + net/xfrm/espintcp.c | 3 + + net/xfrm/xfrm_device.c | 8 +- + net/xfrm/xfrm_interface_bpf.c | 7 +- + net/xfrm/xfrm_state.c | 2 +- + samples/bpf/Makefile | 24 +- + samples/bpf/gnu/stubs.h | 1 + + .../{lwt_len_hist_kern.c => lwt_len_hist.bpf.c} | 29 +- + samples/bpf/lwt_len_hist.sh | 4 +- + .../{map_perf_test_kern.c => map_perf_test.bpf.c} | 48 +- + samples/bpf/map_perf_test_user.c | 2 +- + samples/bpf/net_shared.h | 32 + + .../bpf/{sock_flags_kern.c => sock_flags.bpf.c} | 24 +- + samples/bpf/syscall_tp_kern.c | 14 + + samples/bpf/tc_l2_redirect.sh | 3 + + samples/bpf/test_cgrp2_sock.sh | 16 +- + samples/bpf/test_cgrp2_sock2.sh | 9 +- + .../{test_cgrp2_tc_kern.c => test_cgrp2_tc.bpf.c} | 34 +- + samples/bpf/test_cgrp2_tc.sh | 8 +- + ...kern.c => test_current_task_under_cgroup.bpf.c} | 11 +- + samples/bpf/test_current_task_under_cgroup_user.c | 8 +- + samples/bpf/test_lru_dist.c | 5 - + samples/bpf/test_lwt_bpf.c | 50 +- + samples/bpf/test_lwt_bpf.sh | 19 +- + ...est_map_in_map_kern.c => test_map_in_map.bpf.c} | 8 +- + samples/bpf/test_map_in_map_user.c | 2 +- + ...ad_kprobe_kern.c => test_overhead_kprobe.bpf.c} | 6 +- + ...ad_raw_tp_kern.c => test_overhead_raw_tp.bpf.c} | 4 +- + ...t_overhead_tp_kern.c => test_overhead_tp.bpf.c} | 29 +- + samples/bpf/test_overhead_user.c | 34 +- + ...ite_user_kern.c => test_probe_write_user.bpf.c} | 20 +- + samples/bpf/test_probe_write_user_user.c | 2 +- + samples/bpf/trace_common.h | 13 - + .../{trace_output_kern.c => trace_output.bpf.c} | 6 +- + samples/bpf/trace_output_user.c | 2 +- + samples/bpf/{tracex2_kern.c => tracex2.bpf.c} | 13 +- + samples/bpf/tracex2_user.c | 2 +- + samples/bpf/tracex4_user.c | 4 +- + samples/bpf/xdp_sample.bpf.h | 22 +- + scripts/bpf_doc.py | 2 +- + scripts/pahole-flags.sh | 4 + + tools/bpf/bpftool/Makefile | 8 +- + tools/bpf/bpftool/feature.c | 8 +- + tools/bpf/bpftool/prog.c | 38 +- + tools/bpf/resolve_btfids/Build | 4 +- + tools/bpf/resolve_btfids/Makefile | 47 +- + tools/bpf/resolve_btfids/main.c | 2 +- + tools/bpf/runqslower/Makefile | 2 + + tools/include/uapi/linux/bpf.h | 18 +- + tools/include/uapi/linux/netdev.h | 59 + + tools/lib/bpf/bpf_core_read.h | 4 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/bpf_tracing.h | 320 +- + tools/lib/bpf/btf.c | 16 +- + tools/lib/bpf/btf_dump.c | 199 +- + tools/lib/bpf/libbpf.c | 58 +- + tools/lib/bpf/libbpf.h | 126 +- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_errno.c | 16 +- + tools/lib/bpf/libbpf_internal.h | 5 +- + tools/lib/bpf/libbpf_probes.c | 83 + + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/netlink.c | 118 +- + tools/lib/bpf/nlattr.c | 2 +- + tools/lib/bpf/nlattr.h | 12 + + tools/lib/bpf/usdt.bpf.h | 5 +- + tools/net/ynl/cli.py | 52 + + tools/net/ynl/lib/__init__.py | 7 + + tools/net/ynl/lib/nlspec.py | 310 + + tools/net/ynl/lib/ynl.py | 528 ++ + tools/net/ynl/ynl-gen-c.py | 2357 +++++++ + tools/net/ynl/ynl-regen.sh | 30 + + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/DENYLIST.s390x | 67 +- + tools/testing/selftests/bpf/Makefile | 52 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 2 +- + tools/testing/selftests/bpf/netcnt_common.h | 6 +- + .../selftests/bpf/prog_tests/attach_probe.c | 10 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 6 +- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 4 +- + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 2 +- + tools/testing/selftests/bpf/prog_tests/cpumask.c | 74 + + .../selftests/bpf/prog_tests/decap_sanity.c | 2 +- + .../selftests/bpf/prog_tests/dummy_st_ops.c | 52 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 22 +- + .../selftests/bpf/prog_tests/jit_probe_mem.c | 28 + + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 2 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 + + .../selftests/bpf/prog_tests/kfunc_dynptr_param.c | 2 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 19 +- + .../selftests/bpf/prog_tests/nested_trust.c | 12 + + .../selftests/bpf/prog_tests/setget_sockopt.c | 73 + + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 25 +- + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 71 +- + .../bpf/prog_tests/test_bpf_syscall_macro.c | 17 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 3 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 16 +- + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 47 +- + tools/testing/selftests/bpf/prog_tests/usdt.c | 1 + + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 3 + + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 7 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 31 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 8 + + .../selftests/bpf/prog_tests/xdp_metadata.c | 409 ++ + tools/testing/selftests/bpf/progs/bpf_misc.h | 32 + + .../selftests/bpf/progs/bpf_syscall_macro.c | 26 + + .../bpf/progs/btf_dump_test_case_bitfields.c | 2 +- + .../bpf/progs/btf_dump_test_case_packing.c | 80 +- + .../bpf/progs/btf_dump_test_case_padding.c | 162 +- + .../bpf/progs/btf_dump_test_case_syntax.c | 36 + + tools/testing/selftests/bpf/progs/cpumask_common.h | 114 + + .../testing/selftests/bpf/progs/cpumask_failure.c | 126 + + .../testing/selftests/bpf/progs/cpumask_success.c | 426 ++ + .../selftests/bpf/progs/dummy_st_ops_fail.c | 27 + + .../{dummy_st_ops.c => dummy_st_ops_success.c} | 19 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 453 +- + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 61 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 29 + + tools/testing/selftests/bpf/progs/lsm.c | 7 +- + .../selftests/bpf/progs/nested_trust_common.h | 12 + + .../selftests/bpf/progs/nested_trust_failure.c | 33 + + .../selftests/bpf/progs/nested_trust_success.c | 19 + + tools/testing/selftests/bpf/progs/profiler.inc.h | 62 +- + tools/testing/selftests/bpf/progs/setget_sockopt.c | 8 + + .../selftests/bpf/progs/task_kfunc_failure.c | 18 + + .../selftests/bpf/progs/test_attach_probe.c | 11 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 11 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 11 + + .../selftests/bpf/progs/test_sk_assign_libbpf.c | 3 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 91 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 21 + + .../selftests/bpf/progs/test_uprobe_autoattach.c | 64 +- + .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 12 +- + tools/testing/selftests/bpf/progs/test_vmlinux.c | 4 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 8 +- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 2 +- + tools/testing/selftests/bpf/progs/xdp_features.c | 269 + + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 85 + + tools/testing/selftests/bpf/progs/xdp_metadata.c | 64 + + tools/testing/selftests/bpf/progs/xdp_metadata2.c | 23 + + .../selftests/bpf/progs/xdp_synproxy_kern.c | 2 +- + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 30 + + tools/testing/selftests/bpf/test_offload.py | 10 +- + tools/testing/selftests/bpf/test_progs.c | 42 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_tunnel.sh | 40 +- + tools/testing/selftests/bpf/test_verifier.c | 4 +- + tools/testing/selftests/bpf/test_xdp_features.sh | 107 + + tools/testing/selftests/bpf/test_xsk.sh | 42 +- + tools/testing/selftests/bpf/verifier/sleepable.c | 91 + + tools/testing/selftests/bpf/vmtest.sh | 2 +- + tools/testing/selftests/bpf/xdp_features.c | 699 ++ + tools/testing/selftests/bpf/xdp_features.h | 20 + + tools/testing/selftests/bpf/xdp_hw_metadata.c | 445 ++ + tools/testing/selftests/bpf/xdp_metadata.h | 15 + + tools/testing/selftests/bpf/xdp_synproxy.c | 1 + + tools/testing/selftests/bpf/xsk.c | 677 +- + tools/testing/selftests/bpf/xsk.h | 97 +- + tools/testing/selftests/bpf/xsk_prereqs.sh | 12 +- + tools/testing/selftests/bpf/xskxceiver.c | 382 +- + tools/testing/selftests/bpf/xskxceiver.h | 17 +- + .../selftests/drivers/net/mlxsw/qos_defprio.sh | 68 +- + .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 23 +- + .../selftests/drivers/net/mlxsw/qos_dscp_router.sh | 27 +- + tools/testing/selftests/net/Makefile | 54 +- + tools/testing/selftests/net/bpf/Makefile | 51 - + tools/testing/selftests/net/config | 3 + + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../testing/selftests/net/forwarding/bridge_mdb.sh | 159 +- + .../selftests/net/forwarding/bridge_mdb_max.sh | 1336 ++++ + tools/testing/selftests/net/forwarding/lib.sh | 237 +- + .../testing/selftests/net/forwarding/tc_actions.sh | 53 +- + tools/testing/selftests/net/ip_local_port_range.c | 447 ++ + tools/testing/selftests/net/ip_local_port_range.sh | 5 + + tools/testing/selftests/net/mptcp/diag.sh | 56 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 53 +- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 153 +- + tools/testing/selftests/net/{bpf => }/nat6to4.c | 0 + tools/testing/selftests/net/rps_default_mask.sh | 57 + + .../testing/selftests/net/srv6_end_flavors_test.sh | 869 +++ + tools/testing/selftests/net/tcp_mmap.c | 3 +- + tools/testing/selftests/net/udpgro_frglist.sh | 8 +- + .../tc-testing/tc-tests/filters/rsvp.json | 203 - + .../tc-testing/tc-tests/filters/tcindex.json | 227 - + .../selftests/tc-testing/tc-tests/qdiscs/atm.json | 94 - + .../selftests/tc-testing/tc-tests/qdiscs/cbq.json | 184 - + .../tc-testing/tc-tests/qdiscs/dsmark.json | 140 - + tools/testing/vsock/Makefile | 3 +- + tools/testing/vsock/README | 34 + + tools/testing/vsock/control.c | 28 + + tools/testing/vsock/control.h | 2 + + tools/testing/vsock/util.c | 13 + + tools/testing/vsock/util.h | 1 + + tools/testing/vsock/vsock_perf.c | 427 ++ + tools/testing/vsock/vsock_test.c | 197 +- + 1629 files changed, 150366 insertions(+), 43121 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-net-peak_usb + create mode 100644 Documentation/bpf/cpumasks.rst + create mode 100644 Documentation/bpf/map_sockmap.rst + create mode 100644 Documentation/core-api/netlink.rst + create mode 100644 Documentation/devicetree/bindings/net/amlogic,g12a-mdio-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/amlogic,gxl-mdio-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch-port.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch.yaml + create mode 100644 Documentation/devicetree/bindings/net/maxlinear,gpy2xx.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt + create mode 100644 Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml + create mode 100644 Documentation/devicetree/bindings/net/rfkill-gpio.yaml + create mode 100644 Documentation/netlink/genetlink-c.yaml + create mode 100644 Documentation/netlink/genetlink-legacy.yaml + create mode 100644 Documentation/netlink/genetlink.yaml + create mode 100644 Documentation/netlink/specs/ethtool.yaml + create mode 100644 Documentation/netlink/specs/fou.yaml + create mode 100644 Documentation/netlink/specs/netdev.yaml + delete mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/devlink.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/index.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/kconfig.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/switchdev.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/mellanox/mlx5/tracepoints.rst + create mode 100644 Documentation/networking/devlink/sfc.rst + create mode 100644 Documentation/networking/xdp-rx-metadata.rst + create mode 100644 Documentation/userspace-api/netlink/c-code-gen.rst + create mode 100644 Documentation/userspace-api/netlink/genetlink-legacy.rst + create mode 100644 Documentation/userspace-api/netlink/intro-specs.rst + create mode 100644 Documentation/userspace-api/netlink/specs.rst + create mode 100644 drivers/net/dsa/microchip/ksz_ptp.c + create mode 100644 drivers/net/dsa/microchip/ksz_ptp.h + create mode 100644 drivers/net/dsa/microchip/ksz_ptp_reg.h + create mode 100644 drivers/net/dsa/mv88e6xxx/switchdev.c + create mode 100644 drivers/net/dsa/mv88e6xxx/switchdev.h + create mode 100644 drivers/net/dsa/ocelot/ocelot_ext.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_xdp.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_ddp.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_ddp.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h + create mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h + create mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_vcap_debugfs.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_police.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_pool.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_sdlb.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_tc.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_tc.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_mm.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfdk/ipsec.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/dcb.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/main.h + create mode 100644 drivers/net/ethernet/sfc/efx_devlink.c + create mode 100644 drivers/net/ethernet/sfc/efx_devlink.h + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ethtool.c + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_ethtool.h + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_lib.c + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_lib.h + delete mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h + delete mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe.h + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.h + create mode 100644 drivers/net/ipa/gsi_reg.c + create mode 100644 drivers/net/ipa/reg.h + create mode 100644 drivers/net/ipa/reg/gsi_reg-v3.1.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v3.5.1.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v4.0.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v4.11.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v4.5.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v4.9.c + create mode 100644 drivers/net/mdio/mdio-mux-meson-gxl.c + create mode 100644 drivers/net/phy/mdio-open-alliance.h + create mode 100644 drivers/net/phy/ncn26000.c + create mode 100644 drivers/net/thunderbolt/Kconfig + create mode 100644 drivers/net/thunderbolt/Makefile + rename drivers/net/{thunderbolt.c => thunderbolt/main.c} (96%) + create mode 100644 drivers/net/thunderbolt/trace.c + create mode 100644 drivers/net/thunderbolt/trace.h + create mode 100644 drivers/net/wireless/ath/ath12k/Kconfig + create mode 100644 drivers/net/wireless/ath/ath12k/Makefile + create mode 100644 drivers/net/wireless/ath/ath12k/ce.c + create mode 100644 drivers/net/wireless/ath/ath12k/ce.h + create mode 100644 drivers/net/wireless/ath/ath12k/core.c + create mode 100644 drivers/net/wireless/ath/ath12k/core.h + create mode 100644 drivers/net/wireless/ath/ath12k/dbring.c + create mode 100644 drivers/net/wireless/ath/ath12k/dbring.h + create mode 100644 drivers/net/wireless/ath/ath12k/debug.c + create mode 100644 drivers/net/wireless/ath/ath12k/debug.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_mon.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_mon.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath12k/hal.c + create mode 100644 drivers/net/wireless/ath/ath12k/hal.h + create mode 100644 drivers/net/wireless/ath/ath12k/hal_desc.h + create mode 100644 drivers/net/wireless/ath/ath12k/hal_rx.c + create mode 100644 drivers/net/wireless/ath/ath12k/hal_rx.h + create mode 100644 drivers/net/wireless/ath/ath12k/hal_tx.c + create mode 100644 drivers/net/wireless/ath/ath12k/hal_tx.h + create mode 100644 drivers/net/wireless/ath/ath12k/hif.h + create mode 100644 drivers/net/wireless/ath/ath12k/htc.c + create mode 100644 drivers/net/wireless/ath/ath12k/htc.h + create mode 100644 drivers/net/wireless/ath/ath12k/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/hw.h + create mode 100644 drivers/net/wireless/ath/ath12k/mac.c + create mode 100644 drivers/net/wireless/ath/ath12k/mac.h + create mode 100644 drivers/net/wireless/ath/ath12k/mhi.c + create mode 100644 drivers/net/wireless/ath/ath12k/mhi.h + create mode 100644 drivers/net/wireless/ath/ath12k/pci.c + create mode 100644 drivers/net/wireless/ath/ath12k/pci.h + create mode 100644 drivers/net/wireless/ath/ath12k/peer.c + create mode 100644 drivers/net/wireless/ath/ath12k/peer.h + create mode 100644 drivers/net/wireless/ath/ath12k/qmi.c + create mode 100644 drivers/net/wireless/ath/ath12k/qmi.h + create mode 100644 drivers/net/wireless/ath/ath12k/reg.c + create mode 100644 drivers/net/wireless/ath/ath12k/reg.h + create mode 100644 drivers/net/wireless/ath/ath12k/rx_desc.h + create mode 100644 drivers/net/wireless/ath/ath12k/trace.c + create mode 100644 drivers/net/wireless/ath/ath12k/trace.h + create mode 100644 drivers/net/wireless/ath/ath12k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wmi.h + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c + create mode 100644 include/linux/dsa/ksz_common.h + create mode 100644 include/linux/ism.h + create mode 100644 include/uapi/linux/netdev.h + create mode 100644 kernel/bpf/cpumask.c + create mode 100644 kernel/bpf/preload/iterators/iterators.lskel-big-endian.h + rename kernel/bpf/preload/iterators/{iterators.lskel.h => iterators.lskel-little-endian.h} (100%) + create mode 100644 net/core/netdev-genl-gen.c + create mode 100644 net/core/netdev-genl-gen.h + create mode 100644 net/core/netdev-genl.c + create mode 100644 net/devlink/Makefile + create mode 100644 net/devlink/core.c + create mode 100644 net/devlink/dev.c + create mode 100644 net/devlink/devl_internal.h + create mode 100644 net/devlink/health.c + rename net/{core/devlink.c => devlink/leftover.c} (68%) + create mode 100644 net/devlink/netlink.c + create mode 100644 net/ethtool/mm.c + create mode 100644 net/ethtool/plca.c + rename net/ipv4/{fou.c => fou_core.c} (94%) + create mode 100644 net/ipv4/fou_nl.c + create mode 100644 net/ipv4/fou_nl.h + delete mode 100644 net/ipv4/netfilter/ipt_CLUSTERIP.c + create mode 100644 net/netfilter/nf_conntrack_ovs.c + create mode 100644 net/netfilter/nft_ct_fast.c + delete mode 100644 net/sched/cls_rsvp.c + delete mode 100644 net/sched/cls_rsvp.h + delete mode 100644 net/sched/cls_rsvp6.c + delete mode 100644 net/sched/cls_tcindex.c + delete mode 100644 net/sched/sch_atm.c + delete mode 100644 net/sched/sch_cbq.c + delete mode 100644 net/sched/sch_dsmark.c + create mode 100644 net/sched/sch_mqprio_lib.c + create mode 100644 net/sched/sch_mqprio_lib.h + create mode 100644 samples/bpf/gnu/stubs.h + rename samples/bpf/{lwt_len_hist_kern.c => lwt_len_hist.bpf.c} (75%) + rename samples/bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} (85%) + create mode 100644 samples/bpf/net_shared.h + rename samples/bpf/{sock_flags_kern.c => sock_flags.bpf.c} (66%) + rename samples/bpf/{test_cgrp2_tc_kern.c => test_cgrp2_tc.bpf.c} (70%) + rename samples/bpf/{test_current_task_under_cgroup_kern.c => test_current_task_under_cgroup.bpf.c} (84%) + rename samples/bpf/{test_map_in_map_kern.c => test_map_in_map.bpf.c} (97%) + rename samples/bpf/{test_overhead_kprobe_kern.c => test_overhead_kprobe.bpf.c} (92%) + rename samples/bpf/{test_overhead_raw_tp_kern.c => test_overhead_raw_tp.bpf.c} (82%) + rename samples/bpf/{test_overhead_tp_kern.c => test_overhead_tp.bpf.c} (61%) + rename samples/bpf/{test_probe_write_user_kern.c => test_probe_write_user.bpf.c} (71%) + delete mode 100644 samples/bpf/trace_common.h + rename samples/bpf/{trace_output_kern.c => trace_output.bpf.c} (82%) + rename samples/bpf/{tracex2_kern.c => tracex2.bpf.c} (89%) + create mode 100644 tools/include/uapi/linux/netdev.h + create mode 100755 tools/net/ynl/cli.py + create mode 100644 tools/net/ynl/lib/__init__.py + create mode 100644 tools/net/ynl/lib/nlspec.py + create mode 100644 tools/net/ynl/lib/ynl.py + create mode 100755 tools/net/ynl/ynl-gen-c.py + create mode 100755 tools/net/ynl/ynl-regen.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/cpumask.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/jit_probe_mem.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/nested_trust.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_common.h + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_success.c + create mode 100644 tools/testing/selftests/bpf/progs/dummy_st_ops_fail.c + rename tools/testing/selftests/bpf/progs/{dummy_st_ops.c => dummy_st_ops_success.c} (72%) + create mode 100644 tools/testing/selftests/bpf/progs/jit_probe_mem.c + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_common.h + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_success.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sk_assign_libbpf.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_features.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_hw_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_metadata2.c + create mode 100644 tools/testing/selftests/bpf/progs/xsk_xdp_progs.c + create mode 100755 tools/testing/selftests/bpf/test_xdp_features.sh + create mode 100644 tools/testing/selftests/bpf/verifier/sleepable.c + create mode 100644 tools/testing/selftests/bpf/xdp_features.c + create mode 100644 tools/testing/selftests/bpf/xdp_features.h + create mode 100644 tools/testing/selftests/bpf/xdp_hw_metadata.c + create mode 100644 tools/testing/selftests/bpf/xdp_metadata.h + delete mode 100644 tools/testing/selftests/net/bpf/Makefile + create mode 100755 tools/testing/selftests/net/forwarding/bridge_mdb_max.sh + create mode 100644 tools/testing/selftests/net/ip_local_port_range.c + create mode 100755 tools/testing/selftests/net/ip_local_port_range.sh + rename tools/testing/selftests/net/{bpf => }/nat6to4.c (100%) + create mode 100755 tools/testing/selftests/net/rps_default_mask.sh + create mode 100755 tools/testing/selftests/net/srv6_end_flavors_test.sh + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/rsvp.json + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/tcindex.json + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/atm.json + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json + delete mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json + create mode 100644 tools/testing/vsock/vsock_perf.c +$ git am -3 ../patches/0001-fixup-for-net-mlx5-Separate-mlx5-driver-documentatio.patch +Applying: fixup for "net/mlx5: Separate mlx5 driver documentation into multiple pages" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/networking/device_drivers/ethernet/mellanox/mlx5/tracepoints.rst +$ git add -A . +$ git commit -v -a --amend +[master 9124889a4593] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git + Date: Mon Feb 20 15:31:15 2023 +1100 +Merging bpf-next/for-next (168de0233586 selftests/bpf: Add bpf_fib_lookup test) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/riscv/kernel/probes/kprobes.c +Auto-merging drivers/net/ethernet/intel/ice/ice_txrx.c +Auto-merging drivers/net/ethernet/intel/ice/ice_xsk.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_xsk.c +Auto-merging net/xdp/xsk.c +Resolved 'drivers/net/ethernet/intel/ice/ice_xsk.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4ffbea4f5d2f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/bpf/graph_ds_impl.rst | 267 +++++++++ + Documentation/bpf/other.rst | 3 +- + MAINTAINERS | 7 + + arch/loongarch/net/bpf_jit.c | 2 +- + arch/loongarch/net/bpf_jit.h | 21 + + arch/riscv/include/asm/patch.h | 2 +- + arch/riscv/kernel/patch.c | 19 +- + arch/riscv/kernel/probes/kprobes.c | 15 +- + arch/riscv/net/bpf_jit.h | 5 + + arch/riscv/net/bpf_jit_comp64.c | 435 ++++++++++++++- + drivers/net/ethernet/intel/ice/ice_txrx.c | 67 ++- + drivers/net/ethernet/intel/ice/ice_txrx.h | 37 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 88 +-- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 4 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 12 +- + include/linux/bpf.h | 47 ++ + include/linux/bpf_verifier.h | 38 +- + include/linux/memcontrol.h | 11 + + include/uapi/linux/bpf.h | 17 + + kernel/bpf/bpf_local_storage.c | 4 +- + kernel/bpf/btf.c | 199 +++++-- + kernel/bpf/core.c | 13 +- + kernel/bpf/hashtab.c | 4 +- + kernel/bpf/helpers.c | 94 ++++ + kernel/bpf/memalloc.c | 5 +- + kernel/bpf/syscall.c | 48 +- + kernel/bpf/verifier.c | 606 +++++++++++++++++---- + mm/memcontrol.c | 18 + + net/bpf/test_run.c | 2 + + net/core/filter.c | 43 +- + net/xdp/xsk.c | 59 +- + samples/bpf/test_map_in_map_user.c | 2 +- + samples/bpf/xdp1_user.c | 2 +- + samples/bpf/xdp_adjust_tail_user.c | 2 +- + samples/bpf/xdp_fwd_user.c | 4 +- + samples/bpf/xdp_redirect_cpu_user.c | 4 +- + samples/bpf/xdp_rxq_info_user.c | 2 +- + samples/bpf/xdp_sample_pkts_user.c | 2 +- + samples/bpf/xdp_tx_iptunnel_user.c | 2 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 4 +- + tools/bpf/bpftool/cgroup.c | 4 +- + tools/bpf/bpftool/common.c | 13 +- + tools/bpf/bpftool/link.c | 4 +- + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/map.c | 8 +- + tools/bpf/bpftool/prog.c | 22 +- + tools/bpf/bpftool/struct_ops.c | 6 +- + tools/include/uapi/asm/bpf_perf_event.h | 2 + + tools/include/uapi/linux/bpf.h | 17 + + tools/lib/bpf/bpf.c | 20 + + tools/lib/bpf/bpf.h | 9 + + tools/lib/bpf/btf.c | 8 +- + tools/lib/bpf/libbpf.c | 14 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/netlink.c | 2 +- + tools/lib/bpf/ringbuf.c | 4 +- + tools/testing/selftests/bpf/Makefile | 37 +- + tools/testing/selftests/bpf/bench.c | 59 +- + tools/testing/selftests/bpf/bench.h | 2 + + .../selftests/bpf/benchs/bench_bloom_filter_map.c | 5 + + .../bpf/benchs/bench_bpf_hashmap_full_update.c | 5 +- + .../bpf/benchs/bench_bpf_hashmap_lookup.c | 283 ++++++++++ + .../testing/selftests/bpf/benchs/bench_bpf_loop.c | 1 + + .../selftests/bpf/benchs/bench_local_storage.c | 3 + + .../benchs/bench_local_storage_rcu_tasks_trace.c | 16 +- + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 4 + + tools/testing/selftests/bpf/benchs/bench_strncmp.c | 2 + + .../benchs/run_bench_bpf_hashmap_full_update.sh | 2 +- + .../run_bench_local_storage_rcu_tasks_trace.sh | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 24 + + .../selftests/bpf/map_tests/map_in_map_batch_ops.c | 2 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 8 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 20 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 24 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 2 +- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 69 +-- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 18 +- + .../selftests/bpf/prog_tests/enable_stats.c | 2 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 187 +++++++ + .../bpf/prog_tests/flow_dissector_reattach.c | 10 +- + .../testing/selftests/bpf/prog_tests/htab_reuse.c | 101 ++++ + .../selftests/bpf/prog_tests/kfunc_dynptr_param.c | 72 +-- + .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 4 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 51 +- + .../testing/selftests/bpf/prog_tests/lsm_cgroup.c | 3 +- + tools/testing/selftests/bpf/prog_tests/metadata.c | 8 +- + .../selftests/bpf/prog_tests/migrate_reuseport.c | 2 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 2 +- + tools/testing/selftests/bpf/prog_tests/perf_link.c | 2 +- + tools/testing/selftests/bpf/prog_tests/pinning.c | 2 +- + .../selftests/bpf/prog_tests/prog_run_opts.c | 2 +- + tools/testing/selftests/bpf/prog_tests/rbtree.c | 117 ++++ + tools/testing/selftests/bpf/prog_tests/recursion.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 6 +- + .../selftests/bpf/prog_tests/task_local_storage.c | 8 +- + tools/testing/selftests/bpf/prog_tests/tc_bpf.c | 4 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 133 ++--- + .../selftests/bpf/prog_tests/tp_attach_query.c | 5 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 2 +- + .../selftests/bpf/prog_tests/unpriv_bpf_disabled.c | 8 +- + .../selftests/bpf/prog_tests/user_ringbuf.c | 62 +-- + .../testing/selftests/bpf/prog_tests/verif_stats.c | 5 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 4 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 8 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 8 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 10 +- + .../selftests/bpf/progs/bpf_hashmap_lookup.c | 63 +++ + .../bpf/progs/btf_dump_test_case_syntax.c | 2 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 17 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 2 +- + tools/testing/selftests/bpf/progs/fib_lookup.c | 22 + + tools/testing/selftests/bpf/progs/htab_reuse.c | 19 + + tools/testing/selftests/bpf/progs/linked_list.c | 2 +- + .../testing/selftests/bpf/progs/linked_list_fail.c | 100 ++-- + tools/testing/selftests/bpf/progs/map_kptr.c | 12 +- + tools/testing/selftests/bpf/progs/rbtree.c | 176 ++++++ + .../bpf/progs/rbtree_btf_fail__add_wrong_type.c | 52 ++ + .../bpf/progs/rbtree_btf_fail__wrong_node_type.c | 49 ++ + tools/testing/selftests/bpf/progs/rbtree_fail.c | 322 +++++++++++ + tools/testing/selftests/bpf/progs/strobemeta.h | 2 +- + .../selftests/bpf/progs/test_cls_redirect.c | 6 +- + .../selftests/bpf/progs/test_global_func1.c | 6 +- + .../selftests/bpf/progs/test_global_func10.c | 4 +- + .../selftests/bpf/progs/test_global_func11.c | 4 +- + .../selftests/bpf/progs/test_global_func12.c | 4 +- + .../selftests/bpf/progs/test_global_func13.c | 4 +- + .../selftests/bpf/progs/test_global_func14.c | 4 +- + .../selftests/bpf/progs/test_global_func15.c | 4 +- + .../selftests/bpf/progs/test_global_func16.c | 4 +- + .../selftests/bpf/progs/test_global_func17.c | 4 +- + .../selftests/bpf/progs/test_global_func2.c | 43 +- + .../selftests/bpf/progs/test_global_func3.c | 10 +- + .../selftests/bpf/progs/test_global_func4.c | 55 +- + .../selftests/bpf/progs/test_global_func5.c | 4 +- + .../selftests/bpf/progs/test_global_func6.c | 4 +- + .../selftests/bpf/progs/test_global_func7.c | 4 +- + .../selftests/bpf/progs/test_global_func8.c | 4 +- + .../selftests/bpf/progs/test_global_func9.c | 4 +- + .../bpf/progs/test_global_func_ctx_args.c | 104 ++++ + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 4 + + tools/testing/selftests/bpf/progs/test_subprogs.c | 2 +- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 2 +- + .../selftests/bpf/progs/user_ringbuf_fail.c | 31 +- + tools/testing/selftests/bpf/test_cpp.cpp | 2 +- + tools/testing/selftests/bpf/test_maps.c | 2 +- + .../selftests/bpf/test_skb_cgroup_id_user.c | 2 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 2 +- + tools/testing/selftests/bpf/test_verifier.c | 8 +- + tools/testing/selftests/bpf/testing_helpers.c | 2 +- + .../bpf/verifier/bounds_mix_sign_unsign.c | 110 ++-- + tools/testing/selftests/bpf/verifier/bpf_st_mem.c | 67 +++ + tools/testing/selftests/bpf/veristat.c | 4 +- + tools/testing/selftests/bpf/xdp_synproxy.c | 15 +- + 158 files changed, 4190 insertions(+), 988 deletions(-) + create mode 100644 Documentation/bpf/graph_ds_impl.rst + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_lookup.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/fib_lookup.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/htab_reuse.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/rbtree.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_hashmap_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/fib_lookup.c + create mode 100644 tools/testing/selftests/bpf/progs/htab_reuse.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree_btf_fail__add_wrong_type.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree_btf_fail__wrong_node_type.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_func_ctx_args.c + create mode 100644 tools/testing/selftests/bpf/verifier/bpf_st_mem.c +Merging ipsec-next/master (75da437a2f17 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ 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 (22551e77e550 net/mlx5: Configure IPsec steering for egress RoCEv2 traffic) +$ 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/master (46b5be95b5cb netfilter: let reset rules clean out conntrack entries) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Auto-merging include/net/netfilter/nf_conntrack.h +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/netfilter/nf_tables_api.c +Merge made by the 'ort' strategy. + include/linux/netfilter.h | 3 +++ + include/net/ip_vs.h | 1 + + include/net/netfilter/nf_conntrack.h | 8 ++++++ + include/net/netfilter/nf_tables.h | 13 ++++++++++ + include/uapi/linux/netfilter/nf_tables.h | 3 +++ + net/ipv4/netfilter/nf_reject_ipv4.c | 1 + + net/ipv6/netfilter/nf_reject_ipv6.c | 1 + + net/netfilter/core.c | 16 ++++++++++++ + net/netfilter/ipvs/ip_vs_est.c | 2 +- + net/netfilter/nf_conntrack_core.c | 12 +++++++++ + net/netfilter/nf_conntrack_proto_tcp.c | 35 ++++++++++++++++++++++++++ + net/netfilter/nf_conntrack_proto_udp.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 12 +++------ + net/netfilter/nf_tables_api.c | 43 +++++++++++++++++++++++++++----- + 14 files changed, 136 insertions(+), 16 deletions(-) +Merging bluetooth/master (58c6156a4d4b Bluetooth: hci_mrvl: Add serdev support for 88W8997) +$ 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. + .../devicetree/bindings/net/marvell-bluetooth.yaml | 20 ++++- + drivers/bluetooth/btusb.c | 10 +-- + drivers/bluetooth/hci_mrvl.c | 90 +++++++++++++++++++--- + include/net/bluetooth/mgmt.h | 80 +++++++++---------- + 4 files changed, 142 insertions(+), 58 deletions(-) +Merging wireless-next/for-next (38ae31922969 wifi: rtl8xxxu: add LEDS_CLASS dependency) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 7 ---- + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 1 + + drivers/net/wireless/realtek/rtw88/coex.c | 2 +- + drivers/net/wireless/realtek/rtw88/mac.c | 10 +++++ + drivers/net/wireless/realtek/rtw88/main.h | 2 +- + drivers/net/wireless/realtek/rtw88/ps.c | 4 +- + drivers/net/wireless/realtek/rtw88/wow.c | 2 +- + drivers/net/wireless/realtek/rtw89/core.c | 47 ++++++++++++---------- + 9 files changed, 43 insertions(+), 34 deletions(-) +Merging mtd/mtd/next (84549c816dc3 mtd: parsers: ofpart: add workaround for #size-cells 0) +$ 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. + .../bindings/mtd/partitions/partitions.yaml | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 9 --------- + drivers/mtd/parsers/ofpart_core.c | 19 +++++++++++++++++++ + 3 files changed, 20 insertions(+), 10 deletions(-) +Merging nand/nand/next (ef3e6327ff04 mtd: rawnand: sunxi: Precompute the ECC_CTL register value) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/raw/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/mediatek,mtk-nfc.yaml | 155 ++++++ + .../bindings/mtd/mediatek,nand-ecc-engine.yaml | 63 +++ + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 176 ------- + MAINTAINERS | 2 +- + drivers/mtd/nand/ecc-mtk.c | 28 +- + drivers/mtd/nand/raw/Kconfig | 7 - + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/fsl_elbc_nand.c | 8 + + drivers/mtd/nand/raw/marvell_nand.c | 7 + + drivers/mtd/nand/raw/nand_base.c | 149 +++++- + drivers/mtd/nand/raw/nand_jedec.c | 3 +- + drivers/mtd/nand/raw/nand_onfi.c | 3 +- + drivers/mtd/nand/raw/pasemi_nand.c | 63 +-- + drivers/mtd/nand/raw/sunxi_nand.c | 120 ++--- + drivers/mtd/nand/raw/tmio_nand.c | 533 --------------------- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/alliancememory.c | 153 ++++++ + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/macronix.c | 3 +- + include/linux/mtd/rawnand.h | 21 + + include/linux/mtd/spinand.h | 1 + + 22 files changed, 663 insertions(+), 840 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mediatek,mtk-nfc.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/mediatek,nand-ecc-engine.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/mtk-nand.txt + delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c + create mode 100644 drivers/mtd/nand/spi/alliancememory.c +Merging spi-nor/spi-nor/next (f047382519ca Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/core.c | 20 +++++++---- + drivers/mtd/spi-nor/core.h | 44 ++++++++++++------------ + drivers/mtd/spi-nor/debugfs.c | 2 +- + drivers/mtd/spi-nor/issi.c | 2 +- + drivers/mtd/spi-nor/macronix.c | 2 +- + drivers/mtd/spi-nor/sfdp.c | 78 ++++++++++++++++++++++-------------------- + drivers/mtd/spi-nor/sfdp.h | 9 +++-- + drivers/mtd/spi-nor/spansion.c | 27 +++++++++------ + 8 files changed, 99 insertions(+), 85 deletions(-) +Merging crypto/master (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions) +$ 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 +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/crypto/atmel-ecc.c +Auto-merging drivers/crypto/atmel-i2c.c +Auto-merging drivers/crypto/atmel-i2c.h +Auto-merging drivers/net/macsec.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging net/tls/tls_sw.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2748131fe705] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-qat | 4 +- + .../bindings/bus/aspeed,ast2600-ahbc.yaml | 37 + + .../bindings/crypto/allwinner,sun8i-ce.yaml | 33 +- + .../bindings/crypto/aspeed,ast2600-acry.yaml | 49 + + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 23 +- + .../bindings/rng/starfive,jh7110-trng.yaml | 55 + + MAINTAINERS | 18 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 13 + + arch/arm/crypto/sha1_glue.c | 14 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 57 +- + arch/arm64/crypto/ghash-ce-glue.c | 145 +- + arch/arm64/crypto/sm4-ce-ccm-glue.c | 44 +- + arch/arm64/crypto/sm4-ce-gcm-glue.c | 51 +- + arch/s390/crypto/aes_s390.c | 4 - + arch/s390/crypto/paes_s390.c | 2 +- + arch/x86/Kconfig.assembler | 5 + + arch/x86/crypto/Kconfig | 38 + + arch/x86/crypto/Makefile | 6 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 172 +- + arch/x86/crypto/aria-aesni-avx2-asm_64.S | 1441 ++++++++++++++ + arch/x86/crypto/aria-avx.h | 48 +- + arch/x86/crypto/aria-gfni-avx512-asm_64.S | 971 ++++++++++ + arch/x86/crypto/aria_aesni_avx2_glue.c | 254 +++ + arch/x86/crypto/aria_aesni_avx_glue.c | 49 +- + arch/x86/crypto/aria_gfni_avx512_glue.c | 250 +++ + arch/x86/crypto/blowfish-x86_64-asm_64.S | 71 +- + arch/x86/crypto/blowfish_glue.c | 200 +- + arch/x86/crypto/ecb_cbc_helpers.h | 19 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 45 +- + arch/x86/kernel/asm-offsets.c | 8 + + crypto/adiantum.c | 5 +- + crypto/af_alg.c | 6 +- + crypto/ahash.c | 195 +- + crypto/api.c | 4 +- + crypto/aria_generic.c | 4 + + crypto/authenc.c | 14 +- + crypto/authencesn.c | 15 +- + crypto/ccm.c | 9 +- + crypto/chacha20poly1305.c | 40 +- + crypto/cryptd.c | 290 +-- + crypto/crypto_engine.c | 8 +- + crypto/cts.c | 12 +- + crypto/dh.c | 5 +- + crypto/ecc.c | 6 +- + crypto/essiv.c | 15 +- + crypto/gcm.c | 36 +- + crypto/hctr2.c | 5 +- + crypto/lrw.c | 4 +- + crypto/pcrypt.c | 4 +- + crypto/proc.c | 6 + + crypto/rsa-pkcs1pad.c | 51 +- + crypto/seqiv.c | 7 +- + crypto/shash.c | 4 +- + crypto/skcipher.c | 22 +- + crypto/tcrypt.c | 8 +- + crypto/tcrypt.h | 2 +- + crypto/testmgr.c | 16 +- + crypto/wp512.c | 2 +- + crypto/xts.c | 20 +- + drivers/char/hw_random/Kconfig | 10 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/jh7110-trng.c | 393 ++++ + drivers/crypto/Kconfig | 10 - + drivers/crypto/Makefile | 1 - + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 1 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 13 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 11 +- + drivers/crypto/amcc/crypto4xx_core.c | 10 +- + drivers/crypto/aspeed/Kconfig | 11 + + drivers/crypto/aspeed/Makefile | 4 + + drivers/crypto/aspeed/aspeed-acry.c | 828 +++++++++ + drivers/crypto/aspeed/aspeed-hace.c | 5 +- + drivers/crypto/aspeed/aspeed-hace.h | 2 +- + drivers/crypto/atmel-aes.c | 7 +- + drivers/crypto/atmel-ecc.c | 3 +- + drivers/crypto/atmel-i2c.c | 4 +- + drivers/crypto/atmel-i2c.h | 4 +- + drivers/crypto/atmel-sha.c | 10 +- + drivers/crypto/atmel-sha204a.c | 3 +- + drivers/crypto/atmel-tdes.c | 4 +- + drivers/crypto/axis/artpec6_crypto.c | 14 +- + drivers/crypto/bcm/cipher.c | 102 +- + drivers/crypto/bcm/cipher.h | 7 +- + drivers/crypto/caam/blob_gen.c | 2 +- + drivers/crypto/caam/caamalg.c | 16 +- + drivers/crypto/caam/caamalg_qi.c | 16 +- + drivers/crypto/caam/caamalg_qi2.c | 56 +- + drivers/crypto/caam/caamalg_qi2.h | 10 +- + drivers/crypto/caam/caamhash.c | 18 +- + drivers/crypto/caam/caampkc.c | 31 +- + drivers/crypto/caam/caamprng.c | 12 +- + drivers/crypto/caam/caamrng.c | 11 +- + drivers/crypto/caam/ctrl.c | 4 +- + drivers/crypto/caam/desc_constr.h | 3 +- + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/caam/qi.c | 4 +- + drivers/crypto/caam/qi.h | 12 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 10 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 8 +- + drivers/crypto/ccp/ccp-crypto-main.c | 12 +- + drivers/crypto/ccp/ccp-dmaengine.c | 21 +- + drivers/crypto/ccp/sev-dev.c | 16 +- + drivers/crypto/ccp/sp-pci.c | 46 +- + drivers/crypto/ccree/cc_cipher.c | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 6 +- + drivers/crypto/hifn_795x.c | 4 +- + drivers/crypto/hisilicon/Kconfig | 8 +- + drivers/crypto/hisilicon/qm.c | 54 +- + drivers/crypto/hisilicon/sec/sec_algs.c | 6 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 10 +- + drivers/crypto/hisilicon/sgl.c | 1 - + drivers/crypto/img-hash.c | 12 +- + drivers/crypto/inside-secure/safexcel.c | 15 +- + drivers/crypto/inside-secure/safexcel.h | 6 - + drivers/crypto/inside-secure/safexcel_cipher.c | 21 +- + drivers/crypto/inside-secure/safexcel_hash.c | 54 +- + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/crypto/marvell/cesa/cesa.c | 4 +- + drivers/crypto/marvell/cesa/hash.c | 41 +- + drivers/crypto/marvell/cesa/tdma.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 6 +- + drivers/crypto/marvell/octeontx2/Makefile | 11 +- + drivers/crypto/marvell/octeontx2/cn10k_cpt.c | 9 +- + drivers/crypto/marvell/octeontx2/cn10k_cpt.h | 2 - + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 2 - + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 14 +- + drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 11 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 2 + + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 6 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 2 + + drivers/crypto/mxs-dcp.c | 8 +- + drivers/crypto/nx/nx-common-powernv.c | 13 +- + drivers/crypto/nx/nx-common-pseries.c | 6 +- + .../qat/qat_common/adf_transport_access_macros.h | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 6 +- + drivers/crypto/qat/qat_common/qat_algs_send.c | 3 +- + drivers/crypto/qat/qat_common/qat_bl.c | 115 +- + drivers/crypto/qat/qat_common/qat_bl.h | 4 +- + drivers/crypto/qat/qat_common/qat_comp_algs.c | 169 +- + drivers/crypto/qat/qat_common/qat_compression.c | 2 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 2 +- + drivers/crypto/qce/core.c | 4 +- + drivers/crypto/s5p-sss.c | 8 +- + drivers/crypto/sahara.c | 4 +- + drivers/crypto/stm32/stm32-cryp.c | 37 +- + drivers/crypto/stm32/stm32-hash.c | 266 ++- + drivers/crypto/talitos.c | 6 +- + drivers/crypto/ux500/Kconfig | 22 - + drivers/crypto/ux500/Makefile | 7 - + drivers/crypto/ux500/hash/Makefile | 11 - + drivers/crypto/ux500/hash/hash_alg.h | 398 ---- + drivers/crypto/ux500/hash/hash_core.c | 1966 -------------------- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 2 +- + drivers/md/dm-crypt.c | 8 +- + drivers/md/dm-integrity.c | 4 +- + drivers/net/macsec.c | 8 +- + fs/ecryptfs/crypto.c | 30 +- + include/crypto/aead.h | 20 +- + include/crypto/algapi.h | 6 + + include/crypto/if_alg.h | 4 +- + include/crypto/internal/acompress.h | 2 +- + include/crypto/internal/aead.h | 2 +- + include/crypto/internal/akcipher.h | 2 +- + include/crypto/internal/hash.h | 2 +- + include/crypto/internal/kpp.h | 2 +- + include/crypto/internal/skcipher.h | 2 +- + include/crypto/scatterwalk.h | 4 +- + include/crypto/xts.h | 25 +- + include/linux/crypto.h | 4 +- + include/linux/hisi_acc_qm.h | 5 +- + lib/crypto/blake2s-selftest.c | 25 +- + lib/mpi/mpicoder.c | 3 +- + net/bluetooth/ecdh_helper.c | 37 +- + net/ipv4/ah4.c | 8 +- + net/ipv4/esp4.c | 20 +- + net/ipv6/ah6.c | 8 +- + net/ipv6/esp6.c | 20 +- + net/tipc/crypto.c | 12 +- + net/tls/tls.h | 2 + + net/tls/tls_sw.c | 42 +- + security/keys/dh.c | 30 +- + 186 files changed, 6384 insertions(+), 4058 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/aspeed,ast2600-ahbc.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2600-acry.yaml + create mode 100644 Documentation/devicetree/bindings/rng/starfive,jh7110-trng.yaml + create mode 100644 arch/x86/crypto/aria-aesni-avx2-asm_64.S + create mode 100644 arch/x86/crypto/aria-gfni-avx512-asm_64.S + create mode 100644 arch/x86/crypto/aria_aesni_avx2_glue.c + create mode 100644 arch/x86/crypto/aria_gfni_avx512_glue.c + create mode 100644 drivers/char/hw_random/jh7110-trng.c + create mode 100644 drivers/crypto/aspeed/aspeed-acry.c + delete mode 100644 drivers/crypto/ux500/Kconfig + delete mode 100644 drivers/crypto/ux500/Makefile + delete mode 100644 drivers/crypto/ux500/hash/Makefile + delete mode 100644 drivers/crypto/ux500/hash/hash_alg.h + delete mode 100644 drivers/crypto/ux500/hash/hash_core.c +Merging drm/drm-next (8573df341545 Merge tag 'drm-misc-next-fixes-2023-02-09' 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 Documentation/accel/introduction.rst +CONFLICT (content): Merge conflict in Documentation/accel/introduction.rst +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.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/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/drm_client.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_tiling.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/solomon/ssd130x.c +Auto-merging drivers/gpu/drm/tiny/cirrus.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/video/fbdev/core/fb_defio.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging include/drm/drm_client.h +Auto-merging include/linux/fb.h +Resolved 'Documentation/accel/introduction.rst' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/soc21.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gpu_error.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 48e08dfa4713] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-habanalabs | 14 +- + Documentation/accel/introduction.rst | 6 +- + .../bindings/display/bridge/cdns,dsi.txt | 112 - + .../bindings/display/bridge/cdns,dsi.yaml | 180 + + .../bindings/display/bridge/fsl,ldb.yaml | 16 +- + .../bindings/display/bridge/ite,it6505.yaml | 68 +- + .../bindings/display/bridge/ite,it66121.yaml | 4 +- + .../display/bridge/renesas,dsi-csi2-tx.yaml | 3 +- + .../bindings/display/bridge/renesas,dsi.yaml | 1 + + .../bindings/display/mediatek/mediatek,aal.yaml | 1 + + .../bindings/display/mediatek/mediatek,ccorr.yaml | 3 +- + .../bindings/display/mediatek/mediatek,color.yaml | 1 + + .../bindings/display/mediatek/mediatek,dither.yaml | 1 + + .../bindings/display/mediatek/mediatek,gamma.yaml | 1 + + .../bindings/display/mediatek/mediatek,ovl.yaml | 1 + + .../display/mediatek/mediatek,postmask.yaml | 1 + + .../bindings/display/mediatek/mediatek,rdma.yaml | 4 + + .../bindings/display/msm/dp-controller.yaml | 31 +- + .../bindings/display/msm/dpu-common.yaml | 12 +- + .../bindings/display/msm/dsi-controller-main.yaml | 285 +- + .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 5 +- + .../bindings/display/msm/dsi-phy-common.yaml | 7 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../devicetree/bindings/display/msm/mdp5.txt | 132 - + .../bindings/display/msm/mdss-common.yaml | 9 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 156 + + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 55 +- + .../bindings/display/msm/qcom,msm8998-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,msm8998-mdss.yaml | 14 +- + .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sc7180-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,sc7180-mdss.yaml | 12 +- + .../bindings/display/msm/qcom,sc7280-dpu.yaml | 9 +- + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 9 +- + .../bindings/display/msm/qcom,sc8280xp-dpu.yaml | 122 + + .../bindings/display/msm/qcom,sc8280xp-mdss.yaml | 151 + + .../bindings/display/msm/qcom,sdm845-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,sdm845-mdss.yaml | 20 +- + .../bindings/display/msm/qcom,sm6115-dpu.yaml | 5 +- + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 3 +- + .../bindings/display/msm/qcom,sm8150-dpu.yaml | 92 + + .../bindings/display/msm/qcom,sm8150-mdss.yaml | 332 + + .../bindings/display/msm/qcom,sm8250-dpu.yaml | 7 + + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 14 +- + .../bindings/display/msm/qcom,sm8350-dpu.yaml | 120 + + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 223 + + .../bindings/display/msm/qcom,sm8450-dpu.yaml | 139 + + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 345 + + .../bindings/display/panel/auo,a030jtn01.yaml | 60 + + .../bindings/display/panel/focaltech,gpt3.yaml | 56 + + .../bindings/display/panel/himax,hx8394.yaml | 76 + + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 8 +- + .../bindings/display/panel/visionox,vtdr6130.yaml | 63 + + .../devicetree/bindings/display/renesas,du.yaml | 2 + + .../bindings/display/simple-framebuffer.yaml | 7 + + .../bindings/phy/qcom,hdmi-phy-other.yaml | 27 +- + .../bindings/reserved-memory/framebuffer.yaml | 52 + + Documentation/fb/modedb.rst | 5 + + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 18 +- + Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 2 + + Documentation/gpu/amdgpu/driver-misc.rst | 2 +- + Documentation/gpu/drm-kms-helpers.rst | 7 + + Documentation/gpu/drm-kms.rst | 6 + + Documentation/gpu/drm-uapi.rst | 12 +- + Documentation/gpu/todo.rst | 13 +- + Documentation/gpu/vc4.rst | 19 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 49 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 194 + + .../userspace-api/media/v4l/subdev-formats.rst | 111 + + MAINTAINERS | 62 +- + drivers/Makefile | 1 + + drivers/accel/Kconfig | 8 +- + drivers/accel/Makefile | 4 + + drivers/{misc => accel}/habanalabs/Kconfig | 8 +- + drivers/{misc => accel}/habanalabs/Makefile | 2 +- + drivers/{misc => accel}/habanalabs/common/Makefile | 0 + drivers/{misc => accel}/habanalabs/common/asid.c | 0 + .../habanalabs/common/command_buffer.c | 22 +- + .../habanalabs/common/command_submission.c | 133 +- + .../{misc => accel}/habanalabs/common/context.c | 0 + .../{misc => accel}/habanalabs/common/debugfs.c | 0 + .../{misc => accel}/habanalabs/common/decoder.c | 0 + drivers/{misc => accel}/habanalabs/common/device.c | 109 +- + .../habanalabs/common/firmware_if.c | 189 +- + .../{misc => accel}/habanalabs/common/habanalabs.h | 122 +- + .../habanalabs/common/habanalabs_drv.c | 6 +- + .../habanalabs/common/habanalabs_ioctl.c | 101 +- + .../{misc => accel}/habanalabs/common/hw_queue.c | 0 + drivers/{misc => accel}/habanalabs/common/hwmon.c | 0 + drivers/{misc => accel}/habanalabs/common/irq.c | 38 +- + drivers/{misc => accel}/habanalabs/common/memory.c | 369 +- + .../{misc => accel}/habanalabs/common/memory_mgr.c | 3 +- + .../{misc => accel}/habanalabs/common/mmu/Makefile | 0 + .../{misc => accel}/habanalabs/common/mmu/mmu.c | 2 +- + .../{misc => accel}/habanalabs/common/mmu/mmu_v1.c | 1 - + .../habanalabs/common/mmu/mmu_v2_hr.c | 0 + .../{misc => accel}/habanalabs/common/pci/Makefile | 0 + .../{misc => accel}/habanalabs/common/pci/pci.c | 10 +- + .../{misc => accel}/habanalabs/common/security.c | 174 + + drivers/accel/habanalabs/common/security.h | 163 + + .../{misc => accel}/habanalabs/common/state_dump.c | 2 +- + drivers/{misc => accel}/habanalabs/common/sysfs.c | 0 + drivers/{misc => accel}/habanalabs/gaudi/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi/gaudi.c | 27 +- + drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h | 2 +- + .../habanalabs/gaudi/gaudi_coresight.c | 3 +- + .../habanalabs/gaudi/gaudi_security.c | 0 + drivers/{misc => accel}/habanalabs/gaudi2/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c | 1175 +-- + .../{misc => accel}/habanalabs/gaudi2/gaudi2P.h | 39 +- + .../habanalabs/gaudi2/gaudi2_coresight.c | 10 +- + .../habanalabs/gaudi2/gaudi2_coresight_regs.h | 0 + .../habanalabs/gaudi2/gaudi2_masks.h | 0 + .../habanalabs/gaudi2/gaudi2_security.c | 37 +- + drivers/{misc => accel}/habanalabs/goya/Makefile | 0 + drivers/{misc => accel}/habanalabs/goya/goya.c | 12 + + drivers/{misc => accel}/habanalabs/goya/goyaP.h | 2 +- + .../habanalabs/goya/goya_coresight.c | 2 +- + .../{misc => accel}/habanalabs/goya/goya_hwmgr.c | 0 + .../habanalabs/goya/goya_security.c | 0 + .../habanalabs/include/common/cpucp_if.h | 96 +- + .../habanalabs/include/common/hl_boot_if.h | 151 +- + .../habanalabs/include/common/qman_if.h | 0 + .../include/gaudi/asic_reg/cpu_if_regs.h | 0 + .../include/gaudi/asic_reg/dma0_core_masks.h | 0 + .../include/gaudi/asic_reg/dma0_core_regs.h | 0 + .../include/gaudi/asic_reg/dma0_qm_masks.h | 0 + .../include/gaudi/asic_reg/dma0_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma1_core_regs.h | 0 + .../include/gaudi/asic_reg/dma1_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma2_core_regs.h | 0 + .../include/gaudi/asic_reg/dma2_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma3_core_regs.h | 0 + .../include/gaudi/asic_reg/dma3_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma4_core_regs.h | 0 + .../include/gaudi/asic_reg/dma4_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma5_core_regs.h | 0 + .../include/gaudi/asic_reg/dma5_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma6_core_regs.h | 0 + .../include/gaudi/asic_reg/dma6_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma7_core_regs.h | 0 + .../include/gaudi/asic_reg/dma7_qm_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_s_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_s_regs.h | 0 + .../include/gaudi/asic_reg/gaudi_blocks.h | 0 + .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 2 + + .../include/gaudi/asic_reg/mme0_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme0_qm_masks.h | 0 + .../include/gaudi/asic_reg/mme0_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme1_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme3_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mmu_up_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_masks.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h | 0 + .../include/gaudi/asic_reg/psoc_cpu_pll_regs.h | 0 + .../include/gaudi/asic_reg/psoc_etr_regs.h | 0 + .../gaudi/asic_reg/psoc_global_conf_masks.h | 0 + .../include/gaudi/asic_reg/psoc_global_conf_regs.h | 0 + .../include/gaudi/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h | 0 + .../habanalabs/include/gaudi/asic_reg/stlb_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_qm_regs.h | 0 + .../habanalabs/include/gaudi/gaudi.h | 0 + .../habanalabs/include/gaudi/gaudi_async_events.h | 0 + .../include/gaudi/gaudi_async_ids_map_extended.h | 0 + .../habanalabs/include/gaudi/gaudi_coresight.h | 0 + .../habanalabs/include/gaudi/gaudi_fw_if.h | 0 + .../habanalabs/include/gaudi/gaudi_masks.h | 0 + .../habanalabs/include/gaudi/gaudi_packets.h | 0 + .../habanalabs/include/gaudi/gaudi_reg_map.h | 0 + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 211 + + .../gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_regs.h | 0 + .../asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_masks.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_masks.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_regs.h | 0 + .../include/gaudi2/asic_reg/cpu_if_regs.h | 0 + .../gaudi2/asic_reg/dcore0_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h | 0 + .../asic_reg/dcore0_edma0_core_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_masks.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h | 0 + .../dcore0_edma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h | 0 + .../asic_reg/dcore0_edma1_core_ctx_axuser_regs.h | 0 + .../dcore0_edma1_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h | 15 +- + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h | 41 +- + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_acc_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_base_addr_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h | 6 +- + ...dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_a_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_b_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h | 9 +- + .../asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h | 0 + .../dcore0_mme_qm_arc_dup_eng_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h | 0 + .../dcore0_mme_qm_axuser_nonsecured_regs.h | 0 + .../asic_reg/dcore0_mme_qm_axuser_secured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_qm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_sbte0_masks.h | 0 + .../dcore0_mme_sbte0_mstr_if_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_masks.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h | 0 + .../dcore0_tpc0_cfg_kernel_tensor_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h | 0 + .../asic_reg/dcore0_tpc0_eml_busmon_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h | 0 + .../dcore0_tpc0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + ...dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h | 6 +- + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h | 0 + .../asic_reg/dcore0_vdec0_ctrl_special_regs.h | 0 + .../gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h | 1203 ++++ + .../gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/gaudi2_blocks_linux_driver.h | 0 + .../include/gaudi2/asic_reg/gaudi2_regs.h | 1 + + .../include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qm0_regs.h | 0 + .../gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qpc0_regs.h | 0 + .../nic0_umr0_0_completion_queue_ci_1_regs.h | 0 + .../asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_aux_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_dbi_regs.h | 3 +- + .../include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h | 3 +- + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_wrap_regs.h | 0 + .../gaudi2/asic_reg/pcie_wrap_special_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_ctx_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_special_masks.h | 0 + .../gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h | 0 + .../asic_reg/pdma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_regs.h | 0 + .../gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h | 0 + .../asic_reg/pdma1_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h | 3 +- + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_pif_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_regs.h | 0 + .../gaudi2/asic_reg/psoc_global_conf_masks.h | 27 +- + .../gaudi2/asic_reg/psoc_global_conf_regs.h | 0 + .../gaudi2/asic_reg/psoc_reset_conf_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_reset_conf_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_desc_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_masks.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h | 0 + .../asic_reg/rot0_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_regs.h | 0 + .../habanalabs/include/gaudi2/asic_reg/rot0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_edge_0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_mid_0_regs.h | 0 + .../habanalabs/include/gaudi2/gaudi2.h | 0 + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 2 + + .../habanalabs/include/gaudi2/gaudi2_coresight.h | 0 + .../habanalabs/include/gaudi2/gaudi2_fw_if.h | 23 +- + .../habanalabs/include/gaudi2/gaudi2_packets.h | 4 +- + .../habanalabs/include/gaudi2/gaudi2_reg_map.h | 16 +- + .../include/gaudi2/gaudi2_special_blocks.h | 157 + + .../include/goya/asic_reg/cpu_ca53_cfg_masks.h | 0 + .../include/goya/asic_reg/cpu_ca53_cfg_regs.h | 0 + .../habanalabs/include/goya/asic_reg/cpu_if_regs.h | 0 + .../include/goya/asic_reg/cpu_pll_regs.h | 0 + .../include/goya/asic_reg/dma_ch_0_masks.h | 0 + .../include/goya/asic_reg/dma_ch_0_regs.h | 0 + .../include/goya/asic_reg/dma_ch_1_regs.h | 0 + .../include/goya/asic_reg/dma_ch_2_regs.h | 0 + .../include/goya/asic_reg/dma_ch_3_regs.h | 0 + .../include/goya/asic_reg/dma_ch_4_regs.h | 0 + .../include/goya/asic_reg/dma_macro_masks.h | 0 + .../include/goya/asic_reg/dma_macro_regs.h | 0 + .../include/goya/asic_reg/dma_nrtr_masks.h | 0 + .../include/goya/asic_reg/dma_nrtr_regs.h | 0 + .../include/goya/asic_reg/dma_qm_0_masks.h | 0 + .../include/goya/asic_reg/dma_qm_0_regs.h | 0 + .../include/goya/asic_reg/dma_qm_1_regs.h | 0 + .../include/goya/asic_reg/dma_qm_2_regs.h | 0 + .../include/goya/asic_reg/dma_qm_3_regs.h | 0 + .../include/goya/asic_reg/dma_qm_4_regs.h | 0 + .../habanalabs/include/goya/asic_reg/goya_blocks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_masks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_regs.h | 0 + .../habanalabs/include/goya/asic_reg/ic_pll_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mc_pll_regs.h | 0 + .../include/goya/asic_reg/mme1_rtr_masks.h | 0 + .../include/goya/asic_reg/mme1_rtr_regs.h | 0 + .../include/goya/asic_reg/mme2_rtr_regs.h | 0 + .../include/goya/asic_reg/mme3_rtr_regs.h | 0 + .../include/goya/asic_reg/mme4_rtr_regs.h | 0 + .../include/goya/asic_reg/mme5_rtr_regs.h | 0 + .../include/goya/asic_reg/mme6_rtr_regs.h | 0 + .../include/goya/asic_reg/mme_cmdq_masks.h | 0 + .../include/goya/asic_reg/mme_cmdq_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_masks.h | 0 + .../include/goya/asic_reg/mme_qm_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mme_qm_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_regs.h | 0 + .../include/goya/asic_reg/pci_nrtr_masks.h | 0 + .../include/goya/asic_reg/pci_nrtr_regs.h | 0 + .../include/goya/asic_reg/pcie_aux_regs.h | 0 + .../include/goya/asic_reg/pcie_wrap_regs.h | 0 + .../include/goya/asic_reg/psoc_emmc_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_etr_regs.h | 0 + .../include/goya/asic_reg/psoc_global_conf_masks.h | 0 + .../include/goya/asic_reg/psoc_global_conf_regs.h | 0 + .../include/goya/asic_reg/psoc_mme_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_pci_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_spi_regs.h | 0 + .../include/goya/asic_reg/psoc_timestamp_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x0_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x1_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x2_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x3_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x4_rtr_regs.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_masks.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_regs.h | 0 + .../include/goya/asic_reg/tpc0_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_masks.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_masks.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc0_qm_masks.h | 0 + .../include/goya/asic_reg/tpc0_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc1_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc1_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc2_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc2_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc2_qm_regs.h | 0 + .../include/goya/asic_reg/tpc2_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc3_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc3_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc3_qm_regs.h | 0 + .../include/goya/asic_reg/tpc3_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc4_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc4_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc4_qm_regs.h | 0 + .../include/goya/asic_reg/tpc4_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc5_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc5_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc5_qm_regs.h | 0 + .../include/goya/asic_reg/tpc5_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc6_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc6_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc6_qm_regs.h | 0 + .../include/goya/asic_reg/tpc6_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc7_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc7_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_qm_regs.h | 0 + .../include/goya/asic_reg/tpc_pll_regs.h | 0 + .../{misc => accel}/habanalabs/include/goya/goya.h | 0 + .../habanalabs/include/goya/goya_async_events.h | 0 + .../habanalabs/include/goya/goya_coresight.h | 0 + .../habanalabs/include/goya/goya_fw_if.h | 0 + .../habanalabs/include/goya/goya_packets.h | 0 + .../habanalabs/include/goya/goya_reg_map.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v2_0.h | 0 + .../habanalabs/include/hw_ip/pci/pci_general.h | 0 + drivers/accel/ivpu/Kconfig | 15 + + drivers/accel/ivpu/Makefile | 16 + + drivers/accel/ivpu/TODO | 11 + + drivers/accel/ivpu/ivpu_drv.c | 655 ++ + drivers/accel/ivpu/ivpu_drv.h | 190 + + drivers/accel/ivpu/ivpu_fw.c | 434 ++ + drivers/accel/ivpu/ivpu_fw.h | 38 + + drivers/accel/ivpu/ivpu_gem.c | 749 ++ + drivers/accel/ivpu/ivpu_gem.h | 127 + + drivers/accel/ivpu/ivpu_hw.h | 170 + + drivers/accel/ivpu/ivpu_hw_mtl.c | 1084 +++ + drivers/accel/ivpu/ivpu_hw_mtl_reg.h | 280 + + drivers/accel/ivpu/ivpu_hw_reg_io.h | 115 + + drivers/accel/ivpu/ivpu_ipc.c | 510 ++ + drivers/accel/ivpu/ivpu_ipc.h | 93 + + drivers/accel/ivpu/ivpu_job.c | 615 ++ + drivers/accel/ivpu/ivpu_job.h | 67 + + drivers/accel/ivpu/ivpu_jsm_msg.c | 180 + + drivers/accel/ivpu/ivpu_jsm_msg.h | 23 + + drivers/accel/ivpu/ivpu_mmu.c | 883 +++ + drivers/accel/ivpu/ivpu_mmu.h | 50 + + drivers/accel/ivpu/ivpu_mmu_context.c | 398 ++ + drivers/accel/ivpu/ivpu_mmu_context.h | 50 + + drivers/accel/ivpu/ivpu_pm.c | 329 + + drivers/accel/ivpu/ivpu_pm.h | 38 + + drivers/accel/ivpu/vpu_boot_api.h | 349 + + drivers/accel/ivpu/vpu_jsm_api.h | 1008 +++ + drivers/dma-buf/dma-buf.c | 14 +- + drivers/dma-buf/udmabuf.c | 28 + + drivers/firmware/sysfb_simplefb.c | 43 +- + drivers/gpu/drm/Kconfig | 67 +- + drivers/gpu/drm/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 59 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 343 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 215 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 255 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 210 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 166 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 1 - + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v4_3.c | 61 + + drivers/gpu/drm/amd/amdgpu/df_v4_3.h | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 155 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 241 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 88 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 97 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 174 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 108 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 107 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 37 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 101 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 131 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 18 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 68 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 63 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 59 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 62 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 24 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 7 - + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 - + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 623 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 83 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 165 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 26 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 129 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 153 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 194 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 89 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 3 + + drivers/gpu/drm/amd/display/dc/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1 - + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 17 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 14 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 1 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 33 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 3 + + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 101 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 119 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1849 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7553 -------------------- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 61 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 119 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 +- + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 28 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 34 +- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 114 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 24 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 178 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 90 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 37 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 111 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 17 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 20 +- + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 6 +- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 1 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 26 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 11 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 3 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 16 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 6 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 1 - + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 5 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 25 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 18 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 55 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 29 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 5 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 11 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.h | 4 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 1 - + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 32 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 29 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 17 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 234 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 70 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 20 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 209 +- + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 18 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 7 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 58 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 176 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 53 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 33 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 5 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 7 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 10 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 6 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 6 +- + .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 7 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 133 - + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 267 - + drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 105 - + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 17 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 109 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 5 - + drivers/gpu/drm/amd/display/dc/link/Makefile | 32 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 1055 +++ + .../amd/display/dc/link/accessories/link_dp_cts.h | 33 + + .../dc/link/{ => accessories}/link_dp_trace.c | 8 +- + .../dc/link/{ => accessories}/link_dp_trace.h | 5 - + .../amd/display/dc/link/{ => hwss}/link_hwss_dio.c | 1 - + .../amd/display/dc/link/{ => hwss}/link_hwss_dio.h | 1 + + .../display/dc/link/{ => hwss}/link_hwss_dpia.c | 0 + .../display/dc/link/{ => hwss}/link_hwss_dpia.h | 0 + .../display/dc/link/{ => hwss}/link_hwss_hpo_dp.c | 38 - + .../display/dc/link/{ => hwss}/link_hwss_hpo_dp.h | 1 + + .../dc_link_ddc.c => link/protocols/link_ddc.c} | 410 +- + .../link/protocols/link_ddc.h} | 70 +- + .../display/dc/link/protocols/link_dp_capability.c | 2186 ++++++ + .../display/dc/link/protocols/link_dp_capability.h | 79 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 105 + + .../display/dc/link/protocols/link_dp_dpia.h} | 42 +- + .../dc/link/{ => protocols}/link_dp_dpia_bw.c | 0 + .../dc/link/{ => protocols}/link_dp_dpia_bw.h | 39 +- + .../dc/link/protocols/link_dp_irq_handler.c | 401 ++ + .../link_dp_irq_handler.h} | 15 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 144 + + .../amd/display/dc/link/protocols/link_dp_phy.h | 56 + + .../display/dc/link/protocols/link_dp_training.c | 1700 +++++ + .../display/dc/link/protocols/link_dp_training.h | 182 + + .../dc/link/protocols/link_dp_training_128b_132b.c | 259 + + .../dc/link/protocols/link_dp_training_128b_132b.h | 42 + + .../dc/link/protocols/link_dp_training_8b_10b.c | 414 ++ + .../dc/link/protocols/link_dp_training_8b_10b.h | 61 + + .../dc/link/protocols/link_dp_training_auxless.c | 79 + + .../dc/link/protocols/link_dp_training_auxless.h | 35 + + .../protocols/link_dp_training_dpia.c} | 309 +- + .../dc/link/protocols/link_dp_training_dpia.h | 41 + + .../link_dp_training_fixed_vs_pe_retimer.c | 579 ++ + .../link_dp_training_fixed_vs_pe_retimer.h | 45 + + .../dc_link_dpcd.c => link/protocols/link_dpcd.c} | 13 +- + .../display/dc/{inc => link/protocols}/link_dpcd.h | 5 +- + .../dc/link/protocols/link_edp_panel_control.c | 833 +++ + .../dc/link/protocols/link_edp_panel_control.h | 33 + + .../drm/amd/display/dc/link/protocols/link_hpd.c | 240 + + .../drm/amd/display/dc/link/protocols/link_hpd.h | 47 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 17 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 97 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 21 + + .../drm/amd/display/include/ddc_service_types.h | 6 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 +- + .../drm/amd/display/include/link_service_types.h | 7 +- + .../drm/amd/display/modules/freesync/freesync.c | 64 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 36 + + .../amd/display/modules/info_packet/info_packet.c | 55 + + .../drm/amd/display/modules/power/power_helpers.c | 31 + + .../drm/amd/display/modules/power/power_helpers.h | 3 + + .../drm/amd/include/asic_reg/df/df_4_3_offset.h | 30 + + .../drm/amd/include/asic_reg/df/df_4_3_sh_mask.h | 157 + + .../drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h | 8 + + .../amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h | 50 + + .../amd/include/asic_reg/xgmi/xgmi_6_1_0_sh_mask.h | 87 + + .../amd/include/ivsrcid/gfx/irqsrcs_gfx_11_0_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 2 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 11 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 13 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 32 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 23 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 21 +- + .../pm/powerplay/hwmgr/vega20_processpptables.c | 1 - + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 3 +- + .../drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 5 - + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 51 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 67 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 47 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 6 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 1 - + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 - + drivers/gpu/drm/arm/hdlcd_drv.c | 24 +- + drivers/gpu/drm/armada/armada_fbdev.c | 4 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 - + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 1 - + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 1 - + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 1 - + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 9 +- + drivers/gpu/drm/bridge/Kconfig | 11 - + drivers/gpu/drm/bridge/Makefile | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 7 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 21 + + drivers/gpu/drm/bridge/cadence/Makefile | 3 + + .../bridge/{cdns-dsi.c => cadence/cdns-dsi-core.c} | 83 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h | 84 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.c | 51 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.h | 16 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 - + drivers/gpu/drm/bridge/chipone-icn6211.c | 5 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 80 +- + drivers/gpu/drm/bridge/ite-it6505.c | 133 +- + drivers/gpu/drm/bridge/ite-it66121.c | 321 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 26 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 346 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 16 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 +- + drivers/gpu/drm/bridge/panel.c | 13 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 38 +- + drivers/gpu/drm/bridge/sii9234.c | 5 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 5 +- + drivers/gpu/drm/bridge/tc358764.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 12 +- + drivers/gpu/drm/bridge/tc358768.c | 6 +- + drivers/gpu/drm/bridge/tc358775.c | 5 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 5 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 23 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 124 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_blend.c | 13 +- + drivers/gpu/drm/drm_bridge.c | 294 +- + drivers/gpu/drm/drm_bridge_connector.c | 27 +- + drivers/gpu/drm/drm_bufs.c | 12 +- + drivers/gpu/drm/drm_client.c | 21 +- + drivers/gpu/drm/drm_client_modeset.c | 4 - + drivers/gpu/drm/drm_connector.c | 174 +- + drivers/gpu/drm/drm_context.c | 36 +- + drivers/gpu/drm/drm_debugfs.c | 110 +- + drivers/gpu/drm/drm_drv.c | 7 +- + drivers/gpu/drm/drm_edid.c | 528 +- + drivers/gpu/drm/drm_fb_helper.c | 321 +- + drivers/gpu/drm/drm_fbdev_generic.c | 128 +- + drivers/gpu/drm/drm_file.c | 18 +- + drivers/gpu/drm/drm_format_helper.c | 496 +- + drivers/gpu/drm/drm_fourcc.c | 4 + + drivers/gpu/drm/drm_framebuffer.c | 11 +- + drivers/gpu/drm/drm_gem.c | 19 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 31 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 19 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 2 + + drivers/gpu/drm/drm_gem_vram_helper.c | 12 +- + drivers/gpu/drm/drm_internal.h | 5 + + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 25 +- + drivers/gpu/drm/drm_lease.c | 66 +- + drivers/gpu/drm/drm_mipi_dbi.c | 158 +- + drivers/gpu/drm/drm_mipi_dsi.c | 52 + + drivers/gpu/drm/drm_mode_config.c | 10 +- + drivers/gpu/drm/drm_modes.c | 551 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 33 +- + drivers/gpu/drm/drm_plane.c | 5 + + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/drm_probe_helper.c | 160 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 54 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 5 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 9 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 66 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 36 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 18 +- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 86 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 13 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 12 +- + drivers/gpu/drm/exynos/exynos_dp.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 50 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 12 +- + drivers/gpu/drm/gma500/Kconfig | 2 + + drivers/gpu/drm/gma500/backlight.c | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 + + drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 + + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 + + drivers/gpu/drm/gma500/framebuffer.c | 11 +- + drivers/gpu/drm/gma500/gma_display.c | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 + + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 + + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_device.c | 1 + + drivers/gpu/drm/gma500/psb_intel_display.c | 3 + + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 + + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 + + drivers/gpu/drm/gud/gud_connector.c | 10 +- + drivers/gpu/drm/gud/gud_drv.c | 18 +- + drivers/gpu/drm/gud/gud_internal.h | 1 + + drivers/gpu/drm/gud/gud_pipe.c | 223 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 14 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 - + drivers/gpu/drm/i2c/sil164_drv.c | 4 +- + drivers/gpu/drm/i2c/tda9950.c | 5 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 4 +- + drivers/gpu/drm/i810/Makefile | 8 - + drivers/gpu/drm/i810/i810_dma.c | 1266 ---- + drivers/gpu/drm/i810/i810_drv.c | 101 - + drivers/gpu/drm/i810/i810_drv.h | 246 - + drivers/gpu/drm/i915/Kconfig | 17 +- + drivers/gpu/drm/i915/Makefile | 20 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 22 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 13 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 2 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 + + drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 85 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 328 +- + drivers/gpu/drm/i915/display/intel_audio.h | 9 + + drivers/gpu/drm/i915/display/intel_backlight.c | 539 +- + .../gpu/drm/i915/display/intel_backlight_regs.h | 27 +- + drivers/gpu/drm/i915/display/intel_bios.c | 66 +- + drivers/gpu/drm/i915/display/intel_bios.h | 13 +- + drivers/gpu/drm/i915/display/intel_bw.h | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 216 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 1269 +++- + drivers/gpu/drm/i915/display/intel_color.h | 10 +- + drivers/gpu/drm/i915/display/intel_connector.c | 7 +- + drivers/gpu/drm/i915/display/intel_crt.c | 53 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 1 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 30 +- + drivers/gpu/drm/i915/display/intel_de.h | 46 +- + drivers/gpu/drm/i915/display/intel_display.c | 215 +- + drivers/gpu/drm/i915/display/intel_display.h | 123 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 34 +- + .../gpu/drm/i915/display/intel_display_limits.h | 124 + + drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 1 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 39 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 135 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 5 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 10 + + drivers/gpu/drm/i915/display/intel_dp.c | 306 +- + drivers/gpu/drm/i915/display/intel_dp.h | 19 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 41 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 235 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 328 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 14 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 410 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 7 +- + drivers/gpu/drm/i915/display/intel_dvo_regs.h | 54 + + drivers/gpu/drm/i915/display/intel_fb.c | 2 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 32 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 22 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 53 +- + drivers/gpu/drm/i915/display/intel_hti.c | 3 + + drivers/gpu/drm/i915/display/intel_lvds.c | 53 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 29 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 4 +- + drivers/gpu/drm/i915/display/intel_panel.c | 19 +- + drivers/gpu/drm/i915/display/intel_panel.h | 5 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 23 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- + drivers/gpu/drm/i915/display/intel_pps.c | 360 +- + drivers/gpu/drm/i915/display/intel_pps.h | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 101 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 47 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 17 +- + drivers/gpu/drm/i915/display/intel_tc.c | 55 +- + drivers/gpu/drm/i915/display/intel_tv.c | 4 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 441 ++ + drivers/gpu/drm/i915/display/intel_vblank.h | 23 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 11 +- + drivers/gpu/drm/i915/display/intel_vga.c | 32 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 55 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 49 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 42 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 2 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 16 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 303 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 6 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 23 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 35 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 8 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 15 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 2 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 29 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 + + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 191 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 7 + + drivers/gpu/drm/i915/gt/intel_gsc.c | 8 + + drivers/gpu/drm/i915/gt/intel_gt.c | 167 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 2 - + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 141 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 17 +- + drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 36 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 42 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 20 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 34 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 30 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 6 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 3 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 12 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_rps.h | 3 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 300 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 30 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 15 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 20 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 173 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 12 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 20 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +- + drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 210 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 15 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 137 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h | 47 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 47 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 11 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 17 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 38 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 48 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 106 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 99 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 291 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 3 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 10 +- + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_config.c | 5 +- + drivers/gpu/drm/i915/i915_config.h | 23 + + drivers/gpu/drm/i915/i915_debugfs.c | 8 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 33 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 194 +- + drivers/gpu/drm/i915/i915_drv.h | 134 +- + drivers/gpu/drm/i915/i915_gem.c | 22 +- + drivers/gpu/drm/i915/i915_gem.h | 7 + + drivers/gpu/drm/i915/i915_gem_evict.c | 51 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 71 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- + drivers/gpu/drm/i915/i915_hwmon.c | 43 +- + drivers/gpu/drm/i915/i915_irq.c | 436 +- + drivers/gpu/drm/i915/i915_irq.h | 6 - + drivers/gpu/drm/i915/i915_params.c | 91 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 53 +- + drivers/gpu/drm/i915/i915_perf.c | 51 +- + drivers/gpu/drm/i915/i915_reg.h | 110 +- + drivers/gpu/drm/i915/i915_request.c | 1 + + drivers/gpu/drm/i915/i915_scatterlist.c | 9 + + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 80 +- + drivers/gpu/drm/i915/i915_vma.h | 52 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 4 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 17 +- + drivers/gpu/drm/i915/i915_vma_types.h | 3 +- + drivers/gpu/drm/i915/intel_device_info.c | 7 + + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_mchbar_regs.h | 2 + + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 1 + + drivers/gpu/drm/i915/intel_pm_types.h | 2 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 17 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 59 + + drivers/gpu/drm/i915/intel_uncore.h | 13 + + drivers/gpu/drm/i915/intel_wakeref.h | 21 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 128 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 8 +- + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 36 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 11 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 18 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 35 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 8 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 28 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 +- + drivers/gpu/drm/i915/selftests/scatterlist.c | 4 + + drivers/gpu/drm/i915/{ => soc}/intel_dram.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_dram.h | 0 + drivers/gpu/drm/i915/soc/intel_gmch.c | 171 + + drivers/gpu/drm/i915/soc/intel_gmch.h | 18 + + drivers/gpu/drm/i915/{ => soc}/intel_pch.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_pch.h | 0 + drivers/gpu/drm/i915/vlv_sideband.c | 1 + + drivers/gpu/drm/imx/Kconfig | 41 +- + drivers/gpu/drm/imx/Makefile | 10 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 23 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 7 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 15 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 - + drivers/gpu/drm/imx/ipuv3/Kconfig | 41 + + drivers/gpu/drm/imx/ipuv3/Makefile | 11 + + drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c | 0 + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 1 - + drivers/gpu/drm/kmb/kmb_crtc.c | 1 - + drivers/gpu/drm/kmb/kmb_plane.c | 1 - + drivers/gpu/drm/logicvc/logicvc_drm.c | 13 +- + drivers/gpu/drm/logicvc/logicvc_interface.c | 1 - + drivers/gpu/drm/logicvc/logicvc_mode.c | 1 - + drivers/gpu/drm/mediatek/Kconfig | 1 - + drivers/gpu/drm/mediatek/mtk_cec.c | 2 + + drivers/gpu/drm/mediatek/mtk_disp_aal.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_color.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 1 + + drivers/gpu/drm/mediatek/mtk_dp.c | 6 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 32 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +- + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 3 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +- + drivers/gpu/drm/mga/Makefile | 11 - + drivers/gpu/drm/mga/mga_dma.c | 1168 --- + drivers/gpu/drm/mga/mga_drv.c | 104 - + drivers/gpu/drm/mga/mga_drv.h | 685 -- + drivers/gpu/drm/mga/mga_ioc32.c | 197 - + drivers/gpu/drm/mga/mga_irq.c | 169 - + drivers/gpu/drm/mga/mga_state.c | 1099 --- + drivers/gpu/drm/mga/mga_warp.c | 167 - + drivers/gpu/drm/mgag200/Kconfig | 2 + + drivers/gpu/drm/msm/Kconfig | 7 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 27 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 18 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 61 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 66 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 47 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 18 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 12 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 872 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 147 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 27 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 7 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 25 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h | 21 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 5 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 9 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 + + drivers/gpu/drm/msm/dp/dp_display.c | 157 +- + drivers/gpu/drm/msm/dp/dp_display.h | 1 + + drivers/gpu/drm/msm/dp/dp_drm.c | 3 + + drivers/gpu/drm/msm/dp/dp_drm.h | 4 + + drivers/gpu/drm/msm/dp/dp_panel.c | 7 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 1 + + drivers/gpu/drm/msm/dp/dp_parser.c | 50 +- + drivers/gpu/drm/msm/dp/dp_parser.h | 2 + + drivers/gpu/drm/msm/dsi/dsi.h | 3 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 69 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 20 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 12 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 243 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 21 +- + drivers/gpu/drm/msm/msm_debugfs.c | 12 + + drivers/gpu/drm/msm/msm_drv.c | 18 +- + drivers/gpu/drm/msm/msm_drv.h | 12 +- + drivers/gpu/drm/msm/msm_fbdev.c | 4 +- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 15 + + drivers/gpu/drm/msm/msm_gpu.h | 15 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 148 +- + drivers/gpu/drm/msm/msm_mdss.c | 16 + + drivers/gpu/drm/mxsfb/Kconfig | 2 + + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/Kconfig | 14 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 7 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 1 - + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 + + drivers/gpu/drm/nouveau/nouveau_vga.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 26 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 41 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 38 + + drivers/gpu/drm/panel/Makefile | 4 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 96 +- + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 308 + + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 42 +- + drivers/gpu/drm/panel/panel-edp.c | 11 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 46 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 451 ++ + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 1 - + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 58 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 106 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 24 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 14 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 364 + + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 6 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 44 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 33 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 19 +- + drivers/gpu/drm/panel/panel-simple.c | 6 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 341 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 398 +- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 350 + + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 112 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 4 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 16 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- + drivers/gpu/drm/r128/Makefile | 10 - + drivers/gpu/drm/r128/ati_pcigart.c | 228 - + drivers/gpu/drm/r128/ati_pcigart.h | 31 - + drivers/gpu/drm/r128/r128_cce.c | 944 --- + drivers/gpu/drm/r128/r128_drv.c | 116 - + drivers/gpu/drm/r128/r128_drv.h | 544 -- + drivers/gpu/drm/r128/r128_ioc32.c | 199 - + drivers/gpu/drm/r128/r128_irq.c | 118 - + drivers/gpu/drm/r128/r128_state.c | 1641 ----- + drivers/gpu/drm/radeon/Kconfig | 2 + + drivers/gpu/drm/radeon/atombios.h | 10 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 3 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 1 + + drivers/gpu/drm/radeon/r300.c | 1 - + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 2 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1 - + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_encoders.c | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 8 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rcar-du/Kconfig | 6 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 39 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 82 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_group.c | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 30 + + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 50 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 92 +- + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c | 497 +- + drivers/gpu/drm/rcar-du/rcar_mipi_dsi_regs.h | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 - + drivers/gpu/drm/savage/Makefile | 9 - + drivers/gpu/drm/savage/savage_bci.c | 1082 --- + drivers/gpu/drm/savage/savage_drv.c | 91 - + drivers/gpu/drm/savage/savage_drv.h | 580 -- + drivers/gpu/drm/savage/savage_state.c | 1169 --- + drivers/gpu/drm/scheduler/sched_main.c | 19 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 10 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 1 - + drivers/gpu/drm/sis/Makefile | 10 - + drivers/gpu/drm/sis/sis_drv.c | 143 - + drivers/gpu/drm/sis/sis_drv.h | 80 - + drivers/gpu/drm/sis/sis_mm.c | 363 - + drivers/gpu/drm/solomon/ssd130x.c | 15 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 5 +- + drivers/gpu/drm/sprd/sprd_drm.c | 1 - + drivers/gpu/drm/sprd/sprd_dsi.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 141 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 +- + drivers/gpu/drm/tdfx/Makefile | 8 - + drivers/gpu/drm/tdfx/tdfx_drv.c | 90 - + drivers/gpu/drm/tegra/dpaux.c | 6 +- + drivers/gpu/drm/tegra/fb.c | 7 +- + drivers/gpu/drm/tegra/firewall.c | 3 + + drivers/gpu/drm/tegra/nvdec.c | 16 +- + drivers/gpu/drm/tegra/submit.c | 19 +- + drivers/gpu/drm/tegra/vic.c | 39 +- + drivers/gpu/drm/tests/Makefile | 8 +- + drivers/gpu/drm/tests/drm_client_modeset_test.c | 110 +- + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 68 + + drivers/gpu/drm/tests/drm_connector_test.c | 76 + + drivers/gpu/drm/tests/drm_format_helper_test.c | 384 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 105 +- + drivers/gpu/drm/tests/drm_kunit_helpers.h | 11 - + drivers/gpu/drm/tests/drm_managed_test.c | 71 + + drivers/gpu/drm/tests/drm_modes_test.c | 158 + + drivers/gpu/drm/tests/drm_probe_helper_test.c | 218 + + drivers/gpu/drm/tidss/tidss_crtc.c | 1 - + drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- + drivers/gpu/drm/tidss/tidss_drv.c | 1 - + drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- + drivers/gpu/drm/tidss/tidss_kms.c | 1 - + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- + drivers/gpu/drm/tiny/cirrus.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 15 +- + drivers/gpu/drm/tiny/hx8357d.c | 5 +- + drivers/gpu/drm/tiny/ili9163.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 36 +- + drivers/gpu/drm/tiny/ili9341.c | 5 +- + drivers/gpu/drm/tiny/ili9486.c | 20 +- + drivers/gpu/drm/tiny/mi0283qt.c | 5 +- + drivers/gpu/drm/tiny/ofdrm.c | 40 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 140 +- + drivers/gpu/drm/tiny/st7586.c | 39 +- + drivers/gpu/drm/tiny/st7735r.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 227 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 131 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +- + drivers/gpu/drm/ttm/ttm_device.c | 26 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 3 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 3 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_modeset.c | 1 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 62 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 8 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 1 - + drivers/gpu/drm/vc4/Kconfig | 16 + + drivers/gpu/drm/vc4/Makefile | 7 + + drivers/gpu/drm/vc4/tests/.kunitconfig | 13 + + drivers/gpu/drm/vc4/tests/vc4_mock.c | 200 + + drivers/gpu/drm/vc4/tests/vc4_mock.h | 63 + + drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 41 + + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 138 + + drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 47 + + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 1039 +++ + drivers/gpu/drm/vc4/vc4_bo.c | 10 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 215 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 36 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 34 +- + drivers/gpu/drm/vc4/vc4_drv.c | 5 +- + drivers/gpu/drm/vc4/vc4_drv.h | 148 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 189 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 28 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 + + drivers/gpu/drm/vc4/vc4_hvs.c | 272 +- + drivers/gpu/drm/vc4/vc4_kms.c | 139 +- + drivers/gpu/drm/vc4/vc4_plane.c | 139 +- + drivers/gpu/drm/vc4/vc4_regs.h | 20 +- + drivers/gpu/drm/vc4/vc4_txp.c | 62 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 14 +- + drivers/gpu/drm/vc4/vc4_vec.c | 365 +- + drivers/gpu/drm/via/Makefile | 8 - + drivers/gpu/drm/via/via_3d_reg.h | 1771 ----- + drivers/gpu/drm/via/via_dri1.c | 3630 ---------- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 + + drivers/gpu/drm/virtio/virtgpu_trace.h | 26 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 13 +- + drivers/gpu/drm/vkms/vkms_drv.c | 27 +- + drivers/gpu/drm/vkms/vkms_drv.h | 4 +- + drivers/gpu/drm/vkms/vkms_plane.c | 36 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 10 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 - + drivers/gpu/host1x/cdma.c | 14 +- + drivers/gpu/host1x/cdma.h | 2 + + drivers/gpu/host1x/context.c | 8 +- + drivers/gpu/host1x/debug.c | 7 +- + drivers/gpu/host1x/dev.c | 4 +- + drivers/gpu/host1x/dev.h | 10 +- + drivers/gpu/host1x/fence.c | 118 +- + drivers/gpu/host1x/fence.h | 19 +- + drivers/gpu/host1x/hw/channel_hw.c | 60 +- + drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +- + drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 2 +- + drivers/gpu/host1x/hw/hw_host1x08_uclass.h | 2 +- + drivers/gpu/host1x/hw/intr_hw.c | 74 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 3 - + drivers/gpu/host1x/intr.c | 334 +- + drivers/gpu/host1x/intr.h | 83 +- + drivers/gpu/host1x/job.c | 12 +- + drivers/gpu/host1x/syncpt.c | 98 +- + drivers/gpu/host1x/syncpt.h | 3 +- + drivers/gpu/ipu-v3/ipu-common.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_hgo.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_pipe.c | 18 + + drivers/media/platform/renesas/vsp1/vsp1_regs.h | 26 +- + drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 64 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 4 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 6 + + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 1 - + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 213 - + drivers/video/fbdev/clps711x-fb.c | 10 +- + drivers/video/fbdev/core/fb_defio.c | 4 - + drivers/video/fbdev/core/fbcon.c | 41 +- + drivers/video/fbdev/core/fbmem.c | 33 - + drivers/video/fbdev/core/fbsysfs.c | 1 - + drivers/video/fbdev/efifb.c | 35 +- + drivers/video/fbdev/hyperv_fb.c | 17 +- + drivers/video/fbdev/offb.c | 33 +- + drivers/video/fbdev/simplefb.c | 19 +- + drivers/video/fbdev/vesafb.c | 37 +- + drivers/video/fbdev/vga16fb.c | 15 +- + include/drm/display/drm_dp.h | 15 +- + include/drm/drm_accel.h | 3 +- + include/drm/drm_atomic.h | 32 +- + include/drm/drm_atomic_state_helper.h | 4 + + include/drm/drm_audio_component.h | 3 + + include/drm/drm_bridge.h | 36 +- + include/drm/drm_bridge_connector.h | 2 - + include/drm/drm_client.h | 8 + + include/drm/drm_connector.h | 100 +- + include/drm/drm_crtc_helper.h | 16 +- + include/drm/drm_debugfs.h | 59 + + include/drm/drm_device.h | 32 +- + include/drm/drm_drv.h | 7 - + include/drm/drm_edid.h | 2 + + include/drm/drm_fb_helper.h | 21 +- + include/drm/drm_fixed.h | 1 + + include/drm/drm_format_helper.h | 16 +- + include/drm/drm_gem.h | 1 + + include/drm/drm_gem_atomic_helper.h | 2 - + include/drm/drm_gem_ttm_helper.h | 3 +- + include/drm/drm_gem_vram_helper.h | 4 +- + include/drm/drm_kunit_helpers.h | 91 + + include/drm/drm_mipi_dbi.h | 43 +- + include/drm/drm_mipi_dsi.h | 43 +- + include/drm/drm_mode_config.h | 12 +- + include/drm/drm_modes.h | 17 + + include/drm/drm_modeset_helper_vtables.h | 28 +- + include/drm/drm_panel.h | 10 + + include/drm/drm_pciids.h | 112 - + include/drm/drm_plane.h | 4 +- + include/drm/drm_print.h | 5 +- + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 4 +- + include/drm/gpu_scheduler.h | 8 +- + include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} | 370 +- + include/drm/ttm/ttm_bo_driver.h | 303 - + include/drm/ttm/ttm_device.h | 7 +- + include/drm/ttm/ttm_execbuf_util.h | 4 +- + include/linux/devfreq.h | 7 +- + include/linux/dma-buf.h | 4 +- + include/linux/fb.h | 23 - + include/linux/host1x.h | 10 +- + include/linux/platform_data/simplefb.h | 1 + + include/trace/events/habanalabs.h | 75 + + include/uapi/drm/amdgpu_drm.h | 12 +- + include/uapi/drm/drm_fourcc.h | 12 + + .../{misc/habanalabs.h => drm/habanalabs_accel.h} | 33 +- + include/uapi/drm/i810_drm.h | 292 - + include/uapi/drm/ivpu_accel.h | 306 + + include/uapi/drm/mga_drm.h | 429 -- + include/uapi/drm/msm_drm.h | 4 +- + include/uapi/drm/r128_drm.h | 336 - + include/uapi/drm/savage_drm.h | 220 - + include/uapi/drm/sis_drm.h | 77 - + include/uapi/drm/via_drm.h | 282 - + include/uapi/linux/media-bus-format.h | 5 +- + include/uapi/linux/videodev2.h | 11 + + samples/vfio-mdev/mdpy-fb.c | 8 - + 1699 files changed, 54411 insertions(+), 45142 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp5.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8350-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8450-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,a030jtn01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,vtdr6130.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/framebuffer.yaml + create mode 100644 drivers/accel/Makefile + rename drivers/{misc => accel}/habanalabs/Kconfig (81%) + rename drivers/{misc => accel}/habanalabs/Makefile (88%) + rename drivers/{misc => accel}/habanalabs/common/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/asid.c (100%) + rename drivers/{misc => accel}/habanalabs/common/command_buffer.c (95%) + rename drivers/{misc => accel}/habanalabs/common/command_submission.c (96%) + rename drivers/{misc => accel}/habanalabs/common/context.c (100%) + rename drivers/{misc => accel}/habanalabs/common/debugfs.c (100%) + rename drivers/{misc => accel}/habanalabs/common/decoder.c (100%) + rename drivers/{misc => accel}/habanalabs/common/device.c (95%) + rename drivers/{misc => accel}/habanalabs/common/firmware_if.c (93%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs.h (97%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_drv.c (98%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_ioctl.c (93%) + rename drivers/{misc => accel}/habanalabs/common/hw_queue.c (100%) + rename drivers/{misc => accel}/habanalabs/common/hwmon.c (100%) + rename drivers/{misc => accel}/habanalabs/common/irq.c (94%) + rename drivers/{misc => accel}/habanalabs/common/memory.c (92%) + rename drivers/{misc => accel}/habanalabs/common/memory_mgr.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v1.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v2_hr.c (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/pci.c (97%) + rename drivers/{misc => accel}/habanalabs/common/security.c (76%) + create mode 100644 drivers/accel/habanalabs/common/security.h + rename drivers/{misc => accel}/habanalabs/common/state_dump.c (99%) + rename drivers/{misc => accel}/habanalabs/common/sysfs.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_security.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c (92%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2P.h (95%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_security.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goyaP.h (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_hwmgr.c (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya_security.c (100%) + rename drivers/{misc => accel}/habanalabs/include/common/cpucp_if.h (94%) + rename drivers/{misc => accel}/habanalabs/include/common/hl_boot_if.h (83%) + rename drivers/{misc => accel}/habanalabs/include/common/qman_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme1_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme3_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mmu_up_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_ids_map_extended.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_reg_map.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h (97%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_acc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_base_addr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h (98%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_a_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_b_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_busmon_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_blocks_linux_driver.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qpc0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_completion_queue_ci_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dbi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_special_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_pif_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_desc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_edge_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_mid_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_events.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_ids_map_extended.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_fw_if.h (82%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_packets.h (98%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_reg_map.h (83%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/gaudi2_special_blocks.h + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/ic_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_spi_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_reg_map.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_general.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_1.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v2_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/pci/pci_general.h (100%) + create mode 100644 drivers/accel/ivpu/Kconfig + create mode 100644 drivers/accel/ivpu/Makefile + create mode 100644 drivers/accel/ivpu/TODO + create mode 100644 drivers/accel/ivpu/ivpu_drv.c + create mode 100644 drivers/accel/ivpu/ivpu_drv.h + create mode 100644 drivers/accel/ivpu/ivpu_fw.c + create mode 100644 drivers/accel/ivpu/ivpu_fw.h + create mode 100644 drivers/accel/ivpu/ivpu_gem.c + create mode 100644 drivers/accel/ivpu/ivpu_gem.h + create mode 100644 drivers/accel/ivpu/ivpu_hw.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_mtl.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_mtl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_reg_io.h + create mode 100644 drivers/accel/ivpu/ivpu_ipc.c + create mode 100644 drivers/accel/ivpu/ivpu_ipc.h + create mode 100644 drivers/accel/ivpu/ivpu_job.c + create mode 100644 drivers/accel/ivpu/ivpu_job.h + create mode 100644 drivers/accel/ivpu/ivpu_jsm_msg.c + create mode 100644 drivers/accel/ivpu/ivpu_jsm_msg.h + create mode 100644 drivers/accel/ivpu/ivpu_mmu.c + create mode 100644 drivers/accel/ivpu/ivpu_mmu.h + create mode 100644 drivers/accel/ivpu/ivpu_mmu_context.c + create mode 100644 drivers/accel/ivpu/ivpu_mmu_context.h + create mode 100644 drivers/accel/ivpu/ivpu_pm.c + create mode 100644 drivers/accel/ivpu/ivpu_pm.h + create mode 100644 drivers/accel/ivpu/vpu_boot_api.h + create mode 100644 drivers/accel/ivpu/vpu_jsm_api.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.h + rename drivers/gpu/drm/amd/display/dc/link/{ => accessories}/link_dp_trace.c (95%) + rename drivers/gpu/drm/amd/display/dc/link/{ => accessories}/link_dp_trace.h (91%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dio.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dio.h (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dpia.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dpia.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_hpo_dp.c (86%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_hpo_dp.h (98%) + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_ddc.c => link/protocols/link_ddc.c} (57%) + rename drivers/gpu/drm/amd/display/{include/i2caux_interface.h => dc/link/protocols/link_ddc.h} (52%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia.c + rename drivers/gpu/drm/{tdfx/tdfx_drv.h => amd/display/dc/link/protocols/link_dp_dpia.h} (52%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia_bw.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia_bw.h (65%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c + rename drivers/gpu/drm/amd/display/dc/link/{link_hwss_hpo_frl.h => protocols/link_dp_irq_handler.h} (80%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_128b_132b.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_128b_132b.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_auxless.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_auxless.h + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_dpia.c => link/protocols/link_dp_training_dpia.c} (82%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.h + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_dpcd.c => link/protocols/link_dpcd.c} (97%) + rename drivers/gpu/drm/amd/display/dc/{inc => link/protocols}/link_dpcd.h (95%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_hpd.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_hpd.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_6_1_0_sh_mask.h + rename drivers/gpu/drm/bridge/{cdns-dsi.c => cadence/cdns-dsi-core.c} (97%) + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.c + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.h + delete mode 100644 drivers/gpu/drm/i810/Makefile + delete mode 100644 drivers/gpu/drm/i810/i810_dma.c + delete mode 100644 drivers/gpu/drm/i810/i810_drv.c + delete mode 100644 drivers/gpu/drm/i810/i810_drv.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_limits.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dvo_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vblank.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vblank.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_print.h + create mode 100644 drivers/gpu/drm/i915/i915_config.h + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.h (100%) + create mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.c + create mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.h (100%) + create mode 100644 drivers/gpu/drm/imx/ipuv3/Kconfig + create mode 100644 drivers/gpu/drm/imx/ipuv3/Makefile + rename drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c (100%) + delete mode 100644 drivers/gpu/drm/mga/Makefile + delete mode 100644 drivers/gpu/drm/mga/mga_dma.c + delete mode 100644 drivers/gpu/drm/mga/mga_drv.c + delete mode 100644 drivers/gpu/drm/mga/mga_drv.h + delete mode 100644 drivers/gpu/drm/mga/mga_ioc32.c + delete mode 100644 drivers/gpu/drm/mga/mga_irq.c + delete mode 100644 drivers/gpu/drm/mga/mga_state.c + delete mode 100644 drivers/gpu/drm/mga/mga_warp.c + create mode 100644 drivers/gpu/drm/panel/panel-auo-a030jtn01.c + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx8394.c + create mode 100644 drivers/gpu/drm/panel/panel-orisetech-ota5601a.c + create mode 100644 drivers/gpu/drm/panel/panel-visionox-vtdr6130.c + delete mode 100644 drivers/gpu/drm/r128/Makefile + delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.c + delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.h + delete mode 100644 drivers/gpu/drm/r128/r128_cce.c + delete mode 100644 drivers/gpu/drm/r128/r128_drv.c + delete mode 100644 drivers/gpu/drm/r128/r128_drv.h + delete mode 100644 drivers/gpu/drm/r128/r128_ioc32.c + delete mode 100644 drivers/gpu/drm/r128/r128_irq.c + delete mode 100644 drivers/gpu/drm/r128/r128_state.c + delete mode 100644 drivers/gpu/drm/savage/Makefile + delete mode 100644 drivers/gpu/drm/savage/savage_bci.c + delete mode 100644 drivers/gpu/drm/savage/savage_drv.c + delete mode 100644 drivers/gpu/drm/savage/savage_drv.h + delete mode 100644 drivers/gpu/drm/savage/savage_state.c + delete mode 100644 drivers/gpu/drm/sis/Makefile + delete mode 100644 drivers/gpu/drm/sis/sis_drv.c + delete mode 100644 drivers/gpu/drm/sis/sis_drv.h + delete mode 100644 drivers/gpu/drm/sis/sis_mm.c + delete mode 100644 drivers/gpu/drm/tdfx/Makefile + delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.c + create mode 100644 drivers/gpu/drm/tests/drm_connector_test.c + delete mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/tests/drm_managed_test.c + create mode 100644 drivers/gpu/drm/tests/drm_modes_test.c + create mode 100644 drivers/gpu/drm/tests/drm_probe_helper_test.c + create mode 100644 drivers/gpu/drm/vc4/tests/.kunitconfig + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.h + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_output.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c + delete mode 100644 drivers/gpu/drm/via/Makefile + delete mode 100644 drivers/gpu/drm/via/via_3d_reg.h + delete mode 100644 drivers/gpu/drm/via/via_dri1.c + delete mode 100644 drivers/misc/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + create mode 100644 include/drm/drm_kunit_helpers.h + rename include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} (66%) + delete mode 100644 include/drm/ttm/ttm_bo_driver.h + rename include/uapi/{misc/habanalabs.h => drm/habanalabs_accel.h} (98%) + delete mode 100644 include/uapi/drm/i810_drm.h + create mode 100644 include/uapi/drm/ivpu_accel.h + delete mode 100644 include/uapi/drm/mga_drm.h + delete mode 100644 include/uapi/drm/r128_drm.h + delete mode 100644 include/uapi/drm/savage_drm.h + delete mode 100644 include/uapi/drm/sis_drm.h + delete mode 100644 include/uapi/drm/via_drm.h +Merging drm-misc/for-linux-next (fb073aa27a7e dma-buf: make kobj_type structure constant) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Merge made by the 'ort' strategy. + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 59 ++++++++++++----- + drivers/gpu/drm/drm_gem_shmem_helper.c | 54 ++++++++++------ + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++ + drivers/gpu/drm/i915/display/intel_display.c | 4 ++ + drivers/gpu/drm/i915/display/intel_dp_mst.c | 75 ++++++++++++++++++++-- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 4 ++ + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + include/drm/display/drm_dp_mst_helper.h | 6 +- + 10 files changed, 170 insertions(+), 44 deletions(-) +Merging amdgpu/drm-next (80c6d6804f31 drm/amd/display: disable SubVP + DRR to prevent underflow) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/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/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 303 ++ + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.h | 32 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 14 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 109 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 7 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 76 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 1 + + drivers/gpu/drm/amd/display/dc/Makefile | 4 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 31 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 37 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4871 +------------------- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 103 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 219 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 136 + + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 20 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 125 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 109 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 12 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 3 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 16 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 42 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 18 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 8 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 24 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 61 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.h | 4 + + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 2 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 8 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 12 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 4 + + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 7 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 4 + + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 36 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 21 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 3 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 31 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 5 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 48 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 9 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 45 +- + .../display/dc/link/accessories/link_dp_trace.c | 10 +- + .../display/dc/link/accessories/link_dp_trace.h | 1 + + .../amd/display/dc/link/accessories/link_fpga.c | 95 + + .../amd/display/dc/link/accessories/link_fpga.h | 30 + + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 16 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 1323 ++++++ + .../gpu/drm/amd/display/dc/link/link_detection.h | 30 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 2528 ++++++++++ + drivers/gpu/drm/amd/display/dc/link/link_dpms.h | 40 + + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 577 +++ + drivers/gpu/drm/amd/display/dc/link/link_factory.h | 29 + + .../gpu/drm/amd/display/dc/link/link_resource.c | 114 + + .../gpu/drm/amd/display/dc/link/link_resource.h | 31 + + .../gpu/drm/amd/display/dc/link/link_validation.c | 398 ++ + .../gpu/drm/amd/display/dc/link/link_validation.h | 28 + + .../display/dc/link/protocols/link_dp_capability.c | 74 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 1 + + .../display/dc/link/protocols/link_dp_dpia_bw.c | 413 ++ + .../display/dc/link/protocols/link_dp_dpia_bw.h | 29 - + .../dc/link/protocols/link_dp_irq_handler.c | 54 +- + .../dc/link/protocols/link_dp_irq_handler.h | 4 - + .../amd/display/dc/link/protocols/link_dp_phy.c | 94 +- + .../amd/display/dc/link/protocols/link_dp_phy.h | 8 +- + .../display/dc/link/protocols/link_dp_training.c | 3 +- + .../dc/link/protocols/link_dp_training_dpia.c | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 27 + + .../drm/amd/display/modules/color/color_gamma.c | 140 +- + .../drm/amd/display/modules/color/color_gamma.h | 3 - + .../drm/amd/display/modules/freesync/freesync.c | 12 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 18 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 14 +- + .../gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h | 2 + + .../gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h | 2 + + .../amd/pm/powerplay/inc/vega12/smu9_driver_if.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + + .../swsmu/inc/pmfw_if/smu11_driver_if_arcturus.h | 2 + + .../pm/swsmu/inc/pmfw_if/smu11_driver_if_navi10.h | 2 + + .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 2 + + .../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 2 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 2 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 6 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 27 + + 137 files changed, 7418 insertions(+), 5682 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_fpga.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_fpga.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_detection.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_detection.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dpms.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dpms.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_validation.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_validation.h +Merging drm-intel/for-linux-next (8038510b1fe4 drm/i915: Fix system suspend without fbdev being initialized) +$ 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_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/icl_dsi.c | 3 ++- + drivers/gpu/drm/i915/display/intel_backlight.c | 34 +++++++++++++++++++++++--- + drivers/gpu/drm/i915/display/intel_bios.c | 16 +++++++++--- + drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +++++- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 9 +++---- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 +++++++++++------- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 5 ++-- + drivers/gpu/drm/i915/i915_scatterlist.c | 8 ++++-- + drivers/gpu/drm/i915/intel_pm.c | 10 ++++---- + 9 files changed, 84 insertions(+), 33 deletions(-) +Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Merge made by the 'ort' strategy. + drivers/gpu/host1x/dev.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging drm-msm/msm-next (dbd7a2a941b8 PM / devfreq: Fix build issues with devfreq disabled) +$ 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 (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging 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 (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (40f4b0586810 Merge remote-tracking branch 'regmap/for-6.3' 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/regmap-irq.c | 25 ++----------------------- + include/linux/regmap.h | 11 ++--------- + 2 files changed, 4 insertions(+), 32 deletions(-) +Merging sound/for-next (7933b90b4289 Merge branch 'for-linus' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/sound/hd-audio/notes.rst +Auto-merging MAINTAINERS +CONFLICT (modify/delete): sound/soc/cirrus/ep93xx-ac97.c deleted in HEAD and modified in sound/for-next. Version sound/for-next of sound/soc/cirrus/ep93xx-ac97.c left in tree. +Auto-merging sound/soc/pxa/Kconfig +CONFLICT (modify/delete): sound/soc/pxa/e740_wm9705.c deleted in HEAD and modified in sound/for-next. Version sound/for-next of sound/soc/pxa/e740_wm9705.c left in tree. +CONFLICT (modify/delete): sound/soc/pxa/e750_wm9705.c deleted in HEAD and modified in sound/for-next. Version sound/for-next of sound/soc/pxa/e750_wm9705.c left in tree. +CONFLICT (modify/delete): sound/soc/pxa/e800_wm9712.c deleted in HEAD and modified in sound/for-next. Version sound/for-next of sound/soc/pxa/e800_wm9712.c left in tree. +Auto-merging sound/soc/sof/intel/hda-dai.c +CONFLICT (modify/delete): sound/soc/ti/davinci-vcif.c deleted in HEAD and modified in sound/for-next. Version sound/for-next of sound/soc/ti/davinci-vcif.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f sound/soc/cirrus/ep93xx-ac97.c sound/soc/pxa/e740_wm9705.c sound/soc/pxa/e750_wm9705.c sound/soc/pxa/e800_wm9712.c sound/soc/ti/davinci-vcif.c +rm 'sound/soc/cirrus/ep93xx-ac97.c' +rm 'sound/soc/pxa/e740_wm9705.c' +rm 'sound/soc/pxa/e750_wm9705.c' +rm 'sound/soc/pxa/e800_wm9712.c' +rm 'sound/soc/ti/davinci-vcif.c' +$ git commit --no-edit -v -a +[master d41bdfeb9c3c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/dsp/mediatek,mt8186-dsp.yaml | 4 +- + .../devicetree/bindings/sound/adi,adau7002.txt | 19 - + .../devicetree/bindings/sound/adi,adau7002.yaml | 40 + + .../devicetree/bindings/sound/ak4613.yaml | 7 + + .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 34 - + .../bindings/sound/amlogic,axg-fifo.yaml | 112 + + .../devicetree/bindings/sound/amlogic,axg-pdm.txt | 29 - + .../devicetree/bindings/sound/amlogic,axg-pdm.yaml | 82 + + .../bindings/sound/amlogic,axg-sound-card.txt | 124 - + .../bindings/sound/amlogic,axg-sound-card.yaml | 183 ++ + .../bindings/sound/amlogic,axg-spdifin.txt | 27 - + .../bindings/sound/amlogic,axg-spdifin.yaml | 86 + + .../bindings/sound/amlogic,axg-spdifout.txt | 25 - + .../bindings/sound/amlogic,axg-spdifout.yaml | 79 + + .../bindings/sound/amlogic,axg-tdm-formatters.txt | 36 - + .../bindings/sound/amlogic,axg-tdm-formatters.yaml | 88 + + .../bindings/sound/amlogic,axg-tdm-iface.txt | 22 - + .../bindings/sound/amlogic,axg-tdm-iface.yaml | 55 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 2 +- + .../bindings/sound/audio-graph-port.yaml | 65 +- + .../devicetree/bindings/sound/awinic,aw88395.yaml | 53 + + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 43 +- + .../bindings/sound/component-common.yaml | 21 + + .../devicetree/bindings/sound/dai-common.yaml | 11 +- + .../devicetree/bindings/sound/fsl,sai.yaml | 38 +- + .../devicetree/bindings/sound/fsl,xcvr.yaml | 1 + + .../bindings/sound/google,sc7280-herobrine.yaml | 12 + + .../bindings/sound/infineon,peb2466.yaml | 91 + + .../bindings/sound/irondevice,sma1303.yaml | 48 + + .../devicetree/bindings/sound/max98090.txt | 59 - + .../devicetree/bindings/sound/max98095.txt | 22 - + .../devicetree/bindings/sound/maxim,max98090.yaml | 84 + + .../devicetree/bindings/sound/maxim,max98095.yaml | 54 + + .../bindings/sound/mediatek,mt8188-afe.yaml | 208 ++ + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 97 + + ...,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} | 2 +- + ...ochip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 2 +- + ...spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} | 2 +- + ...spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} | 2 +- + .../devicetree/bindings/sound/nau8822.txt | 16 - + .../devicetree/bindings/sound/nuvoton,nau8822.yaml | 46 + + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 136 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 4 +- + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 3 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 24 +- + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 62 +- + .../devicetree/bindings/sound/qcom,wsa881x.yaml | 5 +- + .../bindings/sound/renesas,idt821034.yaml | 75 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 59 +- + Documentation/devicetree/bindings/sound/rt5640.txt | 3 + + .../devicetree/bindings/sound/samsung,odroid.yaml | 3 +- + .../devicetree/bindings/sound/samsung-i2s.yaml | 11 +- + .../devicetree/bindings/sound/simple-card.yaml | 18 +- + .../devicetree/bindings/sound/tas5720.txt | 2 + + .../devicetree/bindings/sound/ti,pcm3168a.txt | 56 - + .../devicetree/bindings/sound/ti,pcm3168a.yaml | 107 + + .../devicetree/bindings/sound/ti,tlv320aic3x.yaml | 165 + + .../devicetree/bindings/sound/tlv320aic3x.txt | 97 - + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/sound/alsa-configuration.rst | 8 +- + Documentation/sound/cards/audigy-mixer.rst | 2 +- + Documentation/sound/cards/maya44.rst | 2 +- + Documentation/sound/cards/sb-live-mixer.rst | 2 +- + Documentation/sound/designs/jack-controls.rst | 2 +- + Documentation/sound/designs/seq-oss.rst | 2 +- + Documentation/sound/hd-audio/notes.rst | 2 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 10 +- + MAINTAINERS | 21 + + drivers/firewire/core-cdev.c | 43 +- + drivers/firewire/core-transaction.c | 53 +- + drivers/firewire/core.h | 9 + + drivers/mfd/wm97xx-core.c | 4 +- + drivers/soundwire/stream.c | 4 +- + include/linux/firewire.h | 5 +- + include/linux/platform_data/asoc-ux500-msp.h | 20 - + include/linux/soundwire/sdw.h | 8 +- + include/sound/ac97/codec.h | 2 +- + include/sound/acp63_chip_offset_byte.h | 751 ++--- + include/sound/core.h | 6 +- + include/sound/cs42l42.h | 5 + + include/sound/hda_codec.h | 1 + + include/sound/hdaudio.h | 2 +- + include/sound/simple_card_utils.h | 3 + + include/sound/soc-component.h | 2 + + include/sound/soc-dai.h | 90 +- + include/sound/soc-dapm.h | 1 + + include/sound/soc-dpcm.h | 2 + + include/sound/soc-topology.h | 2 +- + include/sound/soc.h | 6 + + include/sound/sof/ipc4/header.h | 3 + + include/uapi/sound/firewire.h | 26 + + include/uapi/sound/intel/avs/tokens.h | 4 + + sound/ac97/bus.c | 5 +- + sound/aoa/fabrics/layout.c | 3 +- + sound/aoa/soundbus/soundbus.h | 2 +- + sound/core/init.c | 40 +- + sound/firewire/amdtp-am824.c | 60 +- + sound/firewire/amdtp-stream-trace.h | 9 +- + sound/firewire/amdtp-stream.c | 310 +- + sound/firewire/amdtp-stream.h | 34 +- + sound/firewire/digi00x/amdtp-dot.c | 28 +- + sound/firewire/fireface/amdtp-ff.c | 28 +- + sound/firewire/fireface/ff-hwdep.c | 41 +- + sound/firewire/fireface/ff-protocol-former.c | 192 +- + sound/firewire/fireface/ff-protocol-latter.c | 6 +- + sound/firewire/fireface/ff-transaction.c | 17 +- + sound/firewire/fireface/ff.c | 10 + + sound/firewire/fireface/ff.h | 9 +- + sound/firewire/motu/amdtp-motu.c | 58 +- + .../motu/motu-command-dsp-message-parser.c | 11 +- + .../motu/motu-register-dsp-message-parser.c | 11 +- + sound/firewire/motu/motu.h | 8 +- + sound/firewire/tascam/amdtp-tascam.c | 28 +- + sound/hda/hdac_stream.c | 7 +- + sound/hda/hdac_sysfs.c | 2 +- + sound/pci/hda/Kconfig | 14 + + sound/pci/hda/cs35l41_hda.c | 109 +- + sound/pci/hda/hda_codec.c | 13 +- + sound/pci/hda/hda_controller.c | 3 +- + sound/pci/hda/hda_controller.h | 1 + + sound/pci/hda/hda_cs_dsp_ctl.c | 4 +- + sound/pci/hda/hda_intel.c | 8 +- + sound/pci/hda/hda_tegra.c | 6 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/ppc/snd_ps3.c | 5 +- + sound/soc/amd/acp/acp-legacy-mach.c | 13 + + sound/soc/amd/acp/acp-mach-common.c | 465 ++- + sound/soc/amd/acp/acp-mach.h | 4 + + sound/soc/amd/acp/acp-sof-mach.c | 14 + + sound/soc/amd/ps/acp63.h | 14 +- + sound/soc/amd/ps/pci-ps.c | 211 +- + sound/soc/amd/ps/ps-pdm-dma.c | 40 +- + sound/soc/amd/raven/acp3x-i2s.c | 8 - + sound/soc/amd/renoir/acp3x-pdm-dma.c | 8 +- + sound/soc/amd/renoir/rn_acp3x.h | 2 +- + sound/soc/amd/yc/acp6x-pdm-dma.c | 8 +- + sound/soc/amd/yc/acp6x.h | 2 +- + sound/soc/atmel/atmel-classd.c | 6 - + sound/soc/atmel/atmel-pdmic.c | 6 - + sound/soc/atmel/mchp-pdmc.c | 145 +- + sound/soc/atmel/mchp-spdifrx.c | 554 +++- + sound/soc/atmel/mchp-spdiftx.c | 8 +- + sound/soc/cirrus/ep93xx-i2s.c | 6 +- + sound/soc/codecs/88pm860x-codec.c | 6 - + sound/soc/codecs/Kconfig | 69 +- + sound/soc/codecs/Makefile | 19 +- + sound/soc/codecs/ac97.c | 6 - + sound/soc/codecs/adau7002.c | 6 - + sound/soc/codecs/aw88395/aw88395.c | 579 ++++ + sound/soc/codecs/aw88395/aw88395.h | 58 + + sound/soc/codecs/aw88395/aw88395_data_type.h | 142 + + sound/soc/codecs/aw88395/aw88395_device.c | 1748 ++++++++++ + sound/soc/codecs/aw88395/aw88395_device.h | 194 ++ + sound/soc/codecs/aw88395/aw88395_lib.c | 1066 +++++++ + sound/soc/codecs/aw88395/aw88395_lib.h | 92 + + sound/soc/codecs/aw88395/aw88395_reg.h | 383 +++ + sound/soc/codecs/bt-sco.c | 6 - + sound/soc/codecs/cq93vc.c | 6 - + sound/soc/codecs/cs35l45-i2c.c | 1 - + sound/soc/codecs/cs35l45-spi.c | 1 - + sound/soc/codecs/cs35l45-tables.c | 12 +- + sound/soc/codecs/cs35l45.c | 1 - + sound/soc/codecs/cs42l42-sdw.c | 607 ++++ + sound/soc/codecs/cs42l42.c | 133 +- + sound/soc/codecs/cs42l42.h | 9 +- + sound/soc/codecs/da7213.c | 30 +- + sound/soc/codecs/da7213.h | 3 + + sound/soc/codecs/hda.c | 7 +- + sound/soc/codecs/hdmi-codec.c | 11 +- + sound/soc/codecs/idt821034.c | 1178 +++++++ + sound/soc/codecs/jz4760.c | 9 + + sound/soc/codecs/lpass-rx-macro.c | 31 +- + sound/soc/codecs/lpass-tx-macro.c | 25 +- + sound/soc/codecs/lpass-va-macro.c | 43 +- + sound/soc/codecs/lpass-wsa-macro.c | 27 +- + sound/soc/codecs/max98090.c | 8 +- + sound/soc/codecs/max98373-sdw.c | 5 +- + sound/soc/codecs/mc13783.c | 6 - + sound/soc/codecs/nau8822.c | 9 + + sound/soc/codecs/nau8822.h | 9 + + sound/soc/codecs/peb2466.c | 2071 ++++++++++++ + sound/soc/codecs/rt1308-sdw.c | 5 +- + sound/soc/codecs/rt1316-sdw.c | 7 +- + sound/soc/codecs/rt1318-sdw.c | 7 +- + sound/soc/codecs/rt5640.c | 9 + + sound/soc/codecs/rt5640.h | 2 + + sound/soc/codecs/rt5645.c | 2 +- + sound/soc/codecs/rt5665.c | 4 +- + sound/soc/codecs/rt5668.c | 4 +- + sound/soc/codecs/rt5682-sdw.c | 5 +- + sound/soc/codecs/rt5682.c | 4 +- + sound/soc/codecs/rt5682s.c | 14 +- + sound/soc/codecs/rt5682s.h | 1 + + sound/soc/codecs/rt700.c | 7 +- + sound/soc/codecs/rt711-sdca-sdw.c | 2 +- + sound/soc/codecs/rt711-sdca.c | 22 +- + sound/soc/codecs/rt711-sdca.h | 8 +- + sound/soc/codecs/rt711.c | 7 +- + sound/soc/codecs/rt712-sdca-sdw.c | 485 +++ + sound/soc/codecs/rt712-sdca-sdw.h | 108 + + sound/soc/codecs/rt712-sdca.c | 1340 ++++++++ + sound/soc/codecs/rt712-sdca.h | 220 ++ + sound/soc/codecs/rt715-sdca-sdw.c | 2 +- + sound/soc/codecs/rt715-sdca.c | 5 +- + sound/soc/codecs/rt715.c | 5 +- + sound/soc/codecs/sdw-mockup.c | 5 +- + sound/soc/codecs/sma1303.c | 1820 +++++++++++ + sound/soc/codecs/sma1303.h | 609 ++++ + sound/soc/codecs/tas5720.c | 128 +- + sound/soc/codecs/tas5720.h | 16 +- + sound/soc/codecs/tlv320adcx140.c | 2 +- + sound/soc/codecs/tlv320adcx140.h | 4 +- + sound/soc/codecs/ts3a227e.c | 20 +- + sound/soc/codecs/wcd934x.c | 10 +- + sound/soc/codecs/wcd938x-sdw.c | 2 +- + sound/soc/codecs/wl1273.c | 6 - + sound/soc/codecs/wm8940.c | 116 +- + sound/soc/codecs/wm8940.h | 3 + + sound/soc/codecs/wsa881x.c | 63 +- + sound/soc/codecs/wsa883x.c | 22 +- + sound/soc/fsl/fsl-asoc-card.c | 4 +- + sound/soc/fsl/fsl_sai.c | 6 +- + sound/soc/fsl/fsl_xcvr.c | 155 +- + sound/soc/fsl/fsl_xcvr.h | 7 + + sound/soc/fsl/imx-hdmi.c | 2 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 6 +- + sound/soc/generic/simple-card-utils.c | 49 + + sound/soc/generic/simple-card.c | 4 + + sound/soc/intel/atom/sst-atom-controls.c | 9 +- + sound/soc/intel/avs/Makefile | 2 +- + sound/soc/intel/avs/boards/nau8825.c | 5 +- + sound/soc/intel/avs/boards/rt286.c | 2 +- + sound/soc/intel/avs/boards/rt298.c | 2 +- + sound/soc/intel/avs/control.c | 105 + + sound/soc/intel/avs/control.h | 23 + + sound/soc/intel/avs/messages.c | 29 + + sound/soc/intel/avs/messages.h | 33 + + sound/soc/intel/avs/path.c | 62 + + sound/soc/intel/avs/pcm.c | 47 +- + sound/soc/intel/avs/probes.c | 25 +- + sound/soc/intel/avs/topology.c | 76 + + sound/soc/intel/avs/topology.h | 3 + + sound/soc/intel/avs/trace.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_da7213.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/sof_ssp_amp.c | 4 - + sound/soc/intel/boards/sof_wm8804.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 19 +- + sound/soc/intel/skylake/skl-topology.h | 5 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/mediatek/Kconfig | 23 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/Makefile | 2 +- + sound/soc/mediatek/common/mtk-base-afe.h | 19 + + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 18 +- + sound/soc/mediatek/common/mtk-soundcard-driver.c | 79 + + sound/soc/mediatek/common/mtk-soundcard-driver.h | 14 + + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 7 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 1 + + sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 7 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- + sound/soc/mediatek/mt8188/Makefile | 15 + + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 658 ++++ + sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 115 + + sound/soc/mediatek/mt8188/mt8188-afe-common.h | 151 + + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 3358 ++++++++++++++++++++ + sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 205 ++ + sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 15 + + sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h | 83 + + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 632 ++++ + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 2573 +++++++++++++++ + sound/soc/mediatek/mt8188/mt8188-dai-pcm.c | 368 +++ + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 785 +++++ + sound/soc/mediatek/mt8188/mt8188-reg.h | 3180 ++++++++++++++++++ + sound/soc/mediatek/mt8192/mt8192-dai-pcm.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 7 +- + sound/soc/meson/aiu-fifo-i2s.c | 4 +- + sound/soc/meson/aiu-fifo-spdif.c | 2 +- + sound/soc/meson/aiu-fifo.c | 21 +- + sound/soc/meson/axg-tdm-interface.c | 34 +- + sound/soc/meson/axg-tdmin.c | 2 +- + sound/soc/meson/axg-tdmout.c | 2 +- + sound/soc/meson/meson-codec-glue.c | 8 +- + sound/soc/pxa/Kconfig | 5 +- + sound/soc/pxa/spitz.c | 6 - + sound/soc/qcom/apq8096.c | 1 + + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 22 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 5 + + sound/soc/qcom/qdsp6/q6apm.c | 14 + + sound/soc/qcom/qdsp6/q6apm.h | 2 + + sound/soc/qcom/qdsp6/q6prm.c | 4 + + sound/soc/qcom/sdm845.c | 1 + + sound/soc/rockchip/Kconfig | 2 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/samsung/i2s-regs.h | 1 + + sound/soc/samsung/i2s.c | 53 + + sound/soc/sh/rcar/adg.c | 169 +- + sound/soc/sh/rcar/core.c | 73 +- + sound/soc/sh/rcar/dma.c | 57 +- + sound/soc/sh/rcar/gen.c | 70 + + sound/soc/sh/rcar/rsnd.h | 23 +- + sound/soc/sh/rcar/ssi.c | 13 +- + sound/soc/sh/rcar/ssiu.c | 15 +- + sound/soc/soc-ac97.c | 68 +- + sound/soc/soc-component.c | 20 + + sound/soc/soc-compress.c | 11 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 13 +- + sound/soc/soc-dapm.c | 26 +- + sound/soc/soc-pcm.c | 15 +- + sound/soc/soc-topology.c | 187 +- + sound/soc/sof/amd/acp-dsp-offset.h | 4 + + sound/soc/sof/amd/acp-ipc.c | 8 +- + sound/soc/sof/amd/acp-loader.c | 7 + + sound/soc/sof/amd/acp.h | 7 +- + sound/soc/sof/compress.c | 9 + + sound/soc/sof/control.c | 44 +- + sound/soc/sof/core.c | 4 + + sound/soc/sof/intel/Kconfig | 4 +- + sound/soc/sof/intel/cnl.c | 2 + + sound/soc/sof/intel/hda-dai.c | 92 +- + sound/soc/sof/intel/hda-dsp.c | 46 +- + sound/soc/sof/intel/hda-ipc.c | 36 +- + sound/soc/sof/intel/hda.h | 6 +- + sound/soc/sof/intel/mtl.c | 16 + + sound/soc/sof/intel/mtl.h | 6 + + sound/soc/sof/ipc3-control.c | 46 +- + sound/soc/sof/ipc3-pcm.c | 3 +- + sound/soc/sof/ipc3-topology.c | 39 +- + sound/soc/sof/ipc3.c | 22 +- + sound/soc/sof/ipc4-control.c | 33 +- + sound/soc/sof/ipc4-fw-reg.h | 155 + + sound/soc/sof/ipc4-pcm.c | 573 +++- + sound/soc/sof/ipc4-priv.h | 17 + + sound/soc/sof/ipc4-topology.c | 212 +- + sound/soc/sof/ipc4-topology.h | 60 + + sound/soc/sof/ipc4.c | 29 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 22 +- + sound/soc/sof/mediatek/mt8186/mt8186.h | 10 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 8 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 2 - + sound/soc/sof/nocodec.c | 6 - + sound/soc/sof/ops.h | 18 +- + sound/soc/sof/pcm.c | 36 +- + sound/soc/sof/pm.c | 12 +- + sound/soc/sof/sof-audio.c | 281 +- + sound/soc/sof/sof-audio.h | 67 +- + sound/soc/sof/sof-priv.h | 30 +- + sound/soc/sof/stream-ipc.c | 53 +- + sound/soc/sof/topology.c | 309 +- + sound/soc/sof/trace.c | 8 +- + sound/soc/spear/spdif_out.c | 3 +- + sound/soc/tegra/Kconfig | 4 +- + sound/soc/tegra/tegra20_ac97.c | 4 +- + sound/soc/tegra/tegra20_i2s.c | 4 +- + sound/soc/tegra/tegra20_spdif.c | 3 +- + sound/soc/tegra/tegra210_admaif.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + sound/soc/ti/davinci-i2s.c | 5 +- + sound/soc/ti/davinci-mcasp.c | 5 +- + sound/soc/ux500/mop500.c | 8 +- + sound/soc/ux500/ux500_msp_dai.c | 37 +- + sound/soc/ux500/ux500_msp_i2s.c | 66 +- + sound/soc/ux500/ux500_msp_i2s.h | 14 +- + sound/soc/ux500/ux500_pcm.c | 83 +- + tools/testing/selftests/alsa/Makefile | 4 +- + tools/testing/selftests/alsa/alsa-local.h | 3 + + tools/testing/selftests/alsa/conf.c | 26 +- + .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 43 +- + tools/testing/selftests/alsa/pcm-test.c | 269 +- + tools/testing/selftests/alsa/pcm-test.conf | 63 + + 379 files changed, 33352 insertions(+), 3928 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-fifo.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-pdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifin.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifin.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-iface.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-iface.yaml + create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw88395.yaml + create mode 100644 Documentation/devicetree/bindings/sound/component-common.yaml + create mode 100644 Documentation/devicetree/bindings/sound/infineon,peb2466.yaml + create mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/max98090.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max98095.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98090.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98095.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml + rename Documentation/devicetree/bindings/sound/{mchp,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (95%) + rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (95%) + delete mode 100644 Documentation/devicetree/bindings/sound/nau8822.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8822.yaml + create mode 100644 Documentation/devicetree/bindings/sound/renesas,idt821034.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt + delete mode 100644 include/linux/platform_data/asoc-ux500-msp.h + create mode 100644 sound/soc/codecs/aw88395/aw88395.c + create mode 100644 sound/soc/codecs/aw88395/aw88395.h + create mode 100644 sound/soc/codecs/aw88395/aw88395_data_type.h + create mode 100644 sound/soc/codecs/aw88395/aw88395_device.c + create mode 100644 sound/soc/codecs/aw88395/aw88395_device.h + create mode 100644 sound/soc/codecs/aw88395/aw88395_lib.c + create mode 100644 sound/soc/codecs/aw88395/aw88395_lib.h + create mode 100644 sound/soc/codecs/aw88395/aw88395_reg.h + create mode 100644 sound/soc/codecs/cs42l42-sdw.c + create mode 100644 sound/soc/codecs/idt821034.c + create mode 100644 sound/soc/codecs/peb2466.c + create mode 100644 sound/soc/codecs/rt712-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt712-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt712-sdca.c + create mode 100644 sound/soc/codecs/rt712-sdca.h + create mode 100644 sound/soc/codecs/sma1303.c + create mode 100644 sound/soc/codecs/sma1303.h + create mode 100644 sound/soc/intel/avs/control.c + create mode 100644 sound/soc/intel/avs/control.h + create mode 100644 sound/soc/mediatek/common/mtk-soundcard-driver.c + create mode 100644 sound/soc/mediatek/common/mtk-soundcard-driver.h + create mode 100644 sound/soc/mediatek/mt8188/Makefile + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-common.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-etdm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-mt6359.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-reg.h + create mode 100644 sound/soc/sof/ipc4-fw-reg.h + create mode 100644 tools/testing/selftests/alsa/pcm-test.conf +Merging sound-asoc/for-next (aed2f3fb920c Merge remote-tracking branch 'asoc/for-6.3' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 7 +++++ + sound/soc/codecs/da7219-aad.c | 41 ++++++++++++++++++++++----- + sound/soc/codecs/da7219-aad.h | 4 +++ + sound/soc/sh/rcar/adg.c | 64 +++++++++++++++++++++---------------------- + 4 files changed, 77 insertions(+), 39 deletions(-) +Merging modules/modules-next (2ece476a2346 module: replace module_layout with module_memory) +$ 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 include/linux/module.h +Auto-merging kernel/module/kallsyms.c +Auto-merging scripts/Makefile.modinst +Merge made by the 'ort' strategy. + Documentation/livepatch/module-elf-format.rst | 11 +- + arch/alpha/kernel/module.c | 2 +- + arch/arc/kernel/unwind.c | 9 +- + arch/arm/kernel/module-plts.c | 9 +- + arch/arm64/kernel/module-plts.c | 13 +- + arch/ia64/kernel/module.c | 24 +- + arch/mips/kernel/vpe.c | 11 +- + arch/parisc/kernel/module.c | 51 ++-- + arch/powerpc/kernel/module_32.c | 7 +- + arch/s390/kernel/module.c | 26 +- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/module.c | 4 +- + include/linux/module.h | 97 ++++-- + kernel/module/internal.h | 40 ++- + kernel/module/kallsyms.c | 58 ++-- + kernel/module/kdb.c | 17 +- + kernel/module/main.c | 407 ++++++++++++++------------ + kernel/module/procfs.c | 16 +- + kernel/module/strict_rwx.c | 99 ++----- + kernel/module/tree_lookup.c | 39 ++- + kernel/params.c | 3 +- + lib/test_kmod.c | 11 +- + scripts/Makefile.modinst | 2 +- + 23 files changed, 477 insertions(+), 483 deletions(-) +Merging input/next (04f8b4ea20c8 Input: pmic8xxx-keypad - fix a Kconfig spelling mistake & hyphenation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/keyboard/Kconfig +CONFLICT (modify/delete): drivers/input/touchscreen/ucb1400_ts.c deleted in HEAD and modified in input/next. Version input/next of drivers/input/touchscreen/ucb1400_ts.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/input/touchscreen/ucb1400_ts.c +rm 'drivers/input/touchscreen/ucb1400_ts.c' +$ git commit --no-edit -v -a +[master 43fbe1654737] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + drivers/input/input.c | 7 +- + drivers/input/joystick/xpad.c | 2 + + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/applespi.c | 10 +- + drivers/input/keyboard/cros_ec_keyb.c | 15 ++ + drivers/input/keyboard/omap4-keypad.c | 6 +- + drivers/input/keyboard/samsung-keypad.c | 12 +- + drivers/input/keyboard/spear-keyboard.c | 4 +- + drivers/input/keyboard/st-keyscan.c | 4 +- + drivers/input/keyboard/tegra-kbc.c | 4 +- + drivers/input/misc/88pm860x_onkey.c | 9 +- + drivers/input/misc/ad714x-i2c.c | 14 +- + drivers/input/misc/ad714x-spi.c | 14 +- + drivers/input/misc/ad714x.c | 12 +- + drivers/input/misc/ad714x.h | 4 +- + drivers/input/misc/adxl34x-i2c.c | 25 +- + drivers/input/misc/adxl34x-spi.c | 25 +- + drivers/input/misc/adxl34x.c | 16 +- + drivers/input/misc/adxl34x.h | 4 +- + drivers/input/misc/axp20x-pek.c | 12 +- + drivers/input/misc/cma3000_d0x_i2c.c | 6 +- + drivers/input/misc/da7280.c | 8 +- + drivers/input/misc/drv260x.c | 8 +- + drivers/input/misc/drv2665.c | 8 +- + drivers/input/misc/drv2667.c | 8 +- + drivers/input/misc/e3x0-button.c | 10 +- + drivers/input/misc/gpio-vibra.c | 10 +- + drivers/input/misc/iqs269a.c | 335 ++++++++++--------------- + drivers/input/misc/iqs626a.c | 8 +- + drivers/input/misc/kxtj9.c | 8 +- + drivers/input/misc/max77693-haptic.c | 11 +- + drivers/input/misc/max8925_onkey.c | 9 +- + drivers/input/misc/max8997_haptic.c | 7 +- + drivers/input/misc/palmas-pwrbutton.c | 10 +- + drivers/input/misc/pcf8574_keypad.c | 16 +- + drivers/input/misc/pm8941-pwrkey.c | 10 +- + drivers/input/misc/pm8xxx-vibrator.c | 6 +- + drivers/input/misc/pmic8xxx-pwrkey.c | 8 +- + drivers/input/misc/pwm-beeper.c | 10 +- + drivers/input/misc/pwm-vibra.c | 10 +- + drivers/input/misc/regulator-haptic.c | 8 +- + drivers/input/misc/rotary_encoder.c | 10 +- + drivers/input/misc/stpmic1_onkey.c | 12 +- + drivers/input/misc/twl4030-vibra.c | 10 +- + drivers/input/misc/twl6040-vibra.c | 7 +- + drivers/input/misc/wistron_btns.c | 6 +- + drivers/input/mouse/cyapa.c | 14 +- + drivers/input/mouse/elan_i2c_core.c | 8 +- + drivers/input/mouse/navpoint.c | 9 +- + drivers/input/mouse/synaptics_i2c.c | 10 +- + drivers/input/rmi4/rmi_i2c.c | 11 +- + drivers/input/rmi4/rmi_smbus.c | 15 +- + drivers/input/rmi4/rmi_spi.c | 11 +- + drivers/input/serio/altera_ps2.c | 4 +- + drivers/input/serio/ambakmi.c | 6 +- + drivers/input/serio/apbps2.c | 4 +- + drivers/input/serio/arc_ps2.c | 4 +- + drivers/input/serio/olpc_apsp.c | 4 +- + drivers/input/touchscreen/ad7877.c | 8 +- + drivers/input/touchscreen/ads7846.c | 31 +-- + drivers/input/touchscreen/ar1021_i2c.c | 9 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 10 +- + drivers/input/touchscreen/bu21013_ts.c | 8 +- + drivers/input/touchscreen/bu21029_ts.c | 8 +- + drivers/input/touchscreen/chipone_icn8318.c | 6 +- + drivers/input/touchscreen/chipone_icn8505.c | 8 +- + drivers/input/touchscreen/cy8ctma140.c | 9 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 9 +- + drivers/input/touchscreen/cyttsp4_core.c | 9 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp4_spi.c | 2 +- + drivers/input/touchscreen/cyttsp_core.c | 7 +- + drivers/input/touchscreen/cyttsp_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp_spi.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 12 +- + drivers/input/touchscreen/eeti_ts.c | 8 +- + drivers/input/touchscreen/egalax_ts.c | 9 +- + drivers/input/touchscreen/ektf2127.c | 10 +- + drivers/input/touchscreen/elants_i2c.c | 10 +- + drivers/input/touchscreen/goodix.c | 8 +- + drivers/input/touchscreen/hideep.c | 8 +- + drivers/input/touchscreen/ilitek_ts_i2c.c | 8 +- + drivers/input/touchscreen/imagis.c | 8 +- + drivers/input/touchscreen/imx6ul_tsc.c | 10 +- + drivers/input/touchscreen/ipaq-micro-ts.c | 11 +- + drivers/input/touchscreen/iqs5xx.c | 8 +- + drivers/input/touchscreen/mcs5000_ts.c | 9 +- + drivers/input/touchscreen/melfas_mip4.c | 8 +- + drivers/input/touchscreen/migor_ts.c | 8 +- + drivers/input/touchscreen/mms114.c | 8 +- + drivers/input/touchscreen/msg2638.c | 8 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 10 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 12 +- + drivers/input/touchscreen/s6sy761.c | 15 +- + drivers/input/touchscreen/silead.c | 8 +- + drivers/input/touchscreen/st1232.c | 10 +- + drivers/input/touchscreen/stmfts.c | 14 +- + drivers/input/touchscreen/surface3_spi.c | 12 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 8 +- + drivers/input/touchscreen/tsc2004.c | 2 +- + drivers/input/touchscreen/tsc2005.c | 2 +- + drivers/input/touchscreen/tsc200x-core.c | 7 +- + drivers/input/touchscreen/wacom_i2c.c | 8 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 8 +- + drivers/input/touchscreen/wm97xx-core.c | 10 +- + drivers/input/touchscreen/zforce_ts.c | 8 +- + drivers/input/touchscreen/zinitix.c | 8 +- + include/linux/platform_data/cros_ec_commands.h | 3 + + 109 files changed, 566 insertions(+), 728 deletions(-) +Merging block/for-next (7c866e4a066b Merge branch 'for-6.3/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging block/blk-merge.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/nvme/target/tcp.c +Auto-merging fs/Makefile +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/coredump.c +Auto-merging fs/internal.h +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/overlayfs/file.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/super.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/xdr.c +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5cd5cd671c73] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-block | 3 +- + Documentation/block/capability.rst | 10 - + Documentation/block/index.rst | 1 - + Documentation/block/ublk.rst | 55 ++- + MAINTAINERS | 1 + + block/Kconfig.iosched | 1 + + block/bfq-cgroup.c | 105 ++--- + block/bfq-iosched.c | 629 ++++++++++++++++++++---------- + block/bfq-iosched.h | 146 +++++-- + block/bfq-wf2q.c | 2 +- + block/bio-integrity.c | 8 +- + block/bio.c | 48 +-- + block/blk-cgroup.c | 150 +++++--- + block/blk-cgroup.h | 14 +- + block/blk-core.c | 36 +- + block/blk-crypto-sysfs.c | 2 +- + block/blk-ia-ranges.c | 4 +- + block/blk-integrity.c | 2 +- + block/blk-iocost.c | 78 ++-- + block/blk-iolatency.c | 37 +- + block/blk-ioprio.c | 6 +- + block/blk-map.c | 40 +- + block/blk-merge.c | 35 +- + block/blk-mq-debugfs.c | 10 +- + block/blk-mq-sched.c | 7 +- + block/blk-mq-sysfs.c | 30 +- + block/blk-mq.c | 152 ++++---- + block/blk-rq-qos.c | 67 ++++ + block/blk-rq-qos.h | 66 +--- + block/blk-settings.c | 10 +- + block/blk-stat.c | 3 +- + block/blk-sysfs.c | 28 +- + block/blk-throttle.c | 11 +- + block/blk-wbt.c | 116 +++++- + block/blk-wbt.h | 98 +---- + block/blk-zoned.c | 4 +- + block/blk.h | 14 +- + block/elevator.c | 4 +- + block/fops.c | 21 +- + block/genhd.c | 42 +- + block/ioctl.c | 13 +- + block/sed-opal.c | 2 + + drivers/block/brd.c | 67 ++-- + drivers/block/drbd/Makefile | 2 +- + drivers/block/drbd/drbd_buildtag.c | 22 ++ + drivers/block/drbd/drbd_debugfs.c | 2 +- + drivers/block/drbd/drbd_int.h | 13 +- + drivers/block/drbd/drbd_interval.c | 6 +- + drivers/block/drbd/drbd_main.c | 20 +- + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/drbd/drbd_vli.h | 2 +- + drivers/block/loop.c | 14 +- + drivers/block/null_blk/main.c | 3 +- + drivers/block/ps3vram.c | 7 - + drivers/block/rbd.c | 7 +- + drivers/block/ublk_drv.c | 405 ++++++++++++++----- + drivers/block/virtio_blk.c | 4 +- + drivers/block/zram/zram_drv.c | 15 +- + drivers/char/random.c | 4 +- + drivers/md/md.c | 65 ++-- + drivers/md/md.h | 9 +- + drivers/nvme/host/auth.c | 30 +- + drivers/nvme/host/constants.c | 16 + + drivers/nvme/host/core.c | 123 +++--- + drivers/nvme/host/fabrics.c | 19 +- + drivers/nvme/host/ioctl.c | 9 +- + drivers/nvme/host/nvme.h | 16 +- + drivers/nvme/host/pci.c | 104 ++--- + drivers/nvme/host/tcp.c | 7 +- + drivers/nvme/target/admin-cmd.c | 2 +- + drivers/nvme/target/io-cmd-file.c | 10 +- + drivers/nvme/target/passthru.c | 5 +- + drivers/nvme/target/tcp.c | 5 +- + drivers/nvme/target/zns.c | 3 +- + drivers/s390/block/dasd.c | 5 +- + drivers/s390/block/dasd_3990_erp.c | 10 +- + drivers/s390/block/dasd_alias.c | 6 +- + drivers/s390/block/dasd_eckd.c | 104 ++--- + drivers/s390/block/dasd_eer.c | 2 +- + drivers/s390/block/dasd_fba.c | 14 +- + drivers/s390/block/dcssblk.c | 4 - + drivers/scsi/sd.c | 36 +- + drivers/target/target_core_file.c | 18 +- + drivers/tty/tty_io.c | 4 +- + drivers/vhost/vringh.c | 5 +- + fs/Kconfig | 4 + + fs/Makefile | 3 +- + fs/affs/Kconfig | 1 + + fs/afs/write.c | 8 +- + fs/ceph/file.c | 12 +- + fs/cifs/connect.c | 5 +- + fs/cifs/file.c | 8 +- + fs/cifs/fscache.c | 16 +- + fs/cifs/misc.c | 5 +- + fs/cifs/smb2ops.c | 6 +- + fs/coda/file.c | 36 +- + fs/coredump.c | 7 +- + fs/direct-io.c | 26 +- + fs/exfat/Kconfig | 1 + + fs/ext2/Kconfig | 1 + + fs/fat/Kconfig | 1 + + fs/hfs/Kconfig | 1 + + fs/hfsplus/Kconfig | 1 + + fs/internal.h | 4 +- + fs/iomap/direct-io.c | 1 - + fs/jfs/Kconfig | 1 + + fs/kernfs/file.c | 2 +- + fs/nfs/fscache.c | 16 +- + fs/nilfs2/Kconfig | 1 + + fs/ntfs3/Kconfig | 1 + + fs/ocfs2/Kconfig | 1 + + fs/orangefs/inode.c | 22 +- + fs/overlayfs/file.c | 36 +- + fs/proc/inode.c | 4 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/reiserfs/Kconfig | 1 + + fs/splice.c | 119 ++++-- + fs/super.c | 24 ++ + fs/udf/Kconfig | 1 + + include/linux/bio.h | 5 +- + include/linux/blk-mq.h | 4 +- + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 27 +- + include/linux/bvec.h | 41 +- + include/linux/drbd.h | 7 - + include/linux/drbd_config.h | 16 + + include/linux/drbd_genl_api.h | 2 +- + include/linux/drbd_limits.h | 204 +++++----- + include/linux/fs.h | 6 + + include/linux/io_uring_types.h | 25 +- + include/linux/mmzone.h | 2 + + include/linux/pipe_fs_i.h | 20 + + include/linux/sched.h | 2 +- + include/linux/uio.h | 50 ++- + include/uapi/linux/io_uring.h | 8 +- + include/uapi/linux/sed-opal.h | 1 + + include/uapi/linux/ublk_cmd.h | 49 ++- + io_uring/advise.c | 29 +- + io_uring/fs.c | 20 +- + io_uring/io_uring.c | 544 +++++++++++++++++--------- + io_uring/io_uring.h | 97 ++--- + io_uring/msg_ring.c | 31 +- + io_uring/net.c | 21 +- + io_uring/notif.c | 3 +- + io_uring/opdef.c | 340 ++++++++++------ + io_uring/opdef.h | 13 +- + io_uring/openclose.c | 18 +- + io_uring/poll.c | 2 +- + io_uring/rsrc.c | 4 +- + io_uring/rw.c | 13 +- + io_uring/splice.c | 7 +- + io_uring/sqpoll.c | 3 +- + io_uring/sqpoll.h | 2 +- + io_uring/statx.c | 4 +- + io_uring/sync.c | 14 +- + io_uring/tctx.c | 2 +- + io_uring/xattr.c | 14 +- + kernel/fork.c | 2 +- + kernel/trace/blktrace.c | 4 +- + lib/iov_iter.c | 728 ++++++++++++++--------------------- + lib/sbitmap.c | 102 +++-- + mm/filemap.c | 154 +++++++- + mm/gup.c | 7 +- + mm/internal.h | 6 + + mm/page_io.c | 8 +- + mm/shmem.c | 124 +++++- + mm/swapfile.c | 2 +- + mm/vmstat.c | 2 + + net/ceph/messenger_v1.c | 7 +- + net/ceph/messenger_v2.c | 28 +- + net/rxrpc/rxperf.c | 8 +- + net/sunrpc/svcsock.c | 7 +- + net/sunrpc/xdr.c | 5 +- + 174 files changed, 3934 insertions(+), 2634 deletions(-) + delete mode 100644 Documentation/block/capability.rst + create mode 100644 drivers/block/drbd/drbd_buildtag.c + create mode 100644 include/linux/drbd_config.h +$ git am -3 ../patches/0001-fixup-for-ublk_drv-add-mechanism-for-supporting-unpr.patch +Applying: fixup for "ublk_drv: add mechanism for supporting unprivileged ublk device" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/ublk_drv.c +$ git add -A . +$ git commit -v -a --amend +[master 59597593fc83] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Mon Feb 20 15:32:01 2023 +1100 +Merging device-mapper/for-next (a2f998a78a42 dm ioctl: remove unnecessary check when using dm_get_mdptr()) +$ 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 +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-integrity.c +CONFLICT (content): Merge conflict in drivers/md/dm-integrity.c +Resolved 'drivers/md/dm-integrity.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 63e74256c3fa] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git +$ git diff -M --stat --summary HEAD^.. + drivers/md/dm-audit.c | 2 +- + drivers/md/dm-bio-prison-v1.c | 19 +- + drivers/md/dm-bio-prison-v1.h | 1 + + drivers/md/dm-bio-prison-v2.c | 15 +- + drivers/md/dm-bio-prison-v2.h | 11 +- + drivers/md/dm-bio-record.h | 1 + + drivers/md/dm-bufio.c | 130 ++--- + drivers/md/dm-builtin.c | 3 +- + drivers/md/dm-cache-background-tracker.c | 17 +- + drivers/md/dm-cache-background-tracker.h | 47 +- + drivers/md/dm-cache-block-types.h | 1 + + drivers/md/dm-cache-metadata.c | 74 +-- + drivers/md/dm-cache-metadata.h | 5 +- + drivers/md/dm-cache-policy-internal.h | 14 +- + drivers/md/dm-cache-policy-smq.c | 166 ++++--- + drivers/md/dm-cache-policy.c | 3 +- + drivers/md/dm-cache-policy.h | 7 +- + drivers/md/dm-cache-target.c | 141 +++--- + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-core.h | 9 +- + drivers/md/dm-crypt.c | 117 ++--- + drivers/md/dm-delay.c | 7 +- + drivers/md/dm-dust.c | 2 +- + drivers/md/dm-ebs-target.c | 5 +- + drivers/md/dm-era-target.c | 122 +++-- + drivers/md/dm-exception-store.c | 7 +- + drivers/md/dm-exception-store.h | 57 +-- + drivers/md/dm-flakey.c | 58 ++- + drivers/md/dm-ima.c | 5 +- + drivers/md/dm-ima.h | 7 +- + drivers/md/dm-init.c | 5 +- + drivers/md/dm-integrity.c | 541 +++++++++++---------- + drivers/md/dm-io-rewind.c | 8 +- + drivers/md/dm-io-tracker.h | 1 + + drivers/md/dm-io.c | 88 ++-- + drivers/md/dm-ioctl.c | 168 ++++--- + drivers/md/dm-kcopyd.c | 61 ++- + drivers/md/dm-linear.c | 5 +- + drivers/md/dm-log-userspace-base.c | 15 +- + drivers/md/dm-log-userspace-transfer.c | 8 +- + drivers/md/dm-log-userspace-transfer.h | 1 + + drivers/md/dm-log-writes.c | 23 +- + drivers/md/dm-log.c | 65 ++- + drivers/md/dm-mpath.c | 125 +++-- + drivers/md/dm-mpath.h | 3 +- + drivers/md/dm-path-selector.c | 4 +- + drivers/md/dm-path-selector.h | 28 +- + drivers/md/dm-ps-historical-service-time.c | 2 +- + drivers/md/dm-ps-io-affinity.c | 6 +- + drivers/md/dm-ps-queue-length.c | 15 +- + drivers/md/dm-ps-round-robin.c | 22 +- + drivers/md/dm-ps-service-time.c | 26 +- + drivers/md/dm-raid.c | 35 +- + drivers/md/dm-raid1.c | 92 ++-- + drivers/md/dm-region-hash.c | 29 +- + drivers/md/dm-rq.c | 27 +- + drivers/md/dm-rq.h | 3 +- + drivers/md/dm-snap-persistent.c | 48 +- + drivers/md/dm-snap-transient.c | 18 +- + drivers/md/dm-snap.c | 91 ++-- + drivers/md/dm-stats.c | 103 ++-- + drivers/md/dm-stats.h | 6 +- + drivers/md/dm-stripe.c | 53 +- + drivers/md/dm-switch.c | 47 +- + drivers/md/dm-sysfs.c | 12 +- + drivers/md/dm-table.c | 58 +-- + drivers/md/dm-target.c | 6 +- + drivers/md/dm-thin-metadata.c | 66 +-- + drivers/md/dm-thin-metadata.h | 1 + + drivers/md/dm-thin.c | 88 ++-- + drivers/md/dm-uevent.c | 6 +- + drivers/md/dm-uevent.h | 6 +- + drivers/md/dm-unstripe.c | 1 + + drivers/md/dm-verity-fec.c | 30 +- + drivers/md/dm-verity-fec.h | 18 +- + drivers/md/dm-verity-target.c | 83 ++-- + drivers/md/dm-verity-verify-sig.c | 2 +- + drivers/md/dm-verity-verify-sig.h | 2 +- + drivers/md/dm-verity.h | 8 +- + drivers/md/dm-writecache.c | 171 ++++--- + drivers/md/dm-zero.c | 1 + + drivers/md/dm-zone.c | 2 +- + drivers/md/dm-zoned-metadata.c | 22 +- + drivers/md/dm-zoned-target.c | 1 - + drivers/md/dm.c | 114 +++-- + drivers/md/dm.h | 16 +- + drivers/md/persistent-data/dm-array.c | 82 ++-- + drivers/md/persistent-data/dm-array.h | 3 +- + drivers/md/persistent-data/dm-bitset.c | 14 +- + drivers/md/persistent-data/dm-bitset.h | 1 + + drivers/md/persistent-data/dm-block-manager.c | 32 +- + drivers/md/persistent-data/dm-block-manager.h | 7 +- + drivers/md/persistent-data/dm-btree-internal.h | 6 +- + drivers/md/persistent-data/dm-btree-remove.c | 52 +- + drivers/md/persistent-data/dm-btree-spine.c | 21 +- + drivers/md/persistent-data/dm-btree.c | 130 ++--- + drivers/md/persistent-data/dm-btree.h | 15 +- + .../persistent-data/dm-persistent-data-internal.h | 7 +- + drivers/md/persistent-data/dm-space-map-common.c | 52 +- + drivers/md/persistent-data/dm-space-map-common.h | 11 +- + drivers/md/persistent-data/dm-space-map-disk.c | 13 +- + drivers/md/persistent-data/dm-space-map-disk.h | 1 + + drivers/md/persistent-data/dm-space-map-metadata.c | 24 +- + drivers/md/persistent-data/dm-space-map-metadata.h | 1 + + drivers/md/persistent-data/dm-space-map.h | 1 + + .../md/persistent-data/dm-transaction-manager.c | 18 +- + .../md/persistent-data/dm-transaction-manager.h | 3 +- + include/linux/device-mapper.h | 60 ++- + include/linux/dm-bufio.h | 13 +- + include/linux/dm-dirty-log.h | 9 +- + include/linux/dm-io.h | 9 +- + include/linux/dm-kcopyd.h | 23 +- + include/linux/dm-region-hash.h | 9 +- + 113 files changed, 2310 insertions(+), 1848 deletions(-) +Merging libata/for-next (8844f0aa8dc4 ata: pata_parport: Fix ida_alloc return value error check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging block/blk-core.c +Auto-merging drivers/Makefile +Auto-merging drivers/ata/Kconfig +Auto-merging drivers/ata/Makefile +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/block/Kconfig +Auto-merging drivers/scsi/libsas/sas_ata.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/blockdev/paride.rst | 388 ++----- + Documentation/admin-guide/kernel-parameters.rst | 1 - + Documentation/admin-guide/kernel-parameters.txt | 19 +- + MAINTAINERS | 7 - + block/blk-core.c | 14 +- + drivers/Makefile | 1 - + drivers/ata/Kconfig | 14 + + drivers/ata/Makefile | 2 + + drivers/ata/acard-ahci.c | 8 +- + drivers/ata/ahci_octeon.c | 6 - + drivers/ata/libahci.c | 171 +++- + drivers/ata/libata-core.c | 81 +- + drivers/ata/libata-eh.c | 117 +-- + drivers/ata/libata-sata.c | 7 +- + drivers/ata/libata-scsi.c | 41 +- + drivers/ata/libata-sff.c | 10 +- + drivers/ata/libata-trace.c | 2 +- + drivers/ata/pata_parport/Kconfig | 141 +++ + drivers/ata/pata_parport/Makefile | 19 + + drivers/{block/paride => ata/pata_parport}/aten.c | 2 +- + drivers/{block/paride => ata/pata_parport}/bpck.c | 2 +- + drivers/{block/paride => ata/pata_parport}/bpck6.c | 2 +- + drivers/{block/paride => ata/pata_parport}/comm.c | 2 +- + drivers/{block/paride => ata/pata_parport}/dstr.c | 2 +- + drivers/{block/paride => ata/pata_parport}/epat.c | 2 +- + drivers/{block/paride => ata/pata_parport}/epia.c | 2 +- + drivers/{block/paride => ata/pata_parport}/fit2.c | 2 +- + drivers/{block/paride => ata/pata_parport}/fit3.c | 2 +- + drivers/{block/paride => ata/pata_parport}/friq.c | 2 +- + drivers/{block/paride => ata/pata_parport}/frpw.c | 2 +- + drivers/{block/paride => ata/pata_parport}/kbic.c | 2 +- + drivers/{block/paride => ata/pata_parport}/ktti.c | 2 +- + drivers/{block/paride => ata/pata_parport}/on20.c | 2 +- + drivers/{block/paride => ata/pata_parport}/on26.c | 2 +- + drivers/ata/pata_parport/pata_parport.c | 761 ++++++++++++++ + .../{block/paride => ata/pata_parport}/ppc6lnx.c | 0 + drivers/ata/sata_fsl.c | 5 +- + drivers/ata/sata_inic162x.c | 14 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_sil24.c | 7 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/block/Kconfig | 29 - + drivers/block/paride/Kconfig | 302 ------ + drivers/block/paride/Makefile | 29 - + drivers/block/paride/Transition-notes | 128 --- + drivers/block/paride/mkd | 31 - + drivers/block/paride/paride.c | 479 --------- + drivers/block/paride/paride.h | 172 ---- + drivers/block/paride/pcd.c | 1042 ------------------- + drivers/block/paride/pd.c | 1032 ------------------- + drivers/block/paride/pf.c | 1057 -------------------- + drivers/block/paride/pg.c | 734 -------------- + drivers/block/paride/pseudo.h | 102 -- + drivers/block/paride/pt.c | 1024 ------------------- + drivers/scsi/ipr.c | 11 +- + drivers/scsi/libsas/sas_ata.c | 11 +- + include/linux/libata.h | 61 +- + include/linux/pata_parport.h | 111 ++ + 58 files changed, 1483 insertions(+), 6742 deletions(-) + create mode 100644 drivers/ata/pata_parport/Kconfig + create mode 100644 drivers/ata/pata_parport/Makefile + rename drivers/{block/paride => ata/pata_parport}/aten.c (99%) + rename drivers/{block/paride => ata/pata_parport}/bpck.c (99%) + rename drivers/{block/paride => ata/pata_parport}/bpck6.c (99%) + rename drivers/{block/paride => ata/pata_parport}/comm.c (99%) + rename drivers/{block/paride => ata/pata_parport}/dstr.c (99%) + rename drivers/{block/paride => ata/pata_parport}/epat.c (99%) + rename drivers/{block/paride => ata/pata_parport}/epia.c (99%) + rename drivers/{block/paride => ata/pata_parport}/fit2.c (99%) + rename drivers/{block/paride => ata/pata_parport}/fit3.c (99%) + rename drivers/{block/paride => ata/pata_parport}/friq.c (99%) + rename drivers/{block/paride => ata/pata_parport}/frpw.c (99%) + rename drivers/{block/paride => ata/pata_parport}/kbic.c (99%) + rename drivers/{block/paride => ata/pata_parport}/ktti.c (98%) + rename drivers/{block/paride => ata/pata_parport}/on20.c (98%) + rename drivers/{block/paride => ata/pata_parport}/on26.c (99%) + create mode 100644 drivers/ata/pata_parport/pata_parport.c + rename drivers/{block/paride => ata/pata_parport}/ppc6lnx.c (100%) + delete mode 100644 drivers/block/paride/Kconfig + delete mode 100644 drivers/block/paride/Makefile + delete mode 100644 drivers/block/paride/Transition-notes + delete mode 100644 drivers/block/paride/mkd + delete mode 100644 drivers/block/paride/paride.c + delete mode 100644 drivers/block/paride/paride.h + delete mode 100644 drivers/block/paride/pcd.c + delete mode 100644 drivers/block/paride/pd.c + delete mode 100644 drivers/block/paride/pf.c + delete mode 100644 drivers/block/paride/pg.c + delete mode 100644 drivers/block/paride/pseudo.h + delete mode 100644 drivers/block/paride/pt.c + create mode 100644 include/linux/pata_parport.h +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 (571f235163ac mmc: meson-gx: Use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mmc/host/Makefile +Merge made by the 'ort' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 76 +++++++++ + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 6 +- + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 25 +-- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 21 ++- + .../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 2 +- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 4 +- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 +- + Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 36 ++-- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,mmcif.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 8 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 3 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- + .../devicetree/bindings/mmc/sdhci-msm.yaml | 4 + + .../devicetree/bindings/mmc/sdhci-pxa.yaml | 19 ++- + .../bindings/mmc/socionext,uniphier-sd.yaml | 10 ++ + .../bindings/mmc/starfive,jh7110-mmc.yaml | 77 +++++++++ + .../devicetree/bindings/mmc/sunplus,mmc.yaml | 2 +- + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 2 +- + MAINTAINERS | 6 + + drivers/memstick/core/Kconfig | 2 + + drivers/mmc/core/Kconfig | 3 +- + drivers/mmc/core/block.c | 25 ++- + drivers/mmc/core/host.c | 26 +++ + drivers/mmc/core/mmc_ops.c | 1 + + drivers/mmc/core/pwrseq_simple.c | 4 +- + drivers/mmc/core/sdio_io.c | 2 +- + drivers/mmc/core/slot-gpio.c | 17 +- + drivers/mmc/host/Kconfig | 11 ++ + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 3 - + drivers/mmc/host/dw_mmc-starfive.c | 186 +++++++++++++++++++++ + drivers/mmc/host/jz4740_mmc.c | 38 ++++- + drivers/mmc/host/meson-gx-mmc.c | 92 +++------- + drivers/mmc/host/moxart-mmc.c | 9 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 ++ + drivers/mmc/host/sdhci-brcmstb.c | 8 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 66 +++++++- + drivers/mmc/host/sdhci-iproc.c | 14 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 19 ++- + drivers/mmc/host/sdhci-pci-core.c | 8 +- + drivers/mmc/host/sdhci-pxav2.c | 154 +++++++++++++++-- + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci.c | 3 - + drivers/mmc/host/sdhci.h | 2 - + drivers/mmc/host/uniphier-sd.c | 83 ++++++++- + include/linux/mmc/host.h | 1 + + include/linux/mmc/slot-gpio.h | 1 + + 56 files changed, 923 insertions(+), 237 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt + create mode 100644 Documentation/devicetree/bindings/mmc/starfive,jh7110-mmc.yaml + create mode 100644 drivers/mmc/host/dw_mmc-starfive.c +Merging mfd/for-mfd-next (a5f31a668da1 dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332) +$ 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 Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/fpga/intel-m10-bmc-sec-update.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-intel-m10-bmc | 8 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 + + .../devicetree/bindings/mfd/nxp,bbnsm.yaml | 101 +++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 + + MAINTAINERS | 4 +- + drivers/fpga/Kconfig | 2 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 415 ++++++++++++------- + drivers/hwmon/Kconfig | 2 +- + drivers/mfd/Kconfig | 33 +- + drivers/mfd/Makefile | 5 +- + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/axp20x.c | 27 +- + drivers/mfd/intel-m10-bmc-core.c | 122 ++++++ + drivers/mfd/intel-m10-bmc-pmci.c | 455 +++++++++++++++++++++ + drivers/mfd/intel-m10-bmc-spi.c | 168 ++++++++ + drivers/mfd/intel-m10-bmc.c | 238 ----------- + drivers/mfd/kempld-core.c | 7 +- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/max8925-core.c | 6 - + drivers/mfd/ntxec.c | 1 + + drivers/mfd/pcf50633-adc.c | 7 +- + drivers/mfd/qcom-pm8xxx.c | 3 - + drivers/mfd/rk808.c | 1 + + drivers/mfd/simple-mfd-i2c.c | 2 +- + drivers/mfd/syscon.c | 27 +- + drivers/mfd/twl-core.c | 9 +- + drivers/mfd/twl4030-power.c | 6 - + include/linux/mfd/axp20x.h | 15 +- + include/linux/mfd/core.h | 2 +- + include/linux/mfd/intel-m10-bmc.h | 205 ++++++++-- + include/linux/mfd/ntxec.h | 2 +- + include/linux/mfd/twl.h | 2 + + 34 files changed, 1423 insertions(+), 491 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/nxp,bbnsm.yaml + create mode 100644 drivers/mfd/intel-m10-bmc-core.c + create mode 100644 drivers/mfd/intel-m10-bmc-pmci.c + create mode 100644 drivers/mfd/intel-m10-bmc-spi.c + delete mode 100644 drivers/mfd/intel-m10-bmc.c +Merging backlight/for-backlight-next (718c35c8d594 backlight: ktz8866: Add support for Kinetic KTZ8866 backlight) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/kinetic,ktz8866.yaml | 76 ++++++ + .../bindings/leds/backlight/qcom-wled.yaml | 1 + + MAINTAINERS | 6 + + drivers/video/backlight/Kconfig | 22 +- + drivers/video/backlight/Makefile | 3 +- + drivers/video/backlight/aat2870_bl.c | 7 +- + drivers/video/backlight/arcxcnn_bl.c | 5 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/ipaq_micro_bl.c | 7 +- + drivers/video/backlight/ktd253-backlight.c | 9 +- + drivers/video/backlight/ktz8866.c | 209 +++++++++++++++ + drivers/video/backlight/pwm_bl.c | 68 +++-- + drivers/video/backlight/sky81452-backlight.c | 2 +- + drivers/video/backlight/tosa_bl.c | 172 ------------- + drivers/video/backlight/tosa_bl.h | 8 - + drivers/video/backlight/tosa_lcd.c | 284 --------------------- + include/linux/pwm_backlight.h | 1 - + 17 files changed, 340 insertions(+), 542 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml + create mode 100644 drivers/video/backlight/ktz8866.c + delete mode 100644 drivers/video/backlight/tosa_bl.c + delete mode 100644 drivers/video/backlight/tosa_bl.h + delete mode 100644 drivers/video/backlight/tosa_lcd.c +Merging battery/for-next (c142872ea40a power: reset: odroid-go-ultra: fix I2C dependency) +$ 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/Kconfig +Auto-merging drivers/power/supply/Makefile +CONFLICT (content): Merge conflict in drivers/power/supply/Makefile +Resolved 'drivers/power/supply/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5fdc1a4882f3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-power-rt9467 | 19 + + Documentation/ABI/testing/sysfs-class-power-rt9471 | 32 + + .../bindings/power/reset/syscon-reboot.yaml | 4 + + .../power/supply/qcom,pm8941-coincell.yaml | 20 +- + .../power/supply/richtek,rt9467-charger.yaml | 82 ++ + .../bindings/power/supply/richtek,rt9471.yaml | 73 ++ + drivers/platform/x86/x86-android-tablets.c | 2 +- + drivers/power/reset/Kconfig | 7 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/odroid-go-ultra-poweroff.c | 177 +++ + drivers/power/reset/syscon-reboot.c | 6 +- + drivers/power/supply/Kconfig | 35 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 22 +- + drivers/power/supply/bq2415x_charger.c | 42 +- + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 8 +- + drivers/power/supply/bq256xx_charger.c | 4 +- + drivers/power/supply/bq25890_charger.c | 181 ++- + drivers/power/supply/bq27xxx_battery.c | 8 +- + drivers/power/supply/charger-manager.c | 6 +- + drivers/power/supply/collie_battery.c | 4 +- + drivers/power/supply/da9150-charger.c | 9 +- + drivers/power/supply/ds2780_battery.c | 8 +- + drivers/power/supply/ds2781_battery.c | 8 +- + drivers/power/supply/lp8788-charger.c | 7 +- + drivers/power/supply/ltc4162-l-charger.c | 12 +- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max1721x_battery.c | 8 +- + drivers/power/supply/max77650-charger.c | 8 +- + drivers/power/supply/max77693_charger.c | 6 +- + drivers/power/supply/mp2629_charger.c | 2 +- + drivers/power/supply/olpc_battery.c | 2 +- + drivers/power/supply/pcf50633-charger.c | 6 +- + drivers/power/supply/power_supply_core.c | 93 -- + drivers/power/supply/power_supply_leds.c | 1 + + drivers/power/supply/power_supply_sysfs.c | 10 +- + drivers/power/supply/rt9467-charger.c | 1282 ++++++++++++++++++++ + drivers/power/supply/rt9471.c | 930 ++++++++++++++ + drivers/power/supply/test_power.c | 3 +- + drivers/power/supply/twl4030_charger.c | 6 +- + drivers/power/supply/wm8350_power.c | 2 +- + 42 files changed, 2909 insertions(+), 233 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-rt9467 + create mode 100644 Documentation/ABI/testing/sysfs-class-power-rt9471 + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9467-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml + create mode 100644 drivers/power/reset/odroid-go-ultra-poweroff.c + create mode 100644 drivers/power/supply/rt9467-charger.c + create mode 100644 drivers/power/supply/rt9471.c +Merging regulator/for-next (3849d051e66d Merge remote-tracking branch 'regulator/for-6.3' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/act8865-regulator.txt | 117 ---------- + .../bindings/regulator/act8945a-regulator.txt | 113 --------- + .../bindings/regulator/active-semi,act8600.yaml | 139 +++++++++++ + .../bindings/regulator/active-semi,act8846.yaml | 205 ++++++++++++++++ + .../bindings/regulator/active-semi,act8865.yaml | 158 +++++++++++++ + .../bindings/regulator/active-semi,act8945a.yaml | 258 +++++++++++++++++++++ + .../devicetree/bindings/regulator/fan53555.txt | 24 -- + .../bindings/regulator/fcs,fan53555.yaml | 64 +++++ + .../bindings/regulator/fixed-regulator.yaml | 7 + + .../bindings/regulator/maxim,max20411.yaml | 58 +++++ + .../bindings/regulator/qcom,rpm-regulator.yaml | 128 ++++++++++ + .../regulator/qcom,usb-vbus-regulator.yaml | 2 +- + .../bindings/regulator/qcom-labibb-regulator.yaml | 6 +- + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 1 + + drivers/regulator/act8945a-regulator.c | 6 +- + drivers/regulator/fixed-helper.c | 2 +- + drivers/regulator/max20411-regulator.c | 163 +++++++++++++ + drivers/regulator/max597x-regulator.c | 52 +++-- + drivers/regulator/max77802-regulator.c | 34 ++- + drivers/regulator/mcp16502.c | 1 + + drivers/regulator/s5m8767.c | 6 +- + drivers/regulator/scmi-regulator.c | 16 +- + drivers/regulator/tps65219-regulator.c | 24 +- + 24 files changed, 1269 insertions(+), 323 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/act8865-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8600.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8846.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8945a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/fan53555.txt + create mode 100644 Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max20411.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpm-regulator.yaml + create mode 100644 drivers/regulator/max20411-regulator.c +Merging security/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test) +$ 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 +Merge made by the 'ort' strategy. + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 7 files changed, 13 insertions(+), 21 deletions(-) +Merging integrity/next-integrity (4958db3245fa ima: Introduce MMAP_CHECK_REQPROT hook) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging include/linux/ima.h +Auto-merging security/integrity/evm/evm_crypto.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/ima_api.c +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/security.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/ima_policy | 2 +- + include/linux/ima.h | 6 ++++-- + security/integrity/evm/evm_crypto.c | 33 +++++++++++++++--------------- + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_api.c | 5 +++-- + security/integrity/ima/ima_appraise.c | 3 +++ + security/integrity/ima/ima_main.c | 38 ++++++++++++++++++++++++++--------- + security/integrity/ima/ima_policy.c | 7 ++++++- + security/security.c | 7 ++++--- + 9 files changed, 67 insertions(+), 35 deletions(-) +$ git am -3 ../patches/0001-fixup-for-ima-Introduce-MMAP_CHECK_REQPROT-hook.patch +Applying: fixup for "ima: Introduce MMAP_CHECK_REQPROT hook" +$ git reset HEAD^ +Unstaged changes after reset: +M security/integrity/ima/ima_main.c +$ git add -A . +$ git commit -v -a --amend +[master fd2e92ab0f8b] Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity + Date: Mon Feb 20 15:32:21 2023 +1100 +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (c0e48d3f7722 smackfs: Added check catlen) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + security/smack/smackfs.c | 17 ++++++++++++++--- + 2 files changed, 15 insertions(+), 4 deletions(-) +Merging tomoyo/master (5fc44ba8be52 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 (85b93bbd1c97 tpm: add vendor flag to command code validation) +$ 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/blacklist.c | 21 +++--- + crypto/asymmetric_keys/Kconfig | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 1 + + crypto/asymmetric_keys/public_key.c | 24 +++++- + drivers/char/tpm/eventlog/acpi.c | 5 +- + drivers/char/tpm/eventlog/efi.c | 13 ++-- + drivers/char/tpm/eventlog/of.c | 35 ++++++++- + drivers/char/tpm/st33zp24/i2c.c | 5 +- + drivers/char/tpm/tpm-chip.c | 1 - + drivers/char/tpm/tpm2-cmd.c | 4 +- + drivers/char/tpm/tpm_crb.c | 100 ++++++++++++++++++++++--- + drivers/char/tpm/tpm_i2c_atmel.c | 5 +- + drivers/char/tpm/tpm_i2c_infineon.c | 5 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 6 +- + drivers/char/tpm/tpm_tis_i2c.c | 5 +- + include/acpi/actbl3.h | 1 + + include/linux/key.h | 8 ++ + include/linux/tpm.h | 1 + + security/keys/key.c | 137 +++++++++++++++++++++++++--------- + 19 files changed, 293 insertions(+), 86 deletions(-) +Merging watchdog/master (4443f6ce0d12 watchdog: at91rm9200: Only warn once about problems in .remove()) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 13 +++ + .../devicetree/bindings/timer/qcom,msm-timer.txt | 47 -------- + .../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 +++++++++ + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 37 ++++++- + .../devicetree/bindings/watchdog/gpio-wdt.yaml | 55 ++++++++++ + .../bindings/watchdog/mediatek,mt7621-wdt.yaml | 7 ++ + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 6 + + .../devicetree/bindings/watchdog/meson-wdt.txt | 21 ---- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 96 ++++++++++++++-- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/watchdog.yaml | 7 +- + Documentation/watchdog/hpwdt.rst | 8 +- + drivers/watchdog/Kconfig | 4 +- + drivers/watchdog/apple_wdt.c | 18 +-- + drivers/watchdog/armada_37xx_wdt.c | 15 +-- + drivers/watchdog/aspeed_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 2 +- + drivers/watchdog/at91sam9_wdt.c | 7 +- + drivers/watchdog/bcm7038_wdt.c | 15 +-- + drivers/watchdog/cadence_wdt.c | 17 +-- + drivers/watchdog/da9062_wdt.c | 15 ++- + drivers/watchdog/da9063_wdt.c | 15 ++- + drivers/watchdog/davinci_wdt.c | 18 +-- + drivers/watchdog/dw_wdt.c | 1 + + drivers/watchdog/iTCO_wdt.c | 4 +- + drivers/watchdog/imgpdc_wdt.c | 31 +----- + drivers/watchdog/imx2_wdt.c | 55 +++++++++- + drivers/watchdog/imx7ulp_wdt.c | 15 +-- + drivers/watchdog/lpc18xx_wdt.c | 30 +---- + drivers/watchdog/meson_gxbb_wdt.c | 16 +-- + drivers/watchdog/mt7621_wdt.c | 122 ++++++++++++++------- + drivers/watchdog/mtk_wdt.c | 7 ++ + drivers/watchdog/of_xilinx_wdt.c | 16 +-- + drivers/watchdog/pcwd_usb.c | 6 +- + drivers/watchdog/pic32-dmt.c | 15 +-- + drivers/watchdog/pic32-wdt.c | 17 +-- + drivers/watchdog/pnx4008_wdt.c | 15 +-- + drivers/watchdog/qcom-wdt.c | 16 +-- + drivers/watchdog/realtek_otto_wdt.c | 17 +-- + drivers/watchdog/rtd119x_wdt.c | 16 +-- + drivers/watchdog/rzg2l_wdt.c | 45 +++++++- + drivers/watchdog/rzn1_wdt.c | 18 +-- + drivers/watchdog/sbsa_gwdt.c | 1 + + drivers/watchdog/visconti_wdt.c | 17 +-- + drivers/watchdog/watchdog_dev.c | 23 +++- + drivers/watchdog/wdat_wdt.c | 6 +- + drivers/watchdog/ziirave_wdt.c | 5 +- + 47 files changed, 531 insertions(+), 459 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/qcom,msm-timer.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt +Merging iommu/next (bedd29d793da Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/host1x/cdma.c +Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +Auto-merging drivers/iommu/arm/arm-smmu/qcom_iommu.c +Auto-merging drivers/media/platform/qcom/venus/firmware.c +Auto-merging drivers/net/ipa/ipa_mem.c +Auto-merging drivers/net/wireless/ath/ath11k/ahb.c +Auto-merging include/acpi/actbl1.h +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-event_source-devices-iommu | 37 + + .../devicetree/bindings/iommu/apple,dart.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 66 +- + .../devicetree/bindings/iommu/qcom,iommu.txt | 1 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../bindings/reserved-memory/reserved-memory.yaml | 89 ++- + MAINTAINERS | 1 - + arch/arm/mm/dma-mapping.c | 11 +- + arch/s390/include/asm/pci_dma.h | 5 +- + arch/s390/pci/pci_dma.c | 31 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/host1x/cdma.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 8 +- + drivers/iommu/Kconfig | 18 +- + drivers/iommu/amd/init.c | 16 +- + drivers/iommu/amd/iommu.c | 89 ++- + drivers/iommu/apple-dart.c | 632 +++++++++++---- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 23 - + drivers/iommu/dma-iommu.c | 21 +- + drivers/iommu/exynos-iommu.c | 216 +++-- + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel/Kconfig | 11 + + drivers/iommu/intel/Makefile | 1 + + drivers/iommu/intel/dmar.c | 33 +- + drivers/iommu/intel/iommu.c | 122 ++- + drivers/iommu/intel/iommu.h | 115 ++- + drivers/iommu/intel/pasid.c | 20 +- + drivers/iommu/intel/perfmon.c | 877 +++++++++++++++++++++ + drivers/iommu/intel/perfmon.h | 64 ++ + drivers/iommu/intel/svm.c | 90 +-- + drivers/iommu/iommu-traces.c | 1 - + drivers/iommu/iommu.c | 171 ++-- + drivers/iommu/iommufd/pages.c | 6 +- + drivers/iommu/ipmmu-vmsa.c | 28 - + drivers/iommu/msm_iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 9 - + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/iommu/of_iommu.c | 96 +++ + drivers/iommu/omap-iommu.c | 6 +- + drivers/iommu/rockchip-iommu.c | 1 - + drivers/iommu/s390-iommu.c | 22 +- + drivers/iommu/sprd-iommu.c | 16 - + drivers/iommu/sun50i-iommu.c | 1 - + drivers/iommu/tegra-gart.c | 6 +- + drivers/iommu/tegra-smmu.c | 5 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/net/ipa/ipa_mem.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 4 +- + drivers/of/address.c | 41 + + drivers/remoteproc/remoteproc_core.c | 5 +- + drivers/vfio/vfio_iommu_type1.c | 9 +- + drivers/vhost/vdpa.c | 2 +- + include/acpi/actbl1.h | 2 +- + include/linux/cpuhotplug.h | 1 + + include/linux/dmar.h | 1 + + include/linux/intel-svm.h | 16 - + include/linux/iommu.h | 39 +- + include/linux/of_address.h | 2 + + include/linux/of_iommu.h | 8 + + include/trace/events/iommu.h | 7 - + 63 files changed, 2493 insertions(+), 646 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-iommu + create mode 100644 drivers/iommu/intel/perfmon.c + create mode 100644 drivers/iommu/intel/perfmon.h + delete mode 100644 include/linux/intel-svm.h +Merging audit/next (6c6cd913accd audit: update the mailing list in MAINTAINERS) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (39459ce717b8 of: dynamic: add lifecycle docbook info to node creation functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/display/msm/dp-controller.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml +Auto-merging Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +Auto-merging Documentation/devicetree/bindings/reserved-memory/reserved-memory.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/of/of_reserved_mem.c +Auto-merging drivers/of/platform.c +Resolved 'Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d7df9d778994] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/Makefile | 2 +- + .../bindings/ata/intel,ixp4xx-compact-flash.yaml | 1 + + .../bindings/clock/socionext,uniphier-clock.yaml | 39 +---- + .../bindings/display/bridge/sil,sii8620.yaml | 108 ++++++++++++ + .../bindings/display/bridge/sil-sii8620.txt | 33 ---- + .../bindings/display/msm/dp-controller.yaml | 3 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 +- + .../bindings/display/tegra/nvidia,tegra20-dc.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-epp.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr2d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-hdmi.yaml | 3 +- + .../display/tegra/nvidia,tegra20-host1x.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-tvo.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 3 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 9 +- + .../devicetree/bindings/firmware/arm,scmi.yaml | 43 +++-- + .../bindings/fuse/nvidia,tegra20-fuse.yaml | 3 +- + .../devicetree/bindings/i2c/i2c-synquacer.txt | 29 ---- + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 2 + + .../bindings/i2c/socionext,synquacer-i2c.yaml | 58 +++++++ + .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 3 +- + .../socionext,synquacer-exiu.txt | 31 ---- + .../socionext,synquacer-exiu.yaml | 53 ++++++ + .../intel,ixp4xx-expansion-bus-controller.yaml | 66 +------- + .../intel,ixp4xx-expansion-peripheral-props.yaml | 80 +++++++++ + .../memory-controllers/mc-peripheral-props.yaml | 1 + + .../bindings/memory-controllers/ti,gpmc.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 3 +- + .../devicetree/bindings/mtd/mtd-physmap.yaml | 1 + + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 101 ++++++------ + .../bindings/pci/rockchip,rk3399-pcie-common.yaml | 69 ++++++++ + .../bindings/pci/rockchip,rk3399-pcie-ep.yaml | 68 ++++++++ + .../bindings/pci/rockchip,rk3399-pcie.yaml | 132 +++++++++++++++ + .../devicetree/bindings/pci/rockchip-pcie-ep.txt | 62 ------- + .../devicetree/bindings/pci/rockchip-pcie-host.txt | 135 --------------- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 14 +- + .../devicetree/bindings/perf/riscv,pmu.yaml | 161 ++++++++++++++++++ + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 3 +- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 3 +- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 24 +-- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 41 ++--- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 29 ++-- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 26 +-- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 17 +- + .../devicetree/bindings/power/power-domain.yaml | 3 - + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 3 +- + .../regulator/socionext,uniphier-regulator.yaml | 21 +-- + .../bindings/reserved-memory/reserved-memory.yaml | 12 +- + .../reset/socionext,uniphier-glue-reset.yaml | 23 +-- + .../bindings/reset/socionext,uniphier-reset.yaml | 52 +----- + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../devicetree/bindings/serial/serial.yaml | 2 +- + .../soc/socionext/socionext,uniphier-adamv.yaml | 50 ++++++ + .../socionext/socionext,uniphier-ahci-glue.yaml | 77 +++++++++ + .../socionext/socionext,uniphier-dwc3-glue.yaml | 106 ++++++++++++ + .../soc/socionext/socionext,uniphier-mioctrl.yaml | 65 ++++++++ + .../soc/socionext/socionext,uniphier-perictrl.yaml | 64 +++++++ + .../soc/socionext/socionext,uniphier-sdctrl.yaml | 61 +++++++ + .../socionext,uniphier-soc-glue-debug.yaml | 68 ++++++++ + .../soc/socionext/socionext,uniphier-soc-glue.yaml | 114 +++++++++++++ + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 ++++++++++++ + .../devicetree/bindings/soc/ti/k3-ringacc.yaml | 13 +- + .../thermal/socionext,uniphier-thermal.yaml | 15 +- + .../devicetree/bindings/ufs/qcom,ufs.yaml | 3 + + .../devicetree/bindings/usb/fcs,fusb302.txt | 34 ---- + .../devicetree/bindings/usb/fcs,fusb302.yaml | 67 ++++++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/maxim,max63xx.yaml | 1 + + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- + MAINTAINERS | 7 +- + Makefile | 9 +- + drivers/of/Kconfig | 14 +- + drivers/of/base.c | 3 +- + drivers/of/dynamic.c | 31 +++- + drivers/of/irq.c | 12 +- + drivers/of/kobj.c | 2 +- + drivers/of/of_reserved_mem.c | 10 ++ + drivers/of/overlay.c | 2 +- + drivers/of/platform.c | 7 +- + drivers/of/property.c | 4 +- + drivers/of/unittest-data/testcases_common.dtsi | 1 + + drivers/of/unittest-data/tests-lifecycle.dtsi | 8 + + drivers/of/unittest.c | 148 ++++++++++++++++- + include/dt-bindings/gpio/gpio.h | 2 +- + include/linux/of.h | 30 +++- + scripts/dtc/dtc-parser.y | 11 +- + scripts/dtc/libfdt/fdt.h | 4 +- + scripts/dtc/of_unittest_expect | 183 ++++++++++++++++++--- + scripts/dtc/version_gen.h | 2 +- + 92 files changed, 2156 insertions(+), 792 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii8620.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-synquacer.txt + create mode 100644 Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.yaml + rename Documentation/devicetree/bindings/{bus => memory-controllers}/intel,ixp4xx-expansion-bus-controller.yaml (57%) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-ep.txt + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt + create mode 100644 Documentation/devicetree/bindings/perf/riscv,pmu.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-adamv.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-ahci-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-dwc3-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-mioctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-perictrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sdctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue-debug.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sysctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.txt + create mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.yaml + create mode 100644 drivers/of/unittest-data/tests-lifecycle.dtsi +Merging dt-krzk/for-next (825475539974 Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 6 +++-- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 8 ++++--- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 6 +++-- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 10 ++++---- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 4 +++- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 4 ++-- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 4 +++- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 4 +++- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 10 ++++---- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 15 +++++++++++- + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 6 +++-- + .../bindings/pinctrl/qcom,sdx65-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6115-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6125-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6350-tlmm.yaml | 27 ++++++++++++++++++---- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 8 ++++--- + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 4 +++- + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 6 +++-- + .../bindings/pinctrl/qcom,sm8350-tlmm.yaml | 18 +++++++++++---- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 5 ++-- + 39 files changed, 164 insertions(+), 63 deletions(-) +Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550) +$ 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 (de82c25dab9a Merge remote-tracking branch 'spi/for-6.3' 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/trivial-devices.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/spi/Makefile +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7d9a3ed3998d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 32 +- + .../bindings/spi/amlogic,meson6-spifc.yaml | 28 +- + .../bindings/spi/aspeed,ast2600-fmc.yaml | 26 +- + .../bindings/spi/brcm,bcm63xx-hsspi.yaml | 134 +++++ + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml | 156 ++--- + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 36 +- + .../devicetree/bindings/spi/cdns,xspi.yaml | 6 +- + .../devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml | 2 +- + .../devicetree/bindings/spi/fsl-imx-cspi.yaml | 2 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 2 +- + .../bindings/spi/mediatek,spi-mtk-snfi.yaml | 54 +- + .../bindings/spi/mediatek,spi-slave-mt27xx.yaml | 2 +- + .../bindings/spi/mikrotik,rb4xx-spi.yaml | 2 +- + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- + Documentation/devicetree/bindings/spi/mxs-spi.yaml | 2 +- + .../bindings/spi/nvidia,tegra210-quad.yaml | 44 +- + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 11 +- + .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 2 +- + .../devicetree/bindings/spi/renesas,rspi.yaml | 22 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 +- + .../devicetree/bindings/spi/spi-bcm63xx-hsspi.txt | 33 -- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 2 +- + .../devicetree/bindings/spi/spi-gpio.yaml | 4 +- + Documentation/devicetree/bindings/spi/spi-mux.yaml | 4 +- + .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 2 +- + .../bindings/spi/spi-peripheral-props.yaml | 10 + + .../devicetree/bindings/spi/spi-pl022.yaml | 18 +- + .../devicetree/bindings/spi/spi-rockchip.yaml | 2 +- + .../devicetree/bindings/spi/spi-sifive.yaml | 6 +- + .../devicetree/bindings/spi/spi-st-ssc.txt | 40 -- + .../bindings/spi/spi-sunplus-sp7021.yaml | 6 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../devicetree/bindings/spi/sprd,spi-adi.yaml | 5 +- + .../devicetree/bindings/spi/st,ssc-spi.yaml | 61 ++ + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 2 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 25 +- + .../devicetree/bindings/spi/xlnx,zynq-qspi.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 14 + + Documentation/spi/pxa2xx.rst | 12 +- + Documentation/spi/spi-lm70llp.rst | 2 +- + Documentation/spi/spi-summary.rst | 2 +- + MAINTAINERS | 12 + + drivers/spi/Kconfig | 38 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 8 +- + drivers/spi/spi-altera-core.c | 30 +- + drivers/spi/spi-altera-dfl.c | 36 +- + drivers/spi/spi-altera-platform.c | 36 +- + drivers/spi/spi-ar934x.c | 10 +- + drivers/spi/spi-armada-3700.c | 98 +-- + drivers/spi/spi-at91-usart.c | 40 +- + drivers/spi/spi-ath79.c | 40 +- + drivers/spi/spi-atmel.c | 254 ++++---- + drivers/spi/spi-bcm63xx-hsspi.c | 493 ++++++++++++++-- + drivers/spi/spi-bcmbca-hsspi.c | 654 +++++++++++++++++++++ + drivers/spi/spi-cadence-quadspi.c | 42 +- + drivers/spi/spi-geni-qcom.c | 211 +++++-- + drivers/spi/spi-intel-pci.c | 13 +- + drivers/spi/spi-intel.c | 2 +- + drivers/spi/spi-loopback-test.c | 8 +- + drivers/spi/spi-mem.c | 2 +- + drivers/spi/spi-mtk-snfi.c | 41 +- + drivers/spi/spi-pl022.c | 1 - + drivers/spi/spi-synquacer.c | 7 +- + drivers/spi/spi-xilinx.c | 9 +- + drivers/spi/spi.c | 69 ++- + drivers/spi/spidev.c | 14 +- + include/linux/spi/altera.h | 4 +- + include/linux/spi/spi.h | 32 +- + include/linux/spi/xilinx_spi.h | 1 + + 74 files changed, 2271 insertions(+), 764 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-st-ssc.txt + create mode 100644 Documentation/devicetree/bindings/spi/st,ssc-spi.yaml + create mode 100644 drivers/spi/spi-bcmbca-hsspi.c +Merging tip/master (be97fc4ad26c Merge branch into tip/master: 'x86/vdso') +$ 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/cgroup-v2.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/scheduler/index.rst +Auto-merging Documentation/x86/resctrl.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging arch/arm/mach-omap2/pm.h +CONFLICT (modify/delete): arch/arm/mach-omap2/pm24xx.c deleted in HEAD and modified in tip/master. Version tip/master of arch/arm/mach-omap2/pm24xx.c left in tree. +Auto-merging arch/arm/mach-omap2/powerdomain.c +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/riscv/Kconfig +Auto-merging arch/s390/kernel/idle.c +CONFLICT (content): Merge conflict in arch/s390/kernel/idle.c +Auto-merging arch/s390/kernel/perf_cpum_cf.c +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Auto-merging arch/s390/kernel/perf_pai_ext.c +Auto-merging arch/s390/kernel/vmlinux.lds.S +Auto-merging arch/x86/kernel/asm-offsets.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging drivers/acpi/processor_idle.c +Auto-merging drivers/base/power/runtime.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/cpuidle/cpuidle-psci.c +Auto-merging drivers/cpuidle/cpuidle-qcom-spm.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging drivers/irqchip/irq-gic-v3.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging drivers/perf/arm_pmu.c +Auto-merging fs/exec.c +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/trace/bpf_trace.c +Resolved 'arch/s390/kernel/idle.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-omap2/pm24xx.c +rm 'arch/arm/mach-omap2/pm24xx.c' +$ git commit --no-edit -v -a +[master 8f361a588178] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-hypervisor-xen | 13 + + Documentation/admin-guide/cgroup-v2.rst | 3 + + Documentation/admin-guide/hw-vuln/spectre.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 18 +- + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/timer/riscv,timer.yaml | 52 + + .../bindings/timer/rockchip,rk-timer.yaml | 1 + + .../devicetree/bindings/timer/sifive,clint.yaml | 8 + + Documentation/kernel-hacking/locking.rst | 4 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-util-clamp.rst | 741 ++++++++++++ + .../translations/it_IT/kernel-hacking/locking.rst | 4 +- + Documentation/x86/resctrl.rst | 147 ++- + MAINTAINERS | 2 + + arch/alpha/kernel/process.c | 1 - + arch/alpha/kernel/vmlinux.lds.S | 1 - + arch/arc/kernel/process.c | 3 + + arch/arc/kernel/vmlinux.lds.S | 1 - + arch/arm/include/asm/vmlinux.lds.h | 1 - + arch/arm/kernel/cpuidle.c | 4 +- + arch/arm/kernel/process.c | 1 - + arch/arm/kernel/smp.c | 6 +- + arch/arm/mach-davinci/cpuidle.c | 4 +- + arch/arm/mach-gemini/board-dt.c | 3 +- + arch/arm/mach-imx/cpuidle-imx5.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 8 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 9 +- + arch/arm/mach-imx/cpuidle-imx7ulp.c | 4 +- + arch/arm/mach-omap2/common.h | 6 +- + arch/arm/mach-omap2/cpuidle34xx.c | 16 +- + arch/arm/mach-omap2/cpuidle44xx.c | 29 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 +- + arch/arm/mach-omap2/pm.h | 2 +- + arch/arm/mach-omap2/pm34xx.c | 14 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 10 +- + arch/arm/mach-s3c/cpuidle-s3c64xx.c | 5 +- + arch/arm64/kernel/cpuidle.c | 6 +- + arch/arm64/kernel/idle.c | 1 - + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/suspend.c | 12 +- + arch/arm64/kernel/vmlinux.lds.S | 1 - + arch/csky/kernel/process.c | 1 - + arch/csky/kernel/smp.c | 2 +- + arch/csky/kernel/vmlinux.lds.S | 1 - + arch/hexagon/kernel/process.c | 1 - + arch/hexagon/kernel/vmlinux.lds.S | 1 - + arch/ia64/kernel/process.c | 1 + + arch/ia64/kernel/time.c | 1 + + arch/ia64/kernel/vmlinux.lds.S | 1 - + arch/loongarch/kernel/idle.c | 1 + + arch/loongarch/kernel/vmlinux.lds.S | 1 - + arch/m68k/kernel/vmlinux-nommu.lds | 1 - + arch/m68k/kernel/vmlinux-std.lds | 1 - + arch/m68k/kernel/vmlinux-sun3.lds | 1 - + arch/microblaze/kernel/process.c | 1 - + arch/microblaze/kernel/vmlinux.lds.S | 1 - + arch/mips/kernel/idle.c | 14 +- + arch/mips/kernel/vmlinux.lds.S | 1 - + arch/nios2/kernel/process.c | 1 - + arch/nios2/kernel/vmlinux.lds.S | 1 - + arch/openrisc/kernel/process.c | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 - + arch/parisc/kernel/process.c | 2 - + arch/parisc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kernel/idle.c | 5 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/perf/core-book3s.c | 3 +- + arch/riscv/Kconfig | 1 - + arch/riscv/kernel/process.c | 1 - + arch/riscv/kernel/time.c | 10 +- + arch/riscv/kernel/vmlinux-xip.lds.S | 1 - + arch/riscv/kernel/vmlinux.lds.S | 1 - + arch/s390/kernel/idle.c | 3 +- + arch/s390/kernel/perf_cpum_cf.c | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 3 +- + arch/s390/kernel/perf_pai_crypto.c | 4 +- + arch/s390/kernel/perf_pai_ext.c | 4 +- + arch/s390/kernel/vmlinux.lds.S | 1 - + arch/s390/kernel/vtime.c | 2 +- + arch/sh/kernel/idle.c | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 - + arch/sparc/kernel/leon_pmc.c | 4 + + arch/sparc/kernel/process_32.c | 1 - + arch/sparc/kernel/process_64.c | 3 +- + arch/sparc/kernel/vmlinux.lds.S | 1 - + arch/um/kernel/dyn.lds.S | 1 - + arch/um/kernel/process.c | 1 - + arch/um/kernel/uml.lds.S | 1 - + arch/x86/Kconfig | 6 +- + arch/x86/Makefile | 6 +- + arch/x86/boot/compressed/head_32.S | 2 +- + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/boot/compressed/misc.c | 18 +- + arch/x86/boot/compressed/vmlinux.lds.S | 1 + + arch/x86/coco/tdx/tdcall.S | 96 +- + arch/x86/coco/tdx/tdx.c | 87 +- + arch/x86/entry/entry_64.S | 11 +- + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/entry/vdso/vdso2c.h | 6 + + arch/x86/entry/vdso/vdso32-setup.c | 9 - + arch/x86/entry/vdso/vdso32/fake_32bit_build.h | 25 + + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 27 +- + arch/x86/entry/vdso/vdso32/vdso32.lds.S | 1 + + arch/x86/entry/vdso/vdso32/vgetcpu.c | 3 + + arch/x86/entry/vdso/vgetcpu.c | 3 +- + arch/x86/entry/vdso/vma.c | 19 +- + arch/x86/events/amd/brs.c | 13 +- + arch/x86/events/amd/core.c | 6 +- + arch/x86/events/amd/ibs.c | 9 +- + arch/x86/events/intel/core.c | 199 +++- + arch/x86/events/intel/ds.c | 133 ++- + arch/x86/events/intel/lbr.c | 4 +- + arch/x86/events/intel/uncore.c | 41 +- + arch/x86/events/intel/uncore.h | 5 + + arch/x86/events/intel/uncore_discovery.c | 60 +- + arch/x86/events/intel/uncore_discovery.h | 14 +- + arch/x86/events/intel/uncore_snb.c | 161 +++ + arch/x86/events/intel/uncore_snbep.c | 158 ++- + arch/x86/events/perf_event.h | 23 +- + arch/x86/events/zhaoxin/core.c | 8 +- + arch/x86/include/asm/alternative.h | 132 ++- + arch/x86/include/asm/asm-prototypes.h | 1 + + arch/x86/include/asm/atomic64_32.h | 44 +- + arch/x86/include/asm/atomic64_64.h | 36 +- + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 15 +- + arch/x86/include/asm/debugreg.h | 9 +- + arch/x86/include/asm/disabled-features.h | 3 +- + arch/x86/include/asm/fpu/sched.h | 2 +- + arch/x86/include/asm/fpu/types.h | 2 +- + arch/x86/include/asm/fpu/xcr.h | 4 +- + arch/x86/include/asm/gsseg.h | 66 ++ + arch/x86/include/asm/irqflags.h | 11 +- + arch/x86/include/asm/kvmclock.h | 2 +- + arch/x86/include/asm/mce.h | 3 + + arch/x86/include/asm/microcode.h | 4 +- + arch/x86/include/asm/microcode_amd.h | 4 +- + arch/x86/include/asm/mmu_context.h | 1 + + arch/x86/include/asm/msr-index.h | 11 + + arch/x86/include/asm/mwait.h | 14 +- + arch/x86/include/asm/nospec-branch.h | 4 +- + arch/x86/include/asm/orc_types.h | 4 +- + arch/x86/include/asm/paravirt.h | 8 +- + arch/x86/include/asm/perf_event.h | 10 +- + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/pvclock.h | 3 +- + arch/x86/include/asm/required-features.h | 3 +- + arch/x86/include/asm/segment.h | 8 +- + arch/x86/include/asm/shared/io.h | 4 +- + arch/x86/include/asm/shared/tdx.h | 7 +- + arch/x86/include/asm/special_insns.h | 29 +- + arch/x86/include/asm/text-patching.h | 31 + + arch/x86/include/asm/thread_info.h | 5 + + arch/x86/include/asm/time.h | 1 + + arch/x86/include/asm/unwind_hints.h | 10 +- + arch/x86/include/asm/vdso.h | 2 +- + arch/x86/include/asm/vdso/gettimeofday.h | 2 + + arch/x86/include/asm/vdso/processor.h | 4 + + arch/x86/include/asm/xen/hypercall.h | 2 +- + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/acpi/boot.c | 35 +- + arch/x86/kernel/alternative.c | 76 +- + arch/x86/kernel/asm-offsets.c | 6 + + arch/x86/kernel/cpu/amd.c | 49 +- + arch/x86/kernel/cpu/bugs.c | 33 +- + arch/x86/kernel/cpu/cacheinfo.c | 5 +- + arch/x86/kernel/cpu/common.c | 79 +- + arch/x86/kernel/cpu/cpu.h | 2 - + arch/x86/kernel/cpu/cpuid-deps.c | 2 + + arch/x86/kernel/cpu/mce/amd.c | 12 +- + arch/x86/kernel/cpu/mce/core.c | 32 +- + arch/x86/kernel/cpu/mce/dev-mcelog.c | 3 +- + arch/x86/kernel/cpu/mce/internal.h | 44 + + arch/x86/kernel/cpu/microcode/amd.c | 76 +- + arch/x86/kernel/cpu/microcode/core.c | 45 +- + arch/x86/kernel/cpu/microcode/intel.c | 44 +- + arch/x86/kernel/cpu/resctrl/core.c | 54 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 13 +- + arch/x86/kernel/cpu/resctrl/internal.h | 28 + + arch/x86/kernel/cpu/resctrl/monitor.c | 30 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 307 ++++- + arch/x86/kernel/cpu/scattered.c | 2 + + arch/x86/kernel/cpu/tsx.c | 1 + + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/e820.c | 6 +- + arch/x86/kernel/fpu/context.h | 2 +- + arch/x86/kernel/fpu/core.c | 6 +- + arch/x86/kernel/hpet.c | 2 + + arch/x86/kernel/hw_breakpoint.c | 4 +- + arch/x86/kernel/kprobes/core.c | 72 +- + arch/x86/kernel/kvmclock.c | 6 +- + arch/x86/kernel/paravirt.c | 15 +- + arch/x86/kernel/process.c | 65 +- + arch/x86/kernel/pvclock.c | 22 +- + arch/x86/kernel/rtc.c | 9 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/signal_32.c | 128 +++ + arch/x86/kernel/signal_64.c | 127 +++ + arch/x86/kernel/signal_compat.c | 191 ---- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/static_call.c | 50 +- + arch/x86/kernel/tls.c | 1 + + arch/x86/kernel/tsc.c | 75 +- + arch/x86/kernel/unwind_orc.c | 5 +- + arch/x86/kernel/vmlinux.lds.S | 1 - + arch/x86/kvm/cpuid.c | 41 +- + arch/x86/kvm/reverse_cpuid.h | 1 + + arch/x86/kvm/svm/svm.c | 3 + + arch/x86/kvm/x86.c | 3 + + arch/x86/lib/cmdline.c | 4 +- + arch/x86/lib/memcpy_64.S | 5 +- + arch/x86/lib/memmove_64.S | 4 +- + arch/x86/lib/memset_64.S | 4 +- + arch/x86/lib/misc.c | 2 + + arch/x86/lib/x86-opcode-map.txt | 1 + + arch/x86/mm/pat/memtype.c | 4 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/irq.c | 2 +- + arch/x86/xen/smp.h | 2 + + arch/x86/xen/smp_pv.c | 17 +- + arch/x86/xen/time.c | 12 +- + arch/x86/xen/xen-head.S | 7 + + arch/xtensa/kernel/process.c | 1 + + arch/xtensa/kernel/vmlinux.lds.S | 1 - + block/blk-mq-cpumap.c | 63 +- + drivers/acpi/processor_idle.c | 28 +- + drivers/base/power/runtime.c | 24 +- + drivers/clk/clk.c | 8 +- + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/acpi_pm.c | 6 +- + drivers/clocksource/em_sti.c | 7 +- + drivers/clocksource/sh_cmt.c | 7 +- + drivers/clocksource/sh_tmu.c | 7 +- + drivers/clocksource/timer-microchip-pit64b.c | 12 + + drivers/clocksource/timer-riscv.c | 27 +- + drivers/clocksource/timer-sun4i.c | 3 +- + drivers/cpuidle/cpuidle-arm.c | 4 +- + drivers/cpuidle/cpuidle-big_little.c | 12 +- + drivers/cpuidle/cpuidle-mvebu-v7.c | 15 +- + drivers/cpuidle/cpuidle-psci.c | 22 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 4 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 19 +- + drivers/cpuidle/cpuidle-tegra.c | 31 +- + drivers/cpuidle/cpuidle.c | 72 +- + drivers/cpuidle/dt_idle_states.c | 2 +- + drivers/cpuidle/poll_state.c | 8 +- + drivers/edac/skx_common.c | 2 +- + drivers/firmware/psci/psci.c | 42 +- + drivers/idle/intel_idle.c | 19 +- + drivers/irqchip/irq-apple-aic.c | 4 +- + drivers/irqchip/irq-armada-370-xp.c | 3 +- + drivers/irqchip/irq-bcm2836.c | 5 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-gic-v4.c | 9 +- + drivers/irqchip/irq-gic.c | 4 +- + drivers/perf/arm_pmu.c | 11 +- + drivers/perf/riscv_pmu_sbi.c | 8 +- + drivers/vdpa/vdpa_user/iova_domain.h | 1 - + drivers/xen/sys-hypervisor.c | 69 +- + fs/binfmt_elf.c | 5 + + fs/exec.c | 4 + + include/asm-generic/vmlinux.lds.h | 9 +- + include/linux/auxvec.h | 2 +- + include/linux/bits.h | 1 - + include/linux/clockchips.h | 4 +- + include/linux/compiler_types.h | 18 +- + include/linux/context_tracking.h | 27 + + include/linux/cpu.h | 3 - + include/linux/cpuidle.h | 50 +- + include/linux/cpumask.h | 4 +- + include/linux/group_cpus.h | 14 + + include/linux/lockdep.h | 1 - + include/linux/math64.h | 4 +- + include/linux/mm.h | 25 + + include/linux/mm_types.h | 43 +- + include/linux/objtool.h | 11 +- + include/linux/percpu-defs.h | 2 +- + include/linux/perf_event.h | 172 ++- + include/linux/resctrl.h | 11 + + include/linux/sched.h | 9 + + include/linux/sched/clock.h | 8 +- + include/linux/sched/cputime.h | 9 - + include/linux/sched/idle.h | 40 +- + include/linux/thread_info.h | 18 +- + include/linux/trace_recursion.h | 18 + + include/linux/tracepoint.h | 15 +- + include/trace/events/rseq.h | 7 +- + include/uapi/linux/auxvec.h | 2 + + include/uapi/linux/membarrier.h | 4 + + include/uapi/linux/rseq.h | 22 + + include/vdso/bits.h | 1 + + init/Kconfig | 4 + + kernel/context_tracking.c | 12 +- + kernel/cpu_pm.c | 9 - + kernel/events/core.c | 207 ++-- + kernel/exit.c | 7 + + kernel/fork.c | 8 +- + kernel/irq/affinity.c | 405 +------ + kernel/irq/manage.c | 5 +- + kernel/locking/lockdep.c | 3 + + kernel/locking/qspinlock.c | 4 +- + kernel/locking/rwsem.c | 87 +- + kernel/panic.c | 5 + + kernel/printk/printk.c | 2 +- + kernel/ptrace.c | 2 +- + kernel/rseq.c | 65 +- + kernel/sched/clock.c | 27 +- + kernel/sched/core.c | 134 ++- + kernel/sched/cpufreq_schedutil.c | 43 +- + kernel/sched/cputime.c | 4 + + kernel/sched/deadline.c | 42 +- + kernel/sched/fair.c | 389 ++++--- + kernel/sched/idle.c | 47 +- + kernel/sched/membarrier.c | 39 +- + kernel/sched/rt.c | 5 +- + kernel/sched/sched.h | 107 +- + kernel/sched/topology.c | 4 +- + kernel/signal.c | 2 + + kernel/time/Kconfig | 6 +- + kernel/time/clocksource.c | 72 +- + kernel/time/hrtimer.c | 18 +- + kernel/time/posix-cpu-timers.c | 13 +- + kernel/time/posix-stubs.c | 2 + + kernel/time/posix-timers.c | 2 + + kernel/time/test_udelay.c | 2 +- + kernel/time/tick-broadcast-hrtimer.c | 29 +- + kernel/time/tick-broadcast.c | 6 +- + kernel/trace/bpf_trace.c | 6 +- + kernel/trace/trace.c | 3 + + kernel/trace/trace_preemptirq.c | 61 +- + lib/Makefile | 2 + + lib/bug.c | 15 +- + lib/group_cpus.c | 428 +++++++ + lib/ubsan.c | 5 +- + mm/kasan/kasan.h | 4 + + mm/kasan/shadow.c | 38 + + scripts/head-object-list.txt | 6 - + tools/arch/x86/include/asm/cpufeatures.h | 1 + + tools/arch/x86/include/asm/orc_types.h | 4 +- + tools/arch/x86/lib/x86-opcode-map.txt | 1 + + tools/include/linux/objtool.h | 11 +- + tools/objtool/.gitignore | 1 + + tools/objtool/Build | 2 - + tools/objtool/Documentation/objtool.txt | 8 + + tools/objtool/Makefile | 66 +- + tools/objtool/arch/powerpc/decode.c | 22 +- + tools/objtool/arch/x86/decode.c | 107 +- + tools/objtool/arch/x86/include/arch/special.h | 6 +- + tools/objtool/builtin-check.c | 2 +- + tools/objtool/check.c | 389 ++++--- + tools/objtool/elf.c | 42 +- + tools/objtool/include/objtool/arch.h | 6 +- + tools/objtool/include/objtool/builtin.h | 2 - + tools/objtool/include/objtool/check.h | 61 +- + tools/objtool/include/objtool/elf.h | 9 +- + tools/objtool/include/objtool/objtool.h | 1 - + tools/objtool/include/objtool/special.h | 2 +- + tools/objtool/objtool.c | 1 - + tools/objtool/orc_dump.c | 4 +- + tools/objtool/special.c | 6 +- + tools/testing/selftests/kvm/rseq_test.c | 16 +- + .../selftests/membarrier/membarrier_test_impl.h | 33 + + .../membarrier/membarrier_test_multi_thread.c | 2 +- + .../membarrier/membarrier_test_single_thread.c | 6 +- + tools/testing/selftests/rseq/.gitignore | 4 + + tools/testing/selftests/rseq/Makefile | 20 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 46 +- + tools/testing/selftests/rseq/basic_test.c | 4 + + tools/testing/selftests/rseq/compiler.h | 6 + + tools/testing/selftests/rseq/param_test.c | 157 ++- + tools/testing/selftests/rseq/rseq-abi.h | 22 + + tools/testing/selftests/rseq/rseq-arm-bits.h | 505 +++++++++ + tools/testing/selftests/rseq/rseq-arm.h | 701 +----------- + tools/testing/selftests/rseq/rseq-arm64-bits.h | 392 +++++++ + tools/testing/selftests/rseq/rseq-arm64.h | 520 +-------- + tools/testing/selftests/rseq/rseq-bits-reset.h | 11 + + tools/testing/selftests/rseq/rseq-bits-template.h | 41 + + tools/testing/selftests/rseq/rseq-mips-bits.h | 462 ++++++++ + tools/testing/selftests/rseq/rseq-mips.h | 646 +---------- + tools/testing/selftests/rseq/rseq-ppc-bits.h | 454 ++++++++ + tools/testing/selftests/rseq/rseq-ppc.h | 617 +--------- + tools/testing/selftests/rseq/rseq-riscv-bits.h | 410 +++++++ + tools/testing/selftests/rseq/rseq-riscv.h | 529 +-------- + tools/testing/selftests/rseq/rseq-s390-bits.h | 474 ++++++++ + tools/testing/selftests/rseq/rseq-s390.h | 495 +------- + tools/testing/selftests/rseq/rseq-skip.h | 65 -- + tools/testing/selftests/rseq/rseq-x86-bits.h | 993 ++++++++++++++++ + tools/testing/selftests/rseq/rseq-x86.h | 1193 +------------------- + tools/testing/selftests/rseq/rseq.c | 91 +- + tools/testing/selftests/rseq/rseq.h | 215 +++- + tools/testing/selftests/rseq/run_param_test.sh | 5 + + tools/testing/selftests/x86/test_vsyscall.c | 7 +- + 396 files changed, 10763 insertions(+), 7489 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/riscv,timer.yaml + create mode 100644 Documentation/scheduler/sched-util-clamp.rst + create mode 100644 arch/x86/entry/vdso/vdso32/fake_32bit_build.h + create mode 100644 arch/x86/entry/vdso/vdso32/vgetcpu.c + create mode 100644 arch/x86/include/asm/gsseg.h + delete mode 100644 arch/x86/kernel/signal_compat.c + create mode 100644 include/linux/group_cpus.h + create mode 100644 lib/group_cpus.c + create mode 100644 tools/testing/selftests/rseq/rseq-arm-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-arm64-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-reset.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-template.h + create mode 100644 tools/testing/selftests/rseq/rseq-mips-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-ppc-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-riscv-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-s390-bits.h + delete mode 100644 tools/testing/selftests/rseq/rseq-skip.h + create mode 100644 tools/testing/selftests/rseq/rseq-x86-bits.h +Merging clockevents/timers/drivers/next (ab407a1919d2 Merge tag 'clocksource.2023.02.06b' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into timers/core) +$ 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 (feac08675023 Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/edac/skx_common.c +Merge made by the 'ort' strategy. + .../memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml | 45 ++ + MAINTAINERS | 7 + + drivers/edac/Kconfig | 8 + + drivers/edac/Makefile | 1 + + drivers/edac/amd64_edac.c | 217 +--------- + drivers/edac/amd64_edac.h | 24 +- + drivers/edac/i10nm_base.c | 459 ++++++++++++++++---- + drivers/edac/qcom_edac.c | 7 + + drivers/edac/skx_common.c | 76 ++-- + drivers/edac/skx_common.h | 61 ++- + drivers/edac/zynqmp_edac.c | 467 +++++++++++++++++++++ + 11 files changed, 1013 insertions(+), 359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml + create mode 100644 drivers/edac/zynqmp_edac.c +Merging irqchip/irq/irqchip-next (a83bf176fed4 Merge branch irq/bcm-l2-fixes 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 +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/irq-apple-aic.c +CONFLICT (content): Merge conflict in drivers/irqchip/irq-apple-aic.c +Auto-merging kernel/irq/irqdomain.c +Resolved 'drivers/irqchip/irq-apple-aic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d395ce88be64] Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/platform/uv/uv_irq.c | 7 +- + drivers/irqchip/Kconfig | 3 +- + drivers/irqchip/irq-alpine-msi.c | 9 +- + drivers/irqchip/irq-apple-aic.c | 159 +------------ + drivers/irqchip/irq-aspeed-scu-ic.c | 5 +- + drivers/irqchip/irq-bcm7120-l2.c | 3 +- + drivers/irqchip/irq-brcmstb-l2.c | 6 +- + drivers/irqchip/irq-gic-v2m.c | 5 +- + drivers/irqchip/irq-gic-v3-its.c | 13 +- + drivers/irqchip/irq-gic-v3-mbi.c | 5 +- + drivers/irqchip/irq-loongson-liointc.c | 13 ++ + drivers/irqchip/irq-loongson-pch-msi.c | 9 +- + drivers/irqchip/irq-mvebu-gicp.c | 1 + + drivers/irqchip/irq-mvebu-odmi.c | 13 +- + drivers/irqchip/irq-ti-sci-intr.c | 1 + + drivers/irqchip/irqchip.c | 8 +- + include/linux/irq.h | 3 + + include/linux/irqdomain.h | 6 +- + kernel/irq/Kconfig | 5 + + kernel/irq/Makefile | 1 + + kernel/irq/ipi-mux.c | 206 +++++++++++++++++ + kernel/irq/irqdomain.c | 408 ++++++++++++++++++++------------- + 23 files changed, 537 insertions(+), 359 deletions(-) + create mode 100644 kernel/irq/ipi-mux.c +Merging ftrace/for-next (ca6cbe8c481a 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/trace/events.rst +Auto-merging Documentation/trace/histogram.rst +CONFLICT (content): Merge conflict in Documentation/trace/histogram.rst +Auto-merging Documentation/trace/kprobetrace.rst +CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst +Auto-merging include/linux/tracepoint.h +Auto-merging init/Kconfig +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_events.c +Resolved 'Documentation/trace/histogram.rst' using previous resolution. +Resolved 'Documentation/trace/kprobetrace.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7a2c9e3fb85e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/bootconfig.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 29 + + Documentation/tools/rtla/common_timerlat_aa.rst | 7 + + Documentation/tools/rtla/index.rst | 1 + + Documentation/tools/rtla/rtla-hwnoise.rst | 107 +++ + Documentation/tools/rtla/rtla-timerlat-top.rst | 164 ++-- + Documentation/trace/events.rst | 12 + + Documentation/trace/histogram.rst | 242 ++++- + Documentation/trace/kprobetrace.rst | 4 +- + include/linux/bootconfig.h | 2 +- + include/linux/kernel.h | 2 +- + include/linux/trace.h | 12 + + include/linux/trace_seq.h | 5 + + include/linux/tracepoint.h | 4 +- + include/trace/bpf_probe.h | 45 +- + include/trace/perf.h | 46 +- + include/trace/stages/stage3_trace_output.h | 3 + + include/trace/stages/stage6_event_callback.h | 3 + + include/trace/stages/stage7_class_define.h | 1 + + init/Kconfig | 13 + + init/main.c | 2 +- + kernel/trace/Kconfig | 20 +- + kernel/trace/kprobe_event_gen_test.c | 2 +- + kernel/trace/ring_buffer.c | 9 +- + kernel/trace/synth_event_gen_test.c | 2 +- + kernel/trace/trace.c | 166 +++- + kernel/trace/trace.h | 6 + + kernel/trace/trace_events.c | 13 +- + kernel/trace/trace_events_filter.c | 93 +- + kernel/trace/trace_events_hist.c | 126 ++- + kernel/trace/trace_events_synth.c | 90 +- + kernel/trace/trace_osnoise.c | 2 +- + kernel/trace/trace_probe.c | 2 + + kernel/trace/trace_probe.h | 1 + + kernel/trace/trace_seq.c | 23 + + kernel/trace/trace_synth.h | 1 + + kernel/tracepoint.c | 4 +- + samples/Kconfig | 7 + + samples/Makefile | 1 + + samples/ftrace/Makefile | 1 + + samples/ftrace/ftrace-direct-modify.c | 2 +- + samples/ftrace/ftrace-direct-multi-modify.c | 2 +- + samples/ftrace/ftrace-direct-multi.c | 2 +- + samples/ftrace/ftrace-direct-too.c | 2 +- + samples/ftrace/ftrace-direct.c | 2 +- + samples/ftrace/ftrace-ops.c | 252 ++++++ + samples/user_events/example.c | 4 +- + scripts/tracing/draw_functrace.py | 6 +- + tools/lib/api/fs/tracing_path.c | 4 +- + .../ftrace/test.d/filter/event-filter-function.tc | 58 ++ + .../ftrace/test.d/kprobe/kprobe_args_char.tc | 47 + + .../inter-event/trigger-synthetic-event-stack.tc | 24 + + .../inter-event/trigger-synthetic-event-syntax.tc | 6 + + tools/tracing/latency/latency-collector.c | 2 +- + tools/tracing/rtla/Makefile | 2 + + tools/tracing/rtla/src/osnoise.c | 117 +++ + tools/tracing/rtla/src/osnoise.h | 7 + + tools/tracing/rtla/src/osnoise_hist.c | 9 +- + tools/tracing/rtla/src/osnoise_top.c | 84 +- + tools/tracing/rtla/src/rtla.c | 4 + + tools/tracing/rtla/src/timerlat_aa.c | 990 +++++++++++++++++++++ + tools/tracing/rtla/src/timerlat_aa.h | 12 + + tools/tracing/rtla/src/timerlat_top.c | 46 +- + tools/tracing/rtla/src/utils.h | 3 + + tools/verification/rv/src/in_kernel.c | 2 +- + 65 files changed, 2629 insertions(+), 339 deletions(-) + create mode 100644 Documentation/tools/rtla/common_timerlat_aa.rst + create mode 100644 Documentation/tools/rtla/rtla-hwnoise.rst + create mode 100644 samples/ftrace/ftrace-ops.c + create mode 100644 tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc + create mode 100644 tools/tracing/rtla/src/timerlat_aa.c + create mode 100644 tools/tracing/rtla/src/timerlat_aa.h +Merging rcu/rcu/next (905739f2b887 Merge branch 'nolibc.2023.01.24a' into HEAD) +$ 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 arch/x86/Kconfig +Auto-merging drivers/net/Kconfig +Auto-merging drivers/pci/controller/Kconfig +Auto-merging fs/locks.c +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/RCU/NMI-RCU.rst | 4 +- + Documentation/RCU/UP.rst | 13 +- + Documentation/RCU/lockdep.rst | 13 +- + Documentation/RCU/rcu.rst | 6 +- + Documentation/RCU/rcu_dereference.rst | 21 +- + Documentation/RCU/rcubarrier.rst | 357 +++++------ + Documentation/RCU/rculist_nulls.rst | 109 ++-- + Documentation/RCU/stallwarn.rst | 135 ++++- + Documentation/RCU/torture.rst | 89 ++- + Documentation/RCU/whatisRCU.rst | 193 +++--- + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/atomic_t.txt | 2 +- + Documentation/memory-barriers.txt | 22 +- + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 - + arch/x86/kernel/nmi.c | 108 +++- + arch/x86/kvm/Kconfig | 1 - + drivers/base/core.c | 42 -- + drivers/dax/Kconfig | 1 - + drivers/hwtracing/stm/Kconfig | 1 - + drivers/md/Kconfig | 1 - + drivers/net/Kconfig | 1 - + drivers/pci/controller/Kconfig | 2 +- + fs/btrfs/Kconfig | 1 - + fs/locks.c | 25 - + fs/notify/Kconfig | 1 - + fs/quota/Kconfig | 1 - + include/linux/kernel_stat.h | 14 +- + include/linux/nmi.h | 8 + + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 19 +- + include/linux/rcutiny.h | 12 +- + include/linux/rcutree.h | 2 +- + include/linux/srcu.h | 45 ++ + include/linux/srcutree.h | 2 +- + init/Kconfig | 1 - + kernel/locking/locktorture.c | 101 ++-- + kernel/notifier.c | 3 - + kernel/pid_namespace.c | 17 + + kernel/rcu/Kconfig | 3 - + kernel/rcu/Kconfig.debug | 15 +- + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcu_segcblist.c | 2 +- + kernel/rcu/rcu_segcblist.h | 2 + + kernel/rcu/rcutorture.c | 12 +- + kernel/rcu/refscale.c | 250 +++++++- + kernel/rcu/srcutree.c | 98 ++- + kernel/rcu/tasks.h | 85 ++- + kernel/rcu/tiny.c | 9 +- + kernel/rcu/tree.c | 657 ++++++++++++--------- + kernel/rcu/tree.h | 19 + + kernel/rcu/tree_exp.h | 43 ++ + kernel/rcu/tree_stall.h | 37 +- + kernel/rcu/update.c | 49 +- + kernel/sched/core.c | 5 + + kernel/torture.c | 4 +- + lib/Kconfig.debug | 11 + + lib/nmi_backtrace.c | 2 + + mm/Kconfig | 1 - + tools/include/nolibc/arch-aarch64.h | 52 +- + tools/include/nolibc/arch-arm.h | 138 +++-- + tools/include/nolibc/arch-i386.h | 60 +- + tools/include/nolibc/arch-mips.h | 79 +-- + tools/include/nolibc/arch-riscv.h | 62 +- + tools/include/nolibc/arch-s390.h | 226 +++++++ + tools/include/nolibc/arch-x86_64.h | 52 +- + tools/include/nolibc/arch.h | 2 + + tools/include/nolibc/errno.h | 4 +- + tools/include/nolibc/stdlib.h | 27 + + tools/include/nolibc/sys.h | 24 + + tools/memory-model/Documentation/explanation.txt | 39 +- + tools/memory-model/linux-kernel.bell | 6 + + tools/memory-model/linux-kernel.cat | 5 +- + tools/memory-model/litmus-tests/dep+plain.litmus | 31 + + tools/testing/selftests/nolibc/Makefile | 17 +- + tools/testing/selftests/nolibc/nolibc-test.c | 30 + + .../selftests/rcutorture/bin/configcheck.sh | 5 +- + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../testing/selftests/rcutorture/bin/functions.sh | 6 + + .../testing/selftests/rcutorture/bin/kvm-build.sh | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 6 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 89 files changed, 2531 insertions(+), 1073 deletions(-) + create mode 100644 tools/include/nolibc/arch-s390.h + create mode 100644 tools/memory-model/litmus-tests/dep+plain.litmus +Merging kvm/next (7cb79f433e75 KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/arm64/kvm/Kconfig +Auto-merging arch/mips/kvm/Kconfig +Auto-merging arch/powerpc/kvm/booke.c +Auto-merging arch/riscv/kvm/Kconfig +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/reverse_cpuid.h +CONFLICT (content): Merge conflict in arch/x86/kvm/reverse_cpuid.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/kvm/arm_vgic.h +Auto-merging include/linux/cpuhotplug.h +Resolved 'arch/x86/kvm/reverse_cpuid.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 41f1f8746ed0] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/locking.rst | 25 +- + Documentation/virt/kvm/x86/errata.rst | 11 + + arch/arm64/include/asm/kvm_host.h | 15 +- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/arch_timer.c | 29 +- + arch/arm64/kvm/arm.c | 93 ++-- + arch/arm64/kvm/mmu.c | 12 +- + arch/arm64/kvm/reset.c | 8 +- + arch/arm64/kvm/sys_regs.c | 6 +- + arch/arm64/kvm/vgic/vgic-init.c | 19 +- + arch/arm64/kvm/vmid.c | 6 +- + arch/mips/include/asm/kvm_host.h | 3 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 2 +- + arch/mips/kvm/callback.c | 14 - + arch/mips/kvm/mips.c | 34 +- + arch/mips/kvm/vz.c | 7 +- + arch/powerpc/include/asm/kvm_host.h | 3 - + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 12 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 6 +- + arch/powerpc/kvm/e500mc.c | 8 +- + arch/powerpc/kvm/powerpc.c | 20 - + arch/riscv/include/asm/kvm_host.h | 7 +- + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/main.c | 23 +- + arch/riscv/kvm/mmu.c | 12 +- + arch/riscv/kvm/vmid.c | 4 +- + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 84 ++-- + arch/s390/kvm/kvm-s390.h | 2 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/pci.h | 2 +- + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 74 +-- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/cpuid.c | 12 +- + arch/x86/kvm/debugfs.c | 2 + + arch/x86/kvm/emulate.c | 1 + + arch/x86/kvm/hyperv.c | 20 + + arch/x86/kvm/hyperv.h | 27 ++ + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/i8259.c | 4 +- + arch/x86/kvm/ioapic.c | 1 + + arch/x86/kvm/irq.c | 1 + + arch/x86/kvm/irq_comm.c | 7 +- + arch/x86/kvm/kvm_onhyperv.c | 1 + + arch/x86/kvm/lapic.c | 327 ++++++++++---- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu.h | 6 +- + arch/x86/kvm/mmu/mmu.c | 277 +++++++----- + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/page_track.c | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 12 +- + arch/x86/kvm/mmu/spte.c | 4 +- + arch/x86/kvm/mmu/spte.h | 4 +- + arch/x86/kvm/mmu/tdp_iter.c | 1 + + arch/x86/kvm/mmu/tdp_mmu.c | 14 +- + arch/x86/kvm/mmu/tdp_mmu.h | 25 +- + arch/x86/kvm/mtrr.c | 1 + + arch/x86/kvm/pmu.c | 1 + + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/smm.c | 1 + + arch/x86/kvm/svm/avic.c | 372 +++++++-------- + arch/x86/kvm/svm/nested.c | 4 +- + arch/x86/kvm/svm/pmu.c | 2 + + arch/x86/kvm/svm/sev.c | 1 + + arch/x86/kvm/svm/svm.c | 97 ++-- + arch/x86/kvm/svm/svm.h | 27 +- + arch/x86/kvm/svm/svm_onhyperv.c | 1 + + arch/x86/kvm/svm/svm_onhyperv.h | 4 +- + arch/x86/kvm/vmx/capabilities.h | 4 +- + arch/x86/kvm/vmx/hyperv.c | 87 +++- + arch/x86/kvm/vmx/hyperv.h | 97 +++- + arch/x86/kvm/vmx/nested.c | 3 +- + arch/x86/kvm/vmx/pmu_intel.c | 5 +- + arch/x86/kvm/vmx/posted_intr.c | 2 + + arch/x86/kvm/vmx/sgx.c | 5 +- + arch/x86/kvm/vmx/vmcs12.c | 1 + + arch/x86/kvm/vmx/vmx.c | 499 +++++++++++---------- + arch/x86/kvm/vmx/vmx_ops.h | 4 +- + arch/x86/kvm/x86.c | 281 +++++++----- + arch/x86/kvm/xen.c | 1 + + include/kvm/arm_arch_timer.h | 6 +- + include/kvm/arm_vgic.h | 4 + + include/linux/cpuhotplug.h | 5 +- + include/linux/kvm_host.h | 13 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 144 ++++-- + .../selftests/kvm/include/x86_64/processor.h | 1 + + .../testing/selftests/kvm/kvm_binary_stats_test.c | 11 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 330 ++++++++------ + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 16 +- + virt/kvm/Kconfig | 3 + + virt/kvm/kvm_main.c | 297 ++++++------ + 99 files changed, 2112 insertions(+), 1550 deletions(-) + delete mode 100644 arch/mips/kvm/callback.c +Merging kvm-arm/next (96a4627dbbd4 Merge tag ' https://github.com/oupton/linux tags/kvmarm-6.3' from into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kvm/guest.c +Auto-merging arch/arm64/kvm/vgic/vgic-v3.c +Auto-merging arch/arm64/tools/cpucaps +Auto-merging arch/arm64/tools/gen-sysreg.awk +Auto-merging arch/arm64/tools/sysreg +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging drivers/irqchip/irq-apple-aic.c +Auto-merging tools/testing/selftests/kvm/aarch64/page_fault_test.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + MAINTAINERS | 3 +- + arch/arm64/include/asm/cache.h | 9 + + arch/arm64/include/asm/el2_setup.h | 99 +++++ + arch/arm64/include/asm/esr.h | 4 + + arch/arm64/include/asm/kvm_arm.h | 23 +- + arch/arm64/include/asm/kvm_emulate.h | 70 +++- + arch/arm64/include/asm/kvm_host.h | 52 ++- + arch/arm64/include/asm/kvm_hyp.h | 1 + + arch/arm64/include/asm/kvm_mmu.h | 11 +- + arch/arm64/include/asm/kvm_nested.h | 20 + + arch/arm64/include/asm/kvm_pgtable.h | 8 + + arch/arm64/include/asm/sysreg.h | 39 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/cacheinfo.c | 5 - + arch/arm64/kernel/cpufeature.c | 25 ++ + arch/arm64/kernel/hyp-stub.S | 86 +--- + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arch_timer.c | 77 ++-- + arch/arm64/kvm/arm.c | 16 +- + arch/arm64/kvm/emulate-nested.c | 203 +++++++++ + arch/arm64/kvm/fpsimd.c | 1 + + arch/arm64/kvm/guest.c | 6 + + arch/arm64/kvm/handle_exit.c | 47 ++- + arch/arm64/kvm/hyp/exception.c | 48 ++- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 21 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 1 + + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 1 + + arch/arm64/kvm/hyp/pgtable.c | 43 +- + arch/arm64/kvm/hyp/vhe/switch.c | 26 +- + arch/arm64/kvm/hypercalls.c | 2 +- + arch/arm64/kvm/inject_fault.c | 61 ++- + arch/arm64/kvm/mmu.c | 34 +- + arch/arm64/kvm/nested.c | 161 ++++++++ + arch/arm64/kvm/pvtime.c | 8 +- + arch/arm64/kvm/reset.c | 17 + + arch/arm64/kvm/sys_regs.c | 455 ++++++++++++++++----- + arch/arm64/kvm/sys_regs.h | 14 +- + arch/arm64/kvm/trace_arm.h | 59 +++ + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 13 +- + arch/arm64/kvm/vgic/vgic-v3.c | 9 +- + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/gen-sysreg.awk | 20 +- + arch/arm64/tools/sysreg | 17 + + arch/x86/include/asm/kvm_host.h | 2 - + drivers/irqchip/irq-apple-aic.c | 53 ++- + include/linux/kvm_types.h | 2 +- + .../selftests/kvm/aarch64/page_fault_test.c | 2 - + tools/testing/selftests/kvm/config | 1 + + .../kvm/x86_64/exit_on_emulation_failure_test.c | 3 - + 51 files changed, 1554 insertions(+), 337 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_nested.h + create mode 100644 arch/arm64/kvm/emulate-nested.c + create mode 100644 arch/arm64/kvm/nested.c +Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 46 +- + Documentation/virt/kvm/devices/vm.rst | 4 + + arch/s390/kvm/gaccess.c | 109 +++++ + arch/s390/kvm/gaccess.h | 3 + + arch/s390/kvm/interrupt.c | 11 +- + arch/s390/kvm/kvm-s390.c | 264 +++++++----- + drivers/s390/virtio/virtio_ccw.c | 46 +- + include/uapi/linux/kvm.h | 8 + + tools/testing/selftests/kvm/Makefile | 3 + + tools/testing/selftests/kvm/s390x/memop.c | 672 +++++++++++++++++++++++------- + 10 files changed, 885 insertions(+), 281 deletions(-) +Merging kvm-x86/next (62ef199250cd Merge branches 'apic', 'generic', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/events/intel/ds.c +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/nmi.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/pmu.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6f3819f09014] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 78 ++++- + arch/x86/events/intel/core.c | 1 + + arch/x86/events/intel/ds.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/idtentry.h | 16 +- + arch/x86/include/asm/kvm_host.h | 33 +- + arch/x86/include/asm/reboot.h | 2 + + arch/x86/include/asm/virtext.h | 16 +- + arch/x86/include/asm/xen/hypervisor.h | 4 +- + arch/x86/include/uapi/asm/kvm.h | 34 +- + arch/x86/kernel/crash.c | 17 +- + arch/x86/kernel/nmi.c | 8 +- + arch/x86/kernel/reboot.c | 88 +++-- + arch/x86/kernel/smp.c | 6 +- + arch/x86/kvm/cpuid.c | 31 +- + arch/x86/kvm/emulate.c | 17 +- + arch/x86/kvm/hyperv.c | 65 ++-- + arch/x86/kvm/kvm_cache_regs.h | 12 + + arch/x86/kvm/kvm_emulate.h | 7 +- + arch/x86/kvm/lapic.c | 77 +++-- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu/mmu.c | 45 ++- + arch/x86/kvm/mmu/mmu_internal.h | 14 + + arch/x86/kvm/mmu/paging_tmpl.h | 13 +- + arch/x86/kvm/mmu/spte.c | 6 +- + arch/x86/kvm/mmu/spte.h | 16 +- + arch/x86/kvm/mmu/tdp_iter.c | 11 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/pmu.c | 289 +++++++++++++--- + arch/x86/kvm/pmu.h | 13 +- + arch/x86/kvm/smm.c | 2 - + arch/x86/kvm/svm/avic.c | 2 +- + arch/x86/kvm/svm/nested.c | 1 - + arch/x86/kvm/svm/pmu.c | 2 + + arch/x86/kvm/svm/sev.c | 6 +- + arch/x86/kvm/svm/svm.c | 34 +- + arch/x86/kvm/svm/svm.h | 29 +- + arch/x86/kvm/vmx/hyperv.h | 31 +- + arch/x86/kvm/vmx/nested.c | 21 +- + arch/x86/kvm/vmx/pmu_intel.c | 23 +- + arch/x86/kvm/vmx/vmcs.h | 4 +- + arch/x86/kvm/vmx/vmenter.S | 80 +++-- + arch/x86/kvm/vmx/vmx.c | 125 ++++--- + arch/x86/kvm/vmx/vmx.h | 18 +- + arch/x86/kvm/vmx/vmx_ops.h | 2 + + arch/x86/kvm/x86.c | 278 ++++++++------- + arch/x86/kvm/x86.h | 18 +- + arch/x86/kvm/xen.c | 26 ++ + arch/x86/kvm/xen.h | 7 + + include/linux/kvm_host.h | 6 +- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + .../testing/selftests/kvm/include/x86_64/hyperv.h | 5 + + .../selftests/kvm/include/x86_64/processor.h | 30 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 10 +- + tools/testing/selftests/kvm/lib/elf.c | 2 + + tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 1 + + tools/testing/selftests/kvm/lib/x86_64/processor.c | 46 ++- + tools/testing/selftests/kvm/memslot_perf_test.c | 5 +- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 4 +- + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 +- + .../kvm/x86_64/hyperv_extended_hypercalls.c | 97 ++++++ + .../testing/selftests/kvm/x86_64/hyperv_features.c | 9 + + .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 385 ++++++++++++++++++++- + .../vmx_exception_with_invalid_guest_state.c | 2 +- + .../selftests/kvm/x86_64/xapic_state_test.c | 55 +++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 15 +- + virt/kvm/coalesced_mmio.c | 8 +- + 70 files changed, 1688 insertions(+), 643 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c +Merging xen-tip/linux-next (4ecc96cba8d9 xen: sysfs: make kobj_type structure constant) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/time.c +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging drivers/xen/sys-hypervisor.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + arch/x86/xen/setup.c | 4 ---- + arch/x86/xen/time.c | 38 ++++++++++++++++++++++++++++++++++++- + drivers/xen/events/events_base.c | 9 ++++++--- + drivers/xen/grant-dma-iommu.c | 11 +++++++++-- + drivers/xen/platform-pci.c | 5 ++--- + drivers/xen/pvcalls-back.c | 3 ++- + drivers/xen/sys-hypervisor.c | 2 +- + drivers/xen/xen-front-pgdir-shbuf.c | 2 +- + include/xen/events.h | 2 +- + 9 files changed, 59 insertions(+), 17 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers()) +$ 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 include/linux/workqueue.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 280 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 210 insertions(+), 71 deletions(-) +Merging drivers-x86/for-next (0d9bdd8a5501 platform/x86: nvidia-wmi-ec-backlight: Add force module parameter) +$ 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/driver-api/surface_aggregator/ssh.rst +Auto-merging MAINTAINERS +Auto-merging drivers/media/v4l2-core/v4l2-subdev.c +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging drivers/platform/x86/intel/vsec.c +Auto-merging include/media/v4l2-subdev.h +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 122 +- + .../driver-api/surface_aggregator/client.rst | 12 +- + .../driver-api/surface_aggregator/ssh.rst | 36 +- + MAINTAINERS | 9 +- + drivers/hid/surface-hid/surface_hid.c | 8 +- + drivers/hid/surface-hid/surface_kbd.c | 8 +- + drivers/leds/led-class.c | 138 +- + drivers/media/v4l2-core/v4l2-async.c | 4 + + drivers/media/v4l2-core/v4l2-fwnode.c | 7 + + drivers/media/v4l2-core/v4l2-subdev-priv.h | 14 + + drivers/media/v4l2-core/v4l2-subdev.c | 46 + + drivers/platform/mellanox/mlxreg-hotplug.c | 28 +- + drivers/platform/surface/aggregator/bus.c | 6 +- + drivers/platform/surface/aggregator/controller.c | 44 +- + drivers/platform/surface/aggregator/ssh_msgb.h | 4 +- + .../surface/aggregator/ssh_request_layer.c | 11 +- + drivers/platform/surface/aggregator/trace.h | 73 +- + drivers/platform/surface/surface_acpi_notify.c | 2 +- + drivers/platform/surface/surface_aggregator_cdev.c | 6 +- + drivers/platform/surface/surface_aggregator_hub.c | 8 +- + .../platform/surface/surface_aggregator_registry.c | 2 +- + .../platform/surface/surface_aggregator_tabletsw.c | 12 +- + drivers/platform/surface/surface_dtx.c | 20 +- + drivers/platform/surface/surface_hotplug.c | 13 +- + .../platform/surface/surface_platform_profile.c | 2 +- + drivers/platform/x86/Kconfig | 1 - + drivers/platform/x86/acerhdf.c | 6 - + drivers/platform/x86/amd/pmc.c | 40 +- + drivers/platform/x86/amd/pmf/Kconfig | 1 + + drivers/platform/x86/dell/Kconfig | 8 +- + drivers/platform/x86/dell/dell-smo8800.c | 5 +- + drivers/platform/x86/dell/dell-wmi-ddv.c | 528 +++++++- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- + drivers/platform/x86/hp/hp-wmi.c | 2 + + drivers/platform/x86/intel/Kconfig | 13 + + drivers/platform/x86/intel/Makefile | 4 + + drivers/platform/x86/intel/int1092/intel_sar.c | 15 +- + drivers/platform/x86/intel/int3472/Kconfig | 1 + + drivers/platform/x86/intel/int3472/Makefile | 2 +- + .../platform/x86/intel/int3472/clk_and_regulator.c | 34 +- + drivers/platform/x86/intel/int3472/common.h | 18 +- + drivers/platform/x86/intel/int3472/discrete.c | 108 +- + drivers/platform/x86/intel/int3472/led.c | 75 ++ + drivers/platform/x86/intel/oaktrail.c | 6 - + drivers/platform/x86/intel/pmc/tgl.c | 6 +- + drivers/platform/x86/intel/punit_ipc.c | 6 - + drivers/platform/x86/intel/tpmi.c | 415 ++++++ + drivers/platform/x86/intel/vsec.c | 30 +- + drivers/platform/x86/intel/vsec.h | 6 + + drivers/platform/x86/mlx-platform.c | 1394 +++++++++++++++++--- + drivers/platform/x86/nvidia-wmi-ec-backlight.c | 6 +- + drivers/platform/x86/think-lmi.c | 8 +- + drivers/platform/x86/uv_sysfs.c | 6 +- + drivers/power/supply/surface_battery.c | 4 +- + drivers/power/supply/surface_charger.c | 2 +- + include/linux/intel_tpmi.h | 30 + + include/linux/leds.h | 21 + + include/linux/platform_data/mlxreg.h | 2 + + include/linux/platform_data/x86/soc.h | 7 +- + include/linux/surface_aggregator/controller.h | 60 +- + include/linux/surface_aggregator/device.h | 58 +- + include/linux/surface_aggregator/serial_hub.h | 40 +- + include/media/v4l2-subdev.h | 4 + + tools/power/x86/intel-speed-select/hfi-events.c | 4 - + tools/power/x86/intel-speed-select/isst-config.c | 82 +- + tools/power/x86/intel-speed-select/isst-core.c | 23 + + tools/power/x86/intel-speed-select/isst-daemon.c | 3 +- + tools/power/x86/intel-speed-select/isst-display.c | 11 +- + tools/power/x86/intel-speed-select/isst.h | 4 + + 69 files changed, 3174 insertions(+), 562 deletions(-) + create mode 100644 drivers/media/v4l2-core/v4l2-subdev-priv.h + create mode 100644 drivers/platform/x86/intel/int3472/led.c + create mode 100644 drivers/platform/x86/intel/tpmi.c + create mode 100644 include/linux/intel_tpmi.h +Merging chrome-platform/for-next (b0d8a67715da platform/chrome: cros_ec_typec: Fix spelling mistake) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'ort' strategy. + MAINTAINERS | 10 +- + drivers/mfd/cros_ec_dev.c | 5 - + drivers/platform/chrome/Kconfig | 12 +- + drivers/platform/chrome/Makefile | 4 +- + drivers/platform/chrome/cros_ec.c | 15 +- + drivers/platform/chrome/cros_ec_debugfs.c | 25 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 14 +- + drivers/platform/chrome/cros_ec_lpc.c | 12 +- + drivers/platform/chrome/cros_ec_proto_test.c | 13 +- + drivers/platform/chrome/cros_ec_sysfs.c | 40 ++- + drivers/platform/chrome/cros_ec_typec.c | 123 +++------ + drivers/platform/chrome/cros_ec_typec.h | 85 ++++++ + drivers/platform/chrome/cros_ec_uart.c | 362 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_typec_switch.c | 16 +- + drivers/platform/chrome/cros_typec_vdm.c | 148 ++++++++++ + drivers/platform/chrome/cros_typec_vdm.h | 13 + + drivers/platform/chrome/wilco_ec/sysfs.c | 3 +- + include/linux/platform_data/cros_ec_commands.h | 69 ++++- + include/linux/platform_data/cros_ec_proto.h | 24 +- + 19 files changed, 846 insertions(+), 147 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_typec.h + create mode 100644 drivers/platform/chrome/cros_ec_uart.c + create mode 100644 drivers/platform/chrome/cros_typec_vdm.c + create mode 100644 drivers/platform/chrome/cros_typec_vdm.h +Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (4aea8f30475f Documentation: leds: Correct spelling) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 8 +- + Documentation/leds/leds-qcom-lpg.rst | 4 +- + drivers/leds/Kconfig | 11 -- + drivers/leds/Makefile | 1 - + drivers/leds/flash/leds-mt6360.c | 38 +---- + drivers/leds/led-class.c | 1 + + drivers/leds/leds-an30259a.c | 21 +-- + drivers/leds/leds-asic3.c | 177 --------------------- + drivers/leds/leds-bcm6328.c | 49 +++--- + drivers/leds/leds-bcm6358.c | 32 ++-- + drivers/leds/leds-bd2802.c | 5 +- + drivers/leds/leds-blinkm.c | 5 +- + drivers/leds/leds-is31fl319x.c | 7 +- + drivers/leds/leds-is31fl32xx.c | 5 +- + drivers/leds/leds-lm3530.c | 5 +- + drivers/leds/leds-lm3532.c | 5 +- + drivers/leds/leds-lm355x.c | 6 +- + drivers/leds/leds-lm3642.c | 5 +- + drivers/leds/leds-lm3692x.c | 6 +- + drivers/leds/leds-lm3697.c | 5 +- + drivers/leds/leds-lp3944.c | 5 +- + drivers/leds/leds-lp3952.c | 5 +- + drivers/leds/leds-lp5521.c | 6 +- + drivers/leds/leds-lp5523.c | 6 +- + drivers/leds/leds-lp5562.c | 5 +- + drivers/leds/leds-lp8501.c | 6 +- + drivers/leds/leds-lp8860.c | 5 +- + drivers/leds/leds-mt6323.c | 30 ++-- + drivers/leds/leds-pca9532.c | 9 +- + drivers/leds/leds-pca955x.c | 26 +-- + drivers/leds/leds-pca963x.c | 6 +- + drivers/leds/leds-pm8058.c | 29 ++-- + drivers/leds/leds-pwm.c | 4 +- + drivers/leds/leds-syscon.c | 49 +++--- + drivers/leds/leds-tca6507.c | 8 +- + drivers/leds/leds-tlc591xx.c | 5 +- + drivers/leds/leds-turris-omnia.c | 5 +- + drivers/leds/leds.h | 1 - + drivers/leds/simple/simatic-ipc-leds-gpio.c | 2 + + include/linux/leds.h | 15 +- + 40 files changed, 189 insertions(+), 434 deletions(-) + delete mode 100644 drivers/leds/leds-asic3.c +Merging ipmi/for-next (befb28f2676a ipmi: ipmb: Fix the MODULE_PARM_DESC associated to 'retry_time_ms') +$ 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/ipmi_ipmb.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 113 ++++++++++++++++++++---------------------- + 2 files changed, 56 insertions(+), 59 deletions(-) +Merging driver-core/driver-core-next (9f467f6375af OPP: fix error checking in opp_migrate_dentry()) +$ 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 arch/arm64/kernel/cacheinfo.c +Auto-merging block/genhd.c +Auto-merging drivers/base/core.c +CONFLICT (content): Merge conflict in drivers/base/core.c +Auto-merging drivers/base/devtmpfs.c +Auto-merging drivers/bus/sunxi-rsb.c +Auto-merging drivers/firmware/arm_scmi/bus.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/i3c/master.c +Auto-merging drivers/input/input.c +Auto-merging drivers/mmc/core/sdio_bus.c +Auto-merging drivers/net/phy/mdio_bus.c +Auto-merging drivers/nvdimm/nd.h +Auto-merging drivers/of/property.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/platform/surface/aggregator/bus.c +Auto-merging drivers/s390/cio/css.c +Auto-merging drivers/s390/cio/device.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/dlm/lockspace.c +Auto-merging fs/gfs2/sys.c +Auto-merging fs/kernfs/dir.c +Auto-merging include/drm/drm_mipi_dsi.h +Auto-merging include/linux/acpi.h +CONFLICT (content): Merge conflict in include/linux/acpi.h +Auto-merging include/linux/firewire.h +Auto-merging include/linux/spi/spi.h +Auto-merging include/linux/surface_aggregator/device.h +Auto-merging include/sound/hdaudio.h +Resolved 'drivers/base/core.c' using previous resolution. +Resolved 'include/linux/acpi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4568bf70214d] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-address_bits | 10 + + .../process/embargoed-hardware-issues.rst | 1 + + arch/alpha/include/asm/dma-mapping.h | 2 +- + arch/arm64/kernel/cacheinfo.c | 14 +- + arch/ia64/include/asm/dma-mapping.h | 2 +- + arch/mips/include/asm/dma-mapping.h | 2 +- + arch/mips/sgi-ip22/ip22-gio.c | 4 +- + arch/parisc/include/asm/dma-mapping.h | 2 +- + arch/parisc/kernel/drivers.c | 4 +- + arch/powerpc/include/asm/ps3.h | 2 +- + arch/powerpc/include/asm/vio.h | 5 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 7 +- + arch/powerpc/platforms/pseries/vio.c | 4 +- + arch/riscv/kernel/cacheinfo.c | 42 -- + arch/sparc/include/asm/dma-mapping.h | 2 +- + arch/sparc/include/asm/vio.h | 5 +- + arch/sparc/kernel/vio.c | 2 +- + arch/x86/include/asm/dma-mapping.h | 2 +- + block/genhd.c | 2 +- + block/partitions/core.c | 4 +- + drivers/acpi/bus.c | 2 +- + drivers/acpi/device_sysfs.c | 8 +- + drivers/acpi/internal.h | 2 +- + drivers/acpi/pptt.c | 93 ++-- + drivers/amba/bus.c | 4 +- + drivers/base/arch_topology.c | 12 +- + drivers/base/auxiliary.c | 2 +- + drivers/base/base.h | 21 +- + drivers/base/bus.c | 575 ++++++++++++++------- + drivers/base/cacheinfo.c | 161 +++++- + drivers/base/class.c | 34 +- + drivers/base/component.c | 2 +- + drivers/base/core.c | 489 ++++++++++++------ + drivers/base/cpu.c | 40 +- + drivers/base/dd.c | 36 +- + drivers/base/devtmpfs.c | 16 +- + drivers/base/driver.c | 29 +- + drivers/base/memory.c | 9 +- + drivers/base/physical_location.c | 5 +- + drivers/base/platform.c | 48 +- + drivers/base/soc.c | 4 +- + drivers/base/swnode.c | 63 +-- + drivers/base/test/property-entry-test.c | 30 +- + drivers/base/transport_class.c | 17 +- + drivers/bcma/main.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 4 +- + drivers/bus/mhi/ep/main.c | 4 +- + drivers/bus/mhi/host/init.c | 4 +- + drivers/bus/mips_cdmm.c | 4 +- + drivers/bus/sunxi-rsb.c | 7 +- + drivers/cxl/core/memdev.c | 4 +- + drivers/cxl/core/port.c | 8 +- + drivers/cxl/cxl.h | 4 +- + drivers/cxl/cxlmem.h | 2 +- + drivers/dax/bus.c | 2 +- + drivers/eisa/eisa-bus.c | 4 +- + drivers/firewire/core-device.c | 8 +- + drivers/firmware/arm_ffa/bus.c | 4 +- + drivers/firmware/arm_scmi/bus.c | 3 +- + drivers/fpga/dfl.c | 4 +- + drivers/fsi/fsi-core.c | 6 +- + drivers/gpio/gpiolib.c | 7 + + drivers/gpu/drm/display/drm_dp_aux_bus.c | 7 +- + drivers/gpu/drm/drm_mipi_dsi.c | 4 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/greybus/core.c | 14 +- + drivers/hid/hid-core.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +- + drivers/hsi/hsi_core.c | 2 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/hwtracing/intel_th/core.c | 6 +- + drivers/hwtracing/intel_th/intel_th.h | 4 +- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/i3c/device.c | 14 +- + drivers/i3c/master.c | 4 +- + drivers/input/input.c | 16 +- + drivers/input/serio/serio.c | 4 +- + drivers/ipack/ipack.c | 4 +- + drivers/irqchip/irq-imx-gpcv2.c | 1 + + drivers/macintosh/macio_asic.c | 7 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 27 +- + drivers/media/pci/intel/ipu3/cio2-bridge.h | 5 +- + drivers/media/rc/rc-main.c | 2 +- + drivers/memstick/core/memstick.c | 6 +- + drivers/misc/mei/bus.c | 4 +- + drivers/misc/tifm_core.c | 4 +- + drivers/mmc/core/bus.c | 4 +- + drivers/mmc/core/sdio_bus.c | 4 +- + drivers/mtd/mtdpart.c | 10 + + drivers/net/phy/mdio_bus.c | 2 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvdimm/dax_devs.c | 2 +- + drivers/nvdimm/dimm_devs.c | 2 +- + drivers/nvdimm/nd-core.h | 10 +- + drivers/nvdimm/nd.h | 4 +- + drivers/nvdimm/region_devs.c | 4 +- + drivers/of/device.c | 4 +- + drivers/of/property.c | 84 +-- + drivers/pci/pci-driver.c | 4 +- + drivers/pcmcia/ds.c | 4 +- + drivers/platform/surface/aggregator/bus.c | 4 +- + drivers/platform/x86/wmi.c | 15 +- + drivers/rapidio/rio-driver.c | 4 +- + drivers/rpmsg/rpmsg_core.c | 4 +- + drivers/s390/cio/css.c | 4 +- + drivers/s390/cio/device.c | 8 +- + drivers/s390/cio/scm.c | 2 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/sh/maple/maple.c | 7 - + drivers/slimbus/core.c | 4 +- + drivers/soc/imx/gpcv2.c | 2 +- + drivers/soc/qcom/apr.c | 4 +- + drivers/soc/renesas/rcar-sysc.c | 2 +- + drivers/soundwire/bus_type.c | 4 +- + drivers/spi/spi.c | 2 +- + drivers/spmi/spmi.c | 2 +- + drivers/ssb/main.c | 4 +- + drivers/staging/greybus/audio_codec.c | 6 - + drivers/staging/greybus/gbphy.c | 14 +- + drivers/tee/tee_core.c | 2 +- + drivers/thunderbolt/switch.c | 4 +- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/xdomain.c | 6 +- + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serial/arc_uart.c | 7 - + drivers/usb/common/ulpi.c | 4 +- + drivers/usb/core/driver.c | 6 +- + drivers/usb/core/message.c | 8 +- + drivers/usb/core/usb.c | 8 +- + drivers/usb/phy/phy.c | 6 +- + drivers/usb/roles/class.c | 3 +- + drivers/usb/typec/bus.c | 4 +- + drivers/usb/typec/class.c | 2 +- + drivers/virtio/virtio.c | 4 +- + drivers/w1/w1.c | 10 +- + drivers/xen/pvcalls-back.c | 2 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 8 +- + drivers/xen/xenbus/xenbus_probe_frontend.c | 4 +- + drivers/zorro/zorro-driver.c | 4 +- + fs/debugfs/inode.c | 4 +- + fs/dlm/lockspace.c | 4 +- + fs/gfs2/sys.c | 6 +- + fs/kernfs/dir.c | 3 - + include/asm-generic/dma-mapping.h | 2 +- + include/drm/drm_mipi_dsi.h | 5 +- + include/linux/acpi.h | 4 +- + include/linux/cacheinfo.h | 13 +- + include/linux/container_of.h | 2 +- + include/linux/device.h | 7 +- + include/linux/device/bus.h | 97 ++-- + include/linux/device/driver.h | 1 - + include/linux/dma-map-ops.h | 2 +- + include/linux/firewire.h | 15 +- + include/linux/fwnode.h | 12 +- + include/linux/hyperv.h | 5 +- + include/linux/i3c/device.h | 22 +- + include/linux/kobject.h | 2 +- + include/linux/mcb.h | 5 +- + include/linux/of_device.h | 4 +- + include/linux/platform_device.h | 11 + + include/linux/property.h | 9 +- + include/linux/soundwire/sdw_type.h | 2 +- + include/linux/spi/spi.h | 2 +- + include/linux/ssb/ssb.h | 2 +- + include/linux/surface_aggregator/device.h | 5 +- + include/linux/transport_class.h | 8 +- + include/linux/virtio.h | 5 +- + include/sound/hdaudio.h | 2 +- + include/xen/xenbus.h | 7 +- + kernel/fail_function.c | 5 +- + kernel/ksysfs.c | 9 + + lib/kobject.c | 16 +- + lib/test_firmware.c | 5 +- + samples/kobject/kset-example.c | 2 +- + scripts/const_structs.checkpatch | 1 + + sound/aoa/soundbus/core.c | 6 +- + sound/hda/hda_bus_type.c | 2 +- + sound/hda/hdac_device.c | 2 +- + 182 files changed, 1532 insertions(+), 1186 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-address_bits +Merging usb/usb-next (1243741f6b02 Merge tag 'usb-serial-6.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/meson8b-odroidc1.dts +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/media/common/Kconfig +Auto-merging drivers/media/common/Makefile +Auto-merging drivers/of/device.c +Auto-merging drivers/thunderbolt/switch.c +Auto-merging drivers/thunderbolt/tb.h +Auto-merging drivers/usb/common/ulpi.c +Auto-merging drivers/usb/core/usb.c +Auto-merging drivers/usb/gadget/udc/Kconfig +Auto-merging drivers/usb/gadget/udc/Makefile +Auto-merging drivers/usb/gadget/udc/pxa25x_udc.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/typec/bus.c +Auto-merging drivers/usb/typec/class.c +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d775f39ec741] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget | 13 + + Documentation/ABI/testing/configfs-usb-gadget-uvc | 57 +- + .../ABI/testing/sysfs-class-usb_power_delivery | 11 +- + .../ABI/testing/sysfs-driver-typec-displayport | 15 + + .../devicetree/bindings/mfd/omap-usb-host.txt | 8 +- + .../devicetree/bindings/powerpc/nintendo/wii.txt | 10 - + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 10 +- + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 1 + + .../devicetree/bindings/usb/brcm,bcm3384-usb.txt | 11 - + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 + + .../devicetree/bindings/usb/cypress,cypd4226.yaml | 98 + + .../devicetree/bindings/usb/ehci-omap.txt | 31 - + .../devicetree/bindings/usb/ehci-orion.txt | 22 - + .../devicetree/bindings/usb/faraday,fotg210.yaml | 7 +- + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 2 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 6 + + .../devicetree/bindings/usb/generic-ehci.yaml | 5 + + .../devicetree/bindings/usb/generic-ohci.yaml | 32 +- + .../devicetree/bindings/usb/genesys,gl850g.yaml | 1 + + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 110 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 + + .../devicetree/bindings/usb/npcm7xx-usb.txt | 20 - + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 15 + + .../bindings/usb/nvidia,tegra234-xusb.yaml | 159 + + Documentation/devicetree/bindings/usb/ohci-nxp.txt | 24 - + .../devicetree/bindings/usb/ohci-omap3.txt | 15 - + Documentation/devicetree/bindings/usb/pxa-usb.txt | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 3 + + .../devicetree/bindings/usb/renesas,rzn1-usbf.yaml | 68 + + .../bindings/usb/renesas,rzv2m-usb3drd.yaml | 129 + + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 41 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 40 +- + .../devicetree/bindings/usb/rockchip,dwc3.yaml | 10 +- + .../bindings/usb/rockchip,rk3399-dwc3.yaml | 115 + + .../bindings/usb/samsung,exynos-dwc3.yaml | 8 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 10 + + .../devicetree/bindings/usb/spear-usb.txt | 35 - + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 1 - + .../devicetree/bindings/usb/ti,tps6598x.yaml | 3 + + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 2 +- + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + .../devicetree/bindings/usb/vialab,vl817.yaml | 71 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/usb/chipidea.rst | 19 +- + Documentation/usb/gadget-testing.rst | 2 +- + Documentation/usb/gadget_configfs.rst | 10 + + Documentation/usb/mass-storage.rst | 2 +- + MAINTAINERS | 8 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 24 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 26 +- + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 36 +- + arch/arm64/configs/defconfig | 3 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 15 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 4 +- + drivers/media/common/Kconfig | 3 + + drivers/media/common/Makefile | 1 + + drivers/media/common/uvc.c | 183 ++ + drivers/media/usb/uvc/Kconfig | 1 + + drivers/media/usb/uvc/uvc_ctrl.c | 2 +- + drivers/media/usb/uvc/uvc_driver.c | 4 +- + drivers/of/device.c | 6 +- + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/xusb-tegra186.c | 64 +- + drivers/phy/tegra/xusb.c | 6 + + drivers/phy/tegra/xusb.h | 23 + + drivers/thunderbolt/acpi.c | 13 +- + drivers/thunderbolt/ctl.c | 52 +- + drivers/thunderbolt/ctl.h | 2 + + drivers/thunderbolt/debugfs.c | 5 +- + drivers/thunderbolt/switch.c | 42 +- + drivers/thunderbolt/tb.c | 508 ++- + drivers/thunderbolt/tb.h | 39 +- + drivers/thunderbolt/tb_msgs.h | 11 +- + drivers/thunderbolt/tb_regs.h | 36 + + drivers/thunderbolt/tunnel.c | 506 ++- + drivers/thunderbolt/tunnel.h | 18 + + drivers/thunderbolt/usb4.c | 572 ++++ + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-gadget.h | 4 +- + drivers/usb/cdns3/cdnsp-ring.c | 110 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 10 +- + drivers/usb/chipidea/debug.c | 2 +- + drivers/usb/chipidea/usbmisc_imx.c | 6 - + drivers/usb/common/ulpi.c | 14 +- + drivers/usb/core/hub.c | 5 +- + drivers/usb/core/sysfs.c | 5 - + drivers/usb/core/usb.c | 2 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/debug.h | 3 + + drivers/usb/dwc3/debugfs.c | 19 +- + drivers/usb/dwc3/dwc3-pci.c | 4 + + drivers/usb/dwc3/dwc3-xilinx.c | 1 - + drivers/usb/dwc3/gadget.c | 4 +- + drivers/usb/early/xhci-dbc.c | 8 +- + drivers/usb/fotg210/Kconfig | 2 +- + drivers/usb/fotg210/fotg210-core.c | 83 +- + drivers/usb/fotg210/fotg210-hcd.c | 69 +- + drivers/usb/fotg210/fotg210-hcd.h | 1 + + drivers/usb/fotg210/fotg210-udc.c | 161 +- + drivers/usb/fotg210/fotg210-udc.h | 4 +- + drivers/usb/fotg210/fotg210.h | 27 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 102 +- + drivers/usb/gadget/configfs.c | 500 ++- + drivers/usb/gadget/function/f_fs.c | 8 +- + drivers/usb/gadget/function/f_uvc.c | 150 +- + drivers/usb/gadget/function/u_ether.c | 38 +- + drivers/usb/gadget/function/u_serial.c | 23 +- + drivers/usb/gadget/function/u_uvc.h | 18 +- + drivers/usb/gadget/function/uvc.h | 4 +- + drivers/usb/gadget/function/uvc_configfs.c | 1154 ++++++- + drivers/usb/gadget/function/uvc_configfs.h | 52 +- + drivers/usb/gadget/function/uvc_v4l2.c | 16 +- + drivers/usb/gadget/legacy/hid.c | 7 +- + drivers/usb/gadget/udc/Kconfig | 22 + + drivers/usb/gadget/udc/Makefile | 2 + + drivers/usb/gadget/udc/bcm63xx_udc.c | 13 +- + drivers/usb/gadget/udc/fusb300_udc.c | 10 +- + drivers/usb/gadget/udc/gr_udc.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 136 +- + drivers/usb/gadget/udc/renesas_usbf.c | 3406 ++++++++++++++++++++ + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 139 + + drivers/usb/gadget/udc/tegra-xudc.c | 50 +- + drivers/usb/host/Kconfig | 22 +- + drivers/usb/host/Makefile | 8 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/fsl-mph-dr-of.c | 3 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/max3421-hcd.c | 15 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 6 +- + drivers/usb/host/xhci-debugfs.c | 2 +- + drivers/usb/host/xhci-hub.c | 257 +- + drivers/usb/host/xhci-mem.c | 338 +- + drivers/usb/host/xhci-mvebu.c | 2 +- + drivers/usb/host/xhci-plat.c | 144 +- + drivers/usb/host/xhci-plat.h | 7 + + drivers/usb/host/xhci-rcar.c | 102 +- + drivers/usb/host/xhci-rcar.h | 55 - + drivers/usb/host/xhci-ring.c | 88 +- + drivers/usb/host/xhci-rzv2m.c | 38 + + drivers/usb/host/xhci-rzv2m.h | 16 + + drivers/usb/host/xhci-tegra.c | 392 ++- + drivers/usb/host/xhci.c | 81 +- + drivers/usb/host/xhci.h | 40 +- + drivers/usb/misc/onboard_usb_hub.c | 4 + + drivers/usb/misc/onboard_usb_hub.h | 11 + + drivers/usb/mtu3/mtu3_gadget.c | 3 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 1 + + drivers/usb/mtu3/mtu3_qmu.c | 7 + + drivers/usb/musb/da8xx.c | 4 +- + drivers/usb/musb/mediatek.c | 3 +- + drivers/usb/musb/sunxi.c | 99 +- + drivers/usb/serial/option.c | 4 + + drivers/usb/storage/ene_ub6250.c | 2 +- + drivers/usb/typec/altmodes/displayport.c | 12 + + drivers/usb/typec/bus.c | 33 +- + drivers/usb/typec/bus.h | 2 + + drivers/usb/typec/class.c | 15 +- + drivers/usb/typec/hd3ss3220.c | 29 + + drivers/usb/typec/mux/Kconfig | 6 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/gpio-sbu-mux.c | 172 + + drivers/usb/typec/mux/intel_pmc_mux.c | 13 +- + drivers/usb/typec/pd.c | 9 +- + drivers/usb/typec/retimer.h | 2 +- + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/maxim_contaminant.c | 387 +++ + drivers/usb/typec/tcpm/tcpci.c | 19 +- + drivers/usb/typec/tcpm/tcpci_maxim.h | 89 + + .../tcpm/{tcpci_maxim.c => tcpci_maxim_core.c} | 53 +- + drivers/usb/typec/tcpm/tcpm.c | 60 +- + drivers/usb/typec/tipd/core.c | 38 + + drivers/usb/typec/ucsi/ucsi.c | 164 +- + drivers/usb/typec/ucsi/ucsi.h | 8 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 22 +- + include/linux/list.h | 15 + + include/linux/usb.h | 27 +- + include/linux/usb/composite.h | 12 + + include/linux/usb/gadget.h | 11 + + include/linux/usb/rzv2m_usb3drd.h | 20 + + include/linux/usb/tcpci.h | 7 + + include/linux/usb/tcpm.h | 8 + + include/{media/v4l2-uvc.h => linux/usb/uvc.h} | 209 +- + include/linux/usb/webusb.h | 80 + + include/uapi/linux/usb/ch9.h | 16 + + include/uapi/linux/usb/video.h | 30 + + 192 files changed, 11248 insertions(+), 1965 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/cypress,cypd4226.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ehci-omap.txt + delete mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt + create mode 100644 Documentation/devicetree/bindings/usb/gpio-sbu-mux.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/npcm7xx-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra234-xusb.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ohci-nxp.txt + delete mode 100644 Documentation/devicetree/bindings/usb/ohci-omap3.txt + create mode 100644 Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml + create mode 100644 Documentation/devicetree/bindings/usb/renesas,rzv2m-usb3drd.yaml + create mode 100644 Documentation/devicetree/bindings/usb/rockchip,rk3399-dwc3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/spear-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/vialab,vl817.yaml + create mode 100644 drivers/media/common/uvc.c + create mode 100644 drivers/usb/gadget/udc/renesas_usbf.c + create mode 100644 drivers/usb/gadget/udc/rzv2m_usb3drd.c + delete mode 100644 drivers/usb/host/xhci-rcar.h + create mode 100644 drivers/usb/host/xhci-rzv2m.c + create mode 100644 drivers/usb/host/xhci-rzv2m.h + create mode 100644 drivers/usb/typec/mux/gpio-sbu-mux.c + create mode 100644 drivers/usb/typec/tcpm/maxim_contaminant.c + create mode 100644 drivers/usb/typec/tcpm/tcpci_maxim.h + rename drivers/usb/typec/tcpm/{tcpci_maxim.c => tcpci_maxim_core.c} (93%) + create mode 100644 include/linux/usb/rzv2m_usb3drd.h + rename include/{media/v4l2-uvc.h => linux/usb/uvc.h} (59%) + create mode 100644 include/linux/usb/webusb.h +Merging thunderbolt/next (06cbcbfaa651 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (617c331d9107 USB: serial: option: add support for VW/Skoda "Carstick LTE") +$ 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 (72206cc730b5 tty: n_gsm: add keep alive support) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/serial/8250.yaml +Auto-merging Documentation/devicetree/bindings/serial/serial.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Auto-merging drivers/spi/spi-geni-qcom.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging include/linux/console.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/devicetree/bindings/serial/8250.yaml | 10 +- + .../devicetree/bindings/serial/8250_omap.yaml | 23 +- + .../bindings/serial/amlogic,meson-uart.yaml | 15 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 27 +- + .../bindings/serial/fsl,s32-linflexuart.yaml | 2 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 11 +- + .../devicetree/bindings/serial/fsl-lpuart.yaml | 6 +- + .../devicetree/bindings/serial/fsl-mxs-auart.yaml | 2 +- + .../devicetree/bindings/serial/pl011.yaml | 1 + + .../devicetree/bindings/serial/qcom,msm-uart.txt | 25 - + .../devicetree/bindings/serial/qcom,msm-uart.yaml | 56 ++ + .../bindings/serial/renesas,em-uart.yaml | 10 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 26 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 24 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 24 +- + .../devicetree/bindings/serial/renesas,scifa.yaml | 22 +- + .../devicetree/bindings/serial/renesas,scifb.yaml | 12 +- + .../devicetree/bindings/serial/rs485.yaml | 6 + + .../devicetree/bindings/serial/serial.yaml | 18 +- + .../devicetree/bindings/serial/sifive-serial.yaml | 6 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 8 + + .../devicetree/bindings/serial/st,stm32-uart.yaml | 7 - + .../bindings/serial/xlnx,opb-uartlite.yaml | 6 +- + Documentation/driver-api/tty/n_gsm.rst | 19 + + Documentation/fpga/dfl.rst | 119 ++++ + MAINTAINERS | 7 + + arch/arm/include/asm/semihost.h | 30 + + arch/arm64/include/asm/semihost.h | 24 + + arch/riscv/include/asm/semihost.h | 26 + + drivers/char/pcmcia/synclink_cs.c | 18 +- + drivers/fpga/dfl.c | 245 ++++++-- + drivers/fpga/dfl.h | 43 ++ + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + drivers/ipack/devices/ipoctal.c | 4 +- + drivers/mmc/core/sdio_uart.c | 13 +- + drivers/pps/clients/pps-ldisc.c | 6 +- + drivers/s390/char/con3215.c | 4 +- + drivers/soc/qcom/qcom-geni-se.c | 2 +- + drivers/spi/spi-geni-qcom.c | 2 +- + drivers/staging/greybus/uart.c | 4 +- + drivers/tty/amiserial.c | 12 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvc_console.h | 2 +- + drivers/tty/hvc/hvc_iucv.c | 6 +- + drivers/tty/hvc/hvcs.c | 91 ++- + drivers/tty/moxa.c | 82 +-- + drivers/tty/mxser.c | 11 +- + drivers/tty/n_gsm.c | 160 +++++- + drivers/tty/serial/8250/8250_dfl.c | 167 ++++++ + drivers/tty/serial/8250/8250_early.c | 4 +- + drivers/tty/serial/8250/8250_pci.c | 25 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 494 ++++++++++++++++ + drivers/tty/serial/8250/8250_pcilib.c | 40 ++ + drivers/tty/serial/8250/8250_pcilib.h | 15 + + drivers/tty/serial/8250/8250_port.c | 57 +- + drivers/tty/serial/8250/Kconfig | 27 + + drivers/tty/serial/8250/Makefile | 3 + + drivers/tty/serial/Kconfig | 16 +- + drivers/tty/serial/Makefile | 2 +- + ...earlycon-arm-semihost.c => earlycon-semihost.c} | 25 +- + drivers/tty/serial/earlycon.c | 9 +- + drivers/tty/serial/fsl_lpuart.c | 119 +++- + drivers/tty/serial/imx.c | 308 +++++----- + drivers/tty/serial/liteuart.c | 241 ++++---- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 3 +- + drivers/tty/serial/msm_serial.c | 1 + + drivers/tty/serial/pch_uart.c | 2 +- + drivers/tty/serial/pic32_uart.c | 2 + + drivers/tty/serial/qcom_geni_serial.c | 638 ++++++++++++++------- + drivers/tty/serial/sc16is7xx.c | 51 +- + drivers/tty/serial/sccnxp.c | 12 +- + drivers/tty/serial/serial-tegra.c | 7 +- + drivers/tty/serial/serial_core.c | 77 +-- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/sunhv.c | 8 +- + drivers/tty/serial/ucc_uart.c | 2 + + drivers/tty/synclink_gt.c | 21 +- + drivers/tty/tty_io.c | 8 +- + drivers/tty/tty_ioctl.c | 8 +- + drivers/tty/tty_port.c | 22 +- + drivers/tty/vt/vt.c | 310 +++++----- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/serial/console.c | 2 +- + drivers/usb/serial/usb-serial.c | 6 +- + drivers/video/console/newport_con.c | 9 +- + drivers/video/console/sticon.c | 9 +- + drivers/video/console/vgacon.c | 8 +- + drivers/video/fbdev/core/fbcon.c | 35 +- + include/linux/console.h | 5 +- + include/linux/console_struct.h | 3 +- + include/linux/dfl.h | 8 + + include/linux/serial.h | 10 + + include/linux/serial_core.h | 9 +- + .../linux/{qcom-geni-se.h => soc/qcom/geni-se.h} | 3 + + include/linux/tty.h | 2 +- + include/linux/tty_ldisc.h | 4 +- + include/linux/tty_port.h | 10 +- + include/uapi/linux/gsmmux.h | 17 +- + include/uapi/linux/kd.h | 10 +- + include/uapi/linux/serial_core.h | 3 + + include/uapi/linux/serial_reg.h | 5 + + net/bluetooth/rfcomm/tty.c | 2 +- + 104 files changed, 2908 insertions(+), 1283 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uart.yaml + create mode 100644 arch/arm/include/asm/semihost.h + create mode 100644 arch/arm64/include/asm/semihost.h + create mode 100644 arch/riscv/include/asm/semihost.h + create mode 100644 drivers/tty/serial/8250/8250_dfl.c + create mode 100644 drivers/tty/serial/8250/8250_pci1xxxx.c + create mode 100644 drivers/tty/serial/8250/8250_pcilib.c + create mode 100644 drivers/tty/serial/8250/8250_pcilib.h + rename drivers/tty/serial/{earlycon-arm-semihost.c => earlycon-semihost.c} (57%) + rename include/linux/{qcom-geni-se.h => soc/qcom/geni-se.h} (99%) +Merging char-misc/char-misc-next (6ec363fc6142 scripts/tags.sh: fix incompatibility with PCRE2) +$ 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 Documentation/kbuild/kbuild.rst +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/android/binderfs.c +Auto-merging drivers/bus/mhi/ep/main.c +Auto-merging drivers/bus/mhi/host/init.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/fpga/dfl.c +CONFLICT (content): Merge conflict in drivers/fpga/dfl.c +Auto-merging drivers/fpga/dfl.h +CONFLICT (content): Merge conflict in drivers/fpga/dfl.h +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/adc/qcom-spmi-adc5.c +Auto-merging drivers/iio/light/vcnl4000.c +Auto-merging drivers/ipack/devices/ipoctal.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/misc/mei/bus.c +Auto-merging drivers/of/property.c +Auto-merging include/linux/hisi_acc_qm.h +Auto-merging include/linux/of.h +Auto-merging kernel/events/core.c +Auto-merging scripts/tags.sh +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/fpga/dfl.c' using previous resolution. +Resolved 'drivers/fpga/dfl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 04acf22328d0] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 13 + + .../testing/sysfs-bus-coresight-devices-ultra_smb | 31 + + Documentation/ABI/testing/sysfs-driver-uacce | 18 + + .../ABI/testing/sysfs-driver-xilinx-tmr-manager | 16 + + .../bindings/arm/qcom,coresight-tpda.yaml | 129 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 93 + + .../bindings/iio/accel/adi,adis16201.yaml | 2 +- + .../bindings/iio/accel/adi,adis16240.yaml | 2 +- + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 2 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 4 +- + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 52 +- + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 48 +- + .../bindings/iio/accel/bosch,bma220.yaml | 2 +- + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 2 +- + .../bindings/iio/accel/memsensing,msa311.yaml | 5 +- + .../bindings/iio/accel/nxp,fxls8962af.yaml | 4 +- + .../devicetree/bindings/iio/adc/adi,ad7091r5.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 42 +- + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 40 +- + .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad799x.yaml | 18 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 10 +- + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 2 +- + .../devicetree/bindings/iio/adc/avia-hx711.yaml | 4 +- + .../bindings/iio/adc/cirrus,ep9301-adc.yaml | 47 + + .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 18 +- + .../devicetree/bindings/iio/adc/maxim,max1027.yaml | 4 +- + .../devicetree/bindings/iio/adc/maxim,max1238.yaml | 2 +- + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 4 +- + .../devicetree/bindings/iio/adc/maxim,max1363.yaml | 2 +- + .../bindings/iio/adc/microchip,mcp3911.yaml | 4 +- + .../devicetree/bindings/iio/adc/nxp,imx93-adc.yaml | 81 + + .../bindings/iio/adc/qcom,pm8018-adc.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 3 +- + .../bindings/iio/adc/qcom,spmi-rradc.yaml | 16 +- + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 2 +- + .../bindings/iio/adc/samsung,exynos-adc.yaml | 6 +- + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 8 +- + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 8 +- + .../devicetree/bindings/iio/adc/ti,adc081c.yaml | 55 + + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 8 +- + .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 2 +- + .../devicetree/bindings/iio/adc/ti,ads7924.yaml | 110 + + .../devicetree/bindings/iio/adc/ti,lmp92064.yaml | 70 + + .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 34 +- + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 40 +- + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 22 +- + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 88 +- + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 52 +- + .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml | 4 +- + .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 20 +- + .../devicetree/bindings/iio/dac/maxim,max5522.yaml | 49 + + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 4 +- + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 2 +- + .../devicetree/bindings/iio/frequency/adf4371.yaml | 12 +- + .../bindings/iio/gyroscope/adi,adxrs290.yaml | 14 +- + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 30 +- + .../devicetree/bindings/iio/health/ti,afe4403.yaml | 2 +- + .../devicetree/bindings/iio/health/ti,afe4404.yaml | 2 +- + .../devicetree/bindings/iio/humidity/dht11.yaml | 2 +- + .../bindings/iio/humidity/ti,hdc2010.yaml | 16 +- + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 2 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 24 +- + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 32 +- + .../bindings/iio/imu/invensense,icm42600.yaml | 34 +- + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 26 +- + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 2 +- + .../bindings/iio/magnetometer/ti,tmag5273.yaml | 75 + + .../bindings/iio/magnetometer/yamaha,yas530.yaml | 18 +- + .../bindings/iio/potentiometer/adi,ad5272.yaml | 2 +- + .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- + .../devicetree/bindings/iio/pressure/bmp085.yaml | 24 +- + .../bindings/iio/proximity/ams,as3935.yaml | 2 +- + .../proximity/google,cros-ec-mkbp-proximity.yaml | 1 - + .../bindings/iio/proximity/semtech,sx9360.yaml | 2 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 + + .../bindings/iio/temperature/adi,ltc2983.yaml | 137 +- + .../bindings/iio/temperature/maxim,max31865.yaml | 12 +- + .../bindings/iio/temperature/ti,tmp117.yaml | 6 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 73 +- + .../bindings/interconnect/qcom,rpmh.yaml | 46 +- + .../bindings/interconnect/qcom,sa8775p-rpmh.yaml | 50 + + .../bindings/interconnect/qcom,sc7280-rpmh.yaml | 71 + + .../bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 49 + + .../bindings/interconnect/qcom,sm8450-rpmh.yaml | 124 + + .../bindings/interconnect/samsung,exynos-bus.yaml | 27 + + .../devicetree/bindings/misc/xlnx,tmr-inject.yaml | 47 + + .../devicetree/bindings/misc/xlnx,tmr-manager.yaml | 47 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 7 +- + Documentation/kbuild/kbuild.rst | 7 + + Documentation/trace/coresight/coresight-tpda.rst | 52 + + Documentation/trace/coresight/coresight-tpdm.rst | 45 + + Documentation/trace/coresight/ultrasoc-smb.rst | 83 + + MAINTAINERS | 48 +- + drivers/accessibility/speakup/main.c | 2 +- + drivers/android/binder.c | 65 +- + drivers/android/binder_internal.h | 3 +- + drivers/android/binderfs.c | 4 +- + drivers/bus/mhi/Makefile | 4 +- + drivers/bus/mhi/ep/main.c | 85 +- + drivers/bus/mhi/ep/sm.c | 42 +- + drivers/bus/mhi/host/init.c | 2 +- + drivers/bus/simple-pm-bus.c | 46 + + drivers/char/applicom.c | 5 +- + drivers/char/pcmcia/cm4000_cs.c | 6 +- + drivers/char/pcmcia/synclink_cs.c | 22 +- + drivers/char/virtio_console.c | 5 +- + drivers/comedi/Kconfig | 2 +- + drivers/comedi/comedi_fops.c | 1 + + drivers/counter/Kconfig | 91 +- + drivers/crypto/hisilicon/qm.c | 169 +- + drivers/firmware/dmi-sysfs.c | 14 +- + drivers/firmware/google/Kconfig | 8 - + drivers/firmware/google/framebuffer-coreboot.c | 4 +- + drivers/firmware/stratix10-svc.c | 25 +- + drivers/fpga/dfl-afu-region.c | 1 + + drivers/fpga/dfl-afu.h | 2 +- + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/fpga/dfl-fme-pr.c | 4 +- + drivers/fpga/dfl-fme-pr.h | 2 +- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/fpga-bridge.c | 11 +- + drivers/fpga/microchip-spi.c | 145 +- + drivers/hwtracing/coresight/Kconfig | 35 + + drivers/hwtracing/coresight/Makefile | 5 +- + drivers/hwtracing/coresight/coresight-core.c | 87 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 23 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 15 +- + drivers/hwtracing/coresight/coresight-cti.h | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 31 + + drivers/hwtracing/coresight/coresight-etm-perf.h | 2 + + drivers/hwtracing/coresight/coresight-etm.h | 3 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 93 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 27 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 91 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 27 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 + + drivers/hwtracing/coresight/coresight-stm.c | 49 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 19 +- + drivers/hwtracing/coresight/coresight-tmc.h | 2 +- + drivers/hwtracing/coresight/coresight-tpda.c | 211 ++ + drivers/hwtracing/coresight/coresight-tpda.h | 35 + + drivers/hwtracing/coresight/coresight-tpdm.c | 259 ++ + drivers/hwtracing/coresight/coresight-tpdm.h | 62 + + drivers/hwtracing/coresight/coresight-trace-id.c | 297 +++ + drivers/hwtracing/coresight/coresight-trace-id.h | 156 ++ + drivers/hwtracing/coresight/ultrasoc-smb.c | 648 +++++ + drivers/hwtracing/coresight/ultrasoc-smb.h | 125 + + drivers/hwtracing/ptt/hisi_ptt.c | 10 + + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/accel/bma400.h | 4 - + drivers/iio/accel/bma400_core.c | 29 +- + drivers/iio/accel/mma9551_core.c | 10 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 34 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad7291.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/ep93xx_adc.c | 8 + + drivers/iio/adc/imx93_adc.c | 484 ++++ + drivers/iio/adc/max11410.c | 3 +- + drivers/iio/adc/qcom-spmi-adc5.c | 8 +- + drivers/iio/adc/stm32-dfsdm-core.c | 99 +- + drivers/iio/adc/stm32-dfsdm.h | 60 +- + drivers/iio/adc/ti-adc128s052.c | 54 +- + drivers/iio/adc/ti-ads7924.c | 474 ++++ + drivers/iio/adc/ti-lmp92064.c | 332 +++ + drivers/iio/adc/xilinx-ams.c | 9 +- + drivers/iio/cdc/ad7746.c | 3 +- + drivers/iio/chemical/scd30_core.c | 46 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 4 +- + drivers/iio/dac/Kconfig | 21 +- + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 2 + + drivers/iio/dac/max5522.c | 207 ++ + drivers/iio/imu/bno055/bno055_ser_trace.c | 2 +- + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 5 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 12 +- + drivers/iio/industrialio-core.c | 64 +- + drivers/iio/light/Makefile | 2 +- + drivers/iio/light/max44009.c | 5 +- + drivers/iio/light/tsl2563.c | 189 +- + drivers/iio/light/vcnl4000.c | 449 ++-- + drivers/iio/magnetometer/Kconfig | 14 +- + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/magnetometer/st_magn_i2c.c | 5 + + drivers/iio/magnetometer/st_magn_spi.c | 5 + + drivers/iio/magnetometer/tmag5273.c | 743 ++++++ + drivers/iio/pressure/ms5611.h | 4 - + drivers/iio/pressure/ms5611_core.c | 49 +- + drivers/iio/pressure/ms5611_i2c.c | 6 - + drivers/iio/pressure/ms5611_spi.c | 6 - + drivers/interconnect/core.c | 14 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/sa8775p.c | 2541 ++++++++++++++++++++ + drivers/interconnect/qcom/sc7180.h | 4 +- + drivers/interconnect/qcom/sc8180x.c | 38 - + drivers/interconnect/qcom/sc8180x.h | 4 +- + drivers/interconnect/qcom/sc8280xp.c | 25 - + drivers/interconnect/qcom/sc8280xp.h | 4 +- + drivers/interconnect/qcom/sdm670.c | 440 ++++ + drivers/interconnect/qcom/sdm670.h | 128 + + drivers/interconnect/qcom/sdx55.h | 4 +- + drivers/interconnect/qcom/sm8150.c | 21 - + drivers/interconnect/qcom/sm8150.h | 4 +- + drivers/interconnect/qcom/sm8250.c | 21 - + drivers/interconnect/qcom/sm8250.h | 4 +- + drivers/ipack/devices/ipoctal.c | 2 +- + drivers/misc/Kconfig | 20 + + drivers/misc/Makefile | 2 + + drivers/misc/eeprom/at25.c | 8 +- + drivers/misc/eeprom/idt_89hpesx.c | 10 +- + drivers/misc/enclosure.c | 2 +- + drivers/misc/fastrpc.c | 13 +- + drivers/misc/genwqe/card_utils.c | 6 +- + drivers/misc/isl29003.c | 10 +- + drivers/misc/mei/bus-fixup.c | 26 +- + drivers/misc/mei/bus.c | 3 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 4 +- + drivers/misc/mei/mei_dev.h | 5 + + drivers/misc/mei/pxp/mei_pxp.c | 4 +- + drivers/misc/sgi-gru/grukservices.c | 8 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/misc/uacce/uacce.c | 50 + + drivers/misc/vmw_balloon.c | 2 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 + + drivers/misc/xilinx_tmr_inject.c | 171 ++ + drivers/misc/xilinx_tmr_manager.c | 220 ++ + drivers/most/Kconfig | 2 +- + drivers/most/most_cdev.c | 5 +- + drivers/most/most_snd.c | 10 +- + drivers/most/most_usb.c | 6 +- + drivers/nvmem/Kconfig | 10 + + drivers/nvmem/Makefile | 1 + + drivers/nvmem/core.c | 145 +- + drivers/nvmem/imx-ocotp.c | 4 +- + drivers/nvmem/qcom-spmi-sdam.c | 13 +- + drivers/nvmem/rave-sp-eeprom.c | 2 +- + drivers/nvmem/stm32-bsec-optee-ta.c | 298 +++ + drivers/nvmem/stm32-bsec-optee-ta.h | 80 + + drivers/nvmem/stm32-romem.c | 84 +- + drivers/nvmem/sunxi_sid.c | 8 +- + drivers/of/property.c | 6 +- + drivers/parport/parport_pc.c | 125 +- + .../dt-bindings/interconnect/qcom,sa8775p-rpmh.h | 231 ++ + include/dt-bindings/interconnect/qcom,sc7180.h | 3 - + include/dt-bindings/interconnect/qcom,sc8180x.h | 3 - + include/dt-bindings/interconnect/qcom,sc8280xp.h | 4 +- + .../dt-bindings/interconnect/qcom,sdm670-rpmh.h | 136 ++ + include/dt-bindings/interconnect/qcom,sdx55.h | 2 - + include/dt-bindings/interconnect/qcom,sm8150.h | 3 - + include/dt-bindings/interconnect/qcom,sm8250.h | 3 - + include/linux/coresight-pmu.h | 34 +- + include/linux/coresight.h | 4 +- + include/linux/etherdevice.h | 14 + + include/linux/hisi_acc_qm.h | 15 + + include/linux/iio/iio.h | 5 + + include/linux/mhi_ep.h | 4 +- + include/linux/nvmem-consumer.h | 10 +- + include/linux/nvmem-provider.h | 31 +- + include/linux/of.h | 25 + + include/linux/parport_pc.h | 3 + + include/linux/platform_data/tsl2563.h | 9 - + include/linux/uacce.h | 12 + + include/linux/uuid.h | 19 +- + include/uapi/linux/android/binder.h | 7 +- + include/uapi/linux/uuid.h | 12 +- + kernel/events/core.c | 1 + + scripts/tags.sh | 9 +- + tools/iio/iio_utils.c | 23 +- + 289 files changed, 12530 insertions(+), 1958 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-ultra_smb + create mode 100644 Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tpda.yaml + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc081c.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads7924.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/maxim,max5522.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8450-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml + create mode 100644 Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml + create mode 100644 Documentation/trace/coresight/coresight-tpda.rst + create mode 100644 Documentation/trace/coresight/coresight-tpdm.rst + create mode 100644 Documentation/trace/coresight/ultrasoc-smb.rst + create mode 100644 drivers/hwtracing/coresight/coresight-tpda.c + create mode 100644 drivers/hwtracing/coresight/coresight-tpda.h + create mode 100644 drivers/hwtracing/coresight/coresight-tpdm.c + create mode 100644 drivers/hwtracing/coresight/coresight-tpdm.h + create mode 100644 drivers/hwtracing/coresight/coresight-trace-id.c + create mode 100644 drivers/hwtracing/coresight/coresight-trace-id.h + create mode 100644 drivers/hwtracing/coresight/ultrasoc-smb.c + create mode 100644 drivers/hwtracing/coresight/ultrasoc-smb.h + create mode 100644 drivers/iio/adc/imx93_adc.c + create mode 100644 drivers/iio/adc/ti-ads7924.c + create mode 100644 drivers/iio/adc/ti-lmp92064.c + create mode 100644 drivers/iio/dac/max5522.c + create mode 100644 drivers/iio/magnetometer/tmag5273.c + create mode 100644 drivers/interconnect/qcom/sa8775p.c + create mode 100644 drivers/interconnect/qcom/sdm670.c + create mode 100644 drivers/interconnect/qcom/sdm670.h + create mode 100644 drivers/misc/xilinx_tmr_inject.c + create mode 100644 drivers/misc/xilinx_tmr_manager.c + create mode 100644 drivers/nvmem/stm32-bsec-optee-ta.c + create mode 100644 drivers/nvmem/stm32-bsec-optee-ta.h + create mode 100644 include/dt-bindings/interconnect/qcom,sa8775p-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdm670-rpmh.h + delete mode 100644 include/linux/platform_data/tsl2563.h +Merging accel/habanalabs-next (e195c1e07613 habanalabs: set hl_capture_*_err storage-class-specifier to static) +$ 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. + .../accel/habanalabs/common/command_submission.c | 73 +- + drivers/accel/habanalabs/common/debugfs.c | 129 +- + drivers/accel/habanalabs/common/device.c | 267 +- + drivers/accel/habanalabs/common/habanalabs.h | 86 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 8 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 52 + + drivers/accel/habanalabs/common/irq.c | 65 +- + drivers/accel/habanalabs/common/memory.c | 109 +- + drivers/accel/habanalabs/common/security.c | 6 +- + drivers/accel/habanalabs/common/security.h | 2 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 20 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 803 +-- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 2 + + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/accel/habanalabs/goya/goya.c | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 5294 ++++++++++---------- + include/uapi/drm/habanalabs_accel.h | 51 +- + 17 files changed, 3673 insertions(+), 3296 deletions(-) +Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (ffa562d00072 fpga: bridge: return errors in the show() method of the "state" attribute) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/fpga/dfl.h +CONFLICT (content): Merge conflict in drivers/fpga/dfl.h +Auto-merging drivers/tty/serial/8250/Kconfig +Auto-merging drivers/tty/serial/8250/Makefile +Resolved 'drivers/fpga/dfl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4d4ff19aa289] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git +$ git diff -M --stat --summary HEAD^.. + drivers/fpga/dfl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging icc/icc-next (7bf0008a5293 Merge branch 'icc-dt' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (91ba2700aa75 staging: iio: meter: Drop ade7854 driver) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/accel/kionix-kx022a.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 ++- + drivers/iio/accel/kionix-kx022a.c | 1 - + drivers/iio/chemical/sps30_i2c.c | 6 +- + drivers/iio/dac/ad5592r-base.c | 5 + + drivers/iio/proximity/sx_common.h | 1 - + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/meter/Kconfig | 37 -- + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7854-i2c.c | 153 ------ + drivers/staging/iio/meter/ade7854-spi.c | 160 ------ + drivers/staging/iio/meter/ade7854.c | 556 --------------------- + drivers/staging/iio/meter/ade7854.h | 173 ------- + drivers/staging/iio/meter/meter.h | 398 --------------- + 14 files changed, 37 insertions(+), 1523 deletions(-) + delete mode 100644 drivers/staging/iio/meter/Kconfig + delete mode 100644 drivers/staging/iio/meter/Makefile + delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c + delete mode 100644 drivers/staging/iio/meter/ade7854.c + delete mode 100644 drivers/staging/iio/meter/ade7854.h + delete mode 100644 drivers/staging/iio/meter/meter.h +Merging phy-next/next (3584f6392f09 phy: qcom: phy-qcom-snps-eusb2: Add support for eUSB2 repeater) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/net/ethernet/freescale/fman/fman_memac.c +Auto-merging drivers/net/ethernet/microchip/lan966x/lan966x_main.c +Auto-merging drivers/pci/controller/pci-tegra.c +Auto-merging drivers/phy/tegra/xusb.c +Merge made by the 'ort' strategy. + .../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 +++ + .../bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 5 + + .../bindings/phy/amlogic,meson-gxl-usb2-phy.yaml | 56 ++ + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 21 - + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 779 -------------------- + .../bindings/phy/nvidia,tegra124-xusb-padctl.yaml | 654 +++++++++++++++++ + .../bindings/phy/nvidia,tegra186-xusb-padctl.yaml | 544 ++++++++++++++ + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 632 +++++++++++++++++ + .../bindings/phy/nvidia,tegra210-xusb-padctl.yaml | 786 +++++++++++++++++++++ + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 3 + + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,pcie2-phy.yaml | 86 +++ + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 160 +++-- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 89 ++- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 52 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 5 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 4 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 79 +++ + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 52 ++ + .../devicetree/bindings/phy/qcom,usb-hsic-phy.txt | 65 -- + .../devicetree/bindings/phy/qcom,usb-hsic-phy.yaml | 67 ++ + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +- + .../devicetree/bindings/phy/qcom-pcie2-phy.txt | 42 -- + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 1 + + Documentation/driver-api/phy/phy.rst | 24 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 9 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 5 +- + drivers/pci/controller/pci-tegra.c | 5 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 59 +- + drivers/phy/mediatek/phy-mtk-io.h | 4 +- + drivers/phy/phy-can-transceiver.c | 4 + + drivers/phy/phy-core.c | 51 +- + drivers/phy/qualcomm/Kconfig | 68 +- + drivers/phy/qualcomm/Makefile | 14 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 259 +++++++ + drivers/phy/qualcomm/phy-qcom-pcie2.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 750 +++++++++++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 588 +++++++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 15 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h | 23 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h | 25 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h | 5 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 31 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h | 31 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h | 16 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h | 18 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 82 +++ + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h | 2 +- + .../phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v6.h | 32 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 30 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 5 - + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 77 ++ + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h | 45 ++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 688 ++++++++++++++---- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 83 ++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 23 +- + drivers/phy/qualcomm/phy-qcom-snps-eusb2.c | 441 ++++++++++++ + drivers/phy/renesas/r8a779f0-ether-serdes.c | 65 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 7 +- + drivers/phy/tegra/xusb.c | 17 + + drivers/phy/ti/phy-j721e-wiz.c | 66 +- + drivers/usb/host/ehci-exynos.c | 23 +- + drivers/usb/host/ohci-exynos.c | 23 +- + include/linux/phy/phy.h | 16 +- + 69 files changed, 6574 insertions(+), 1495 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-gxl-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra186-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra210-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,pcie2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,snps-eusb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,snps-eusb2-repeater.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-pcie2-phy.txt + create mode 100644 drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-snps-eusb2.c +Merging soundwire/next (66f95de7c13b soundwire: cadence: further simplify low-level xfer_msg_defer() callback) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/bus_type.c +Auto-merging drivers/soundwire/stream.c +Auto-merging include/linux/soundwire/sdw.h +Auto-merging sound/soc/codecs/rt1316-sdw.c +Auto-merging sound/soc/codecs/rt1318-sdw.c +Auto-merging sound/soc/codecs/rt711-sdca-sdw.c +Merge made by the 'ort' strategy. + drivers/soundwire/bus.c | 56 +++++------------ + drivers/soundwire/bus.h | 3 +- + drivers/soundwire/bus_type.c | 9 +-- + drivers/soundwire/cadence_master.c | 80 ++++++++++++----------- + drivers/soundwire/cadence_master.h | 22 ++++--- + drivers/soundwire/debugfs.c | 13 +++- + drivers/soundwire/intel.c | 27 -------- + drivers/soundwire/intel_auxdevice.c | 1 - + drivers/soundwire/stream.c | 38 +++++------ + include/linux/soundwire/sdw.h | 122 ++++++++++++++++++++++++++++++------ + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + 13 files changed, 207 insertions(+), 167 deletions(-) +Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional) +$ 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. + .../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 14 +++++++++----- + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-qcom-spmi-misc.c | 4 ++-- + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (c55365a09302 docs: vfio: Update vfio.rst per latest interfaces) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging samples/Kconfig +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio-mediated-device.rst | 108 +-------- + Documentation/driver-api/vfio.rst | 82 +++++-- + Documentation/s390/vfio-ap.rst | 1 - + MAINTAINERS | 1 - + arch/s390/Kconfig | 8 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + drivers/gpu/drm/i915/Kconfig | 3 +- + drivers/vfio/container.c | 7 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +- + drivers/vfio/group.c | 44 +++- + drivers/vfio/mdev/Kconfig | 8 +- + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 +- + drivers/vfio/pci/mlx5/cmd.c | 79 +++++-- + drivers/vfio/pci/mlx5/cmd.h | 28 ++- + drivers/vfio/pci/mlx5/main.c | 261 ++++++++++++++++++---- + drivers/vfio/pci/vfio_pci_config.c | 6 +- + drivers/vfio/pci/vfio_pci_core.c | 7 +- + drivers/vfio/pci/vfio_pci_igd.c | 2 +- + drivers/vfio/pci/vfio_pci_intrs.c | 10 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- + drivers/vfio/platform/vfio_platform_common.c | 12 +- + drivers/vfio/platform/vfio_platform_irq.c | 8 +- + drivers/vfio/vfio.h | 25 ++- + drivers/vfio/vfio_iommu_type1.c | 248 +++++++++----------- + drivers/vfio/vfio_main.c | 70 +++++- + drivers/vfio/virqfd.c | 2 +- + include/linux/vfio.h | 6 +- + include/uapi/linux/vfio.h | 15 +- + samples/Kconfig | 19 +- + samples/vfio-mdev/README.rst | 100 +++++++++ + 33 files changed, 755 insertions(+), 421 deletions(-) + create mode 100644 samples/vfio-mdev/README.rst +Merging staging/staging-next (b5929325f063 staging: r8188eu: Revert "staging: r8188eu: simplify rtw_get_ff_hwaddr") +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f3f485d043db] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 + + drivers/staging/emxx_udc/emxx_udc.c | 7 +- + drivers/staging/greybus/gpio.c | 6 +- + drivers/staging/greybus/usb.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 3 +- + drivers/staging/pi433/TODO | 3 + + drivers/staging/pi433/pi433_if.c | 11 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 67 +-- + drivers/staging/r8188eu/core/rtw_fw.c | 10 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 5 - + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 31 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 23 +- + drivers/staging/r8188eu/core/rtw_recv.c | 30 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 26 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 478 +++++++-------------- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 35 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 7 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 42 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 31 +- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 80 ++-- + drivers/staging/r8188eu/include/drv_types.h | 4 - + drivers/staging/r8188eu/include/hal_intf.h | 2 +- + drivers/staging/r8188eu/include/osdep_intf.h | 32 -- + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 21 - + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 16 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 3 +- + drivers/staging/r8188eu/include/rtw_io.h | 257 +---------- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 3 - + drivers/staging/r8188eu/include/rtw_xmit.h | 57 +-- + drivers/staging/r8188eu/include/usb_ops.h | 2 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 29 -- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 17 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 33 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 106 +---- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 355 ++++++--------- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 219 +--------- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 374 ++++++++-------- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 86 +--- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 208 +++------ + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 342 ++++++++------- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 45 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 +- + drivers/staging/rts5208/ms.c | 2 + + drivers/staging/vc04_services/Makefile | 2 - + .../staging/vc04_services/bcm2835-audio/Makefile | 2 - + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 12 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 3 +- + .../staging/vc04_services/bcm2835-camera/Makefile | 5 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +- + .../vc04_services/bcm2835-camera/controls.c | 6 +- + .../include/linux/raspberrypi/vchiq.h | 63 ++- + drivers/staging/vc04_services/interface/TODO | 5 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 136 +++--- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 226 +++++----- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 38 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 36 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 11 +- + drivers/staging/vc04_services/vchiq-mmal/Makefile | 5 - + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 15 +- + drivers/staging/vme_user/vme.h | 26 +- + drivers/staging/vme_user/vme_bridge.h | 36 +- + drivers/staging/wlan-ng/hfa384x.h | 171 -------- + 72 files changed, 1330 insertions(+), 2666 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/usb_ops_linux.h +Merging counter-next/counter-next (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (e922bbf37564 dmaengine: idma64: Update bytes_transferred field) +$ 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/Kconfig +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/tegra210-adma.c +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging include/linux/dmaengine.h +Merge made by the 'ort' strategy. + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../devicetree/bindings/dma/apple,admac.yaml | 2 +- + .../devicetree/bindings/dma/arm-pl08x.yaml | 2 +- + .../devicetree/bindings/dma/dma-controller.yaml | 2 +- + .../devicetree/bindings/dma/dma-router.yaml | 2 +- + .../devicetree/bindings/dma/fsl,edma.yaml | 2 +- + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 149 ++++ + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 80 ++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --- + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 60 -- + .../devicetree/bindings/dma/ingenic,dma.yaml | 2 +- + .../devicetree/bindings/dma/intel,ldma.yaml | 2 +- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra210-adma.yaml | 2 +- + Documentation/devicetree/bindings/dma/owl-dma.yaml | 2 +- + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 2 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 5 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 2 +- + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 2 +- + .../bindings/dma/renesas,rzn1-dmamux.yaml | 2 +- + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 2 +- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../bindings/dma/snps,dma-spear1340.yaml | 2 +- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 38 +- + .../bindings/dma/socionext,uniphier-mio-dmac.yaml | 2 +- + .../bindings/dma/socionext,uniphier-xdmac.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 2 +- + .../devicetree/bindings/dma/stericsson,dma40.yaml | 18 +- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 77 +- + MAINTAINERS | 11 + + drivers/dma/Kconfig | 16 +- + drivers/dma/at_xdmac.c | 220 ++++- + drivers/dma/bcm2835-dma.c | 4 +- + drivers/dma/dma-axi-dmac.c | 4 +- + drivers/dma/dmaengine.c | 26 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- + drivers/dma/dw/core.c | 11 +- + drivers/dma/fsl-edma.c | 8 +- + drivers/dma/fsl-qdma.c | 10 +- + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/device.c | 14 +- + drivers/dma/idxd/dma.c | 6 - + drivers/dma/idxd/init.c | 7 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/dma/img-mdc-dma.c | 4 +- + drivers/dma/imx-dma.c | 4 +- + drivers/dma/imx-sdma.c | 43 +- + drivers/dma/mcf-edma.c | 5 +- + drivers/dma/mediatek/mtk-hsdma.c | 4 +- + drivers/dma/mmp_pdma.c | 4 +- + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/moxart-dma.c | 4 +- + drivers/dma/mv_xor_v2.c | 7 +- + drivers/dma/mxs-dma.c | 4 +- + drivers/dma/nbpfaxi.c | 4 +- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/ptdma/ptdma-dmaengine.c | 2 +- + drivers/dma/pxa_dma.c | 4 +- + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/sf-pdma/sf-pdma.c | 7 +- + drivers/dma/sf-pdma/sf-pdma.h | 1 - + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/stm32-dmamux.c | 4 +- + drivers/dma/stm32-mdma.c | 4 +- + drivers/dma/sun4i-dma.c | 4 +- + drivers/dma/sun6i-dma.c | 7 +- + drivers/dma/tegra210-adma.c | 4 +- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/cppi41.c | 10 +- + drivers/dma/ti/k3-psil-am62a.c | 196 +++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 42 +- + drivers/dma/ti/omap-dma.c | 4 +- + drivers/dma/xilinx/Makefile | 1 + + drivers/dma/xilinx/xdma-regs.h | 166 ++++ + drivers/dma/xilinx/xdma.c | 974 +++++++++++++++++++++ + drivers/dma/xilinx/zynqmp_dma.c | 4 +- + include/linux/dma/amd_xdma.h | 16 + + include/linux/dma/imx-dma.h | 1 + + include/linux/dmaengine.h | 13 +- + include/linux/platform_data/amd_xdma.h | 34 + + 88 files changed, 2119 insertions(+), 445 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt + create mode 100644 drivers/dma/ti/k3-psil-am62a.c + create mode 100644 drivers/dma/xilinx/xdma-regs.h + create mode 100644 drivers/dma/xilinx/xdma.c + create mode 100644 include/linux/dma/amd_xdma.h + create mode 100644 include/linux/platform_data/amd_xdma.h +Merging cgroup/for-next (14fffd51f902 Merge branch 'for-6.2-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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cgroups.rst | 2 + + Documentation/admin-guide/cgroup-v1/memory.rst | 284 +++++++++++++----------- + kernel/cgroup/cpuset.c | 15 +- + 3 files changed, 162 insertions(+), 139 deletions(-) +Merging scsi/for-next (1a10df75c93f 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 Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/sd.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,ufs.yaml | 4 + + .../devicetree/bindings/ufs/sprd,ums9620-ufs.yaml | 79 ++ + Documentation/scsi/ChangeLog.lpfc | 36 +- + Documentation/scsi/ChangeLog.megaraid | 8 +- + Documentation/scsi/ChangeLog.megaraid_sas | 4 +- + Documentation/scsi/ChangeLog.ncr53c8xx | 16 +- + Documentation/scsi/ChangeLog.sym53c8xx | 14 +- + Documentation/scsi/ChangeLog.sym53c8xx_2 | 10 +- + Documentation/scsi/ncr53c8xx.rst | 4 +- + Documentation/scsi/sym53c8xx_2.rst | 2 +- + Documentation/scsi/tcm_qla2xxx.rst | 2 +- + Documentation/scsi/ufs.rst | 2 +- + Documentation/target/tcmu-design.rst | 2 +- + MAINTAINERS | 14 + + drivers/ata/libata-scsi.c | 23 +- + drivers/hwmon/drivetemp.c | 11 +- + drivers/scsi/3w-sas.c | 12 +- + drivers/scsi/3w-sas.h | 4 +- + drivers/scsi/aacraid/aachba.c | 5 +- + drivers/scsi/aic94xx/aic94xx_task.c | 3 + + drivers/scsi/ch.c | 30 +- + drivers/scsi/cxlflash/superpipe.c | 34 +- + drivers/scsi/cxlflash/vlun.c | 32 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 26 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 13 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 22 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 12 +- + drivers/scsi/elx/libefc_sli/sli4.c | 2 +- + drivers/scsi/ipr.c | 9 +- + drivers/scsi/ips.c | 11 +- + drivers/scsi/libsas/sas_ata.c | 88 ++- + drivers/scsi/libsas/sas_discover.c | 6 - + drivers/scsi/libsas/sas_expander.c | 125 +-- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 63 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 33 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- + drivers/scsi/lpfc/lpfc_hw4.h | 7 +- + drivers/scsi/lpfc/lpfc_init.c | 94 ++- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 +- + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vmid.c | 41 +- + drivers/scsi/lpfc/lpfc_vport.c | 16 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 3 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/mvumi.h | 6 +- + drivers/scsi/pm8001/pm8001_ctl.c | 46 +- + drivers/scsi/qla2xxx/qla_attr.c | 5 +- + drivers/scsi/qla2xxx/qla_bsg.c | 9 +- + drivers/scsi/qla2xxx/qla_def.h | 51 +- + drivers/scsi/qla2xxx/qla_dfs.c | 10 +- + drivers/scsi/qla2xxx/qla_edif.c | 96 ++- + drivers/scsi/qla2xxx/qla_edif.h | 2 + + drivers/scsi/qla2xxx/qla_edif_bsg.h | 15 +- + drivers/scsi/qla2xxx/qla_gbl.h | 18 +- + drivers/scsi/qla2xxx/qla_gs.c | 407 ---------- + drivers/scsi/qla2xxx/qla_init.c | 97 +-- + drivers/scsi/qla2xxx/qla_inline.h | 110 ++- + drivers/scsi/qla2xxx/qla_iocb.c | 107 ++- + drivers/scsi/qla2xxx/qla_isr.c | 9 +- + drivers/scsi/qla2xxx/qla_mbx.c | 8 +- + drivers/scsi/qla2xxx/qla_mid.c | 302 ++++++- + drivers/scsi/qla2xxx/qla_nvme.c | 38 +- + drivers/scsi/qla2xxx/qla_os.c | 61 +- + drivers/scsi/qla2xxx/qla_target.c | 106 +-- + drivers/scsi/qla2xxx/qla_target.h | 1 - + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 13 +- + drivers/scsi/scsi.c | 12 +- + drivers/scsi/scsi_ioctl.c | 7 +- + drivers/scsi/scsi_lib.c | 78 +- + drivers/scsi/scsi_scan.c | 26 +- + drivers/scsi/scsi_transport_spi.c | 31 +- + drivers/scsi/sd.c | 83 +- + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/ses.c | 14 +- + drivers/scsi/smartpqi/smartpqi.h | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 3 +- + drivers/scsi/snic/snic_debugfs.c | 4 +- + drivers/scsi/sr.c | 11 +- + drivers/scsi/sr_ioctl.c | 17 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/target/target_core_pscsi.c | 12 +- + drivers/ufs/core/Makefile | 2 +- + drivers/ufs/core/ufs-mcq.c | 431 ++++++++++ + drivers/ufs/core/ufs_bsg.c | 144 ++-- + drivers/ufs/core/ufshcd-priv.h | 109 ++- + drivers/ufs/core/ufshcd.c | 863 ++++++++++++++++----- + drivers/ufs/core/ufshpb.c | 4 +- + drivers/ufs/host/Kconfig | 19 +- + drivers/ufs/host/Makefile | 1 + + drivers/ufs/host/ufs-exynos.c | 10 +- + drivers/ufs/host/ufs-qcom.c | 548 +++++++++---- + drivers/ufs/host/ufs-qcom.h | 97 +-- + drivers/ufs/host/ufs-sprd.c | 458 +++++++++++ + drivers/ufs/host/ufs-sprd.h | 85 ++ + include/scsi/libsas.h | 1 - + include/scsi/sas_ata.h | 20 + + include/scsi/scsi_device.h | 38 +- + include/uapi/scsi/scsi_bsg_fc.h | 2 +- + include/uapi/scsi/scsi_bsg_ufs.h | 48 +- + include/ufs/ufs.h | 37 +- + include/ufs/ufshcd.h | 194 ++++- + include/ufs/ufshci.h | 76 +- + include/ufs/unipro.h | 1 - + 111 files changed, 4236 insertions(+), 1849 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml + create mode 100644 drivers/ufs/core/ufs-mcq.c + create mode 100644 drivers/ufs/host/ufs-sprd.c + create mode 100644 drivers/ufs/host/ufs-sprd.h +Merging scsi-mkp/for-next (833f7d4819a8 scsi: ufs: core: Fix an error handling path in ufshcd_read_desc_param()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (c76a6fa50447 virtio_ring: introduce virtqueue_reset()) +$ 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 Documentation/driver-api/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/vsock.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/virtio.h +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/virtio/index.rst | 11 + + Documentation/driver-api/virtio/virtio.rst | 145 +++ + .../driver-api/virtio/writing_virtio_drivers.rst | 197 ++++ + MAINTAINERS | 6 + + drivers/block/virtio_blk.c | 568 +++++++++- + drivers/nvdimm/virtio_pmem.c | 11 +- + drivers/pci/quirks.c | 8 + + drivers/scsi/virtio_scsi.c | 14 +- + drivers/vdpa/Kconfig | 30 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 32 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 10 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 162 ++- + drivers/vdpa/mlx5/Makefile | 2 +- + drivers/vdpa/mlx5/core/mr.c | 1 - + drivers/vdpa/mlx5/core/resources.c | 3 +- + drivers/vdpa/mlx5/net/debug.c | 152 +++ + drivers/vdpa/mlx5/net/mlx5_vnet.c | 259 +++-- + drivers/vdpa/mlx5/net/mlx5_vnet.h | 94 ++ + drivers/vdpa/solidrun/Makefile | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 188 ++++ + drivers/vdpa/solidrun/snet_main.c | 1111 ++++++++++++++++++++ + drivers/vdpa/solidrun/snet_vdpa.h | 194 ++++ + drivers/vdpa/vdpa.c | 110 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 233 ++-- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 7 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 219 +++- + drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +- + drivers/vhost/net.c | 5 +- + drivers/vhost/scsi.c | 6 +- + drivers/vhost/test.c | 3 - + drivers/vhost/vdpa.c | 39 +- + drivers/vhost/vhost.c | 2 +- + drivers/vhost/vhost.h | 2 +- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/virtio_ring.c | 925 ++++++++++++---- + drivers/virtio/virtio_vdpa.c | 13 +- + include/linux/pci_ids.h | 2 + + include/linux/vdpa.h | 12 +- + include/linux/virtio.h | 29 + + include/linux/virtio_config.h | 8 +- + include/linux/virtio_ring.h | 16 + + include/linux/vringh.h | 2 +- + include/uapi/linux/vhost.h | 8 + + include/uapi/linux/vhost_types.h | 2 + + include/uapi/linux/virtio_blk.h | 133 +++ + include/uapi/linux/virtio_blk_ioctl.h | 44 + + tools/virtio/Makefile | 2 +- + 50 files changed, 4367 insertions(+), 666 deletions(-) + create mode 100644 Documentation/driver-api/virtio/index.rst + create mode 100644 Documentation/driver-api/virtio/virtio.rst + create mode 100644 Documentation/driver-api/virtio/writing_virtio_drivers.rst + create mode 100644 drivers/vdpa/mlx5/net/debug.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h + create mode 100644 drivers/vdpa/solidrun/Makefile + create mode 100644 drivers/vdpa/solidrun/snet_hwmon.c + create mode 100644 drivers/vdpa/solidrun/snet_main.c + create mode 100644 drivers/vdpa/solidrun/snet_vdpa.h + create mode 100644 include/uapi/linux/virtio_blk_ioctl.h +Merging rpmsg/for-next (c7ed92130c40 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Auto-merging drivers/remoteproc/qcom_q6v5_pas.c +Auto-merging drivers/remoteproc/qcom_wcnss.c +Merge made by the 'ort' strategy. + .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 4 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 - + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 421 +-------------------- + .../bindings/remoteproc/qcom,glink-edge.yaml | 28 +- + .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 99 +++++ + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++++++++++++++ + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 393 +++++++++++++++++++ + .../bindings/remoteproc/qcom,pas-common.yaml | 89 +++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 172 +-------- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 94 +++++ + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 133 +++++++ + .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 ++++++++++ + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 95 +++++ + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 147 +++++++ + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 109 ++++++ + .../bindings/remoteproc/qcom,sm6115-pas.yaml | 143 +++++++ + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 167 ++++++++ + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 174 +++++++++ + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 182 +++++++++ + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 178 +++++++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 --------- + .../bindings/remoteproc/qcom,wcnss-pil.yaml | 294 ++++++++++++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,pru-consumer.yaml | 60 +++ + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 94 ----- + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/remoteproc/mtk_scp.c | 1 + + drivers/remoteproc/mtk_scp_ipi.c | 32 +- + drivers/remoteproc/pru_rproc.c | 230 ++++++++++- + drivers/remoteproc/qcom_common.c | 19 +- + drivers/remoteproc/qcom_common.h | 8 +- + drivers/remoteproc/qcom_q6v5.c | 4 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 124 +++++- + drivers/remoteproc/qcom_q6v5_mss.c | 261 +++++++++---- + drivers/remoteproc/qcom_q6v5_pas.c | 336 +++++++++++++--- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 12 + + drivers/remoteproc/qcom_wcnss.h | 2 - + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 12 + + drivers/rpmsg/qcom_glink_native.c | 208 +++++----- + drivers/rpmsg/qcom_glink_native.h | 8 +- + drivers/rpmsg/qcom_glink_rpm.c | 96 ++++- + drivers/rpmsg/qcom_glink_smem.c | 102 ++++- + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 8 + + drivers/rpmsg/rpmsg_ctrl.c | 2 + + include/linux/remoteproc/pruss.h | 83 ++++ + include/linux/rpmsg/qcom_glink.h | 12 +- + 50 files changed, 4153 insertions(+), 1160 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,glink-rpm-edge.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,pru-consumer.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt + create mode 100644 include/linux/remoteproc/pruss.h +$ git am -3 ../patches/0001-remoteproc-fix-for-iommu-Add-a-gfp-parameter-to-iomm.patch +Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/remoteproc/qcom_q6v5_adsp.c +$ git add -A . +$ git commit -v -a --amend +[master 4a18f0526058] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git + Date: Mon Feb 20 15:34:06 2023 +1100 +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-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 (4827aae06133 gpio: sim: Use %pfwP specifier instead of calling fwnode API directly) +$ 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/gpio-sim.c +Auto-merging drivers/gpio/gpio-vf610.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/gpiolib-acpi.h +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/fujitsu,mb86s70-gpio.txt | 20 -- + .../bindings/gpio/fujitsu,mb86s70-gpio.yaml | 50 +++ + .../devicetree/bindings/gpio/gpio-eic-sprd.txt | 97 ----- + .../devicetree/bindings/gpio/gpio-sprd.txt | 28 -- + .../devicetree/bindings/gpio/sprd,gpio-eic.yaml | 124 +++++++ + .../devicetree/bindings/gpio/sprd,gpio.yaml | 75 ++++ + Documentation/driver-api/gpio/legacy.rst | 17 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 15 - + Documentation/translations/zh_TW/gpio.txt | 16 - + arch/m68k/include/asm/gpio.h | 7 - + arch/sh/include/asm/gpio.h | 5 - + drivers/gpio/Kconfig | 10 +- + drivers/gpio/TODO | 4 +- + drivers/gpio/gpio-104-dio-48e.c | 398 +++++++-------------- + drivers/gpio/gpio-104-idi-48.c | 336 ++++++----------- + drivers/gpio/gpio-davinci.c | 3 +- + drivers/gpio/gpio-ge.c | 1 - + drivers/gpio/gpio-gpio-mm.c | 154 ++------ + drivers/gpio/gpio-i8255.c | 320 +++++------------ + drivers/gpio/gpio-i8255.h | 54 ++- + drivers/gpio/gpio-msc313.c | 6 - + drivers/gpio/gpio-mvebu.c | 6 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-pca953x.c | 34 +- + drivers/gpio/gpio-pca9570.c | 24 +- + drivers/gpio/gpio-pcf857x.c | 118 +++--- + drivers/gpio/gpio-regmap.c | 17 +- + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-sim.c | 9 +- + drivers/gpio/gpio-tegra186.c | 41 +-- + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpio-wcd934x.c | 1 - + drivers/gpio/gpio-xilinx.c | 11 - + drivers/gpio/gpio-zevio.c | 9 +- + drivers/gpio/gpiolib-acpi.c | 10 - + drivers/gpio/gpiolib-acpi.h | 4 - + drivers/gpio/gpiolib-cdev.c | 21 +- + drivers/gpio/gpiolib-devres.c | 55 --- + drivers/gpio/gpiolib-of.c | 135 +++---- + drivers/gpio/gpiolib-of.h | 5 - + drivers/gpio/gpiolib.c | 70 ++-- + drivers/gpio/gpiolib.h | 10 + + drivers/pinctrl/core.c | 14 +- + include/asm-generic/gpio.h | 12 - + include/linux/gpio.h | 20 -- + include/linux/gpio/consumer.h | 48 --- + include/linux/gpio/driver.h | 9 +- + include/linux/of_gpio.h | 102 +----- + include/linux/platform_data/pcf857x.h | 45 --- + 49 files changed, 886 insertions(+), 1690 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-eic-sprd.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-sprd.txt + create mode 100644 Documentation/devicetree/bindings/gpio/sprd,gpio-eic.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/sprd,gpio.yaml + delete mode 100644 include/linux/platform_data/pcf857x.h +Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-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 (099f37a539e6 pinctrl: qcom: Add support for i2c specific pull feature) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/driver-api/pin-control.rst +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/pinctrl-rockchip.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging drivers/pinctrl/sunplus/sppctl.c +Auto-merging include/linux/gpio/driver.h +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b779a7862624] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + ...,imx8mm-pinctrl.yaml => fsl,imx8m-pinctrl.yaml} | 24 +- + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 84 - + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 84 - + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 84 - + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 12 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 8 +- + .../bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 475 ++++++ + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 8 +- + .../bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 197 +++ + .../bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 134 ++ + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 4 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 18 + + .../bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 134 ++ + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 138 ++ + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 6 +- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 2 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 148 ++ + .../bindings/pinctrl/qcom,sm8550-tlmm.yaml | 163 ++ + .../bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 633 ++++++- + .../bindings/pinctrl/ralink,mt7621-pinctrl.yaml | 205 ++- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 86 +- + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 236 ++- + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 205 ++- + .../bindings/pinctrl/renesas,rzg2l-poeg.yaml | 86 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 4 +- + .../pinctrl/starfive,jh7110-aon-pinctrl.yaml | 124 ++ + .../pinctrl/starfive,jh7110-sys-pinctrl.yaml | 142 ++ + Documentation/driver-api/pin-control.rst | 498 +++--- + MAINTAINERS | 8 +- + drivers/gpio/gpiolib-of.c | 5 - + drivers/gpio/gpiolib.c | 8 + + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 6 +- + drivers/pinctrl/freescale/pinctrl-mxs.h | 6 +- + drivers/pinctrl/intel/pinctrl-alderlake.c | 18 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 10 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 31 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 31 +- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 13 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 13 +- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 24 +- + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 13 +- + drivers/pinctrl/intel/pinctrl-geminilake.c | 21 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 35 +- + drivers/pinctrl/intel/pinctrl-intel.c | 74 +- + drivers/pinctrl/intel/pinctrl-intel.h | 55 +- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 13 +- + drivers/pinctrl/intel/pinctrl-lakefield.c | 13 +- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 12 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 8 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 23 +- + drivers/pinctrl/intel/pinctrl-moorefield.c | 6 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 37 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 30 +- + drivers/pinctrl/mediatek/Kconfig | 5 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 1048 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 1 - + drivers/pinctrl/mediatek/pinctrl-paris.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 - + drivers/pinctrl/pinctrl-amd.c | 7 + + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +- + drivers/pinctrl/pinctrl-at91.c | 44 +- + drivers/pinctrl/pinctrl-da850-pupd.c | 6 - + drivers/pinctrl/pinctrl-digicolor.c | 10 +- + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 5 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-sx150x.c | 6 +- + drivers/pinctrl/pinctrl-thunderbay.c | 7 - + drivers/pinctrl/pinmux.c | 4 +- + drivers/pinctrl/qcom/Kconfig | 50 + + drivers/pinctrl/qcom/Makefile | 5 + + drivers/pinctrl/qcom/pinctrl-ipq5332.c | 861 ++++++++++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 1 - + drivers/pinctrl/qcom/pinctrl-msm.c | 9 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 1 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 11 +- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 8 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 1274 ++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 1537 +++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 240 +++ + drivers/pinctrl/qcom/pinctrl-sm8550.c | 1790 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/ralink/pinctrl-mt7620.c | 164 +- + drivers/pinctrl/ralink/pinctrl-mt7621.c | 48 +- + drivers/pinctrl/ralink/pinctrl-rt2880.c | 28 +- + drivers/pinctrl/ralink/pinctrl-rt305x.c | 82 +- + drivers/pinctrl/ralink/pinctrl-rt3883.c | 44 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 244 +++ + drivers/pinctrl/renesas/pfc-r8a779g0.c | 112 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 25 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/starfive/Kconfig | 33 + + drivers/pinctrl/starfive/Makefile | 4 + + .../pinctrl/starfive/pinctrl-starfive-jh7110-aon.c | 177 ++ + .../pinctrl/starfive/pinctrl-starfive-jh7110-sys.c | 449 +++++ + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 982 +++++++++++ + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h | 70 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + + drivers/pinctrl/sunplus/sppctl.c | 1 - + .../dt-bindings/pinctrl/starfive,jh7110-pinctrl.h | 137 ++ + include/linux/gpio/driver.h | 12 - + include/linux/pinctrl/pinctrl.h | 20 + + 111 files changed, 12781 insertions(+), 1292 deletions(-) + rename Documentation/devicetree/bindings/pinctrl/{fsl,imx8mm-pinctrl.yaml => fsl,imx8m-pinctrl.yaml} (76%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mp-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7981-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8365-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq5332-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sa8775p-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8550-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-poeg.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7981.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq5332.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-qdu1000.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sa8775p.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8550.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h + create mode 100644 include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h +Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions) +$ 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 (1b929c02afd3 Linux 6.2-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 (7a77daf8223e pwm: dwc: use devm_pwmchip_add) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Merge made by the 'ort' strategy. + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 93 +++++++++++++++++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 52 ---------- + .../bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 68 +++++++++++++ + drivers/pwm/Kconfig | 3 +- + drivers/pwm/pwm-ab8500.c | 112 +++++++++++++++++++-- + drivers/pwm/pwm-dwc.c | 38 +++---- + drivers/pwm/pwm-iqs620a.c | 4 +- + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-sifive.c | 8 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + include/linux/pwm.h | 14 +-- + 11 files changed, 304 insertions(+), 91 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mediatek.txt + create mode 100644 Documentation/devicetree/bindings/pwm/snps,dw-apb-timers-pwm2.yaml +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (bbf45b2ab467 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 +Merge made by the 'ort' strategy. + tools/testing/ktest/ktest.pl | 52 ++++++++++++++++++++++++++++------------- + tools/testing/ktest/sample.conf | 5 ++++ + 2 files changed, 41 insertions(+), 16 deletions(-) +Merging kselftest/next (0eb15a47bf43 selftests/user_events: add a note about user_events.h dependency) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/arm64/fp/Makefile +Auto-merging tools/testing/selftests/rseq/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/Makefile | 4 +- + tools/testing/selftests/arm64/fp/Makefile | 2 +- + tools/testing/selftests/arm64/tags/Makefile | 2 +- + tools/testing/selftests/clone3/Makefile | 2 +- + tools/testing/selftests/core/Makefile | 2 +- + tools/testing/selftests/dmabuf-heaps/Makefile | 2 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 3 +- + tools/testing/selftests/drivers/dma-buf/Makefile | 2 +- + .../selftests/drivers/s390x/uvdevice/Makefile | 3 +- + tools/testing/selftests/filesystems/Makefile | 2 +- + .../selftests/filesystems/binderfs/Makefile | 2 +- + tools/testing/selftests/filesystems/epoll/Makefile | 2 +- + .../ftrace/test.d/ftrace/func_event_triggers.tc | 2 +- + tools/testing/selftests/futex/functional/Makefile | 2 +- + tools/testing/selftests/gpio/Makefile | 2 +- + tools/testing/selftests/iommu/Makefile | 3 +- + tools/testing/selftests/ipc/Makefile | 2 +- + tools/testing/selftests/kcmp/Makefile | 2 +- + tools/testing/selftests/kselftest_harness.h | 142 ++++++++++++++++++++- + tools/testing/selftests/media_tests/Makefile | 2 +- + tools/testing/selftests/membarrier/Makefile | 2 +- + tools/testing/selftests/memfd/Makefile | 4 +- + tools/testing/selftests/mount_setattr/Makefile | 4 +- + .../selftests/mount_setattr/mount_setattr_test.c | 7 - + .../selftests/move_mount_set_group/Makefile | 2 +- + tools/testing/selftests/perf_events/Makefile | 2 +- + tools/testing/selftests/pid_namespace/Makefile | 2 +- + tools/testing/selftests/pidfd/Makefile | 2 +- + .../prctl/disable-tsc-ctxt-sw-stress-test.c | 2 +- + .../prctl/disable-tsc-on-off-stress-test.c | 2 +- + tools/testing/selftests/ptp/Makefile | 9 +- + tools/testing/selftests/ptrace/Makefile | 2 +- + tools/testing/selftests/rseq/Makefile | 2 +- + tools/testing/selftests/sched/Makefile | 2 +- + tools/testing/selftests/sched/cs_prctl_test.c | 15 ++- + tools/testing/selftests/seccomp/Makefile | 2 +- + tools/testing/selftests/sync/Makefile | 2 +- + tools/testing/selftests/tdx/Makefile | 2 +- + tools/testing/selftests/tdx/tdx_guest_test.c | 2 +- + tools/testing/selftests/tpm2/tpm2.py | 2 +- + tools/testing/selftests/user_events/Makefile | 10 +- + tools/testing/selftests/vm/Makefile | 2 +- + tools/testing/selftests/x86/Makefile | 2 +- + 43 files changed, 201 insertions(+), 67 deletions(-) +Merging kunit/test (1b929c02afd3 Linux 6.2-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 (82649c7c0da4 kunit: Add printf attribute to fail_current_test_impl) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + .../dev-tools/kunit/api/functionredirection.rst | 162 +++++++++++ + Documentation/dev-tools/kunit/api/index.rst | 13 +- + Documentation/dev-tools/kunit/usage.rst | 15 +- + include/kunit/static_stub.h | 113 ++++++++ + include/kunit/test-bug.h | 29 +- + lib/Kconfig.debug | 13 + + lib/Makefile | 9 + + lib/hashtable_test.c | 317 +++++++++++++++++++++ + lib/kunit/Makefile | 4 + + lib/kunit/hooks-impl.h | 31 ++ + lib/kunit/hooks.c | 21 ++ + lib/kunit/kunit-example-test.c | 38 +++ + lib/kunit/static_stub.c | 123 ++++++++ + lib/kunit/test.c | 15 +- + tools/testing/kunit/kunit.py | 186 ++++++------ + 15 files changed, 966 insertions(+), 123 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/functionredirection.rst + create mode 100644 include/kunit/static_stub.h + create mode 100644 lib/hashtable_test.c + create mode 100644 lib/kunit/hooks-impl.h + create mode 100644 lib/kunit/hooks.c + create mode 100644 lib/kunit/static_stub.c +Merging livepatching/for-next (b2e118419db3 Merge branch 'for-6.3/cleanup-relocations' 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 +Auto-merging arch/x86/kernel/module.c +Auto-merging include/linux/moduleloader.h +Auto-merging kernel/livepatch/core.c +Merge made by the 'ort' strategy. + arch/x86/kernel/module.c | 97 +++++++++++++++++++++++++++----------------- + include/linux/moduleloader.h | 17 ++++++++ + kernel/livepatch/core.c | 62 ++++++++++++++++++++++------ + 3 files changed, 126 insertions(+), 50 deletions(-) +Merging rtc/rtc-next (e8c9efd5d52f dt-bindings: rtc: moxart: use proper names for gpio properties) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../bindings/rtc/amlogic,meson-vrtc.yaml | 44 +++ + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 21 +- + .../bindings/rtc/microcrystal,rv3028.yaml | 54 +++ + .../devicetree/bindings/rtc/moxa,moxart-rtc.txt | 12 +- + .../devicetree/bindings/rtc/nxp,pcf2127.yaml | 5 +- + .../devicetree/bindings/rtc/rtc-meson-vrtc.txt | 22 -- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 6 +- + drivers/rtc/rtc-ab-eoz9.c | 7 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 152 +++++--- + drivers/rtc/rtc-ds1307.c | 6 +- + drivers/rtc/rtc-hym8563.c | 7 +- + drivers/rtc/rtc-m41t80.c | 7 +- + drivers/rtc/rtc-max8907.c | 1 - + drivers/rtc/rtc-moxart.c | 89 ++--- + drivers/rtc/rtc-pcf2123.c | 7 +- + drivers/rtc/rtc-pcf85063.c | 7 +- + drivers/rtc/rtc-pcf8523.c | 7 +- + drivers/rtc/rtc-pcf85363.c | 7 +- + drivers/rtc/rtc-pcf8563.c | 7 +- + drivers/rtc/rtc-pm8xxx.c | 402 +++++++-------------- + drivers/rtc/rtc-rv3029c2.c | 7 +- + drivers/rtc/rtc-rv3032.c | 7 +- + drivers/rtc/rtc-rv8803.c | 52 ++- + drivers/rtc/rtc-rx8010.c | 8 +- + drivers/rtc/rtc-sun6i.c | 16 +- + include/linux/bcd.h | 4 + + 26 files changed, 531 insertions(+), 433 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/microcrystal,rv3028.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt +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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 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 +Merge made by the 'ort' strategy. + kernel/seccomp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (1b929c02afd3 Linux 6.2-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 (fa7876365ad2 nvmem: stm32: fix OPTEE dependency) +$ 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 drivers/of/property.c +Auto-merging include/linux/of.h +Merge made by the 'ort' strategy. +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 (b14033a3e6ba x86/hyperv: Fix hv_get/set_register for nested bringup) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging arch/x86/include/asm/hyperv-tlfs.h +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging drivers/hid/hid-hyperv.c +Auto-merging drivers/hv/hv_balloon.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/video/fbdev/hyperv_fb.c +Auto-merging include/linux/hyperv.h +Merge made by the 'ort' strategy. + arch/x86/include/asm/hyperv-tlfs.h | 17 ++++++- + arch/x86/include/asm/mshyperv.h | 78 +++++++++++++++++++++------------ + arch/x86/kernel/cpu/mshyperv.c | 72 ++++++++++++++++++++++++++++++ + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/hid/hid-hyperv.c | 4 +- + drivers/hv/hv.c | 18 +++++--- + drivers/hv/hv_balloon.c | 4 +- + drivers/hv/hv_common.c | 9 ++-- + drivers/hv/hv_util.c | 4 +- + drivers/hv/vmbus_drv.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/net/hyperv/netvsc_drv.c | 5 +-- + drivers/pci/controller/pci-hyperv.c | 8 +--- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/uio/uio_hv_generic.c | 5 +-- + drivers/video/fbdev/hyperv_fb.c | 5 +-- + include/asm-generic/hyperv-tlfs.h | 1 + + include/asm-generic/mshyperv.h | 1 + + include/linux/hyperv.h | 2 +- + net/vmw_vsock/hyperv_transport.c | 4 +- + 20 files changed, 172 insertions(+), 79 deletions(-) +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/hd44780.c | 2 ++ + 1 file changed, 2 insertions(+) +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 (1b929c02afd3 Linux 6.2-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 trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (3c54a3ff0a2c bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring()) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (2fe03412e2e1 memblock: Avoid useless checks in memblock_merge_regions().) +$ 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 | 41 +++++++++++++++++++++++++++-------------- + 1 file changed, 27 insertions(+), 14 deletions(-) +Merging cxl/next (e686c32590f4 dax/kmem: Fix leak of memory-hotplug resources) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Auto-merging drivers/cxl/core/memdev.c +Auto-merging drivers/cxl/core/port.c +Auto-merging drivers/cxl/cxl.h +Auto-merging drivers/cxl/cxlmem.h +Auto-merging drivers/dax/Kconfig +Auto-merging drivers/dax/bus.c +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/nvdimm/dimm_devs.c +Auto-merging drivers/nvdimm/nd-core.h +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-cxl | 79 ++- + MAINTAINERS | 1 + + drivers/Makefile | 2 +- + drivers/acpi/numa/hmat.c | 4 +- + drivers/acpi/pci_root.c | 3 + + drivers/cxl/Kconfig | 14 +- + drivers/cxl/acpi.c | 5 +- + drivers/cxl/core/Makefile | 3 + + drivers/cxl/core/core.h | 7 +- + drivers/cxl/core/hdm.c | 144 +++++- + drivers/cxl/core/mbox.c | 263 +++++++++- + drivers/cxl/core/memdev.c | 3 +- + drivers/cxl/core/pci.c | 316 ++++++++---- + drivers/cxl/core/port.c | 123 +++-- + drivers/cxl/core/region.c | 878 +++++++++++++++++++++++++++++--- + drivers/cxl/core/trace.c | 5 + + drivers/cxl/core/trace.h | 606 ++++++++++++++++++++++ + drivers/cxl/cxl.h | 96 +++- + drivers/cxl/cxlmem.h | 186 ++++++- + drivers/cxl/cxlpci.h | 12 +- + drivers/cxl/pci.c | 425 +++++++++++----- + drivers/cxl/pmem.c | 1 + + drivers/cxl/port.c | 119 +++-- + drivers/dax/Kconfig | 17 +- + drivers/dax/Makefile | 2 + + drivers/dax/bus.c | 55 +- + drivers/dax/bus.h | 12 +- + drivers/dax/cxl.c | 53 ++ + drivers/dax/device.c | 3 +- + drivers/dax/hmem/Makefile | 3 +- + drivers/dax/hmem/device.c | 102 ++-- + drivers/dax/hmem/hmem.c | 148 +++++- + drivers/dax/kmem.c | 5 +- + drivers/nvdimm/bus.c | 19 +- + drivers/nvdimm/dimm_devs.c | 5 +- + drivers/nvdimm/nd-core.h | 1 + + drivers/pci/probe.c | 1 + + include/linux/dax.h | 7 +- + include/linux/libnvdimm.h | 3 + + include/linux/memregion.h | 2 + + include/linux/pci.h | 1 + + include/linux/range.h | 5 + + include/trace/events/cxl.h | 112 ---- + include/uapi/linux/cxl_mem.h | 30 +- + include/uapi/linux/pci_regs.h | 1 + + kernel/resource.c | 14 - + lib/stackinit_kunit.c | 6 +- + tools/testing/cxl/Kbuild | 9 + + tools/testing/cxl/config_check.c | 1 + + tools/testing/cxl/cxl_acpi_test.c | 6 + + tools/testing/cxl/cxl_core_test.c | 6 + + tools/testing/cxl/cxl_mem_test.c | 6 + + tools/testing/cxl/cxl_pmem_test.c | 6 + + tools/testing/cxl/cxl_port_test.c | 6 + + tools/testing/cxl/test/Kbuild | 2 +- + tools/testing/cxl/test/cxl.c | 165 +++++- + tools/testing/cxl/test/mem.c | 352 +++++++++++++ + tools/testing/cxl/test/mock.c | 36 +- + tools/testing/cxl/test/mock.h | 6 +- + tools/testing/cxl/watermark.h | 25 + + 60 files changed, 3788 insertions(+), 740 deletions(-) + create mode 100644 drivers/cxl/core/trace.c + create mode 100644 drivers/cxl/core/trace.h + create mode 100644 drivers/dax/cxl.c + delete mode 100644 include/trace/events/cxl.h + create mode 100644 tools/testing/cxl/cxl_acpi_test.c + create mode 100644 tools/testing/cxl/cxl_core_test.c + create mode 100644 tools/testing/cxl/cxl_mem_test.c + create mode 100644 tools/testing/cxl/cxl_pmem_test.c + create mode 100644 tools/testing/cxl/cxl_port_test.c + create mode 100644 tools/testing/cxl/watermark.h +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 (e1d447157f23 firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/arm64/include/asm/efi.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/efi.h +Auto-merging arch/arm64/kernel/efi.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/firmware/efi/memattr.c +Auto-merging drivers/firmware/google/gsmi.c +Auto-merging include/linux/efi.h +Resolved 'arch/arm64/include/asm/efi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ac6e9d2d55cb] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/efi.h | 2 +- + arch/arm/kernel/efi.c | 5 +- + arch/arm64/include/asm/efi.h | 9 ++-- + arch/arm64/kernel/efi.c | 20 +++++-- + arch/arm64/kernel/traps.c | 6 +++ + arch/ia64/kernel/efi.c | 2 +- + arch/riscv/include/asm/efi.h | 2 +- + arch/riscv/kernel/efi.c | 3 +- + arch/x86/include/asm/efi.h | 14 ++++- + arch/x86/include/asm/ibt.h | 4 +- + arch/x86/kernel/apm_32.c | 4 +- + arch/x86/kernel/cpu/common.c | 5 +- + arch/x86/platform/efi/efi.c | 2 +- + arch/x86/platform/efi/efi_64.c | 8 ++- + drivers/firmware/efi/cper_cxl.c | 12 ++++- + drivers/firmware/efi/earlycon.c | 41 ++++++++++---- + drivers/firmware/efi/efi-init.c | 2 +- + drivers/firmware/efi/efi.c | 74 ++++++++++++++++++++------ + drivers/firmware/efi/esrt.c | 15 ++---- + drivers/firmware/efi/libstub/efi-stub-helper.c | 67 +++++++++++++++++++++++ + drivers/firmware/efi/libstub/efistub.h | 23 ++++++++ + drivers/firmware/efi/libstub/zboot.c | 2 + + drivers/firmware/efi/memattr.c | 7 ++- + drivers/firmware/efi/sysfb_efi.c | 8 +++ + drivers/firmware/efi/vars.c | 38 +++++++------ + drivers/firmware/google/gsmi.c | 2 +- + drivers/xen/efi.c | 61 +++++++++++++++++++++ + fs/efivarfs/super.c | 9 ++-- + include/linux/cxl_err.h | 22 -------- + include/linux/efi.h | 36 +++++++++---- + 30 files changed, 389 insertions(+), 116 deletions(-) + delete mode 100644 include/linux/cxl_err.h +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 (603c592a005a Merge branch 'slab/for-6.3/fixes' 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 +Merge made by the 'ort' strategy. + mm/slab.c | 34 +++++++++++++++------------------- + mm/slub.c | 13 +++++++------ + 2 files changed, 22 insertions(+), 25 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 (1c1ea1c3e21d MAINTAINERS: Update Landlock repository) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/security/landlock.rst | 34 +++++++- + MAINTAINERS | 2 +- + tools/testing/selftests/landlock/fs_test.c | 47 ++++++++++ + tools/testing/selftests/landlock/ptrace_test.c | 113 +++++++++++++++++++++---- + 4 files changed, 175 insertions(+), 21 deletions(-) +Merging rust/rust-next (7ea01d3169a2 rust: delete rust-project.json when running make clean) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging rust/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + Makefile | 2 +- + rust/Makefile | 15 ++ + rust/alloc/borrow.rs | 498 -------------------------------------- + rust/alloc/lib.rs | 3 +- + rust/alloc/vec/mod.rs | 3 + + rust/bindings/bindings_helper.h | 1 + + rust/bindings/lib.rs | 1 + + rust/compiler_builtins.rs | 5 +- + rust/helpers.c | 19 ++ + rust/kernel/lib.rs | 6 + + rust/kernel/prelude.rs | 8 +- + rust/kernel/sync.rs | 10 + + rust/kernel/sync/arc.rs | 524 ++++++++++++++++++++++++++++++++++++++++ + rust/kernel/types.rs | 215 ++++++++++++++++- + 15 files changed, 808 insertions(+), 503 deletions(-) + delete mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/kernel/sync.rs + create mode 100644 rust/kernel/sync/arc.rs +Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (18e93f4dc099 bitmap: switch from inline to __always_inline) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/find.h +Auto-merging include/linux/nodemask.h +Merge made by the 'ort' strategy. + include/linux/bitmap.h | 46 +++++++-------- + include/linux/cpumask.h | 142 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 ++++++------- + include/linux/nodemask.h | 86 ++++++++++++++-------------- + 4 files changed, 157 insertions(+), 157 deletions(-) +Merging hte/for-next (1b929c02afd3 Linux 6.2-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 (78f7a3fd6dc6 randstruct: disable Clang 15 support) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging arch/arm64/kernel/traps.c +Auto-merging drivers/crypto/hisilicon/sgl.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e.h +Auto-merging include/linux/compiler_attributes.h +Auto-merging include/uapi/linux/io_uring.h +Auto-merging lib/Makefile +Auto-merging lib/ubsan.c +Auto-merging net/rxrpc/ar-internal.h +Merge made by the 'ort' strategy. + arch/arm64/include/asm/brk-imm.h | 3 + + arch/arm64/kernel/traps.c | 21 +++++++ + drivers/crypto/hisilicon/sgl.c | 3 +- + drivers/gpu/drm/i915/gvt/firmware.c | 4 +- + drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 +- + drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- + drivers/misc/lkdtm/heap.c | 1 + + drivers/soc/ixp4xx/ixp4xx-npe.c | 6 +- + fs/coda/upcall.c | 2 +- + fs/ext4/sysfs.c | 7 ++- + include/linux/compiler_attributes.h | 5 ++ + include/linux/fortify-string.h | 7 +++ + include/linux/uaccess.h | 4 ++ + include/linux/ubsan.h | 9 +++ + include/uapi/linux/io_uring.h | 2 +- + lib/Makefile | 2 - + lib/string.c | 10 ++-- + lib/ubsan.c | 68 ++++++++++++++++++++++ + lib/ubsan.h | 32 +++++++++++ + net/rxrpc/ar-internal.h | 2 +- + scripts/gcc-plugins/Makefile | 2 +- + security/Kconfig.hardening | 3 + + security/loadpin/loadpin.c | 89 +++++++++++++++++------------ + 23 files changed, 228 insertions(+), 59 deletions(-) + create mode 100644 include/linux/ubsan.h +Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper) +$ 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 +Auto-merging drivers/md/bcache/bcache_ondisk.h +Auto-merging include/linux/exportfs.h +Merge made by the 'ort' strategy. + drivers/md/bcache/bcache_ondisk.h | 8 ++++---- + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging iommufd/for-next (b4ff830eca09 iommufd: Do not add the same hwpt to the ioas->hwpt_list twice) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/s390-iommu.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/vfio/container.c +Auto-merging drivers/vfio/group.c +Auto-merging drivers/vfio/vfio.h +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/vfio/vfio_main.c +Auto-merging include/linux/iommu.h +Auto-merging include/linux/irqdomain.h +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/irq/msi.c +Merge made by the 'ort' strategy. + arch/s390/include/asm/msi.h | 17 +++++ + drivers/iommu/amd/iommu.c | 5 +- + drivers/iommu/intel/iommu.c | 2 - + drivers/iommu/intel/irq_remapping.c | 3 +- + drivers/iommu/iommu.c | 24 +++++++ + drivers/iommu/iommufd/Kconfig | 2 +- + drivers/iommu/iommufd/device.c | 8 +-- + drivers/iommu/iommufd/iommufd_private.h | 2 + + drivers/iommu/iommufd/main.c | 3 + + drivers/iommu/iommufd/vfio_compat.c | 107 ++++++++++++++++++++++++++------ + drivers/iommu/s390-iommu.c | 2 - + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/vfio/Kconfig | 2 +- + drivers/vfio/container.c | 7 --- + drivers/vfio/group.c | 7 ++- + drivers/vfio/iommufd.c | 19 +++++- + drivers/vfio/vfio.h | 8 ++- + drivers/vfio/vfio_iommu_type1.c | 16 +---- + drivers/vfio/vfio_main.c | 7 +++ + include/linux/iommu.h | 2 +- + include/linux/iommufd.h | 12 +++- + include/linux/irqdomain.h | 29 ++------- + include/linux/msi.h | 17 +++++ + kernel/irq/irqdomain.c | 39 ------------ + kernel/irq/msi.c | 27 ++++++++ + tools/testing/selftests/iommu/iommufd.c | 2 +- + 26 files changed, 241 insertions(+), 132 deletions(-) + create mode 100644 arch/s390/include/asm/msi.h +Merging mm-stable/mm-stable (f7a449f77960 mm: memcontrol: rename memcg_kmem_enabled()) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/cgroup-v1/memory.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/memory.rst +Auto-merging Documentation/admin-guide/mm/damon/reclaim.rst +Auto-merging Documentation/admin-guide/mm/hugetlbpage.rst +Auto-merging Documentation/admin-guide/mm/idle_page_tracking.rst +Auto-merging Documentation/admin-guide/mm/numaperf.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/mm/numaperf.rst +Auto-merging Documentation/admin-guide/mm/pagemap.rst +Auto-merging Documentation/mm/balance.rst +Auto-merging Documentation/mm/highmem.rst +Auto-merging Documentation/mm/hugetlbfs_reserv.rst +Auto-merging Documentation/mm/page_owner.rst +Auto-merging Documentation/mm/slub.rst +Auto-merging Documentation/mm/transhuge.rst +Auto-merging Documentation/mm/unevictable-lru.rst +Auto-merging Documentation/mm/zsmalloc.rst +Auto-merging Documentation/translations/zh_CN/mm/hugetlbfs_reserv.rst +Auto-merging Documentation/translations/zh_CN/mm/page_owner.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/vdso.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/mm/pat/memtype.c +Auto-merging drivers/accel/habanalabs/common/memory.c +Auto-merging drivers/accel/habanalabs/gaudi/gaudi.c +Auto-merging drivers/accel/habanalabs/gaudi2/gaudi2.c +Auto-merging drivers/accel/habanalabs/goya/goya.c +Auto-merging drivers/android/binder.c +Auto-merging drivers/block/brd.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_dma_helper.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +CONFLICT (modify/delete): drivers/gpu/drm/i810/i810_dma.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/gpu/drm/i810/i810_dma.c left in tree. +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_gem.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging drivers/misc/uacce/uacce.c +CONFLICT (modify/delete): drivers/staging/media/deprecated/meye/meye.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/staging/media/deprecated/meye/meye.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/deprecated/stkwebcam/stk-webcam.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/staging/media/deprecated/stkwebcam/stk-webcam.c left in tree. +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/video/fbdev/core/fb_defio.c +Auto-merging fs/afs/write.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/cifs/file.c +Auto-merging fs/coredump.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/erofs/data.c +Auto-merging fs/exec.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/write.c +CONFLICT (content): Merge conflict in fs/nfs/write.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/orangefs/file.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/ramfs/file-nommu.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/memcontrol.h +CONFLICT (content): Merge conflict in include/linux/memcontrol.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/pagemap.h +Auto-merging include/uapi/linux/prctl.h +Auto-merging init/main.c +Auto-merging io_uring/io_uring.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/events/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sys.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging mm/compaction.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/internal.h +Auto-merging mm/kasan/kasan.h +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/migrate.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page_io.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.c +Auto-merging mm/slub.c +Auto-merging mm/swap.c +Auto-merging mm/swapfile.c +Auto-merging net/ipv4/tcp.c +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/mm/Makefile +Resolved 'Documentation/admin-guide/cgroup-v1/memory.rst' using previous resolution. +Resolved 'Documentation/admin-guide/mm/numaperf.rst' using previous resolution. +Resolved 'drivers/infiniband/hw/hfi1/file_ops.c' using previous resolution. +Resolved 'fs/buffer.c' using previous resolution. +Resolved 'fs/nfs/write.c' using previous resolution. +Resolved 'fs/ntfs3/inode.c' using previous resolution. +Resolved 'include/linux/memcontrol.h' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/i810/i810_dma.c drivers/staging/media/deprecated/meye/meye.c drivers/staging/media/deprecated/stkwebcam/stk-webcam.c +rm 'drivers/gpu/drm/i810/i810_dma.c' +rm 'drivers/staging/media/deprecated/meye/meye.c' +rm 'drivers/staging/media/deprecated/stkwebcam/stk-webcam.c' +$ git commit --no-edit -v -a +[master 8c6f79b8ec17] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-node | 39 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 29 + + Documentation/admin-guide/cgroup-v1/memory.rst | 13 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 9 + + Documentation/admin-guide/mm/damon/usage.rst | 105 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 6 +- + .../admin-guide/mm/idle_page_tracking.rst | 2 +- + Documentation/admin-guide/mm/numaperf.rst | 8 +- + Documentation/admin-guide/mm/pagemap.rst | 4 +- + Documentation/core-api/pin_user_pages.rst | 31 +- + Documentation/dev-tools/kasan.rst | 17 + + Documentation/mm/balance.rst | 2 +- + Documentation/mm/damon/index.rst | 22 +- + Documentation/mm/damon/maintainer-profile.rst | 62 ++ + Documentation/mm/highmem.rst | 43 +- + Documentation/mm/hugetlbfs_reserv.rst | 21 +- + Documentation/mm/multigen_lru.rst | 86 +- + Documentation/mm/page_owner.rst | 2 +- + Documentation/mm/slub.rst | 2 +- + Documentation/mm/transhuge.rst | 24 +- + Documentation/mm/unevictable-lru.rst | 151 +-- + Documentation/mm/zsmalloc.rst | 168 +++ + .../translations/zh_CN/mm/hugetlbfs_reserv.rst | 14 +- + Documentation/translations/zh_CN/mm/page_owner.rst | 2 +- + MAINTAINERS | 14 +- + arch/alpha/include/asm/page.h | 9 +- + arch/alpha/include/asm/pgtable.h | 40 +- + arch/arc/include/asm/page.h | 1 - + arch/arc/include/asm/pgtable-bits-arcv2.h | 26 +- + arch/arm/include/asm/memory.h | 2 - + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-2level.h | 3 + + arch/arm/include/asm/pgtable-3level.h | 3 + + arch/arm/include/asm/pgtable.h | 34 +- + arch/arm/kernel/process.c | 2 +- + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/include/asm/pgtable.h | 1 - + arch/arm64/kernel/vdso.c | 6 +- + arch/arm64/mm/fault.c | 4 +- + arch/csky/abiv1/inc/abi/pgtable-bits.h | 13 +- + arch/csky/abiv2/inc/abi/pgtable-bits.h | 19 +- + arch/csky/include/asm/page.h | 1 - + arch/csky/include/asm/pgtable.h | 17 + + arch/hexagon/include/asm/page.h | 1 - + arch/hexagon/include/asm/pgtable.h | 36 +- + arch/ia64/include/asm/page.h | 18 +- + arch/ia64/include/asm/pgtable.h | 31 +- + arch/ia64/mm/init.c | 8 +- + arch/loongarch/include/asm/page.h | 13 - + arch/loongarch/include/asm/pgtable-bits.h | 4 + + arch/loongarch/include/asm/pgtable.h | 38 +- + arch/loongarch/include/asm/tlb.h | 2 +- + arch/m68k/include/asm/mcf_pgtable.h | 35 +- + arch/m68k/include/asm/motorola_pgtable.h | 39 +- + arch/m68k/include/asm/page.h | 6 +- + arch/m68k/include/asm/page_mm.h | 1 - + arch/m68k/include/asm/page_no.h | 11 +- + arch/m68k/include/asm/pgtable_no.h | 6 - + arch/m68k/include/asm/sun3_pgtable.h | 38 +- + arch/microblaze/include/asm/page.h | 1 - + arch/microblaze/include/asm/pgtable.h | 44 +- + arch/mips/include/asm/page.h | 28 - + arch/mips/include/asm/pgtable-32.h | 88 +- + arch/mips/include/asm/pgtable-64.h | 23 +- + arch/mips/include/asm/pgtable.h | 35 + + arch/nios2/include/asm/page.h | 9 - + arch/nios2/include/asm/pgtable-bits.h | 3 + + arch/nios2/include/asm/pgtable.h | 37 +- + arch/openrisc/include/asm/page.h | 2 - + arch/openrisc/include/asm/pgtable.h | 40 +- + arch/parisc/include/asm/page.h | 4 - + arch/parisc/include/asm/pgtable.h | 40 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 37 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 22 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 6 +- + arch/powerpc/include/asm/nohash/32/pte-44x.h | 18 +- + arch/powerpc/include/asm/nohash/32/pte-85xx.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 24 +- + arch/powerpc/include/asm/nohash/pgtable.h | 15 + + arch/powerpc/include/asm/nohash/pte-e500.h | 1 - + arch/powerpc/include/asm/page.h | 9 - + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/vdso.c | 4 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 6 +- + arch/powerpc/kvm/book3s_xive_native.c | 2 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 2 +- + arch/powerpc/platforms/book3s/vas-api.c | 4 +- + arch/powerpc/platforms/cell/spufs/file.c | 14 +- + arch/powerpc/platforms/pseries/vas.c | 3 +- + arch/riscv/include/asm/page.h | 5 - + arch/riscv/include/asm/pgtable-bits.h | 3 + + arch/riscv/include/asm/pgtable.h | 28 +- + arch/riscv/kernel/vdso.c | 6 +- + arch/s390/include/asm/page.h | 5 +- + arch/s390/include/asm/pgtable.h | 1 - + arch/s390/kernel/vdso.c | 4 +- + arch/s390/mm/gmap.c | 11 +- + arch/sh/include/asm/page.h | 3 - + arch/sh/include/asm/pgtable_32.h | 53 +- + arch/sh/kernel/cpu/sh4/sq.c | 2 +- + arch/sh/mm/init.c | 1 + + arch/sparc/include/asm/page_32.h | 1 - + arch/sparc/include/asm/pgtable_32.h | 26 +- + arch/sparc/include/asm/pgtable_64.h | 37 +- + arch/sparc/include/asm/pgtsrmmu.h | 14 +- + arch/um/include/asm/page.h | 1 - + arch/um/include/asm/pgtable.h | 36 +- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/include/asm/page.h | 5 +- + arch/x86/include/asm/page_32.h | 4 - + arch/x86/include/asm/page_64.h | 4 - + arch/x86/include/asm/pgtable-2level.h | 26 +- + arch/x86/include/asm/pgtable-3level.h | 26 +- + arch/x86/include/asm/pgtable.h | 27 +- + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/kernel/cpu/sgx/virt.c | 2 +- + arch/x86/mm/fault.c | 23 +- + arch/x86/mm/pat/memtype.c | 14 +- + arch/x86/um/mem_32.c | 2 +- + arch/xtensa/include/asm/page.h | 4 +- + arch/xtensa/include/asm/pgtable.h | 31 +- + block/bdev.c | 78 -- + drivers/accel/habanalabs/common/memory.c | 2 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 4 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 8 +- + drivers/accel/habanalabs/goya/goya.c | 4 +- + drivers/acpi/pfr_telemetry.c | 2 +- + drivers/android/binder.c | 3 +- + drivers/android/binder_alloc.c | 2 +- + drivers/base/node.c | 3 + + drivers/block/brd.c | 15 +- + drivers/block/zram/zram_drv.c | 69 +- + drivers/char/mem.c | 2 +- + drivers/char/mspec.c | 2 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/dax/device.c | 2 +- + drivers/dma/idxd/cdev.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 3 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_vm.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 +- + drivers/gpu/drm/tegra/gem.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 3 +- + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/hwtracing/stm/core.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 13 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 2 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 4 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +- + drivers/misc/cxl/context.c | 2 +- + drivers/misc/ocxl/context.c | 4 +- + drivers/misc/ocxl/sysfs.c | 2 +- + drivers/misc/open-dice.c | 18 +- + drivers/misc/sgi-gru/grufile.c | 4 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/nvdimm/btt.c | 16 +- + drivers/nvdimm/pmem.c | 24 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/cxlflash/ocxl_hw.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 2 +- + drivers/target/target_core_user.c | 2 +- + drivers/uio/uio.c | 2 +- + drivers/usb/core/devio.c | 3 +- + drivers/usb/mon/mon_bin.c | 3 +- + drivers/vdpa/vdpa_user/iova_domain.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 4 +- + drivers/xen/gntalloc.c | 2 +- + drivers/xen/gntdev.c | 4 +- + drivers/xen/privcmd-buf.c | 2 +- + drivers/xen/privcmd.c | 4 +- + fs/afs/write.c | 116 ++- + fs/aio.c | 2 +- + fs/btrfs/extent_io.c | 57 +- + fs/buffer.c | 54 +- + fs/ceph/addr.c | 58 +- + fs/cifs/file.c | 40 +- + fs/coredump.c | 8 +- + fs/cramfs/inode.c | 4 +- + fs/erofs/data.c | 2 +- + fs/exec.c | 20 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 69 +- + fs/ext4/move_extent.c | 46 +- + fs/ext4/super.c | 6 +- + fs/f2fs/checkpoint.c | 49 +- + fs/f2fs/data.c | 84 +- + fs/f2fs/node.c | 72 +- + fs/fs-writeback.c | 10 +- + fs/fuse/dax.c | 2 +- + fs/fuse/file.c | 18 +- + fs/gfs2/aops.c | 64 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + fs/hugetlbfs/inode.c | 72 +- + fs/iomap/buffered-io.c | 5 +- + fs/jbd2/commit.c | 33 +- + fs/jbd2/journal.c | 3 +- + fs/mpage.c | 73 +- + fs/nfs/write.c | 5 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 16 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/page.c | 59 +- + fs/nilfs2/segment.c | 46 +- + fs/ntfs3/inode.c | 6 +- + fs/ocfs2/journal.c | 16 +- + fs/orangefs/file.c | 3 +- + fs/orangefs/inode.c | 23 +- + fs/proc/task_mmu.c | 31 +- + fs/proc/task_nommu.c | 2 +- + fs/proc/vmcore.c | 3 +- + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/tail_conversion.c | 2 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/userfaultfd.c | 115 +-- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/hugetlb.h | 16 +- + include/asm-generic/memory_model.h | 12 + + include/asm-generic/page.h | 2 - + include/linux/blkdev.h | 12 +- + include/linux/buffer_head.h | 5 +- + include/linux/damon.h | 68 +- + include/linux/fs.h | 2 + + include/linux/gfp_types.h | 12 +- + include/linux/highmem.h | 72 +- + include/linux/huge_mm.h | 13 +- + include/linux/hugetlb.h | 107 +- + include/linux/hugetlb_cgroup.h | 8 +- + include/linux/jbd2.h | 2 - + include/linux/kasan.h | 36 +- + include/linux/maple_tree.h | 19 +- + include/linux/memcontrol.h | 66 +- + include/linux/migrate.h | 10 + + include/linux/mm.h | 542 +++++----- + include/linux/mm_inline.h | 19 +- + include/linux/mm_types.h | 186 ++-- + include/linux/mman.h | 34 + + include/linux/mmu_notifier.h | 13 +- + include/linux/mmzone.h | 150 ++- + include/linux/page-flags.h | 1 + + include/linux/page_ext.h | 20 + + include/linux/pagemap.h | 34 +- + include/linux/pagevec.h | 13 +- + include/linux/pagewalk.h | 11 +- + include/linux/pgtable.h | 34 +- + include/linux/pid_namespace.h | 19 + + include/linux/rmap.h | 13 +- + include/linux/sched/coredump.h | 6 +- + include/linux/shmem_fs.h | 18 +- + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 2 +- + include/linux/stackdepot.h | 152 ++- + include/linux/string.h | 1 + + include/linux/swap.h | 4 +- + include/linux/swapops.h | 6 +- + include/linux/userfaultfd_k.h | 2 +- + include/linux/vmalloc.h | 1 + + include/linux/writeback.h | 16 +- + include/linux/xarray.h | 3 +- + include/trace/events/cma.h | 32 +- + include/trace/events/mmflags.h | 1 - + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/memfd.h | 4 + + include/uapi/linux/prctl.h | 6 + + init/main.c | 6 +- + io_uring/io_uring.c | 2 +- + ipc/shm.c | 8 +- + kernel/bpf/ringbuf.c | 4 +- + kernel/bpf/syscall.c | 4 +- + kernel/crash_core.c | 4 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 5 +- + kernel/fork.c | 23 +- + kernel/kcov.c | 2 +- + kernel/pid_namespace.c | 5 + + kernel/pid_sysctl.h | 60 ++ + kernel/relay.c | 2 +- + kernel/sched/fair.c | 14 +- + kernel/sys.c | 33 + + lib/Kconfig.debug | 71 -- + lib/maple_tree.c | 152 +-- + lib/stackdepot.c | 654 ++++++------ + lib/test_maple_tree.c | 72 ++ + lib/test_printf.c | 8 +- + lib/test_vmalloc.c | 8 +- + mm/Kconfig | 21 +- + mm/Kconfig.debug | 74 +- + mm/cma.c | 26 +- + mm/compaction.c | 99 +- + mm/damon/Kconfig | 7 +- + mm/damon/core-test.h | 30 + + mm/damon/core.c | 113 +- + mm/damon/dbgfs.c | 19 + + mm/damon/ops-common.c | 38 +- + mm/damon/ops-common.h | 2 +- + mm/damon/paddr.c | 163 +-- + mm/damon/reclaim.c | 19 + + mm/damon/sysfs-common.c | 2 +- + mm/damon/sysfs-common.h | 4 +- + mm/damon/sysfs-schemes.c | 391 ++++++- + mm/damon/sysfs.c | 22 +- + mm/damon/vaddr-test.h | 20 +- + mm/damon/vaddr.c | 68 +- + mm/debug.c | 9 +- + mm/debug_vm_pgtable.c | 129 ++- + mm/fadvise.c | 5 +- + mm/filemap.c | 138 +-- + mm/folio-compat.c | 11 + + mm/gup.c | 382 ++++--- + mm/hmm.c | 15 +- + mm/huge_memory.c | 176 ++-- + mm/hugetlb.c | 657 ++++++------ + mm/hugetlb_cgroup.c | 8 +- + mm/internal.h | 272 ++++- + mm/kasan/common.c | 20 +- + mm/kasan/generic.c | 4 +- + mm/kasan/hw_tags.c | 60 ++ + mm/kasan/kasan.h | 29 + + mm/kasan/report.c | 41 +- + mm/kasan/report_generic.c | 32 +- + mm/kasan/report_hw_tags.c | 35 +- + mm/kasan/report_sw_tags.c | 26 + + mm/kasan/report_tags.c | 2 +- + mm/kasan/sw_tags.c | 6 +- + mm/khugepaged.c | 43 +- + mm/kmemleak.c | 85 +- + mm/kmsan/core.c | 10 +- + mm/kmsan/instrumentation.c | 23 + + mm/ksm.c | 5 +- + mm/madvise.c | 123 ++- + mm/mapping_dirty_helpers.c | 2 +- + mm/memcontrol.c | 94 +- + mm/memfd.c | 56 +- + mm/memory-failure.c | 215 ++-- + mm/memory-tiers.c | 4 +- + mm/memory.c | 247 ++--- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 188 ++-- + mm/memremap.c | 6 +- + mm/migrate.c | 916 +++++++++++----- + mm/migrate_device.c | 4 +- + mm/mlock.c | 351 ++++--- + mm/mmap.c | 1090 ++++++++++---------- + mm/mmu_notifier.c | 10 - + mm/mprotect.c | 161 +-- + mm/mremap.c | 53 +- + mm/nommu.c | 197 ++-- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 107 +- + mm/page_alloc.c | 233 +++-- + mm/page_ext.c | 16 +- + mm/page_idle.c | 47 +- + mm/page_io.c | 183 ++-- + mm/page_owner.c | 6 +- + mm/page_reporting.c | 6 +- + mm/page_table_check.c | 1 + + mm/page_vma_mapped.c | 9 +- + mm/pagewalk.c | 6 +- + mm/percpu-internal.h | 6 +- + mm/percpu.c | 2 +- + mm/readahead.c | 39 +- + mm/rmap.c | 325 +++--- + mm/secretmem.c | 4 +- + mm/shmem.c | 105 +- + mm/slab.c | 2 +- + mm/slab.h | 18 +- + mm/slab_common.c | 1 - + mm/slub.c | 6 +- + mm/sparse.c | 2 +- + mm/swap.c | 50 +- + mm/swap.h | 10 +- + mm/swap_state.c | 65 +- + mm/swapfile.c | 11 +- + mm/userfaultfd.c | 49 +- + mm/util.c | 26 +- + mm/vmalloc.c | 461 +++++---- + mm/vmscan.c | 1063 ++++++++++++------- + mm/workingset.c | 28 +- + mm/z3fold.c | 2 - + mm/zsmalloc.c | 74 +- + net/ipv4/tcp.c | 11 +- + security/apparmor/policy_unpack.c | 11 +- + security/selinux/selinuxfs.c | 6 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm_native.c | 9 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/usb/usx2y/us122l.c | 4 +- + sound/usb/usx2y/usX2Yhwdep.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + tools/cgroup/memcg_shrinker.py | 3 +- + tools/{vm => mm}/.gitignore | 0 + tools/{vm => mm}/Makefile | 4 +- + tools/{vm => mm}/page-types.c | 0 + tools/{vm => mm}/page_owner_sort.c | 65 +- + tools/{vm => mm}/slabinfo-gnuplot.sh | 0 + tools/{vm => mm}/slabinfo.c | 0 + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/maple.c | 50 +- + tools/testing/selftests/Makefile | 2 +- + .../selftests/damon/debugfs_rm_non_contexts.sh | 2 +- + tools/testing/selftests/damon/sysfs.sh | 31 +- + tools/testing/selftests/kselftest_deps.sh | 6 +- + tools/testing/selftests/memfd/fuse_test.c | 1 + + tools/testing/selftests/memfd/memfd_test.c | 341 +++++- + tools/testing/selftests/{vm => mm}/.gitignore | 0 + tools/testing/selftests/{vm => mm}/Makefile | 9 +- + .../{vm => mm}/charge_reserved_hugetlb.sh | 0 + tools/testing/selftests/{vm => mm}/check_config.sh | 0 + .../testing/selftests/{vm => mm}/compaction_test.c | 0 + tools/testing/selftests/{vm => mm}/config | 0 + tools/testing/selftests/{vm => mm}/cow.c | 231 +++++ + tools/testing/selftests/{vm => mm}/gup_test.c | 0 + tools/testing/selftests/{vm => mm}/hmm-tests.c | 0 + tools/testing/selftests/{vm => mm}/hugepage-mmap.c | 0 + .../testing/selftests/{vm => mm}/hugepage-mremap.c | 0 + tools/testing/selftests/{vm => mm}/hugepage-shm.c | 0 + .../selftests/{vm => mm}/hugepage-vmemmap.c | 0 + .../testing/selftests/{vm => mm}/hugetlb-madvise.c | 0 + .../{vm => mm}/hugetlb_reparenting_test.sh | 0 + tools/testing/selftests/{vm => mm}/khugepaged.c | 0 + .../selftests/{vm => mm}/ksm_functional_tests.c | 2 +- + tools/testing/selftests/{vm => mm}/ksm_tests.c | 0 + tools/testing/selftests/{vm => mm}/madv_populate.c | 0 + .../selftests/{vm => mm}/map_fixed_noreplace.c | 0 + tools/testing/selftests/{vm => mm}/map_hugetlb.c | 0 + tools/testing/selftests/{vm => mm}/map_populate.c | 0 + tools/testing/selftests/mm/mdwe_test.c | 197 ++++ + tools/testing/selftests/{vm => mm}/memfd_secret.c | 0 + tools/testing/selftests/{vm => mm}/migration.c | 0 + .../selftests/{vm => mm}/mlock-random-test.c | 0 + tools/testing/selftests/{vm => mm}/mlock2-tests.c | 0 + tools/testing/selftests/{vm => mm}/mlock2.h | 0 + tools/testing/selftests/{vm => mm}/mrelease_test.c | 0 + .../selftests/{vm => mm}/mremap_dontunmap.c | 0 + tools/testing/selftests/{vm => mm}/mremap_test.c | 119 ++- + .../testing/selftests/{vm => mm}/on-fault-limit.c | 0 + tools/testing/selftests/{vm => mm}/pkey-helpers.h | 0 + tools/testing/selftests/{vm => mm}/pkey-powerpc.h | 0 + tools/testing/selftests/{vm => mm}/pkey-x86.h | 0 + .../testing/selftests/{vm => mm}/protection_keys.c | 0 + tools/testing/selftests/{vm => mm}/run_vmtests.sh | 0 + tools/testing/selftests/{vm => mm}/settings | 0 + tools/testing/selftests/{vm => mm}/soft-dirty.c | 0 + .../selftests/{vm => mm}/split_huge_page_test.c | 0 + tools/testing/selftests/{vm => mm}/test_hmm.sh | 0 + tools/testing/selftests/{vm => mm}/test_vmalloc.sh | 0 + tools/testing/selftests/{vm => mm}/thuge-gen.c | 0 + .../selftests/{vm => mm}/transhuge-stress.c | 0 + tools/testing/selftests/{vm => mm}/userfaultfd.c | 0 + tools/testing/selftests/{vm => mm}/util.h | 0 + .../testing/selftests/{vm => mm}/va_128TBswitch.c | 0 + .../testing/selftests/{vm => mm}/va_128TBswitch.sh | 0 + .../selftests/{vm => mm}/virtual_address_range.c | 0 + tools/testing/selftests/{vm => mm}/vm_util.c | 0 + tools/testing/selftests/{vm => mm}/vm_util.h | 0 + .../selftests/{vm => mm}/write_hugetlb_memory.sh | 0 + .../selftests/{vm => mm}/write_to_hugetlbfs.c | 0 + 490 files changed, 11379 insertions(+), 6748 deletions(-) + create mode 100644 Documentation/mm/damon/maintainer-profile.rst + create mode 100644 kernel/pid_sysctl.h + rename tools/{vm => mm}/.gitignore (100%) + rename tools/{vm => mm}/Makefile (90%) + rename tools/{vm => mm}/page-types.c (100%) + rename tools/{vm => mm}/page_owner_sort.c (95%) + rename tools/{vm => mm}/slabinfo-gnuplot.sh (100%) + rename tools/{vm => mm}/slabinfo.c (100%) + rename tools/testing/selftests/{vm => mm}/.gitignore (100%) + rename tools/testing/selftests/{vm => mm}/Makefile (96%) + rename tools/testing/selftests/{vm => mm}/charge_reserved_hugetlb.sh (100%) + rename tools/testing/selftests/{vm => mm}/check_config.sh (100%) + rename tools/testing/selftests/{vm => mm}/compaction_test.c (100%) + rename tools/testing/selftests/{vm => mm}/config (100%) + rename tools/testing/selftests/{vm => mm}/cow.c (86%) + rename tools/testing/selftests/{vm => mm}/gup_test.c (100%) + rename tools/testing/selftests/{vm => mm}/hmm-tests.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-mmap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-mremap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-shm.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-vmemmap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugetlb-madvise.c (100%) + rename tools/testing/selftests/{vm => mm}/hugetlb_reparenting_test.sh (100%) + rename tools/testing/selftests/{vm => mm}/khugepaged.c (100%) + rename tools/testing/selftests/{vm => mm}/ksm_functional_tests.c (99%) + rename tools/testing/selftests/{vm => mm}/ksm_tests.c (100%) + rename tools/testing/selftests/{vm => mm}/madv_populate.c (100%) + rename tools/testing/selftests/{vm => mm}/map_fixed_noreplace.c (100%) + rename tools/testing/selftests/{vm => mm}/map_hugetlb.c (100%) + rename tools/testing/selftests/{vm => mm}/map_populate.c (100%) + create mode 100644 tools/testing/selftests/mm/mdwe_test.c + rename tools/testing/selftests/{vm => mm}/memfd_secret.c (100%) + rename tools/testing/selftests/{vm => mm}/migration.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock-random-test.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock2-tests.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock2.h (100%) + rename tools/testing/selftests/{vm => mm}/mrelease_test.c (100%) + rename tools/testing/selftests/{vm => mm}/mremap_dontunmap.c (100%) + rename tools/testing/selftests/{vm => mm}/mremap_test.c (84%) + rename tools/testing/selftests/{vm => mm}/on-fault-limit.c (100%) + rename tools/testing/selftests/{vm => mm}/pkey-helpers.h (100%) + rename tools/testing/selftests/{vm => mm}/pkey-powerpc.h (100%) + rename tools/testing/selftests/{vm => mm}/pkey-x86.h (100%) + rename tools/testing/selftests/{vm => mm}/protection_keys.c (100%) + rename tools/testing/selftests/{vm => mm}/run_vmtests.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/settings (100%) + rename tools/testing/selftests/{vm => mm}/soft-dirty.c (100%) + rename tools/testing/selftests/{vm => mm}/split_huge_page_test.c (100%) + rename tools/testing/selftests/{vm => mm}/test_hmm.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/test_vmalloc.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/thuge-gen.c (100%) + rename tools/testing/selftests/{vm => mm}/transhuge-stress.c (100%) + rename tools/testing/selftests/{vm => mm}/userfaultfd.c (100%) + rename tools/testing/selftests/{vm => mm}/util.h (100%) + rename tools/testing/selftests/{vm => mm}/va_128TBswitch.c (100%) + rename tools/testing/selftests/{vm => mm}/va_128TBswitch.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/virtual_address_range.c (100%) + rename tools/testing/selftests/{vm => mm}/vm_util.c (100%) + rename tools/testing/selftests/{vm => mm}/vm_util.h (100%) + rename tools/testing/selftests/{vm => mm}/write_hugetlb_memory.sh (100%) + rename tools/testing/selftests/{vm => mm}/write_to_hugetlbfs.c (100%) +$ git am -3 ../patches/0001-accel-ivpu-fix-up-for-mm-introduce-vma-vm_flags-wrap.patch +Applying: accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/accel/ivpu/ivpu_gem.c +$ git add -A . +$ git commit -v -a --amend +[master d1e15d495905] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Feb 20 15:35:42 2023 +1100 +$ git am -3 ../patches/0001-udf-fix-up-for-fs-convert-writepage_t-callback-to-pa.patch +Applying: udf: fix up for "fs: convert writepage_t callback to pass a folio" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/udf/inode.c +$ git add -A . +$ git commit -v -a --amend +[master ce93697ae9b9] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Feb 20 15:35:42 2023 +1100 +$ git am -3 ../patches/0001-mm-fixup-for-mm-implement-memory-deny-write-execute-.patch +Applying: mm: fixup for "mm: implement memory-deny-write-execute as a prctl" +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/prctl.h +$ git add -A . +$ git commit -v -a --amend +[master 1ab726b51146] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Feb 20 15:35:42 2023 +1100 +$ git am -3 ../patches/0001-gfs2-fix-up-for-fs-convert-writepage_t-callback-to-p.patch +Applying: gfs2: fix up for "fs: convert writepage_t callback to pass a folio" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/gfs2/log.c +$ git add -A . +$ git commit -v -a --amend +[master 83c4a84b18e1] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Feb 20 15:35:42 2023 +1100 +Merging mm-nonmm-stable/mm-nonmm-stable (817013880a68 Update CREDITS file entry for Jesper Juhl) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging CREDITS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging arch/Kconfig +Auto-merging arch/alpha/kernel/process.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/hfsplus/xattr.c +Auto-merging fs/mpage.c +Auto-merging fs/ntfs/inode.c +Auto-merging include/linux/util_macros.h +Auto-merging kernel/kexec_core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging net/openvswitch/flow_table.c +Auto-merging scripts/tags.sh +Auto-merging sound/soc/fsl/fsl-asoc-card.c +Merge made by the 'ort' strategy. + CREDITS | 6 +- + Documentation/admin-guide/sysctl/kernel.rst | 25 +- + Documentation/fault-injection/fault-injection.rst | 65 ++++ + arch/Kconfig | 128 ++++---- + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/smp.c | 4 +- + arch/sparc/Kconfig | 2 +- + arch/x86/kvm/emulate.c | 8 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + fs/cramfs/Kconfig | 2 +- + fs/ext4/inode.c | 5 +- + fs/fat/namei_vfat.c | 4 +- + fs/freevxfs/vxfs_subr.c | 6 +- + fs/freevxfs/vxfs_super.c | 2 +- + fs/hfs/bnode.c | 1 + + fs/hfs/extent.c | 2 +- + fs/hfsplus/extents.c | 2 +- + fs/hfsplus/xattr.c | 18 +- + fs/nilfs2/dat.c | 38 ++- + fs/ntfs/aops.c | 10 +- + fs/ntfs/aops.h | 2 +- + fs/ntfs/compress.c | 6 +- + fs/ntfs/dir.c | 4 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/mft.c | 2 +- + fs/ntfs/namei.c | 4 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 12 +- + fs/proc/cmdline.c | 1 + + include/asm-generic/error-injection.h | 7 +- + include/linux/error-injection.h | 3 +- + include/linux/kexec.h | 3 +- + include/linux/percpu_counter.h | 6 +- + include/linux/util_macros.h | 2 + + init/initramfs.c | 4 +- + kernel/hung_task.c | 2 + + kernel/kexec.c | 4 +- + kernel/kexec_core.c | 94 +++++- + kernel/kexec_file.c | 11 +- + kernel/kthread.c | 5 + + kernel/user_namespace.c | 2 +- + lib/Kconfig.debug | 40 ++- + lib/Makefile | 2 + + lib/dhry.h | 358 ++++++++++++++++++++++ + lib/dhry_1.c | 283 +++++++++++++++++ + lib/dhry_2.c | 175 +++++++++++ + lib/dhry_run.c | 85 +++++ + lib/error-inject.c | 2 +- + lib/genalloc.c | 18 +- + lib/percpu_counter.c | 25 +- + lib/zlib_deflate/deflate.c | 23 +- + lib/zlib_dfltcc/dfltcc.c | 25 +- + lib/zlib_dfltcc/dfltcc.h | 57 +--- + lib/zlib_dfltcc/dfltcc_deflate.c | 91 ++++-- + lib/zlib_dfltcc/dfltcc_deflate.h | 21 ++ + lib/zlib_dfltcc/dfltcc_inflate.c | 24 +- + lib/zlib_dfltcc/dfltcc_inflate.h | 37 +++ + lib/zlib_inflate/inflate.c | 2 +- + net/openvswitch/flow_table.c | 2 +- + scripts/bloat-o-meter | 3 +- + scripts/checkpatch.pl | 38 ++- + scripts/gdb/linux/mm.py | 222 ++++++++++++++ + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/spelling.txt | 17 + + scripts/tags.sh | 10 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + 66 files changed, 1779 insertions(+), 298 deletions(-) + create mode 100644 lib/dhry.h + create mode 100644 lib/dhry_1.c + create mode 100644 lib/dhry_2.c + create mode 100644 lib/dhry_run.c + create mode 100644 lib/zlib_dfltcc/dfltcc_deflate.h + create mode 100644 lib/zlib_dfltcc/dfltcc_inflate.h + create mode 100644 scripts/gdb/linux/mm.py +Merging mm/mm-everything (23de16dd868f Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/mm/ksm.rst +Auto-merging Documentation/translations/zh_CN/accounting/delay-accounting.rst +CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/accounting/delay-accounting.rst +Auto-merging fs/proc/base.c +Auto-merging include/linux/mm_types.h +Auto-merging mm/Kconfig +Auto-merging mm/compaction.c +Auto-merging mm/gup.c +Auto-merging mm/internal.h +Auto-merging mm/kasan/kasan.h +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +Auto-merging tools/objtool/check.c +Resolved 'Documentation/translations/zh_CN/accounting/delay-accounting.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb0c19ca1155] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 14 +- + Documentation/admin-guide/mm/ksm.rst | 7 + + .../zh_CN/accounting/delay-accounting.rst | 14 +- + fs/proc/base.c | 1 + + include/linux/hugetlb.h | 6 +- + include/linux/migrate.h | 20 +- + include/linux/mm_types.h | 7 +- + include/trace/events/huge_memory.h | 3 +- + mm/Kconfig | 9 + + mm/Makefile | 1 + + mm/compaction.c | 2 +- + mm/damon/paddr.c | 2 +- + mm/dmapool.c | 402 ++++++++++----------- + mm/dmapool_test.c | 147 ++++++++ + mm/folio-compat.c | 4 +- + mm/gup.c | 2 +- + mm/hugetlb.c | 13 +- + mm/internal.h | 4 +- + mm/kasan/kasan.h | 4 +- + mm/khugepaged.c | 261 +++++++++---- + mm/kmsan/Makefile | 8 +- + mm/ksm.c | 185 ++++++++-- + mm/madvise.c | 4 +- + mm/memcontrol.c | 4 +- + mm/memory-failure.c | 10 +- + mm/memory.c | 4 +- + mm/memory_hotplug.c | 14 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 20 +- + mm/migrate_device.c | 2 +- + mm/page_alloc.c | 22 +- + mm/vmscan.c | 10 +- + tools/accounting/getdelays.c | 24 +- + tools/objtool/check.c | 2 + + tools/testing/selftests/mm/ksm_functional_tests.c | 96 ++++- + 35 files changed, 912 insertions(+), 420 deletions(-) + create mode 100644 mm/dmapool_test.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b7e6a0c0b7bb --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230220 |