diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-15 18:25:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-15 18:25:17 +1100 |
| commit | 03d992bd2de6c7f2c9bbd4260ff104c0926ce3ff (patch) | |
| tree | 58a8f84a49b8a2b864aae291f2951ee6073095dd | |
| parent | bec3cbf794d4e346033cf49104ad92459912412b (diff) | |
| download | linux-next-20201015.tar.gz linux-next-20201015.tar.xz | |
Add linux-next specific files for 20201015next-20201015
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 330 | ||||
| -rw-r--r-- | Next/Trees | 332 | ||||
| -rw-r--r-- | Next/merge.log | 18308 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 18971 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..463d2cae9054 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,330 @@ +Name SHA1 +---- ---- +origin 4da9af0014b51c8b015ed8c622440ef28912efe6 +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current e30d694c3381b565e043cf74b0bed059db1b4ac9 +arc-current 6364d1b41cc382db3b03cf33c57b6007ee8f09cf +arm-current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arm64-fixes 39e4716caa598a07a98598b2e7cd03055ce25fb9 +arm-soc-fixes 6869f774b1cd2bf20b4e4c5bfa13da311e02d495 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes 7ff3a2a626f7161c94fb58a0058dbdaedaa9d166 +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes 0460534b532e5518c657c7d6492b9337d975eaa3 +s390-fixes 549738f15da0e5a00275977623be199fbbf7df50 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 1e40d75ef90c5c99d9418637cd7295fa49ecb5fb +bpf 28802e7c0c9954218d1830f7507edc9d49b03a00 +ipsec 7fe94612dd4cfcd35fe0ec87745fb31ad2be71f8 +netfilter 1e40d75ef90c5c99d9418637cd7295fa49ecb5fb +ipvs 48d072c4e8cdb542ade06727c31d7851bcc40a89 +wireless-drivers df41c19abbeaae6e24c8e31cff5fdb48632be380 +mac80211 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96 +rdma-fixes a1b8638ba1320e6684aa98233c15255eb803fac7 +sound-current ce1558c285f9ad04c03b46833a028230771cc0a7 +sound-asoc-fixes 2ebefde9de62a0828936e47b62975501993b5ee9 +regmap-fixes 549738f15da0e5a00275977623be199fbbf7df50 +regulator-fixes 549738f15da0e5a00275977623be199fbbf7df50 +spi-fixes d4f3a651ab82685c63e6fb38bec20b3ccf08c085 +pci-current 76a6b0b90d532ed9bb9f6069aa12859c185e5b99 +driver-core.current 856deb866d16e29bd65952e0289066f6078af773 +tty.current ba4f184e126b751d1bffad5897f263108befc780 +usb.current 549738f15da0e5a00275977623be199fbbf7df50 +usb-gadget-fixes 51609fba0cca69206a213171ce0cdf2dfc9cb21d +usb-serial-fixes 856deb866d16e29bd65952e0289066f6078af773 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 850280156f6421a404f2351bee07a0e7bedfd4c6 +staging.current 549738f15da0e5a00275977623be199fbbf7df50 +char-misc.current 856deb866d16e29bd65952e0289066f6078af773 +soundwire-fixes 3fbbf2148a406b3e350fe91e6fdd78eb42ecad24 +thunderbolt-fixes 549738f15da0e5a00275977623be199fbbf7df50 +input-current 5fc27b098dafb8e30794a9db0705074c7d766179 +crypto-current 3093e7c16e12d729c325adb3c53dde7308cefbd8 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes aae7a75a821a793ed6b8ad502a5890fb8e8f172d +kselftest-fixes aa803771a80aa2aa2d5cdd38434b369066fbb8fc +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 549738f15da0e5a00275977623be199fbbf7df50 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 1afc0c89f6a155c54c76d65ffcf72cd1232daf3a +mfd-fixes 22380b65dc70f5b132c5afdf6b4011e2a84ec34a +v4l-dvb-fixes d0254f82d702a1d0d92e42f87676111de88846cf +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes be090fa62080d8501a5651a73cb954721966b125 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 8f04aea048d56f3e39a7e543939450246542a6fc +kvm-fixes e2e1a1c86bf32a8d7458b9024f518cf2434414c8 +kvms390-fixes f20d4e924b4465822c4a35290b85aadf88ddf466 +hwmon-fixes 18360b33a071e5883250fd1e04bfdeff8c3887a3 +nvdimm-fixes 88b67edd7247466bc47f01e1dc539b0d0d4b931e +btrfs-fixes 2a851de0233afe9d0f6382f19af74d28ee1da0bd +vfs-fixes 8a018eb55e3ac033592afbcb476b0ffe64465b12 +dma-mapping-fixes 892fc9f6835ecf075efac20789b012c5c9997fcc +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 1797d588af15174d4a4e7159dac8c800538e4f8c +samsung-krzk-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-samsung-fixes bbf5c979011a099af5dc76498918ed7df445635b +devicetree-fixes efe84d408bf41975db8506d3a1cc02e794e2309c +scsi-fixes bcf3a2953d36bbfb9bd44ccb3db0897d935cc485 +drm-fixes dded93ffbb8c4a578adf13b54cd62519908a23f8 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes bbf5c979011a099af5dc76498918ed7df445635b +mmc-fixes 4243219141b67d7c2fdb2d8073c17c539b9263eb +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 911e1987efc8f3e6445955fbae7f54b428b92bd3 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 84814460eef9af0fb56a4698341c9cb7996a6312 +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx c5c553850899e2662ecf749ac21fff95d17f59a4 +gpio-intel-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-intel-fixes 3488737093e7f60c7764b9a3cc66648adcbddca4 +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 1abdd39f14b25dd2d69096b624a4f86f158a9feb +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 5f7b81c18366c38446f6eedab570b98dbdc07cff +drm-misc-fixes 27204b99b08289d0993cb77c22470034b5eb974d +kspp-gustavo 736116436e5b99b46e1a49c17cae6f6ee0a30e84 +kbuild 666ddd277a196407047234da6db673f0ff6723b8 +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 2a410d09417b5344ab1f3cf001ac73a1daf8dcce +asm-generic 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arc def9d2780727cec3313ed3522d0123158d87224d +arm adc5f7029376049873289be305d507022281b8dd +arm64 d13027bb35e089bc1bb9f19c4976decf32a09b97 +arm-perf 887e2cff0f8dc4dac4c35e631b711325c6dd65b8 +arm-soc 4bb6c7b93462215bfd1f2acf15eaad3e95852350 +amlogic c56e4ad07fb343a3e2d0d943180e1acbb2b46b88 +aspeed 48127d01a153e6121cbe17379dec36fb0615a4a4 +at91 d1f170f8447df1fed9c6c8ce9789724ee972c8bb +drivers-memory 94ca85733699e09c691e63c5bc2475f92f9dd52a +imx-mxs bc421f7da477103250ecab17d600055849edcf3d +keystone 703dff8cb900d84bf95bf046114f8eefc95e8943 +mediatek b05dfbba9c464c3fb2596abb422e8b7a1f1f49f9 +mvebu f89c9685f6a1782c3e4c86aca636036009d22efd +omap 7a159a1ad494f85a655802dc423a684786a6d468 +qcom abea2a011c54c2724f7fcee64444ced7b9e51aa5 +raspberrypi 4564363351e2680e55edc23c7953aebd2acb4ab7 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 1ff27687ae7e65b4b29db46b5b84319977d9085e +reset 68a215164e1938490c82eecccb263d30c586b84a +rockchip ba0ceb95f560011db6a5181441b57d8b3db8be34 +samsung-krzk 62315959a2631d0228e48613089f5fef4bbf1502 +scmi 4d538ffe94a8d3eb7dfe324024e790ebbea4d77f +sunxi a2e5e8054a26622be6e402ce1d017655d0d160c8 +tegra 9ea55312ba1093068cf81f5899fadcaf61bf60b2 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 48a78787c0f352cc4ea3a6a4bf0c4f732e861712 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk df8a5d26427ebe7649d02fbd763492ecd2b5d00a +clk-samsung ff8e0ff9b99643a32f7e33a96867e76d0fa10f76 +csky 1c8499089bc6bc17ad2cb85d0441587d962d06f6 +h8300 8808515be0ed4e33de9bfdc65f4c1b547ee11065 +ia64 c331649e637152788b0ca1c857d0c2eaf34fcbc3 +m68k 50c5feeea0af99a4401fd54fd72bec1333a496ca +m68knommu 9f5fd809d7a02e32c2e044acb9f6aed1c79a699b +microblaze 4a17e8513376bb23f814d3e340a5692a12c69369 +mips cf3af0a4d3b62ab48e0b90180ea161d0f5d4953f +nds32 54bde873682b467f781f352effdb52d24e0a0c30 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd fbb75b71b131d53722432e4cb6539e4c00dcbb9e +powerpc a2d0230b91f7e23ceb5d8fb6a9799f30517ec33a +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v e8d444d3e98c255f91d228984abc46cfdfaf48b4 +s390 ddadd80dc9431179f251928b956bf65342b8a9e8 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f06885b3f3e3884f98351d7b72a4fc8400911cde +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs d6e05fb2b68055587a9111fb167c8e83b15574d6 +ceph 28e1581c3b4ea5f98530064a103c6217bedeea73 +cifs 344602068c51443a54335a40ec08765c165ae972 +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat e17632ef887466e30b5328db398966b106fb0bf0 +ext3 e44b86917b3fec1a26753135360ca326d6be1e22 +ext4 9cb3701fb5997a03841073faa52e9d4bd0893076 +f2fs 788e96d1d39949fc91457a816f4bda0d374c257b +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 42d3e2d041f08d1f8f078da005c936648ba77405 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs bbf5c979011a099af5dc76498918ed7df445635b +nfs-anna a2d24bcb97dc7b0be1cb891e60ae133bdf36c786 +nfsd 856deb866d16e29bd65952e0289066f6078af773 +cel 13a9a9d74d4d9689ad65938966dbc66386063648 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs 8f6ee74c27860d4a4c6e0f8cf772bb2afc184bcb +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs 7e75d8faa7e62253914597b72cfb0ca8c9e6d692 +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 1ad5f100e3ba73fe75615f720fa721f039759ee6 +vfs 60fb9d4572fa62d516f5907e7e6d9f75d463ade9 +printk ece33d6abfbc6bfb114731e795b3f3488267510f +pci ec8d6eaa648655a79ef27f343600e561e4ab8384 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid f5795950202d1da56468736e0eb35397d3b766c3 +i2c 48f2192f645ceaade37bf88279d5e0b332416407 +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 9b20aec24b8ab2860ea41182ba554dfcc444c0c8 +jc_docs 4fb220da0dd03d3699776220d86ac84b38941c0c +v4l-dvb c386e0797d26a32e354daf4480c5d40165db66a1 +v4l-dvb-next a2c13eb834ddb25797a387c6d571eda439592603 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 91e0225c546b542d828011feef9fb155e18b7941 +cpufreq-arm bc9b9c5ab9d8d16157737db539929d57562926e9 +cpupower 527b7779e5ecabb057089b760140309bdcacc16a +devfreq d353d1202b89ab039acd079cd97f7646058ebe11 +opp a5663c9b1e31c00e0bdfaf4d92eb51358fc3950f +thermal 48b458591749d35c927351b4960b49e35af30fe6 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f2b30fd9b4bd6e3620fe55786df7fc5f89ad526 +swiotlb b51e627158cb0f67569aa46b5a08b568d20a81a4 +rdma 1c39c16d64bc203655e780693929ab38d6139fc2 +net-next 50172733d01c3097b23ac8d45bf1fff72af0ba98 +bpf-next ccdf7fae3afaeaf0e5dd03311b86ffa56adf85ae +ipsec-next 61e7113e48d3ca1ea692b5c6376a4b545b312166 +mlx5-next 9d8feb460adb90e89e64101ce2c1cfcd548a6d83 +netfilter-next ccdf7fae3afaeaf0e5dd03311b86ffa56adf85ae +ipvs-next c2568c8c9e636a56abf31da4b28b65d3ded02524 +wireless-drivers-next df41c19abbeaae6e24c8e31cff5fdb48632be380 +bluetooth 44d59235ace59f8b493044d693174e60b571e2e1 +mac80211-next ba6ff70a3bb76c1ff440d3a0044b82e97abb648f +gfs2 65ae3e4e553fb1aae71abed2b605bb3daad2f15b +mtd 6402f4ce95811db7df72244ca84860332e4c2518 +nand 88e315d12fbb50c0bd12549bb04a051a4b4bc744 +spi-nor 9a3422a110c868e511387a81df25a315eaa3a7b8 +crypto 3093e7c16e12d729c325adb3c53dde7308cefbd8 +drm 640eee067d9aae0bb98d8706001976ff1affaf00 +amdgpu 02c3d98ce25b3e4f0b8e830be054c8f4f7f944c1 +drm-intel 214bba50616f65264dfc30d095daef3ab7500f52 +drm-tegra d9f980ebcd01d90a2a76ea2383c925abf9223cab +drm-misc d3c8f2784d3266d27956659c78835ee1d1925ad2 +drm-msm d1ea914925856d397b0b3241428f20b945e31434 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm efd5a93d2a894a1efde45ed12c17cb32f1740812 +etnaviv 3136fed4f91e02ad754464bf1ec15e22b800cc69 +regmap 6e0545c4f08368e67496111778a726f9a2031f26 +sound f401b2c9931a70317b6ac0d3e6020adc3a404cc0 +sound-asoc 2ebefde9de62a0828936e47b62975501993b5ee9 +modules fdf09ab887829cd1b671e45d9549f8ec1ffda0fa +input 8a30c6eb29e036f729b4dd6982462ca15d062087 +block 03b2b7a067107218331bd120075e8000005b4344 +device-mapper 681cc5e8667e8579a2da8fa4090c48a2d73fc3bb +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 1e23400f1a7342a2805cc647e6314cd12bfb5526 +mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +backlight 97ecfda1a8ffc5ffc9681d0dfa65fd5b39839dfe +battery 6c59a17b0d59dbffa62d0b3b8e648ccad02ea82f +regulator c6e70a6fd5ceff381059e600156d78c1b94b7c60 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity aa662fc04f5b290b3979332588bf8d812b189962 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 0d50f059c4cdc9e436f6f4db8779ac0795bfdadf +smack edd615371b668404d06699c04f5f90c4f438814a +tomoyo 5384d92e4e02661d2b08e9e20c7b2cd3b0b82db6 +tpmdd 865c50e1d279671728c2936cb7680eb89355eeea +watchdog c5b8e4644607b0319fd86a36fb0caad54ee2021e +iommu 7e3c3883c381aeda903778d7e99fc4cd523be610 +audit c07203516439b9cd9f7b3cbed82a77164de5af40 +devicetree bd36e51d10e7c2b7d39ffa7d075aed98a8e7473c +mailbox 62c04453381e4a13674df1b4793788994fd9a696 +spi 988731181359efd771ae967f94936906fa38868a +tip 80f92ca9b86c71450f003d39956fca4327cc5586 +clockevents f087e452f27e6342f938b92b2254b077bf1d9145 +edac eea32b7fdcb57e070997e77c4b7c3cc02b379f93 +irqchip 63ea38a402213d8c9c16e58ee4901ff51bc8fe3c +ftrace d3c07fac565261101337b9535df072361297ea2d +rcu a9863c90f5031a8fde56351f09fade3cec3ea4f0 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 4e5dc64c43192b4fd4c96ac150a8f013065f5f5b +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 32118f97f41d26a2447118fa956715cb4bd1bdac +percpu eff623d602db1e9510220f7d14558c2358562307 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 1a3f7813f38e400b0b63492b626b425f0a043d0b +chrome-platform 3e98fd6d816cd82f529345870efd435f06e02803 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 19d2e0cef0b14f8c7210162f58327485f5fa7c51 +ipmi 8fe7990ceda8597e407d06bffc4bdbe835a93ece +driver-core ee4906770ee931394179bcd42cabb196bc952276 +usb 93578a25d4e21603518daf27a5f9caa4bf79de68 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 3e765cab8abe7f84cb80d4a7a973fc97d5742647 +usb-chipidea-next 71ac680e6339e744d87647a1ca27b2e87dba2eac +phy-next 60f5a24c11f7fa0c8c74018cfd4c25a3f432fdaf +tty 4be87603b6dc9e49c2e07151bb51180dc0b6964a +char-misc f3277cbfba763cd2826396521b9296de67cf1bbc +extcon dbc888072a976c2a7f74ad2df1ca3e6894f96002 +soundwire 0173f525b2c1b02a51784e2119d434593235aed1 +thunderbolt 810278da901c15fba475394edb7f1271c3806658 +vfio 83e491799e631dd41e7c7a870dd3a7603c461123 +staging e1f13c879a7c21bd207dc6242455e8e3a1e88b40 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 5a42868ade31807e9350ed45d018530bf61c4e07 +dmaengine fc143e38ddd47d3b01ac276786ee78edf053bf5d +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi 9dcbbd959cef85b74ec52d83bc0129244c519ae2 +scsi-mkp 1ef16a407f544408d3559e4de2ed05591df4da75 +vhost 65457c87de6646fa684c3f3e134b8291322d3f33 +rpmsg 05383bf01edffc1550841bb153950d27de4589b9 +gpio 3d6e8262d3c09479c65e59939df6ca3c0ad7f750 +gpio-brgl cf048e05b68789e9fa35f246f8ecbe95d79f4173 +gpio-intel 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl c348abca14dc51890bc07ce8f63538dea6d0bc3c +pinctrl-intel a0bf06dc51dbbc5ad182b1bcf4d879db8d297c5e +pinctrl-samsung bbf5c979011a099af5dc76498918ed7df445635b +pwm 3b1954cd57bf7648417c593d60eac1ec661ad514 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 4c8511317b4ec75cc3868f80a7b9fddb8322e512 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching 59fc1e476962eff9ef259355a9daf912b563aac0 +coresight 3477326277451000bc667dfcc4fd0774c039184c +rtc 179b4bcc4c0cf62e3737c718e05f5a69b3e9041c +nvdimm a1b8638ba1320e6684aa98233c15255eb803fac7 +at24 61f764c307f6b2079b7af0d4fb7951402b824967 +ntb b8e2c8bbdf7778c6e3c65db21ababb1dfa794282 +seccomp dfe719fef03d752f1682fa8aeddf30ba501c8555 +kspp 9b80e4c4ddaca3501177ed41e49d0928ba2122a8 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 1cf257875246407cc37062c9f20bd695662df62b +nvmem 02200a863b9a18221143124988c03098d39e1b61 +xarray 84c34df158cf215b0cd1475ab3b8e6f212f81f23 +hyperv 626b901f60446355e35e8c76c6b391a7d7491203 +auxdisplay bbf5c979011a099af5dc76498918ed7df445635b +kgdb d081a6e353168f15e63eb9e9334757f20343319f +pidfd e06ce5515b74f628b78677e6736f66f6abb89b00 +hmm 0c16d9635e3a51377e5815b9f8e14f497a4dbb42 +fpga e1e66168c7695e90f90ff3a515290b65e53a84e2 +kunit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 5de15b610f785f0e188fefb707f0b19de156968a +kunit-next d2585f5164c298aaaed14c2c8d313cbe7bd5b253 +trivial 2a9b29b289833e42e13fdfb7e082499c1464f25c +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 298edb32160f6ae0595ec05a1cc4fdd1d4d8db18 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 2095725c325bed4fde39f5be20c46f618e934c9d +akpm-current c12679c08a474bb8c09b4953aee938626aa2892c +akpm 5432eb6812cffb85d830efc3d5358c8b533495a7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..390856df2e01 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,332 @@ +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 +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 +uniphier-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.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/fscrypt.git#for-stable +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-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/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-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +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 +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.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/jeyu/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 +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 +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +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#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +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 +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#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 +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +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 +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-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 +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#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 +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git 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 +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +uniphier git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +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/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-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.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +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 +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 +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/helgaas/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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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 +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-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 +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.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 +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/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/jeyu/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 +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/jmorris/linux-security.git#next-testing +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 +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#auto-latest +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/rostedt/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#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/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 +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 +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-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/andersson/remoteproc.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-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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ccefd142f1f8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,18308 @@ +$ date -R +Thu, 15 Oct 2020 08:54:44 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 61% (8035/13152)
Updating files: 62% (8155/13152)
Updating files: 63% (8286/13152)
Updating files: 64% (8418/13152)
Updating files: 65% (8549/13152)
Updating files: 66% (8681/13152)
Updating files: 67% (8812/13152)
Updating files: 68% (8944/13152)
Updating files: 69% (9075/13152)
Updating files: 70% (9207/13152)
Updating files: 71% (9338/13152)
Updating files: 72% (9470/13152)
Updating files: 73% (9601/13152)
Updating files: 74% (9733/13152)
Updating files: 75% (9864/13152)
Updating files: 76% (9996/13152)
Updating files: 77% (10128/13152)
Updating files: 78% (10259/13152)
Updating files: 79% (10391/13152)
Updating files: 80% (10522/13152)
Updating files: 81% (10654/13152)
Updating files: 82% (10785/13152)
Updating files: 83% (10917/13152)
Updating files: 84% (11048/13152)
Updating files: 85% (11180/13152)
Updating files: 86% (11311/13152)
Updating files: 87% (11443/13152)
Updating files: 88% (11574/13152)
Updating files: 89% (11706/13152)
Updating files: 90% (11837/13152)
Updating files: 91% (11969/13152)
Updating files: 92% (12100/13152)
Updating files: 92% (12192/13152)
Updating files: 93% (12232/13152)
Updating files: 94% (12363/13152)
Updating files: 95% (12495/13152)
Updating files: 96% (12626/13152)
Updating files: 97% (12758/13152)
Updating files: 98% (12889/13152)
Updating files: 99% (13021/13152)
Updating files: 100% (13152/13152)
Updating files: 100% (13152/13152), done. +HEAD is now at 13cb73490f47 Merge tag 'x86-entry-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (4da9af0014b5 Merge tag 'threads-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) +$ git merge origin/master +Updating 13cb73490f47..4da9af0014b5 +Fast-forward + .clang-format | 5 +- + .gitignore | 3 + + .mailmap | 1 + + .../ABI/obsolete/sysfs-selinux-checkreqprot | 2 +- + Documentation/ABI/stable/sysfs-kernel-notes | 5 + + Documentation/ABI/testing/sysfs-platform-dptf | 16 + + Documentation/PCI/index.rst | 1 + + Documentation/{filesystems => PCI}/sysfs-pci.rst | 0 + Documentation/admin-guide/README.rst | 6 +- + Documentation/admin-guide/bcache.rst | 31 +- + Documentation/admin-guide/blockdev/ramdisk.rst | 66 +- + Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 + + Documentation/admin-guide/cgroup-v2.rst | 69 +- + Documentation/admin-guide/gpio/gpio-mockup.rst | 50 + + Documentation/admin-guide/gpio/index.rst | 1 + + Documentation/admin-guide/kdump/gdbmacros.txt | 159 +- + Documentation/admin-guide/kdump/kdump.rst | 7 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 131 +- + Documentation/admin-guide/kernel-parameters.txt | 38 +- + .../admin-guide/media/dvb-usb-dvbsky-cardlist.rst | 8 +- + .../admin-guide/media/dvb-usb-dw2102-cardlist.rst | 4 + + .../admin-guide/media/em28xx-cardlist.rst | 4 + + Documentation/admin-guide/media/ipu3.rst | 142 +- + Documentation/admin-guide/media/pci-cardlist.rst | 2 + + Documentation/admin-guide/media/rkisp1.dot | 18 + + Documentation/admin-guide/media/rkisp1.rst | 181 + + Documentation/admin-guide/media/siano-cardlist.rst | 2 +- + Documentation/admin-guide/media/usb-cardlist.rst | 1 - + .../admin-guide/media/usbvision-cardlist.rst | 283 - + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + Documentation/admin-guide/media/zoran-cardlist.rst | 51 + + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/admin-guide/mm/numaperf.rst | 8 + + Documentation/admin-guide/pm/cpuidle.rst | 9 + + Documentation/admin-guide/pnp.rst | 4 - + Documentation/admin-guide/svga.rst | 7 +- + Documentation/admin-guide/sysctl/abi.rst | 73 +- + Documentation/admin-guide/tainted-kernels.rst | 2 +- + Documentation/arm/sunxi.rst | 2 +- + Documentation/arm/uefi.rst | 2 +- + Documentation/arm64/amu.rst | 2 + + Documentation/arm64/index.rst | 2 + + Documentation/conf.py | 15 +- + Documentation/core-api/cpu_hotplug.rst | 2 +- + Documentation/crypto/userspace-if.rst | 20 +- + Documentation/dev-tools/kasan.rst | 74 +- + Documentation/dev-tools/kmemleak.rst | 2 +- + .../devicetree/bindings/clock/imx8qxp-lpcg.yaml | 2 +- + .../bindings/cpufreq/cpufreq-qcom-hw.txt | 2 +- + .../display/tegra/nvidia,tegra20-host1x.txt | 92 +- + .../devicetree/bindings/fsi/ibm,fsi2spi.yaml | 1 + + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 55 +- + .../devicetree/bindings/gpio/gpio-max732x.txt | 58 - + .../devicetree/bindings/gpio/gpio-pca953x.txt | 90 - + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 232 + + .../devicetree/bindings/gpio/pl061-gpio.yaml | 3 + + .../bindings/gpio/renesas,rcar-gpio.yaml | 1 + + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 6 + + .../devicetree/bindings/hwmon/adi,adm1266.yaml | 51 + + Documentation/devicetree/bindings/hwmon/lm75.txt | 39 - + Documentation/devicetree/bindings/hwmon/lm75.yaml | 66 + + .../devicetree/bindings/hwmon/maxim,max20730.yaml | 65 + + .../devicetree/bindings/hwmon/moortec,mr75203.yaml | 71 + + .../devicetree/bindings/hwmon/sensirion,shtc1.yaml | 61 + + .../devicetree/bindings/iommu/mediatek,iommu.txt | 2 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 3 +- + .../devicetree/bindings/media/gpio-ir-receiver.txt | 3 + + .../devicetree/bindings/media/i2c/ov5647.txt | 35 - + .../devicetree/bindings/media/i2c/ov5647.yaml | 88 + + .../bindings/media/mediatek-jpeg-encoder.txt | 35 + + .../devicetree/bindings/media/mediatek-vcodec.txt | 9 +- + .../bindings/media/qcom,sc7180-venus.yaml | 6 +- + .../bindings/media/qcom,sdm845-venus-v2.yaml | 6 +- + .../devicetree/bindings/media/renesas,csi2.yaml | 1 + + .../devicetree/bindings/media/renesas,vin.yaml | 2 + + .../devicetree/bindings/media/samsung-fimc.txt | 6 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 37 +- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 65 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 4 + + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 + + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 6 +- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.txt | 61 - + .../devicetree/bindings/mmc/sdhci-am654.yaml | 218 + + Documentation/devicetree/bindings/opp/opp.txt | 53 +- + .../devicetree/bindings/regulator/mp886x.txt | 27 - + .../devicetree/bindings/regulator/mps,mp886x.yaml | 61 + + .../bindings/regulator/mt6360-regulator.yaml | 113 + + .../devicetree/bindings/regulator/pfuze100.txt | 394 -- + .../devicetree/bindings/regulator/pfuze100.yaml | 186 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 12 + + .../bindings/regulator/qcom,spmi-regulator.txt | 31 + + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 44 + + .../regulator/richtek,rt4801-regulator.yaml | 79 + + .../regulator/richtek,rtmv20-regulator.yaml | 159 + + .../bindings/regulator/rohm,bd71837-regulator.yaml | 11 + + .../bindings/regulator/rohm,bd71847-regulator.yaml | 11 + + .../bindings/regulator/rohm,bd9576-regulator.yaml | 34 + + .../bindings/regulator/silergy,sy8824x.yaml | 45 + + .../devicetree/bindings/regulator/sy8824x.txt | 24 - + .../devicetree/bindings/rng/ingenic,trng.yaml | 43 + + .../bindings/rng/xiphera,xip8001b-trng.yaml | 33 + + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 2 + + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 86 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 1 + + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 54 +- + .../devicetree/bindings/spi/spi-mtk-nor.txt | 47 - + .../devicetree/bindings/trivial-devices.yaml | 6 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/doc-guide/kernel-doc.rst | 33 +- + Documentation/doc-guide/sphinx.rst | 17 + + Documentation/driver-api/dma-buf.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 12 +- + Documentation/driver-api/media/camera-sensor.rst | 134 + + Documentation/driver-api/media/cec-core.rst | 62 +- + Documentation/driver-api/media/csi2.rst | 2 + + Documentation/driver-api/media/drivers/index.rst | 2 + + Documentation/driver-api/media/drivers/vidtv.rst | 425 ++ + Documentation/driver-api/media/drivers/zoran.rst | 575 ++ + Documentation/driver-api/media/index.rst | 1 + + Documentation/driver-api/media/v4l2-subdev.rst | 97 +- + Documentation/driver-api/nvdimm/index.rst | 1 + + Documentation/driver-api/soundwire/stream.rst | 8 +- + Documentation/fb/fbcon.rst | 21 +- + Documentation/fb/matroxfb.rst | 2 - + Documentation/fb/sstfb.rst | 3 - + Documentation/fb/vesafb.rst | 2 - + Documentation/filesystems/index.rst | 2 - + Documentation/filesystems/locking.rst | 3 - + Documentation/filesystems/mount_api.rst | 7 +- + Documentation/filesystems/seq_file.rst | 20 +- + Documentation/filesystems/sysfs.rst | 3 +- + Documentation/filesystems/ubifs-authentication.rst | 6 +- + Documentation/firmware-guide/acpi/index.rst | 1 + + Documentation/hwmon/adm1266.rst | 37 + + Documentation/hwmon/amd_energy.rst | 5 + + Documentation/hwmon/drivetemp.rst | 18 + + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/intel-m10-bmc-hwmon.rst | 78 + + Documentation/hwmon/ltc2945.rst | 2 +- + Documentation/hwmon/mp2975.rst | 116 + + Documentation/hwmon/pmbus-core.rst | 3 +- + Documentation/hwmon/pmbus.rst | 22 +- + Documentation/hwmon/sysfs-interface.rst | 70 + + Documentation/ia64/index.rst | 1 - + Documentation/ia64/xen.rst | 206 - + Documentation/iio/iio_configfs.rst | 2 +- + Documentation/kbuild/llvm.rst | 4 + + Documentation/kbuild/makefiles.rst | 20 + + Documentation/locking/lockdep-design.rst | 258 + + Documentation/locking/seqlock.rst | 18 + + Documentation/maintainer/index.rst | 1 + + Documentation/maintainer/modifying-patches.rst | 50 + + Documentation/memory-barriers.txt | 8 +- + Documentation/networking/index.rst | 1 + + .../{filesystems => networking}/sysfs-tagging.rst | 0 + Documentation/process/2.Process.rst | 2 +- + Documentation/process/changes.rst | 15 + + Documentation/process/deprecated.rst | 24 +- + Documentation/process/email-clients.rst | 5 + + Documentation/process/programming-language.rst | 9 +- + Documentation/process/submit-checklist.rst | 4 + + Documentation/process/submitting-drivers.rst | 9 +- + Documentation/process/submitting-patches.rst | 280 +- + Documentation/scheduler/sched-capacity.rst | 2 +- + Documentation/scheduler/sched-energy.rst | 2 +- + Documentation/security/credentials.rst | 1 - + Documentation/security/keys/trusted-encrypted.rst | 5 +- + Documentation/sphinx/automarkup.py | 137 +- + Documentation/trace/histogram.rst | 4 +- + Documentation/trace/kprobetrace.rst | 2 +- + Documentation/trace/ring-buffer-design.rst | 26 +- + Documentation/translations/ko_KR/howto.rst | 9 +- + .../translations/ko_KR/memory-barriers.txt | 32 +- + Documentation/translations/zh_CN/arm64/amu.rst | 100 + + Documentation/translations/zh_CN/arm64/index.rst | 16 + + .../translations/zh_CN/filesystems/sysfs.txt | 3 +- + Documentation/translations/zh_CN/index.rst | 1 + + Documentation/userspace-api/ioctl/hdio.rst | 24 +- + Documentation/userspace-api/iommu.rst | 209 + + Documentation/userspace-api/media/cec/cec-api.rst | 10 +- + .../userspace-api/media/cec/cec-func-close.rst | 9 +- + .../userspace-api/media/cec/cec-func-ioctl.rst | 9 +- + .../userspace-api/media/cec/cec-func-open.rst | 9 +- + .../userspace-api/media/cec/cec-func-poll.rst | 9 +- + .../userspace-api/media/cec/cec-funcs.rst | 9 +- + .../userspace-api/media/cec/cec-header.rst | 9 +- + .../userspace-api/media/cec/cec-intro.rst | 9 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 9 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 9 +- + .../media/cec/cec-ioc-adap-g-phys-addr.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 9 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 9 +- + .../userspace-api/media/cec/cec-pin-error-inj.rst | 9 +- + .../media/dvb/audio-bilingual-channel-select.rst | 9 +- + .../media/dvb/audio-channel-select.rst | 9 +- + .../userspace-api/media/dvb/audio-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/audio-continue.rst | 9 +- + .../userspace-api/media/dvb/audio-fclose.rst | 9 +- + .../userspace-api/media/dvb/audio-fopen.rst | 9 +- + .../userspace-api/media/dvb/audio-fwrite.rst | 9 +- + .../media/dvb/audio-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/audio-get-status.rst | 9 +- + .../userspace-api/media/dvb/audio-pause.rst | 9 +- + .../userspace-api/media/dvb/audio-play.rst | 9 +- + .../media/dvb/audio-select-source.rst | 9 +- + .../userspace-api/media/dvb/audio-set-av-sync.rst | 9 +- + .../media/dvb/audio-set-bypass-mode.rst | 9 +- + .../userspace-api/media/dvb/audio-set-id.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mixer.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mute.rst | 9 +- + .../media/dvb/audio-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/audio-stop.rst | 9 +- + Documentation/userspace-api/media/dvb/audio.rst | 9 +- + .../userspace-api/media/dvb/audio_data_types.rst | 9 +- + .../media/dvb/audio_function_calls.rst | 9 +- + .../userspace-api/media/dvb/ca-fclose.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-fopen.rst | 9 +- + .../userspace-api/media/dvb/ca-get-cap.rst | 9 +- + .../userspace-api/media/dvb/ca-get-descr-info.rst | 9 +- + .../userspace-api/media/dvb/ca-get-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-get-slot-info.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-reset.rst | 9 +- + .../userspace-api/media/dvb/ca-send-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-set-descr.rst | 9 +- + Documentation/userspace-api/media/dvb/ca.rst | 9 +- + .../userspace-api/media/dvb/ca_data_types.rst | 9 +- + .../userspace-api/media/dvb/ca_function_calls.rst | 9 +- + Documentation/userspace-api/media/dvb/demux.rst | 9 +- + .../userspace-api/media/dvb/dmx-add-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-expbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-fclose.rst | 9 +- + .../userspace-api/media/dvb/dmx-fopen.rst | 9 +- + .../userspace-api/media/dvb/dmx-fread.rst | 9 +- + .../userspace-api/media/dvb/dmx-fwrite.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-pes-pids.rst | 9 +- + .../userspace-api/media/dvb/dmx-get-stc.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-mmap.rst | 9 +- + .../userspace-api/media/dvb/dmx-munmap.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-qbuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-querybuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-remove-pid.rst | 9 +- + .../userspace-api/media/dvb/dmx-reqbufs.rst | 9 +- + .../media/dvb/dmx-set-buffer-size.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-set-pes-filter.rst | 9 +- + .../userspace-api/media/dvb/dmx-start.rst | 9 +- + Documentation/userspace-api/media/dvb/dmx-stop.rst | 9 +- + .../userspace-api/media/dvb/dmx_fcalls.rst | 9 +- + .../userspace-api/media/dvb/dmx_types.rst | 9 +- + .../userspace-api/media/dvb/dvb-fe-read-status.rst | 9 +- + .../userspace-api/media/dvb/dvb-frontend-event.rst | 9 +- + .../media/dvb/dvb-frontend-parameters.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbapi.rst | 10 +- + .../userspace-api/media/dvb/dvbproperty.rst | 9 +- + Documentation/userspace-api/media/dvb/dvbstb.svg | 28 +- + Documentation/userspace-api/media/dvb/examples.rst | 9 +- + .../userspace-api/media/dvb/fe-bandwidth-t.rst | 9 +- + .../media/dvb/fe-diseqc-recv-slave-reply.rst | 9 +- + .../media/dvb/fe-diseqc-reset-overload.rst | 9 +- + .../media/dvb/fe-diseqc-send-burst.rst | 9 +- + .../media/dvb/fe-diseqc-send-master-cmd.rst | 9 +- + .../media/dvb/fe-dishnetwork-send-legacy-cmd.rst | 9 +- + .../media/dvb/fe-enable-high-lnb-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-get-event.rst | 9 +- + .../userspace-api/media/dvb/fe-get-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-get-info.rst | 9 +- + .../userspace-api/media/dvb/fe-get-property.rst | 9 +- + .../userspace-api/media/dvb/fe-read-ber.rst | 9 +- + .../media/dvb/fe-read-signal-strength.rst | 9 +- + .../userspace-api/media/dvb/fe-read-snr.rst | 9 +- + .../userspace-api/media/dvb/fe-read-status.rst | 9 +- + .../media/dvb/fe-read-uncorrected-blocks.rst | 9 +- + .../media/dvb/fe-set-frontend-tune-mode.rst | 9 +- + .../userspace-api/media/dvb/fe-set-frontend.rst | 9 +- + .../userspace-api/media/dvb/fe-set-tone.rst | 9 +- + .../userspace-api/media/dvb/fe-set-voltage.rst | 9 +- + .../userspace-api/media/dvb/fe-type-t.rst | 9 +- + .../media/dvb/fe_property_parameters.rst | 9 +- + .../userspace-api/media/dvb/frontend-header.rst | 9 +- + .../media/dvb/frontend-property-cable-systems.rst | 9 +- + .../dvb/frontend-property-satellite-systems.rst | 9 +- + .../dvb/frontend-property-terrestrial-systems.rst | 9 +- + .../media/dvb/frontend-stat-properties.rst | 9 +- + Documentation/userspace-api/media/dvb/frontend.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_close.rst | 9 +- + .../userspace-api/media/dvb/frontend_f_open.rst | 9 +- + .../userspace-api/media/dvb/frontend_fcalls.rst | 9 +- + .../media/dvb/frontend_legacy_api.rst | 9 +- + .../media/dvb/frontend_legacy_dvbv3_api.rst | 9 +- + Documentation/userspace-api/media/dvb/headers.rst | 9 +- + Documentation/userspace-api/media/dvb/intro.rst | 9 +- + .../userspace-api/media/dvb/legacy_dvb_apis.rst | 9 +- + .../userspace-api/media/dvb/net-add-if.rst | 9 +- + .../userspace-api/media/dvb/net-get-if.rst | 9 +- + .../userspace-api/media/dvb/net-remove-if.rst | 9 +- + .../userspace-api/media/dvb/net-types.rst | 9 +- + Documentation/userspace-api/media/dvb/net.rst | 9 +- + .../media/dvb/query-dvb-frontend-info.rst | 9 +- + .../userspace-api/media/dvb/video-clear-buffer.rst | 9 +- + .../userspace-api/media/dvb/video-command.rst | 9 +- + .../userspace-api/media/dvb/video-continue.rst | 9 +- + .../userspace-api/media/dvb/video-fast-forward.rst | 9 +- + .../userspace-api/media/dvb/video-fclose.rst | 9 +- + .../userspace-api/media/dvb/video-fopen.rst | 9 +- + .../userspace-api/media/dvb/video-freeze.rst | 9 +- + .../userspace-api/media/dvb/video-fwrite.rst | 9 +- + .../media/dvb/video-get-capabilities.rst | 9 +- + .../userspace-api/media/dvb/video-get-event.rst | 9 +- + .../media/dvb/video-get-frame-count.rst | 9 +- + .../userspace-api/media/dvb/video-get-pts.rst | 9 +- + .../userspace-api/media/dvb/video-get-size.rst | 9 +- + .../userspace-api/media/dvb/video-get-status.rst | 9 +- + .../userspace-api/media/dvb/video-play.rst | 9 +- + .../media/dvb/video-select-source.rst | 9 +- + .../userspace-api/media/dvb/video-set-blank.rst | 9 +- + .../media/dvb/video-set-display-format.rst | 9 +- + .../userspace-api/media/dvb/video-set-format.rst | 9 +- + .../media/dvb/video-set-streamtype.rst | 9 +- + .../userspace-api/media/dvb/video-slowmotion.rst | 9 +- + .../userspace-api/media/dvb/video-stillpicture.rst | 9 +- + .../userspace-api/media/dvb/video-stop.rst | 9 +- + .../userspace-api/media/dvb/video-try-command.rst | 9 +- + Documentation/userspace-api/media/dvb/video.rst | 9 +- + .../media/dvb/video_function_calls.rst | 9 +- + .../userspace-api/media/dvb/video_types.rst | 9 +- + Documentation/userspace-api/media/fdl-appendix.rst | 9 +- + Documentation/userspace-api/media/gen-errors.rst | 9 +- + Documentation/userspace-api/media/glossary.rst | 205 + + Documentation/userspace-api/media/index.rst | 3 + + .../media/mediactl/media-controller-intro.rst | 9 +- + .../media/mediactl/media-controller-model.rst | 9 +- + .../media/mediactl/media-controller.rst | 10 +- + .../media/mediactl/media-func-close.rst | 9 +- + .../media/mediactl/media-func-ioctl.rst | 9 +- + .../media/mediactl/media-func-open.rst | 9 +- + .../userspace-api/media/mediactl/media-funcs.rst | 9 +- + .../userspace-api/media/mediactl/media-header.rst | 9 +- + .../media/mediactl/media-ioc-device-info.rst | 9 +- + .../media/mediactl/media-ioc-enum-entities.rst | 9 +- + .../media/mediactl/media-ioc-enum-links.rst | 9 +- + .../media/mediactl/media-ioc-g-topology.rst | 9 +- + .../media/mediactl/media-ioc-request-alloc.rst | 26 +- + .../media/mediactl/media-ioc-setup-link.rst | 9 +- + .../media/mediactl/media-request-ioc-queue.rst | 26 +- + .../media/mediactl/media-request-ioc-reinit.rst | 26 +- + .../userspace-api/media/mediactl/media-types.rst | 9 +- + .../userspace-api/media/mediactl/request-api.rst | 26 +- + .../media/mediactl/request-func-close.rst | 26 +- + .../media/mediactl/request-func-ioctl.rst | 26 +- + .../media/mediactl/request-func-poll.rst | 26 +- + .../userspace-api/media/rc/keytable.c.rst | 9 +- + .../userspace-api/media/rc/lirc-dev-intro.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-dev.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-func.rst | 9 +- + .../userspace-api/media/rc/lirc-get-features.rst | 9 +- + .../userspace-api/media/rc/lirc-get-rec-mode.rst | 9 +- + .../media/rc/lirc-get-rec-resolution.rst | 9 +- + .../userspace-api/media/rc/lirc-get-send-mode.rst | 9 +- + .../userspace-api/media/rc/lirc-get-timeout.rst | 9 +- + .../userspace-api/media/rc/lirc-header.rst | 9 +- + Documentation/userspace-api/media/rc/lirc-read.rst | 9 +- + .../media/rc/lirc-set-measure-carrier-mode.rst | 9 +- + .../media/rc/lirc-set-rec-carrier-range.rst | 9 +- + .../media/rc/lirc-set-rec-carrier.rst | 9 +- + .../media/rc/lirc-set-rec-timeout-reports.rst | 9 +- + .../media/rc/lirc-set-rec-timeout.rst | 9 +- + .../media/rc/lirc-set-send-carrier.rst | 9 +- + .../media/rc/lirc-set-send-duty-cycle.rst | 9 +- + .../media/rc/lirc-set-transmitter-mask.rst | 9 +- + .../media/rc/lirc-set-wideband-receiver.rst | 9 +- + .../userspace-api/media/rc/lirc-write.rst | 9 +- + Documentation/userspace-api/media/rc/rc-intro.rst | 9 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 4 +- + .../userspace-api/media/rc/rc-sysfs-nodes.rst | 9 +- + .../userspace-api/media/rc/rc-table-change.rst | 9 +- + Documentation/userspace-api/media/rc/rc-tables.rst | 9 +- + .../userspace-api/media/rc/remote_controllers.rst | 10 +- + .../userspace-api/media/typical_media_device.svg | 11 +- + Documentation/userspace-api/media/v4l/app-pri.rst | 9 +- + Documentation/userspace-api/media/v4l/async.rst | 9 +- + Documentation/userspace-api/media/v4l/audio.rst | 9 +- + Documentation/userspace-api/media/v4l/bayer.svg | 28 +- + Documentation/userspace-api/media/v4l/biblio.rst | 9 +- + Documentation/userspace-api/media/v4l/buffer.rst | 9 +- + .../userspace-api/media/v4l/capture-example.rst | 9 +- + .../userspace-api/media/v4l/capture.c.rst | 9 +- + .../userspace-api/media/v4l/colorspaces-defs.rst | 18 +- + .../media/v4l/colorspaces-details.rst | 14 +- + .../userspace-api/media/v4l/colorspaces.rst | 9 +- + .../userspace-api/media/v4l/common-defs.rst | 9 +- + Documentation/userspace-api/media/v4l/common.rst | 9 +- + Documentation/userspace-api/media/v4l/compat.rst | 9 +- + .../userspace-api/media/v4l/constraints.svg | 28 +- + Documentation/userspace-api/media/v4l/control.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.rst | 9 +- + Documentation/userspace-api/media/v4l/crop.svg | 11 +- + .../userspace-api/media/v4l/depth-formats.rst | 9 +- + .../userspace-api/media/v4l/dev-capture.rst | 9 +- + .../userspace-api/media/v4l/dev-encoder.rst | 26 +- + .../userspace-api/media/v4l/dev-event.rst | 9 +- + .../userspace-api/media/v4l/dev-mem2mem.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-meta.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-osd.rst | 9 +- + .../userspace-api/media/v4l/dev-output.rst | 9 +- + .../userspace-api/media/v4l/dev-overlay.rst | 9 +- + .../userspace-api/media/v4l/dev-radio.rst | 9 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 9 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 9 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 11 +- + .../userspace-api/media/v4l/dev-subdev.rst | 9 +- + .../userspace-api/media/v4l/dev-touch.rst | 9 +- + Documentation/userspace-api/media/v4l/devices.rst | 9 +- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 9 +- + Documentation/userspace-api/media/v4l/dmabuf.rst | 9 +- + .../userspace-api/media/v4l/dv-timings.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 338 +- + .../userspace-api/media/v4l/ext-ctrls-detect.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-dv.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-rx.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-fm-tx.rst | 9 +- + .../media/v4l/ext-ctrls-image-process.rst | 9 +- + .../media/v4l/ext-ctrls-image-source.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-jpeg.rst | 9 +- + .../userspace-api/media/v4l/ext-ctrls-rf-tuner.rst | 9 +- + .../userspace-api/media/v4l/extended-controls.rst | 9 +- + .../userspace-api/media/v4l/field-order.rst | 9 +- + .../userspace-api/media/v4l/fieldseq_bt.svg | 11 +- + .../userspace-api/media/v4l/fieldseq_tb.svg | 11 +- + Documentation/userspace-api/media/v4l/format.rst | 9 +- + .../userspace-api/media/v4l/func-close.rst | 9 +- + .../userspace-api/media/v4l/func-ioctl.rst | 9 +- + .../userspace-api/media/v4l/func-mmap.rst | 9 +- + .../userspace-api/media/v4l/func-munmap.rst | 9 +- + .../userspace-api/media/v4l/func-open.rst | 9 +- + .../userspace-api/media/v4l/func-poll.rst | 9 +- + .../userspace-api/media/v4l/func-read.rst | 9 +- + .../userspace-api/media/v4l/func-select.rst | 9 +- + .../userspace-api/media/v4l/func-write.rst | 9 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 248 +- + .../userspace-api/media/v4l/hsv-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/io.rst | 9 +- + .../media/v4l/libv4l-introduction.rst | 9 +- + Documentation/userspace-api/media/v4l/libv4l.rst | 9 +- + .../userspace-api/media/v4l/meta-formats.rst | 10 +- + Documentation/userspace-api/media/v4l/mmap.rst | 9 +- + Documentation/userspace-api/media/v4l/nv12mt.svg | 28 +- + .../userspace-api/media/v4l/nv12mt_example.svg | 28 +- + Documentation/userspace-api/media/v4l/open.rst | 120 +- + .../userspace-api/media/v4l/pixfmt-bayer.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-grey.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-indexed.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-intro.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-inzi.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-m420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 9 +- + .../media/v4l/pixfmt-meta-intel-ipu3.rst | 25 +- + .../userspace-api/media/v4l/pixfmt-meta-rkisp1.rst | 49 + + .../userspace-api/media/v4l/pixfmt-meta-uvc.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-meta-vivid.rst | 26 +- + .../media/v4l/pixfmt-meta-vsp1-hgo.rst | 9 +- + .../media/v4l/pixfmt-meta-vsp1-hgt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv12mt.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv16m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-nv24.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-hsv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-packed-yuv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 26 +- + .../userspace-api/media/v4l/pixfmt-rgb.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cs14le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-cu16le.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu16be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu18be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-pcu20be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-sdr-ru12le.rst | 9 +- + .../media/v4l/pixfmt-srggb10-ipu3.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10.rst | 9 +- + .../media/v4l/pixfmt-srggb10alaw8.rst | 9 +- + .../media/v4l/pixfmt-srggb10dpcm8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-srggb8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-td16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu08.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-tch-tu16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uv8.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-uyvy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-v4l2-mplane.rst | 25 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 90 +- + .../userspace-api/media/v4l/pixfmt-vyuy.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10b.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y10p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y12i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y14.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16-be.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y16.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y41p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-y8i.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv410.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv411p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv420m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv422p.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuv444m.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yuyv.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-yvyu.rst | 9 +- + .../userspace-api/media/v4l/pixfmt-z16.rst | 9 +- + Documentation/userspace-api/media/v4l/pixfmt.rst | 9 +- + .../userspace-api/media/v4l/planar-apis.rst | 9 +- + Documentation/userspace-api/media/v4l/querycap.rst | 9 +- + Documentation/userspace-api/media/v4l/rw.rst | 9 +- + .../userspace-api/media/v4l/sdr-formats.rst | 9 +- + .../media/v4l/selection-api-configuration.rst | 9 +- + .../media/v4l/selection-api-examples.rst | 9 +- + .../media/v4l/selection-api-intro.rst | 9 +- + .../media/v4l/selection-api-targets.rst | 9 +- + .../media/v4l/selection-api-vs-crop-api.rst | 9 +- + .../userspace-api/media/v4l/selection-api.rst | 9 +- + .../userspace-api/media/v4l/selection.svg | 28 +- + .../userspace-api/media/v4l/selections-common.rst | 9 +- + Documentation/userspace-api/media/v4l/standard.rst | 9 +- + .../userspace-api/media/v4l/streaming-par.rst | 9 +- + .../userspace-api/media/v4l/subdev-formats.rst | 104 +- + .../media/v4l/subdev-image-processing-crop.svg | 11 +- + .../media/v4l/subdev-image-processing-full.svg | 11 +- + ...ubdev-image-processing-scaling-multi-source.svg | 11 +- + .../userspace-api/media/v4l/tch-formats.rst | 9 +- + Documentation/userspace-api/media/v4l/tuner.rst | 9 +- + .../userspace-api/media/v4l/user-func.rst | 9 +- + Documentation/userspace-api/media/v4l/userp.rst | 9 +- + .../media/v4l/v4l2-selection-flags.rst | 9 +- + .../media/v4l/v4l2-selection-targets.rst | 9 +- + Documentation/userspace-api/media/v4l/v4l2.rst | 11 +- + .../userspace-api/media/v4l/v4l2grab-example.rst | 9 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 9 +- + Documentation/userspace-api/media/v4l/vbi_525.svg | 11 +- + Documentation/userspace-api/media/v4l/vbi_625.svg | 11 +- + .../userspace-api/media/v4l/vbi_hsync.svg | 11 +- + Documentation/userspace-api/media/v4l/video.rst | 9 +- + Documentation/userspace-api/media/v4l/videodev.rst | 9 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 9 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 9 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 9 +- + .../media/v4l/vidioc-dbg-g-register.rst | 9 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 9 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 9 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 44 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 9 +- + .../media/v4l/vidioc-enum-framesizes.rst | 9 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumaudio.rst | 9 +- + .../media/v4l/vidioc-enumaudioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 9 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 9 +- + .../media/v4l/vidioc-g-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-input.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-output.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 9 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-std.rst | 9 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 9 +- + .../userspace-api/media/v4l/vidioc-log-status.rst | 9 +- + .../userspace-api/media/v4l/vidioc-overlay.rst | 9 +- + .../userspace-api/media/v4l/vidioc-prepare-buf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 9 +- + .../media/v4l/vidioc-query-dv-timings.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querybuf.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 9 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 9 +- + .../userspace-api/media/v4l/vidioc-querystd.rst | 9 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 9 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 9 +- + .../userspace-api/media/v4l/vidioc-streamon.rst | 9 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 9 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 60 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 9 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 9 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 9 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 9 +- + .../media/v4l/vidioc-subdev-querycap.rst | 9 +- + .../media/v4l/vidioc-subscribe-event.rst | 9 +- + .../userspace-api/media/v4l/yuv-formats.rst | 9 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 7 +- + Documentation/virt/index.rst | 2 +- + Documentation/virt/kvm/amd-memory-encryption.rst | 6 +- + Documentation/virt/kvm/api.rst | 4 +- + Documentation/virt/kvm/cpuid.rst | 2 +- + Documentation/virt/uml/user_mode_linux.rst | 4403 ------------- + .../virt/uml/user_mode_linux_howto_v2.rst | 1208 ++++ + Documentation/vm/active_mm.rst | 2 +- + Documentation/vm/hmm.rst | 139 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/page_migration.rst | 164 +- + Documentation/watch_queue.rst | 14 +- + Documentation/x86/x86_64/boot-options.rst | 4 + + MAINTAINERS | 98 +- + Makefile | 9 - + arch/Kconfig | 43 + + arch/alpha/include/asm/checksum.h | 5 +- + arch/alpha/kernel/vmlinux.lds.S | 1 + + arch/alpha/lib/csum_partial_copy.c | 164 +- + arch/arc/kernel/kprobes.c | 54 +- + arch/arc/kernel/vmlinux.lds.S | 1 + + arch/arm/Kconfig | 17 +- + arch/arm/Makefile | 4 + + arch/arm/boot/compressed/Makefile | 2 + + arch/arm/boot/compressed/vmlinux.lds.S | 20 +- + arch/arm/boot/dts/r8a7742.dtsi | 48 + + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 36 - + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 67 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 512 -- + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 984 +-- + arch/arm/crypto/aes-neonbs-core.S | 54 +- + arch/arm/crypto/aes-neonbs-glue.c | 58 +- + arch/arm/crypto/curve25519-glue.c | 1 + + arch/arm/crypto/poly1305-glue.c | 1 + + arch/arm/crypto/sha256-armv4.pl | 4 +- + arch/arm/crypto/sha256-core.S_shipped | 4 +- + arch/arm/crypto/sha512-armv4.pl | 4 +- + arch/arm/crypto/sha512-core.S_shipped | 4 +- + arch/arm/include/asm/checksum.h | 17 +- + arch/arm/include/asm/efi.h | 23 +- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/include/asm/topology.h | 5 + + arch/arm/{kernel => include/asm}/vmlinux.lds.h | 30 +- + arch/arm/include/asm/xen/page.h | 5 + + arch/arm/kernel/setup.c | 18 +- + arch/arm/kernel/topology.c | 26 - + arch/arm/kernel/vmlinux-xip.lds.S | 8 +- + arch/arm/kernel/vmlinux.lds.S | 8 +- + arch/arm/lib/csumpartialcopy.S | 4 +- + arch/arm/lib/csumpartialcopygeneric.S | 1 + + arch/arm/lib/csumpartialcopyuser.S | 26 +- + arch/arm/mm/init.c | 59 +- + arch/arm/mm/mmu.c | 39 +- + arch/arm/mm/pmsa-v7.c | 23 +- + arch/arm/mm/pmsa-v8.c | 17 +- + arch/arm/probes/kprobes/core.c | 78 +- + arch/arm/xen/enlighten.c | 6 +- + arch/arm/xen/mm.c | 7 +- + arch/arm64/Kconfig | 15 - + arch/arm64/Makefile | 9 +- + arch/arm64/crypto/ghash-ce-glue.c | 4 +- + arch/arm64/crypto/sha1-ce-glue.c | 3 + + arch/arm64/crypto/sha2-ce-glue.c | 3 + + arch/arm64/include/asm/barrier.h | 1 + + arch/arm64/include/asm/compat.h | 2 - + arch/arm64/include/asm/efi.h | 5 +- + arch/arm64/include/asm/io.h | 1 + + arch/arm64/include/asm/topology.h | 2 + + arch/arm64/include/asm/unistd32.h | 12 +- + arch/arm64/include/asm/xen/page.h | 6 + + arch/arm64/kernel/machine_kexec_file.c | 6 +- + arch/arm64/kernel/probes/kprobes.c | 78 +- + arch/arm64/kernel/setup.c | 4 +- + arch/arm64/kernel/smccc-call.S | 2 - + arch/arm64/kernel/topology.c | 9 +- + arch/arm64/kernel/vdso/Makefile | 7 - + arch/arm64/kernel/vmlinux.lds.S | 28 +- + arch/arm64/mm/init.c | 11 +- + arch/arm64/mm/kasan_init.c | 10 +- + arch/arm64/mm/mmu.c | 13 +- + arch/arm64/mm/numa.c | 15 +- + arch/c6x/include/asm/checksum.h | 3 + + arch/c6x/kernel/setup.c | 9 +- + arch/c6x/lib/csum_64plus.S | 4 +- + arch/csky/Kconfig | 13 - + arch/csky/kernel/probes/kprobes.c | 77 +- + arch/csky/kernel/vmlinux.lds.S | 1 + + arch/h8300/kernel/process.c | 2 +- + arch/h8300/kernel/setup.c | 8 +- + arch/hexagon/include/asm/checksum.h | 11 - + arch/hexagon/kernel/vmlinux.lds.S | 1 + + arch/hexagon/lib/checksum.c | 11 - + arch/ia64/Kconfig | 9 - + arch/ia64/configs/bigsur_defconfig | 8 +- + arch/ia64/configs/generic_defconfig | 10 +- + arch/ia64/configs/gensparse_defconfig | 10 +- + arch/ia64/configs/tiger_defconfig | 10 +- + arch/ia64/configs/zx1_defconfig | 8 +- + arch/ia64/include/asm/checksum.h | 3 - + arch/ia64/include/asm/processor.h | 10 - + arch/ia64/include/asm/switch_to.h | 10 +- + arch/ia64/kernel/Makefile | 3 +- + arch/ia64/kernel/irq_ia64.c | 7 - + arch/ia64/kernel/kprobes.c | 77 +- + arch/ia64/kernel/perfmon.c | 6703 -------------------- + arch/ia64/kernel/process.c | 57 +- + arch/ia64/kernel/ptrace.c | 24 - + arch/ia64/kernel/smpboot.c | 8 - + arch/ia64/kernel/syscalls/syscall.tbl | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 1 + + arch/ia64/lib/Makefile | 1 - + arch/ia64/lib/carta_random.S | 55 - + arch/ia64/lib/csum_partial_copy.c | 15 - + arch/ia64/oprofile/Makefile | 1 - + arch/ia64/oprofile/init.c | 12 +- + arch/ia64/oprofile/perfmon.c | 99 - + arch/m68k/include/asm/checksum.h | 7 +- + arch/m68k/kernel/process.c | 10 +- + arch/m68k/lib/checksum.c | 88 +- + arch/microblaze/Kconfig | 18 +- + arch/microblaze/mm/init.c | 21 +- + arch/mips/Kconfig | 17 - + arch/mips/cavium-octeon/dma-octeon.c | 14 +- + arch/mips/include/asm/checksum.h | 68 +- + arch/mips/include/asm/compat.h | 2 - + arch/mips/kernel/kprobes.c | 54 +- + arch/mips/kernel/setup.c | 31 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 12 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 12 +- + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lib/csum_partial.S | 261 +- + arch/mips/netlogic/xlp/setup.c | 2 +- + arch/nds32/kernel/setup.c | 8 +- + arch/nds32/kernel/vmlinux.lds.S | 1 + + arch/nios2/include/asm/checksum.h | 4 - + arch/nios2/kernel/process.c | 2 +- + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/kernel/setup.c | 9 +- + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/openrisc/mm/init.c | 8 +- + arch/parisc/Kconfig | 16 - + arch/parisc/boot/compressed/vmlinux.lds.S | 1 + + arch/parisc/include/asm/checksum.h | 28 - + arch/parisc/include/asm/compat.h | 2 - + arch/parisc/kernel/kprobes.c | 76 +- + arch/parisc/kernel/syscalls/syscall.tbl | 12 +- + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/lib/checksum.c | 17 - + arch/powerpc/Kconfig | 17 - + arch/powerpc/crypto/crc-vpmsum_test.c | 6 +- + arch/powerpc/include/asm/checksum.h | 13 +- + arch/powerpc/include/asm/compat.h | 2 - + arch/powerpc/kernel/fadump.c | 57 +- + arch/powerpc/kernel/kprobes.c | 53 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 12 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kexec/file_load_64.c | 16 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 12 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 14 +- + arch/powerpc/lib/checksum_32.S | 74 +- + arch/powerpc/lib/checksum_64.S | 37 +- + arch/powerpc/lib/checksum_wrappers.c | 74 +- + arch/powerpc/mm/book3s64/hash_utils.c | 16 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 10 +- + arch/powerpc/mm/kasan/kasan_init_32.c | 8 +- + arch/powerpc/mm/mem.c | 33 +- + arch/powerpc/mm/numa.c | 7 +- + arch/powerpc/mm/pgtable_32.c | 8 +- + arch/riscv/Kconfig | 13 - + arch/riscv/kernel/vmlinux.lds.S | 1 + + arch/riscv/mm/init.c | 36 +- + arch/riscv/mm/kasan_init.c | 10 +- + arch/s390/Kconfig | 17 - + arch/s390/include/asm/checksum.h | 7 - + arch/s390/include/asm/compat.h | 2 - + arch/s390/kernel/kprobes.c | 79 +- + arch/s390/kernel/setup.c | 27 +- + arch/s390/kernel/syscalls/syscall.tbl | 12 +- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/mm/page-states.c | 6 +- + arch/s390/mm/vmem.c | 7 +- + arch/sh/Kconfig | 16 - + arch/sh/include/asm/checksum_32.h | 36 +- + arch/sh/kernel/kprobes.c | 58 +- + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sh/lib/checksum.S | 119 +- + arch/sh/mm/init.c | 9 +- + arch/sparc/Kconfig | 18 +- + arch/sparc/include/asm/checksum.h | 2 + + arch/sparc/include/asm/checksum_32.h | 70 +- + arch/sparc/include/asm/checksum_64.h | 39 +- + arch/sparc/include/asm/compat.h | 3 +- + arch/sparc/kernel/kprobes.c | 51 +- + arch/sparc/kernel/process.c | 6 +- + arch/sparc/kernel/syscalls/syscall.tbl | 12 +- + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/sparc/lib/checksum_32.S | 202 +- + arch/sparc/lib/csum_copy.S | 3 +- + arch/sparc/lib/csum_copy_from_user.S | 4 +- + arch/sparc/lib/csum_copy_to_user.S | 4 +- + arch/sparc/mm/fault_32.c | 6 +- + arch/sparc/mm/init_64.c | 12 +- + arch/um/Kconfig | 16 - + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/Kconfig | 21 +- + arch/x86/Makefile | 4 + + arch/x86/boot/compressed/Makefile | 52 +- + arch/x86/boot/compressed/cpuflags.c | 4 - + arch/x86/boot/compressed/head_32.S | 99 +- + arch/x86/boot/compressed/head_64.S | 198 +- + arch/x86/boot/compressed/ident_map_64.c | 349 + + arch/x86/boot/compressed/idt_64.c | 54 + + arch/x86/boot/compressed/idt_handlers_64.S | 77 + + arch/x86/boot/compressed/kaslr.c | 266 +- + arch/x86/boot/compressed/kaslr_64.c | 153 - + arch/x86/boot/compressed/misc.c | 7 + + arch/x86/boot/compressed/misc.h | 54 +- + arch/x86/boot/compressed/mkpiggy.c | 6 + + arch/x86/boot/compressed/pgtable_64.c | 9 - + arch/x86/boot/compressed/sev-es.c | 214 + + arch/x86/boot/compressed/vmlinux.lds.S | 50 +- + arch/x86/boot/setup.ld | 2 +- + arch/x86/boot/tools/build.c | 4 - + arch/x86/crypto/blake2s-glue.c | 1 + + arch/x86/crypto/chacha_glue.c | 1 + + arch/x86/crypto/crc32c-intel_glue.c | 18 +- + arch/x86/crypto/curve25519-x86_64.c | 69 +- + arch/x86/crypto/nhpoly1305-avx2-glue.c | 1 + + arch/x86/crypto/nhpoly1305-sse2-glue.c | 1 + + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 8 +- + arch/x86/crypto/poly1305_glue.c | 4 +- + arch/x86/entry/entry_64.S | 84 +- + arch/x86/entry/syscall_x32.c | 5 + + arch/x86/entry/syscalls/syscall_32.tbl | 14 +- + arch/x86/entry/syscalls/syscall_64.tbl | 10 +- + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + + arch/x86/events/amd/ibs.c | 93 +- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/amd/uncore.c | 186 +- + arch/x86/events/core.c | 225 +- + arch/x86/events/intel/core.c | 364 +- + arch/x86/events/intel/ds.c | 32 +- + arch/x86/events/intel/uncore.c | 275 +- + arch/x86/events/intel/uncore.h | 2 + + arch/x86/events/intel/uncore_snb.c | 45 +- + arch/x86/events/intel/uncore_snbep.c | 72 +- + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 54 +- + arch/x86/events/rapl.c | 1 + + arch/x86/hyperv/hv_init.c | 8 +- + arch/x86/hyperv/hv_spinlock.c | 2 +- + arch/x86/include/asm/asm.h | 6 +- + arch/x86/include/asm/checksum.h | 1 + + arch/x86/include/asm/checksum_32.h | 40 +- + arch/x86/include/asm/checksum_64.h | 14 +- + arch/x86/include/asm/compat.h | 3 +- + arch/x86/include/asm/cpu_entry_area.h | 33 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/desc.h | 27 + + arch/x86/include/asm/desc_defs.h | 10 + + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu/internal.h | 30 +- + arch/x86/include/asm/fpu/xcr.h | 34 + + arch/x86/include/asm/hyperv-tlfs.h | 33 - + arch/x86/include/asm/idtentry.h | 54 +- + arch/x86/include/asm/insn-eval.h | 6 + + arch/x86/include/asm/mem_encrypt.h | 5 + + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/nospec-branch.h | 2 +- + arch/x86/include/asm/numa.h | 10 +- + arch/x86/include/asm/orc_types.h | 34 - + arch/x86/include/asm/page_64_types.h | 1 + + arch/x86/include/asm/paravirt.h | 151 +- + arch/x86/include/asm/paravirt_types.h | 23 - + arch/x86/include/asm/perf_event.h | 98 +- + arch/x86/include/asm/pgtable-3level_types.h | 5 - + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/pgtable_64_types.h | 2 - + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/proto.h | 1 + + arch/x86/include/asm/realmode.h | 7 + + arch/x86/include/asm/required-features.h | 2 +- + arch/x86/include/asm/segment.h | 6 +- + arch/x86/include/asm/setup.h | 6 +- + arch/x86/include/asm/sev-es.h | 114 + + arch/x86/include/asm/special_insns.h | 28 +- + arch/x86/include/asm/stacktrace.h | 2 + + arch/x86/include/asm/static_call.h | 40 + + arch/x86/include/asm/svm.h | 106 +- + arch/x86/include/asm/text-patching.h | 19 + + arch/x86/include/asm/trap_pf.h | 24 + + arch/x86/include/asm/trapnr.h | 1 + + arch/x86/include/asm/traps.h | 20 +- + arch/x86/include/asm/uaccess.h | 309 +- + arch/x86/include/asm/unwind_hints.h | 56 +- + arch/x86/include/asm/x86_init.h | 16 +- + arch/x86/include/uapi/asm/svm.h | 11 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/alternative.c | 5 + + arch/x86/kernel/cpu/amd.c | 3 +- + arch/x86/kernel/cpu/common.c | 37 +- + arch/x86/kernel/cpu/mshyperv.c | 8 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/vmware.c | 50 +- + arch/x86/kernel/dumpstack.c | 7 +- + arch/x86/kernel/dumpstack_64.c | 46 +- + arch/x86/kernel/e820.c | 16 +- + arch/x86/kernel/head64.c | 122 +- + arch/x86/kernel/head_64.S | 165 +- + arch/x86/kernel/idt.c | 41 +- + arch/x86/kernel/kprobes/core.c | 111 +- + arch/x86/kernel/kprobes/opt.c | 7 +- + arch/x86/kernel/kvm.c | 35 +- + arch/x86/kernel/nmi.c | 15 + + arch/x86/kernel/paravirt.c | 19 - + arch/x86/kernel/paravirt_patch.c | 17 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 60 +- + arch/x86/kernel/sev-es-shared.c | 507 ++ + arch/x86/kernel/sev-es.c | 1404 ++++ + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/static_call.c | 98 + + arch/x86/kernel/sys_ia32.c | 2 +- + arch/x86/kernel/traps.c | 50 +- + arch/x86/kernel/tsc.c | 10 +- + arch/x86/kernel/umip.c | 49 +- + arch/x86/kernel/unwind_orc.c | 11 +- + arch/x86/kernel/vmlinux.lds.S | 40 +- + arch/x86/kvm/hyperv.c | 20 +- + arch/x86/kvm/svm/nested.c | 47 +- + arch/x86/kvm/svm/svm.c | 4 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/lib/checksum_32.S | 117 +- + arch/x86/lib/csum-copy_64.S | 140 +- + arch/x86/lib/csum-wrappers_64.c | 86 +- + arch/x86/lib/getuser.S | 60 + + arch/x86/lib/insn-eval.c | 130 + + arch/x86/lib/putuser.S | 22 +- + arch/x86/mm/cpu_entry_area.c | 3 +- + arch/x86/mm/extable.c | 1 + + arch/x86/mm/init_64.c | 20 +- + arch/x86/mm/mem_encrypt.c | 38 +- + arch/x86/mm/mem_encrypt_identity.c | 3 + + arch/x86/mm/numa.c | 34 +- + arch/x86/mm/numa_emulation.c | 3 +- + arch/x86/pci/sta2x11-fixup.c | 1 - + arch/x86/platform/efi/efi.c | 3 + + arch/x86/platform/efi/efi_64.c | 10 + + arch/x86/platform/uv/uv_nmi.c | 3 - + arch/x86/realmode/init.c | 24 +- + arch/x86/realmode/rm/header.S | 3 + + arch/x86/realmode/rm/trampoline_64.S | 20 + + arch/x86/tools/gen-insn-attr-x86.awk | 50 +- + arch/x86/um/asm/checksum.h | 16 - + arch/x86/um/asm/checksum_32.h | 23 - + arch/x86/xen/enlighten_pv.c | 19 +- + arch/x86/xen/mmu_pv.c | 10 +- + arch/xtensa/Kconfig | 14 - + arch/xtensa/include/asm/checksum.h | 34 +- + arch/xtensa/lib/checksum.S | 67 +- + arch/xtensa/mm/init.c | 55 +- + block/Kconfig | 2 - + block/bfq-iosched.c | 9 +- + block/bio.c | 20 +- + block/blk-cgroup.c | 32 +- + block/blk-core.c | 260 +- + block/blk-crypto-internal.h | 21 +- + block/blk-crypto.c | 33 +- + block/blk-integrity.c | 6 +- + block/blk-iocost.c | 1623 +++-- + block/blk-iolatency.c | 2 +- + block/blk-lib.c | 2 +- + block/blk-map.c | 177 +- + block/blk-merge.c | 245 +- + block/blk-mq-debugfs.c | 11 +- + block/blk-mq-sched.c | 156 +- + block/blk-mq-sched.h | 3 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 156 +- + block/blk-mq-tag.h | 56 +- + block/blk-mq.c | 101 +- + block/blk-mq.h | 76 +- + block/blk-settings.c | 40 +- + block/blk-sysfs.c | 291 +- + block/blk-throttle.c | 128 +- + block/blk.h | 29 +- + block/bounce.c | 19 +- + block/bsg-lib.c | 2 +- + block/elevator.c | 23 +- + block/genhd.c | 160 +- + block/ioctl.c | 33 +- + block/ioprio.c | 2 +- + block/kyber-iosched.c | 6 +- + block/mq-deadline.c | 6 + + block/partitions/core.c | 29 +- + block/scsi_ioctl.c | 22 +- + crypto/Kconfig | 40 + + crypto/Makefile | 8 + + crypto/af_alg.c | 14 +- + crypto/ahash.c | 54 +- + crypto/algif_aead.c | 9 +- + crypto/algif_rng.c | 175 +- + crypto/algif_skcipher.c | 2 +- + crypto/arc4.c | 11 + + crypto/asymmetric_keys/public_key.c | 63 + + crypto/asymmetric_keys/x509_cert_parser.c | 27 +- + crypto/asymmetric_keys/x509_public_key.c | 3 + + crypto/async_tx/async_pq.c | 72 +- + crypto/async_tx/async_raid6_recov.c | 163 +- + crypto/async_tx/async_xor.c | 120 +- + crypto/async_tx/raid6test.c | 24 +- + crypto/cbc.c | 144 +- + crypto/crc32c_generic.c | 4 +- + crypto/crct10dif_generic.c | 2 +- + crypto/crypto_engine.c | 3 +- + crypto/ecrdsa.c | 1 + + crypto/internal.h | 16 +- + crypto/jitterentropy-kcapi.c | 2 +- + crypto/proc.c | 4 +- + crypto/rsa-pkcs1pad.c | 1 + + crypto/sm2.c | 481 ++ + crypto/sm2signature.asn1 | 4 + + crypto/sm3_generic.c | 7 +- + crypto/tcrypt.c | 18 +- + crypto/tcrypt.h | 29 - + crypto/testmgr.c | 25 +- + crypto/testmgr.h | 59 + + crypto/xor.c | 69 +- + drivers/acpi/Kconfig | 65 +- + drivers/acpi/Makefile | 10 +- + drivers/acpi/acpi_apd.c | 32 +- + drivers/acpi/acpi_cmos_rtc.c | 2 - + drivers/acpi/acpi_configfs.c | 1 + + drivers/acpi/acpi_extlog.c | 6 +- + drivers/acpi/acpi_lpss.c | 2 - + drivers/acpi/acpi_memhotplug.c | 19 +- + drivers/acpi/acpi_platform.c | 2 - + drivers/acpi/acpi_pnp.c | 2 + + drivers/acpi/acpi_processor.c | 34 +- + drivers/acpi/acpica/acdebug.h | 4 + + drivers/acpi/acpica/acglobal.h | 6 + + drivers/acpi/acpica/achware.h | 6 + + drivers/acpi/acpica/aclocal.h | 11 +- + drivers/acpi/acpica/acpredef.h | 33 +- + drivers/acpi/acpica/dbexec.c | 39 +- + drivers/acpi/acpica/dbinput.c | 14 +- + drivers/acpi/acpica/dbmethod.c | 167 +- + drivers/acpi/acpica/evgpe.c | 4 +- + drivers/acpi/acpica/evgpeblk.c | 27 +- + drivers/acpi/acpica/evgpeinit.c | 23 +- + drivers/acpi/acpica/hwgpe.c | 102 +- + drivers/acpi/acpica/hwvalid.c | 30 + + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 4 +- + drivers/acpi/acpica/nsxfobj.c | 3 +- + drivers/acpi/acpica/psparse.c | 4 +- + drivers/acpi/acpica/utpredef.c | 5 +- + drivers/acpi/acpica/utstrsuppt.c | 33 +- + drivers/acpi/apei/apei-base.c | 6 +- + drivers/acpi/arm64/iort.c | 2 +- + drivers/acpi/bus.c | 4 + + drivers/acpi/button.c | 13 +- + drivers/acpi/container.c | 3 - + drivers/acpi/custom_method.c | 2 - + drivers/acpi/debugfs.c | 3 - + drivers/acpi/dock.c | 2 - + drivers/acpi/dptf/Kconfig | 14 + + drivers/acpi/dptf/Makefile | 1 + + drivers/acpi/dptf/dptf_pch_fivr.c | 126 + + drivers/acpi/dptf/int340x_thermal.c | 1 + + drivers/acpi/ec.c | 10 +- + drivers/acpi/event.c | 3 - + drivers/acpi/nfit/core.c | 10 +- + drivers/acpi/numa/hmat.c | 167 +- + drivers/acpi/numa/srat.c | 82 +- + drivers/acpi/osl.c | 30 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pci_slot.c | 3 - + drivers/acpi/pmic/Kconfig | 67 + + drivers/acpi/pmic/Makefile | 10 + + drivers/acpi/proc.c | 4 - + drivers/acpi/processor_core.c | 3 - + drivers/acpi/processor_thermal.c | 2 - + drivers/acpi/scan.c | 3 +- + drivers/acpi/tiny-power-button.c | 1 - + drivers/acpi/video_detect.c | 12 +- + drivers/acpi/wakeup.c | 2 - + drivers/ata/ahci.c | 4 + + drivers/ata/ahci.h | 2 + + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_qoriq.c | 20 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/sata_highbank.c | 7 +- + drivers/base/arch_topology.c | 15 +- + drivers/base/core.c | 48 +- + drivers/base/node.c | 3 + + drivers/base/power/domain.c | 71 +- + drivers/base/power/runtime.c | 5 +- + drivers/base/regmap/Kconfig | 6 +- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/internal.h | 3 + + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/regmap/regmap-irq.c | 33 +- + drivers/base/regmap/regmap-sdw.c | 1 - + drivers/base/regmap/regmap-spi-avmm.c | 719 +++ + drivers/base/regmap/regmap.c | 145 +- + drivers/block/amiflop.c | 2 +- + drivers/block/aoe/aoeblk.c | 3 +- + drivers/block/aoe/aoecmd.c | 4 +- + drivers/block/ataflop.c | 7 +- + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_int.h | 1 - + drivers/block/drbd/drbd_main.c | 31 +- + drivers/block/drbd/drbd_nl.c | 26 +- + drivers/block/drbd/drbd_receiver.c | 12 +- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_worker.c | 6 +- + drivers/block/floppy.c | 8 +- + drivers/block/loop.c | 4 +- + drivers/block/nbd.c | 15 +- + drivers/block/null_blk.h | 5 + + drivers/block/null_blk_main.c | 22 +- + drivers/block/null_blk_zoned.c | 319 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/pktcdvd.c | 94 +- + drivers/block/rbd.c | 4 +- + drivers/block/rnbd/rnbd-clt.c | 12 +- + drivers/block/rsxx/core.c | 2 +- + drivers/block/swim.c | 22 +- + drivers/block/swim3.c | 4 +- + drivers/block/virtio_blk.c | 4 +- + drivers/block/xsysace.c | 26 +- + drivers/block/zram/zram_drv.c | 30 +- + drivers/bus/mvebu-mbus.c | 12 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/char/hw_random/Kconfig | 24 + + drivers/char/hw_random/Makefile | 2 + + drivers/char/hw_random/cctrng.c | 9 +- + drivers/char/hw_random/imx-rngc.c | 1 + + drivers/char/hw_random/ingenic-trng.c | 161 + + drivers/char/hw_random/intel-rng.c | 2 +- + drivers/char/hw_random/iproc-rng200.c | 8 +- + drivers/char/hw_random/mxc-rnga.c | 6 +- + drivers/char/hw_random/npcm-rng.c | 14 +- + drivers/char/hw_random/optee-rng.c | 6 +- + drivers/char/hw_random/stm32-rng.c | 8 +- + drivers/char/hw_random/xiphera-trng.c | 150 + + drivers/char/raw.c | 56 +- + drivers/clocksource/hyperv_timer.c | 4 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/armada-37xx-cpufreq.c | 6 + + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq-dt.c | 296 +- + drivers/cpufreq/cpufreq.c | 45 +- + drivers/cpufreq/cpufreq_stats.c | 105 +- + drivers/cpufreq/imx6q-cpufreq.c | 10 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 144 +- + drivers/cpufreq/s5pv210-cpufreq.c | 31 +- + drivers/cpufreq/scmi-cpufreq.c | 12 +- + drivers/cpufreq/scpi-cpufreq.c | 6 +- + drivers/cpufreq/sti-cpufreq.c | 6 +- + drivers/cpufreq/tegra186-cpufreq.c | 30 + + drivers/cpufreq/vexpress-spc-cpufreq.c | 12 +- + drivers/cpuidle/cpuidle-psci-domain.c | 59 +- + drivers/cpuidle/cpuidle-tegra.c | 34 +- + drivers/cpuidle/cpuidle.c | 1 + + drivers/cpuidle/sysfs.c | 3 + + drivers/crypto/Kconfig | 1 + + drivers/crypto/allwinner/Kconfig | 43 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c | 17 +- + drivers/crypto/allwinner/sun8i-ce/Makefile | 3 + + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 131 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 405 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 413 ++ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 164 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 127 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 139 +- + drivers/crypto/allwinner/sun8i-ss/Makefile | 2 + + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 16 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 229 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 444 ++ + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 173 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 89 +- + drivers/crypto/amcc/crypto4xx_alg.c | 2 +- + drivers/crypto/amcc/crypto4xx_core.h | 1 + + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 12 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 16 +- + drivers/crypto/atmel-aes.c | 2 +- + drivers/crypto/atmel-tdes.c | 2 +- + drivers/crypto/bcm/cipher.c | 111 +- + drivers/crypto/bcm/cipher.h | 1 - + drivers/crypto/bcm/spu.c | 23 +- + drivers/crypto/bcm/spu.h | 1 - + drivers/crypto/bcm/spu2.c | 12 +- + drivers/crypto/bcm/spu2.h | 1 - + drivers/crypto/caam/Kconfig | 3 + + drivers/crypto/caam/Makefile | 2 + + drivers/crypto/caam/caamalg.c | 94 +- + drivers/crypto/caam/caamalg_desc.c | 28 +- + drivers/crypto/caam/caamalg_qi.c | 94 +- + drivers/crypto/caam/caamalg_qi2.c | 118 +- + drivers/crypto/caam/caamalg_qi2.h | 2 + + drivers/crypto/caam/ctrl.c | 88 +- + drivers/crypto/caam/debugfs.c | 96 + + drivers/crypto/caam/debugfs.h | 26 + + drivers/crypto/caam/dpseci-debugfs.c | 23 +- + drivers/crypto/caam/intern.h | 17 - + drivers/crypto/caam/jr.c | 10 +- + drivers/crypto/caam/qi.c | 20 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 8 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 + + drivers/crypto/cavium/zip/zip_main.c | 44 +- + drivers/crypto/ccp/ccp-ops.c | 3 +- + drivers/crypto/ccree/cc_cipher.c | 282 +- + drivers/crypto/ccree/cc_crypto_ctx.h | 1 - + drivers/crypto/ccree/cc_driver.c | 7 +- + drivers/crypto/ccree/cc_driver.h | 1 - + drivers/crypto/ccree/cc_pm.c | 6 +- + drivers/crypto/chelsio/chcr_core.c | 2 +- + drivers/crypto/hifn_795x.c | 28 +- + drivers/crypto/hisilicon/hpre/hpre.h | 1 - + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 59 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 33 +- + drivers/crypto/hisilicon/qm.c | 237 +- + drivers/crypto/hisilicon/qm.h | 31 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 51 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 39 +- + drivers/crypto/hisilicon/zip/zip.h | 15 - + drivers/crypto/hisilicon/zip/zip_crypto.c | 140 +- + drivers/crypto/hisilicon/zip/zip_main.c | 195 +- + drivers/crypto/img-hash.c | 1 + + drivers/crypto/inside-secure/safexcel.c | 44 +- + drivers/crypto/inside-secure/safexcel.h | 28 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 90 +- + drivers/crypto/inside-secure/safexcel_hash.c | 153 +- + drivers/crypto/inside-secure/safexcel_ring.c | 9 +- + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/crypto/marvell/cesa/cesa.c | 4 +- + drivers/crypto/marvell/cesa/cesa.h | 20 +- + drivers/crypto/marvell/cesa/cipher.c | 5 +- + drivers/crypto/marvell/cesa/hash.c | 24 +- + drivers/crypto/marvell/cesa/tdma.c | 16 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 8 +- + drivers/crypto/mediatek/mtk-aes.c | 57 +- + drivers/crypto/mediatek/mtk-platform.c | 16 +- + drivers/crypto/mediatek/mtk-sha.c | 2 +- + drivers/crypto/n2_core.c | 60 +- + drivers/crypto/omap-sham.c | 189 +- + drivers/crypto/padlock-aes.c | 1 + + drivers/crypto/picoxcell_crypto.c | 9 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 19 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 17 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 19 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 17 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 6 - + drivers/crypto/qat/qat_common/adf_aer.c | 6 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 19 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 - + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 6 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 42 +- + drivers/crypto/qat/qat_common/qat_algs.c | 10 +- + drivers/crypto/qat/qat_common/qat_hal.c | 7 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 9 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 19 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 17 +- + drivers/crypto/qce/core.c | 1 + + drivers/crypto/qce/sha.c | 1 + + drivers/crypto/qce/skcipher.c | 1 + + drivers/crypto/qcom-rng.c | 1 + + drivers/crypto/rockchip/rk3288_crypto.c | 1 + + drivers/crypto/rockchip/rk3288_crypto.h | 1 + + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 1 + + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 1 + + drivers/crypto/s5p-sss.c | 28 +- + drivers/crypto/sa2ul.c | 235 +- + drivers/crypto/sahara.c | 2 +- + drivers/crypto/stm32/Kconfig | 1 + + drivers/crypto/stm32/stm32-crc32.c | 22 +- + drivers/crypto/stm32/stm32-cryp.c | 47 +- + drivers/crypto/stm32/stm32-hash.c | 16 +- + drivers/crypto/talitos.c | 8 +- + drivers/crypto/ux500/cryp/cryp_core.c | 28 +- + drivers/crypto/ux500/hash/hash_core.c | 31 +- + drivers/crypto/virtio/Kconfig | 1 - + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1 + + drivers/dax/Kconfig | 6 + + drivers/dax/Makefile | 3 +- + drivers/dax/bus.c | 1049 ++- + drivers/dax/bus.h | 28 +- + drivers/dax/dax-private.h | 60 +- + drivers/dax/device.c | 138 +- + drivers/dax/hmem/Makefile | 6 + + drivers/dax/hmem/device.c | 100 + + drivers/dax/{ => hmem}/hmem.c | 23 +- + drivers/dax/kmem.c | 178 +- + drivers/dax/pmem/compat.c | 2 +- + drivers/dax/pmem/core.c | 22 +- + drivers/devfreq/devfreq-event.c | 14 +- + drivers/devfreq/devfreq.c | 57 +- + drivers/devfreq/exynos-bus.c | 7 +- + drivers/devfreq/rk3399_dmc.c | 2 +- + drivers/devfreq/tegra30-devfreq.c | 8 +- + drivers/edac/ghes_edac.c | 17 +- + drivers/firmware/efi/Kconfig | 18 +- + drivers/firmware/efi/Makefile | 3 +- + drivers/firmware/efi/cper.c | 18 +- + drivers/firmware/efi/{arm-init.c => efi-init.c} | 1 + + drivers/firmware/efi/efi-pstore.c | 83 +- + drivers/firmware/efi/efi.c | 53 +- + drivers/firmware/efi/efivars.c | 45 +- + drivers/firmware/efi/libstub/Makefile | 11 +- + drivers/firmware/efi/libstub/arm32-stub.c | 178 +- + drivers/firmware/efi/libstub/arm64-stub.c | 9 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 101 +- + drivers/firmware/efi/libstub/efi-stub.c | 48 +- + drivers/firmware/efi/libstub/efistub.h | 61 +- + drivers/firmware/efi/libstub/fdt.c | 4 +- + drivers/firmware/efi/libstub/file.c | 5 +- + drivers/firmware/efi/libstub/hidden.h | 6 - + drivers/firmware/efi/libstub/relocate.c | 4 +- + drivers/firmware/efi/libstub/string.c | 1 + + drivers/firmware/efi/libstub/vsprintf.c | 2 +- + drivers/firmware/efi/mokvar-table.c | 359 ++ + drivers/firmware/efi/vars.c | 22 - + drivers/firmware/efi/x86_fake_mem.c | 12 +- + drivers/firmware/google/Kconfig | 2 +- + drivers/firmware/google/gsmi.c | 8 +- + drivers/firmware/psci/psci.c | 12 +- + drivers/firmware/qcom_scm.c | 24 + + drivers/firmware/qcom_scm.h | 1 + + drivers/gpio/Kconfig | 33 +- + drivers/gpio/Makefile | 3 +- + drivers/gpio/gpio-aggregator.c | 70 +- + drivers/gpio/gpio-bcm-kona.c | 5 +- + drivers/gpio/gpio-davinci.c | 8 +- + drivers/gpio/gpio-dwapb.c | 352 +- + drivers/gpio/gpio-mockup.c | 158 +- + drivers/gpio/gpio-mpc8xxx.c | 45 +- + drivers/gpio/gpio-mxc.c | 6 + + drivers/gpio/gpio-omap.c | 5 +- + drivers/gpio/gpio-pca953x.c | 11 +- + drivers/gpio/gpio-pisosr.c | 9 +- + drivers/gpio/gpio-stp-xway.c | 54 +- + drivers/gpio/gpio-tc3589x.c | 18 +- + drivers/gpio/gpio-zynq.c | 8 +- + drivers/gpio/gpiolib-acpi.c | 3 - + drivers/gpio/gpiolib-cdev.c | 1542 ++++- + drivers/gpio/gpiolib-cdev.h | 19 +- + drivers/gpio/gpiolib-devprop.c | 63 - + drivers/gpio/gpiolib-of.c | 5 - + drivers/gpio/gpiolib.c | 89 +- + drivers/gpio/gpiolib.h | 6 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 15 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 3 +- + drivers/gpu/host1x/mipi.c | 22 +- + drivers/hid/hid-hyperv.c | 4 +- + drivers/hid/hid-picolcd_cir.c | 10 +- + drivers/hv/channel.c | 461 +- + drivers/hv/hv.c | 4 +- + drivers/hv/hv_util.c | 11 +- + drivers/hv/vmbus_drv.c | 2 +- + drivers/hwmon/Kconfig | 23 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/ad7414.c | 5 +- + drivers/hwmon/ad7418.c | 9 +- + drivers/hwmon/adc128d818.c | 5 +- + drivers/hwmon/adm1021.c | 9 +- + drivers/hwmon/adm1025.c | 5 +- + drivers/hwmon/adm1026.c | 5 +- + drivers/hwmon/adm1029.c | 5 +- + drivers/hwmon/adm1031.c | 9 +- + drivers/hwmon/adm1177.c | 5 +- + drivers/hwmon/adm9240.c | 356 +- + drivers/hwmon/ads7828.c | 9 +- + drivers/hwmon/adt7410.c | 5 +- + drivers/hwmon/adt7411.c | 5 +- + drivers/hwmon/adt7462.c | 5 +- + drivers/hwmon/adt7470.c | 5 +- + drivers/hwmon/adt7475.c | 6 +- + drivers/hwmon/amc6821.c | 5 +- + drivers/hwmon/amd_energy.c | 164 +- + drivers/hwmon/asb100.c | 8 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/atxp1.c | 5 +- + drivers/hwmon/bt1-pvt.c | 138 +- + drivers/hwmon/bt1-pvt.h | 3 + + drivers/hwmon/dme1737.c | 9 +- + drivers/hwmon/ds1621.c | 9 +- + drivers/hwmon/ds620.c | 5 +- + drivers/hwmon/emc1403.c | 8 +- + drivers/hwmon/emc2103.c | 4 +- + drivers/hwmon/emc6w201.c | 5 +- + drivers/hwmon/f75375s.c | 10 +- + drivers/hwmon/fschmd.c | 10 +- + drivers/hwmon/ftsteutates.c | 4 +- + drivers/hwmon/g760a.c | 5 +- + drivers/hwmon/g762.c | 4 +- + drivers/hwmon/gl518sm.c | 5 +- + drivers/hwmon/gl520sm.c | 5 +- + drivers/hwmon/gsc-hwmon.c | 32 +- + drivers/hwmon/hih6130.c | 5 +- + drivers/hwmon/hwmon.c | 10 + + drivers/hwmon/ina209.c | 5 +- + drivers/hwmon/ina2xx.c | 9 +- + drivers/hwmon/ina3221.c | 5 +- + drivers/hwmon/intel-m10-bmc-hwmon.c | 334 + + drivers/hwmon/jc42.c | 4 +- + drivers/hwmon/k10temp.c | 162 +- + drivers/hwmon/lineage-pem.c | 5 +- + drivers/hwmon/lm63.c | 9 +- + drivers/hwmon/lm73.c | 4 +- + drivers/hwmon/lm75.c | 33 +- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm78.c | 9 +- + drivers/hwmon/lm80.c | 5 +- + drivers/hwmon/lm83.c | 9 +- + drivers/hwmon/lm85.c | 8 +- + drivers/hwmon/lm87.c | 4 +- + drivers/hwmon/lm90.c | 7 +- + drivers/hwmon/lm92.c | 5 +- + drivers/hwmon/lm93.c | 5 +- + drivers/hwmon/lm95234.c | 9 +- + drivers/hwmon/lm95241.c | 5 +- + drivers/hwmon/lm95245.c | 5 +- + drivers/hwmon/ltc2945.c | 5 +- + drivers/hwmon/ltc2947-i2c.c | 5 +- + drivers/hwmon/ltc2990.c | 5 +- + drivers/hwmon/ltc4151.c | 5 +- + drivers/hwmon/ltc4215.c | 5 +- + drivers/hwmon/ltc4222.c | 5 +- + drivers/hwmon/ltc4245.c | 5 +- + drivers/hwmon/ltc4260.c | 5 +- + drivers/hwmon/ltc4261.c | 5 +- + drivers/hwmon/max16065.c | 8 +- + drivers/hwmon/max1619.c | 5 +- + drivers/hwmon/max1668.c | 9 +- + drivers/hwmon/max31730.c | 4 +- + drivers/hwmon/max31790.c | 5 +- + drivers/hwmon/max6621.c | 5 +- + drivers/hwmon/max6639.c | 5 +- + drivers/hwmon/max6642.c | 5 +- + drivers/hwmon/max6650.c | 10 +- + drivers/hwmon/max6697.c | 9 +- + drivers/hwmon/mcp3021.c | 9 +- + drivers/hwmon/mr75203.c | 656 ++ + drivers/hwmon/nct7802.c | 5 +- + drivers/hwmon/nct7904.c | 5 +- + drivers/hwmon/occ/p8_i2c.c | 5 +- + drivers/hwmon/pcf8591.c | 5 +- + drivers/hwmon/pmbus/Kconfig | 20 + + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/adm1266.c | 513 ++ + drivers/hwmon/pmbus/adm1275.c | 11 +- + drivers/hwmon/pmbus/bel-pfe.c | 11 +- + drivers/hwmon/pmbus/ibm-cffps.c | 19 +- + drivers/hwmon/pmbus/inspur-ipsps.c | 7 +- + drivers/hwmon/pmbus/ir35221.c | 7 +- + drivers/hwmon/pmbus/ir38064.c | 7 +- + drivers/hwmon/pmbus/irps5401.c | 7 +- + drivers/hwmon/pmbus/isl68137.c | 11 +- + drivers/hwmon/pmbus/lm25066.c | 11 +- + drivers/hwmon/pmbus/ltc2978.c | 14 +- + drivers/hwmon/pmbus/ltc3815.c | 7 +- + drivers/hwmon/pmbus/max16064.c | 7 +- + drivers/hwmon/pmbus/max16601.c | 7 +- + drivers/hwmon/pmbus/max20730.c | 390 +- + drivers/hwmon/pmbus/max20751.c | 7 +- + drivers/hwmon/pmbus/max31785.c | 9 +- + drivers/hwmon/pmbus/max34440.c | 39 +- + drivers/hwmon/pmbus/max8688.c | 7 +- + drivers/hwmon/pmbus/mp2975.c | 769 +++ + drivers/hwmon/pmbus/pmbus.c | 11 +- + drivers/hwmon/pmbus/pmbus.h | 16 +- + drivers/hwmon/pmbus/pmbus_core.c | 308 +- + drivers/hwmon/pmbus/pxe1610.c | 7 +- + drivers/hwmon/pmbus/tps40422.c | 7 +- + drivers/hwmon/pmbus/tps53679.c | 11 +- + drivers/hwmon/pmbus/ucd9000.c | 13 +- + drivers/hwmon/pmbus/ucd9200.c | 13 +- + drivers/hwmon/pmbus/xdpe12284.c | 7 +- + drivers/hwmon/pmbus/zl6100.c | 11 +- + drivers/hwmon/powr1220.c | 5 +- + drivers/hwmon/pwm-fan.c | 10 +- + drivers/hwmon/scmi-hwmon.c | 6 +- + drivers/hwmon/sht21.c | 5 +- + drivers/hwmon/sht3x.c | 9 +- + drivers/hwmon/shtc1.c | 34 +- + drivers/hwmon/smm665.c | 9 +- + drivers/hwmon/smsc47m192.c | 5 +- + drivers/hwmon/sparx5-temp.c | 2 +- + drivers/hwmon/stts751.c | 5 +- + drivers/hwmon/tc654.c | 5 +- + drivers/hwmon/tc74.c | 5 +- + drivers/hwmon/thmc50.c | 9 +- + drivers/hwmon/tmp102.c | 5 +- + drivers/hwmon/tmp103.c | 5 +- + drivers/hwmon/tmp108.c | 5 +- + drivers/hwmon/tmp401.c | 7 +- + drivers/hwmon/tmp421.c | 7 +- + drivers/hwmon/tmp513.c | 11 +- + drivers/hwmon/w83627ehf.c | 6 +- + drivers/hwmon/w83773g.c | 5 +- + drivers/hwmon/w83781d.c | 9 +- + drivers/hwmon/w83791d.c | 8 +- + drivers/hwmon/w83792d.c | 7 +- + drivers/hwmon/w83793.c | 8 +- + drivers/hwmon/w83795.c | 9 +- + drivers/hwmon/w83l785ts.c | 8 +- + drivers/hwmon/w83l786ng.c | 4 +- + drivers/ide/ide-cd.c | 16 +- + drivers/ide/ide-disk.c | 5 +- + drivers/ide/ide-floppy.c | 2 - + drivers/ide/ide-gd.c | 48 +- + drivers/ide/ide-ioctls.c | 4 +- + drivers/infiniband/sw/rdmavt/mr.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/iommu/Kconfig | 12 +- + drivers/iommu/amd/amd_iommu.h | 9 + + drivers/iommu/amd/amd_iommu_types.h | 6 +- + drivers/iommu/amd/init.c | 48 +- + drivers/iommu/amd/iommu.c | 90 +- + drivers/iommu/arm/arm-smmu-v3/Makefile | 5 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 248 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 843 +-- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 723 +++ + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 102 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 84 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 12 +- + drivers/iommu/dma-iommu.c | 22 +- + drivers/iommu/fsl_pamu.c | 2 +- + drivers/iommu/intel/dmar.c | 50 +- + drivers/iommu/intel/iommu.c | 62 +- + drivers/iommu/intel/svm.c | 13 +- + drivers/iommu/io-pgtable-arm.c | 27 +- + drivers/iommu/io-pgtable-arm.h | 30 + + drivers/iommu/iommu.c | 200 +- + drivers/iommu/iova.c | 2 +- + drivers/iommu/mtk_iommu.c | 49 +- + drivers/iommu/mtk_iommu.h | 1 + + drivers/iommu/sun50i-iommu.c | 15 +- + drivers/iommu/tegra-smmu.c | 138 +- + drivers/irqchip/irq-gic-v3-its.c | 9 +- + drivers/md/bcache/alloc.c | 60 +- + drivers/md/bcache/bcache.h | 29 +- + drivers/md/bcache/btree.c | 146 +- + drivers/md/bcache/btree.h | 2 +- + drivers/md/bcache/closure.c | 16 +- + drivers/md/bcache/debug.c | 10 +- + drivers/md/bcache/extents.c | 6 +- + drivers/md/bcache/features.c | 4 +- + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/journal.c | 246 +- + drivers/md/bcache/movinggc.c | 58 +- + drivers/md/bcache/request.c | 16 +- + drivers/md/bcache/super.c | 249 +- + drivers/md/bcache/sysfs.c | 10 +- + drivers/md/bcache/writeback.c | 2 +- + drivers/md/dm-linear.c | 5 +- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-table.c | 43 +- + drivers/md/dm.c | 26 +- + drivers/md/md-bitmap.c | 16 +- + drivers/md/md-cluster.c | 7 +- + drivers/md/md-linear.c | 2 +- + drivers/md/md.c | 51 +- + drivers/md/md.h | 6 +- + drivers/md/raid0.c | 47 +- + drivers/md/raid10.c | 477 +- + drivers/md/raid10.h | 1 + + drivers/md/raid5.c | 309 +- + drivers/md/raid5.h | 29 +- + drivers/media/cec/core/cec-adap.c | 8 +- + drivers/media/cec/core/cec-core.c | 31 +- + drivers/media/cec/core/cec-pin.c | 6 +- + drivers/media/cec/platform/seco/seco-cec.c | 2 +- + drivers/media/cec/usb/pulse8/pulse8-cec.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/siano/sms-cards.c | 2 +- + drivers/media/common/siano/smsir.c | 4 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 34 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 32 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 53 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 12 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 3 +- + drivers/media/dvb-frontends/lg2160.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mb86a16.c | 7 +- + drivers/media/dvb-frontends/mxl5xx.c | 1 - + drivers/media/dvb-frontends/rtl2832_sdr.c | 1 + + drivers/media/dvb-frontends/tda10021.c | 40 +- + drivers/media/dvb-frontends/tda10086.c | 22 +- + drivers/media/dvb-frontends/tda18271c2dd.c | 41 +- + drivers/media/dvb-frontends/tda18271c2dd_maps.h | 22 +- + drivers/media/dvb-frontends/zd1301_demod.h | 6 - + drivers/media/firewire/firedtv-fw.c | 6 +- + drivers/media/i2c/Kconfig | 2 +- + drivers/media/i2c/adv7180.c | 9 +- + drivers/media/i2c/adv748x/adv748x-core.c | 31 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 31 + + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/dw9807-vcm.c | 2 +- + drivers/media/i2c/imx219.c | 2 +- + drivers/media/i2c/imx258.c | 2 +- + drivers/media/i2c/imx274.c | 8 +- + drivers/media/i2c/m5mols/m5mols_core.c | 3 +- + drivers/media/i2c/max9286.c | 43 +- + drivers/media/i2c/ml86v7667.c | 7 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m001.c | 7 +- + drivers/media/i2c/mt9m111.c | 7 +- + drivers/media/i2c/ov2740.c | 24 +- + drivers/media/i2c/ov5640.c | 340 +- + drivers/media/i2c/ov5675.c | 15 +- + drivers/media/i2c/ov6650.c | 57 +- + drivers/media/i2c/ov7740.c | 10 +- + drivers/media/i2c/ov8856.c | 430 ++ + drivers/media/i2c/ov9640.c | 9 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/s5k5baf.c | 5 +- + drivers/media/i2c/smiapp/smiapp-core.c | 6 +- + drivers/media/i2c/tc358743.c | 21 +- + drivers/media/i2c/tda1997x.c | 16 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/i2c/tvp7002.c | 4 +- + drivers/media/mc/mc-device.c | 7 +- + drivers/media/pci/bt8xx/bttv-driver.c | 15 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 7 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 8 +- + drivers/media/pci/cobalt/cobalt-omnitek.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 11 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx23885/cx23885.h | 4 +- + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 15 +- + drivers/media/pci/cx88/cx88-alsa.c | 19 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-input.c | 4 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/dt3155/dt3155.c | 3 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 159 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 +- + drivers/media/pci/mantis/mantis_dma.c | 4 +- + drivers/media/pci/mantis/mantis_dma.h | 2 +- + drivers/media/pci/mantis/mantis_dvb.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 - + drivers/media/pci/ngene/ngene-core.c | 12 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 11 +- + drivers/media/pci/saa7134/saa7134-cards.c | 4 +- + drivers/media/pci/saa7134/saa7134-core.c | 47 +- + drivers/media/pci/saa7134/saa7134-empress.c | 3 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7134/saa7134-tvaudio.c | 3 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 - + drivers/media/pci/saa7134/saa7134.h | 2 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 8 +- + drivers/media/pci/saa7164/saa7164-core.c | 12 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 7 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 6 +- + drivers/media/pci/smipcie/smipcie-ir.c | 7 +- + drivers/media/pci/smipcie/smipcie-main.c | 6 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-i2c.c | 2 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 6 +- + drivers/media/pci/ttpci/av7110.c | 20 +- + drivers/media/pci/ttpci/av7110_v4l.c | 4 +- + drivers/media/pci/ttpci/budget-ci.c | 15 +- + drivers/media/pci/ttpci/budget-core.c | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 19 +- + drivers/media/platform/Kconfig | 9 +- + drivers/media/platform/aspeed-video.c | 5 +- + drivers/media/platform/coda/coda-bit.c | 4 +- + drivers/media/platform/coda/coda-common.c | 17 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 27 +- + drivers/media/platform/exynos4-is/fimc-core.c | 67 +- + drivers/media/platform/exynos4-is/fimc-core.h | 5 - + drivers/media/platform/exynos4-is/fimc-is.c | 17 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 4 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 9 +- + drivers/media/platform/exynos4-is/media-dev.c | 89 +- + drivers/media/platform/exynos4-is/media-dev.h | 11 - + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 10 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 40 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 133 +- + drivers/media/platform/mtk-jpeg/Makefile | 5 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 930 ++- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 106 +- + .../mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +- + .../mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 12 +- + .../{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +- + .../{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +- + .../{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 19 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 154 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 + + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 2 +- + drivers/media/platform/mtk-vcodec/Makefile | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 11 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 62 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 1 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 40 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 211 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 180 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 2 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c | 231 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h | 38 + + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 3 +- + drivers/media/platform/mtk-vcodec/vdec_drv_base.h | 2 - + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 1 - + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 12 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 11 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 68 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 11 +- + drivers/media/platform/mtk-vcodec/venc_drv_if.c | 1 - + drivers/media/platform/mtk-vcodec/venc_drv_if.h | 13 + + drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 27 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 141 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 8 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 - + drivers/media/platform/mx2_emmaprp.c | 7 +- + drivers/media/platform/omap3isp/isp.c | 8 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/pxa_camera.c | 195 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 8 - + drivers/media/platform/qcom/camss/camss-vfe.h | 2 - + drivers/media/platform/qcom/camss/camss-video.c | 124 +- + drivers/media/platform/qcom/camss/camss-video.h | 2 - + drivers/media/platform/qcom/camss/camss.c | 5 - + drivers/media/platform/qcom/venus/Makefile | 2 +- + drivers/media/platform/qcom/venus/core.c | 56 +- + drivers/media/platform/qcom/venus/core.h | 34 +- + drivers/media/platform/qcom/venus/dbgfs.c | 19 + + drivers/media/platform/qcom/venus/dbgfs.h | 12 + + drivers/media/platform/qcom/venus/firmware.c | 19 +- + drivers/media/platform/qcom/venus/helpers.c | 241 +- + drivers/media/platform/qcom/venus/helpers.h | 2 + + drivers/media/platform/qcom/venus/hfi.c | 5 + + drivers/media/platform/qcom/venus/hfi.h | 1 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 37 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 28 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 18 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 3 + + drivers/media/platform/qcom/venus/hfi_venus.c | 72 +- + drivers/media/platform/qcom/venus/hfi_venus.h | 1 + + drivers/media/platform/qcom/venus/pm_helpers.c | 94 +- + drivers/media/platform/qcom/venus/vdec.c | 26 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 31 +- + drivers/media/platform/qcom/venus/venc.c | 199 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 35 +- + drivers/media/platform/rcar-fcp.c | 8 +- + drivers/media/platform/rcar-vin/Kconfig | 4 +- + drivers/media/platform/rcar-vin/rcar-core.c | 71 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 106 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 49 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 31 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 5 +- + drivers/media/platform/rcar_drif.c | 30 +- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 1 + + drivers/media/platform/s3c-camif/camif-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 7 + + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 +- + drivers/media/platform/sti/bdisp/bdisp-debug.c | 29 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 10 +- + drivers/media/platform/sti/bdisp/bdisp.h | 2 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 10 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 4 +- + drivers/media/platform/sti/hva/hva-debugfs.c | 22 +- + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 4 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 7 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 5 +- + drivers/media/platform/ti-vpe/vpe.c | 2 + + drivers/media/platform/vsp1/vsp1_drv.c | 11 +- + drivers/media/radio/radio-si476x.c | 66 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 28 +- + drivers/media/rc/ati_remote.c | 4 + + drivers/media/rc/ene_ir.c | 18 +- + drivers/media/rc/fintek-cir.c | 8 +- + drivers/media/rc/gpio-ir-recv.c | 53 + + drivers/media/rc/igorplugusb.c | 6 +- + drivers/media/rc/iguanair.c | 6 +- + drivers/media/rc/imon_raw.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 8 +- + drivers/media/rc/ir-imon-decoder.c | 10 +- + drivers/media/rc/ir-jvc-decoder.c | 6 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 8 +- + drivers/media/rc/ir-nec-decoder.c | 6 +- + drivers/media/rc/ir-rc5-decoder.c | 6 +- + drivers/media/rc/ir-rc6-decoder.c | 6 +- + drivers/media/rc/ir-rcmm-decoder.c | 18 +- + drivers/media/rc/ir-sanyo-decoder.c | 6 +- + drivers/media/rc/ir-sharp-decoder.c | 6 +- + drivers/media/rc/ir-sony-decoder.c | 6 +- + drivers/media/rc/ir-xmp-decoder.c | 15 +- + drivers/media/rc/ir_toy.c | 14 +- + drivers/media/rc/ite-cir.c | 10 +- + drivers/media/rc/ite-cir.h | 4 +- + drivers/media/rc/lirc_dev.c | 95 +- + drivers/media/rc/mceusb.c | 12 +- + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/nuvoton-cir.c | 10 +- + drivers/media/rc/nuvoton-cir.h | 2 +- + drivers/media/rc/rc-core-priv.h | 21 +- + drivers/media/rc/rc-ir-raw.c | 16 +- + drivers/media/rc/rc-loopback.c | 8 +- + drivers/media/rc/rc-main.c | 10 +- + drivers/media/rc/redrat3.c | 17 +- + drivers/media/rc/serial_ir.c | 12 +- + drivers/media/rc/sir_ir.c | 2 +- + drivers/media/rc/st_rc.c | 6 +- + drivers/media/rc/streamzap.c | 10 +- + drivers/media/rc/sunxi-cir.c | 4 +- + drivers/media/rc/ttusbir.c | 18 +- + drivers/media/rc/winbond-cir.c | 10 +- + drivers/media/rc/xbox_remote.c | 2 +- + drivers/media/test-drivers/Kconfig | 16 + + drivers/media/test-drivers/Makefile | 1 + + drivers/media/test-drivers/vicodec/vicodec-core.c | 6 +- + drivers/media/test-drivers/vidtv/Kconfig | 11 + + drivers/media/test-drivers/vidtv/Makefile | 9 + + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 566 ++ + drivers/media/test-drivers/vidtv/vidtv_bridge.h | 63 + + drivers/media/test-drivers/vidtv/vidtv_channel.c | 310 + + drivers/media/test-drivers/vidtv/vidtv_channel.h | 76 + + drivers/media/test-drivers/vidtv/vidtv_common.c | 89 + + drivers/media/test-drivers/vidtv/vidtv_common.h | 33 + + drivers/media/test-drivers/vidtv/vidtv_demod.c | 464 ++ + drivers/media/test-drivers/vidtv/vidtv_demod.h | 69 + + drivers/media/test-drivers/vidtv/vidtv_encoder.h | 166 + + drivers/media/test-drivers/vidtv/vidtv_mux.c | 474 ++ + drivers/media/test-drivers/vidtv/vidtv_mux.h | 167 + + drivers/media/test-drivers/vidtv/vidtv_pes.c | 438 ++ + drivers/media/test-drivers/vidtv/vidtv_pes.h | 191 + + drivers/media/test-drivers/vidtv/vidtv_psi.c | 1322 ++++ + drivers/media/test-drivers/vidtv/vidtv_psi.h | 577 ++ + drivers/media/test-drivers/vidtv/vidtv_s302m.c | 502 ++ + drivers/media/test-drivers/vidtv/vidtv_s302m.h | 92 + + drivers/media/test-drivers/vidtv/vidtv_ts.c | 137 + + drivers/media/test-drivers/vidtv/vidtv_ts.h | 108 + + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 438 ++ + drivers/media/test-drivers/vidtv/vidtv_tuner.h | 43 + + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/test-drivers/vivid/vivid-core.c | 674 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 9 +- + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 38 +- + .../media/test-drivers/vivid/vivid-vid-common.c | 25 + + drivers/media/tuners/fc0011.c | 2 +- + drivers/media/tuners/qt1010.c | 25 +- + drivers/media/tuners/tda18271-fe.c | 2 +- + drivers/media/tuners/tuner-simple.c | 5 +- + drivers/media/usb/au0828/au0828-input.c | 8 +- + drivers/media/usb/au0828/au0828-video.c | 12 +- + drivers/media/usb/b2c2/flexcop-usb.c | 9 +- + drivers/media/usb/b2c2/flexcop-usb.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 16 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 +- + drivers/media/usb/dvb-usb/Kconfig | 1 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 13 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 11 +- + drivers/media/usb/dvb-usb/pctv452e.c | 26 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 4 +- + drivers/media/usb/em28xx/em28xx-audio.c | 8 +- + drivers/media/usb/em28xx/em28xx-cards.c | 22 + + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/gspca/mr97310a.c | 10 +- + drivers/media/usb/gspca/nw80x.c | 2 +- + drivers/media/usb/gspca/ov519.c | 6 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sunplus.c | 4 +- + drivers/media/usb/gspca/xirlink_cit.c | 4 +- + drivers/media/usb/gspca/zc3xx.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 +- + drivers/media/usb/pwc/pwc-v4l.c | 2 +- + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 8 +- + drivers/media/usb/tm6000/tm6000-core.c | 24 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 197 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 7 +- + drivers/media/usb/usbtv/usbtv-core.c | 3 +- + drivers/media/usb/usbtv/usbtv-video.c | 4 +- + drivers/media/usb/uvc/uvc_ctrl.c | 46 +- + drivers/media/usb/uvc/uvc_debugfs.c | 20 +- + drivers/media/usb/uvc/uvc_driver.c | 71 +- + drivers/media/usb/uvc/uvc_entity.c | 35 + + drivers/media/usb/uvc/uvc_v4l2.c | 34 + + drivers/media/usb/uvc/uvc_video.c | 6 +- + drivers/media/usb/uvc/uvcvideo.h | 8 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 61 + + drivers/media/v4l2-core/v4l2-fwnode.c | 4 +- + drivers/media/v4l2-core/v4l2-h264.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 68 +- + drivers/media/v4l2-core/v4l2-subdev.c | 16 + + drivers/media/v4l2-core/videobuf-dma-sg.c | 22 +- + drivers/memory/samsung/exynos5422-dmc.c | 6 +- + drivers/memory/tegra/tegra210.c | 2 +- + drivers/memstick/core/ms_block.c | 2 +- + drivers/misc/kgdbts.c | 48 +- + drivers/mmc/core/block.c | 2 +- + drivers/mmc/core/bus.c | 12 + + drivers/mmc/core/core.c | 10 + + drivers/mmc/core/host.c | 26 +- + drivers/mmc/core/mmc.c | 22 +- + drivers/mmc/core/mmc_test.c | 8 +- + drivers/mmc/core/queue.c | 3 +- + drivers/mmc/core/sd.c | 38 +- + drivers/mmc/core/sdio.c | 24 + + drivers/mmc/core/sdio_bus.c | 54 +- + drivers/mmc/core/sdio_cis.c | 11 + + drivers/mmc/host/Kconfig | 53 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/alcor.c | 1 + + drivers/mmc/host/android-goldfish.c | 1 + + drivers/mmc/host/atmel-mci.c | 1 + + drivers/mmc/host/au1xmmc.c | 1 + + drivers/mmc/host/bcm2835.c | 5 +- + drivers/mmc/host/cavium-octeon.c | 1 + + drivers/mmc/host/cqhci.c | 6 + + drivers/mmc/host/cqhci.h | 2 + + drivers/mmc/host/davinci_mmc.c | 8 +- + drivers/mmc/host/dw_mmc-bluefield.c | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 1 + + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 + + drivers/mmc/host/dw_mmc-k3.c | 1 + + drivers/mmc/host/dw_mmc-pltfm.c | 1 + + drivers/mmc/host/dw_mmc-rockchip.c | 1 + + drivers/mmc/host/dw_mmc-zx.c | 12 +- + drivers/mmc/host/dw_mmc.c | 9 +- + drivers/mmc/host/jz4740_mmc.c | 5 +- + drivers/mmc/host/meson-gx-mmc.c | 19 +- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 1 + + drivers/mmc/host/meson-mx-sdio.c | 1 + + drivers/mmc/host/mmc_spi.c | 4 +- + drivers/mmc/host/moxart-mmc.c | 24 +- + drivers/mmc/host/mtk-sd.c | 68 +- + drivers/mmc/host/mvsdio.c | 1 + + drivers/mmc/host/mxcmmc.c | 1 + + drivers/mmc/host/mxs-mmc.c | 1 + + drivers/mmc/host/omap.c | 1 + + drivers/mmc/host/omap_hsmmc.c | 19 +- + drivers/mmc/host/owl-mmc.c | 1 + + drivers/mmc/host/pxamci.c | 1 + + drivers/mmc/host/renesas_sdhi.h | 6 +- + drivers/mmc/host/renesas_sdhi_core.c | 233 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 + + drivers/mmc/host/rtsx_pci_sdmmc.c | 1 + + drivers/mmc/host/rtsx_usb_sdmmc.c | 8 +- + drivers/mmc/host/s3cmci.c | 14 +- + drivers/mmc/host/sdhci-acpi.c | 38 + + drivers/mmc/host/sdhci-bcm-kona.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 13 +- + drivers/mmc/host/sdhci-cadence.c | 1 + + drivers/mmc/host/sdhci-cns3xxx.c | 1 + + drivers/mmc/host/sdhci-dove.c | 1 + + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 1 + + drivers/mmc/host/sdhci-iproc.c | 2 + + drivers/mmc/host/sdhci-milbeaut.c | 1 + + drivers/mmc/host/sdhci-msm.c | 16 +- + drivers/mmc/host/sdhci-of-arasan.c | 8 +- + drivers/mmc/host/sdhci-of-aspeed.c | 2 + + drivers/mmc/host/sdhci-of-at91.c | 1 + + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + drivers/mmc/host/sdhci-of-esdhc.c | 19 +- + drivers/mmc/host/sdhci-of-hlwd.c | 1 + + drivers/mmc/host/sdhci-of-sparx5.c | 270 + + drivers/mmc/host/sdhci-omap.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 154 + + drivers/mmc/host/sdhci-pci-gli.c | 150 +- + drivers/mmc/host/sdhci-pic32.c | 1 + + drivers/mmc/host/sdhci-pxav2.c | 1 + + drivers/mmc/host/sdhci-pxav3.c | 1 + + drivers/mmc/host/sdhci-s3c.c | 3 + + drivers/mmc/host/sdhci-sirf.c | 1 + + drivers/mmc/host/sdhci-spear.c | 1 + + drivers/mmc/host/sdhci-sprd.c | 5 +- + drivers/mmc/host/sdhci-st.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 8 +- + drivers/mmc/host/sdhci-xenon.c | 1 + + drivers/mmc/host/sdhci_am654.c | 207 +- + drivers/mmc/host/sdhci_f_sdh30.c | 1 + + drivers/mmc/host/sh_mmcif.c | 1 + + drivers/mmc/host/sunxi-mmc.c | 1 + + drivers/mmc/host/tmio_mmc.c | 9 +- + drivers/mmc/host/tmio_mmc.h | 8 +- + drivers/mmc/host/tmio_mmc_core.c | 48 +- + drivers/mmc/host/uniphier-sd.c | 6 +- + drivers/mmc/host/usdhi6rol0.c | 1 + + drivers/mmc/host/via-sdmmc.c | 3 + + drivers/mmc/host/wbsd.c | 1 + + drivers/mmc/host/wmt-sdmmc.c | 1 + + drivers/mtd/mtdcore.c | 2 + + drivers/net/ethernet/3com/typhoon.c | 3 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + drivers/net/hyperv/netvsc.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 46 +- + drivers/net/hyperv/rndis_filter.c | 13 +- + drivers/net/wireless/intel/ipw2x00/Kconfig | 4 - + drivers/net/wireless/intersil/hostap/Kconfig | 4 - + drivers/nvdimm/badrange.c | 26 +- + drivers/nvdimm/blk.c | 3 +- + drivers/nvdimm/btt.c | 5 +- + drivers/nvdimm/bus.c | 9 +- + drivers/nvdimm/claim.c | 13 +- + drivers/nvdimm/nd.h | 5 +- + drivers/nvdimm/pfn_devs.c | 13 +- + drivers/nvdimm/pmem.c | 31 +- + drivers/nvdimm/region.c | 21 +- + drivers/nvme/host/core.c | 546 +- + drivers/nvme/host/multipath.c | 10 +- + drivers/nvme/host/nvme.h | 26 +- + drivers/nvme/host/pci.c | 35 +- + drivers/nvme/host/zns.c | 57 +- + drivers/nvme/target/admin-cmd.c | 2 + + drivers/nvme/target/core.c | 4 +- + drivers/nvme/target/fc.c | 2 +- + drivers/nvme/target/loop.c | 4 +- + drivers/nvme/target/nvmet.h | 2 + + drivers/nvme/target/passthru.c | 43 +- + drivers/nvme/target/tcp.c | 21 +- + drivers/opp/core.c | 231 +- + drivers/opp/cpu.c | 2 +- + drivers/opp/of.c | 112 +- + drivers/opp/opp.h | 5 +- + drivers/oprofile/buffer_sync.c | 4 +- + drivers/pci/controller/pci-hyperv.c | 5 +- + drivers/pci/p2pdma.c | 12 +- + drivers/pci/pci-acpi.c | 10 + + drivers/pinctrl/bcm/Kconfig | 1 + + drivers/platform/x86/hp-wmi.c | 23 + + drivers/platform/x86/intel_pmc_core.c | 121 +- + drivers/platform/x86/intel_pmc_core.h | 5 +- + drivers/platform/x86/mlx-platform.c | 16 +- + drivers/pnp/isapnp/compat.c | 23 - + drivers/pnp/quirks.c | 2 - + drivers/power/avs/qcom-cpr.c | 8 +- + drivers/powercap/idle_inject.c | 1 + + drivers/regulator/88pg86x.c | 2 +- + drivers/regulator/Kconfig | 64 +- + drivers/regulator/Makefile | 5 + + drivers/regulator/bd718x7-regulator.c | 422 +- + drivers/regulator/bd9576-regulator.c | 337 + + drivers/regulator/core.c | 239 +- + drivers/regulator/da9055-regulator.c | 2 - + drivers/regulator/da9062-regulator.c | 2 - + drivers/regulator/da9063-regulator.c | 2 - + drivers/regulator/da9210-regulator.c | 6 +- + drivers/regulator/da9211-regulator.c | 18 +- + drivers/regulator/dbx500-prcmu.c | 26 +- + drivers/regulator/dummy.c | 4 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 20 +- + drivers/regulator/lochnagar-regulator.c | 1 + + drivers/regulator/lp8755.c | 88 +- + drivers/regulator/ltc3589.c | 12 +- + drivers/regulator/ltc3676.c | 12 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/mp886x.c | 109 +- + drivers/regulator/mt6360-regulator.c | 459 ++ + drivers/regulator/pca9450-regulator.c | 6 +- + drivers/regulator/pv88060-regulator.c | 10 +- + drivers/regulator/pv88080-regulator.c | 10 +- + drivers/regulator/pv88090-regulator.c | 10 +- + drivers/regulator/pwm-regulator.c | 2 +- + drivers/regulator/qcom-labibb-regulator.c | 8 +- + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + drivers/regulator/qcom_smd-regulator.c | 167 + + drivers/regulator/qcom_spmi-regulator.c | 177 +- + drivers/regulator/qcom_usb_vbus-regulator.c | 1 + + drivers/regulator/rpi-panel-attiny-regulator.c | 214 + + drivers/regulator/rt4801-regulator.c | 223 + + drivers/regulator/rtmv20-regulator.c | 397 ++ + drivers/regulator/s5m8767.c | 13 +- + drivers/regulator/slg51000-regulator.c | 4 - + drivers/regulator/stm32-booster.c | 2 +- + drivers/regulator/stm32-pwr.c | 2 +- + drivers/regulator/stm32-vrefbuf.c | 2 +- + drivers/regulator/stpmic1_regulator.c | 4 - + drivers/regulator/stw481x-vmmc.c | 4 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8827n.c | 2 + + drivers/regulator/ti-abb-regulator.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps6105x-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/regulator/tps65023-regulator.c | 2 +- + drivers/regulator/tps65086-regulator.c | 4 +- + drivers/regulator/tps65090-regulator.c | 8 +- + drivers/regulator/tps6586x-regulator.c | 8 +- + drivers/regulator/tps65910-regulator.c | 135 +- + drivers/regulator/tps65912-regulator.c | 4 +- + drivers/regulator/wm831x-dcdc.c | 4 - + drivers/regulator/wm831x-isink.c | 2 - + drivers/regulator/wm831x-ldo.c | 2 - + drivers/regulator/wm8350-regulator.c | 2 - + drivers/remoteproc/Kconfig | 2 +- + drivers/s390/block/dasd_genhd.c | 15 +- + drivers/s390/block/dasd_ioctl.c | 17 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 36 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 87 +- + drivers/scsi/hosts.c | 1 + + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 39 + + drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 +- + drivers/scsi/scsi_debug.c | 28 +- + drivers/scsi/scsi_lib.c | 2 + + drivers/scsi/scsi_sysfs.c | 11 + + drivers/scsi/sd.c | 13 +- + drivers/scsi/sg.c | 9 +- + drivers/scsi/sr.c | 36 +- + drivers/scsi/storvsc_drv.c | 56 +- + drivers/soc/samsung/exynos-asv.c | 2 +- + drivers/spi/Kconfig | 31 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-armada-3700.c | 1 - + drivers/spi/spi-atmel.c | 6 +- + drivers/spi/spi-bcm-qspi.c | 13 +- + drivers/spi/spi-bcm2835.c | 7 +- + drivers/spi/spi-cadence-quadspi.c | 5 +- + drivers/spi/spi-cadence.c | 2 +- + drivers/spi/spi-dw-bt1.c | 339 + + drivers/spi/spi-dw-core.c | 679 +- + drivers/spi/spi-dw-dma.c | 332 +- + drivers/spi/spi-dw-mmio.c | 98 +- + drivers/spi/spi-dw-pci.c | 22 +- + drivers/spi/spi-dw.h | 89 +- + drivers/spi/spi-fsi.c | 139 +- + drivers/spi/spi-fsl-dspi.c | 58 +- + drivers/spi/spi-fsl-espi.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-geni-qcom.c | 194 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 261 +- + drivers/spi/spi-imx.c | 11 +- + drivers/spi/spi-lantiq-ssc.c | 12 +- + drivers/spi/spi-mtk-nor.c | 409 +- + drivers/spi/spi-mux.c | 5 +- + drivers/spi/spi-npcm-fiu.c | 7 +- + drivers/spi/spi-nxp-fspi.c | 69 +- + drivers/spi/spi-omap2-mcspi.c | 17 +- + drivers/spi/spi-qcom-qspi.c | 25 +- + drivers/spi/spi-qup.c | 2 +- + drivers/spi/spi-rspi.c | 81 +- + drivers/spi/spi-s3c24xx.c | 2 +- + drivers/spi/spi-s3c64xx.c | 111 +- + drivers/spi/spi-sprd-adi.c | 5 +- + drivers/spi/spi-sprd.c | 17 +- + drivers/spi/spi-stm32.c | 13 +- + drivers/spi/spi-synquacer.c | 5 +- + drivers/spi/spi-tegra114.c | 11 +- + drivers/spi/spi-tegra20-sflash.c | 5 +- + drivers/spi/spi-tegra20-slink.c | 10 +- + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/spi/spi-xilinx.c | 3 +- + drivers/spi/spi-zynqmp-gqspi.c | 720 ++- + drivers/spi/spidev.c | 4 +- + drivers/staging/media/Kconfig | 6 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/Makefile | 12 +- + drivers/staging/media/atomisp/i2c/Kconfig | 74 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 4 +- + drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 12 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 29 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 17 +- + .../media/atomisp/pci/atomisp_compat_ioctl32.c | 84 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 10 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 51 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 6 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 9 +- + .../atomisp/pci/css_2401_system/host/csi_rx.c | 1 + + .../atomisp/pci/css_2401_system/host/ibuf_ctrl.c | 1 + + .../pci/css_2401_system/host/ibuf_ctrl_local.h | 1 + + .../pci/css_2401_system/host/ibuf_ctrl_private.h | 268 - + .../atomisp/pci/css_2401_system/host/isys_dma.c | 10 +- + .../pci/css_2401_system/host/isys_dma_local.h | 21 - + .../pci/css_2401_system/host/isys_dma_private.h | 12 +- + .../atomisp/pci/css_2401_system/host/isys_irq.c | 3 +- + .../pci/css_2401_system/host/isys_irq_local.h | 4 +- + .../pci/css_2401_system/host/isys_irq_private.h | 12 +- + .../pci/css_2401_system/host/pixelgen_private.h | 73 +- + .../atomisp/pci/css_2401_system/ibuf_ctrl_global.h | 6 +- + .../atomisp/pci/css_2401_system/isys_irq_global.h | 4 +- + .../atomisp/pci/css_2401_system/pixelgen_global.h | 8 +- + .../pci/hive_isp_css_common/host/input_formatter.c | 6 +- + .../host/input_formatter_local.h | 4 - + .../pci/hive_isp_css_common/host/input_system.c | 70 +- + .../pci/hive_isp_css_include/host/csi_rx_public.h | 4 +- + .../hive_isp_css_include/host/ibuf_ctrl_public.h | 94 - + .../hive_isp_css_include/host/isys_dma_public.h | 8 +- + .../hive_isp_css_include/host/isys_irq_public.h | 29 +- + .../pci/hive_isp_css_include/host/isys_public.h | 4 +- + .../hive_isp_css_include/host/pixelgen_public.h | 4 +- + .../atomisp/pci/hive_isp_css_include/ibuf_ctrl.h | 47 - + .../atomisp/pci/hive_isp_css_include/isys_dma.h | 47 - + .../atomisp/pci/hive_isp_css_include/isys_irq.h | 16 +- + .../pci/hive_isp_css_include/print_support.h | 2 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 6 +- + drivers/staging/media/atomisp/pci/ia_css_env.h | 4 +- + drivers/staging/media/atomisp/pci/ia_css_mipi.h | 2 - + drivers/staging/media/atomisp/pci/ia_css_stream.h | 4 +- + .../media/atomisp/pci/input_system_global.h | 29 +- + .../pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 7 - + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 145 - + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 144 - + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 53 - + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 4 +- + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 3 - + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 7 +- + .../pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 7 - + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 31 - + .../atomisp/pci/isp2400_input_system_global.h | 21 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 17 +- + .../atomisp/pci/isp2400_input_system_public.h | 26 +- + .../media/atomisp/pci/isp2400_system_global.h | 16 - + .../atomisp/pci/isp2401_input_system_global.h | 30 +- + .../media/atomisp/pci/isp2401_input_system_local.h | 3 - + .../atomisp/pci/isp2401_input_system_private.h | 224 +- + .../media/atomisp/pci/isp2401_system_global.h | 19 - + .../media/atomisp/pci/runtime/binary/src/binary.c | 863 ++- + .../pci/runtime/bufq/interface/ia_css_bufq_comm.h | 10 - + .../media/atomisp/pci/runtime/bufq/src/bufq.c | 26 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 15 +- + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 196 +- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 2 +- + .../atomisp/pci/runtime/inputfifo/src/inputfifo.c | 10 - + .../pci/runtime/isys/interface/ia_css_isys.h | 18 +- + .../pci/runtime/isys/interface/ia_css_isys_comm.h | 4 +- + .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 2 +- + .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 2 +- + .../media/atomisp/pci/runtime/isys/src/isys_init.c | 20 +- + .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 2 +- + .../media/atomisp/pci/runtime/isys/src/rx.c | 24 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 58 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 2 +- + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 4 +- + .../atomisp/pci/runtime/queue/src/queue_access.c | 2 +- + .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- + drivers/staging/media/atomisp/pci/sh_css.c | 379 +- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 4 - + .../staging/media/atomisp/pci/sh_css_firmware.c | 64 +- + drivers/staging/media/atomisp/pci/sh_css_hrt.c | 4 - + .../staging/media/atomisp/pci/sh_css_internal.h | 44 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 46 +- + .../media/atomisp/pci/sh_css_param_shading.c | 25 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 547 +- + .../staging/media/atomisp/pci/sh_css_properties.c | 10 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 39 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 8 +- + drivers/staging/media/atomisp/pci/sh_css_struct.h | 2 - + drivers/staging/media/atomisp/pci/system_global.h | 23 - + drivers/staging/media/hantro/hantro_drv.c | 5 - + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 26 +- + drivers/staging/media/hantro/hantro_h264.c | 14 +- + drivers/staging/media/hantro/hantro_hw.h | 2 - + drivers/staging/media/hantro/hantro_postproc.c | 4 +- + drivers/staging/media/imx/TODO | 4 + + drivers/staging/media/ipu3/include/intel-ipu3.h | 14 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 2 +- + drivers/staging/media/ipu3/ipu3-css.c | 274 +- + drivers/staging/media/meson/vdec/vdec.c | 8 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + .../media/uapi/v4l/pixfmt-meta-rkisp1-params.rst | 23 - + .../media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst | 22 - + drivers/staging/media/rkisp1/TODO | 4 +- + drivers/staging/media/rkisp1/rkisp1-capture.c | 230 +- + drivers/staging/media/rkisp1/rkisp1-common.h | 281 +- + drivers/staging/media/rkisp1/rkisp1-dev.c | 17 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 59 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 211 +- + drivers/staging/media/rkisp1/rkisp1-regs.h | 1 - + drivers/staging/media/rkisp1/rkisp1-resizer.c | 94 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 29 +- + drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 289 +- + drivers/staging/media/rkvdec/rkvdec-h264.c | 37 +- + drivers/staging/media/rkvdec/rkvdec.c | 14 +- + drivers/staging/media/rkvdec/rkvdec.h | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 61 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 29 +- + drivers/staging/media/tegra-vde/vde.c | 4 +- + drivers/staging/media/tegra-video/Kconfig | 7 + + drivers/staging/media/tegra-video/TODO | 6 - + drivers/staging/media/tegra-video/csi.c | 314 +- + drivers/staging/media/tegra-video/csi.h | 8 + + drivers/staging/media/tegra-video/tegra210.c | 25 +- + drivers/staging/media/tegra-video/vi.c | 850 ++- + drivers/staging/media/tegra-video/vi.h | 25 +- + drivers/staging/media/tegra-video/video.c | 23 +- + drivers/staging/media/usbvision/Kconfig | 18 - + drivers/staging/media/usbvision/Makefile | 4 - + drivers/staging/media/usbvision/TODO | 11 - + drivers/staging/media/usbvision/usbvision-cards.c | 1120 ---- + drivers/staging/media/usbvision/usbvision-cards.h | 70 - + drivers/staging/media/usbvision/usbvision-core.c | 2428 ------- + drivers/staging/media/usbvision/usbvision-i2c.c | 438 -- + drivers/staging/media/usbvision/usbvision-video.c | 1643 ----- + drivers/staging/media/usbvision/usbvision.h | 500 -- + drivers/staging/media/zoran/Kconfig | 76 + + drivers/staging/media/zoran/Makefile | 7 + + drivers/staging/media/zoran/TODO | 19 + + drivers/staging/media/zoran/videocodec.c | 330 + + drivers/staging/media/zoran/videocodec.h | 308 + + drivers/staging/media/zoran/zoran.h | 319 + + drivers/staging/media/zoran/zoran_card.c | 1333 ++++ + drivers/staging/media/zoran/zoran_card.h | 30 + + drivers/staging/media/zoran/zoran_device.c | 1013 +++ + drivers/staging/media/zoran/zoran_device.h | 64 + + drivers/staging/media/zoran/zoran_driver.c | 1037 +++ + drivers/staging/media/zoran/zr36016.c | 433 ++ + drivers/staging/media/zoran/zr36016.h | 92 + + drivers/staging/media/zoran/zr36050.c | 842 +++ + drivers/staging/media/zoran/zr36050.h | 163 + + drivers/staging/media/zoran/zr36057.h | 154 + + drivers/staging/media/zoran/zr36060.c | 872 +++ + drivers/staging/media/zoran/zr36060.h | 201 + + drivers/staging/rtl8192e/Kconfig | 4 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 70 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 72 +- + drivers/staging/rtl8192u/Kconfig | 1 + + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 81 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 64 +- + drivers/target/target_core_iblock.c | 5 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/virtio/virtio_mem.c | 47 +- + drivers/xen/gntdev.c | 17 +- + drivers/xen/pvcalls-front.c | 2 +- + drivers/xen/unpopulated-alloc.c | 45 +- + fs/9p/vfs_file.c | 2 +- + fs/9p/vfs_super.c | 6 +- + fs/Makefile | 1 - + fs/afs/super.c | 1 - + fs/aio.c | 8 +- + fs/block_dev.c | 184 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 1 - + fs/btrfs/block-group.c | 66 +- + fs/btrfs/btrfs_inode.h | 30 +- + fs/btrfs/compression.c | 35 - + fs/btrfs/compression.h | 35 + + fs/btrfs/ctree.c | 204 +- + fs/btrfs/ctree.h | 103 +- + fs/btrfs/delalloc-space.c | 123 +- + fs/btrfs/delayed-inode.c | 6 +- + fs/btrfs/dev-replace.c | 72 +- + fs/btrfs/disk-io.c | 159 +- + fs/btrfs/disk-io.h | 9 +- + fs/btrfs/extent-io-tree.h | 3 +- + fs/btrfs/extent-tree.c | 206 +- + fs/btrfs/extent_io.c | 216 +- + fs/btrfs/extent_io.h | 23 +- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/file.c | 316 +- + fs/btrfs/free-space-cache.c | 23 +- + fs/btrfs/inode.c | 788 ++- + fs/btrfs/ioctl.c | 68 +- + fs/btrfs/locking.c | 45 +- + fs/btrfs/locking.h | 78 + + fs/btrfs/ordered-data.c | 113 +- + fs/btrfs/ordered-data.h | 24 +- + fs/btrfs/print-tree.c | 38 + + fs/btrfs/print-tree.h | 4 + + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/reada.c | 30 +- + fs/btrfs/reflink.c | 46 +- + fs/btrfs/relocation.c | 11 +- + fs/btrfs/root-tree.c | 13 +- + fs/btrfs/scrub.c | 8 +- + fs/btrfs/send.c | 365 +- + fs/btrfs/send.h | 1 - + fs/btrfs/space-info.c | 323 +- + fs/btrfs/space-info.h | 2 + + fs/btrfs/struct-funcs.c | 10 - + fs/btrfs/super.c | 6 +- + fs/btrfs/sysfs.c | 253 +- + fs/btrfs/sysfs.h | 11 +- + fs/btrfs/tests/extent-buffer-tests.c | 3 +- + fs/btrfs/tests/inode-tests.c | 7 +- + fs/btrfs/transaction.c | 15 +- + fs/btrfs/transaction.h | 8 + + fs/btrfs/tree-checker.c | 17 +- + fs/btrfs/tree-log.c | 284 +- + fs/btrfs/tree-log.h | 32 +- + fs/btrfs/volumes.c | 403 +- + fs/btrfs/volumes.h | 8 +- + fs/buffer.c | 16 - + fs/compat.c | 132 - + fs/crypto/crypto.c | 4 +- + fs/crypto/fname.c | 60 +- + fs/crypto/fscrypt_private.h | 10 +- + fs/crypto/hooks.c | 80 +- + fs/crypto/inline_crypt.c | 7 +- + fs/crypto/keyring.c | 9 +- + fs/crypto/keysetup.c | 182 +- + fs/crypto/keysetup_v1.c | 8 +- + fs/crypto/policy.c | 209 +- + fs/dax.c | 13 +- + fs/direct-io.c | 19 - + fs/dlm/Kconfig | 1 + + fs/dlm/config.c | 66 +- + fs/dlm/config.h | 4 +- + fs/dlm/lowcomms.c | 329 +- + fs/dlm/midcomms.c | 136 +- + fs/dlm/midcomms.h | 3 +- + fs/efivarfs/super.c | 3 + + fs/erofs/data.c | 2 +- + fs/erofs/super.c | 2 - + fs/erofs/xattr.c | 2 - + fs/erofs/zdata.c | 48 +- + fs/exec.c | 6 + + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 6 +- + fs/ext4/ialloc.c | 119 +- + fs/ext4/namei.c | 7 +- + fs/ext4/super.c | 16 +- + fs/f2fs/dir.c | 6 +- + fs/f2fs/f2fs.h | 25 +- + fs/f2fs/namei.c | 7 +- + fs/f2fs/super.c | 15 +- + fs/file.c | 2 + + fs/fs-writeback.c | 7 +- + fs/fs_parser.c | 2 +- + fs/fuse/inode.c | 4 +- + fs/internal.h | 3 - + fs/io-wq.c | 200 +- + fs/io-wq.h | 4 + + fs/io_uring.c | 2201 ++++--- + fs/iomap/buffered-io.c | 194 +- + fs/iomap/direct-io.c | 49 +- + fs/jfs/jfs_metapage.c | 2 +- + fs/namei.c | 4 +- + fs/namespace.c | 4 +- + fs/nfs/fs_context.c | 195 +- + fs/nfs/super.c | 9 +- + fs/nfsd/blocklayout.c | 4 +- + fs/ntfs/inode.c | 6 + + fs/ocfs2/alloc.c | 6 +- + fs/ocfs2/cluster/heartbeat.c | 28 +- + fs/ocfs2/localalloc.c | 2 +- + fs/proc/base.c | 3 +- + fs/proc/task_mmu.c | 104 +- + fs/quota/Kconfig | 5 - + fs/quota/Makefile | 1 - + fs/quota/compat.c | 120 - + fs/quota/compat.h | 34 + + fs/quota/quota.c | 73 +- + fs/read_write.c | 362 +- + fs/splice.c | 57 +- + fs/super.c | 2 + + fs/ubifs/dir.c | 40 +- + fs/ubifs/super.c | 2 + + fs/vboxsf/super.c | 2 + + fs/xattr.c | 22 +- + fs/xfs/kmem.c | 22 - + fs/xfs/kmem.h | 7 - + fs/xfs/libxfs/xfs_ag.c | 5 + + fs/xfs/libxfs/xfs_attr.c | 14 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 43 +- + fs/xfs/libxfs/xfs_attr_sf.h | 29 +- + fs/xfs/libxfs/xfs_da_format.h | 6 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 35 + + fs/xfs/libxfs/xfs_format.h | 211 +- + fs/xfs/libxfs/xfs_fs.h | 1 + + fs/xfs/libxfs/xfs_ialloc.c | 5 + + fs/xfs/libxfs/xfs_ialloc_btree.c | 65 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 130 +- + fs/xfs/libxfs/xfs_inode_buf.h | 15 +- + fs/xfs/libxfs/xfs_inode_fork.c | 8 +- + fs/xfs/libxfs/xfs_log_format.h | 7 +- + fs/xfs/libxfs/xfs_log_recover.h | 1 - + fs/xfs/libxfs/xfs_quota_defs.h | 8 +- + fs/xfs/libxfs/xfs_sb.c | 6 +- + fs/xfs/libxfs/xfs_shared.h | 3 + + fs/xfs/libxfs/xfs_trans_inode.c | 17 +- + fs/xfs/scrub/agheader.c | 30 + + fs/xfs/scrub/agheader_repair.c | 24 + + fs/xfs/scrub/inode.c | 31 +- + fs/xfs/scrub/symlink.c | 2 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_attr_list.c | 6 +- + fs/xfs/xfs_bmap_util.c | 16 + + fs/xfs/xfs_buf.c | 208 +- + fs/xfs/xfs_buf.h | 17 +- + fs/xfs/xfs_buf_item.c | 264 +- + fs/xfs/xfs_buf_item.h | 12 + + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_dquot.c | 66 +- + fs/xfs/xfs_dquot.h | 3 + + fs/xfs/xfs_file.c | 17 +- + fs/xfs/xfs_icache.c | 19 +- + fs/xfs/xfs_inode.c | 83 +- + fs/xfs/xfs_inode.h | 38 +- + fs/xfs/xfs_inode_item.c | 61 +- + fs/xfs/xfs_inode_item.h | 5 +- + fs/xfs/xfs_inode_item_recover.c | 76 + + fs/xfs/xfs_ioctl.c | 7 +- + fs/xfs/xfs_log_recover.c | 60 +- + fs/xfs/xfs_mount.c | 32 +- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_ondisk.h | 38 +- + fs/xfs/xfs_qm.c | 13 + + fs/xfs/xfs_qm.h | 4 + + fs/xfs/xfs_qm_syscalls.c | 18 +- + fs/xfs/xfs_quota.h | 8 - + fs/xfs/xfs_rtalloc.c | 13 +- + fs/xfs/xfs_super.c | 28 +- + fs/xfs/xfs_trace.h | 29 +- + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans.h | 2 +- + fs/xfs/xfs_trans_buf.c | 46 +- + fs/xfs/xfs_trans_dquot.c | 6 + + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acpi_io.h | 2 +- + include/acpi/acpi_numa.h | 18 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actypes.h | 2 +- + include/acpi/acuuid.h | 7 + + include/acpi/battery.h | 2 + + include/acpi/platform/aclinux.h | 7 +- + include/asm-generic/atomic-instrumented.h | 330 +- + include/asm-generic/bitops/instrumented-atomic.h | 6 +- + include/asm-generic/bitops/instrumented-lock.h | 2 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 30 +- + include/asm-generic/checksum.h | 12 - + include/asm-generic/compat.h | 8 + + include/asm-generic/vmlinux.lds.h | 62 +- + include/crypto/algapi.h | 8 +- + include/crypto/cbc.h | 141 - + include/crypto/hash.h | 18 +- + include/crypto/if_alg.h | 1 + + include/crypto/internal/hash.h | 19 +- + include/crypto/public_key.h | 3 + + include/crypto/sm2.h | 25 + + include/crypto/sm3.h | 2 + + include/drm/intel-gtt.h | 5 +- + include/dt-bindings/memory/mt8167-larb-port.h | 51 + + .../regulator/mediatek,mt6360-regulator.h | 16 + + include/kunit/test.h | 5 + + include/linux/acpi.h | 29 +- + include/linux/arch_topology.h | 6 +- + include/linux/async_tx.h | 23 +- + include/linux/backing-dev.h | 78 +- + include/linux/blk-crypto.h | 20 +- + include/linux/blk-mq.h | 15 +- + include/linux/blk_types.h | 7 +- + include/linux/blkdev.h | 88 +- + include/linux/compaction.h | 3 - + include/linux/compat.h | 65 +- + include/linux/compiler-clang.h | 8 + + include/linux/compiler-gcc.h | 2 +- + include/linux/compiler.h | 4 +- + include/linux/cper.h | 24 +- + include/linux/cpufreq.h | 15 +- + include/linux/cpuidle.h | 1 + + include/linux/crash_core.h | 3 + + include/linux/dax.h | 11 +- + include/linux/dcache.h | 2 +- + include/linux/debug_locks.h | 2 +- + include/linux/dev_printk.h | 8 + + include/linux/devfreq-event.h | 14 +- + include/linux/devfreq.h | 11 +- + include/linux/device-mapper.h | 6 + + include/linux/efi.h | 46 +- + include/linux/export.h | 2 +- + include/linux/frame.h | 35 - + include/linux/fs.h | 67 +- + include/linux/fscrypt.h | 159 +- + include/linux/genhd.h | 15 +- + include/linux/gfp.h | 6 +- + include/linux/gpio/driver.h | 3 - + include/linux/hidden.h | 19 + + include/linux/host1x.h | 4 +- + include/linux/huge_mm.h | 3 - + include/linux/hwmon.h | 20 + + include/linux/hyperv.h | 68 +- + include/linux/ide.h | 2 - + include/linux/iio/iio.h | 2 +- + include/linux/instrumented.h | 30 + + include/linux/intel-iommu.h | 1 + + include/linux/io-pgtable.h | 2 +- + include/linux/io_uring.h | 58 + + include/linux/iomap.h | 5 + + include/linux/iommu.h | 45 +- + include/linux/isapnp.h | 6 - + include/linux/kasan.h | 6 + + include/linux/kcsan-checks.h | 45 +- + include/linux/kernel.h | 1 - + include/linux/kprobes.h | 51 +- + include/linux/lockdep.h | 58 +- + include/linux/lockdep_types.h | 8 +- + include/linux/memblock.h | 88 +- + include/linux/memcontrol.h | 13 +- + include/linux/memory_hotplug.h | 23 +- + include/linux/memremap.h | 11 +- + include/linux/mfd/tc3589x.h | 6 + + include/linux/mm.h | 36 +- + include/linux/mmap_lock.h | 5 + + include/linux/mmc/card.h | 2 + + include/linux/mmc/host.h | 9 +- + include/linux/mmc/sdio_func.h | 2 + + include/linux/mmzone.h | 37 +- + include/linux/module.h | 5 + + include/linux/mpi.h | 192 + + include/linux/nodemask.h | 1 + + include/linux/notifier.h | 15 +- + include/linux/numa.h | 11 - + include/linux/objtool.h | 129 + + include/linux/oid_registry.h | 6 + + include/linux/oom.h | 1 + + include/linux/overflow.h | 39 +- + include/linux/page-flags.h | 42 +- + include/linux/pagemap.h | 59 +- + include/linux/pe.h | 3 + + include/linux/percpu-refcount.h | 52 +- + include/linux/perf_event.h | 34 +- + include/linux/platform_data/gpio-dwapb.h | 4 +- + include/linux/platform_data/gsc_hwmon.h | 1 + + include/linux/platform_data/mlxreg.h | 34 +- + include/linux/pm.h | 2 +- + include/linux/pm_domain.h | 4 +- + include/linux/printk.h | 8 +- + include/linux/property.h | 13 + + include/linux/psci.h | 2 +- + include/linux/pxa2xx_ssp.h | 165 +- + include/linux/qcom_scm.h | 7 + + include/linux/quotaops.h | 3 - + include/linux/range.h | 6 + + include/linux/rbtree_latch.h | 6 +- + include/linux/refcount.h | 65 +- + include/linux/regmap.h | 52 + + include/linux/regulator/driver.h | 3 - + include/linux/sched.h | 14 +- + include/linux/sched/coredump.h | 1 + + include/linux/sched/mm.h | 3 + + include/linux/sched/sd_flags.h | 156 + + include/linux/sched/task.h | 2 +- + include/linux/sched/topology.h | 37 +- + include/linux/seqlock.h | 388 +- + include/linux/skbuff.h | 2 +- + include/linux/slab.h | 2 +- + include/linux/soc/mediatek/infracfg.h | 3 + + include/linux/soc/qcom/smd-rpm.h | 4 + + include/linux/static_call.h | 298 + + include/linux/static_call_types.h | 35 + + include/linux/string_helpers.h | 2 + + include/linux/sunrpc/gss_krb5.h | 11 - + include/linux/sunrpc/gss_krb5_enctypes.h | 9 +- + include/linux/suspend.h | 4 +- + include/linux/swap.h | 13 +- + include/linux/swap_slots.h | 2 +- + include/linux/swiotlb.h | 1 + + include/linux/syscalls.h | 2 +- + include/linux/tracepoint-defs.h | 5 + + include/linux/tracepoint.h | 86 +- + include/linux/uio.h | 20 +- + include/media/cec.h | 2 - + include/media/h264-ctrls.h | 87 +- + include/media/rc-core.h | 11 +- + include/media/tpg/v4l2-tpg.h | 1 + + include/media/v4l2-async.h | 5 +- + include/media/v4l2-common.h | 29 + + include/media/v4l2-ctrls.h | 2 + + include/media/v4l2-fwnode.h | 24 +- + include/media/v4l2-h264.h | 3 +- + include/media/v4l2-mediabus.h | 33 +- + include/media/v4l2-mem2mem.h | 22 + + include/media/v4l2-subdev.h | 40 +- + include/media/videobuf-dma-sg.h | 2 +- + include/media/videobuf2-v4l2.h | 17 + + include/net/checksum.h | 22 +- + include/scsi/scsi_host.h | 9 +- + include/trace/define_trace.h | 14 +- + include/trace/events/avc.h | 53 + + include/trace/events/bcache.h | 4 +- + include/trace/events/btrfs.h | 28 +- + include/trace/events/filelock.h | 8 +- + include/trace/events/iocost.h | 67 +- + include/trace/events/sched.h | 4 + + include/trace/events/xen.h | 20 - + include/uapi/asm-generic/unistd.h | 14 +- + include/uapi/linux/blkzoned.h | 15 +- + include/uapi/linux/btrfs_tree.h | 14 + + include/uapi/linux/capability.h | 2 + + include/uapi/linux/cdrom.h | 5 +- + include/uapi/linux/fscrypt.h | 6 +- + include/uapi/linux/gpio.h | 334 +- + include/uapi/linux/if_alg.h | 1 + + include/uapi/linux/io_uring.h | 61 +- + include/uapi/linux/iommu.h | 18 +- + include/uapi/linux/membarrier.h | 26 + + include/uapi/linux/pidfd.h | 12 + + include/uapi/linux/v4l2-controls.h | 25 + + include/uapi/linux/v4l2-mediabus.h | 15 +- + include/uapi/linux/v4l2-subdev.h | 10 +- + include/uapi/linux/videodev2.h | 23 +- + init/Kconfig | 5 +- + init/init_task.c | 3 + + kernel/Makefile | 1 + + kernel/audit.c | 9 +- + kernel/audit.h | 4 - + kernel/bpf/core.c | 2 +- + kernel/cpu_pm.c | 48 +- + kernel/dma/contiguous.c | 11 +- + kernel/dma/swiotlb.c | 6 +- + kernel/events/core.c | 121 +- + kernel/exit.c | 15 +- + kernel/fork.c | 47 +- + kernel/jump_label.c | 10 +- + kernel/kcsan/core.c | 210 +- + kernel/kcsan/debugfs.c | 130 +- + kernel/kcsan/kcsan-test.c | 128 +- + kernel/kcsan/kcsan.h | 12 +- + kernel/kcsan/report.c | 10 +- + kernel/kcsan/selftest.c | 8 +- + kernel/kexec_core.c | 2 +- + kernel/kprobes.c | 130 +- + kernel/locking/lockdep.c | 977 ++- + kernel/locking/lockdep_internals.h | 7 +- + kernel/module.c | 15 +- + kernel/notifier.c | 144 +- + kernel/pid.c | 12 +- + kernel/power/hibernate.c | 50 +- + kernel/power/main.c | 8 +- + kernel/power/power.h | 3 +- + kernel/power/suspend.c | 14 +- + kernel/power/swap.c | 36 +- + kernel/power/user.c | 40 +- + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 4 +- + kernel/printk/printk.c | 1153 ++-- + kernel/printk/printk_ringbuffer.c | 2083 ++++++ + kernel/printk/printk_ringbuffer.h | 382 ++ + kernel/printk/printk_safe.c | 2 +- + kernel/resource.c | 11 +- + kernel/sched/core.c | 13 +- + kernel/sched/cpufreq_schedutil.c | 18 +- + kernel/sched/deadline.c | 34 +- + kernel/sched/debug.c | 56 +- + kernel/sched/fair.c | 103 +- + kernel/sched/features.h | 2 +- + kernel/sched/membarrier.c | 136 +- + kernel/sched/topology.c | 69 +- + kernel/seccomp.c | 64 +- + kernel/static_call.c | 482 ++ + kernel/sys_ni.c | 1 - + kernel/time/sched_clock.c | 6 +- + kernel/time/timekeeping.c | 10 +- + kernel/trace/blktrace.c | 13 +- + kernel/trace/bpf_trace.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 2 +- + kernel/trace/trace_kprobe.c | 7 +- + kernel/trace/trace_printk.c | 4 +- + kernel/tracepoint.c | 39 +- + lib/Kconfig.debug | 9 + + lib/Kconfig.kasan | 31 +- + lib/Kconfig.kcsan | 5 + + lib/Makefile | 5 +- + lib/checksum.c | 11 - + lib/crypto/chacha20poly1305.c | 4 +- + lib/iov_iter.c | 199 +- + lib/kunit/test.c | 13 +- + lib/locking-selftest.c | 445 +- + lib/mpi/Makefile | 6 + + lib/mpi/ec.c | 1509 +++++ + lib/mpi/mpi-add.c | 155 + + lib/mpi/mpi-bit.c | 251 + + lib/mpi/mpi-cmp.c | 46 +- + lib/mpi/mpi-div.c | 234 + + lib/mpi/mpi-internal.h | 53 + + lib/mpi/mpi-inv.c | 143 + + lib/mpi/mpi-mod.c | 155 + + lib/mpi/mpi-mul.c | 91 + + lib/mpi/mpicoder.c | 336 + + lib/mpi/mpih-div.c | 294 + + lib/mpi/mpih-mul.c | 25 + + lib/mpi/mpiutil.c | 204 + + lib/percpu-refcount.c | 131 +- + lib/string_helpers.c | 23 + + lib/test_free_pages.c | 42 + + lib/test_hmm.c | 65 +- + lib/test_kasan.c | 728 +-- + lib/test_kasan_module.c | 111 + + lib/vsprintf.c | 4 +- + mm/Kconfig | 6 +- + mm/Makefile | 1 - + mm/backing-dev.c | 14 +- + mm/compaction.c | 5 +- + mm/debug.c | 18 +- + mm/dmapool.c | 46 +- + mm/fadvise.c | 9 +- + mm/filemap.c | 78 +- + mm/gup.c | 44 +- + mm/gup_benchmark.c | 23 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 100 +- + mm/internal.h | 3 + + mm/kasan/report.c | 34 +- + mm/kmemleak.c | 8 +- + mm/madvise.c | 21 +- + mm/memblock.c | 98 +- + mm/memcontrol.c | 262 +- + mm/memory-failure.c | 7 +- + mm/memory.c | 147 +- + mm/memory_hotplug.c | 10 +- + mm/mempolicy.c | 8 +- + mm/mempool.c | 18 +- + mm/memremap.c | 308 +- + mm/migrate.c | 5 +- + mm/mincore.c | 28 +- + mm/mmap.c | 47 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 2 + + mm/page-writeback.c | 18 +- + mm/page_alloc.c | 82 +- + mm/page_counter.c | 2 +- + mm/page_io.c | 32 +- + mm/page_isolation.c | 39 +- + mm/process_vm_access.c | 86 +- + mm/shmem.c | 19 +- + mm/slab.c | 4 +- + mm/slab.h | 42 +- + mm/slub.c | 33 +- + mm/sparse.c | 10 +- + mm/swap.c | 79 +- + mm/swap_slots.c | 3 +- + mm/swap_state.c | 36 +- + mm/swapfile.c | 61 +- + mm/truncate.c | 58 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 5 +- + mm/z3fold.c | 3 +- + mm/zbud.c | 1 - + net/compat.c | 4 +- + net/core/skbuff.c | 13 +- + net/ipv4/icmp.c | 10 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/raw.c | 2 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/raw.c | 2 +- + net/sunrpc/Kconfig | 1 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 276 - + net/sunrpc/auth_gss/gss_krb5_mech.c | 95 - + net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 87 - + net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 - + net/sunrpc/auth_gss/gss_krb5_wrap.c | 65 +- + net/sunrpc/socklib.c | 2 +- + net/unix/scm.c | 1 + + samples/Makefile | 1 + + samples/kmemleak/Makefile | 3 + + {mm => samples/kmemleak}/kmemleak-test.c | 2 +- + samples/kprobes/kprobe_example.c | 8 +- + samples/kprobes/kretprobe_example.c | 6 +- + scripts/Makefile.kcsan | 2 +- + scripts/atomic/check-atomics.sh | 1 + + scripts/atomic/gen-atomic-instrumented.sh | 21 +- + scripts/coccinelle/api/device_attr_show.cocci | 2 +- + scripts/decodecode | 29 +- + scripts/gdb/linux/dmesg.py | 147 +- + scripts/gdb/linux/utils.py | 7 + + scripts/kernel-doc | 5 +- + scripts/selinux/mdp/mdp.c | 7 + + scripts/spelling.txt | 4 + + scripts/tags.sh | 2 + + security/integrity/digsig_asymmetric.c | 14 +- + security/integrity/platform_certs/load_uefi.c | 85 +- + security/keys/compat.c | 37 +- + security/keys/internal.h | 5 - + security/keys/keyctl.c | 2 +- + security/selinux/avc.c | 29 +- + security/selinux/hooks.c | 17 +- + security/selinux/include/conditional.h | 2 +- + security/selinux/include/policycap.h | 20 + + security/selinux/include/policycap_names.h | 18 + + security/selinux/include/security.h | 63 +- + security/selinux/selinuxfs.c | 259 +- + security/selinux/ss/avtab.c | 49 +- + security/selinux/ss/avtab.h | 1 + + security/selinux/ss/conditional.c | 155 + + security/selinux/ss/conditional.h | 2 + + security/selinux/ss/hashtab.c | 53 + + security/selinux/ss/hashtab.h | 6 + + security/selinux/ss/services.c | 875 +-- + security/selinux/ss/services.h | 5 +- + security/selinux/ss/sidtab.c | 10 + + security/selinux/ss/sidtab.h | 2 + + security/smack/smack.h | 19 +- + security/smack/smack_access.c | 55 +- + security/smack/smack_lsm.c | 252 +- + security/smack/smackfs.c | 23 +- + security/tomoyo/util.c | 29 +- + tools/arch/x86/include/asm/orc_types.h | 34 - + tools/arch/x86/tools/gen-insn-attr-x86.awk | 50 +- + tools/cgroup/iocost_monitor.py | 54 +- + tools/gpio/gpio-event-mon.c | 146 +- + tools/gpio/gpio-hammer.c | 56 +- + tools/gpio/gpio-utils.c | 176 +- + tools/gpio/gpio-utils.h | 48 +- + tools/gpio/gpio-watch.c | 16 +- + tools/gpio/lsgpio.c | 60 +- + tools/include/linux/objtool.h | 129 + + tools/include/linux/static_call_types.h | 35 + + tools/include/uapi/asm-generic/unistd.h | 14 +- + tools/lib/subcmd/help.c | 10 +- + tools/memory-model/Documentation/cheatsheet.txt | 33 +- + tools/memory-model/Documentation/litmus-tests.txt | 1074 ++++ + tools/memory-model/Documentation/recipes.txt | 4 +- + tools/memory-model/Documentation/references.txt | 2 +- + tools/memory-model/Documentation/simple.txt | 271 + + tools/memory-model/README | 160 +- + tools/objtool/Makefile | 6 +- + tools/objtool/arch.h | 4 + + tools/objtool/arch/x86/Build | 1 + + tools/objtool/arch/x86/decode.c | 37 + + tools/objtool/arch/x86/include/arch_special.h | 20 + + tools/objtool/arch/x86/special.c | 145 + + tools/objtool/builtin-check.c | 15 +- + tools/objtool/builtin-orc.c | 27 +- + tools/objtool/check.c | 417 +- + tools/objtool/check.h | 10 +- + tools/objtool/elf.c | 8 +- + tools/objtool/elf.h | 3 +- + tools/objtool/objtool.c | 30 + + tools/objtool/objtool.h | 7 +- + tools/objtool/orc_dump.c | 9 +- + tools/objtool/orc_gen.c | 12 +- + tools/objtool/special.c | 48 +- + tools/objtool/special.h | 10 + + tools/objtool/sync-check.sh | 33 +- + tools/objtool/weak.c | 6 +- + tools/perf/Makefile.config | 2 +- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 12 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 12 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 10 +- + tools/power/acpi/Makefile | 2 + + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + tools/power/cpupower/utils/cpufreq-set.c | 14 +- + tools/power/pm-graph/sleepgraph.py | 2 +- + tools/power/x86/intel-speed-select/isst-config.c | 23 +- + tools/power/x86/intel-speed-select/isst-core.c | 8 +- + tools/power/x86/intel-speed-select/isst.h | 2 +- + tools/testing/nvdimm/dax-dev.c | 22 +- + tools/testing/nvdimm/test/iomap.c | 2 +- + tools/testing/selftests/clone3/clone3.c | 45 +- + .../clone3/clone3_cap_checkpoint_restore.c | 4 +- + .../selftests/clone3/clone3_clear_sighand.c | 2 +- + tools/testing/selftests/clone3/clone3_selftests.h | 24 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 4 +- + .../ftrace/test.d/dynevent/add_remove_kprobe.tc | 2 +- + .../ftrace/test.d/dynevent/clear_select_events.tc | 2 +- + .../ftrace/test.d/dynevent/generic_clear_event.tc | 2 +- + .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 4 +- + .../ftrace/test.d/kprobe/add_and_remove.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_args_comm.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_args_symbol.tc | 10 +- + .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +- + .../ftrace/test.d/kprobe/kprobe_multiprobe.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 12 +- + .../ftrace/test.d/kprobe/kretprobe_args.tc | 4 +- + .../selftests/ftrace/test.d/kprobe/profile.tc | 2 +- + tools/testing/selftests/kselftest_harness.h | 5 + + tools/testing/selftests/pidfd/pidfd.h | 4 + + tools/testing/selftests/pidfd/pidfd_setns_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_wait.c | 304 +- + tools/testing/selftests/rseq/param_test.c | 223 +- + tools/testing/selftests/rseq/rseq-x86.h | 57 + + tools/testing/selftests/rseq/run_param_test.sh | 2 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 440 +- + tools/testing/selftests/vm/Makefile | 17 + + tools/testing/selftests/vm/compaction_test.c | 11 +- + tools/testing/selftests/vm/gup_benchmark.c | 32 +- + tools/testing/selftests/vm/hmm-tests.c | 4 +- + tools/testing/selftests/vm/userfaultfd.c | 296 +- + 3034 files changed, 95882 insertions(+), 62125 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-kernel-notes + rename Documentation/{filesystems => PCI}/sysfs-pci.rst (100%) + create mode 100644 Documentation/admin-guide/gpio/gpio-mockup.rst + create mode 100644 Documentation/admin-guide/media/rkisp1.dot + create mode 100644 Documentation/admin-guide/media/rkisp1.rst + delete mode 100644 Documentation/admin-guide/media/usbvision-cardlist.rst + create mode 100644 Documentation/admin-guide/media/zoran-cardlist.rst + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,adm1266.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm75.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/lm75.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max20730.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sensirion,shtc1.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5647.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt + create mode 100644 Documentation/devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-am654.txt + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-am654.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/mp886x.txt + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp886x.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mt6360-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/pfuze100.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pfuze100.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/raspberrypi,7inch-touchscreen-panel-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtmv20-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8824x.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8824x.txt + create mode 100644 Documentation/devicetree/bindings/rng/ingenic,trng.yaml + create mode 100644 Documentation/devicetree/bindings/rng/xiphera,xip8001b-trng.yaml + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mtk-nor.txt + create mode 100644 Documentation/driver-api/media/camera-sensor.rst + create mode 100644 Documentation/driver-api/media/drivers/vidtv.rst + create mode 100644 Documentation/driver-api/media/drivers/zoran.rst + create mode 100644 Documentation/hwmon/adm1266.rst + create mode 100644 Documentation/hwmon/intel-m10-bmc-hwmon.rst + create mode 100644 Documentation/hwmon/mp2975.rst + delete mode 100644 Documentation/ia64/xen.rst + create mode 100644 Documentation/maintainer/modifying-patches.rst + rename Documentation/{filesystems => networking}/sysfs-tagging.rst (100%) + create mode 100644 Documentation/translations/zh_CN/arm64/amu.rst + create mode 100644 Documentation/translations/zh_CN/arm64/index.rst + create mode 100644 Documentation/userspace-api/iommu.rst + create mode 100644 Documentation/userspace-api/media/glossary.rst + create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst + delete mode 100644 Documentation/virt/uml/user_mode_linux.rst + create mode 100644 Documentation/virt/uml/user_mode_linux_howto_v2.rst + rename arch/arm/{kernel => include/asm}/vmlinux.lds.h (84%) + delete mode 100644 arch/ia64/kernel/perfmon.c + delete mode 100644 arch/ia64/lib/carta_random.S + delete mode 100644 arch/ia64/oprofile/perfmon.c + create mode 100644 arch/x86/boot/compressed/ident_map_64.c + create mode 100644 arch/x86/boot/compressed/idt_64.c + create mode 100644 arch/x86/boot/compressed/idt_handlers_64.S + delete mode 100644 arch/x86/boot/compressed/kaslr_64.c + create mode 100644 arch/x86/boot/compressed/sev-es.c + create mode 100644 arch/x86/include/asm/fpu/xcr.h + create mode 100644 arch/x86/include/asm/sev-es.h + create mode 100644 arch/x86/include/asm/static_call.h + create mode 100644 arch/x86/include/asm/trap_pf.h + create mode 100644 arch/x86/kernel/sev-es-shared.c + create mode 100644 arch/x86/kernel/sev-es.c + create mode 100644 arch/x86/kernel/static_call.c + create mode 100644 crypto/sm2.c + create mode 100644 crypto/sm2signature.asn1 + create mode 100644 drivers/acpi/dptf/dptf_pch_fivr.c + create mode 100644 drivers/acpi/pmic/Kconfig + create mode 100644 drivers/acpi/pmic/Makefile + create mode 100644 drivers/base/regmap/regmap-spi-avmm.c + create mode 100644 drivers/char/hw_random/ingenic-trng.c + create mode 100644 drivers/char/hw_random/xiphera-trng.c + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c + create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c + create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c + create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c + create mode 100644 drivers/crypto/caam/debugfs.c + create mode 100644 drivers/crypto/caam/debugfs.h + create mode 100644 drivers/dax/hmem/Makefile + create mode 100644 drivers/dax/hmem/device.c + rename drivers/dax/{ => hmem}/hmem.c (69%) + rename drivers/firmware/efi/{arm-init.c => efi-init.c} (99%) + delete mode 100644 drivers/firmware/efi/libstub/hidden.h + create mode 100644 drivers/firmware/efi/mokvar-table.c + delete mode 100644 drivers/gpio/gpiolib-devprop.c + create mode 100644 drivers/hwmon/intel-m10-bmc-hwmon.c + create mode 100644 drivers/hwmon/mr75203.c + create mode 100644 drivers/hwmon/pmbus/adm1266.c + create mode 100644 drivers/hwmon/pmbus/mp2975.c + create mode 100644 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c + create mode 100644 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h + create mode 100644 drivers/iommu/io-pgtable-arm.h + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (91%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (98%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%) + rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (77%) + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c + create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h + create mode 100644 drivers/media/test-drivers/vidtv/Kconfig + create mode 100644 drivers/media/test-drivers/vidtv/Makefile + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_bridge.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_bridge.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_channel.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_channel.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_common.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_common.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_demod.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_demod.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_encoder.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_mux.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_mux.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_pes.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_pes.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_psi.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_psi.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_s302m.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_s302m.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_ts.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_ts.h + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_tuner.c + create mode 100644 drivers/media/test-drivers/vidtv/vidtv_tuner.h + create mode 100644 drivers/mmc/host/sdhci-of-sparx5.c + create mode 100644 drivers/regulator/bd9576-regulator.c + create mode 100644 drivers/regulator/mt6360-regulator.c + create mode 100644 drivers/regulator/rpi-panel-attiny-regulator.c + create mode 100644 drivers/regulator/rt4801-regulator.c + create mode 100644 drivers/regulator/rtmv20-regulator.c + create mode 100644 drivers/spi/spi-dw-bt1.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/ibuf_ctrl_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/ibuf_ctrl.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp2400_system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp2401_system_global.h + delete mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-params.rst + delete mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst + delete mode 100644 drivers/staging/media/usbvision/Kconfig + delete mode 100644 drivers/staging/media/usbvision/Makefile + delete mode 100644 drivers/staging/media/usbvision/TODO + delete mode 100644 drivers/staging/media/usbvision/usbvision-cards.c + delete mode 100644 drivers/staging/media/usbvision/usbvision-cards.h + delete mode 100644 drivers/staging/media/usbvision/usbvision-core.c + delete mode 100644 drivers/staging/media/usbvision/usbvision-i2c.c + delete mode 100644 drivers/staging/media/usbvision/usbvision-video.c + delete mode 100644 drivers/staging/media/usbvision/usbvision.h + create mode 100644 drivers/staging/media/zoran/Kconfig + create mode 100644 drivers/staging/media/zoran/Makefile + create mode 100644 drivers/staging/media/zoran/TODO + create mode 100644 drivers/staging/media/zoran/videocodec.c + create mode 100644 drivers/staging/media/zoran/videocodec.h + create mode 100644 drivers/staging/media/zoran/zoran.h + create mode 100644 drivers/staging/media/zoran/zoran_card.c + create mode 100644 drivers/staging/media/zoran/zoran_card.h + create mode 100644 drivers/staging/media/zoran/zoran_device.c + create mode 100644 drivers/staging/media/zoran/zoran_device.h + create mode 100644 drivers/staging/media/zoran/zoran_driver.c + create mode 100644 drivers/staging/media/zoran/zr36016.c + create mode 100644 drivers/staging/media/zoran/zr36016.h + create mode 100644 drivers/staging/media/zoran/zr36050.c + create mode 100644 drivers/staging/media/zoran/zr36050.h + create mode 100644 drivers/staging/media/zoran/zr36057.h + create mode 100644 drivers/staging/media/zoran/zr36060.c + create mode 100644 drivers/staging/media/zoran/zr36060.h + delete mode 100644 fs/compat.c + delete mode 100644 fs/quota/compat.c + create mode 100644 fs/quota/compat.h + delete mode 100644 include/crypto/cbc.h + create mode 100644 include/crypto/sm2.h + create mode 100644 include/dt-bindings/memory/mt8167-larb-port.h + create mode 100644 include/dt-bindings/regulator/mediatek,mt6360-regulator.h + delete mode 100644 include/linux/frame.h + create mode 100644 include/linux/hidden.h + create mode 100644 include/linux/io_uring.h + create mode 100644 include/linux/objtool.h + create mode 100644 include/linux/sched/sd_flags.h + create mode 100644 include/linux/static_call.h + create mode 100644 include/linux/static_call_types.h + create mode 100644 include/trace/events/avc.h + create mode 100644 include/uapi/linux/pidfd.h + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h + create mode 100644 kernel/static_call.c + create mode 100644 lib/mpi/ec.c + create mode 100644 lib/mpi/mpi-add.c + create mode 100644 lib/mpi/mpi-div.c + create mode 100644 lib/mpi/mpi-inv.c + create mode 100644 lib/mpi/mpi-mod.c + create mode 100644 lib/mpi/mpi-mul.c + create mode 100644 lib/test_free_pages.c + create mode 100644 lib/test_kasan_module.c + create mode 100644 samples/kmemleak/Makefile + rename {mm => samples/kmemleak}/kmemleak-test.c (98%) + create mode 100644 security/selinux/include/policycap.h + create mode 100644 security/selinux/include/policycap_names.h + create mode 100644 tools/include/linux/objtool.h + create mode 100644 tools/include/linux/static_call_types.h + create mode 100644 tools/memory-model/Documentation/litmus-tests.txt + create mode 100644 tools/memory-model/Documentation/simple.txt + create mode 100644 tools/objtool/arch/x86/include/arch_special.h + create mode 100644 tools/objtool/arch/x86/special.c +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (e30d694c3381 Documentation/llvm: Fix clang target examples) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (6364d1b41cc3 arc: include/asm: fix typos of "themselves") +$ git merge arc-current/for-curr +Removing arch/arc/plat-eznps/smp.c +Removing arch/arc/plat-eznps/platform.c +Removing arch/arc/plat-eznps/mtm.c +Removing arch/arc/plat-eznps/include/plat/smp.h +Removing arch/arc/plat-eznps/include/plat/mtm.h +Removing arch/arc/plat-eznps/include/plat/ctop.h +Removing arch/arc/plat-eznps/entry.S +Removing arch/arc/plat-eznps/ctop.c +Removing arch/arc/plat-eznps/Makefile +Removing arch/arc/plat-eznps/Kconfig +Removing arch/arc/configs/nps_defconfig +Removing arch/arc/boot/dts/eznps.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 -- + arch/arc/Kconfig | 2 - + arch/arc/Makefile | 5 - + arch/arc/boot/dts/axc001.dtsi | 2 +- + arch/arc/boot/dts/axc003.dtsi | 2 +- + arch/arc/boot/dts/axc003_idu.dtsi | 2 +- + arch/arc/boot/dts/eznps.dts | 84 ------------- + arch/arc/boot/dts/vdk_axc003.dtsi | 2 +- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 2 +- + arch/arc/configs/nps_defconfig | 80 ------------ + arch/arc/include/asm/atomic.h | 108 +---------------- + arch/arc/include/asm/barrier.h | 9 +- + arch/arc/include/asm/bitops.h | 58 +-------- + arch/arc/include/asm/cmpxchg.h | 72 +---------- + arch/arc/include/asm/entry-compact.h | 27 ----- + arch/arc/include/asm/processor.h | 37 ------ + arch/arc/include/asm/ptrace.h | 5 - + arch/arc/include/asm/setup.h | 4 - + arch/arc/include/asm/spinlock.h | 6 - + arch/arc/include/asm/switch_to.h | 9 -- + arch/arc/kernel/ctx_sw.c | 13 -- + arch/arc/kernel/devtree.c | 2 - + arch/arc/kernel/process.c | 15 --- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/tlbex.S | 7 -- + arch/arc/plat-eznps/Kconfig | 58 --------- + arch/arc/plat-eznps/Makefile | 8 -- + arch/arc/plat-eznps/ctop.c | 21 ---- + arch/arc/plat-eznps/entry.S | 60 --------- + arch/arc/plat-eznps/include/plat/ctop.h | 208 -------------------------------- + arch/arc/plat-eznps/include/plat/mtm.h | 49 -------- + arch/arc/plat-eznps/include/plat/smp.h | 15 --- + arch/arc/plat-eznps/mtm.c | 166 ------------------------- + arch/arc/plat-eznps/platform.c | 91 -------------- + arch/arc/plat-eznps/smp.c | 138 --------------------- + arch/arc/plat-hsdk/Kconfig | 1 + + 36 files changed, 15 insertions(+), 1362 deletions(-) + delete mode 100644 arch/arc/boot/dts/eznps.dts + delete mode 100644 arch/arc/configs/nps_defconfig + delete mode 100644 arch/arc/plat-eznps/Kconfig + delete mode 100644 arch/arc/plat-eznps/Makefile + delete mode 100644 arch/arc/plat-eznps/ctop.c + delete mode 100644 arch/arc/plat-eznps/entry.S + delete mode 100644 arch/arc/plat-eznps/include/plat/ctop.h + delete mode 100644 arch/arc/plat-eznps/include/plat/mtm.h + delete mode 100644 arch/arc/plat-eznps/include/plat/smp.h + delete mode 100644 arch/arc/plat-eznps/mtm.c + delete mode 100644 arch/arc/plat-eznps/platform.c + delete mode 100644 arch/arc/plat-eznps/smp.c +Merging arm-current/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (39e4716caa59 crypto: arm64: Use x16 with indirect branch to bti_c) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (6869f774b1cd Merge tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Removing include/dt-bindings/mux/mux-j721e-wiz.h +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 15 ++++- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 10 +-- + arch/arm/mach-omap2/cpuidle44xx.c | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 6 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 7 ++- + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 8 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 ++- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 11 ++-- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 13 ++-- + drivers/soc/actions/owl-sps-helper.c | 1 + + drivers/soc/qcom/pdr_internal.h | 2 +- + drivers/soc/xilinx/zynqmp_power.c | 2 +- + include/dt-bindings/mux/mux-j721e-wiz.h | 53 ---------------- + include/dt-bindings/mux/ti-serdes.h | 71 ++++++++++++++++++++++ + include/dt-bindings/pinctrl/omap.h | 2 +- + 16 files changed, 134 insertions(+), 82 deletions(-) + delete mode 100644 include/dt-bindings/mux/mux-j721e-wiz.h + create mode 100644 include/dt-bindings/mux/ti-serdes.h +Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()) +$ git merge drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/memory/jz4780-nemc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (0460534b532e powerpc/papr_scm: Limit the readability of 'perf_stats' sysfs attribute) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (549738f15da0 Linux 5.9-rc8) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 8 files changed, 20 insertions(+), 18 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (1e40d75ef90c Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/scaling.rst | 6 +-- + drivers/net/can/m_can/m_can_platform.c | 2 - + drivers/net/dsa/microchip/ksz_common.c | 16 +++--- + drivers/net/ethernet/freescale/fec_main.c | 35 ++++++++++--- + drivers/net/ethernet/korina.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 ++ + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ipa/ipa_endpoint.c | 6 +++ + include/net/netfilter/nf_log.h | 1 + + include/net/tls.h | 4 -- + net/can/j1939/transport.c | 2 + + net/core/sock.c | 11 ++-- + net/ipv4/ip_gre.c | 15 ++++-- + net/ipv4/netfilter/nf_log_arp.c | 19 ++++++- + net/ipv4/netfilter/nf_log_ipv4.c | 6 ++- + net/ipv4/route.c | 4 +- + net/ipv6/netfilter/nf_log_ipv6.c | 8 +-- + net/ipv6/route.c | 3 +- + net/mptcp/options.c | 34 ++++++++++--- + net/mptcp/protocol.c | 17 +++++++ + net/mptcp/protocol.h | 4 +- + net/mptcp/subflow.c | 19 +++++-- + net/netfilter/ipvs/ip_vs_xmit.c | 6 +++ + net/netfilter/nf_log_common.c | 12 +++++ + net/netfilter/nf_tables_api.c | 19 +++++-- + net/smc/smc_llc.c | 6 +-- + net/tipc/msg.c | 3 +- + net/tipc/name_distr.c | 10 +++- + net/tipc/node.c | 2 +- + net/tls/tls_device.c | 11 ++-- + tools/testing/selftests/netfilter/nf-queue.c | 61 ++++++++++++++++++---- + tools/testing/selftests/netfilter/nft_meta.sh | 32 +++++++++--- + tools/testing/selftests/netfilter/nft_queue.sh | 70 +++++++++++++++++++++----- + 34 files changed, 349 insertions(+), 105 deletions(-) +Merging bpf/master (28802e7c0c99 net: usb: qmi_wwan: add Cellient MPL200 card) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (7fe94612dd4c xfrm: interface: fix the priorities for ipip and ipv6 tunnels) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_tunnel.c | 4 ++-- + net/ipv6/xfrm6_tunnel.c | 4 ++-- + net/xfrm/xfrm_interface.c | 8 ++++---- + 3 files changed, 8 insertions(+), 8 deletions(-) +Merging netfilter/master (1e40d75ef90c Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (48d072c4e8cd selftests: netfilter: add time counter check) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (df41c19abbea drivers/net/wan/hdlc_fr: Move the skb_headroom check out of fr_hard_header) +$ git merge wireless-drivers/master +Removing tools/testing/selftests/bpf/test_sock_fields.c +Auto-merging tools/perf/Makefile.config +Removing tools/build/feature/test-libelf-mmap.c +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/tipc/node.c +Auto-merging net/tipc/msg.c +Auto-merging net/smc/smc_llc.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/mptcp/subflow.c +Auto-merging net/mptcp/protocol.h +CONFLICT (content): Merge conflict in net/mptcp/protocol.h +Auto-merging net/mptcp/protocol.c +Auto-merging net/mptcp/options.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/raw.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/ipv4/icmp.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging mm/page_alloc.c +Auto-merging mm/filemap.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Removing include/net/drop_monitor.h +Removing include/net/caif/caif_spi.h +Auto-merging include/linux/skbuff.h +Removing include/linux/platform_data/macb.h +Auto-merging fs/io_uring.c +Auto-merging drivers/net/ipa/ipa_endpoint.c +Auto-merging drivers/net/ethernet/ti/tlan.c +Removing drivers/net/ethernet/mscc/ocelot_s2.h +Removing drivers/net/ethernet/mellanox/mlx5/core/esw/chains.h +Removing drivers/net/ethernet/mellanox/mlx5/core/esw/chains.c +Removing drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/3com/typhoon.c +Auto-merging drivers/net/dsa/microchip/ksz_common.c +Removing drivers/net/caif/caif_spi_slave.c +Removing drivers/net/caif/caif_spi.c +Auto-merging drivers/crypto/chelsio/chcr_core.c +Auto-merging drivers/block/nbd.c +Auto-merging arch/x86/include/asm/nospec-branch.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/index.rst +Removing Documentation/networking/caif/spi_porting.rst +Removing Documentation/devicetree/bindings/net/renesas,ravb.txt +Removing Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'net/mptcp/protocol.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a307b1b214d0] Merge remote-tracking branch 'wireless-drivers/master' into master +$ git diff -M --stat --summary HEAD^.. + CREDITS | 4 + + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/admin-guide/sysctl/net.rst | 20 +- + Documentation/bpf/bpf_devel_QA.rst | 19 +- + Documentation/bpf/btf.rst | 25 + + Documentation/bpf/index.rst | 1 + + Documentation/bpf/prog_sk_lookup.rst | 98 + + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 7 + + .../devicetree/bindings/net/brcm,systemport.txt | 5 + + .../devicetree/bindings/net/can/fsl-flexcan.txt | 10 +- + .../bindings/net/can/microchip,mcp251x.txt | 7 +- + .../bindings/net/can/microchip,mcp251xfd.yaml | 79 + + .../devicetree/bindings/net/can/rcar_can.txt | 8 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 5 +- + Documentation/devicetree/bindings/net/dsa/b53.txt | 9 +- + .../devicetree/bindings/net/dsa/mt7530.txt | 13 +- + .../bindings/net/ethernet-controller.yaml | 14 + + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 130 + + .../devicetree/bindings/net/marvell,prestera.txt | 34 + + .../devicetree/bindings/net/nfc/s3fwrn5.txt | 25 - + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 73 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 262 ++ + .../devicetree/bindings/net/renesas,ravb.txt | 135 - + .../devicetree/bindings/net/smsc-lan87xx.txt | 4 + + .../devicetree/bindings/net/ti,dp83822.yaml | 80 + + .../bindings/net/wireless/qcom,ath10k.txt | 4 +- + .../bindings/net/wireless/qcom,ath11k.yaml | 4 +- + .../devicetree/bindings/ptp/ptp-qoriq.txt | 2 + + Documentation/driver-api/80211/cfg80211.rst | 392 +-- + .../driver-api/80211/mac80211-advanced.rst | 151 +- + Documentation/driver-api/80211/mac80211.rst | 148 +- + Documentation/networking/af_xdp.rst | 68 +- + Documentation/networking/caif/index.rst | 1 - + Documentation/networking/caif/spi_porting.rst | 229 -- + .../device_drivers/ethernet/amazon/ena.rst | 25 +- + Documentation/networking/devlink/devlink-flash.rst | 28 + + .../networking/devlink/devlink-params.rst | 6 + + .../networking/devlink/devlink-reload.rst | 81 + + Documentation/networking/devlink/devlink-trap.rst | 70 + + Documentation/networking/devlink/ice.rst | 36 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/ethtool-netlink.rst | 11 + + Documentation/networking/index.rst | 1 + + Documentation/networking/kapi.rst | 9 + + Documentation/networking/l2tp.rst | 939 ++++-- + Documentation/networking/statistics.rst | 179 ++ + Documentation/networking/vxlan.rst | 28 + + MAINTAINERS | 48 +- + Makefile | 4 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 50 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 63 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 4 +- + arch/powerpc/boot/dts/fsl/t1040rdb.dts | 107 + + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 78 + + arch/s390/include/asm/ccwdev.h | 9 +- + arch/s390/include/asm/chsc.h | 7 + + arch/s390/include/asm/css_chars.h | 4 +- + arch/s390/net/bpf_jit_comp.c | 61 +- + arch/x86/include/asm/nospec-branch.h | 16 +- + arch/x86/net/bpf_jit_comp.c | 310 +- + drivers/atm/atmtcp.c | 2 +- + drivers/bcma/driver_pci_host.c | 4 +- + drivers/block/nbd.c | 6 +- + drivers/bluetooth/btintel.c | 291 +- + drivers/bluetooth/btintel.h | 91 + + drivers/bluetooth/btmrvl_sdio.c | 54 +- + drivers/bluetooth/btmtksdio.c | 4 +- + drivers/bluetooth/btusb.c | 129 +- + drivers/bluetooth/hci_h5.c | 2 - + drivers/bluetooth/hci_intel.c | 54 +- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_qca.c | 8 +- + drivers/bluetooth/hci_serdev.c | 36 +- + drivers/connector/connector.c | 7 +- + drivers/crypto/chelsio/Kconfig | 32 - + drivers/crypto/chelsio/Makefile | 5 - + drivers/crypto/chelsio/chcr_algo.h | 33 - + drivers/crypto/chelsio/chcr_core.c | 62 - + drivers/crypto/chelsio/chcr_core.h | 96 - + drivers/net/Kconfig | 4 + + drivers/net/Makefile | 2 + + drivers/net/appletalk/cops.c | 2 + + drivers/net/appletalk/ltpc.c | 2 + + drivers/net/bareudp.c | 11 +- + drivers/net/caif/Kconfig | 19 - + drivers/net/caif/Makefile | 4 - + drivers/net/caif/caif_hsi.c | 19 +- + drivers/net/caif/caif_spi.c | 874 ------ + drivers/net/caif/caif_spi_slave.c | 254 -- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/can/Kconfig | 4 +- + drivers/net/can/at91_can.c | 8 +- + drivers/net/can/c_can/c_can.c | 9 - + drivers/net/can/c_can/c_can.h | 4 +- + drivers/net/can/cc770/cc770.c | 2 +- + drivers/net/can/cc770/cc770.h | 2 +- + drivers/net/can/dev.c | 58 +- + drivers/net/can/flexcan.c | 610 +++- + drivers/net/can/grcan.c | 4 +- + drivers/net/can/m_can/Kconfig | 2 +- + drivers/net/can/mscan/mpc5xxx_can.c | 2 +- + drivers/net/can/mscan/mscan.c | 29 +- + drivers/net/can/pch_can.c | 67 +- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 - + drivers/net/can/rx-offload.c | 11 + + drivers/net/can/sja1000/peak_pci.c | 2 +- + drivers/net/can/sja1000/peak_pcmcia.c | 2 +- + drivers/net/can/softing/Kconfig | 6 +- + drivers/net/can/softing/softing_fw.c | 8 +- + drivers/net/can/softing/softing_main.c | 11 +- + drivers/net/can/softing/softing_platform.h | 2 +- + drivers/net/can/spi/Kconfig | 4 +- + drivers/net/can/spi/Makefile | 1 + + drivers/net/can/spi/mcp251x.c | 345 ++- + drivers/net/can/spi/mcp251xfd/Kconfig | 17 + + drivers/net/can/spi/mcp251xfd/Makefile | 8 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2927 ++++++++++++++++++ + drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c | 89 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 556 ++++ + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 835 +++++ + drivers/net/can/ti_hecc.c | 29 +- + drivers/net/can/usb/Kconfig | 2 +- + drivers/net/can/usb/gs_usb.c | 4 +- + drivers/net/can/usb/mcba_usb.c | 4 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 166 +- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 4 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 4 +- + drivers/net/can/usb/ucan.c | 4 +- + drivers/net/can/usb/usb_8dev.c | 4 +- + drivers/net/can/xilinx_can.c | 16 +- + drivers/net/dsa/Kconfig | 6 +- + drivers/net/dsa/b53/b53_common.c | 99 +- + drivers/net/dsa/b53/b53_priv.h | 5 +- + drivers/net/dsa/bcm_sf2.c | 136 +- + drivers/net/dsa/bcm_sf2.h | 4 + + drivers/net/dsa/dsa_loop.c | 59 +- + drivers/net/dsa/lantiq_gswip.c | 26 +- + drivers/net/dsa/microchip/ksz8795.c | 6 +- + drivers/net/dsa/microchip/ksz9477.c | 32 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 1 + + drivers/net/dsa/microchip/ksz_common.c | 3 +- + drivers/net/dsa/mt7530.c | 1271 +++++++- + drivers/net/dsa/mt7530.h | 259 +- + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 308 +- + drivers/net/dsa/mv88e6xxx/chip.h | 18 + + drivers/net/dsa/mv88e6xxx/devlink.c | 633 ++++ + drivers/net/dsa/mv88e6xxx/devlink.h | 21 + + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 59 +- + drivers/net/dsa/ocelot/Kconfig | 23 +- + drivers/net/dsa/ocelot/Makefile | 6 +- + drivers/net/dsa/ocelot/felix.c | 124 +- + drivers/net/dsa/ocelot/felix.h | 32 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 639 ++-- + drivers/net/dsa/ocelot/seville_vsc9953.c | 284 +- + drivers/net/dsa/qca8k.c | 6 +- + drivers/net/dsa/realtek-smi-core.c | 3 +- + drivers/net/dsa/realtek-smi-core.h | 9 +- + drivers/net/dsa/rtl8366.c | 291 +- + drivers/net/dsa/rtl8366rb.c | 115 +- + drivers/net/dsa/sja1105/Makefile | 1 + + drivers/net/dsa/sja1105/sja1105.h | 20 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 262 ++ + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 10 +- + drivers/net/dsa/sja1105/sja1105_main.c | 326 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 5 +- + drivers/net/ethernet/3com/typhoon.c | 61 +- + drivers/net/ethernet/8390/axnet_cs.c | 17 +- + drivers/net/ethernet/8390/lib8390.c | 32 +- + drivers/net/ethernet/8390/pcnet_cs.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 77 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 6 +- + drivers/net/ethernet/alteon/acenic.c | 9 +- + drivers/net/ethernet/alteon/acenic.h | 3 +- + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 128 +- + drivers/net/ethernet/amazon/ena/ena_com.c | 247 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 42 +- + drivers/net/ethernet/amazon/ena/ena_common_defs.h | 31 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 84 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 37 +- + drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h | 31 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 203 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 178 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 40 +- + drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h | 31 +- + drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 31 +- + drivers/net/ethernet/amd/sun3lance.c | 11 - + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 19 +- + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 11 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 11 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 53 + + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 6 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 50 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 4 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 37 + + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 13 + + drivers/net/ethernet/arc/emac_arc.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 160 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 55 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 66 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 50 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 19 +- + drivers/net/ethernet/broadcom/b44.c | 8 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 40 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 22 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 98 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 702 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 161 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 19 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 312 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 397 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/cnic.c | 18 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 20 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 13 +- + drivers/net/ethernet/brocade/bna/bnad.c | 7 +- + drivers/net/ethernet/cadence/macb.h | 11 + + drivers/net/ethernet/cadence/macb_main.c | 14 +- + drivers/net/ethernet/cadence/macb_pci.c | 3 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 + + drivers/net/ethernet/cavium/common/cavium_ptp.c | 10 +- + .../net/ethernet/cavium/liquidio/cn68xx_device.c | 2 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 92 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 363 +-- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 158 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 12 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 13 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 11 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 5 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 1 + + .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 1 + + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 8 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 14 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 2 +- + drivers/net/ethernet/chelsio/Kconfig | 2 + + drivers/net/ethernet/chelsio/Makefile | 1 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 10 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 76 +- + drivers/net/ethernet/chelsio/cxgb3/adapter.h | 1 + + drivers/net/ethernet/chelsio/cxgb3/ael1002.c | 7 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 10 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 91 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 15 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 57 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 54 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 17 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 204 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 10 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 58 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 32 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 8 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 92 +- + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 52 + + .../net/ethernet/chelsio/inline_crypto/Makefile | 4 + + .../chelsio/inline_crypto/ch_ipsec/Makefile | 8 + + .../chelsio/inline_crypto/ch_ipsec}/chcr_ipsec.c | 104 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h | 58 + + .../chelsio/inline_crypto/ch_ktls/Makefile | 5 + + .../chelsio/inline_crypto/ch_ktls}/chcr_common.h | 24 - + .../chelsio/inline_crypto/ch_ktls}/chcr_ktls.c | 471 ++- + .../chelsio/inline_crypto/ch_ktls}/chcr_ktls.h | 43 +- + .../ethernet/chelsio/inline_crypto}/chtls/Makefile | 0 + .../ethernet/chelsio/inline_crypto}/chtls/chtls.h | 88 + + .../chelsio/inline_crypto}/chtls/chtls_cm.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_cm.h | 0 + .../chelsio/inline_crypto}/chtls/chtls_hw.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_io.c | 0 + .../chelsio/inline_crypto}/chtls/chtls_main.c | 2 +- + drivers/net/ethernet/cirrus/cs89x0.h | 4 - + drivers/net/ethernet/cisco/enic/enic.h | 1 + + drivers/net/ethernet/cisco/enic/enic_api.c | 8 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 115 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 66 +- + drivers/net/ethernet/cortina/gemini.c | 40 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 62 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 4 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 44 +- + drivers/net/ethernet/dec/tulip/interrupt.c | 56 +- + drivers/net/ethernet/dec/tulip/media.c | 5 - + drivers/net/ethernet/dec/tulip/tulip_core.c | 65 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 44 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 80 +- + drivers/net/ethernet/dlink/dl2k.c | 81 +- + drivers/net/ethernet/dlink/sundance.c | 21 +- + drivers/net/ethernet/dnet.c | 13 +- + drivers/net/ethernet/ethoc.c | 6 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 1 + + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c | 8 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 63 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 309 ++ + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 746 +++-- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 125 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 98 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 88 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 3 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h | 4 + + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 21 + + drivers/net/ethernet/freescale/dpaa2/dpni.c | 79 + + drivers/net/ethernet/freescale/dpaa2/dpni.h | 35 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 7 +- + drivers/net/ethernet/freescale/fec_main.c | 3 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 10 +- + drivers/net/ethernet/freescale/fec_ptp.c | 8 +- + drivers/net/ethernet/freescale/fman/fman.c | 14 +- + drivers/net/ethernet/freescale/fman/fman_muram.c | 6 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 23 +- + drivers/net/ethernet/freescale/fman/mac.c | 4 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 11 +- + drivers/net/ethernet/google/gve/gve.h | 106 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 315 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 62 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 365 ++- + drivers/net/ethernet/google/gve/gve_main.c | 301 +- + drivers/net/ethernet/google/gve/gve_register.h | 1 + + drivers/net/ethernet/google/gve/gve_rx.c | 37 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 34 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 148 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 17 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 7 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 90 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 77 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 352 ++- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 35 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 45 +- + drivers/net/ethernet/hisilicon/hns3/hns3_trace.h | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 67 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 38 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 37 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 26 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 16 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 180 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 9 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 103 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 62 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 34 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 174 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + drivers/net/ethernet/hisilicon/hns_mdio.c | 3 +- + drivers/net/ethernet/huawei/hinic/Makefile | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 318 ++ + drivers/net/ethernet/huawei/hinic/hinic_debugfs.h | 114 + + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 20 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 8 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 27 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 6 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 92 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 55 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 7 +- + drivers/net/ethernet/ibm/ibmvnic.c | 415 +-- + drivers/net/ethernet/ibm/ibmvnic.h | 4 +- + drivers/net/ethernet/intel/e100.c | 12 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 149 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 40 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 1 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 + + drivers/net/ethernet/intel/e1000e/hw.h | 5 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 56 +- + drivers/net/ethernet/intel/e1000e/phy.c | 3 + + drivers/net/ethernet/intel/e1000e/ptp.c | 3 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 - + drivers/net/ethernet/intel/i40e/i40e.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 330 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_trace.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 50 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 19 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 105 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_adminq.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 20 +- + drivers/net/ethernet/intel/iavf/iavf_trace.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 11 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 27 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 6 +- + drivers/net/ethernet/intel/ice/ice_base.c | 16 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 116 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 6 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 2 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 233 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 11 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 5 +- + drivers/net/ethernet/intel/ice/ice_flow.c | 66 +- + drivers/net/ethernet/intel/ice/ice_flow.h | 4 +- + drivers/net/ethernet/intel/ice/ice_fw_update.c | 51 +- + drivers/net/ethernet/intel/ice/ice_fw_update.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 7 +- + drivers/net/ethernet/intel/ice/ice_main.c | 127 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 18 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 4 +- + drivers/net/ethernet/intel/ice/ice_type.h | 3 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 138 +- + drivers/net/ethernet/intel/ice/ice_xsk.h | 7 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 6 +- + drivers/net/ethernet/intel/igb/e1000_i210.c | 5 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 1 + + drivers/net/ethernet/intel/igb/e1000_mbx.c | 1 + + drivers/net/ethernet/intel/igb/igb.h | 80 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 + + drivers/net/ethernet/intel/igb/igb_main.c | 472 ++- + drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 17 +- + drivers/net/ethernet/intel/igc/igc.h | 3 + + drivers/net/ethernet/intel/igc/igc_base.c | 5 + + drivers/net/ethernet/intel/igc/igc_defines.h | 16 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 3 + + drivers/net/ethernet/intel/igc/igc_hw.h | 11 +- + drivers/net/ethernet/intel/igc/igc_main.c | 52 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 62 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 135 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 17 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 11 + + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 49 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 8 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 63 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 16 +- + drivers/net/ethernet/jme.c | 40 +- + drivers/net/ethernet/marvell/Kconfig | 7 + + drivers/net/ethernet/marvell/Makefile | 1 + + drivers/net/ethernet/marvell/mvneta.c | 47 +- + drivers/net/ethernet/marvell/mvpp2/Makefile | 3 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 203 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 878 ++++-- + drivers/net/ethernet/marvell/mvpp2/mvpp2_tai.c | 457 +++ + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 5 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 29 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 11 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 22 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 47 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 541 +++- + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 275 ++ + drivers/net/ethernet/marvell/octeontx2/af/ptp.h | 25 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 36 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 22 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 41 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 87 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 239 +- + .../net/ethernet/marvell/octeontx2/af/rvu_trace.c | 12 + + .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 103 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 98 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 26 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 35 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 180 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 212 ++ + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.h | 13 + + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 112 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 5 +- + drivers/net/ethernet/marvell/prestera/Kconfig | 25 + + drivers/net/ethernet/marvell/prestera/Makefile | 7 + + drivers/net/ethernet/marvell/prestera/prestera.h | 206 ++ + .../ethernet/marvell/prestera/prestera_devlink.c | 112 + + .../ethernet/marvell/prestera/prestera_devlink.h | 23 + + .../net/ethernet/marvell/prestera/prestera_dsa.c | 104 + + .../net/ethernet/marvell/prestera/prestera_dsa.h | 35 + + .../ethernet/marvell/prestera/prestera_ethtool.c | 780 +++++ + .../ethernet/marvell/prestera/prestera_ethtool.h | 11 + + .../net/ethernet/marvell/prestera/prestera_hw.c | 1253 ++++++++ + .../net/ethernet/marvell/prestera/prestera_hw.h | 182 ++ + .../net/ethernet/marvell/prestera/prestera_main.c | 667 ++++ + .../net/ethernet/marvell/prestera/prestera_pci.c | 769 +++++ + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 820 +++++ + .../net/ethernet/marvell/prestera/prestera_rxtx.h | 19 + + .../ethernet/marvell/prestera/prestera_switchdev.c | 1277 ++++++++ + .../ethernet/marvell/prestera/prestera_switchdev.h | 13 + + drivers/net/ethernet/marvell/pxa168_eth.c | 7 +- + drivers/net/ethernet/marvell/skge.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 19 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 18 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 116 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 58 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 1 + + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 527 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 75 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 83 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 42 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 60 +- + .../mellanox/mlx5/core/en/xsk/{umem.c => pool.c} | 112 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/pool.h | 27 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.h | 29 - + .../mellanox/mlx5/core/en_accel/en_accel.h | 32 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 3 - + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 20 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 27 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 91 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 106 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 50 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 35 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 882 ++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 97 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 632 ++-- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 3 +- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 8 + + .../net/ethernet/mellanox/mlx5/core/esw/chains.c | 944 ------ + .../net/ethernet/mellanox/mlx5/core/esw/chains.h | 68 - + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 124 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 44 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 505 ++- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 463 +++ + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 21 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 63 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 911 ++++++ + .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 93 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 7 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +- + .../mellanox/mlx5/core/steering/dr_matcher.c | 22 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 47 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 8 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 183 +- + .../mellanox/mlx5/core/steering/dr_types.h | 24 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 3 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 642 +++- + drivers/net/ethernet/mellanox/mlxsw/core.h | 14 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 368 +++ + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 173 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 239 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 594 +--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 91 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 377 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 163 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 204 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 32 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 34 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 120 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 - + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 22 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 + + drivers/net/ethernet/micrel/ks8842.c | 17 +- + drivers/net/ethernet/micrel/ksz884x.c | 76 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 2 +- + drivers/net/ethernet/microchip/lan743x_main.c | 11 +- + drivers/net/ethernet/mscc/ocelot.c | 101 +- + drivers/net/ethernet/mscc/ocelot.h | 2 + + drivers/net/ethernet/mscc/ocelot_flower.c | 542 +++- + drivers/net/ethernet/mscc/ocelot_io.c | 17 + + drivers/net/ethernet/mscc/ocelot_net.c | 54 +- + drivers/net/ethernet/mscc/ocelot_ptp.c | 3 +- + drivers/net/ethernet/mscc/ocelot_s2.h | 64 - + drivers/net/ethernet/mscc/ocelot_vcap.c | 856 ++++-- + drivers/net/ethernet/mscc/ocelot_vcap.h | 99 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 195 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +- + drivers/net/ethernet/natsemi/natsemi.c | 63 +- + drivers/net/ethernet/natsemi/ns83820.c | 77 +- + drivers/net/ethernet/natsemi/sonic.c | 24 +- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/neterion/s2io.c | 91 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 14 +- + drivers/net/ethernet/neterion/vxge/vxge-config.h | 7 +- + drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 12 +- + drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 72 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 18 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 17 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 6 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 73 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 85 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 9 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 7 +- + drivers/net/ethernet/ni/nixge.c | 7 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 4 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 5 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 14 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + drivers/net/ethernet/pensando/Kconfig | 1 + + drivers/net/ethernet/pensando/ionic/Makefile | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 7 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 47 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 31 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 87 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 73 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 12 +- + .../net/ethernet/pensando/ionic/ionic_devlink.h | 3 + + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 198 +- + drivers/net/ethernet/pensando/ionic/ionic_fw.c | 206 ++ + drivers/net/ethernet/pensando/ionic/ionic_if.h | 34 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 1076 ++++--- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 115 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 101 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 48 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 182 +- + drivers/net/ethernet/qlogic/Kconfig | 5 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 3 - + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 3 + + drivers/net/ethernet/qlogic/qed/Makefile | 1 + + drivers/net/ethernet/qlogic/qed/qed.h | 5 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 9 + + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 259 ++ + drivers/net/ethernet/qlogic/qed/qed_devlink.h | 20 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 18 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 8 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 130 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 9 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 38 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 10 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 1 + + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/8139too.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 56 +- + drivers/net/ethernet/renesas/ravb.h | 5 +- + drivers/net/ethernet/renesas/ravb_main.c | 55 +- + drivers/net/ethernet/renesas/sh_eth.c | 12 +- + drivers/net/ethernet/rocker/rocker_main.c | 83 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 17 +- + drivers/net/ethernet/sfc/ef10.c | 152 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 41 + + drivers/net/ethernet/sfc/ef100_netdev.c | 4 + + drivers/net/ethernet/sfc/ef100_nic.c | 23 +- + drivers/net/ethernet/sfc/ef100_tx.c | 44 +- + drivers/net/ethernet/sfc/ef100_tx.h | 1 - + drivers/net/ethernet/sfc/efx.c | 21 +- + drivers/net/ethernet/sfc/efx_channels.c | 15 +- + drivers/net/ethernet/sfc/efx_channels.h | 2 - + drivers/net/ethernet/sfc/efx_common.c | 124 +- + drivers/net/ethernet/sfc/efx_common.h | 3 + + drivers/net/ethernet/sfc/ethtool.c | 3 +- + drivers/net/ethernet/sfc/ethtool_common.c | 47 +- + drivers/net/ethernet/sfc/falcon/farch.c | 29 +- + drivers/net/ethernet/sfc/falcon/rx.c | 2 + + drivers/net/ethernet/sfc/falcon/selftest.c | 2 +- + drivers/net/ethernet/sfc/farch.c | 33 +- + drivers/net/ethernet/sfc/mcdi.c | 6 +- + drivers/net/ethernet/sfc/mcdi.h | 4 +- + drivers/net/ethernet/sfc/mcdi_functions.c | 24 +- + drivers/net/ethernet/sfc/mcdi_functions.h | 2 +- + drivers/net/ethernet/sfc/mcdi_port.c | 593 +--- + drivers/net/ethernet/sfc/mcdi_port_common.c | 605 +++- + drivers/net/ethernet/sfc/mcdi_port_common.h | 15 +- + drivers/net/ethernet/sfc/net_driver.h | 131 +- + drivers/net/ethernet/sfc/nic.h | 4 + + drivers/net/ethernet/sfc/nic_common.h | 47 +- + drivers/net/ethernet/sfc/ptp.c | 12 +- + drivers/net/ethernet/sfc/selftest.c | 18 +- + drivers/net/ethernet/sfc/selftest.h | 4 +- + drivers/net/ethernet/sfc/siena.c | 1 - + drivers/net/ethernet/sfc/tx.c | 136 +- + drivers/net/ethernet/sfc/tx.h | 26 + + drivers/net/ethernet/sfc/tx_common.c | 19 +- + drivers/net/ethernet/silan/sc92031.c | 40 +- + drivers/net/ethernet/sis/sis900.c | 8 +- + drivers/net/ethernet/smsc/epic100.c | 71 +- + drivers/net/ethernet/smsc/smc91x.c | 13 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 51 +- + drivers/net/ethernet/socionext/sni_ave.c | 32 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 17 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 196 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 14 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 6 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 55 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 297 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/net/ethernet/sun/sunbmac.c | 18 +- + drivers/net/ethernet/sun/sungem.c | 5 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 70 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 10 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 16 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 1 + + drivers/net/ethernet/ti/am65-cpts.c | 43 +- + drivers/net/ethernet/ti/cpsw.c | 10 +- + drivers/net/ethernet/ti/cpsw_ale.c | 421 ++- + drivers/net/ethernet/ti/cpsw_ale.h | 7 + + drivers/net/ethernet/ti/cpsw_ethtool.c | 3 +- + drivers/net/ethernet/ti/cpsw_new.c | 3 - + drivers/net/ethernet/ti/cpsw_priv.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.h | 2 - + drivers/net/ethernet/ti/cpts.c | 42 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 10 +- + drivers/net/ethernet/ti/netcp_ethss.c | 18 +- + drivers/net/ethernet/ti/tlan.c | 65 +- + drivers/net/ethernet/toshiba/tc35815.c | 48 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 40 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 26 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- + drivers/net/fddi/skfp/h/smc.h | 2 +- + drivers/net/geneve.c | 11 +- + drivers/net/gtp.c | 74 +- + drivers/net/hippi/rrunner.c | 117 +- + drivers/net/ieee802154/mac802154_hwsim.c | 6 +- + drivers/net/ipa/gsi.c | 32 +- + drivers/net/ipa/gsi.h | 1 - + drivers/net/ipa/gsi_reg.h | 59 +- + drivers/net/ipa/gsi_trans.c | 1 - + drivers/net/ipa/ipa.h | 17 +- + drivers/net/ipa/ipa_clock.c | 28 +- + drivers/net/ipa/ipa_endpoint.c | 47 +- + drivers/net/ipa/ipa_interrupt.c | 14 + + drivers/net/ipa/ipa_main.c | 72 +- + drivers/net/ipa/ipa_reg.h | 2 +- + drivers/net/ipa/ipa_uc.c | 2 +- + drivers/net/ipvlan/ipvlan_main.c | 8 + + drivers/net/macsec.c | 8 +- + drivers/net/mdio/Kconfig | 251 ++ + drivers/net/mdio/Makefile | 29 + + drivers/net/{phy => mdio}/mdio-aspeed.c | 0 + drivers/net/{phy => mdio}/mdio-bcm-iproc.c | 0 + drivers/net/{phy => mdio}/mdio-bcm-unimac.c | 0 + drivers/net/{phy => mdio}/mdio-bitbang.c | 0 + drivers/net/{phy => mdio}/mdio-cavium.c | 0 + drivers/net/{phy => mdio}/mdio-cavium.h | 0 + drivers/net/{phy => mdio}/mdio-gpio.c | 0 + drivers/net/{phy => mdio}/mdio-hisi-femac.c | 0 + drivers/net/{phy => mdio}/mdio-i2c.c | 3 +- + drivers/net/{phy => mdio}/mdio-ipq4019.c | 109 +- + drivers/net/{phy => mdio}/mdio-ipq8064.c | 0 + drivers/net/{phy => mdio}/mdio-moxart.c | 0 + drivers/net/{phy => mdio}/mdio-mscc-miim.c | 0 + drivers/net/{phy => mdio}/mdio-mux-bcm-iproc.c | 0 + drivers/net/{phy => mdio}/mdio-mux-gpio.c | 0 + drivers/net/{phy => mdio}/mdio-mux-meson-g12a.c | 0 + drivers/net/{phy => mdio}/mdio-mux-mmioreg.c | 0 + drivers/net/{phy => mdio}/mdio-mux-multiplexer.c | 0 + drivers/net/{phy => mdio}/mdio-mux.c | 0 + drivers/net/{phy => mdio}/mdio-mvusb.c | 0 + drivers/net/{phy => mdio}/mdio-octeon.c | 0 + drivers/net/{phy => mdio}/mdio-sun4i.c | 0 + drivers/net/{phy => mdio}/mdio-thunder.c | 0 + drivers/net/{phy => mdio}/mdio-xgene.c | 2 +- + drivers/{of => net/mdio}/of_mdio.c | 38 +- + drivers/net/netdevsim/Makefile | 2 +- + drivers/net/netdevsim/dev.c | 35 +- + drivers/net/netdevsim/ethtool.c | 64 + + drivers/net/netdevsim/netdev.c | 1 + + drivers/net/netdevsim/netdevsim.h | 20 +- + drivers/net/netdevsim/udp_tunnels.c | 34 +- + drivers/net/pcs/Kconfig | 22 + + drivers/net/pcs/Makefile | 5 + + drivers/net/pcs/pcs-lynx.c | 318 ++ + drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} | 2 +- + drivers/net/phy/Kconfig | 405 +-- + drivers/net/phy/Makefile | 37 +- + drivers/net/phy/at803x.c | 4 +- + drivers/net/phy/bcm7xxx.c | 32 +- + drivers/net/phy/dp83640.c | 70 +- + drivers/net/phy/dp83822.c | 232 +- + drivers/net/phy/dp83867.c | 45 +- + drivers/net/phy/dp83869.c | 365 +++ + drivers/net/phy/marvell.c | 14 +- + drivers/net/phy/mdio_bus.c | 15 - + drivers/net/phy/micrel.c | 14 + + drivers/net/phy/mscc/mscc_macsec.c | 2 +- + drivers/net/phy/phy-core.c | 36 +- + drivers/net/phy/phy.c | 69 +- + drivers/net/phy/phylink.c | 48 +- + drivers/net/phy/realtek.c | 47 +- + drivers/net/phy/sfp.c | 2 +- + drivers/net/phy/smsc.c | 126 +- + drivers/net/phy/spi_ks8995.c | 4 +- + drivers/net/team/team.c | 6 +- + drivers/net/tun.c | 18 - + drivers/net/usb/Kconfig | 2 + + drivers/net/usb/kaweth.c | 261 +- + drivers/net/usb/net1080.c | 1 - + drivers/net/usb/smsc75xx.c | 13 +- + drivers/net/usb/smsc95xx.c | 488 ++- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/veth.c | 9 +- + drivers/net/virtio_net.c | 7 +- + drivers/net/vxlan.c | 22 +- + drivers/net/wan/fsl_ucc_hdlc.c | 1 + + drivers/net/wan/hdlc_fr.c | 172 +- + drivers/net/wan/lmc/lmc_debug.c | 18 - + drivers/net/wan/lmc/lmc_debug.h | 1 - + drivers/net/wan/lmc/lmc_main.c | 105 +- + drivers/net/wan/lmc/lmc_media.c | 4 - + drivers/net/wan/lmc/lmc_proto.c | 16 - + drivers/net/wan/sbni.c | 101 +- + drivers/net/wan/slic_ds26522.c | 2 - + drivers/net/wan/x25_asy.c | 5 +- + drivers/net/wan/x25_asy.h | 1 - + drivers/net/wimax/i2400m/control.c | 2 - + drivers/net/wireguard/netlink.c | 14 +- + drivers/net/wireless/admtek/adm8211.c | 83 +- + drivers/net/wireless/ath/ath10k/bmi.c | 10 +- + drivers/net/wireless/ath/ath10k/ce.c | 81 +- + drivers/net/wireless/ath/ath10k/ce.h | 15 +- + drivers/net/wireless/ath/ath10k/core.c | 55 +- + drivers/net/wireless/ath/ath10k/core.h | 22 + + drivers/net/wireless/ath/ath10k/coredump.c | 349 ++- + drivers/net/wireless/ath/ath10k/coredump.h | 1 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 26 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 6 +- + drivers/net/wireless/ath/ath10k/hw.h | 3 - + drivers/net/wireless/ath/ath10k/mac.c | 929 +++++- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 8 + + drivers/net/wireless/ath/ath10k/sdio.c | 331 +- + drivers/net/wireless/ath/ath10k/snoc.c | 29 +- + drivers/net/wireless/ath/ath10k/snoc.h | 1 + + drivers/net/wireless/ath/ath10k/targaddrs.h | 11 + + drivers/net/wireless/ath/ath10k/txrx.c | 11 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 19 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 2 + + drivers/net/wireless/ath/ath10k/wmi.c | 73 +- + drivers/net/wireless/ath/ath10k/wmi.h | 76 + + drivers/net/wireless/ath/ath10k/wow.c | 2 +- + drivers/net/wireless/ath/ath11k/Kconfig | 18 +- + drivers/net/wireless/ath/ath11k/Makefile | 12 +- + drivers/net/wireless/ath/ath11k/ahb.c | 455 +-- + drivers/net/wireless/ath/ath11k/ahb.h | 8 + + drivers/net/wireless/ath/ath11k/ce.c | 224 +- + drivers/net/wireless/ath/ath11k/ce.h | 15 +- + drivers/net/wireless/ath/ath11k/core.c | 291 +- + drivers/net/wireless/ath/ath11k/core.h | 79 +- + drivers/net/wireless/ath/ath11k/dbring.c | 2 +- + drivers/net/wireless/ath/ath11k/debug.c | 1104 +------ + drivers/net/wireless/ath/ath11k/debug.h | 247 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 1097 +++++++ + drivers/net/wireless/ath/ath11k/debugfs.h | 217 ++ + .../{debug_htt_stats.c => debugfs_htt_stats.c} | 56 +- + .../{debug_htt_stats.h => debugfs_htt_stats.h} | 27 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 29 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.h | 44 + + drivers/net/wireless/ath/ath11k/dp.c | 316 +- + drivers/net/wireless/ath/ath11k/dp.h | 40 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 375 ++- + drivers/net/wireless/ath/ath11k/dp_rx.h | 6 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 200 +- + drivers/net/wireless/ath/ath11k/hal.c | 306 +- + drivers/net/wireless/ath/ath11k/hal.h | 198 +- + drivers/net/wireless/ath/ath11k/hal_rx.c | 16 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 2 +- + drivers/net/wireless/ath/ath11k/hif.h | 30 + + drivers/net/wireless/ath/ath11k/htc.c | 19 +- + drivers/net/wireless/ath/ath11k/hw.c | 894 ++++++ + drivers/net/wireless/ath/ath11k/hw.h | 152 +- + drivers/net/wireless/ath/ath11k/mac.c | 412 ++- + drivers/net/wireless/ath/ath11k/mhi.c | 467 +++ + drivers/net/wireless/ath/ath11k/mhi.h | 39 + + drivers/net/wireless/ath/ath11k/pci.c | 1062 +++++++ + drivers/net/wireless/ath/ath11k/pci.h | 72 + + drivers/net/wireless/ath/ath11k/peer.c | 3 - + drivers/net/wireless/ath/ath11k/qmi.c | 357 ++- + drivers/net/wireless/ath/ath11k/qmi.h | 29 +- + drivers/net/wireless/ath/ath11k/reg.c | 8 +- + drivers/net/wireless/ath/ath11k/spectral.c | 36 +- + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 154 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 2 +- + drivers/net/wireless/ath/ath5k/base.c | 26 +- + drivers/net/wireless/ath/ath5k/debug.c | 25 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 6 +- + drivers/net/wireless/ath/ath5k/reset.c | 2 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 2 +- + drivers/net/wireless/ath/ath5k/rfkill.c | 7 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 5 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 15 +- + drivers/net/wireless/ath/ath9k/Kconfig | 12 +- + drivers/net/wireless/ath/ath9k/ani.c | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 68 - + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 35 +- + drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 37 - + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 14 - + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 21 - + drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- + drivers/net/wireless/ath/ath9k/beacon.c | 6 +- + drivers/net/wireless/ath/ath9k/channel.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 21 +- + drivers/net/wireless/ath/ath9k/htc.h | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 8 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 + + drivers/net/wireless/ath/ath9k/hw.c | 6 +- + drivers/net/wireless/ath/ath9k/init.c | 6 +- + drivers/net/wireless/ath/ath9k/main.c | 18 +- + drivers/net/wireless/ath/ath9k/pci.c | 5 +- + drivers/net/wireless/ath/ath9k/wmi.c | 9 +- + drivers/net/wireless/ath/ath9k/wmi.h | 4 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 5 +- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 12 +- + drivers/net/wireless/ath/carl9170/usb.c | 7 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 15 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 57 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 222 +- + drivers/net/wireless/ath/wcn36xx/main.c | 288 +- + drivers/net/wireless/ath/wcn36xx/pmc.c | 7 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 757 +++-- + drivers/net/wireless/ath/wcn36xx/smd.h | 12 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 279 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 18 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 8 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 4 +- + drivers/net/wireless/ath/wil6210/pmc.c | 12 +- + drivers/net/wireless/ath/wil6210/txrx.c | 30 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 10 +- + drivers/net/wireless/ath/wil6210/wil_platform.c | 3 +- + drivers/net/wireless/ath/wil6210/wmi.c | 36 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 11 +- + drivers/net/wireless/atmel/atmel.c | 4 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 14 +- + drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_ht.c | 3 - + drivers/net/wireless/broadcom/b43/phy_n.c | 21 +- + drivers/net/wireless/broadcom/b43/pio.c | 2 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 15 +- + drivers/net/wireless/broadcom/b43legacy/pio.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 12 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 62 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 14 + + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 39 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 31 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 7 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 30 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 9 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 31 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 35 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 17 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.h | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 47 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 99 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 47 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 112 - + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 268 -- + drivers/net/wireless/cisco/airo.c | 913 +++--- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 52 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 6 +- + drivers/net/wireless/intel/ipw2x00/libipw.h | 3 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 34 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 8 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 46 +- + drivers/net/wireless/intel/iwlegacy/4965-calib.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 67 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 10 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 25 +- + drivers/net/wireless/intel/iwlegacy/common.c | 76 +- + drivers/net/wireless/intel/iwlegacy/common.h | 4 +- + drivers/net/wireless/intel/iwlegacy/debug.c | 3 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 70 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 17 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 92 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 59 +- + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 25 +- + .../net/wireless/intel/iwlwifi/fw/api/binding.h | 16 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 82 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 32 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 231 +- + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 18 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 13 + + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 32 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 133 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 29 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 471 ++- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 56 + + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 14 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 12 +- + drivers/net/wireless/intel/iwlwifi/fw/img.c | 55 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 274 ++ + drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 18 + + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 14 +- + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 21 +- + .../net/wireless/intel/iwlwifi/iwl-context-info.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 6 +- + .../net/wireless/intel/iwlwifi/iwl-devtrace-msg.h | 6 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 20 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 98 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 76 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 294 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 363 ++- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 203 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 459 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 118 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 59 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 123 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 32 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 + + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 197 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 107 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 84 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 12 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 51 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 82 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 99 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 53 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 27 + + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 23 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 161 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 137 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 1089 +------ + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 530 +--- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 1529 +++++++++ + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 230 ++ + drivers/net/wireless/intersil/hostap/hostap.h | 6 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 33 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 3 +- + drivers/net/wireless/intersil/orinoco/main.c | 11 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 14 +- + drivers/net/wireless/intersil/p54/p54pci.c | 12 +- + drivers/net/wireless/intersil/prism54/isl_38xx.c | 2 +- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 5 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 108 +- + drivers/net/wireless/marvell/libertas/defs.h | 3 +- + drivers/net/wireless/marvell/libertas/firmware.c | 4 +- + drivers/net/wireless/marvell/libertas/main.c | 6 +- + drivers/net/wireless/marvell/libertas/rx.c | 11 +- + drivers/net/wireless/marvell/libertas_tf/cmd.c | 22 +- + .../net/wireless/marvell/libertas_tf/deb_defs.h | 3 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 37 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 7 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 4 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/init.c | 14 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 323 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 149 - + drivers/net/wireless/marvell/mwifiex/scan.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 429 +++ + drivers/net/wireless/marvell/mwifiex/sdio.h | 427 --- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 6 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/marvell/mwifiex/util.c | 6 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 15 + + drivers/net/wireless/marvell/mwifiex/wmm.h | 18 +- + drivers/net/wireless/marvell/mwl8k.c | 16 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 9 +- + drivers/net/wireless/mediatek/mt76/dma.c | 162 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 47 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 61 +- + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 8 +- + .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h | 3 + + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 5 - + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 5 +- + drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 2 + + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 55 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 42 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 200 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 21 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 7 +- + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 3 + + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 38 +- + .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 22 +- + .../net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 282 +- + .../net/wireless/mediatek/mt76/mt7615/testmode.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 2 - + .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 8 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 29 +- + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 1 + + .../net/wireless/mediatek/mt76/mt76x0/initvals.h | 145 - + .../wireless/mediatek/mt76/mt76x0/initvals_init.h | 159 + + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 + + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dma.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 70 +- + drivers/net/wireless/mediatek/mt76/mt76x02_usb.h | 3 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 5 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 146 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 10 + + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 257 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 39 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 140 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 33 + + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 48 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 17 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 160 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 19 +- + drivers/net/wireless/mediatek/mt76/tx.c | 330 +- + drivers/net/wireless/mediatek/mt76/usb.c | 86 +- + drivers/net/wireless/mediatek/mt76/util.c | 28 + + drivers/net/wireless/mediatek/mt76/util.h | 76 + + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 34 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 4 +- + drivers/net/wireless/microchip/wilc1000/mon.c | 3 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 1 - + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 7 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 16 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 16 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 42 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 25 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.h | 10 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 10 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 23 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 1 - + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 70 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 193 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 3 - + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 712 ++--- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 354 +-- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 720 ++--- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 668 ++-- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 756 ++--- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 40 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/cam.c | 82 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 269 +- + drivers/net/wireless/realtek/rtlwifi/debug.c | 24 +- + drivers/net/wireless/realtek/rtlwifi/debug.h | 14 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 423 ++- + drivers/net/wireless/realtek/rtlwifi/ps.c | 125 +- + drivers/net/wireless/realtek/rtlwifi/ps.h | 10 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 192 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 90 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 215 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/led.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 405 ++- + .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 41 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 224 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 88 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 271 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/dm.c | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 184 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 121 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 28 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/dm.c | 38 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 154 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 72 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 134 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 58 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 312 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 116 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 214 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 423 ++- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 32 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 72 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 102 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 210 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/led.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 366 ++- + .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 45 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/dm.c | 42 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 159 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 220 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 72 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 22 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 162 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 64 +- + .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c | 150 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 647 ++-- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 232 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 365 ++- + .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 32 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 124 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 66 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 213 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 310 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 37 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 22 +- + .../realtek/rtlwifi/rtl8723com/phy_common.c | 44 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 827 +++-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 134 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 467 ++- + .../net/wireless/realtek/rtlwifi/rtl8821ae/led.c | 32 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 553 ++-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 72 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 28 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 4 - + drivers/net/wireless/realtek/rtw88/debug.c | 32 +- + drivers/net/wireless/realtek/rtw88/fw.c | 86 +- + drivers/net/wireless/realtek/rtw88/fw.h | 18 +- + drivers/net/wireless/realtek/rtw88/mac.c | 13 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 81 +- + drivers/net/wireless/realtek/rtw88/main.c | 205 +- + drivers/net/wireless/realtek/rtw88/main.h | 32 + + drivers/net/wireless/realtek/rtw88/pci.c | 38 +- + drivers/net/wireless/realtek/rtw88/pci.h | 4 +- + drivers/net/wireless/realtek/rtw88/phy.c | 11 +- + drivers/net/wireless/realtek/rtw88/reg.h | 5 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 7 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 22 +- + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 32 +- + drivers/net/wireless/realtek/rtw88/tx.c | 4 +- + drivers/net/wireless/realtek/rtw88/tx.h | 2 +- + drivers/net/wireless/realtek/rtw88/util.h | 2 + + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 33 +- + drivers/net/wireless/rsi/rsi_91x_ps.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 7 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +- + drivers/net/wireless/st/cw1200/wsm.c | 6 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wl1251/reg.h | 2 +- + drivers/net/wireless/ti/wl12xx/reg.h | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 7 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 7 - + drivers/net/wireless/ti/wlcore/debugfs.h | 6 +- + drivers/net/wireless/ti/wlcore/main.c | 1 - + drivers/net/wireless/wl3501_cs.c | 26 +- + drivers/net/wireless/zydas/zd1201.c | 6 +- + drivers/net/wireless/zydas/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 15 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 10 +- + drivers/nfc/pn533/usb.c | 2 +- + drivers/nfc/s3fwrn5/Kconfig | 1 + + drivers/nfc/s3fwrn5/firmware.c | 4 +- + drivers/nfc/s3fwrn5/firmware.h | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 24 +- + drivers/nfc/st-nci/se.c | 3 +- + drivers/nfc/st21nfca/se.c | 3 +- + drivers/of/Kconfig | 7 - + drivers/of/Makefile | 1 - + drivers/of/base.c | 1 + + drivers/ptp/ptp_ines.c | 91 +- + drivers/ptp/ptp_qoriq.c | 20 +- + drivers/s390/cio/chsc.c | 22 +- + drivers/s390/cio/chsc.h | 8 +- + drivers/s390/cio/css.c | 11 +- + drivers/s390/cio/css.h | 4 +- + drivers/s390/cio/device_ops.c | 93 +- + drivers/s390/net/Kconfig | 2 +- + drivers/s390/net/ctcm_fsms.h | 1 - + drivers/s390/net/ctcm_mpc.h | 1 - + drivers/s390/net/ism.h | 7 + + drivers/s390/net/ism_drv.c | 47 + + drivers/s390/net/qeth_core.h | 102 +- + drivers/s390/net/qeth_core_main.c | 359 +-- + drivers/s390/net/qeth_core_mpc.h | 14 +- + drivers/s390/net/qeth_core_sys.c | 71 +- + drivers/s390/net/qeth_ethtool.c | 16 +- + drivers/s390/net/qeth_l2.h | 9 +- + drivers/s390/net/qeth_l2_main.c | 888 ++++-- + drivers/s390/net/qeth_l2_sys.c | 17 +- + drivers/s390/net/qeth_l3.h | 4 +- + drivers/s390/net/qeth_l3_main.c | 176 +- + drivers/s390/net/qeth_l3_sys.c | 72 +- + drivers/ssb/pci.c | 7 +- + drivers/target/target_core_user.c | 6 +- + drivers/thermal/thermal_netlink.c | 8 +- + fs/dlm/netlink.c | 6 +- + fs/io_uring.c | 6 + + include/linux/bpf-cgroup.h | 25 + + include/linux/bpf.h | 141 +- + include/linux/bpf_local_storage.h | 163 + + include/linux/bpf_lsm.h | 29 + + include/linux/bpf_types.h | 3 + + include/linux/bpf_verifier.h | 21 +- + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 42 +- + include/linux/btf_ids.h | 59 +- + include/linux/can/core.h | 2 +- + include/linux/can/dev.h | 27 +- + include/linux/can/rx-offload.h | 3 + + include/linux/cookie.h | 51 + + include/linux/dsa/8021q.h | 51 +- + include/linux/ethtool.h | 30 + + include/linux/filter.h | 12 +- + include/linux/fsl/ptp_qoriq.h | 3 + + include/linux/ieee80211.h | 230 +- + include/linux/if_bridge.h | 8 +- + include/linux/if_tun.h | 19 +- + include/linux/inet_diag.h | 2 + + include/linux/ipv6.h | 22 - + include/linux/mdio.h | 9 +- + {drivers/net/phy => include/linux/mdio}/mdio-i2c.h | 0 + .../net/phy => include/linux/mdio}/mdio-xgene.h | 0 + include/linux/micrel_phy.h | 1 + + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/driver.h | 3 +- + include/linux/mlx5/eswitch.h | 15 +- + include/linux/net.h | 3 + + include/linux/netdevice.h | 99 +- + include/linux/netfilter/nf_conntrack_common.h | 2 +- + include/linux/netlink.h | 30 +- + include/linux/of.h | 5 + + include/linux/of_mdio.h | 6 + + include/linux/pcs-lynx.h | 21 + + include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} | 8 +- + include/linux/phy.h | 426 ++- + include/linux/phylink.h | 3 + + include/linux/platform_data/macb.h | 20 - + include/linux/prefetch.h | 8 + + include/linux/ptp_classify.h | 78 +- + include/linux/qed/qed_if.h | 82 +- + include/linux/rcupdate_trace.h | 13 +- + include/linux/skbuff.h | 8 + + include/linux/skmsg.h | 17 - + include/linux/sock_diag.h | 14 +- + include/linux/stmmac.h | 3 + + include/linux/tcp.h | 21 +- + include/net/bluetooth/hci_core.h | 6 + + include/net/bluetooth/l2cap.h | 2 + + include/net/bluetooth/mgmt.h | 18 + + include/net/bpf_sk_storage.h | 12 + + include/net/caif/caif_spi.h | 155 - + include/net/cfg80211.h | 112 +- + include/net/devlink.h | 228 +- + include/net/drop_monitor.h | 36 - + include/net/dsa.h | 86 +- + include/net/dst.h | 2 +- + include/net/genetlink.h | 75 +- + include/net/inet_connection_sock.h | 10 +- + include/net/inet_sock.h | 7 - + include/net/ip.h | 2 +- + include/net/ip_vs.h | 3 - + include/net/ipv6_stubs.h | 3 + + include/net/mac80211.h | 149 +- + include/net/mptcp.h | 6 +- + include/net/net_namespace.h | 2 +- + include/net/netfilter/nf_tables.h | 13 +- + include/net/netfilter/nf_tables_core.h | 11 + + include/net/netlink.h | 105 +- + include/net/netns/ipv4.h | 1 + + include/net/netns/nexthop.h | 2 +- + include/net/nexthop.h | 4 - + include/net/pkt_sched.h | 5 +- + include/net/request_sock.h | 9 +- + include/net/sch_generic.h | 11 +- + include/net/smc.h | 4 + + include/net/sock.h | 10 +- + include/net/switchdev.h | 1 + + include/net/tc_act/tc_vlan.h | 2 + + include/net/tcp.h | 73 +- + include/net/udp_tunnel.h | 24 + + include/net/xdp_sock.h | 30 +- + include/net/xdp_sock_drv.h | 122 +- + include/net/xfrm.h | 33 + + include/net/xsk_buff_pool.h | 53 +- + include/soc/mscc/ocelot.h | 76 +- + include/soc/mscc/ocelot_ptp.h | 3 +- + include/soc/mscc/ocelot_vcap.h | 202 +- + include/trace/events/devlink.h | 37 + + include/trace/events/rxrpc.h | 35 +- + include/uapi/linux/bpf.h | 560 +++- + include/uapi/linux/can/isotp.h | 166 + + include/uapi/linux/can/raw.h | 3 + + include/uapi/linux/devlink.h | 69 + + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/ethtool_netlink.h | 18 +- + include/uapi/linux/genetlink.h | 11 + + include/uapi/linux/gtp.h | 2 + + include/uapi/linux/if_bridge.h | 38 + + include/uapi/linux/if_link.h | 235 +- + include/uapi/linux/if_pppol2tp.h | 2 +- + include/uapi/linux/inet_diag.h | 18 + + include/uapi/linux/l2tp.h | 7 +- + include/uapi/linux/mroute.h | 5 +- + include/uapi/linux/netfilter/nf_tables.h | 8 + + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 3 +- + include/uapi/linux/netlink.h | 4 + + include/uapi/linux/nl80211.h | 196 +- + include/uapi/linux/tc_act/tc_mpls.h | 1 + + include/uapi/linux/tc_act/tc_vlan.h | 4 + + include/uapi/linux/tipc.h | 2 + + include/uapi/linux/tipc_netlink.h | 2 + + init/Kconfig | 3 + + kernel/Makefile | 2 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/arraymap.c | 91 +- + kernel/bpf/bpf_inode_storage.c | 272 ++ + kernel/bpf/bpf_iter.c | 62 +- + kernel/bpf/bpf_local_storage.c | 600 ++++ + kernel/bpf/bpf_lsm.c | 21 +- + kernel/bpf/bpf_struct_ops.c | 6 +- + kernel/bpf/btf.c | 1196 +++++++- + kernel/bpf/core.c | 29 +- + kernel/bpf/cpumap.c | 17 +- + kernel/bpf/devmap.c | 17 +- + kernel/bpf/hashtab.c | 16 +- + kernel/bpf/helpers.c | 26 + + kernel/bpf/inode.c | 116 +- + kernel/bpf/lpm_trie.c | 1 + + kernel/bpf/map_in_map.c | 24 +- + kernel/bpf/map_in_map.h | 2 - + kernel/bpf/map_iter.c | 15 + + kernel/bpf/preload/.gitignore | 4 + + kernel/bpf/preload/Kconfig | 26 + + kernel/bpf/preload/Makefile | 25 + + kernel/bpf/preload/bpf_preload.h | 16 + + kernel/bpf/preload/bpf_preload_kern.c | 91 + + kernel/bpf/preload/bpf_preload_umd_blob.S | 7 + + kernel/bpf/preload/iterators/.gitignore | 2 + + kernel/bpf/preload/iterators/Makefile | 57 + + kernel/bpf/preload/iterators/README | 4 + + kernel/bpf/preload/iterators/bpf_preload_common.h | 13 + + kernel/bpf/preload/iterators/iterators.bpf.c | 114 + + kernel/bpf/preload/iterators/iterators.c | 94 + + kernel/bpf/preload/iterators/iterators.skel.h | 412 +++ + kernel/bpf/queue_stack_maps.c | 2 + + kernel/bpf/reuseport_array.c | 3 +- + kernel/bpf/ringbuf.c | 1 + + kernel/bpf/stackmap.c | 6 +- + kernel/bpf/syscall.c | 329 +- + kernel/bpf/task_iter.c | 15 +- + kernel/bpf/trampoline.c | 63 +- + kernel/bpf/verifier.c | 1080 +++++-- + kernel/rcu/tasks.h | 53 +- + kernel/taskstats.c | 40 +- + kernel/trace/bpf_trace.c | 166 +- + lib/nlattr.c | 122 +- + mm/filemap.c | 8 +- + mm/page_alloc.c | 2 +- + net/8021q/vlan.c | 6 +- + net/8021q/vlan.h | 19 +- + net/Kconfig | 1 - + net/atm/lec.c | 2 +- + net/atm/signaling.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 1 + + net/batman-adv/bat_v_elp.c | 1 + + net/batman-adv/bat_v_ogm.c | 1 + + net/batman-adv/bridge_loop_avoidance.c | 2 +- + net/batman-adv/fragmentation.c | 2 +- + net/batman-adv/hard-interface.c | 19 +- + net/batman-adv/hard-interface.h | 1 - + net/batman-adv/main.c | 1 - + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 16 +- + net/batman-adv/netlink.c | 6 +- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/send.c | 2 +- + net/batman-adv/soft-interface.c | 4 +- + net/batman-adv/types.h | 4 +- + net/bluetooth/Kconfig | 1 - + net/bluetooth/a2mp.c | 22 +- + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_core.c | 43 +- + net/bluetooth/hci_event.c | 89 +- + net/bluetooth/hci_request.c | 85 +- + net/bluetooth/l2cap_core.c | 7 +- + net/bluetooth/l2cap_sock.c | 21 +- + net/bluetooth/mgmt.c | 57 +- + net/bluetooth/sco.c | 6 + + net/bpf/test_run.c | 88 + + net/bpfilter/Kconfig | 1 + + net/bridge/br.c | 5 + + net/bridge/br_forward.c | 17 +- + net/bridge/br_ioctl.c | 2 +- + net/bridge/br_mdb.c | 573 +++- + net/bridge/br_multicast.c | 1863 +++++++++-- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 117 +- + net/bridge/br_vlan.c | 6 +- + net/bridge/netfilter/ebt_stp.c | 1 - + net/caif/cfsrvl.c | 1 - + net/can/Kconfig | 13 + + net/can/Makefile | 3 + + net/can/af_can.c | 6 +- + net/can/bcm.c | 2 +- + net/can/gw.c | 2 +- + net/can/isotp.c | 1426 +++++++++ + net/can/proc.c | 2 +- + net/can/raw.c | 30 +- + net/core/bpf_sk_storage.c | 836 +---- + net/core/datagram.c | 33 +- + net/core/dev.c | 130 +- + net/core/devlink.c | 896 +++++- + net/core/drop_monitor.c | 139 +- + net/core/filter.c | 873 +++++- + net/core/flow_dissector.c | 10 +- + net/core/net-procfs.c | 15 +- + net/core/net-sysfs.c | 4 +- + net/core/net_namespace.c | 12 +- + net/core/netpoll.c | 2 +- + net/core/pktgen.c | 10 +- + net/core/ptp_classifier.c | 30 + + net/core/skbuff.c | 79 +- + net/core/skmsg.c | 34 +- + net/core/sock.c | 21 +- + net/core/sock_diag.c | 9 +- + net/core/sock_map.c | 382 ++- + net/core/sysctl_net_core.c | 17 +- + net/dccp/ackvec.c | 2 +- + net/dccp/ipv4.c | 8 +- + net/dccp/timer.c | 3 +- + net/dsa/dsa.c | 51 +- + net/dsa/dsa2.c | 134 +- + net/dsa/dsa_priv.h | 62 +- + net/dsa/master.c | 20 +- + net/dsa/port.c | 104 +- + net/dsa/slave.c | 191 +- + net/dsa/switch.c | 50 +- + net/dsa/tag_8021q.c | 158 +- + net/dsa/tag_brcm.c | 35 +- + net/dsa/tag_dsa.c | 9 - + net/dsa/tag_edsa.c | 9 - + net/dsa/tag_ksz.c | 1 + + net/dsa/tag_mtk.c | 10 - + net/dsa/tag_ocelot.c | 26 +- + net/dsa/tag_qca.c | 10 - + net/dsa/tag_rtl4_a.c | 11 - + net/dsa/tag_sja1105.c | 33 +- + net/dsa/tag_trailer.c | 1 + + net/ethtool/bitset.c | 26 +- + net/ethtool/cabletest.c | 41 +- + net/ethtool/channels.c | 37 +- + net/ethtool/coalesce.c | 45 +- + net/ethtool/common.c | 2 + + net/ethtool/debug.c | 24 +- + net/ethtool/eee.c | 32 +- + net/ethtool/features.c | 30 +- + net/ethtool/ioctl.c | 67 +- + net/ethtool/linkinfo.c | 30 +- + net/ethtool/linkmodes.c | 34 +- + net/ethtool/linkstate.c | 14 +- + net/ethtool/netlink.c | 124 +- + net/ethtool/netlink.h | 35 +- + net/ethtool/pause.c | 86 +- + net/ethtool/privflags.c | 24 +- + net/ethtool/rings.c | 35 +- + net/ethtool/strset.c | 26 +- + net/ethtool/tsinfo.c | 13 +- + net/ethtool/tunnels.c | 42 +- + net/ethtool/wol.c | 24 +- + net/hsr/hsr_debugfs.c | 21 +- + net/hsr/hsr_netlink.c | 6 +- + net/ieee802154/netlink.c | 6 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/bpf_tcp_ca.c | 34 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/fou.c | 10 +- + net/ipv4/icmp.c | 6 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_diag.c | 17 + + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/ip_options.c | 35 +- + net/ipv4/ip_output.c | 11 +- + net/ipv4/ip_sockglue.c | 5 +- + net/ipv4/ip_tunnel.c | 8 +- + net/ipv4/ip_vti.c | 9 +- + net/ipv4/ipmr.c | 14 +- + net/ipv4/nexthop.c | 66 +- + net/ipv4/ping.c | 29 +- + net/ipv4/raw.c | 5 +- + net/ipv4/route.c | 19 +- + net/ipv4/syncookies.c | 6 +- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 51 +- + net/ipv4/tcp_bpf.c | 13 +- + net/ipv4/tcp_cong.c | 27 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/ipv4/tcp_input.c | 223 +- + net/ipv4/tcp_ipv4.c | 18 +- + net/ipv4/tcp_metrics.c | 6 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 212 +- + net/ipv4/tcp_recovery.c | 16 +- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/tcp_timer.c | 1 - + net/ipv4/udp.c | 2 +- + net/ipv4/udp_bpf.c | 9 +- + net/ipv4/udp_tunnel_nic.c | 96 +- + net/ipv6/addrconf_core.c | 8 + + net/ipv6/af_inet6.c | 2 + + net/ipv6/inet6_hashtables.c | 6 +- + net/ipv6/ip6_fib.c | 12 +- + net/ipv6/ip6_gre.c | 33 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_vti.c | 8 +- + net/ipv6/netfilter/ip6t_NPT.c | 39 + + net/ipv6/route.c | 3 +- + net/ipv6/tcp_ipv6.c | 27 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 8 +- + net/l2tp/Makefile | 2 + + net/l2tp/l2tp_core.c | 329 +- + net/l2tp/l2tp_core.h | 33 +- + net/l2tp/l2tp_debugfs.c | 4 +- + net/l2tp/l2tp_eth.c | 13 +- + net/l2tp/l2tp_ip.c | 17 +- + net/l2tp/l2tp_ip6.c | 17 +- + net/l2tp/l2tp_netlink.c | 30 +- + net/l2tp/l2tp_ppp.c | 70 +- + net/l2tp/trace.h | 211 ++ + net/mac80211/Makefile | 1 + + net/mac80211/agg-rx.c | 2 +- + net/mac80211/cfg.c | 118 +- + net/mac80211/chan.c | 9 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.h | 29 + + net/mac80211/ibss.c | 7 +- + net/mac80211/ieee80211_i.h | 47 +- + net/mac80211/iface.c | 1576 +++++----- + net/mac80211/key.c | 15 - + net/mac80211/main.c | 2 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/mesh_hwmp.c | 4 +- + net/mac80211/mesh_plink.c | 1 + + net/mac80211/mesh_ps.c | 6 +- + net/mac80211/mlme.c | 233 +- + net/mac80211/offchannel.c | 40 +- + net/mac80211/rate.c | 40 +- + net/mac80211/rx.c | 98 +- + net/mac80211/s1g.c | 16 + + net/mac80211/scan.c | 43 +- + net/mac80211/sta_info.c | 4 + + net/mac80211/sta_info.h | 3 +- + net/mac80211/status.c | 229 +- + net/mac80211/trace.h | 33 + + net/mac80211/tx.c | 249 +- + net/mac80211/util.c | 193 ++ + net/mac80211/vht.c | 4 - + net/mptcp/mib.c | 9 + + net/mptcp/mib.h | 9 + + net/mptcp/options.c | 86 +- + net/mptcp/pm.c | 94 +- + net/mptcp/pm_netlink.c | 325 +- + net/mptcp/protocol.c | 553 +++- + net/mptcp/protocol.h | 67 +- + net/mptcp/subflow.c | 100 +- + net/ncsi/ncsi-netlink.c | 6 +- + net/netfilter/ipset/ip_set_core.c | 17 +- + net/netfilter/ipvs/Kconfig | 1 - + net/netfilter/ipvs/ip_vs_ctl.c | 13 +- + net/netfilter/ipvs/ip_vs_sync.c | 3 - + net/netfilter/nf_conntrack_core.c | 25 +- + net/netfilter/nf_conntrack_netlink.c | 5 +- + net/netfilter/nf_conntrack_standalone.c | 6 +- + net/netfilter/nf_tables_api.c | 86 +- + net/netfilter/nf_tables_core.c | 15 +- + net/netfilter/nf_tables_offload.c | 2 - + net/netfilter/nfnetlink.c | 19 +- + net/netfilter/nft_bitwise.c | 141 +- + net/netfilter/nft_cmp.c | 13 +- + net/netfilter/nft_socket.c | 27 + + net/netfilter/xt_HMARK.c | 2 +- + net/netlabel/netlabel_calipso.c | 10 +- + net/netlabel/netlabel_cipso_v4.c | 6 +- + net/netlabel/netlabel_domainhash.c | 5 +- + net/netlabel/netlabel_mgmt.c | 6 +- + net/netlabel/netlabel_unlabeled.c | 6 +- + net/netlink/af_netlink.c | 68 +- + net/netlink/genetlink.c | 377 ++- + net/netlink/policy.c | 288 +- + net/nfc/digital_dep.c | 3 - + net/openvswitch/actions.c | 40 +- + net/openvswitch/conntrack.c | 10 +- + net/openvswitch/datapath.c | 70 +- + net/openvswitch/flow_table.c | 70 +- + net/openvswitch/flow_table.h | 1 - + net/openvswitch/meter.c | 6 +- + net/openvswitch/vport-internal_dev.c | 8 +- + net/openvswitch/vport.c | 7 +- + net/packet/af_packet.c | 41 +- + net/psample/psample.c | 6 +- + net/rds/cong.c | 2 +- + net/rds/ib_cm.c | 2 +- + net/rds/ib_recv.c | 6 +- + net/rds/rdma.c | 2 +- + net/rxrpc/af_rxrpc.c | 7 +- + net/rxrpc/ar-internal.h | 70 +- + net/rxrpc/call_object.c | 43 + + net/rxrpc/conn_client.c | 1088 +++---- + net/rxrpc/conn_event.c | 14 +- + net/rxrpc/conn_object.c | 12 +- + net/rxrpc/conn_service.c | 7 + + net/rxrpc/local_object.c | 4 +- + net/rxrpc/net_ns.c | 5 +- + net/rxrpc/output.c | 6 + + net/rxrpc/proc.c | 2 +- + net/rxrpc/rtt.c | 1 - + net/rxrpc/rxkad.c | 8 +- + net/rxrpc/sysctl.c | 10 +- + net/sched/act_api.c | 5 +- + net/sched/act_ct.c | 8 +- + net/sched/act_ctinfo.c | 5 +- + net/sched/act_gate.c | 4 +- + net/sched/act_mpls.c | 18 + + net/sched/act_vlan.c | 40 + + net/sched/cls_u32.c | 8 +- + net/sched/sch_generic.c | 23 +- + net/sctp/associola.c | 4 +- + net/sctp/auth.c | 4 +- + net/sctp/bind_addr.c | 2 +- + net/sctp/chunk.c | 2 +- + net/sctp/protocol.c | 8 +- + net/sctp/sm_make_chunk.c | 6 +- + net/sctp/ulpqueue.c | 2 +- + net/smc/af_smc.c | 881 ++++-- + net/smc/smc.h | 19 + + net/smc/smc_cdc.c | 4 +- + net/smc/smc_clc.c | 500 ++- + net/smc/smc_clc.h | 250 +- + net/smc/smc_close.c | 4 +- + net/smc/smc_core.c | 77 +- + net/smc/smc_core.h | 24 +- + net/smc/smc_diag.c | 30 +- + net/smc/smc_ism.c | 32 +- + net/smc/smc_ism.h | 8 +- + net/smc/smc_llc.c | 2 +- + net/smc/smc_netns.h | 1 + + net/smc/smc_pnet.c | 174 +- + net/smc/smc_pnet.h | 15 + + net/smc/smc_tx.c | 10 +- + net/socket.c | 8 +- + net/sunrpc/sysctl.c | 6 +- + net/tipc/core.c | 6 + + net/tipc/core.h | 8 + + net/tipc/crypto.c | 981 ++++-- + net/tipc/crypto.h | 43 +- + net/tipc/link.c | 10 +- + net/tipc/msg.c | 2 +- + net/tipc/msg.h | 8 +- + net/tipc/net.c | 20 +- + net/tipc/net.h | 1 + + net/tipc/netlink.c | 2 + + net/tipc/netlink_compat.c | 6 +- + net/tipc/node.c | 94 +- + net/tipc/node.h | 2 + + net/tipc/socket.c | 3 +- + net/tipc/sysctl.c | 9 + + net/tipc/topsrv.c | 1 - + net/tipc/udp_media.c | 1 + + net/tls/tls_main.c | 25 +- + net/unix/af_unix.c | 1 - + net/wimax/stack.c | 6 +- + net/wireless/chan.c | 135 +- + net/wireless/core.c | 8 +- + net/wireless/core.h | 9 +- + net/wireless/lib80211.c | 2 - + net/wireless/mlme.c | 14 +- + net/wireless/nl80211.c | 517 +++- + net/wireless/radiotap.c | 1 + + net/wireless/reg.c | 329 +- + net/wireless/scan.c | 585 +++- + net/wireless/sme.c | 2 +- + net/wireless/util.c | 32 + + net/wireless/wext-compat.c | 2 +- + net/xdp/xdp_umem.c | 225 +- + net/xdp/xdp_umem.h | 6 - + net/xdp/xsk.c | 219 +- + net/xdp/xsk.h | 11 +- + net/xdp/xsk_buff_pool.c | 380 ++- + net/xdp/xsk_diag.c | 20 +- + net/xdp/xsk_queue.h | 14 +- + net/xdp/xskmap.c | 13 +- + net/xfrm/Kconfig | 11 + + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_compat.c | 625 ++++ + net/xfrm/xfrm_interface.c | 9 +- + net/xfrm/xfrm_state.c | 77 +- + net/xfrm/xfrm_user.c | 110 +- + samples/bpf/.gitignore | 1 + + samples/bpf/Makefile | 21 +- + samples/bpf/cpustat_kern.c | 36 +- + samples/bpf/cpustat_user.c | 47 +- + samples/bpf/lathist_kern.c | 24 +- + samples/bpf/lathist_user.c | 42 +- + samples/bpf/offwaketime_kern.c | 52 +- + samples/bpf/offwaketime_user.c | 66 +- + samples/bpf/sockex3_kern.c | 20 +- + samples/bpf/sockex3_user.c | 6 +- + samples/bpf/spintest_kern.c | 36 +- + samples/bpf/spintest_user.c | 68 +- + samples/bpf/syscall_tp_kern.c | 24 +- + samples/bpf/syscall_tp_user.c | 54 +- + samples/bpf/task_fd_query_kern.c | 2 +- + samples/bpf/task_fd_query_user.c | 2 +- + samples/bpf/test_current_task_under_cgroup_kern.c | 27 +- + samples/bpf/test_current_task_under_cgroup_user.c | 52 +- + samples/bpf/test_map_in_map_kern.c | 7 +- + samples/bpf/test_probe_write_user_kern.c | 12 +- + samples/bpf/test_probe_write_user_user.c | 49 +- + samples/bpf/trace_output_kern.c | 15 +- + samples/bpf/trace_output_user.c | 55 +- + samples/bpf/tracex3_kern.c | 2 +- + samples/bpf/tracex5_user.c | 6 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdpsock_user.c | 56 +- + samples/bpf/xsk_fwd.c | 1085 +++++++ + scripts/bpf_helpers_doc.py | 4 + + scripts/link-vmlinux.sh | 6 +- + security/bpf/hooks.c | 6 + + tools/bpf/bpftool/Documentation/Makefile | 15 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 37 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 33 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 33 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 37 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 27 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 36 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 48 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 34 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 34 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 34 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 35 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 34 +- + tools/bpf/bpftool/Documentation/common_options.rst | 22 + + tools/bpf/bpftool/Makefile | 6 +- + tools/bpf/bpftool/bash-completion/bpftool | 25 +- + tools/bpf/bpftool/gen.c | 2 - + tools/bpf/bpftool/json_writer.c | 6 + + tools/bpf/bpftool/json_writer.h | 3 + + tools/bpf/bpftool/link.c | 44 +- + tools/bpf/bpftool/main.c | 33 +- + tools/bpf/bpftool/map.c | 152 +- + tools/bpf/bpftool/net.c | 299 +- + tools/bpf/bpftool/prog.c | 203 +- + tools/bpf/resolve_btfids/Makefile | 2 + + tools/bpf/resolve_btfids/main.c | 29 +- + tools/build/Makefile | 2 + + tools/build/Makefile.feature | 1 - + tools/build/feature/Makefile | 4 - + tools/build/feature/test-all.c | 4 - + tools/build/feature/test-libelf-mmap.c | 9 - + tools/include/linux/btf_ids.h | 59 +- + tools/include/uapi/linux/bpf.h | 560 +++- + tools/lib/bpf/Makefile | 28 +- + tools/lib/bpf/bpf.c | 70 +- + tools/lib/bpf/bpf.h | 39 +- + tools/lib/bpf/bpf_core_read.h | 120 +- + tools/lib/bpf/bpf_helpers.h | 49 + + tools/lib/bpf/bpf_prog_linfo.c | 3 - + tools/lib/bpf/bpf_tracing.h | 4 +- + tools/lib/bpf/btf.c | 1899 ++++++++++-- + tools/lib/bpf/btf.h | 103 +- + tools/lib/bpf/btf_dump.c | 87 +- + tools/lib/bpf/hashmap.c | 3 + + tools/lib/bpf/hashmap.h | 12 + + tools/lib/bpf/libbpf.c | 3239 ++++++++++++++------ + tools/lib/bpf/libbpf.h | 12 +- + tools/lib/bpf/libbpf.map | 38 + + tools/lib/bpf/libbpf_common.h | 2 + + tools/lib/bpf/libbpf_internal.h | 147 +- + tools/lib/bpf/libbpf_probes.c | 8 +- + tools/lib/bpf/netlink.c | 128 +- + tools/lib/bpf/nlattr.c | 9 +- + tools/lib/bpf/ringbuf.c | 8 +- + tools/lib/bpf/xsk.c | 380 ++- + tools/lib/bpf/xsk.h | 9 + + tools/perf/Makefile.config | 4 - + tools/perf/util/bpf-loader.c | 12 +- + tools/perf/util/symbol.h | 2 +- + tools/testing/selftests/bpf/.gitignore | 2 - + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/README.rst | 21 + + tools/testing/selftests/bpf/bench.c | 5 +- + tools/testing/selftests/bpf/benchs/bench_rename.c | 17 - + tools/testing/selftests/bpf/benchs/bench_trigger.c | 17 + + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 13 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 8 +- + tools/testing/selftests/bpf/network_helpers.c | 37 + + tools/testing/selftests/bpf/network_helpers.h | 2 + + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 115 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 4 + + .../selftests/bpf/{test_btf.c => prog_tests/btf.c} | 410 +-- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 105 + + .../testing/selftests/bpf/prog_tests/btf_endian.c | 101 + + .../selftests/bpf/prog_tests/btf_map_in_map.c | 35 +- + .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 234 ++ + tools/testing/selftests/bpf/prog_tests/btf_write.c | 244 ++ + .../selftests/bpf/prog_tests/cls_redirect.c | 72 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 350 ++- + tools/testing/selftests/bpf/prog_tests/d_path.c | 157 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 293 +- + .../selftests/bpf/prog_tests/global_data_init.c | 3 +- + tools/testing/selftests/bpf/prog_tests/ksyms.c | 6 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 9 +- + tools/testing/selftests/bpf/prog_tests/metadata.c | 141 + + .../selftests/bpf/prog_tests/pe_preserve_elems.c | 66 + + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 65 +- + .../selftests/bpf/prog_tests/raw_tp_test_run.c | 96 + + .../selftests/bpf/prog_tests/reference_tracking.c | 2 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 45 +- + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 7 +- + .../selftests/bpf/prog_tests/snprintf_btf.c | 62 + + .../testing/selftests/bpf/prog_tests/sock_fields.c | 382 +++ + .../selftests/bpf/prog_tests/sockmap_basic.c | 189 ++ + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 +- + tools/testing/selftests/bpf/prog_tests/subprogs.c | 31 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 332 ++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 622 ++++ + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 94 + + .../selftests/bpf/prog_tests/test_local_storage.c | 60 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 9 + + .../selftests/bpf/prog_tests/test_overhead.c | 14 +- + tools/testing/selftests/bpf/prog_tests/trace_ext.c | 111 + + .../selftests/bpf/prog_tests/xdp_noinline.c | 49 +- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 2 + + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 2 + + tools/testing/selftests/bpf/progs/bpf_flow.c | 12 +- + tools/testing/selftests/bpf/progs/bpf_iter.h | 32 + + .../testing/selftests/bpf/progs/bpf_iter_sockmap.c | 59 + + .../selftests/bpf/progs/bpf_iter_task_btf.c | 50 + + .../selftests/bpf/progs/bpf_iter_task_file.c | 10 +- + .../selftests/bpf/progs/btf__core_reloc_enumval.c | 3 + + .../bpf/progs/btf__core_reloc_enumval___diff.c | 3 + + .../progs/btf__core_reloc_enumval___err_missing.c | 3 + + .../progs/btf__core_reloc_enumval___val3_missing.c | 3 + + .../progs/btf__core_reloc_size___err_ambiguous.c | 4 + + .../bpf/progs/btf__core_reloc_type_based.c | 3 + + .../btf__core_reloc_type_based___all_missing.c | 3 + + .../progs/btf__core_reloc_type_based___diff_sz.c | 3 + + .../btf__core_reloc_type_based___fn_wrong_args.c | 3 + + .../progs/btf__core_reloc_type_based___incompat.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_type_id.c | 3 + + .../btf__core_reloc_type_id___missing_targets.c | 3 + + tools/testing/selftests/bpf/progs/btf_ptr.h | 27 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 352 ++- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 27 + + .../selftests/bpf/progs/fmod_ret_freplace.c | 14 + + .../selftests/bpf/progs/freplace_attach_probe.c | 40 + + .../selftests/bpf/progs/freplace_cls_redirect.c | 34 + + .../selftests/bpf/progs/freplace_connect_v4_prog.c | 19 + + .../selftests/bpf/progs/freplace_get_constant.c | 15 + + tools/testing/selftests/bpf/progs/local_storage.c | 140 + + tools/testing/selftests/bpf/progs/lsm.c | 64 +- + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 16 +- + .../testing/selftests/bpf/progs/metadata_unused.c | 15 + + tools/testing/selftests/bpf/progs/metadata_used.c | 15 + + .../selftests/bpf/progs/netif_receive_skb.c | 249 ++ + tools/testing/selftests/bpf/progs/pyperf.h | 11 +- + .../testing/selftests/bpf/progs/pyperf_subprogs.c | 5 + + tools/testing/selftests/bpf/progs/strobemeta.h | 30 +- + .../selftests/bpf/progs/strobemeta_subprogs.c | 10 + + tools/testing/selftests/bpf/progs/tailcall1.c | 28 +- + tools/testing/selftests/bpf/progs/tailcall2.c | 14 +- + tools/testing/selftests/bpf/progs/tailcall3.c | 4 +- + .../selftests/bpf/progs/tailcall_bpf2bpf1.c | 38 + + .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 41 + + .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 61 + + .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 61 + + .../selftests/bpf/progs/test_btf_map_in_map.c | 31 + + .../selftests/bpf/progs/test_btf_skc_cls_ingress.c | 174 ++ + .../selftests/bpf/progs/test_cls_redirect.c | 105 +- + .../bpf/progs/test_cls_redirect_subprogs.c | 2 + + .../selftests/bpf/progs/test_core_reloc_enumval.c | 72 + + .../selftests/bpf/progs/test_core_reloc_kernel.c | 2 + + .../bpf/progs/test_core_reloc_type_based.c | 110 + + .../selftests/bpf/progs/test_core_reloc_type_id.c | 115 + + tools/testing/selftests/bpf/progs/test_d_path.c | 65 + + .../selftests/bpf/progs/test_l4lb_noinline.c | 41 +- + .../bpf/progs/test_misc_tcp_hdr_options.c | 325 ++ + tools/testing/selftests/bpf/progs/test_overhead.c | 6 - + .../selftests/bpf/progs/test_pe_preserve_elems.c | 38 + + .../testing/selftests/bpf/progs/test_pkt_access.c | 20 + + .../selftests/bpf/progs/test_raw_tp_test_run.c | 24 + + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 216 +- + ...{test_sock_fields_kern.c => test_sock_fields.c} | 176 +- + .../bpf/progs/test_sockmap_invalid_update.c | 23 + + .../selftests/bpf/progs/test_sockmap_update.c | 48 + + tools/testing/selftests/bpf/progs/test_subprogs.c | 103 + + .../selftests/bpf/progs/test_sysctl_loop1.c | 4 +- + .../selftests/bpf/progs/test_sysctl_loop2.c | 4 +- + .../testing/selftests/bpf/progs/test_sysctl_prog.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 144 + + .../selftests/bpf/progs/test_tcp_hdr_options.c | 623 ++++ + tools/testing/selftests/bpf/progs/test_trace_ext.c | 18 + + .../selftests/bpf/progs/test_trace_ext_tracing.c | 25 + + tools/testing/selftests/bpf/progs/test_vmlinux.c | 12 +- + .../selftests/bpf/progs/test_xdp_noinline.c | 36 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + tools/testing/selftests/bpf/test_bpftool_build.sh | 21 + + .../testing/selftests/bpf/test_bpftool_metadata.sh | 82 + + .../selftests/bpf/test_current_pid_tgid_new_ns.c | 1 + + tools/testing/selftests/bpf/test_progs.h | 63 + + tools/testing/selftests/bpf/test_sock_fields.c | 482 --- + tools/testing/selftests/bpf/test_socket_cookie.c | 2 +- + tools/testing/selftests/bpf/test_tc_neigh.sh | 168 + + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 151 + + tools/testing/selftests/bpf/test_verifier.c | 19 +- + tools/testing/selftests/bpf/verifier/and.c | 16 + + tools/testing/selftests/bpf/verifier/bounds.c | 146 + + tools/testing/selftests/bpf/verifier/calls.c | 6 +- + tools/testing/selftests/bpf/verifier/d_path.c | 37 + + tools/testing/selftests/bpf/verifier/map_ptr.c | 32 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 47 + + .../drivers/net/mlxsw/devlink_trap_policer.sh | 33 +- + .../selftests/drivers/net/mlxsw/qos_ets_strict.sh | 9 + + .../selftests/drivers/net/mlxsw/qos_headroom.sh | 379 +++ + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 14 + + .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 5 + + .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 403 +++ + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 6 + + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 1 + + .../selftests/drivers/net/mlxsw/tc_police_scale.sh | 12 +- + .../selftests/drivers/net/netdevsim/devlink.sh | 21 + + .../drivers/net/netdevsim/ethtool-pause.sh | 108 + + .../drivers/net/netdevsim/udp_tunnel_nic.sh | 167 + + .../drivers/net/ocelot/tc_flower_chains.sh | 273 ++ + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 + + tools/testing/selftests/net/config | 6 +- + tools/testing/selftests/net/drop_monitor_tests.sh | 215 ++ + tools/testing/selftests/net/fib_nexthops.sh | 44 + + .../selftests/net/forwarding/devlink_lib.sh | 70 +- + tools/testing/selftests/net/forwarding/lib.sh | 43 + + .../testing/selftests/net/forwarding/mirror_lib.sh | 2 +- + tools/testing/selftests/net/ipsec.c | 2195 +++++++++++++ + tools/testing/selftests/net/mptcp/Makefile | 3 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 22 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 21 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 193 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 293 ++ + tools/testing/selftests/net/nettest.c | 2 + + tools/testing/selftests/net/psock_snd.sh | 16 +- + tools/testing/selftests/net/tcp_mmap.c | 42 +- + 2213 files changed, 123631 insertions(+), 49969 deletions(-) + create mode 100644 Documentation/bpf/prog_sk_lookup.rst + create mode 100644 Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml + create mode 100644 Documentation/devicetree/bindings/net/intel,dwmac-plat.yaml + delete mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml + create mode 100644 Documentation/devicetree/bindings/net/renesas,etheravb.yaml + delete mode 100644 Documentation/devicetree/bindings/net/renesas,ravb.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,dp83822.yaml + delete mode 100644 Documentation/networking/caif/spi_porting.rst + create mode 100644 Documentation/networking/devlink/devlink-reload.rst + create mode 100644 Documentation/networking/statistics.rst + delete mode 100644 drivers/net/caif/caif_spi.c + delete mode 100644 drivers/net/caif/caif_spi_slave.c + create mode 100644 drivers/net/can/spi/mcp251xfd/Kconfig + create mode 100644 drivers/net/can/spi/mcp251xfd/Makefile + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c + create mode 100644 drivers/net/can/spi/mcp251xfd/mcp251xfd.h + create mode 100644 drivers/net/dsa/mv88e6xxx/devlink.c + create mode 100644 drivers/net/dsa/mv88e6xxx/devlink.h + create mode 100644 drivers/net/dsa/sja1105/sja1105_devlink.c + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/Kconfig + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/Makefile + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto/ch_ipsec}/chcr_ipsec.c (89%) + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h + create mode 100644 drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto/ch_ktls}/chcr_common.h (87%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto/ch_ktls}/chcr_ktls.c (86%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto/ch_ktls}/chcr_ktls.h (65%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/Makefile (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls.h (81%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_cm.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_cm.h (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_hw.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_io.c (100%) + rename drivers/{crypto/chelsio => net/ethernet/chelsio/inline_crypto}/chtls/chtls_main.c (99%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_debugfs.h + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_tai.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/ptp.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/ptp.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h + create mode 100644 drivers/net/ethernet/marvell/prestera/Kconfig + create mode 100644 drivers/net/ethernet/marvell/prestera/Makefile + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_devlink.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_devlink.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_dsa.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_dsa.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_ethtool.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_ethtool.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_hw.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_hw.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_main.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_pci.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_rxtx.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_rxtx.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_switchdev.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_switchdev.h + rename drivers/net/ethernet/mellanox/mlx5/core/en/xsk/{umem.c => pool.c} (50%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/umem.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/chains.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/chains.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h + delete mode 100644 drivers/net/ethernet/mscc/ocelot_s2.h + create mode 100644 drivers/net/ethernet/pensando/ionic/ionic_fw.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_devlink.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_devlink.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c + create mode 100644 drivers/net/mdio/Kconfig + create mode 100644 drivers/net/mdio/Makefile + rename drivers/net/{phy => mdio}/mdio-aspeed.c (100%) + rename drivers/net/{phy => mdio}/mdio-bcm-iproc.c (100%) + rename drivers/net/{phy => mdio}/mdio-bcm-unimac.c (100%) + rename drivers/net/{phy => mdio}/mdio-bitbang.c (100%) + rename drivers/net/{phy => mdio}/mdio-cavium.c (100%) + rename drivers/net/{phy => mdio}/mdio-cavium.h (100%) + rename drivers/net/{phy => mdio}/mdio-gpio.c (100%) + rename drivers/net/{phy => mdio}/mdio-hisi-femac.c (100%) + rename drivers/net/{phy => mdio}/mdio-i2c.c (98%) + rename drivers/net/{phy => mdio}/mdio-ipq4019.c (57%) + rename drivers/net/{phy => mdio}/mdio-ipq8064.c (100%) + rename drivers/net/{phy => mdio}/mdio-moxart.c (100%) + rename drivers/net/{phy => mdio}/mdio-mscc-miim.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-bcm-iproc.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-gpio.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-meson-g12a.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-mmioreg.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux-multiplexer.c (100%) + rename drivers/net/{phy => mdio}/mdio-mux.c (100%) + rename drivers/net/{phy => mdio}/mdio-mvusb.c (100%) + rename drivers/net/{phy => mdio}/mdio-octeon.c (100%) + rename drivers/net/{phy => mdio}/mdio-sun4i.c (100%) + rename drivers/net/{phy => mdio}/mdio-thunder.c (100%) + rename drivers/net/{phy => mdio}/mdio-xgene.c (99%) + rename drivers/{of => net/mdio}/of_mdio.c (95%) + create mode 100644 drivers/net/netdevsim/ethtool.c + create mode 100644 drivers/net/pcs/Kconfig + create mode 100644 drivers/net/pcs/Makefile + create mode 100644 drivers/net/pcs/pcs-lynx.c + rename drivers/net/{phy/mdio-xpcs.c => pcs/pcs-xpcs.c} (99%) + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs.c + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs.h + rename drivers/net/wireless/ath/ath11k/{debug_htt_stats.c => debugfs_htt_stats.c} (99%) + rename drivers/net/wireless/ath/ath11k/{debug_htt_stats.h => debugfs_htt_stats.h} (98%) + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs_sta.h + create mode 100644 drivers/net/wireless/ath/ath11k/hw.c + create mode 100644 drivers/net/wireless/ath/ath11k/mhi.c + create mode 100644 drivers/net/wireless/ath/ath11k/mhi.h + create mode 100644 drivers/net/wireless/ath/ath11k/pci.c + create mode 100644 drivers/net/wireless/ath/ath11k/pci.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/pnvm.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/pnvm.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/queue/tx.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/queue/tx.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/initvals_init.h + create mode 100644 include/linux/bpf_local_storage.h + create mode 100644 include/linux/cookie.h + rename {drivers/net/phy => include/linux/mdio}/mdio-i2c.h (100%) + rename {drivers/net/phy => include/linux/mdio}/mdio-xgene.h (100%) + create mode 100644 include/linux/pcs-lynx.h + rename include/linux/{mdio-xpcs.h => pcs/pcs-xpcs.h} (88%) + delete mode 100644 include/linux/platform_data/macb.h + delete mode 100644 include/net/caif/caif_spi.h + delete mode 100644 include/net/drop_monitor.h + create mode 100644 include/uapi/linux/can/isotp.h + create mode 100644 kernel/bpf/bpf_inode_storage.c + create mode 100644 kernel/bpf/bpf_local_storage.c + create mode 100644 kernel/bpf/preload/.gitignore + create mode 100644 kernel/bpf/preload/Kconfig + create mode 100644 kernel/bpf/preload/Makefile + create mode 100644 kernel/bpf/preload/bpf_preload.h + create mode 100644 kernel/bpf/preload/bpf_preload_kern.c + create mode 100644 kernel/bpf/preload/bpf_preload_umd_blob.S + create mode 100644 kernel/bpf/preload/iterators/.gitignore + create mode 100644 kernel/bpf/preload/iterators/Makefile + create mode 100644 kernel/bpf/preload/iterators/README + create mode 100644 kernel/bpf/preload/iterators/bpf_preload_common.h + create mode 100644 kernel/bpf/preload/iterators/iterators.bpf.c + create mode 100644 kernel/bpf/preload/iterators/iterators.c + create mode 100644 kernel/bpf/preload/iterators/iterators.skel.h + create mode 100644 net/can/isotp.c + create mode 100644 net/l2tp/trace.h + create mode 100644 net/mac80211/s1g.c + create mode 100644 net/xfrm/xfrm_compat.c + create mode 100644 samples/bpf/xsk_fwd.c + create mode 100644 tools/bpf/bpftool/Documentation/common_options.rst + delete mode 100644 tools/build/feature/test-libelf-mmap.c + rename tools/testing/selftests/bpf/{test_btf.c => prog_tests/btf.c} (96%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_endian.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_write.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/d_path.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/metadata.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/pe_preserve_elems.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_test_run.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/snprintf_btf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_fields.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/subprogs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpffs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_local_storage.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/trace_ext.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task_btf.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___diff.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___err_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___val3_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___err_ambiguous.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___all_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___diff_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___fn_wrong_args.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___incompat.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_id.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_id___missing_targets.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_ptr.h + create mode 100644 tools/testing/selftests/bpf/progs/fmod_ret_freplace.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_attach_probe.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_get_constant.c + create mode 100644 tools/testing/selftests/bpf/progs/local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/metadata_unused.c + create mode 100644 tools/testing/selftests/bpf/progs/metadata_used.c + create mode 100644 tools/testing/selftests/bpf/progs/netif_receive_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf1.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf2.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf3.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf4.c + create mode 100644 tools/testing/selftests/bpf/progs/test_btf_skc_cls_ingress.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_enumval.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_type_based.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_type_id.c + create mode 100644 tools/testing/selftests/bpf/progs/test_d_path.c + create mode 100644 tools/testing/selftests/bpf/progs/test_misc_tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/progs/test_pe_preserve_elems.c + create mode 100644 tools/testing/selftests/bpf/progs/test_raw_tp_test_run.c + rename tools/testing/selftests/bpf/progs/{test_sock_fields_kern.c => test_sock_fields.c} (61%) + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_invalid_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_subprogs.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_neigh.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c + create mode 100644 tools/testing/selftests/bpf/progs/test_trace_ext.c + create mode 100644 tools/testing/selftests/bpf/progs/test_trace_ext_tracing.c + create mode 100755 tools/testing/selftests/bpf/test_bpftool_metadata.sh + delete mode 100644 tools/testing/selftests/bpf/test_sock_fields.c + create mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh + create mode 100644 tools/testing/selftests/bpf/test_tcp_hdr_options.h + create mode 100644 tools/testing/selftests/bpf/verifier/d_path.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh + mode change 100644 => 100755 tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh + create mode 100755 tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh + create mode 100755 tools/testing/selftests/net/drop_monitor_tests.sh + create mode 100644 tools/testing/selftests/net/ipsec.c + create mode 100755 tools/testing/selftests/net/mptcp/simult_flows.sh +Merging mac80211/master (3fdd47c3b40a Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (a1b8638ba132 Linux 5.9-rc7) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (ce1558c285f9 ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close) +$ git merge sound-current/for-linus +Removing sound/soc/intel/haswell/sst-haswell-pcm.c +Removing sound/soc/intel/haswell/sst-haswell-ipc.h +Removing sound/soc/intel/haswell/sst-haswell-ipc.c +Removing sound/soc/intel/haswell/sst-haswell-dsp.c +Removing sound/soc/intel/haswell/Makefile +Removing sound/soc/intel/common/sst-firmware.c +Removing sound/soc/intel/common/sst-acpi.c +Removing sound/soc/intel/boards/byt-rt5640.c +Removing sound/soc/intel/boards/byt-max98090.c +Removing sound/soc/intel/baytrail/sst-baytrail-pcm.c +Removing sound/soc/intel/baytrail/sst-baytrail-ipc.h +Removing sound/soc/intel/baytrail/sst-baytrail-ipc.c +Removing sound/soc/intel/baytrail/sst-baytrail-dsp.c +Removing sound/soc/intel/baytrail/Makefile +Removing include/trace/events/hswadsp.h +Auto-merging include/linux/pxa2xx_ssp.h +Auto-merging drivers/spi/spi-atmel.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/tas2562.txt +Removing Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt +Removing Documentation/devicetree/bindings/sound/hdmi.txt +Removing Documentation/devicetree/bindings/sound/fsl,spdif.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-pci-devices-catpt | 16 + + Documentation/devicetree/bindings/sound/ak4458.txt | 5 + + Documentation/devicetree/bindings/sound/ak5558.txt | 2 + + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 6 +- + .../devicetree/bindings/sound/cirrus,cs4234.yaml | 74 + + .../devicetree/bindings/sound/fsl,spdif.txt | 68 - + .../devicetree/bindings/sound/fsl,spdif.yaml | 110 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 + + Documentation/devicetree/bindings/sound/hdmi.txt | 16 - + .../bindings/sound/intel,keembay-i2s.yaml | 1 + + .../devicetree/bindings/sound/max98090.txt | 2 +- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 73 + + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 75 + + .../devicetree/bindings/sound/mt6359.yaml | 61 + + .../bindings/sound/mt8183-da7219-max98357.txt | 1 + + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 7 + + .../devicetree/bindings/sound/qcom,apq8096.txt | 8 + + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 79 - + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 219 ++ + .../devicetree/bindings/sound/qcom,q6afe.txt | 23 + + .../devicetree/bindings/sound/qcom,sdm845.txt | 8 + + .../devicetree/bindings/sound/realtek,rt1015p.yaml | 36 + + .../devicetree/bindings/sound/rockchip-spdif.yaml | 1 + + Documentation/devicetree/bindings/sound/rt5640.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5665.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5668.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5682.txt | 2 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 11 +- + .../bindings/sound/samsung,midas-audio.yaml | 6 +- + .../devicetree/bindings/sound/samsung,odroid.yaml | 5 + + .../devicetree/bindings/sound/samsung-i2s.yaml | 15 + + .../devicetree/bindings/sound/sgtl5000.yaml | 4 + + .../devicetree/bindings/sound/tas2562.txt | 37 - + .../devicetree/bindings/sound/tas2562.yaml | 8 + + .../devicetree/bindings/sound/tas2764.yaml | 76 + + .../devicetree/bindings/sound/tas2770.yaml | 11 +- + .../bindings/sound/ti,j721e-cpb-audio.yaml | 92 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 50 + + MAINTAINERS | 1 + + arch/arm/mach-s3c24xx/mach-gta02.c | 17 + + arch/arm/mach-s3c24xx/mach-h1940.c | 18 + + arch/arm/mach-s3c24xx/mach-rx1950.c | 16 + + drivers/iio/adc/stm32-dfsdm-adc.c | 4 + + drivers/iio/adc/stm32-dfsdm.h | 2 + + drivers/spi/spi-atmel.c | 1 - + include/drm/drm_audio_component.h | 4 + + include/dt-bindings/sound/qcom,q6afe.h | 96 +- + include/dt-bindings/sound/sc7180-lpass.h | 11 + + include/sound/hda_codec.h | 1 + + include/sound/hda_register.h | 2 +- + include/sound/hdaudio_ext.h | 2 +- + include/sound/hdmi-codec.h | 3 - + include/sound/pcm_params.h | 5 - + include/sound/soc-acpi-intel-match.h | 1 - + include/sound/soc-acpi.h | 4 +- + include/sound/soc-component.h | 28 +- + include/sound/soc-dai.h | 8 +- + include/sound/soc-link.h | 3 +- + include/sound/soc.h | 4 + + include/sound/sof.h | 2 + + include/sound/sof/ext_manifest.h | 7 + + include/sound/sof/info.h | 6 +- + include/sound/sof/topology.h | 12 +- + include/sound/timer.h | 8 +- + include/trace/events/hswadsp.h | 385 --- + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 5 + + sound/ac97/ac97_core.h | 2 +- + sound/aoa/soundbus/i2sbus/pcm.c | 3 +- + sound/atmel/ac97c.c | 22 +- + sound/core/compress_offload.c | 5 +- + sound/core/control.c | 56 +- + sound/core/control_compat.c | 14 +- + sound/core/hrtimer.c | 2 +- + sound/core/hwdep.c | 27 +- + sound/core/hwdep_compat.c | 23 +- + sound/core/init.c | 3 +- + sound/core/memalloc.c | 2 +- + sound/core/pcm.c | 8 +- + sound/core/pcm_memory.c | 3 +- + sound/core/rawmidi.c | 2 +- + sound/core/seq/oss/seq_oss.c | 7 +- + sound/core/timer.c | 26 +- + sound/drivers/aloop.c | 23 +- + sound/drivers/pcsp/pcsp_lib.c | 12 +- + sound/drivers/portman2x4.c | 2 +- + sound/drivers/vx/vx_core.c | 4 +- + sound/drivers/vx/vx_pcm.c | 2 - + sound/firewire/amdtp-stream.c | 25 +- + sound/firewire/amdtp-stream.h | 2 +- + sound/firewire/bebob/bebob_hwdep.c | 3 +- + sound/firewire/fireworks/fireworks_pcm.c | 2 +- + sound/hda/ext/hdac_ext_bus.c | 5 +- + sound/hda/hdac_component.c | 3 + + sound/hda/hdac_i915.c | 69 +- + sound/pci/asihpi/asihpi.c | 37 +- + sound/pci/asihpi/hpioctl.c | 16 +- + sound/pci/asihpi/hpios.h | 2 +- + sound/pci/hda/hda_auto_parser.c | 2 +- + sound/pci/hda/hda_codec.c | 3 + + sound/pci/hda/hda_intel.c | 20 +- + sound/pci/hda/hda_jack.c | 14 +- + sound/pci/hda/hda_jack.h | 2 +- + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_ca0132.c | 1796 ++++++++++--- + sound/pci/hda/patch_hdmi.c | 23 +- + sound/pci/hda/patch_realtek.c | 56 + + sound/pci/mixart/mixart.h | 2 +- + sound/pci/riptide/riptide.c | 20 +- + sound/pci/rme9652/hdsp.c | 55 +- + sound/pci/rme9652/hdspm.c | 15 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 11 +- + sound/soc/atmel/Kconfig | 25 + + sound/soc/atmel/Makefile | 4 + + sound/soc/atmel/atmel-pcm-dma.c | 1 - + sound/soc/atmel/mchp-spdifrx.c | 953 +++++++ + sound/soc/atmel/mchp-spdiftx.c | 871 +++++++ + sound/soc/codecs/Kconfig | 27 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ak4458.c | 120 +- + sound/soc/codecs/ak4458.h | 5 +- + sound/soc/codecs/ak5558.c | 30 + + sound/soc/codecs/cs4234.c | 918 +++++++ + sound/soc/codecs/cs4234.h | 287 ++ + sound/soc/codecs/cs42l51.c | 9 + + sound/soc/codecs/cs47l15.c | 2 +- + sound/soc/codecs/cs47l35.c | 2 +- + sound/soc/codecs/da7219-aad.c | 85 +- + sound/soc/codecs/da7219-aad.h | 3 + + sound/soc/codecs/da7219.c | 494 ++-- + sound/soc/codecs/da7219.h | 1 + + sound/soc/codecs/hdac_hda.c | 3 + + sound/soc/codecs/hdac_hdmi.c | 140 +- + sound/soc/codecs/hdmi-codec.c | 12 +- + sound/soc/codecs/max98373-sdw.c | 3 + + sound/soc/codecs/max9867.c | 131 +- + sound/soc/codecs/max9867.h | 4 +- + sound/soc/codecs/mt6359.c | 2758 ++++++++++++++++++++ + sound/soc/codecs/mt6359.h | 2640 +++++++++++++++++++ + sound/soc/codecs/nau8825.c | 2 +- + sound/soc/codecs/rt1015.c | 111 +- + sound/soc/codecs/rt1015.h | 8 + + sound/soc/codecs/rt1015p.c | 148 ++ + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 1 + + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 97 +- + sound/soc/codecs/rt5682.h | 2 - + sound/soc/codecs/rt700-sdw.c | 5 +- + sound/soc/codecs/rt711-sdw.c | 6 +- + sound/soc/codecs/rt715-sdw.c | 3 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/rt715.h | 2 + + sound/soc/codecs/tas2562.c | 63 +- + sound/soc/codecs/tas2764.c | 688 +++++ + sound/soc/codecs/tas2764.h | 92 + + sound/soc/codecs/tas2770.c | 399 ++- + sound/soc/codecs/tas2770.h | 47 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tlv320adcx140.c | 177 +- + sound/soc/codecs/tlv320adcx140.h | 8 + + sound/soc/codecs/tlv320aic32x4-clk.c | 9 +- + sound/soc/codecs/tlv320aic32x4.c | 83 +- + sound/soc/codecs/tlv320aic32x4.h | 7 + + sound/soc/codecs/wm0010.c | 3 +- + sound/soc/codecs/wm8523.h | 2 +- + sound/soc/codecs/wm8962.c | 2 + + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 28 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/fsl-asoc-card.c | 15 + + sound/soc/fsl/fsl_audmix.c | 16 +- + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_esai.c | 14 +- + sound/soc/fsl/fsl_sai.c | 309 ++- + sound/soc/fsl/fsl_sai.h | 92 +- + sound/soc/fsl/fsl_spdif.c | 4 - + sound/soc/fsl/imx-audmix.c | 8 +- + sound/soc/fsl/imx-es8328.c | 12 +- + sound/soc/fsl/imx-mc13783.c | 10 +- + sound/soc/fsl/mx27vis-aic32x4.c | 10 +- + sound/soc/generic/simple-card.c | 33 +- + sound/soc/intel/Kconfig | 50 +- + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/atom/sst-atom-controls.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 3 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +- + sound/soc/intel/atom/sst-mfld-platform.h | 4 +- + sound/soc/intel/atom/sst/sst.c | 6 +- + sound/soc/intel/atom/sst/sst.h | 41 +- + sound/soc/intel/atom/sst/sst_acpi.c | 1 - + sound/soc/intel/atom/sst/sst_drv_interface.c | 3 - + sound/soc/intel/atom/sst/sst_ipc.c | 1 - + sound/soc/intel/atom/sst/sst_loader.c | 4 +- + sound/soc/intel/atom/sst/sst_pvt.c | 5 +- + sound/soc/intel/atom/sst/sst_stream.c | 1 - + sound/soc/intel/baytrail/Makefile | 5 - + sound/soc/intel/baytrail/sst-baytrail-dsp.c | 358 --- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 772 ------ + sound/soc/intel/baytrail/sst-baytrail-ipc.h | 65 - + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 459 ---- + sound/soc/intel/boards/Kconfig | 36 +- + sound/soc/intel/boards/Makefile | 11 +- + sound/soc/intel/boards/bdw-rt5650.c | 47 +- + sound/soc/intel/boards/bdw-rt5677.c | 42 +- + sound/soc/intel/boards/broadwell.c | 45 +- + sound/soc/intel/boards/byt-max98090.c | 182 -- + sound/soc/intel/boards/byt-rt5640.c | 224 -- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 1 - + sound/soc/intel/boards/bytcr_rt5640.c | 1 - + sound/soc/intel/boards/haswell.c | 32 +- + sound/soc/intel/boards/hda_dsp_common.c | 7 +- + sound/soc/intel/boards/hda_dsp_common.h | 3 - + sound/soc/intel/boards/sof_rt5682.c | 13 + + sound/soc/intel/boards/sof_sdw.c | 348 ++- + sound/soc/intel/boards/sof_sdw_common.h | 26 +- + sound/soc/intel/boards/sof_sdw_dmic.c | 1 + + sound/soc/intel/boards/sof_sdw_max98373.c | 38 +- + sound/soc/intel/boards/sof_sdw_rt1308.c | 6 + + sound/soc/intel/boards/sof_sdw_rt1316.c | 119 + + sound/soc/intel/boards/sof_sdw_rt5682.c | 2 + + sound/soc/intel/boards/sof_sdw_rt700.c | 8 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 2 + + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 174 ++ + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 42 + + sound/soc/intel/catpt/Makefile | 6 + + sound/soc/intel/catpt/core.h | 188 ++ + sound/soc/intel/catpt/device.c | 355 +++ + sound/soc/intel/catpt/dsp.c | 578 ++++ + sound/soc/intel/catpt/ipc.c | 298 +++ + sound/soc/intel/catpt/loader.c | 671 +++++ + sound/soc/intel/catpt/messages.c | 313 +++ + sound/soc/intel/catpt/messages.h | 401 +++ + sound/soc/intel/catpt/pcm.c | 1175 +++++++++ + sound/soc/intel/catpt/registers.h | 178 ++ + sound/soc/intel/catpt/sysfs.c | 55 + + sound/soc/intel/catpt/trace.h | 83 + + sound/soc/intel/common/Makefile | 4 - + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 15 - + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 89 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 34 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 16 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 232 +- + sound/soc/intel/common/sst-acpi.c | 236 -- + sound/soc/intel/common/sst-dsp-priv.h | 284 +- + sound/soc/intel/common/sst-dsp.c | 162 -- + sound/soc/intel/common/sst-dsp.h | 237 +- + sound/soc/intel/common/sst-firmware.c | 1273 --------- + sound/soc/intel/common/sst-ipc.c | 27 - + sound/soc/intel/common/sst-ipc.h | 3 - + sound/soc/intel/haswell/Makefile | 5 - + sound/soc/intel/haswell/sst-haswell-dsp.c | 705 ----- + sound/soc/intel/haswell/sst-haswell-ipc.c | 2222 ---------------- + sound/soc/intel/haswell/sst-haswell-ipc.h | 527 ---- + sound/soc/intel/haswell/sst-haswell-pcm.c | 1369 ---------- + sound/soc/intel/keembay/kmb_platform.c | 145 +- + sound/soc/intel/skylake/bxt-sst.c | 2 - + sound/soc/intel/skylake/cnl-sst-dsp.h | 4 +- + sound/soc/intel/skylake/cnl-sst.c | 4 +- + sound/soc/intel/skylake/skl-nhlt.c | 2 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 2 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 16 +- + sound/soc/intel/skylake/skl-sst-utils.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 8 +- + sound/soc/intel/skylake/skl-topology.h | 8 +- + sound/soc/intel/skylake/skl.c | 10 +- + sound/soc/intel/skylake/skl.h | 2 +- + sound/soc/mediatek/Kconfig | 1 + + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 5 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 50 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 +- + sound/soc/meson/axg-tdm-formatter.c | 2 +- + sound/soc/meson/meson-card-utils.c | 33 +- + sound/soc/qcom/Kconfig | 24 +- + sound/soc/qcom/Makefile | 4 + + sound/soc/qcom/common.c | 4 + + sound/soc/qcom/lpass-apq8016.c | 92 +- + sound/soc/qcom/lpass-cpu.c | 463 +++- + sound/soc/qcom/lpass-hdmi.c | 258 ++ + sound/soc/qcom/lpass-hdmi.h | 102 + + sound/soc/qcom/lpass-ipq806x.c | 71 +- + sound/soc/qcom/lpass-lpaif-reg.h | 208 +- + sound/soc/qcom/lpass-platform.c | 493 +++- + sound/soc/qcom/lpass-sc7180.c | 305 +++ + sound/soc/qcom/lpass.h | 181 +- + sound/soc/qcom/qdsp6/Makefile | 1 + + sound/soc/qcom/qdsp6/q6adm.c | 2 + + sound/soc/qcom/qdsp6/q6afe-clocks.c | 272 ++ + sound/soc/qcom/qdsp6/q6afe-dai.c | 231 ++ + sound/soc/qcom/qdsp6/q6afe.c | 310 ++- + sound/soc/qcom/qdsp6/q6afe.h | 33 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 416 ++- + sound/soc/qcom/qdsp6/q6asm.c | 175 +- + sound/soc/qcom/qdsp6/q6asm.h | 49 +- + sound/soc/qcom/qdsp6/q6core.c | 2 + + sound/soc/qcom/qdsp6/q6routing.c | 123 +- + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_max98090.c | 3 +- + sound/soc/samsung/h1940_uda1380.c | 71 +- + sound/soc/samsung/neo1973_wm8753.c | 85 +- + sound/soc/samsung/rx1950_uda1380.c | 72 +- + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c-i2s-v2.h | 3 +- + sound/soc/samsung/s3c2412-i2s.c | 2 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_pcm.c | 21 +- + sound/soc/soc-component.c | 73 +- + sound/soc/soc-compress.c | 30 +- + sound/soc/soc-core.c | 76 +- + sound/soc/soc-dai.c | 21 +- + sound/soc/soc-dapm.c | 4 +- + sound/soc/soc-generic-dmaengine-pcm.c | 5 + + sound/soc/soc-link.c | 21 +- + sound/soc/soc-pcm.c | 123 +- + sound/soc/soc-topology.c | 18 +- + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/control.c | 149 +- + sound/soc/sof/debug.c | 2 +- + sound/soc/sof/imx/Kconfig | 10 + + sound/soc/sof/imx/Makefile | 3 + + sound/soc/sof/imx/imx-common.c | 75 + + sound/soc/sof/imx/imx-common.h | 16 + + sound/soc/sof/imx/imx8.c | 40 +- + sound/soc/sof/imx/imx8m.c | 27 +- + sound/soc/sof/intel/Kconfig | 31 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 2 +- + sound/soc/sof/intel/bdw.c | 2 +- + sound/soc/sof/intel/byt.c | 6 +- + sound/soc/sof/intel/cnl.c | 40 +- + sound/soc/sof/intel/hda-codec.c | 28 +- + sound/soc/sof/intel/hda-dsp.c | 20 +- + sound/soc/sof/intel/hda-ipc.h | 4 + + sound/soc/sof/intel/hda-loader.c | 196 +- + sound/soc/sof/intel/hda-stream.c | 69 + + sound/soc/sof/intel/hda.c | 47 +- + sound/soc/sof/intel/hda.h | 12 +- + sound/soc/sof/intel/shim.h | 2 +- + sound/soc/sof/intel/tgl.c | 153 ++ + sound/soc/sof/ipc.c | 16 +- + sound/soc/sof/loader.c | 34 +- + sound/soc/sof/pcm.c | 8 +- + sound/soc/sof/pm.c | 13 +- + sound/soc/sof/sof-acpi-dev.c | 2 + + sound/soc/sof/sof-audio.c | 56 +- + sound/soc/sof/sof-audio.h | 10 + + sound/soc/sof/sof-of-dev.c | 6 + + sound/soc/sof/sof-pci-dev.c | 59 +- + sound/soc/sof/sof-priv.h | 22 +- + sound/soc/sof/topology.c | 421 +-- + sound/soc/sprd/sprd-pcm-compress.c | 2 +- + sound/soc/stm/stm32_adfsdm.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/sunxi/sun4i-codec.c | 2 +- + sound/soc/sunxi/sun50i-codec-analog.c | 176 +- + sound/soc/sunxi/sun8i-codec.c | 473 ++-- + sound/soc/tegra/tegra_max98090.c | 12 +- + sound/soc/tegra/tegra_rt5640.c | 12 +- + sound/soc/tegra/tegra_wm8753.c | 12 +- + sound/soc/tegra/trimslice.c | 12 +- + sound/soc/ti/Kconfig | 2 +- + sound/soc/ti/davinci-mcasp.c | 4 +- + sound/soc/ti/j721e-evm.c | 13 +- + sound/soc/txx9/txx9aclc.c | 11 +- + sound/soc/txx9/txx9aclc.h | 2 +- + sound/soc/xilinx/Kconfig | 4 +- + sound/usb/card.c | 133 +- + sound/usb/endpoint.c | 2 +- + sound/usb/midi.c | 13 +- + sound/usb/misc/ua101.c | 16 +- + sound/usb/mixer_quirks.c | 213 ++ + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/mixer_us16x08.c | 8 +- + sound/usb/quirks-table.h | 262 +- + sound/usb/usbaudio.h | 1 - + 381 files changed, 25537 insertions(+), 13541 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-catpt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs4234.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt + create mode 100644 Documentation/devicetree/bindings/sound/mchp,spdifrx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mchp,spdiftx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt6359.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2764.yaml + create mode 100644 include/dt-bindings/sound/sc7180-lpass.h + delete mode 100644 include/trace/events/hswadsp.h + create mode 100644 sound/soc/atmel/mchp-spdifrx.c + create mode 100644 sound/soc/atmel/mchp-spdiftx.c + create mode 100644 sound/soc/codecs/cs4234.c + create mode 100644 sound/soc/codecs/cs4234.h + create mode 100644 sound/soc/codecs/mt6359.c + create mode 100644 sound/soc/codecs/mt6359.h + create mode 100644 sound/soc/codecs/rt1015p.c + create mode 100644 sound/soc/codecs/tas2764.c + create mode 100644 sound/soc/codecs/tas2764.h + delete mode 100644 sound/soc/intel/baytrail/Makefile + delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-dsp.c + delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.c + delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-ipc.h + delete mode 100644 sound/soc/intel/baytrail/sst-baytrail-pcm.c + delete mode 100644 sound/soc/intel/boards/byt-max98090.c + delete mode 100644 sound/soc/intel/boards/byt-rt5640.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt711_sdca.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c + create mode 100644 sound/soc/intel/catpt/Makefile + create mode 100644 sound/soc/intel/catpt/core.h + create mode 100644 sound/soc/intel/catpt/device.c + create mode 100644 sound/soc/intel/catpt/dsp.c + create mode 100644 sound/soc/intel/catpt/ipc.c + create mode 100644 sound/soc/intel/catpt/loader.c + create mode 100644 sound/soc/intel/catpt/messages.c + create mode 100644 sound/soc/intel/catpt/messages.h + create mode 100644 sound/soc/intel/catpt/pcm.c + create mode 100644 sound/soc/intel/catpt/registers.h + create mode 100644 sound/soc/intel/catpt/sysfs.c + create mode 100644 sound/soc/intel/catpt/trace.h + delete mode 100644 sound/soc/intel/common/sst-acpi.c + delete mode 100644 sound/soc/intel/common/sst-firmware.c + delete mode 100644 sound/soc/intel/haswell/Makefile + delete mode 100644 sound/soc/intel/haswell/sst-haswell-dsp.c + delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.c + delete mode 100644 sound/soc/intel/haswell/sst-haswell-ipc.h + delete mode 100644 sound/soc/intel/haswell/sst-haswell-pcm.c + create mode 100644 sound/soc/qcom/lpass-hdmi.c + create mode 100644 sound/soc/qcom/lpass-hdmi.h + create mode 100644 sound/soc/qcom/lpass-sc7180.c + create mode 100644 sound/soc/qcom/qdsp6/q6afe-clocks.c + create mode 100644 sound/soc/sof/imx/imx-common.c + create mode 100644 sound/soc/sof/imx/imx-common.h + create mode 100644 sound/soc/sof/intel/tgl.c +Merging sound-asoc-fixes/for-linus (2ebefde9de62 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/intel/Kconfig | 18 ------------- + sound/soc/intel/atom/Makefile | 2 +- + sound/soc/intel/atom/sst/Makefile | 6 ++--- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 39 ++++++++++++++++++++++------ + sound/soc/intel/catpt/dsp.c | 9 ++++--- + sound/soc/intel/catpt/pcm.c | 10 +++++++ + 6 files changed, 51 insertions(+), 33 deletions(-) +Merging regmap-fixes/for-linus (549738f15da0 Linux 5.9-rc8) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (549738f15da0 Linux 5.9-rc8) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (d4f3a651ab82 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (76a6b0b90d53 MAINTAINERS: Add Pali Rohár as aardvark PCI maintainer) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (856deb866d16 Linux 5.9-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (ba4f184e126b Linux 5.9-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (549738f15da0 Linux 5.9-rc8) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (51609fba0cca usb: dwc3: simple: add support for Hikey 970) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/dwc3-of-simple.c | 1 + + drivers/usb/dwc3/ep0.c | 16 +++++++++++ + drivers/usb/dwc3/gadget.c | 56 ++++++++++++++++++++++++++++++--------- + drivers/usb/dwc3/gadget.h | 1 + + 6 files changed, 63 insertions(+), 14 deletions(-) +Merging usb-serial-fixes/usb-linus (856deb866d16 Linux 5.9-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (850280156f64 phy: ti: am654: Fix a leak in serdes_am654_probe()) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (549738f15da0 Linux 5.9-rc8) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (856deb866d16 Linux 5.9-rc5) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (3fbbf2148a40 soundwire: fix double free of dangling pointer) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (549738f15da0 Linux 5.9-rc8) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (5fc27b098daf Input: i8042 - add nopnp quirk for Acer Aspire 5 A515) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (3093e7c16e12 X.509: Fix modular build of public_key_sm2) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay()) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (aa803771a80a tools: Avoid comma separated statements) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (549738f15da0 Linux 5.9-rc8) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (1afc0c89f6a1 Revert "mtd: spi-nor: Add capability to disable flash quad mode") +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d0254f82d702 media: dt-bindings: media: imx274: Convert to json-schema) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (be090fa62080 MIPS: BCM47XX: Remove the needless check with the 1074K) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (e2e1a1c86bf3 Merge tag 'kvmarm-fixes-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for KVM_CAP_S390_DIAG318) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (18360b33a071 hwmon: (w83627ehf) Fix a resource leak in probe) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (2a851de0233a Merge branch 'misc-5.9' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (8a018eb55e3a pipe: Fix memory leaks in create_pipe_files()) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (1797d588af15 platform/x86: asus-wmi: Fix SW_TABLET_MODE always reporting 1 on many different models) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (bbf5c979011a Linux 5.9) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (efe84d408bf4 scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (bcf3a2953d36 scsi: iscsi: iscsi_tcp: Avoid holding spinlock while calling getpeername()) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (dded93ffbb8c Merge tag 'amd-drm-fixes-5.9-2020-10-08' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (bbf5c979011a Linux 5.9) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4243219141b6 mmc: core: don't set limits.discard_granularity as 0) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (911e1987efc8 Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (84814460eef9 riscv: Fixup bootup failure with HARDENED_USERCOPY) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation) +$ git merge pidfd-fixes/fixes +Auto-merging net/ipv4/tcp_metrics.c +Auto-merging net/core/net_namespace.c +Auto-merging net/core/net-sysfs.c +Auto-merging kernel/pid.c +Auto-merging include/net/net_namespace.h +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/mount.h | 3 +-- + fs/namespace.c | 4 ++-- + include/linux/cgroup.h | 5 ++--- + include/linux/ipc_namespace.h | 3 +-- + include/linux/ns_common.h | 3 +++ + include/linux/pid_namespace.h | 4 +--- + include/linux/time_namespace.h | 9 ++++----- + include/linux/user_namespace.h | 5 ++--- + include/linux/utsname.h | 9 ++++----- + include/net/net_namespace.h | 11 ++++------- + include/uapi/linux/ptrace.h | 3 ++- + init/version.c | 2 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 4 ++-- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 13 +++---------- + kernel/time/namespace.c | 9 +++------ + kernel/user.c | 2 +- + kernel/user_namespace.c | 4 ++-- + kernel/utsname.c | 7 ++----- + net/core/net-sysfs.c | 6 +++--- + net/core/net_namespace.c | 6 +++--- + net/ipv4/inet_timewait_sock.c | 4 ++-- + net/ipv4/tcp_metrics.c | 2 +- + 26 files changed, 53 insertions(+), 73 deletions(-) +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (c5c553850899 scripts/spdxcheck.py: handle license identifiers in XML comments) +$ git merge spdx/spdx-linus +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/scsi/LICENSE.qla4xxx +Removing Documentation/scsi/LICENSE.qla2xxx +Removing Documentation/networking/device_drivers/qlogic/LICENSE.qlge +Removing Documentation/networking/device_drivers/qlogic/LICENSE.qlcnic +Removing Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fcc47c86fbd1] Merge remote-tracking branch 'spdx/spdx-linus' into master +$ git diff -M --stat --summary HEAD^.. + .../device_drivers/qlogic/LICENSE.qla3xxx | 46 --- + .../device_drivers/qlogic/LICENSE.qlcnic | 288 -------------- + .../networking/device_drivers/qlogic/LICENSE.qlge | 288 -------------- + Documentation/scsi/LICENSE.qla2xxx | 290 -------------- + Documentation/scsi/LICENSE.qla4xxx | 289 -------------- + LICENSES/deprecated/GFDL-1.1 | 377 +++++++++++++++++++ + LICENSES/deprecated/GFDL-1.2 | 417 +++++++++++++++++++++ + LICENSES/deprecated/Zlib | 27 ++ + MAINTAINERS | 3 - + .../mellanox/mlx5/core/accel/ipsec_offload.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 3 +- + drivers/net/ethernet/qlogic/qla3xxx.h | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 3 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 3 +- + drivers/scsi/qla2xxx/qla_bsg.c | 3 +- + drivers/scsi/qla2xxx/qla_bsg.h | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 3 +- + drivers/scsi/qla2xxx/qla_dbg.h | 3 +- + drivers/scsi/qla2xxx/qla_def.h | 3 +- + drivers/scsi/qla2xxx/qla_dfs.c | 3 +- + drivers/scsi/qla2xxx/qla_fw.h | 3 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 3 +- + drivers/scsi/qla2xxx/qla_inline.h | 3 +- + drivers/scsi/qla2xxx/qla_iocb.c | 3 +- + drivers/scsi/qla2xxx/qla_isr.c | 3 +- + drivers/scsi/qla2xxx/qla_mbx.c | 3 +- + drivers/scsi/qla2xxx/qla_mid.c | 3 +- + drivers/scsi/qla2xxx/qla_mr.c | 3 +- + drivers/scsi/qla2xxx/qla_mr.h | 3 +- + drivers/scsi/qla2xxx/qla_nvme.c | 3 +- + drivers/scsi/qla2xxx/qla_nvme.h | 3 +- + drivers/scsi/qla2xxx/qla_nx.c | 3 +- + drivers/scsi/qla2xxx/qla_nx.h | 3 +- + drivers/scsi/qla2xxx/qla_nx2.c | 3 +- + drivers/scsi/qla2xxx/qla_nx2.h | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/qla2xxx/qla_settings.h | 3 +- + drivers/scsi/qla2xxx/qla_sup.c | 3 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 3 +- + drivers/scsi/qla2xxx/qla_tmpl.h | 3 +- + drivers/scsi/qla2xxx/qla_version.h | 3 +- + drivers/scsi/qla4xxx/ql4_83xx.c | 3 +- + drivers/scsi/qla4xxx/ql4_83xx.h | 3 +- + drivers/scsi/qla4xxx/ql4_attr.c | 3 +- + drivers/scsi/qla4xxx/ql4_bsg.c | 3 +- + drivers/scsi/qla4xxx/ql4_bsg.h | 3 +- + drivers/scsi/qla4xxx/ql4_dbg.c | 3 +- + drivers/scsi/qla4xxx/ql4_dbg.h | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 3 +- + drivers/scsi/qla4xxx/ql4_fw.h | 3 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 3 +- + drivers/scsi/qla4xxx/ql4_init.c | 3 +- + drivers/scsi/qla4xxx/ql4_inline.h | 3 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 3 +- + drivers/scsi/qla4xxx/ql4_isr.c | 3 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 3 +- + drivers/scsi/qla4xxx/ql4_nvram.c | 3 +- + drivers/scsi/qla4xxx/ql4_nvram.h | 3 +- + drivers/scsi/qla4xxx/ql4_nx.c | 3 +- + drivers/scsi/qla4xxx/ql4_nx.h | 3 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 +- + drivers/scsi/qla4xxx/ql4_version.h | 3 +- + drivers/staging/qlge/qlge.h | 3 +- + drivers/staging/qlge/qlge_main.c | 2 +- + scripts/spdxcheck.py | 3 + + 86 files changed, 900 insertions(+), 1354 deletions(-) + delete mode 100644 Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx + delete mode 100644 Documentation/networking/device_drivers/qlogic/LICENSE.qlcnic + delete mode 100644 Documentation/networking/device_drivers/qlogic/LICENSE.qlge + delete mode 100644 Documentation/scsi/LICENSE.qla2xxx + delete mode 100644 Documentation/scsi/LICENSE.qla4xxx + create mode 100644 LICENSES/deprecated/GFDL-1.1 + create mode 100644 LICENSES/deprecated/GFDL-1.2 + create mode 100644 LICENSES/deprecated/Zlib +Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (3488737093e7 pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (1abdd39f14b2 kunit: tool: fix display of make errors) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + tools/testing/kunit/configs/broken_on_uml.config | 1 + + tools/testing/kunit/kunit.py | 58 +++++++++++++++------- + tools/testing/kunit/kunit_json.py | 63 ++++++++++++++++++++++++ + tools/testing/kunit/kunit_kernel.py | 27 +++++----- + tools/testing/kunit/kunit_tool_test.py | 33 +++++++++++++ + 5 files changed, 154 insertions(+), 28 deletions(-) + create mode 100644 tools/testing/kunit/kunit_json.py +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/wl.c | 13 +++++++++++++ + fs/ubifs/debug.c | 1 + + fs/ubifs/ioctl.c | 1 - + fs/ubifs/journal.c | 7 ++++--- + fs/ubifs/orphan.c | 2 ++ + fs/ubifs/tnc.c | 3 +++ + fs/ubifs/xattr.c | 2 ++ + 7 files changed, 25 insertions(+), 4 deletions(-) +Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors) +$ git merge memblock-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (27204b99b082 drm: drm_dsc.h: fix a kernel-doc markup) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp-gustavo/for-next/kspp (736116436e5b include: jhash/signal: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging kernel/tracepoint.c +Auto-merging include/linux/fs.h +Auto-merging drivers/target/target_core_user.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- + drivers/target/target_core_user.c | 2 +- + fs/binfmt_elf.c | 2 +- + fs/hfs/btree.h | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/isofs/rock.h | 8 ++++---- + fs/select.c | 4 ++-- + include/linux/dma/ti-cppi5.h | 4 ++-- + include/linux/fs.h | 2 +- + include/linux/jhash.h | 2 ++ + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + include/linux/platform_data/cros_ec_commands.h | 14 +++++++------- + include/linux/platform_data/cros_ec_proto.h | 2 +- + include/linux/signal.h | 2 ++ + kernel/params.c | 2 +- + kernel/tracepoint.c | 2 +- + net/bluetooth/msft.c | 3 ++- + security/integrity/ima/ima.h | 2 +- + 18 files changed, 32 insertions(+), 27 deletions(-) +Merging kbuild/for-next (666ddd277a19 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging tools/testing/selftests/bpf/Makefile +Removing scripts/namespace.pl +Auto-merging scripts/link-vmlinux.sh +Removing scripts/gen_compile_commands.py +Auto-merging scripts/Makefile.kcsan +Auto-merging lib/Kconfig.debug +Auto-merging arch/arm64/kernel/vdso/Makefile +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm/Makefile +CONFLICT (content): Merge conflict in arch/arm/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/submit-checklist.rst +Resolved 'arch/arm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 209335219bf1] Merge remote-tracking branch 'kbuild/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/process/submit-checklist.rst | 3 +- + MAINTAINERS | 1 + + Makefile | 86 +++- + arch/arm/Makefile | 4 - + .../module.lds => include/asm/module.lds.h} | 2 + + arch/arm/vdso/Makefile | 2 +- + arch/arm64/Makefile | 4 - + .../module.lds => include/asm/module.lds.h} | 2 + + arch/arm64/kernel/vdso/Makefile | 4 +- + arch/arm64/kernel/vdso32/Makefile | 8 +- + arch/ia64/Makefile | 1 - + arch/ia64/{module.lds => include/asm/module.lds.h} | 0 + arch/m68k/Makefile | 1 - + .../module.lds => include/asm/module.lds.h} | 0 + arch/mips/vdso/Makefile | 2 +- + arch/nds32/kernel/vdso/Makefile | 2 +- + arch/powerpc/Makefile | 1 - + .../module.lds => include/asm/module.lds.h} | 0 + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/riscv/Makefile | 3 - + .../module.lds => include/asm/module.lds.h} | 3 +- + arch/riscv/kernel/vdso/Makefile | 2 +- + arch/s390/kernel/vdso64/Makefile | 4 +- + arch/sparc/vdso/Makefile | 2 +- + arch/um/include/asm/Kbuild | 1 + + arch/x86/entry/vdso/Makefile | 2 +- + include/asm-generic/Kbuild | 1 + + include/asm-generic/module.lds.h | 10 + + lib/Kconfig.debug | 10 +- + scripts/.gitignore | 1 + + scripts/Makefile | 3 + + scripts/Makefile.kasan | 4 +- + scripts/Makefile.kcsan | 2 +- + scripts/Makefile.modfinal | 5 +- + scripts/Makefile.ubsan | 3 + + scripts/clang-tools/gen_compile_commands.py | 236 ++++++++++ + scripts/clang-tools/run-clang-tools.py | 74 ++++ + scripts/gen_compile_commands.py | 151 ------- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/qconf.cc | 368 +++++++--------- + scripts/kconfig/qconf.h | 77 +--- + scripts/link-vmlinux.sh | 20 +- + scripts/{module-common.lds => module.lds.S} | 3 + + scripts/namespace.pl | 473 --------------------- + scripts/package/builddeb | 13 +- + scripts/package/mkdebian | 9 +- + scripts/setlocalversion | 21 +- + tools/testing/selftests/bpf/Makefile | 2 +- + 49 files changed, 650 insertions(+), 996 deletions(-) + rename arch/arm/{kernel/module.lds => include/asm/module.lds.h} (72%) + rename arch/arm64/{kernel/module.lds => include/asm/module.lds.h} (76%) + rename arch/ia64/{module.lds => include/asm/module.lds.h} (100%) + rename arch/m68k/{kernel/module.lds => include/asm/module.lds.h} (100%) + rename arch/powerpc/{kernel/module.lds => include/asm/module.lds.h} (100%) + rename arch/riscv/{kernel/module.lds => include/asm/module.lds.h} (84%) + create mode 100644 include/asm-generic/module.lds.h + create mode 100755 scripts/clang-tools/gen_compile_commands.py + create mode 100755 scripts/clang-tools/run-clang-tools.py + delete mode 100755 scripts/gen_compile_commands.py + rename scripts/{module-common.lds => module.lds.S} (93%) + delete mode 100755 scripts/namespace.pl +Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (2a410d09417b ARM/ixp4xx: add a missing include of dma-map-ops.h) +$ git merge dma-mapping/for-next +Auto-merging mm/memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/Kconfig +Auto-merging kernel/dma/swiotlb.c +Auto-merging kernel/dma/contiguous.c +Auto-merging include/linux/gfp.h +Removing include/linux/dma-noncoherent.h +Removing include/linux/dma-contiguous.h +Removing include/asm-generic/dma-contiguous.h +Auto-merging include/asm-generic/Kbuild +Auto-merging drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +Auto-merging drivers/media/platform/exynos4-is/fimc-is.c +Auto-merging drivers/iommu/io-pgtable-arm.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/base/core.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/xtensa/mm/init.c +Auto-merging arch/x86/pci/sta2x11-fixup.c +Auto-merging arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/kernel/setup.c +Auto-merging arch/mips/cavium-octeon/dma-octeon.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/microblaze/mm/init.c +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm/xen/mm.c +Auto-merging arch/arm/mm/init.c +Removing arch/arm/include/asm/dma-contiguous.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master da3ac3791431] Merge remote-tracking branch 'dma-mapping/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 13 +- + Documentation/core-api/dma-api.rst | 99 +++---- + Documentation/core-api/dma-attributes.rst | 8 - + MAINTAINERS | 2 +- + arch/alpha/kernel/pci_iommu.c | 11 +- + arch/arc/mm/dma.c | 2 +- + arch/arm/common/dmabounce.c | 3 +- + arch/arm/include/asm/dma-contiguous.h | 15 - + arch/arm/include/asm/dma-direct.h | 35 ++- + arch/arm/include/asm/dma-iommu.h | 1 - + arch/arm/include/asm/dma-mapping.h | 71 ----- + arch/arm/mach-davinci/devices-da8xx.c | 18 +- + arch/arm/mach-highbank/highbank.c | 2 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- + arch/arm/mach-imx/mach-mx31moboard.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 1 + + arch/arm/mach-keystone/keystone.c | 21 +- + arch/arm/mach-mvebu/coherency.c | 2 +- + arch/arm/mach-omap1/include/mach/memory.h | 31 -- + arch/arm/mach-omap1/usb.c | 22 ++ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mm/dma-mapping-nommu.c | 3 + + arch/arm/mm/dma-mapping.c | 9 +- + arch/arm/mm/init.c | 2 +- + arch/arm/xen/mm.c | 2 +- + arch/arm64/mm/dma-mapping.c | 2 +- + arch/arm64/mm/init.c | 5 +- + arch/c6x/mm/dma-coherent.c | 2 +- + arch/csky/kernel/setup.c | 2 +- + arch/csky/mm/dma-mapping.c | 4 +- + arch/hexagon/kernel/dma.c | 2 +- + arch/ia64/Kconfig | 3 +- + arch/ia64/hp/common/sba_iommu.c | 7 +- + arch/ia64/kernel/dma-mapping.c | 14 +- + arch/ia64/mm/init.c | 5 +- + arch/m68k/kernel/dma.c | 2 +- + arch/microblaze/kernel/dma.c | 3 +- + arch/microblaze/mm/consistent.c | 2 +- + arch/microblaze/mm/init.c | 2 +- + arch/mips/Kconfig | 1 - + arch/mips/bmips/dma.c | 4 +- + arch/mips/cavium-octeon/dma-octeon.c | 4 +- + arch/mips/include/asm/dma-direct.h | 4 +- + arch/mips/include/asm/jazzdma.h | 2 - + arch/mips/jazz/jazzdma.c | 105 ++----- + arch/mips/kernel/setup.c | 2 +- + arch/mips/loongson2ef/fuloong-2e/dma.c | 4 +- + arch/mips/loongson2ef/lemote-2f/dma.c | 4 +- + arch/mips/loongson64/dma.c | 4 +- + arch/mips/mm/dma-noncoherent.c | 51 ++-- + arch/mips/pci/pci-ar2315.c | 4 +- + arch/mips/pci/pci-xtalk-bridge.c | 4 +- + arch/mips/sgi-ip32/ip32-dma.c | 4 +- + arch/nds32/kernel/dma.c | 2 +- + arch/openrisc/kernel/dma.c | 2 +- + arch/parisc/Kconfig | 1 - + arch/parisc/kernel/drivers.c | 1 + + arch/parisc/kernel/pci-dma.c | 8 +- + arch/powerpc/include/asm/dma-direct.h | 4 +- + arch/powerpc/include/asm/iommu.h | 2 +- + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/kernel/dma-iommu.c | 2 + + arch/powerpc/kernel/iommu.c | 11 +- + arch/powerpc/mm/dma-noncoherent.c | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 6 +- + arch/powerpc/platforms/pseries/ibmebus.c | 2 +- + arch/powerpc/platforms/pseries/vio.c | 4 +- + arch/s390/kernel/setup.c | 2 +- + arch/s390/pci/pci_dma.c | 10 +- + arch/sh/boards/mach-ap325rxa/setup.c | 1 + + arch/sh/boards/mach-ecovec24/setup.c | 1 + + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 1 + + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- + arch/sh/drivers/pci/pci.c | 1 - + arch/sh/drivers/pci/pcie-sh7786.c | 9 +- + arch/sh/kernel/dma-coherent.c | 2 +- + arch/sparc/kernel/iommu-common.c | 10 +- + arch/sparc/kernel/iommu.c | 5 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 4 +- + arch/sparc/mm/io-unit.c | 2 +- + arch/sparc/mm/iommu.c | 2 +- + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/kernel/amd_gart_64.c | 12 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/setup.c | 2 + + arch/x86/pci/sta2x11-fixup.c | 6 +- + arch/x86/xen/pci-swiotlb-xen.c | 2 +- + arch/xtensa/kernel/pci-dma.c | 3 +- + arch/xtensa/mm/init.c | 2 +- + drivers/acpi/arm64/iort.c | 6 +- + drivers/acpi/scan.c | 2 +- + drivers/base/core.c | 2 + + drivers/base/dd.c | 2 +- + drivers/dma-buf/heaps/cma_heap.c | 2 +- + drivers/firewire/ohci.c | 26 +- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 - + drivers/gpu/drm/msm/msm_gem.c | 1 + + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 8 +- + drivers/iommu/amd/iommu.c | 3 +- + drivers/iommu/dma-iommu.c | 46 ++- + drivers/iommu/intel/iommu.c | 10 +- + drivers/iommu/io-pgtable-arm.c | 5 - + drivers/media/platform/exynos4-is/fimc-is.c | 1 - + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 9 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 11 +- + drivers/misc/mic/Kconfig | 1 + + drivers/misc/mic/bus/mic_bus.c | 1 + + drivers/misc/mic/bus/scif_bus.c | 2 +- + drivers/misc/mic/bus/scif_bus.h | 2 +- + drivers/misc/mic/bus/vop_bus.c | 2 +- + drivers/misc/mic/host/mic_boot.c | 1 + + drivers/net/ethernet/amd/au1000_eth.c | 15 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 37 +-- + drivers/net/ethernet/i825xx/lib82596.c | 148 +++++----- + drivers/net/ethernet/i825xx/sni_82596.c | 23 +- + drivers/net/ethernet/seeq/sgiseeq.c | 28 +- + drivers/of/address.c | 73 ++--- + drivers/of/device.c | 45 +-- + drivers/of/of_private.h | 11 +- + drivers/of/unittest.c | 34 ++- + drivers/parisc/ccio-dma.c | 6 +- + drivers/parisc/sba_iommu.c | 6 +- + drivers/pci/pci-driver.c | 1 + + drivers/pci/xen-pcifront.c | 1 + + drivers/pcmcia/ds.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 25 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/scsi/53c700.c | 121 ++++---- + drivers/scsi/53c700.h | 17 +- + drivers/scsi/sgiwd93.c | 14 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 10 +- + drivers/usb/core/message.c | 6 - + drivers/usb/core/usb.c | 12 - + drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- + drivers/xen/swiotlb-xen.c | 4 +- + include/asm-generic/Kbuild | 1 - + include/asm-generic/dma-contiguous.h | 10 - + include/linux/cma.h | 2 + + include/linux/device.h | 4 +- + include/linux/dma-contiguous.h | 176 ----------- + include/linux/dma-direct.h | 198 +++++-------- + include/linux/dma-direction.h | 8 +- + include/linux/dma-map-ops.h | 326 +++++++++++++++++++++ + include/linux/dma-mapping.h | 240 ++++----------- + include/linux/dma-noncoherent.h | 114 ------- + include/linux/gfp.h | 6 +- + kernel/dma/Kconfig | 25 +- + kernel/dma/Makefile | 1 + + kernel/dma/coherent.c | 25 +- + kernel/dma/contiguous.c | 142 ++++++++- + kernel/dma/debug.c | 19 +- + include/linux/dma-debug.h => kernel/dma/debug.h | 44 +-- + kernel/dma/direct.c | 268 ++++++++++------- + kernel/dma/direct.h | 119 ++++++++ + kernel/dma/dummy.c | 3 +- + kernel/dma/mapping.c | 159 ++++++---- + kernel/dma/ops_helpers.c | 85 ++++++ + kernel/dma/pool.c | 5 +- + kernel/dma/swiotlb.c | 6 +- + kernel/dma/virt.c | 4 +- + mm/Kconfig | 3 +- + mm/cma.h | 2 - + mm/hugetlb.c | 4 +- + mm/memory.c | 1 - + sound/mips/hal2.c | 58 ++-- + 170 files changed, 1921 insertions(+), 1699 deletions(-) + delete mode 100644 arch/arm/include/asm/dma-contiguous.h + delete mode 100644 include/asm-generic/dma-contiguous.h + delete mode 100644 include/linux/dma-contiguous.h + create mode 100644 include/linux/dma-map-ops.h + delete mode 100644 include/linux/dma-noncoherent.h + rename include/linux/dma-debug.h => kernel/dma/debug.h (81%) + create mode 100644 kernel/dma/direct.h + create mode 100644 kernel/dma/ops_helpers.c +$ git am -3 ../patches/0001-xsk-Remove-internal-DMA-headers.patch +Applying: xsk: Remove internal DMA headers +$ git reset HEAD^ +Unstaged changes after reset: +M net/xdp/xsk_buff_pool.c +$ git add -A . +$ git commit -v -a --amend +[master d4800c00ae90] Merge remote-tracking branch 'dma-mapping/for-next' into master + Date: Thu Oct 15 09:49:02 2020 +1100 +Merging asm-generic/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (adc5f7029376 ARM: add malloc size to decompressor kexec size structure) +$ git merge arm/for-next +Auto-merging arch/arm/boot/compressed/vmlinux.lds.S +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/Makefile +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 16 ++++-- + arch/arm/Makefile | 3 + + arch/arm/boot/compressed/Makefile | 7 ++- + arch/arm/boot/compressed/debug.S | 5 +- + arch/arm/boot/compressed/head.S | 74 ++++++++++++------------ + arch/arm/boot/compressed/vmlinux.lds.S | 4 +- + arch/arm/include/debug/8250.S | 7 ++- + arch/arm/include/debug/asm9260.S | 5 +- + arch/arm/include/debug/at91.S | 5 +- + arch/arm/include/debug/bcm63xx.S | 5 +- + arch/arm/include/debug/brcmstb.S | 5 +- + arch/arm/include/debug/clps711x.S | 5 +- + arch/arm/include/debug/dc21285.S | 5 +- + arch/arm/include/debug/digicolor.S | 5 +- + arch/arm/include/debug/efm32.S | 5 +- + arch/arm/include/debug/icedcc.S | 15 ++++- + arch/arm/include/debug/imx.S | 5 +- + arch/arm/include/debug/meson.S | 5 +- + arch/arm/include/debug/msm.S | 5 +- + arch/arm/include/debug/omap2plus.S | 5 +- + arch/arm/include/debug/pl01x.S | 5 +- + arch/arm/include/debug/renesas-scif.S | 5 +- + arch/arm/include/debug/sa1100.S | 5 +- + arch/arm/include/debug/samsung.S | 5 +- + arch/arm/include/debug/sirf.S | 5 +- + arch/arm/include/debug/sti.S | 5 +- + arch/arm/include/debug/stm32.S | 5 +- + arch/arm/include/debug/tegra.S | 7 ++- + arch/arm/include/debug/vf.S | 5 +- + arch/arm/include/debug/vt8500.S | 5 +- + arch/arm/include/debug/zynq.S | 5 +- + arch/arm/kernel/debug.S | 11 +++- + arch/arm/kernel/hw_breakpoint.c | 100 ++++++++++++++++++++++++--------- + arch/arm/mm/cache-l2x0.c | 16 ++++-- + 34 files changed, 263 insertions(+), 112 deletions(-) +Merging arm64/for-next/core (d13027bb35e0 Revert "arm64: initialize per-cpu offsets earlier") +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (4bb6c7b93462 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/spi/spi-s3c24xx.c +Auto-merging drivers/spi/Makefile +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/mmc/host/s3cmci.c +Auto-merging drivers/mmc/host/Kconfig +CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig +Auto-merging drivers/memory/tegra/tegra210.c +Auto-merging drivers/memory/samsung/exynos5422-dmc.c +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/cpufreq/scmi-cpufreq.c +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra186.dtsi +Auto-merging arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +Removing arch/arm/plat-samsung/watchdog-reset.c +Removing arch/arm/plat-samsung/include/plat/samsung-time.h +Auto-merging arch/arm/mach-shmobile/setup-rcar-gen2.c +Removing arch/arm/mach-s3c64xx/watchdog-reset.h +Removing arch/arm/mach-s3c64xx/include/mach/hardware.h +Removing arch/arm/mach-s3c24xx/setup-camif.c +Removing arch/arm/mach-s3c24xx/include/mach/io.h +Removing arch/arm/mach-s3c24xx/include/mach/fb.h +Removing arch/arm/mach-imx/ulpi.h +Removing arch/arm/mach-imx/pcm037.h +Removing arch/arm/mach-imx/mx31moboard-smartbot.c +Removing arch/arm/mach-imx/mx31moboard-marxbot.c +Removing arch/arm/mach-imx/mx31moboard-devboard.c +Removing arch/arm/mach-imx/mx31lite-db.c +Removing arch/arm/mach-imx/mx31lilly-db.c +Removing arch/arm/mach-imx/mx21.h +Removing arch/arm/mach-imx/mm-imx27.c +Removing arch/arm/mach-imx/mm-imx21.c +Removing arch/arm/mach-imx/mach-vpr200.c +Removing arch/arm/mach-imx/mach-qong.c +Removing arch/arm/mach-imx/mach-pcm043.c +Removing arch/arm/mach-imx/mach-pcm037_eet.c +Removing arch/arm/mach-imx/mach-pcm037.c +Removing arch/arm/mach-imx/mach-pca100.c +Removing arch/arm/mach-imx/mach-mx35_3ds.c +CONFLICT (modify/delete): arch/arm/mach-imx/mach-mx31moboard.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/mach-mx31moboard.c left in tree. +Removing arch/arm/mach-imx/mach-mx31lite.c +Removing arch/arm/mach-imx/mach-mx31lilly.c +Removing arch/arm/mach-imx/mach-mx31ads.c +Removing arch/arm/mach-imx/mach-mx31_3ds.c +Removing arch/arm/mach-imx/mach-mx27ads.c +Removing arch/arm/mach-imx/mach-mx27_3ds.c +Removing arch/arm/mach-imx/mach-mx21ads.c +Removing arch/arm/mach-imx/mach-kzm_arm11_01.c +CONFLICT (modify/delete): arch/arm/mach-imx/mach-imx27_visstrim_m10.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/mach-imx27_visstrim_m10.c left in tree. +Removing arch/arm/mach-imx/mach-bug.c +Removing arch/arm/mach-imx/mach-armadillo5x0.c +Removing arch/arm/mach-imx/iomux-v3.h +Removing arch/arm/mach-imx/iomux-v3.c +Removing arch/arm/mach-imx/iomux-v1.h +Removing arch/arm/mach-imx/iomux-v1.c +Removing arch/arm/mach-imx/iomux-mx35.h +Removing arch/arm/mach-imx/iomux-mx3.h +Removing arch/arm/mach-imx/iomux-mx2x.h +Removing arch/arm/mach-imx/iomux-mx27.h +Removing arch/arm/mach-imx/iomux-mx21.h +Removing arch/arm/mach-imx/iomux-imx31.c +Removing arch/arm/mach-imx/imx27-dt.c +Removing arch/arm/mach-imx/ehci.h +Removing arch/arm/mach-imx/ehci-imx35.c +Removing arch/arm/mach-imx/ehci-imx31.c +Removing arch/arm/mach-imx/ehci-imx27.c +Removing arch/arm/mach-imx/devices/platform-spi_imx.c +Removing arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c +Removing arch/arm/mach-imx/devices/platform-pata_imx.c +Removing arch/arm/mach-imx/devices/platform-mxc_w1.c +Removing arch/arm/mach-imx/devices/platform-mxc_rtc.c +Removing arch/arm/mach-imx/devices/platform-mxc_nand.c +Removing arch/arm/mach-imx/devices/platform-mxc-mmc.c +Removing arch/arm/mach-imx/devices/platform-mxc-ehci.c +Removing arch/arm/mach-imx/devices/platform-mx2-emma.c +Removing arch/arm/mach-imx/devices/platform-mx2-camera.c +Removing arch/arm/mach-imx/devices/platform-ipu-core.c +Removing arch/arm/mach-imx/devices/platform-imx27-coda.c +Removing arch/arm/mach-imx/devices/platform-imx21-hcd.c +Removing arch/arm/mach-imx/devices/platform-imx2-wdt.c +Removing arch/arm/mach-imx/devices/platform-imx-uart.c +Removing arch/arm/mach-imx/devices/platform-imx-ssi.c +Removing arch/arm/mach-imx/devices/platform-imx-keypad.c +Removing arch/arm/mach-imx/devices/platform-imx-i2c.c +Removing arch/arm/mach-imx/devices/platform-imx-fb.c +Removing arch/arm/mach-imx/devices/platform-imx-dma.c +Removing arch/arm/mach-imx/devices/platform-gpio_keys.c +Removing arch/arm/mach-imx/devices/platform-gpio-mxc.c +Removing arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c +Removing arch/arm/mach-imx/devices/platform-flexcan.c +Removing arch/arm/mach-imx/devices/platform-fec.c +Removing arch/arm/mach-imx/devices/devices.c +Removing arch/arm/mach-imx/devices/devices-common.h +Removing arch/arm/mach-imx/devices/Makefile +Removing arch/arm/mach-imx/devices/Kconfig +Removing arch/arm/mach-imx/devices-imx35.h +Removing arch/arm/mach-imx/devices-imx31.h +Removing arch/arm/mach-imx/devices-imx27.h +Removing arch/arm/mach-imx/devices-imx21.h +Removing arch/arm/mach-imx/board-mx31moboard.h +Removing arch/arm/mach-imx/board-mx31lite.h +Removing arch/arm/mach-imx/board-mx31lilly.h +Removing arch/arm/mach-imx/3ds_debugboard.h +Removing arch/arm/mach-imx/3ds_debugboard.c +Removing arch/arm/mach-exynos/include/mach/map.h +Auto-merging arch/arm/include/debug/brcmstb.S +Auto-merging arch/arm/boot/dts/r8a7742.dtsi +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/arm/ti/k3.txt +Resolved 'drivers/mmc/host/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-imx/mach-imx27_visstrim_m10.c arch/arm/mach-imx/mach-mx31moboard.c +rm 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' +rm 'arch/arm/mach-imx/mach-mx31moboard.c' +$ git commit --no-edit -v -a +[master aa603213c28c] Merge remote-tracking branch 'arm-soc/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/actions.yaml | 11 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 + + .../devicetree/bindings/arm/atmel-at91.yaml | 1 + + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 2 + + Documentation/devicetree/bindings/arm/fsl.yaml | 95 + + .../devicetree/bindings/arm/omap/prm-inst.txt | 2 + + Documentation/devicetree/bindings/arm/qcom.yaml | 11 + + Documentation/devicetree/bindings/arm/renesas.yaml | 12 + + .../devicetree/bindings/arm/rockchip.yaml | 16 +- + .../devicetree/bindings/arm/samsung/pmu.yaml | 24 +- + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 10 + + Documentation/devicetree/bindings/arm/tegra.yaml | 4 + + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 3 +- + Documentation/devicetree/bindings/arm/ti/k3.txt | 26 - + Documentation/devicetree/bindings/arm/ti/k3.yaml | 35 + + Documentation/devicetree/bindings/arm/toshiba.yaml | 22 + + .../devicetree/bindings/bus/brcm,gisb-arb.txt | 3 +- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 6 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 9 +- + .../bindings/fuse/nvidia,tegra20-fuse.txt | 1 + + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 + + .../allwinner,sun7i-a20-sc-nmi.yaml | 5 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 5 +- + .../memory-controllers/mediatek,smi-common.txt | 3 +- + .../memory-controllers/mediatek,smi-larb.txt | 3 +- + .../bindings/misc/nvidia,tegra186-misc.txt | 8 +- + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 13 +- + .../devicetree/bindings/nvmem/vf610-ocotp.txt | 4 +- + .../bindings/power/amlogic,meson-ee-pwrc.yaml | 23 +- + .../bindings/power/brcm,bcm63xx-power.yaml | 44 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../power/supply/summit,smb347-charger.yaml | 152 ++ + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../bindings/reset/xlnx,zynqmp-reset.txt | 11 +- + .../devicetree/bindings/soc/ti/k3-ringacc.yaml | 6 - + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 439 ++++ + .../sram/allwinner,sun4i-a10-system-control.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + MAINTAINERS | 59 +- + arch/arm/Kconfig | 12 +- + arch/arm/Kconfig.debug | 29 +- + arch/arm/Makefile | 7 +- + arch/arm/arm-soc-for-next-contents.txt | 223 ++ + arch/arm/boot/dts/Makefile | 25 +- + arch/arm/boot/dts/alpine.dtsi | 2 +- + arch/arm/boot/dts/am335x-lxm.dts | 4 + + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 427 ++++ + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 404 +-- + arch/arm/boot/dts/am335x-sbc-t335.dts | 4 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 1 - + arch/arm/boot/dts/am33xx.dtsi | 4 +- + arch/arm/boot/dts/am3517-evm-ui.dtsi | 4 +- + arch/arm/boot/dts/am3517-evm.dts | 2 +- + arch/arm/boot/dts/am3874-iceboard.dts | 8 +- + arch/arm/boot/dts/am4372.dtsi | 6 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 14 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 15 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 13 +- + arch/arm/boot/dts/am437x-l4.dtsi | 80 +- + arch/arm/boot/dts/am437x-sbc-t43.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 14 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 19 +- + arch/arm/boot/dts/am571x-idk.dts | 27 - + arch/arm/boot/dts/am5729-beagleboneai.dts | 14 +- + arch/arm/boot/dts/am572x-idk.dts | 5 - + arch/arm/boot/dts/am574x-idk.dts | 5 - + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 19 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 13 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 14 +- + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 4 +- + arch/arm/boot/dts/animeo_ip.dts | 3 +- + arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 20 +- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 4 +- + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 17 + + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 47 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 5 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 420 ++++ + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 17 + + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 23 +- + arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts | 662 +++++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 7 + + arch/arm/boot/dts/aspeed-g5.dtsi | 1 - + .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 13 - + arch/arm/boot/dts/at91-ariag25.dts | 3 +- + arch/arm/boot/dts/at91-ariettag25.dts | 3 +- + arch/arm/boot/dts/at91-cosino.dtsi | 3 +- + arch/arm/boot/dts/at91-cosino_mega2560.dts | 1 + + arch/arm/boot/dts/at91-foxg20.dts | 3 +- + arch/arm/boot/dts/at91-kizbox.dts | 2 +- + arch/arm/boot/dts/at91-kizbox2-common.dtsi | 2 +- + arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 2 +- + arch/arm/boot/dts/at91-linea.dtsi | 2 +- + arch/arm/boot/dts/at91-qil_a9260.dts | 3 +- + arch/arm/boot/dts/at91-sam9_l9260.dts | 3 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +- + arch/arm/boot/dts/at91-som60.dtsi | 2 +- + arch/arm/boot/dts/at91-vinco.dts | 2 +- + arch/arm/boot/dts/at91-wb45n.dtsi | 3 +- + arch/arm/boot/dts/at91-wb50n.dtsi | 2 +- + arch/arm/boot/dts/at91rm9200.dtsi | 11 +- + arch/arm/boot/dts/at91rm9200ek.dts | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 11 +- + arch/arm/boot/dts/at91sam9260ek.dts | 3 +- + arch/arm/boot/dts/at91sam9261.dtsi | 10 +- + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 15 +- + arch/arm/boot/dts/at91sam9263ek.dts | 3 +- + arch/arm/boot/dts/at91sam9g20.dtsi | 5 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 +- + .../boot/dts/at91sam9g25-gardena-smart-gateway.dts | 158 ++ + arch/arm/boot/dts/at91sam9g45.dtsi | 12 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 10 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 10 +- + arch/arm/boot/dts/at91sam9rlek.dts | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 12 +- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 + + arch/arm/boot/dts/at91sam9xe.dtsi | 3 + + arch/arm/boot/dts/bcm-cygnus.dtsi | 4 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 6 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 48 + + arch/arm/boot/dts/bcm2711.dtsi | 122 +- + arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 197 ++ + arch/arm/boot/dts/bcm5301x.dtsi | 25 +- + arch/arm/boot/dts/bcm958525xmc.dts | 2 +- + arch/arm/boot/dts/bcm958625k.dts | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 15 +- + arch/arm/boot/dts/dra7-l4.dtsi | 55 - + arch/arm/boot/dts/dra7.dtsi | 4 +- + arch/arm/boot/dts/dra71-evm.dts | 14 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 10 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 14 +- + arch/arm/boot/dts/dra72-evm.dts | 13 +- + arch/arm/boot/dts/dra76-evm.dts | 18 +- + arch/arm/boot/dts/emev2.dtsi | 2 +- + arch/arm/boot/dts/ethernut5.dts | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 4 + + arch/arm/boot/dts/exynos3250-monk.dts | 6 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 6 +- + arch/arm/boot/dts/exynos3250.dtsi | 44 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 56 +- + arch/arm/boot/dts/exynos4210-origen.dts | 27 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 25 + + arch/arm/boot/dts/exynos4210-trats.dts | 186 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 36 +- + arch/arm/boot/dts/exynos4210.dtsi | 38 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 42 +- + arch/arm/boot/dts/exynos4412-i9300.dts | 6 +- + arch/arm/boot/dts/exynos4412-i9305.dts | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 116 +- + arch/arm/boot/dts/exynos4412-n710x.dts | 39 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 35 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 46 +- + arch/arm/boot/dts/exynos4412-origen.dts | 25 + + arch/arm/boot/dts/exynos4412-smdk4412.dts | 27 + + arch/arm/boot/dts/exynos4412-tiny4412.dts | 24 + + arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- + arch/arm/boot/dts/exynos4412.dtsi | 18 +- + arch/arm/boot/dts/exynos5.dtsi | 10 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 20 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +- + arch/arm/boot/dts/exynos5250-spring.dts | 41 +- + arch/arm/boot/dts/exynos5250.dtsi | 54 +- + arch/arm/boot/dts/exynos5260.dtsi | 4 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 8 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 12 + + arch/arm/boot/dts/exynos5410.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 + + arch/arm/boot/dts/exynos5420.dtsi | 16 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 60 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 60 +- + arch/arm/boot/dts/hi3620.dtsi | 32 +- + arch/arm/boot/dts/hip04.dtsi | 6 +- + arch/arm/boot/dts/hisi-x5hd2.dtsi | 5 +- + arch/arm/boot/dts/imx23-evk.dts | 2 +- + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 28 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 4 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28.dtsi | 2 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 4 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 8 +- + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 3 +- + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 3 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 2 +- + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 4 +- + arch/arm/boot/dts/imx6dl-prtrvt.dts | 4 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 2 +- + arch/arm/boot/dts/imx6dl-tqma6a.dtsi | 16 + + arch/arm/boot/dts/imx6dl-tqma6b.dtsi | 16 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 38 +- + arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 6 +- + arch/arm/boot/dts/imx6dl-yapp4-orion.dts | 54 + + arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 4 + + arch/arm/boot/dts/imx6dl.dtsi | 8 +- + arch/arm/boot/dts/imx6q-b450v3.dts | 14 +- + arch/arm/boot/dts/imx6q-b650v3.dts | 12 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 4 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 31 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 7 +- + arch/arm/boot/dts/imx6q-logicpd.dts | 2 +- + arch/arm/boot/dts/imx6q-prti6q.dts | 6 +- + arch/arm/boot/dts/imx6q-tqma6a.dtsi | 16 + + arch/arm/boot/dts/imx6q-tqma6b.dtsi | 15 + + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 4 +- + arch/arm/boot/dts/imx6q.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-pico.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 201 ++ + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 28 + + arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 28 + + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 5 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 3 +- + arch/arm/boot/dts/imx6qp-tqma6b.dtsi | 16 + + arch/arm/boot/dts/imx6sl-evk.dts | 11 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 588 +++++ + arch/arm/boot/dts/imx6sl.dtsi | 2 + + arch/arm/boot/dts/imx6sll-evk.dts | 73 + + arch/arm/boot/dts/imx6sll.dtsi | 7 + + arch/arm/boot/dts/imx6sx-sdb.dtsi | 9 + + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 2 +- + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 83 +- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 15 +- + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 2 +- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- + arch/arm/boot/dts/meson.dtsi | 14 +- + arch/arm/boot/dts/meson8.dtsi | 2 - + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 6 +- + arch/arm/boot/dts/mpa1600.dts | 2 +- + arch/arm/boot/dts/mps2.dtsi | 10 +- + ...ts => mstar-infinity-msc313-breadbee_crust.dts} | 2 +- + ...y5-ssc8336n.dtsi => mstar-infinity-msc313.dtsi} | 2 +- + .../dts/{infinity.dtsi => mstar-infinity.dtsi} | 0 + ...ee.dts => mstar-infinity3-msc313e-breadbee.dts} | 2 +- + ...ty-msc313.dtsi => mstar-infinity3-msc313e.dtsi} | 2 +- + .../dts/{infinity3.dtsi => mstar-infinity3.dtsi} | 2 +- + ....dts => mstar-mercury5-ssc8336n-midrived08.dts} | 2 +- + ...3-msc313e.dtsi => mstar-mercury5-ssc8336n.dtsi} | 2 +- + .../dts/{mercury5.dtsi => mstar-mercury5.dtsi} | 0 + arch/arm/boot/dts/mstar-v7.dtsi | 20 + + arch/arm/boot/dts/mt2701.dtsi | 13 + + arch/arm/boot/dts/mt7623.dtsi | 123 - + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 88 +- + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 74 +- + arch/arm/boot/dts/mt7623n.dtsi | 306 +++ + arch/arm/boot/dts/nspire.dtsi | 12 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 4 +- + arch/arm/boot/dts/omap3-beagle.dts | 6 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3530.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 4 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 21 + + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 8 +- + arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-n9.dts | 1 - + arch/arm/boot/dts/omap3-n900.dts | 6 +- + arch/arm/boot/dts/omap3-n950.dts | 8 +- + arch/arm/boot/dts/omap3-overo-common-dvi.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 4 +- + .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- + arch/arm/boot/dts/omap3-thunder.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 3 + + arch/arm/boot/dts/omap34xx.dtsi | 3 +- + arch/arm/boot/dts/omap36xx.dtsi | 3 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 4 +- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 6 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 6 +- + arch/arm/boot/dts/omap4-sdp.dts | 14 +- + arch/arm/boot/dts/omap4.dtsi | 14 +- + arch/arm/boot/dts/omap443x.dtsi | 10 + + arch/arm/boot/dts/omap5-board-common.dtsi | 4 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 6 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 6 +- + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/boot/dts/owl-s500-labrador-base-m.dts | 35 + + arch/arm/boot/dts/owl-s500-labrador-v2.dtsi | 22 + + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 47 + + arch/arm/boot/dts/owl-s500.dtsi | 6 +- + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 1 - + arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 1 - + arch/arm/boot/dts/pm9g45.dts | 3 +- + arch/arm/boot/dts/prima2.dtsi | 2 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 +- + arch/arm/boot/dts/r7s72100.dtsi | 2 +- + arch/arm/boot/dts/r7s9210.dtsi | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 11 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 120 + + arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 79 +- + arch/arm/boot/dts/r8a7742.dtsi | 337 ++- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 112 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a77470.dtsi | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7792.dtsi | 2 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/boot/dts/r9a06g032.dtsi | 2 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 6 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 6 +- + arch/arm/boot/dts/rk3066a.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- + arch/arm/boot/dts/rk3288-miqi.dts | 16 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 16 +- + arch/arm/boot/dts/rk3288-r89.dts | 16 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 14 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 17 +- + arch/arm/boot/dts/s3c2416.dtsi | 111 +- + arch/arm/boot/dts/s3c24xx.dtsi | 24 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 32 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 32 +- + arch/arm/boot/dts/s3c64xx.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 73 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 26 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 98 + + arch/arm/boot/dts/s5pv210-galaxys.dts | 85 + + arch/arm/boot/dts/s5pv210-goni.dts | 97 +- + arch/arm/boot/dts/s5pv210-smdkc110.dts | 9 + + arch/arm/boot/dts/s5pv210-smdkv210.dts | 14 +- + arch/arm/boot/dts/s5pv210-torbreck.dts | 9 + + arch/arm/boot/dts/s5pv210.dtsi | 163 +- + arch/arm/boot/dts/sam9x60.dtsi | 10 +- + arch/arm/boot/dts/sama5d2.dtsi | 19 +- + arch/arm/boot/dts/sama5d3.dtsi | 8 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 8 +- + arch/arm/boot/dts/sd5203.dts | 96 + + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/boot/dts/spear13xx.dtsi | 2 +- + arch/arm/boot/dts/ste-href.dtsi | 22 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 91 + + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 15 +- + arch/arm/boot/dts/stm32h743.dtsi | 20 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 26 + + arch/arm/boot/dts/stm32mp151.dtsi | 50 +- + arch/arm/boot/dts/stm32mp153.dtsi | 6 + + arch/arm/boot/dts/stm32mp153c-dhcom-drc02.dts | 35 + + arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dts | 4 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 16 +- + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 3 +- + arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 276 +++ + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 80 + + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 157 ++ + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 45 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 42 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 7 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 25 + + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 4 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 4 + + arch/arm/boot/dts/sun8i-r40.dtsi | 104 + + arch/arm/boot/dts/sun8i-s3-pinecube.dts | 235 ++ + arch/arm/boot/dts/sun8i-v3.dtsi | 13 + + arch/arm/boot/dts/sun8i-v3s.dtsi | 118 + + arch/arm/boot/dts/tango4-common.dtsi | 2 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 30 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 54 +- + arch/arm/boot/dts/tny_a9260_common.dtsi | 2 +- + arch/arm/boot/dts/tny_a9263.dts | 2 +- + arch/arm/boot/dts/usb_a9260.dts | 2 +- + arch/arm/boot/dts/usb_a9263.dts | 2 +- + arch/arm/boot/dts/usb_a9g20_common.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 4 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 6 +- + arch/arm/boot/dts/vf610-zii-cfu1.dts | 3 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 2 - + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 - + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 - + arch/arm/boot/dts/zx296702.dtsi | 2 +- + arch/arm/configs/aspeed_g4_defconfig | 3 +- + arch/arm/configs/aspeed_g5_defconfig | 7 +- + arch/arm/configs/exynos_defconfig | 8 +- + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 22 +- + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 6 +- + arch/arm/configs/omap2plus_defconfig | 12 + + arch/arm/configs/realview_defconfig | 18 +- + arch/arm/configs/shmobile_defconfig | 5 +- + arch/arm/configs/versatile_defconfig | 5 +- + arch/arm/include/debug/brcmstb.S | 26 +- + arch/arm/mach-at91/pm.c | 97 +- + arch/arm/mach-at91/pm.h | 5 +- + arch/arm/mach-at91/pm_suspend.S | 41 +- + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 5 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 10 +- + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-exynos/Makefile | 4 - + arch/arm/mach-exynos/common.h | 6 +- + arch/arm/mach-exynos/exynos.c | 25 +- + arch/arm/mach-exynos/include/mach/map.h | 18 - + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 8 +- + arch/arm/mach-hisi/Kconfig | 16 +- + arch/arm/mach-imx/3ds_debugboard.c | 207 -- + arch/arm/mach-imx/3ds_debugboard.h | 11 - + arch/arm/mach-imx/Kconfig | 375 +-- + arch/arm/mach-imx/Makefile | 45 +- + arch/arm/mach-imx/board-mx31lilly.h | 28 - + arch/arm/mach-imx/board-mx31lite.h | 29 - + arch/arm/mach-imx/board-mx31moboard.h | 30 - + arch/arm/mach-imx/common.h | 15 - + arch/arm/mach-imx/cpu-imx27.c | 10 +- + arch/arm/mach-imx/cpu-imx31.c | 9 +- + arch/arm/mach-imx/cpu-imx35.c | 9 +- + arch/arm/mach-imx/devices-imx21.h | 56 - + arch/arm/mach-imx/devices-imx27.h | 86 - + arch/arm/mach-imx/devices-imx31.h | 80 - + arch/arm/mach-imx/devices-imx35.h | 87 - + arch/arm/mach-imx/devices/Kconfig | 71 - + arch/arm/mach-imx/devices/Makefile | 28 - + arch/arm/mach-imx/devices/devices-common.h | 293 --- + arch/arm/mach-imx/devices/devices.c | 35 - + arch/arm/mach-imx/devices/platform-fec.c | 49 - + arch/arm/mach-imx/devices/platform-flexcan.c | 45 - + arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 51 - + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 31 - + arch/arm/mach-imx/devices/platform-gpio_keys.c | 15 - + arch/arm/mach-imx/devices/platform-imx-dma.c | 44 - + arch/arm/mach-imx/devices/platform-imx-fb.c | 47 - + arch/arm/mach-imx/devices/platform-imx-i2c.c | 74 - + arch/arm/mach-imx/devices/platform-imx-keypad.c | 54 - + arch/arm/mach-imx/devices/platform-imx-ssi.c | 86 - + arch/arm/mach-imx/devices/platform-imx-uart.c | 92 - + arch/arm/mach-imx/devices/platform-imx2-wdt.c | 52 - + arch/arm/mach-imx/devices/platform-imx21-hcd.c | 38 - + arch/arm/mach-imx/devices/platform-imx27-coda.c | 34 - + arch/arm/mach-imx/devices/platform-ipu-core.c | 127 - + arch/arm/mach-imx/devices/platform-mx2-camera.c | 59 - + arch/arm/mach-imx/devices/platform-mx2-emma.c | 37 - + arch/arm/mach-imx/devices/platform-mxc-ehci.c | 61 - + arch/arm/mach-imx/devices/platform-mxc-mmc.c | 72 - + arch/arm/mach-imx/devices/platform-mxc_nand.c | 72 - + arch/arm/mach-imx/devices/platform-mxc_rtc.c | 43 - + arch/arm/mach-imx/devices/platform-mxc_w1.c | 47 - + arch/arm/mach-imx/devices/platform-pata_imx.c | 45 - + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 64 - + arch/arm/mach-imx/devices/platform-spi_imx.c | 78 - + arch/arm/mach-imx/ehci-imx27.c | 74 - + arch/arm/mach-imx/ehci-imx31.c | 74 - + arch/arm/mach-imx/ehci-imx35.c | 89 - + arch/arm/mach-imx/ehci.h | 44 - + arch/arm/mach-imx/hardware.h | 1 - + arch/arm/mach-imx/imx27-dt.c | 26 - + arch/arm/mach-imx/iomux-imx31.c | 161 -- + arch/arm/mach-imx/iomux-mx21.h | 109 - + arch/arm/mach-imx/iomux-mx27.h | 192 -- + arch/arm/mach-imx/iomux-mx2x.h | 217 -- + arch/arm/mach-imx/iomux-mx3.h | 706 ------ + arch/arm/mach-imx/iomux-mx35.h | 1254 ---------- + arch/arm/mach-imx/iomux-v1.c | 174 -- + arch/arm/mach-imx/iomux-v1.h | 81 - + arch/arm/mach-imx/iomux-v3.c | 65 - + arch/arm/mach-imx/iomux-v3.h | 130 - + arch/arm/mach-imx/mach-armadillo5x0.c | 562 ----- + arch/arm/mach-imx/mach-bug.c | 54 - + arch/arm/mach-imx/mach-imx27.c | 81 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 562 ----- + arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} | 0 + arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} | 0 + arch/arm/mach-imx/mach-imx7ulp.c | 3 + + arch/arm/mach-imx/mach-kzm_arm11_01.c | 291 --- + arch/arm/mach-imx/mach-mx21ads.c | 338 --- + arch/arm/mach-imx/mach-mx27_3ds.c | 470 ---- + arch/arm/mach-imx/mach-mx27ads.c | 407 --- + arch/arm/mach-imx/mach-mx31_3ds.c | 615 ----- + arch/arm/mach-imx/mach-mx31ads.c | 579 ----- + arch/arm/mach-imx/mach-mx31lilly.c | 312 --- + arch/arm/mach-imx/mach-mx31lite.c | 290 --- + arch/arm/mach-imx/mach-mx31moboard.c | 581 ----- + arch/arm/mach-imx/mach-mx35_3ds.c | 516 ---- + arch/arm/mach-imx/mach-pca100.c | 426 ---- + arch/arm/mach-imx/mach-pcm037.c | 585 ----- + arch/arm/mach-imx/mach-pcm037_eet.c | 166 -- + arch/arm/mach-imx/mach-pcm043.c | 412 ---- + arch/arm/mach-imx/mach-qong.c | 262 -- + arch/arm/mach-imx/mach-vpr200.c | 306 --- + arch/arm/mach-imx/mm-imx21.c | 84 - + arch/arm/mach-imx/mm-imx27.c | 88 - + arch/arm/mach-imx/mm-imx3.c | 185 +- + arch/arm/mach-imx/mx21.h | 176 -- + arch/arm/mach-imx/mx27.h | 196 -- + arch/arm/mach-imx/mx31.h | 179 -- + arch/arm/mach-imx/mx31lilly-db.c | 182 -- + arch/arm/mach-imx/mx31lite-db.c | 154 -- + arch/arm/mach-imx/mx31moboard-devboard.c | 238 -- + arch/arm/mach-imx/mx31moboard-marxbot.c | 270 -- + arch/arm/mach-imx/mx31moboard-smartbot.c | 124 - + arch/arm/mach-imx/mx35.h | 173 -- + arch/arm/mach-imx/pcm037.h | 18 - + arch/arm/mach-imx/pm-imx27.c | 12 +- + arch/arm/mach-imx/ulpi.h | 20 - + arch/arm/mach-mstar/Kconfig | 1 + + arch/arm/mach-omap1/include/mach/mux.h | 2 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/am33xx.h | 2 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/clockdomains33xx_data.c | 2 +- + arch/arm/mach-omap2/clockdomains81xx_data.c | 2 +- + arch/arm/mach-omap2/cm-regbits-33xx.h | 2 +- + arch/arm/mach-omap2/cm-regbits-54xx.h | 2 +- + arch/arm/mach-omap2/cm-regbits-7xx.h | 2 +- + arch/arm/mach-omap2/cm1_54xx.h | 2 +- + arch/arm/mach-omap2/cm1_7xx.h | 2 +- + arch/arm/mach-omap2/cm2_54xx.h | 2 +- + arch/arm/mach-omap2/cm2_7xx.h | 2 +- + arch/arm/mach-omap2/cm33xx.c | 2 +- + arch/arm/mach-omap2/cm33xx.h | 2 +- + arch/arm/mach-omap2/cm81xx.h | 2 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/dma.c | 2 +- + arch/arm/mach-omap2/l3_2xxx.h | 2 +- + arch/arm/mach-omap2/l3_3xxx.h | 2 +- + arch/arm/mach-omap2/l4_2xxx.h | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 24 - + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 77 - + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 5 +- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 10 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 33 - + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 33 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 46 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +- + arch/arm/mach-omap2/omap_opp_data.h | 2 +- + arch/arm/mach-omap2/omap_phy_internal.c | 2 +- + arch/arm/mach-omap2/opp3xxx_data.c | 2 +- + arch/arm/mach-omap2/opp4xxx_data.c | 2 +- + arch/arm/mach-omap2/pm-debug.c | 2 - + arch/arm/mach-omap2/pm.c | 2 + + arch/arm/mach-omap2/pm.h | 4 - + arch/arm/mach-omap2/pm33xx-core.c | 27 +- + arch/arm/mach-omap2/pm34xx.c | 26 +- + arch/arm/mach-omap2/powerdomains33xx_data.c | 2 +- + arch/arm/mach-omap2/prcm43xx.h | 2 +- + arch/arm/mach-omap2/prcm_mpu54xx.h | 2 +- + arch/arm/mach-omap2/prcm_mpu7xx.h | 2 +- + arch/arm/mach-omap2/prm-regbits-33xx.h | 2 +- + arch/arm/mach-omap2/prm33xx.c | 2 +- + arch/arm/mach-omap2/prm33xx.h | 2 +- + arch/arm/mach-omap2/prm54xx.h | 2 +- + arch/arm/mach-omap2/prm7xx.h | 2 +- + arch/arm/mach-omap2/scrm54xx.h | 2 +- + arch/arm/mach-omap2/sleep33xx.S | 2 +- + arch/arm/mach-omap2/sleep43xx.S | 2 +- + arch/arm/mach-omap2/ti81xx.h | 2 +- + arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +- + arch/arm/{plat-samsung => mach-s3c}/Kconfig | 72 +- + .../Kconfig => mach-s3c/Kconfig.s3c24xx} | 13 - + .../Kconfig => mach-s3c/Kconfig.s3c64xx} | 5 +- + arch/arm/{plat-samsung => mach-s3c}/Makefile | 16 +- + arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot | 0 + .../Makefile => mach-s3c/Makefile.s3c24xx} | 22 +- + .../Makefile => mach-s3c/Makefile.s3c64xx} | 36 +- + .../include/plat => mach-s3c}/adc-core.h | 0 + arch/arm/{plat-samsung => mach-s3c}/adc.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h | 0 + .../ata-core.h => mach-s3c/ata-core-s3c64xx.h} | 6 +- + .../backlight.h => mach-s3c/backlight-s3c64xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c | 3 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c | 8 +- + arch/arm/{mach-s3c24xx => mach-s3c}/bast.h | 0 + .../common-smdk-s3c24xx.c} | 13 +- + .../common-smdk-s3c24xx.h} | 0 + arch/arm/{plat-samsung => mach-s3c}/cpu.c | 21 +- + .../{plat-samsung/include/plat => mach-s3c}/cpu.h | 12 - + .../cpufreq-utils-s3c24xx.c} | 40 +- + .../cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} | 8 +- + arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h | 2 +- + .../dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} | 9 +- + .../dev-backlight-s3c64xx.c} | 6 +- + .../dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} | 5 +- + arch/arm/{plat-samsung => mach-s3c}/dev-uart.c | 2 +- + arch/arm/{plat-samsung => mach-s3c}/devs.c | 57 +- + .../{plat-samsung/include/plat => mach-s3c}/devs.h | 0 + .../include/mach/dma.h => mach-s3c/dma-s3c24xx.h} | 0 + .../include/mach/dma.h => mach-s3c/dma-s3c64xx.h} | 0 + arch/arm/mach-s3c/dma.h | 9 + + .../fb-core.h => mach-s3c/fb-core-s3c24xx.h} | 6 +- + .../{plat-samsung/include/plat => mach-s3c}/fb.h | 0 + .../include/plat => mach-s3c}/gpio-cfg-helpers.h | 0 + .../include/plat => mach-s3c}/gpio-cfg.h | 0 + .../include/plat => mach-s3c}/gpio-core.h | 2 +- + .../gpio-samsung-s3c24xx.h} | 2 + + .../gpio-samsung-s3c64xx.h} | 0 + arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c | 18 +- + arch/arm/mach-s3c/gpio-samsung.h | 9 + + arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h | 2 +- + .../{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c | 7 +- + arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h | 0 + .../hardware.h => mach-s3c/hardware-s3c24xx.h} | 13 +- + .../include/plat => mach-s3c}/iic-core.h | 0 + arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 + + arch/arm/mach-s3c/include/mach/io.h | 8 + + .../include/mach/irqs-s3c24xx.h} | 0 + .../include/mach/irqs-s3c64xx.h} | 0 + arch/arm/mach-s3c/include/mach/irqs.h | 9 + + .../plat => mach-s3c/include/mach}/map-base.h | 0 + arch/arm/{plat-samsung => mach-s3c}/init.c | 4 +- + .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c | 14 +- + .../{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c | 6 +- + .../irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} | 16 +- + .../irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} | 8 +- + arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 + + .../arm/mach-s3c/irq-s3c24xx-fiq.S | 10 +- + .../irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c | 23 +- + .../irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} | 0 + .../include/plat => mach-s3c}/keypad.h | 0 + .../arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c | 41 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c | 17 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c | 23 +- + .../{mach-s3c24xx => mach-s3c}/mach-at2440evb.c | 31 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c | 25 +- + .../mach-crag6410-module.c | 7 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c | 37 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c | 43 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c | 55 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c | 19 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c | 30 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c | 45 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c | 30 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c | 39 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c | 17 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c | 23 +- + .../{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c | 27 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c | 19 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c | 41 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c | 26 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c | 44 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c | 29 +- + .../{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c | 8 +- + .../{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c | 23 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c | 21 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h | 0 + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c | 20 +- + arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c | 20 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c | 19 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c | 30 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c | 28 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c | 30 +- + .../arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c | 19 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c | 17 +- + .../arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c | 35 +- + .../{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c | 27 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c | 18 +- + arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c | 23 +- + .../include/plat => mach-s3c}/map-s3c.h | 12 +- + .../include/mach/map.h => mach-s3c/map-s3c24xx.h} | 6 +- + .../include/mach/map.h => mach-s3c/map-s3c64xx.h} | 4 +- + .../include/plat => mach-s3c}/map-s5p.h | 4 +- + arch/arm/mach-s3c/map.h | 9 + + .../nand-core.h => mach-s3c/nand-core-s3c24xx.h} | 6 +- + .../onenand-core-s3c64xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/otom.h | 0 + arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c | 6 +- + arch/arm/{plat-samsung => mach-s3c}/platformdata.c | 4 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c | 4 +- + .../pll-s3c2440-12000000.c | 4 +- + .../pll-s3c2440-16934400.c | 4 +- + arch/arm/{plat-samsung => mach-s3c}/pm-common.c | 4 +- + arch/arm/mach-s3c/pm-common.h | 40 + + .../mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} | 10 +- + .../mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} | 50 +- + arch/arm/mach-s3c/pm-core.h | 9 + + arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S | 5 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c | 11 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c | 12 +- + arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c | 6 +- + .../{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} | 14 +- + .../{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} | 74 +- + arch/arm/{plat-samsung => mach-s3c}/pm.c | 20 +- + .../{plat-samsung/include/plat => mach-s3c}/pm.h | 2 +- + .../include/plat => mach-s3c}/pwm-core.h | 0 + .../include/plat => mach-s3c}/regs-adc.h | 0 + .../regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} | 2 + + .../regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-clock.h | 9 + + .../regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} | 6 +- + .../regs-gpio-memport-s3c64xx.h} | 0 + .../regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} | 2 + + .../regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-gpio.h | 9 + + .../regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} | 2 + + .../regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} | 0 + arch/arm/mach-s3c/regs-irq.h | 9 + + .../include/plat => mach-s3c}/regs-irqtype.h | 0 + .../regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} | 2 + + .../regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} | 0 + .../include/mach => mach-s3c}/regs-s3c2443-clock.h | 50 + + .../regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} | 0 + .../regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} | 0 + .../regs-syscon-power-s3c64xx.h} | 0 + .../regs-usb-hsotg-phy-s3c64xx.h} | 0 + .../rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c | 23 +- + .../arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c | 26 +- + .../include/mach => mach-s3c}/s3c2412.h | 2 + + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c | 36 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c | 17 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c | 17 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c | 30 +- + arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c | 22 +- + .../{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} | 33 +- + .../{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} | 26 +- + arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c | 16 +- + arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c | 21 +- + .../{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} | 54 +- + .../{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} | 17 +- + .../include/plat => mach-s3c}/sdhci.h | 2 +- + .../setup-fb-24bpp-s3c64xx.c} | 6 +- + .../setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} | 8 +- + .../setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} | 4 +- + .../setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} | 4 +- + .../setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} | 9 +- + .../setup-keypad-s3c64xx.c} | 6 +- + .../setup-sdhci-gpio-s3c24xx.c} | 7 +- + .../setup-sdhci-gpio-s3c64xx.c} | 6 +- + .../setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} | 6 +- + .../setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} | 5 +- + .../setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} | 8 +- + .../setup-usb-phy-s3c64xx.c} | 12 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c | 11 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c | 2 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c | 10 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c | 6 +- + arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h | 0 + .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S | 9 +- + .../arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S | 5 +- + .../sleep.S => mach-s3c/sleep-s3c24xx.S} | 7 +- + .../sleep.S => mach-s3c/sleep-s3c64xx.S} | 4 +- + .../spi-core.h => mach-s3c/spi-core-s3c24xx.h} | 6 +- + .../include/plat => mach-s3c}/usb-phy.h | 0 + arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h | 0 + arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c | 4 +- + .../include/plat => mach-s3c}/wakeup-mask.h | 0 + arch/arm/mach-s3c24xx/include/mach/fb.h | 2 - + arch/arm/mach-s3c24xx/include/mach/io.h | 212 -- + arch/arm/mach-s3c24xx/setup-camif.c | 67 - + arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 - + arch/arm/mach-s3c64xx/watchdog-reset.h | 16 - + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-s5pv210/Makefile | 7 - + arch/arm/mach-s5pv210/pm.c | 51 +- + arch/arm/mach-s5pv210/regs-clock.h | 4 +- + arch/arm/mach-s5pv210/s5pv210.c | 2 - + arch/arm/mach-shmobile/rcar-gen2.h | 2 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +- + arch/arm/mach-stm32/Makefile.boot | 2 +- + arch/arm/plat-samsung/include/plat/samsung-time.h | 26 - + arch/arm/plat-samsung/watchdog-reset.c | 93 - + arch/arm64/Kconfig.platforms | 8 +- + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/actions/s700.dtsi | 17 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a100-allwinner-perf1.dts | 180 ++ + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 364 +++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 8 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 8 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 8 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 8 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 8 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 12 +- + arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/Makefile | 2 + + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 88 - + .../boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 + + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 618 +---- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 625 +++++ + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 318 +++ + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 94 +- + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 86 - + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 12 +- + arch/arm64/boot/dts/freescale/Makefile | 5 + + .../boot/dts/freescale/fsl-ls1012a-oxalis.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 5 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 18 + + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 9 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 134 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 134 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 157 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 12 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 16 +- + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 40 +- + arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts | 57 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 553 +---- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 474 ++++ + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 255 ++ + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 561 +++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 32 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 3 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 20 +- + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 240 ++ + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 551 +++++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 360 +-- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 52 +- + .../dts/freescale/imx8mq-hummingboard-pulse.dts | 8 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 52 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 29 + + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 27 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1106 +++++++++ + arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts | 21 +- + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 15 +- + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 53 +- + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 8 +- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 6 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 10 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 18 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 7 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 6 +- + arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 18 +- + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 20 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 14 +- + arch/arm64/boot/dts/lg/lg1312.dtsi | 10 +- + arch/arm64/boot/dts/lg/lg1313.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 11 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 30 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 15 +- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 81 + + arch/arm64/boot/dts/microchip/sparx5_nand.dtsi | 31 + + arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 53 + + arch/arm64/boot/dts/microchip/sparx5_pcb134.dts | 1 + + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 32 + + .../boot/dts/microchip/sparx5_pcb134_emmc.dts | 23 + + arch/arm64/boot/dts/microchip/sparx5_pcb135.dts | 1 + + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 32 + + .../boot/dts/microchip/sparx5_pcb135_emmc.dts | 23 + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 217 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 16 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 14 + + .../dts/nvidia/tegra194-p3509-0000+p3668-0000.dts | 14 + + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 16 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 247 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 3 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 1 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 29 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 150 +- + arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts | 40 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 189 ++ + arch/arm64/boot/dts/qcom/Makefile | 16 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 900 +++---- + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 6 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 96 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 34 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 10 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 108 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 14 +- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 79 + + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 132 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2608 ++++++++++---------- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 92 +- + arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 2 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 12 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 686 +++++ + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 66 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 24 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts | 17 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 18 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 192 ++ + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 15 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dts | 14 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 191 ++ + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1402 +++++++++++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 332 ++- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 14 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 380 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 92 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 111 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 32 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1059 +++++++- + arch/arm64/boot/dts/renesas/Makefile | 3 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 40 +- + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 40 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 26 +- + .../r8a774e1-hihope-rzg2h-ex-idk-1110wr.dts | 15 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dts | 5 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h.dts | 15 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1334 +++++++++- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 +- + .../boot/dts/renesas/r8a77961-salvator-xs.dts | 57 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 617 ++++- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 127 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 46 + + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 22 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 133 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/boot/dts/rockchip/Makefile | 6 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 374 +++ + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 368 +++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 4 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 24 + + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 12 +- + ...{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 26 - + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 + + arch/arm64/boot/dts/ti/Makefile | 8 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 52 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 18 +- + .../boot/dts/ti/k3-am654-industrial-thermal.dtsi | 12 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 215 ++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 449 ++++ + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 273 ++ + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 65 + + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 172 ++ + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 195 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 301 ++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 155 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 11 +- + arch/arm64/boot/dts/toshiba/Makefile | 2 + + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 43 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 390 +++ + arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi | 93 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 5 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 10 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 9 +- + arch/arm64/configs/defconfig | 50 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6362.dtsi | 6 + + drivers/bus/brcmstb_gisb.c | 100 +- + drivers/clk/imx/clk-imx27.c | 73 - + drivers/clk/imx/clk-imx31.c | 71 - + drivers/clk/imx/clk-imx35.c | 68 - + drivers/clk/samsung/clk-s3c2410-dclk.c | 15 +- + drivers/clk/samsung/clk-s3c2410.c | 1 + + drivers/clk/samsung/clk-s3c2412.c | 1 + + drivers/clk/samsung/clk-s3c2443.c | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 1 + + drivers/cpufreq/Kconfig.arm | 2 - + drivers/cpufreq/s3c2410-cpufreq.c | 10 +- + drivers/cpufreq/s3c2412-cpufreq.c | 44 +- + drivers/cpufreq/s3c2440-cpufreq.c | 29 +- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 14 +- + drivers/cpufreq/scmi-cpufreq.c | 6 +- + drivers/dma/ti/k3-udma-glue.c | 2 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/Makefile | 2 +- + drivers/firmware/arm_scmi/Makefile | 6 +- + drivers/firmware/arm_scmi/bus.c | 6 +- + drivers/firmware/arm_scmi/clock.c | 9 +- + drivers/firmware/arm_scmi/common.h | 26 +- + drivers/firmware/arm_scmi/driver.c | 31 +- + drivers/firmware/arm_scmi/mailbox.c | 4 +- + drivers/firmware/arm_scmi/notify.c | 2 +- + drivers/firmware/arm_scmi/perf.c | 9 +- + drivers/firmware/arm_scmi/power.c | 9 +- + drivers/firmware/arm_scmi/reset.c | 9 +- + drivers/firmware/arm_scmi/sensors.c | 9 +- + drivers/firmware/arm_scmi/smc.c | 2 +- + drivers/firmware/arm_scmi/system.c | 131 + + drivers/firmware/imx/scu-pd.c | 4 + + drivers/firmware/smccc/smccc.c | 2 + + drivers/firmware/tegra/bpmp.c | 3 +- + drivers/firmware/ti_sci.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- + drivers/hwmon/s3c-hwmon.c | 2 +- + drivers/input/touchscreen/s3c2410_ts.c | 37 +- + drivers/irqchip/Makefile | 1 - + drivers/leds/leds-s3c24xx.c | 2 - + drivers/mailbox/tegra-hsp.c | 9 +- + drivers/memory/Kconfig | 52 +- + drivers/memory/Makefile | 2 +- + drivers/memory/brcmstb_dpfe.c | 46 +- + drivers/memory/emif.c | 55 +- + drivers/memory/fsl-corenet-cf.c | 6 +- + drivers/memory/mtk-smi.c | 23 + + drivers/memory/omap-gpmc.c | 272 +- + drivers/memory/renesas-rpc-if.c | 4 +- + drivers/memory/samsung/exynos5422-dmc.c | 108 +- + drivers/memory/tegra/tegra124-emc.c | 14 +- + drivers/memory/tegra/tegra124.c | 1 - + drivers/memory/tegra/tegra186-emc.c | 10 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 3 +- + drivers/memory/tegra/tegra210.c | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/s3cmci.c | 72 +- + drivers/power/supply/s3c_adc_battery.c | 2 +- + drivers/pwm/Kconfig | 2 +- + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 3 +- + drivers/reset/reset-imx7.c | 13 +- + drivers/reset/reset-zynqmp.c | 50 +- + drivers/reset/sti/reset-syscfg.c | 7 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 30 +- + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 4 +- + drivers/soc/bcm/Kconfig | 10 + + drivers/soc/bcm/Makefile | 1 + + drivers/soc/bcm/bcm63xx/Kconfig | 12 + + drivers/soc/bcm/bcm63xx/Makefile | 2 + + drivers/soc/bcm/bcm63xx/bcm63xx-power.c | 378 +++ + drivers/soc/bcm/brcmstb/biuctrl.c | 105 +- + drivers/soc/fsl/dpio/qbman-portal.c | 2 - + drivers/soc/fsl/qbman/bman.c | 2 +- + drivers/soc/fsl/qbman/qman_test_api.c | 2 +- + drivers/soc/fsl/qe/ucc.c | 2 +- + drivers/soc/imx/gpcv2.c | 15 +- + drivers/soc/mediatek/mtk-cmdq-helper.c | 113 +- + drivers/soc/mediatek/mtk-infracfg.c | 4 +- + drivers/soc/qcom/apr.c | 2 +- + drivers/soc/qcom/llcc-qcom.c | 7 +- + drivers/soc/qcom/rpmh-internal.h | 4 + + drivers/soc/qcom/rpmh-rsc.c | 115 +- + drivers/soc/qcom/socinfo.c | 5 + + drivers/soc/renesas/Kconfig | 354 +-- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a779a0-sysc.c | 448 ++++ + drivers/soc/renesas/rcar-rst.c | 6 + + drivers/soc/renesas/renesas-soc.c | 8 + + drivers/soc/samsung/Kconfig | 49 +- + drivers/soc/samsung/Makefile | 3 + + .../soc/samsung/s3c-pm-check.c | 2 +- + .../soc/samsung/s3c-pm-debug.c | 26 +- + drivers/soc/sunxi/sunxi_sram.c | 2 +- + drivers/soc/tegra/Kconfig | 10 + + drivers/soc/tegra/fuse/fuse-tegra.c | 8 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 30 + + drivers/soc/tegra/fuse/fuse.h | 10 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 26 + + drivers/soc/tegra/pmc.c | 146 +- + drivers/soc/ti/Kconfig | 11 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/k3-ringacc.c | 33 +- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_dma.c | 16 +- + drivers/soc/ti/knav_qmss_queue.c | 14 +- + drivers/soc/ti/omap_prm.c | 274 +- + drivers/soc/ti/pm33xx.c | 47 +- + drivers/soc/ti/pruss.c | 354 +++ + drivers/soc/ti/ti_sci_pm_domains.c | 251 +- + drivers/soc/versatile/soc-integrator.c | 2 +- + drivers/spi/Kconfig | 2 +- + drivers/spi/Makefile | 1 - + .../regs-spi.h => drivers/spi/spi-s3c24xx-regs.h | 9 +- + drivers/spi/spi-s3c24xx.c | 28 +- + drivers/tee/optee/core.c | 7 + + drivers/tee/optee/optee_msg.h | 21 + + drivers/tee/optee/optee_private.h | 1 + + drivers/tee/optee/optee_smc.h | 3 + + drivers/tee/optee/rpc.c | 95 + + drivers/tee/tee_core.c | 89 +- + drivers/tee/tee_shm.c | 32 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 55 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 34 +- + drivers/usb/gadget/udc/s3c2410_udc.h | 1 + + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 + .../video/fbdev/s3c2410fb-regs-lcd.h | 28 +- + drivers/video/fbdev/s3c2410fb.c | 16 +- + drivers/watchdog/Kconfig | 10 +- + include/dt-bindings/clock/r8a779a0-cpg-mssr.h | 55 + + include/dt-bindings/clock/tegra234-clock.h | 14 + + include/dt-bindings/mux/ti-serdes.h | 22 + + include/dt-bindings/power/meson-axg-power.h | 14 + + include/dt-bindings/power/r8a779a0-sysc.h | 59 + + include/dt-bindings/power/summit,smb347-charger.h | 19 + + include/dt-bindings/reset/imx8mq-reset.h | 5 +- + include/dt-bindings/reset/tegra234-reset.h | 10 + + include/dt-bindings/reset/xlnx-versal-resets.h | 105 + + include/dt-bindings/soc/bcm6318-pm.h | 17 + + include/dt-bindings/soc/bcm63268-pm.h | 21 + + include/dt-bindings/soc/bcm6328-pm.h | 17 + + include/dt-bindings/soc/bcm6362-pm.h | 21 + + include/linux/clk/samsung.h | 56 + + include/linux/mailbox/mtk-cmdq-mailbox.h | 6 +- + include/linux/platform_data/clk-s3c2410.h | 19 + + .../linux/platform_data}/fb-s3c2410.h | 33 +- + include/linux/platform_data/mmc-s3cmci.h | 2 + + include/linux/platform_data/pm33xx.h | 3 - + include/linux/platform_data/s3c-hsudc.h | 2 + + include/linux/pruss_driver.h | 54 + + include/linux/qcom-geni-se.h | 4 +- + include/linux/scmi_protocol.h | 32 +- + include/linux/soc/mediatek/mtk-cmdq.h | 93 +- + .../adc.h => include/linux/soc/samsung/s3c-adc.h | 6 +- + .../linux/soc/samsung/s3c-cpu-freq.h | 4 + + .../linux/soc/samsung/s3c-cpufreq-core.h | 14 +- + .../linux/soc/samsung/s3c-pm.h | 69 +- + .../linux/spi/s3c24xx-fiq.h | 10 + + include/linux/spi/s3c24xx.h | 2 +- + include/linux/tee_drv.h | 3 + + include/media/drv-intf/s3c_camif.h | 4 - + include/soc/fsl/qman.h | 4 +- + include/soc/tegra/fuse.h | 3 + + include/uapi/linux/tee.h | 13 + + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/s3c2412-i2s.c | 7 - + sound/soc/samsung/s3c24xx-i2s.c | 7 - + 1232 files changed, 35102 insertions(+), 26120 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt + create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml + create mode 100644 Documentation/devicetree/bindings/arm/toshiba.yaml + create mode 100644 Documentation/devicetree/bindings/power/brcm,bcm63xx-power.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml + create mode 100644 Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts + create mode 100644 arch/arm/boot/dts/at91sam9g25-gardena-smart-gateway.dts + create mode 100644 arch/arm/boot/dts/bcm53016-meraki-mr32.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-orion.dts + create mode 100644 arch/arm/boot/dts/imx6q-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-tqma6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts + rename arch/arm/boot/dts/{infinity-msc313-breadbee_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} (90%) + rename arch/arm/boot/dts/{mercury5-ssc8336n.dtsi => mstar-infinity-msc313.dtsi} (87%) + rename arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} (100%) + rename arch/arm/boot/dts/{infinity3-msc313e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} (89%) + rename arch/arm/boot/dts/{infinity-msc313.dtsi => mstar-infinity3-msc313e.dtsi} (87%) + rename arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} (84%) + rename arch/arm/boot/dts/{mercury5-ssc8336n-midrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} (89%) + rename arch/arm/boot/dts/{infinity3-msc313e.dtsi => mstar-mercury5-ssc8336n.dtsi} (87%) + rename arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} (100%) + create mode 100644 arch/arm/boot/dts/mt7623n.dtsi + create mode 100644 arch/arm/boot/dts/owl-s500-labrador-base-m.dts + create mode 100644 arch/arm/boot/dts/owl-s500-labrador-v2.dtsi + create mode 100644 arch/arm/boot/dts/owl-s500-roseapplepi.dts + create mode 100644 arch/arm/boot/dts/sd5203.dts + create mode 100644 arch/arm/boot/dts/stm32mp153c-dhcom-drc02.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157c-odyssey.dts + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-s3-pinecube.dts + delete mode 100644 arch/arm/mach-exynos/include/mach/map.h + delete mode 100644 arch/arm/mach-imx/3ds_debugboard.c + delete mode 100644 arch/arm/mach-imx/3ds_debugboard.h + delete mode 100644 arch/arm/mach-imx/board-mx31lilly.h + delete mode 100644 arch/arm/mach-imx/board-mx31lite.h + delete mode 100644 arch/arm/mach-imx/board-mx31moboard.h + delete mode 100644 arch/arm/mach-imx/devices-imx21.h + delete mode 100644 arch/arm/mach-imx/devices-imx27.h + delete mode 100644 arch/arm/mach-imx/devices-imx31.h + delete mode 100644 arch/arm/mach-imx/devices-imx35.h + delete mode 100644 arch/arm/mach-imx/devices/Kconfig + delete mode 100644 arch/arm/mach-imx/devices/Makefile + delete mode 100644 arch/arm/mach-imx/devices/devices-common.h + delete mode 100644 arch/arm/mach-imx/devices/devices.c + delete mode 100644 arch/arm/mach-imx/devices/platform-fec.c + delete mode 100644 arch/arm/mach-imx/devices/platform-flexcan.c + delete mode 100644 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-gpio-mxc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-gpio_keys.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-dma.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-fb.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-i2c.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-keypad.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-ssi.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx-uart.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx2-wdt.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx21-hcd.c + delete mode 100644 arch/arm/mach-imx/devices/platform-imx27-coda.c + delete mode 100644 arch/arm/mach-imx/devices/platform-ipu-core.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-camera.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mx2-emma.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-ehci.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc-mmc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_nand.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rtc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_w1.c + delete mode 100644 arch/arm/mach-imx/devices/platform-pata_imx.c + delete mode 100644 arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c + delete mode 100644 arch/arm/mach-imx/devices/platform-spi_imx.c + delete mode 100644 arch/arm/mach-imx/ehci-imx27.c + delete mode 100644 arch/arm/mach-imx/ehci-imx31.c + delete mode 100644 arch/arm/mach-imx/ehci-imx35.c + delete mode 100644 arch/arm/mach-imx/ehci.h + delete mode 100644 arch/arm/mach-imx/imx27-dt.c + delete mode 100644 arch/arm/mach-imx/iomux-imx31.c + delete mode 100644 arch/arm/mach-imx/iomux-mx21.h + delete mode 100644 arch/arm/mach-imx/iomux-mx27.h + delete mode 100644 arch/arm/mach-imx/iomux-mx2x.h + delete mode 100644 arch/arm/mach-imx/iomux-mx3.h + delete mode 100644 arch/arm/mach-imx/iomux-mx35.h + delete mode 100644 arch/arm/mach-imx/iomux-v1.c + delete mode 100644 arch/arm/mach-imx/iomux-v1.h + delete mode 100644 arch/arm/mach-imx/iomux-v3.c + delete mode 100644 arch/arm/mach-imx/iomux-v3.h + delete mode 100644 arch/arm/mach-imx/mach-armadillo5x0.c + delete mode 100644 arch/arm/mach-imx/mach-bug.c + create mode 100644 arch/arm/mach-imx/mach-imx27.c + delete mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c + rename arch/arm/mach-imx/{imx31-dt.c => mach-imx31.c} (100%) + rename arch/arm/mach-imx/{imx35-dt.c => mach-imx35.c} (100%) + delete mode 100644 arch/arm/mach-imx/mach-kzm_arm11_01.c + delete mode 100644 arch/arm/mach-imx/mach-mx21ads.c + delete mode 100644 arch/arm/mach-imx/mach-mx27_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-mx27ads.c + delete mode 100644 arch/arm/mach-imx/mach-mx31_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-mx31ads.c + delete mode 100644 arch/arm/mach-imx/mach-mx31lilly.c + delete mode 100644 arch/arm/mach-imx/mach-mx31lite.c + delete mode 100644 arch/arm/mach-imx/mach-mx31moboard.c + delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c + delete mode 100644 arch/arm/mach-imx/mach-pca100.c + delete mode 100644 arch/arm/mach-imx/mach-pcm037.c + delete mode 100644 arch/arm/mach-imx/mach-pcm037_eet.c + delete mode 100644 arch/arm/mach-imx/mach-pcm043.c + delete mode 100644 arch/arm/mach-imx/mach-qong.c + delete mode 100644 arch/arm/mach-imx/mach-vpr200.c + delete mode 100644 arch/arm/mach-imx/mm-imx21.c + delete mode 100644 arch/arm/mach-imx/mm-imx27.c + delete mode 100644 arch/arm/mach-imx/mx21.h + delete mode 100644 arch/arm/mach-imx/mx31lilly-db.c + delete mode 100644 arch/arm/mach-imx/mx31lite-db.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-devboard.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-marxbot.c + delete mode 100644 arch/arm/mach-imx/mx31moboard-smartbot.c + delete mode 100644 arch/arm/mach-imx/pcm037.h + delete mode 100644 arch/arm/mach-imx/ulpi.h + rename arch/arm/{plat-samsung => mach-s3c}/Kconfig (69%) + rename arch/arm/{mach-s3c24xx/Kconfig => mach-s3c/Kconfig.s3c24xx} (97%) + rename arch/arm/{mach-s3c64xx/Kconfig => mach-s3c/Kconfig.s3c64xx} (98%) + rename arch/arm/{plat-samsung => mach-s3c}/Makefile (62%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/Makefile.boot (100%) + rename arch/arm/{mach-s3c24xx/Makefile => mach-s3c/Makefile.s3c24xx} (81%) + rename arch/arm/{mach-s3c64xx/Makefile => mach-s3c/Makefile.s3c64xx} (56%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/adc-core.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/adc.c (99%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/anubis.h (100%) + rename arch/arm/{mach-s3c64xx/ata-core.h => mach-s3c/ata-core-s3c64xx.h} (78%) + rename arch/arm/{mach-s3c64xx/backlight.h => mach-s3c/backlight-s3c64xx.h} (78%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-ide.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast-irq.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/bast.h (100%) + rename arch/arm/{mach-s3c24xx/common-smdk.c => mach-s3c/common-smdk-s3c24xx.c} (96%) + rename arch/arm/{mach-s3c24xx/common-smdk.h => mach-s3c/common-smdk-s3c24xx.h} (100%) + rename arch/arm/{plat-samsung => mach-s3c}/cpu.c (62%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/cpu.h (89%) + rename arch/arm/{mach-s3c24xx/cpufreq-utils.c => mach-s3c/cpufreq-utils-s3c24xx.c} (68%) + rename arch/arm/{mach-s3c64xx/cpuidle.c => mach-s3c/cpuidle-s3c64xx.c} (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/crag6410.h (95%) + rename arch/arm/{mach-s3c64xx/dev-audio.c => mach-s3c/dev-audio-s3c64xx.c} (97%) + rename arch/arm/{mach-s3c64xx/dev-backlight.c => mach-s3c/dev-backlight-s3c64xx.c} (98%) + rename arch/arm/{mach-s3c64xx/dev-uart.c => mach-s3c/dev-uart-s3c64xx.c} (95%) + rename arch/arm/{plat-samsung => mach-s3c}/dev-uart.c (97%) + rename arch/arm/{plat-samsung => mach-s3c}/devs.c (96%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/devs.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/dma.h => mach-s3c/dma-s3c24xx.h} (100%) + rename arch/arm/{mach-s3c64xx/include/mach/dma.h => mach-s3c/dma-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/dma.h + rename arch/arm/{mach-s3c24xx/fb-core.h => mach-s3c/fb-core-s3c24xx.h} (78%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/fb.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg-helpers.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-cfg.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/gpio-core.h (99%) + rename arch/arm/{mach-s3c24xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/gpio-samsung.h => mach-s3c/gpio-samsung-s3c64xx.h} (100%) + rename arch/arm/{plat-samsung => mach-s3c}/gpio-samsung.c (99%) + create mode 100644 arch/arm/mach-s3c/gpio-samsung.h + rename arch/arm/{mach-s3c24xx => mach-s3c}/gta02.h (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940-bluetooth.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/h1940.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/hardware.h => mach-s3c/hardware-s3c24xx.h} (54%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/iic-core.h (100%) + create mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h + create mode 100644 arch/arm/mach-s3c/include/mach/io.h + rename arch/arm/{mach-s3c24xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c24xx.h} (100%) + rename arch/arm/{mach-s3c64xx/include/mach/irqs.h => mach-s3c/include/mach/irqs-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/include/mach/irqs.h + rename arch/arm/{plat-samsung/include/plat => mach-s3c/include/mach}/map-base.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/init.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/iotiming-s3c2412.c (98%) + rename arch/arm/{mach-s3c24xx/irq-pm.c => mach-s3c/irq-pm-s3c24xx.c} (93%) + rename arch/arm/{mach-s3c64xx/irq-pm.c => mach-s3c/irq-pm-s3c64xx.c} (97%) + create mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c + rename drivers/spi/spi-s3c24xx-fiq.S => arch/arm/mach-s3c/irq-s3c24xx-fiq.S (94%) + rename {drivers/irqchip => arch/arm/mach-s3c}/irq-s3c24xx.c (99%) + rename arch/arm/{mach-s3c64xx/irq-uart.h => mach-s3c/irq-uart-s3c64xx.h} (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/keypad.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-amlm5900.c (83%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-anubis.c (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-anw6410.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-at2440evb.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-bast.c (97%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410-module.c (98%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-crag6410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-gta02.c (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-h1940.c (94%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-hmt.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-jive.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-mini2440.c (94%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-mini6410.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-n30.c (94%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-ncp.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-nexcoder.c (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris-dvs.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-osiris.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-otom.c (88%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-qt2410.c (88%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-real6410.c (95%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx1950.c (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-rx3715.c (89%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-s3c2416-dt.c (92%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-s3c64xx-dt.c (70%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.c (96%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq.h (100%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq5.c (91%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smartq7.c (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2410.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2413.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2416.c (93%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2440.c (87%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-smdk2443.c (90%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6400.c (87%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/mach-smdk6410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-tct_hammer.c (81%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vr1000.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/mach-vstms.c (88%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s3c.h (87%) + rename arch/arm/{mach-s3c24xx/include/mach/map.h => mach-s3c/map-s3c24xx.h} (97%) + rename arch/arm/{mach-s3c64xx/include/mach/map.h => mach-s3c/map-s3c64xx.h} (98%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/map-s5p.h (85%) + create mode 100644 arch/arm/mach-s3c/map.h + rename arch/arm/{mach-s3c24xx/nand-core.h => mach-s3c/nand-core-s3c24xx.h} (77%) + rename arch/arm/{mach-s3c64xx/onenand-core.h => mach-s3c/onenand-core-s3c64xx.h} (82%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/osiris.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/otom.h (100%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/pl080.c (98%) + rename arch/arm/{plat-samsung => mach-s3c}/platformdata.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2410.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-12000000.c (97%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pll-s3c2440-16934400.c (98%) + rename arch/arm/{plat-samsung => mach-s3c}/pm-common.c (95%) + create mode 100644 arch/arm/mach-s3c/pm-common.h + rename arch/arm/{mach-s3c24xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c24xx.h} (94%) + rename arch/arm/{mach-s3c64xx/include/mach/pm-core.h => mach-s3c/pm-core-s3c64xx.h} (58%) + create mode 100644 arch/arm/mach-s3c/pm-core.h + rename arch/arm/{plat-samsung => mach-s3c}/pm-gpio.c (99%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-h1940.S (80%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2410.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2412.c (94%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/pm-s3c2416.c (95%) + rename arch/arm/{mach-s3c24xx/pm.c => mach-s3c/pm-s3c24xx.c} (93%) + rename arch/arm/{mach-s3c64xx/pm.c => mach-s3c/pm-s3c64xx.c} (81%) + rename arch/arm/{plat-samsung => mach-s3c}/pm.c (94%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pm.h (98%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/pwm-core.h (100%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-adc.h (100%) + rename arch/arm/{mach-s3c24xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-clock.h => mach-s3c/regs-clock-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-clock.h + rename arch/arm/{mach-s3c24xx/regs-dsc.h => mach-s3c/regs-dsc-s3c24xx.h} (77%) + rename arch/arm/{mach-s3c64xx/regs-gpio-memport.h => mach-s3c/regs-gpio-memport-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c24xx.h} (99%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-gpio.h => mach-s3c/regs-gpio-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-gpio.h + rename arch/arm/{mach-s3c24xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c24xx.h} (98%) + rename arch/arm/{mach-s3c64xx/include/mach/regs-irq.h => mach-s3c/regs-irq-s3c64xx.h} (100%) + create mode 100644 arch/arm/mach-s3c/regs-irq.h + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/regs-irqtype.h (100%) + rename arch/arm/{mach-s3c24xx/regs-mem.h => mach-s3c/regs-mem-s3c24xx.h} (98%) + rename arch/arm/{mach-s3c64xx/regs-modem.h => mach-s3c/regs-modem-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/regs-s3c2443-clock.h (81%) + rename arch/arm/{mach-s3c64xx/regs-srom.h => mach-s3c/regs-srom-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-sys.h => mach-s3c/regs-sys-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-syscon-power.h => mach-s3c/regs-syscon-power-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c64xx/regs-usb-hsotg-phy.h => mach-s3c/regs-usb-hsotg-phy-s3c64xx.h} (100%) + rename arch/arm/{mach-s3c24xx/include/mach/rtc-core.h => mach-s3c/rtc-core-s3c24xx.h} (81%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2410.c (88%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412-power.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2412.c (92%) + rename arch/arm/{mach-s3c24xx/include/mach => mach-s3c}/s3c2412.h (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2416.c (84%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2440.c (85%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2442.c (82%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c2443.c (83%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/s3c244x.c (90%) + rename arch/arm/{mach-s3c24xx/common.c => mach-s3c/s3c24xx.c} (97%) + rename arch/arm/{mach-s3c24xx/common.h => mach-s3c/s3c24xx.h} (85%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6400.c (88%) + rename arch/arm/{mach-s3c64xx => mach-s3c}/s3c6410.c (87%) + rename arch/arm/{mach-s3c64xx/common.c => mach-s3c/s3c64xx.c} (91%) + rename arch/arm/{mach-s3c64xx/common.h => mach-s3c/s3c64xx.h} (80%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/sdhci.h (99%) + rename arch/arm/{mach-s3c64xx/setup-fb-24bpp.c => mach-s3c/setup-fb-24bpp-s3c64xx.c} (86%) + rename arch/arm/{mach-s3c24xx/setup-i2c.c => mach-s3c/setup-i2c-s3c24xx.c} (79%) + rename arch/arm/{mach-s3c64xx/setup-i2c0.c => mach-s3c/setup-i2c0-s3c64xx.c} (90%) + rename arch/arm/{mach-s3c64xx/setup-i2c1.c => mach-s3c/setup-i2c1-s3c64xx.c} (90%) + rename arch/arm/{mach-s3c64xx/setup-ide.c => mach-s3c/setup-ide-s3c64xx.c} (89%) + rename arch/arm/{mach-s3c64xx/setup-keypad.c => mach-s3c/setup-keypad-s3c64xx.c} (86%) + rename arch/arm/{mach-s3c24xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c24xx.c} (89%) + rename arch/arm/{mach-s3c64xx/setup-sdhci-gpio.c => mach-s3c/setup-sdhci-gpio-s3c64xx.c} (95%) + rename arch/arm/{mach-s3c24xx/setup-spi.c => mach-s3c/setup-spi-s3c24xx.c} (85%) + rename arch/arm/{mach-s3c64xx/setup-spi.c => mach-s3c/setup-spi-s3c64xx.c} (83%) + rename arch/arm/{mach-s3c24xx/setup-ts.c => mach-s3c/setup-ts-s3c24xx.c} (81%) + rename arch/arm/{mach-s3c64xx/setup-usb-phy.c => mach-s3c/setup-usb-phy-s3c64xx.c} (92%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-audio.c (86%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-nor.c (98%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-pm.c (91%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec-usb.c (96%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/simtec.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2410.S (90%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/sleep-s3c2412.S (93%) + rename arch/arm/{mach-s3c24xx/sleep.S => mach-s3c/sleep-s3c24xx.S} (92%) + rename arch/arm/{mach-s3c64xx/sleep.S => mach-s3c/sleep-s3c64xx.S} (97%) + rename arch/arm/{mach-s3c24xx/spi-core.h => mach-s3c/spi-core-s3c24xx.h} (81%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/usb-phy.h (100%) + rename arch/arm/{mach-s3c24xx => mach-s3c}/vr1000.h (100%) + rename arch/arm/{plat-samsung => mach-s3c}/wakeup-mask.c (94%) + rename arch/arm/{plat-samsung/include/plat => mach-s3c}/wakeup-mask.h (100%) + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/io.h + delete mode 100644 arch/arm/mach-s3c24xx/setup-camif.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s3c64xx/watchdog-reset.h + delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h + delete mode 100644 arch/arm/plat-samsung/watchdog-reset.c + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100-allwinner-perf1.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi + create mode 100644 arch/arm64/boot/dts/microchip/sparx5_nand.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779a0.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts + rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (95%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200.dtsi + create mode 100644 arch/arm64/boot/dts/toshiba/Makefile + create mode 100644 arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts + create mode 100644 arch/arm64/boot/dts/toshiba/tmpv7708.dtsi + create mode 100644 arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi + create mode 100644 drivers/firmware/arm_scmi/system.c + create mode 100644 drivers/soc/bcm/bcm63xx/Kconfig + create mode 100644 drivers/soc/bcm/bcm63xx/Makefile + create mode 100644 drivers/soc/bcm/bcm63xx/bcm63xx-power.c + create mode 100644 drivers/soc/renesas/r8a779a0-sysc.c + rename arch/arm/plat-samsung/pm-check.c => drivers/soc/samsung/s3c-pm-check.c (99%) + rename arch/arm/plat-samsung/pm-debug.c => drivers/soc/samsung/s3c-pm-debug.c (78%) + create mode 100644 drivers/soc/ti/pruss.c + rename arch/arm/plat-samsung/include/plat/regs-spi.h => drivers/spi/spi-s3c24xx-regs.h (89%) + rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%) + rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%) + create mode 100644 include/dt-bindings/clock/r8a779a0-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/tegra234-clock.h + create mode 100644 include/dt-bindings/power/meson-axg-power.h + create mode 100644 include/dt-bindings/power/r8a779a0-sysc.h + create mode 100644 include/dt-bindings/power/summit,smb347-charger.h + create mode 100644 include/dt-bindings/reset/tegra234-reset.h + create mode 100644 include/dt-bindings/reset/xlnx-versal-resets.h + create mode 100644 include/dt-bindings/soc/bcm6318-pm.h + create mode 100644 include/dt-bindings/soc/bcm63268-pm.h + create mode 100644 include/dt-bindings/soc/bcm6328-pm.h + create mode 100644 include/dt-bindings/soc/bcm6362-pm.h + create mode 100644 include/linux/clk/samsung.h + create mode 100644 include/linux/platform_data/clk-s3c2410.h + rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%) + create mode 100644 include/linux/pruss_driver.h + rename arch/arm/plat-samsung/include/plat/adc.h => include/linux/soc/samsung/s3c-adc.h (85%) + rename arch/arm/plat-samsung/include/plat/cpu-freq.h => include/linux/soc/samsung/s3c-cpu-freq.h (97%) + rename arch/arm/plat-samsung/include/plat/cpu-freq-core.h => include/linux/soc/samsung/s3c-cpufreq-core.h (95%) + rename arch/arm/plat-samsung/include/plat/pm-common.h => include/linux/soc/samsung/s3c-pm.h (55%) + rename drivers/spi/spi-s3c24xx-fiq.h => include/linux/spi/s3c24xx-fiq.h (66%) +Merging amlogic/for-next (c56e4ad07fb3 Merge branch 'v5.10/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 6 +++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 50 +++++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 +- + 3 files changed, 59 insertions(+), 1 deletion(-) +Merging aspeed/for-next (48127d01a153 Merge branch 'soc-for-v5.10' into for-next) +$ git merge aspeed/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-lpc.txt | 8 +- + .../devicetree/bindings/mfd/aspeed-scu.txt | 26 + + .../devicetree/bindings/soc/aspeed/xdma.yaml | 103 ++ + MAINTAINERS | 8 + + arch/arm/boot/dts/aspeed-g4.dtsi | 5 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/boot/dts/aspeed-g6.dtsi | 5 + + drivers/soc/Makefile | 2 +- + drivers/soc/aspeed/Kconfig | 53 +- + drivers/soc/aspeed/Makefile | 2 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 37 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 + + drivers/soc/aspeed/aspeed-socinfo.c | 133 +++ + drivers/soc/aspeed/aspeed-xdma.c | 1205 ++++++++++++++++++++ + include/uapi/linux/aspeed-xdma.h | 42 + + 15 files changed, 1615 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.yaml + create mode 100644 drivers/soc/aspeed/aspeed-socinfo.c + create mode 100644 drivers/soc/aspeed/aspeed-xdma.c + create mode 100644 include/uapi/linux/aspeed-xdma.h +Merging at91/at91-next (d1f170f8447d Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (94ca85733699 memory: emif: Convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (bc421f7da477 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Removing drivers/clk/imx/clk-imx21.c +Merge made by the 'recursive' strategy. + drivers/clk/clk-composite.c | 1 + + drivers/clk/imx/Kconfig | 90 +++++++++++++--- + drivers/clk/imx/Makefile | 78 +++++++------- + drivers/clk/imx/clk-busy.c | 1 + + drivers/clk/imx/clk-composite-7ulp.c | 1 + + drivers/clk/imx/clk-composite-8m.c | 3 + + drivers/clk/imx/clk-cpu.c | 2 + + drivers/clk/imx/clk-fixup-mux.c | 1 + + drivers/clk/imx/clk-frac-pll.c | 2 + + drivers/clk/imx/clk-gate2.c | 4 +- + drivers/clk/imx/clk-imx21.c | 171 ------------------------------- + drivers/clk/imx/clk-imx6q.c | 1 + + drivers/clk/imx/clk-imx6sl.c | 15 +-- + drivers/clk/imx/clk-imx6sx.c | 1 + + drivers/clk/imx/clk-imx7d.c | 132 ++++++++++++------------ + drivers/clk/imx/clk-imx8mm.c | 4 + + drivers/clk/imx/clk-imx8mn.c | 4 + + drivers/clk/imx/clk-imx8mp.c | 28 +++-- + drivers/clk/imx/clk-imx8mq.c | 4 + + drivers/clk/imx/clk-imx8qxp-lpcg.c | 4 + + drivers/clk/imx/clk-imx8qxp.c | 4 + + drivers/clk/imx/clk-lpcg-scu.c | 1 + + drivers/clk/imx/clk-pfd.c | 2 +- + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 7 +- + drivers/clk/imx/clk-pllv1.c | 1 + + drivers/clk/imx/clk-pllv3.c | 5 +- + drivers/clk/imx/clk-pllv4.c | 1 + + drivers/clk/imx/clk-sscg-pll.c | 2 + + drivers/clk/imx/clk-vf610.c | 2 + + drivers/clk/imx/clk.c | 18 +++- + drivers/clk/imx/clk.h | 7 ++ + include/dt-bindings/clock/imx8mp-clock.h | 2 +- + include/dt-bindings/clock/vf610-clock.h | 3 +- + 34 files changed, 281 insertions(+), 323 deletions(-) + delete mode 100644 drivers/clk/imx/clk-imx21.c +Merging keystone/next (703dff8cb900 Merge branch 'for_5.10/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (b05dfbba9c46 Merge branch 'v5.9-next/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 ++- + arch/arm/boot/dts/Makefile | 6 ++ + arch/arm/boot/dts/armada-388-clearfog.dts | 4 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +- + arch/arm/boot/dts/armada-388-helios4.dts | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 12 ++- + arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 104 +++++++++++++++++++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 104 +++++++++++++++++++++ + .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++++ + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts | 17 ++++ + arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 104 +++++++++++++++++++++ + arch/arm/boot/dts/dove-sbc-a510.dts | 1 + + arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood.dtsi | 4 +- + arch/arm/mach-mvebu/coherency_ll.S | 7 +- + .../dts/marvell/armada-3720-espressobin-emmc.dts | 18 ---- + .../marvell/armada-3720-espressobin-v7-emmc.dts | 42 +++------ + .../dts/marvell/armada-3720-espressobin-v7.dts | 24 +++-- + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 38 ++++++-- + 29 files changed, 593 insertions(+), 100 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts + create mode 100644 arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi +Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (abea2a011c54 Merge branches 'arm64-for-5.10', 'arm64-defconfig-for-5.10' and 'drivers-for-5.10' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the display pipeline) +$ git merge raspberrypi/for-next +Already up to date. +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (1ff27687ae7e Merge branch 'renesas-fixes-for-v5.9' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (68a215164e19 reset: sti: reset-syscfg: fix struct description warnings) +$ git merge reset/reset/next +Already up to date. +Merging rockchip/for-next (ba0ceb95f560 Merge branch 'v5.10-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/Kconfig | 1 + + drivers/clk/rockchip/Kconfig | 78 ++++++++++++++++++++++ + drivers/clk/rockchip/Makefile | 42 ++++++------ + drivers/clk/rockchip/clk-ddr.c | 1 + + drivers/clk/rockchip/clk-half-divider.c | 18 ++--- + drivers/clk/rockchip/clk-rk3308.c | 1 - + drivers/clk/rockchip/clk-rk3399.c | 56 ++++++++++++++++ + drivers/clk/rockchip/clk.c | 113 +++++++++++++++++--------------- + drivers/clk/rockchip/softrst.c | 7 +- + 9 files changed, 232 insertions(+), 85 deletions(-) + create mode 100644 drivers/clk/rockchip/Kconfig +Merging samsung-krzk/for-next (62315959a263 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 - + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 18 ++++++++++++++++++ + drivers/cpuidle/cpuidle-big_little.c | 3 +-- + 3 files changed, 19 insertions(+), 3 deletions(-) +Merging scmi/for-linux-next (4d538ffe94a8 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/base.c | 2 ++ + drivers/firmware/arm_scmi/clock.c | 2 ++ + drivers/firmware/arm_scmi/common.h | 2 ++ + drivers/firmware/arm_scmi/driver.c | 8 ++++++++ + drivers/firmware/arm_scmi/notify.c | 22 ++++++++++++++-------- + drivers/firmware/arm_scmi/perf.c | 2 ++ + drivers/firmware/arm_scmi/reset.c | 4 +--- + drivers/firmware/arm_scmi/sensors.c | 2 ++ + drivers/firmware/arm_scmi/smc.c | 2 +- + 9 files changed, 34 insertions(+), 12 deletions(-) +Merging sunxi/sunxi/for-next (a2e5e8054a26 Merge branch 'sunxi/dt-for-5.10', remote-tracking branches 'korg/sunxi/sunxi/clk-for-5.10', 'korg/sunxi/sunxi/fixes-for-5.9' and 'korg/sunxi/sunxi/drivers-for-5.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +Resolved 'Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml' using previous resolution. +Resolved 'arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 24d5e5c48cea] Merge remote-tracking branch 'sunxi/sunxi/for-next' into master +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 7 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 3 + + drivers/clk/sunxi-ng/Kconfig | 10 + + drivers/clk/sunxi-ng/Makefile | 2 + + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 214 ++++ + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.h | 21 + + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 1276 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-a100.h | 56 + + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 37 +- + include/dt-bindings/clock/sun50i-a100-ccu.h | 116 ++ + include/dt-bindings/clock/sun50i-a100-r-ccu.h | 23 + + include/dt-bindings/reset/sun50i-a100-ccu.h | 68 ++ + include/dt-bindings/reset/sun50i-a100-r-ccu.h | 18 + + 13 files changed, 1837 insertions(+), 14 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100-r.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a100.h + create mode 100644 include/dt-bindings/clock/sun50i-a100-ccu.h + create mode 100644 include/dt-bindings/clock/sun50i-a100-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-a100-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-a100-r-ccu.h +Merging tegra/for-next (9ea55312ba10 Merge branch for-5.10/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (48a78787c0f3 Merge branch 'ti-k3-dts-next' into ti-k3-next) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 1 - + 2 files changed, 2 deletions(-) +Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next) +$ git merge uniphier/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (df8a5d26427e Merge branch 'clk-kconfig' into clk-next) +$ git merge clk/clk-next +Removing Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 + + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 93 ++ + .../bindings/clock/qcom,sc7180-videocc.yaml | 65 -- + ...{qcom,sdm845-videocc.yaml => qcom,videocc.yaml} | 18 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + drivers/clk/Kconfig | 2 +- + drivers/clk/at91/at91sam9g45.c | 7 - + drivers/clk/at91/clk-main.c | 11 +- + drivers/clk/at91/clk-peripheral.c | 4 +- + drivers/clk/at91/clk-sam9x60-pll.c | 3 +- + drivers/clk/at91/sam9x60.c | 2 +- + drivers/clk/baikal-t1/clk-ccu-pll.c | 14 +- + drivers/clk/bcm/clk-bcm2835.c | 4 +- + drivers/clk/bcm/clk-raspberrypi.c | 1 + + drivers/clk/clk-axi-clkgen.c | 187 +++- + drivers/clk/clk-fixed-factor.c | 1 + + drivers/clk/clk-fixed-rate.c | 1 + + drivers/clk/clk-qoriq.c | 2 +- + drivers/clk/clk-s2mps11.c | 13 +- + drivers/clk/clk-si5341.c | 4 +- + drivers/clk/davinci/da8xx-cfgchip.c | 1 + + drivers/clk/ingenic/cgu.c | 134 ++- + drivers/clk/keystone/sci-clk.c | 19 +- + drivers/clk/mediatek/Kconfig | 48 + + drivers/clk/mediatek/Makefile | 6 + + drivers/clk/mediatek/clk-mt6765.c | 1 - + drivers/clk/mediatek/clk-mt6779.c | 2 + + drivers/clk/mediatek/clk-mt6797.c | 8 +- + drivers/clk/mediatek/clk-mt7629.c | 9 +- + drivers/clk/mediatek/clk-mt8167-aud.c | 66 ++ + drivers/clk/mediatek/clk-mt8167-img.c | 60 ++ + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 58 + + drivers/clk/mediatek/clk-mt8167-mm.c | 132 +++ + drivers/clk/mediatek/clk-mt8167-vdec.c | 73 ++ + drivers/clk/mediatek/clk-mt8167.c | 1062 +++++++++++++++++++ + drivers/clk/meson/Kconfig | 26 +- + drivers/clk/meson/axg-audio.c | 214 +++- + drivers/clk/meson/clk-phase.c | 56 + + drivers/clk/meson/clk-phase.h | 6 + + drivers/clk/meson/g12a.c | 11 + + drivers/clk/meson/meson-aoclk.c | 2 +- + drivers/clk/mmp/clk-of-mmp2.c | 4 +- + drivers/clk/mmp/clk-of-pxa1928.c | 3 +- + drivers/clk/mvebu/ap-cpu-clk.c | 2 +- + drivers/clk/pxa/clk-pxa.h | 8 +- + drivers/clk/qcom/Kconfig | 27 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 10 +- + drivers/clk/qcom/clk-rcg2.c | 19 +- + drivers/clk/qcom/dispcc-sc7180.c | 3 - + drivers/clk/qcom/dispcc-sm8250.c | 1107 ++++++++++++++++++++ + drivers/clk/qcom/gcc-ipq8074.c | 2 +- + drivers/clk/qcom/gcc-msm8939.c | 12 - + drivers/clk/qcom/gcc-msm8994.c | 388 ++++++- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/clk/qcom/videocc-sm8150.c | 276 +++++ + drivers/clk/qcom/videocc-sm8250.c | 369 +++++++ + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r7s9210-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7742-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a7743-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7745-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77470-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7790-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 276 +++++ + drivers/clk/renesas/renesas-cpg-mssr.c | 136 ++- + drivers/clk/renesas/renesas-cpg-mssr.h | 14 +- + drivers/clk/rockchip/clk-half-divider.c | 2 +- + drivers/clk/samsung/clk-cpu.c | 37 +- + drivers/clk/samsung/clk-cpu.h | 6 +- + drivers/clk/samsung/clk-exynos3250.c | 6 +- + drivers/clk/samsung/clk-exynos4.c | 7 +- + drivers/clk/samsung/clk-exynos5250.c | 8 +- + drivers/clk/samsung/clk-exynos5420.c | 27 +- + drivers/clk/samsung/clk-exynos5433.c | 10 +- + drivers/clk/sirf/clk-prima2.c | 2 +- + drivers/clk/socfpga/clk-agilex.c | 13 - + drivers/clk/tegra/clk-tegra210-emc.c | 2 +- + drivers/clk/ti/autoidle.c | 14 +- + drivers/clk/ti/clk-7xx.c | 1 + + drivers/clk/ti/clockdomain.c | 2 + + drivers/clk/uniphier/clk-uniphier-cpugear.c | 2 +- + drivers/clk/uniphier/clk-uniphier-mux.c | 2 +- + include/dt-bindings/clock/dra7.h | 1 + + include/dt-bindings/clock/exynos5250.h | 4 +- + include/dt-bindings/clock/exynos5420.h | 6 + + include/dt-bindings/clock/mt8167-clk.h | 131 +++ + include/dt-bindings/clock/qcom,dispcc-sm8150.h | 1 + + include/dt-bindings/clock/qcom,dispcc-sm8250.h | 66 ++ + include/dt-bindings/clock/qcom,gcc-msm8994.h | 36 + + include/dt-bindings/clock/qcom,videocc-sm8150.h | 25 + + include/dt-bindings/clock/qcom,videocc-sm8250.h | 34 + + 102 files changed, 5112 insertions(+), 457 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml + rename Documentation/devicetree/bindings/clock/{qcom,sdm845-videocc.yaml => qcom,videocc.yaml} (68%) + create mode 100644 drivers/clk/mediatek/clk-mt8167-aud.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-mfgcfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8167.c + create mode 100644 drivers/clk/qcom/dispcc-sm8250.c + create mode 100644 drivers/clk/qcom/videocc-sm8150.c + create mode 100644 drivers/clk/qcom/videocc-sm8250.c + create mode 100644 drivers/clk/renesas/r8a779a0-cpg-mssr.c + create mode 100644 include/dt-bindings/clock/mt8167-clk.h + create mode 120000 include/dt-bindings/clock/qcom,dispcc-sm8150.h + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sm8250.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sm8150.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sm8250.h +Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws instead of __clk_lookup() calls) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (1c8499089bc6 csky: Add memory layout 2.5G(user):1.5G(kernel)) +$ git merge csky/linux-next +Auto-merging arch/csky/kernel/vmlinux.lds.S +Auto-merging arch/csky/kernel/setup.c +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 16 ++++++++++++++++ + arch/csky/abiv1/inc/abi/ckmmu.h | 8 ++++---- + arch/csky/abiv2/inc/abi/ckmmu.h | 14 +++++++------- + arch/csky/abiv2/inc/abi/entry.h | 19 ++++++++++++++++--- + arch/csky/include/asm/memory.h | 2 +- + arch/csky/include/asm/mmu_context.h | 8 +------- + arch/csky/include/asm/page.h | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/include/asm/processor.h | 2 +- + arch/csky/include/asm/segment.h | 2 +- + arch/csky/kernel/atomic.S | 4 ++++ + arch/csky/kernel/entry.S | 10 ++++++++-- + arch/csky/kernel/head.S | 10 ++++++++-- + arch/csky/kernel/setup.c | 18 ++++++++++++++++-- + arch/csky/kernel/smp.c | 7 +++---- + arch/csky/kernel/vmlinux.lds.S | 2 +- + arch/csky/mm/fault.c | 7 +------ + arch/csky/mm/init.c | 29 ++++++++++++++++++++++------- + 19 files changed, 113 insertions(+), 51 deletions(-) +Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/clocksource/h8300_timer8.c +Auto-merging arch/h8300/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (9f5fd809d7a0 serial: mcf: add sysrq capability) +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/uaccess_no.h +Removing arch/m68k/include/asm/uaccess_mm.h +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Resolved 'arch/m68k/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 499faa0a464e] Merge remote-tracking branch 'm68knommu/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 1 + + arch/m68k/coldfire/device.c | 6 +- + arch/m68k/include/asm/uaccess.h | 398 ++++++++++++++++++++++++++++++++++++- + arch/m68k/include/asm/uaccess_mm.h | 390 ------------------------------------ + arch/m68k/include/asm/uaccess_no.h | 160 --------------- + arch/m68k/kernel/signal.c | 6 +- + drivers/tty/serial/mcf.c | 1 + + 7 files changed, 403 insertions(+), 559 deletions(-) + delete mode 100644 arch/m68k/include/asm/uaccess_mm.h + delete mode 100644 arch/m68k/include/asm/uaccess_no.h +Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (cf3af0a4d3b6 MIPS: DEC: Restore bootmem reservation for firmware working memory area) +$ git merge mips/mips-next +Removing arch/mips/pnx833x/stb22x/board.c +Removing arch/mips/pnx833x/stb22x/Makefile +Removing arch/mips/pnx833x/common/setup.c +Removing arch/mips/pnx833x/common/reset.c +Removing arch/mips/pnx833x/common/prom.c +Removing arch/mips/pnx833x/common/platform.c +Removing arch/mips/pnx833x/common/interrupts.c +Removing arch/mips/pnx833x/common/Makefile +Removing arch/mips/pnx833x/Platform +Removing arch/mips/pnx833x/Makefile +Auto-merging arch/mips/pci/pci-ar2315.c +Auto-merging arch/mips/netlogic/xlp/setup.c +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/setup.c +Removing arch/mips/jz4740/setup.c +Removing arch/mips/jz4740/Platform +Removing arch/mips/jz4740/Makefile +Removing arch/mips/include/asm/mach-tx49xx/war.h +Removing arch/mips/include/asm/mach-sibyte/war.h +Removing arch/mips/include/asm/mach-rm/war.h +Removing arch/mips/include/asm/mach-rc32434/war.h +Removing arch/mips/include/asm/mach-pnx833x/pnx833x.h +Removing arch/mips/include/asm/mach-pnx833x/irq.h +Removing arch/mips/include/asm/mach-pnx833x/irq-mapping.h +Removing arch/mips/include/asm/mach-pnx833x/gpio.h +Removing arch/mips/include/asm/mach-paravirt/kernel-entry-init.h +Removing arch/mips/include/asm/mach-paravirt/irq.h +Removing arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h +Removing arch/mips/include/asm/mach-malta/war.h +Removing arch/mips/include/asm/mach-malta/malta-pm.h +Removing arch/mips/include/asm/mach-malta/malta-dtshim.h +Auto-merging arch/mips/include/asm/mach-loongson64/mmzone.h +Auto-merging arch/mips/include/asm/mach-loongson64/irq.h +Removing arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h +Removing arch/mips/include/asm/mach-jz4740/irq.h +Removing arch/mips/include/asm/mach-ip32/war.h +Removing arch/mips/include/asm/mach-ip30/war.h +Removing arch/mips/include/asm/mach-ip30/irq.h +Removing arch/mips/include/asm/mach-ip28/war.h +Removing arch/mips/include/asm/mach-ip27/war.h +Removing arch/mips/include/asm/mach-ip27/kmalloc.h +Removing arch/mips/include/asm/mach-ip22/war.h +Removing arch/mips/include/asm/mach-generic/war.h +Removing arch/mips/include/asm/mach-cavium-octeon/war.h +Removing arch/mips/include/asm/m48t37.h +Removing arch/mips/configs/pnx8335_stb225_defconfig +Auto-merging arch/mips/bcm47xx/setup.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/ingenic/devices.yaml | 5 + + MAINTAINERS | 5 +- + arch/mips/Kbuild.platforms | 2 - + arch/mips/Kconfig | 158 ++++-- + arch/mips/alchemy/Kconfig | 11 - + arch/mips/alchemy/board-gpr.c | 17 - + arch/mips/alchemy/board-mtx1.c | 17 - + arch/mips/alchemy/board-xxs1500.c | 18 - + arch/mips/alchemy/common/prom.c | 21 + + arch/mips/alchemy/devboards/db1300.c | 7 + + arch/mips/alchemy/devboards/platform.c | 17 - + arch/mips/ar7/memory.c | 2 +- + arch/mips/ath25/ar2315.c | 3 +- + arch/mips/ath25/ar5312.c | 3 +- + arch/mips/bcm47xx/prom.c | 3 +- + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 ++++++++++----------- + arch/mips/bcm63xx/setup.c | 2 +- + arch/mips/boot/compressed/Makefile | 8 +- + arch/mips/boot/compressed/decompress.c | 4 + + arch/mips/boot/compressed/string.c | 17 + + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 14 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 14 + + arch/mips/boot/dts/ingenic/jz4770.dtsi | 15 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 23 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 137 +++-- + arch/mips/boot/dts/ingenic/x1000.dtsi | 14 + + arch/mips/boot/dts/ingenic/x1830.dtsi | 14 + + arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 39 ++ + arch/mips/cavium-octeon/setup.c | 26 +- + arch/mips/cobalt/setup.c | 3 +- + arch/mips/configs/ci20_defconfig | 4 +- + arch/mips/configs/cu1000-neo_defconfig | 15 +- + arch/mips/configs/cu1830-neo_defconfig | 15 +- + arch/mips/configs/gcw0_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 - + arch/mips/configs/pnx8335_stb225_defconfig | 77 --- + arch/mips/configs/qi_lb60_defconfig | 7 +- + arch/mips/configs/rs90_defconfig | 4 +- + arch/mips/dec/prom/memory.c | 12 +- + arch/mips/dec/setup.c | 9 +- + arch/mips/fw/arc/memory.c | 28 +- + arch/mips/fw/sni/sniprom.c | 4 +- + arch/mips/generic/Kconfig | 8 +- + arch/mips/generic/Makefile | 1 + + arch/mips/generic/Platform | 4 + + arch/mips/generic/board-ingenic.c | 120 ++++ + arch/mips/generic/init.c | 11 +- + arch/mips/generic/proc.c | 5 + + arch/mips/include/asm/bootinfo.h | 9 +- + arch/mips/include/asm/cpu-features.h | 3 - + arch/mips/include/asm/cpu.h | 1 - + arch/mips/include/asm/futex.h | 4 +- + arch/mips/include/asm/idle.h | 2 + + arch/mips/include/asm/llsc.h | 2 +- + arch/mips/include/asm/local.h | 4 +- + arch/mips/include/asm/m48t37.h | 36 -- + .../asm/mach-au1x00/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 137 ----- + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +- + arch/mips/include/asm/mach-cavium-octeon/war.h | 27 - + arch/mips/include/asm/mach-generic/irq.h | 2 +- + arch/mips/include/asm/mach-generic/war.h | 23 - + .../cpu-feature-overrides.h | 0 + arch/mips/include/asm/mach-ip22/war.h | 27 - + arch/mips/include/asm/mach-ip27/kmalloc.h | 8 - + arch/mips/include/asm/mach-ip27/war.h | 23 - + .../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-ip28/war.h | 23 - + arch/mips/include/asm/mach-ip30/irq.h | 87 --- + arch/mips/include/asm/mach-ip30/war.h | 24 - + arch/mips/include/asm/mach-ip32/war.h | 23 - + arch/mips/include/asm/mach-jz4740/irq.h | 13 - + .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 -- + arch/mips/include/asm/mach-loongson64/irq.h | 3 +- + arch/mips/include/asm/mach-loongson64/mmzone.h | 6 +- + arch/mips/include/asm/mach-malta/malta-dtshim.h | 25 - + arch/mips/include/asm/mach-malta/malta-pm.h | 33 -- + arch/mips/include/asm/mach-malta/war.h | 23 - + .../asm/mach-paravirt/cpu-feature-overrides.h | 35 -- + arch/mips/include/asm/mach-paravirt/irq.h | 19 - + .../include/asm/mach-paravirt/kernel-entry-init.h | 52 -- + arch/mips/include/asm/mach-pnx833x/gpio.h | 159 ------ + arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 112 ---- + arch/mips/include/asm/mach-pnx833x/irq.h | 40 -- + arch/mips/include/asm/mach-pnx833x/pnx833x.h | 189 ------- + arch/mips/include/asm/mach-rc32434/war.h | 23 - + arch/mips/include/asm/mach-rm/war.h | 27 - + arch/mips/include/asm/mach-sibyte/war.h | 38 -- + arch/mips/include/asm/mach-tx49xx/war.h | 23 - + arch/mips/include/asm/mips-boards/malta.h | 2 + + arch/mips/include/asm/mipsregs.h | 23 +- + arch/mips/include/asm/netlogic/psb-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 + + arch/mips/include/asm/pgtable-bits.h | 5 - + arch/mips/include/asm/pgtable.h | 2 - + arch/mips/include/asm/processor.h | 1 + + arch/mips/include/asm/r4k-timer.h | 6 +- + arch/mips/include/asm/sgi/heart.h | 51 ++ + arch/mips/include/asm/stackframe.h | 6 +- + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/include/asm/txx9/tx4939.h | 1 - + arch/mips/include/asm/war.h | 150 ----- + arch/mips/{jz4740 => ingenic}/Kconfig | 16 +- + arch/mips/jz4740/Makefile | 9 - + arch/mips/jz4740/Platform | 3 - + arch/mips/jz4740/setup.c | 145 ----- + arch/mips/kernel/Makefile | 9 +- + arch/mips/kernel/branch.c | 2 + + arch/mips/kernel/cpu-probe.c | 344 +----------- + arch/mips/kernel/cpu-r3k-probe.c | 171 ++++++ + arch/mips/kernel/fpu-probe.c | 321 +++++++++++ + arch/mips/kernel/fpu-probe.h | 40 ++ + arch/mips/kernel/ftrace.c | 4 - + arch/mips/kernel/head.S | 2 +- + arch/mips/kernel/mips-mt-fpaff.c | 4 +- + arch/mips/kernel/process.c | 21 +- + arch/mips/kernel/prom.c | 25 - + arch/mips/kernel/setup.c | 76 +-- + arch/mips/kernel/signal.c | 8 +- + arch/mips/kernel/syscall.c | 2 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 10 +- + arch/mips/loongson2ef/common/mem.c | 12 +- + arch/mips/loongson32/common/prom.c | 4 +- + arch/mips/loongson64/numa.c | 29 +- + arch/mips/loongson64/reset.c | 5 - + arch/mips/mm/c-r4k.c | 17 +- + arch/mips/mm/page.c | 16 +- + arch/mips/mm/sc-mips.c | 2 + + arch/mips/mm/tlbex.c | 8 +- + arch/mips/mm/uasm.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 1 - + arch/mips/netlogic/xlp/setup.c | 2 +- + arch/mips/netlogic/xlr/setup.c | 5 +- + arch/mips/pci/pci-ar2315.c | 5 +- + arch/mips/pci/pci-ar71xx.c | 4 +- + arch/mips/pci/pci-ar724x.c | 9 +- + arch/mips/pnx833x/Makefile | 4 - + arch/mips/pnx833x/Platform | 4 - + arch/mips/pnx833x/common/Makefile | 2 - + arch/mips/pnx833x/common/interrupts.c | 303 ---------- + arch/mips/pnx833x/common/platform.c | 224 -------- + arch/mips/pnx833x/common/prom.c | 51 -- + arch/mips/pnx833x/common/reset.c | 31 - + arch/mips/pnx833x/common/setup.c | 48 -- + arch/mips/pnx833x/stb22x/Makefile | 2 - + arch/mips/pnx833x/stb22x/board.c | 120 ---- + arch/mips/ralink/of.c | 3 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/sgi-ip30/ip30-common.h | 14 + + arch/mips/sgi-ip30/ip30-irq.c | 2 + + arch/mips/sgi-ip32/ip32-memory.c | 3 +- + arch/mips/sgi-ip32/ip32-setup.c | 2 - + arch/mips/sibyte/common/cfe.c | 16 +- + arch/mips/txx9/generic/setup_tx4939.c | 17 - + arch/mips/txx9/jmr3927/prom.c | 4 +- + arch/mips/txx9/rbtx4927/prom.c | 5 +- + arch/mips/txx9/rbtx4938/prom.c | 3 +- + arch/mips/txx9/rbtx4939/prom.c | 14 +- + drivers/firmware/broadcom/bcm47xx_sprom.c | 1 + + drivers/tty/serial/sb1250-duart.c | 9 +- + include/linux/bcm47xx_sprom.h | 10 + + include/linux/bcm963xx_tag.h | 2 +- + lib/decompress_unzstd.c | 7 +- + 165 files changed, 1730 insertions(+), 3681 deletions(-) + delete mode 100644 arch/mips/configs/pnx8335_stb225_defconfig + create mode 100644 arch/mips/generic/board-ingenic.c + delete mode 100644 arch/mips/include/asm/m48t37.h + delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/war.h + delete mode 100644 arch/mips/include/asm/mach-generic/war.h + rename arch/mips/include/asm/{mach-jz4740 => mach-ingenic}/cpu-feature-overrides.h (100%) + delete mode 100644 arch/mips/include/asm/mach-ip22/war.h + delete mode 100644 arch/mips/include/asm/mach-ip27/kmalloc.h + delete mode 100644 arch/mips/include/asm/mach-ip27/war.h + delete mode 100644 arch/mips/include/asm/mach-ip28/war.h + delete mode 100644 arch/mips/include/asm/mach-ip30/irq.h + delete mode 100644 arch/mips/include/asm/mach-ip30/war.h + delete mode 100644 arch/mips/include/asm/mach-ip32/war.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/irq.h + delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h + delete mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h + delete mode 100644 arch/mips/include/asm/mach-malta/malta-pm.h + delete mode 100644 arch/mips/include/asm/mach-malta/war.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/irq.h + delete mode 100644 arch/mips/include/asm/mach-paravirt/kernel-entry-init.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/gpio.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/irq-mapping.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/irq.h + delete mode 100644 arch/mips/include/asm/mach-pnx833x/pnx833x.h + delete mode 100644 arch/mips/include/asm/mach-rc32434/war.h + delete mode 100644 arch/mips/include/asm/mach-rm/war.h + delete mode 100644 arch/mips/include/asm/mach-sibyte/war.h + delete mode 100644 arch/mips/include/asm/mach-tx49xx/war.h + rename arch/mips/{jz4740 => ingenic}/Kconfig (91%) + delete mode 100644 arch/mips/jz4740/Makefile + delete mode 100644 arch/mips/jz4740/Platform + delete mode 100644 arch/mips/jz4740/setup.c + create mode 100644 arch/mips/kernel/cpu-r3k-probe.c + create mode 100644 arch/mips/kernel/fpu-probe.c + create mode 100644 arch/mips/kernel/fpu-probe.h + delete mode 100644 arch/mips/pnx833x/Makefile + delete mode 100644 arch/mips/pnx833x/Platform + delete mode 100644 arch/mips/pnx833x/common/Makefile + delete mode 100644 arch/mips/pnx833x/common/interrupts.c + delete mode 100644 arch/mips/pnx833x/common/platform.c + delete mode 100644 arch/mips/pnx833x/common/prom.c + delete mode 100644 arch/mips/pnx833x/common/reset.c + delete mode 100644 arch/mips/pnx833x/common/setup.c + delete mode 100644 arch/mips/pnx833x/stb22x/Makefile + delete mode 100644 arch/mips/pnx833x/stb22x/board.c +Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Auto-merging arch/nds32/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/setup.c | 2 +- + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 4 files changed, 5 insertions(+), 50 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (fbb75b71b131 parisc/sticon: Add user font support) +$ git merge parisc-hd/for-next +Auto-merging drivers/firmware/Kconfig +Auto-merging arch/parisc/Kconfig +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-32bit_defconfig | 6 +- + arch/parisc/configs/generic-64bit_defconfig | 6 +- + arch/parisc/include/asm/barrier.h | 6 +- + arch/parisc/include/asm/cmpxchg.h | 14 +- + arch/parisc/include/asm/futex.h | 4 +- + arch/parisc/include/asm/socket.h | 4 +- + arch/parisc/include/asm/spinlock.h | 23 ++- + arch/parisc/include/uapi/asm/fcntl.h | 7 +- + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/signal.h | 5 +- + arch/parisc/install.sh | 2 +- + arch/parisc/kernel/cache.c | 18 +- + arch/parisc/kernel/entry.S | 14 +- + arch/parisc/kernel/inventory.c | 30 +++ + arch/parisc/kernel/smp.c | 9 +- + arch/parisc/kernel/syscall.S | 10 +- + arch/parisc/lib/bitops.c | 6 +- + arch/parisc/lib/iomap.c | 18 ++ + drivers/firmware/Kconfig | 2 +- + drivers/firmware/qemu_fw_cfg.c | 3 + + drivers/video/console/Kconfig | 1 + + drivers/video/console/sticon.c | 304 ++++++++++++++++------------ + drivers/video/console/sticore.c | 284 ++++++++++++++------------ + drivers/video/fbdev/sticore.h | 27 ++- + tools/arch/parisc/include/uapi/asm/mman.h | 1 - + 26 files changed, 453 insertions(+), 353 deletions(-) +Merging powerpc/next (a2d0230b91f7 cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier) +$ git merge powerpc/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging fs/exec.c +Auto-merging drivers/macintosh/smu.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/kasan/kasan_init_32.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/kasan/kasan_init_32.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/kernel/fadump.c +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/powerpc/include/asm/hw_irq.h +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Resolved 'arch/powerpc/mm/kasan/kasan_init_32.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a617c0fdcd34] Merge remote-tracking branch 'powerpc/next' into master +$ git diff -M --stat --summary HEAD^.. + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 25 ++ + .../testing/sysfs-bus-event_source-devices-hv_gpci | 38 +++ + Documentation/powerpc/isa-versions.rst | 4 + + Documentation/powerpc/ptrace.rst | 1 + + arch/Kconfig | 7 + + arch/powerpc/Kconfig | 21 +- + arch/powerpc/Makefile | 3 +- + arch/powerpc/Makefile.postlink | 2 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/boot/dts/fsl/t1024rdb.dts | 1 - + arch/powerpc/boot/dts/fsl/t4240rdb.dts | 1 - + arch/powerpc/boot/util.S | 15 +- + arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 6 +- + arch/powerpc/configs/85xx/tqm8540_defconfig | 6 +- + arch/powerpc/configs/85xx/tqm8541_defconfig | 6 +- + arch/powerpc/configs/85xx/tqm8555_defconfig | 6 +- + arch/powerpc/configs/85xx/tqm8560_defconfig | 6 +- + arch/powerpc/include/asm/asm-prototypes.h | 5 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 18 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 13 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 17 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 7 + + arch/powerpc/include/asm/book3s/64/radix.h | 16 + + arch/powerpc/include/asm/cacheflush.h | 10 + + arch/powerpc/include/asm/cputable.h | 18 +- + arch/powerpc/include/asm/cputhreads.h | 1 - + arch/powerpc/include/asm/delay.h | 2 +- + arch/powerpc/include/asm/drmem.h | 43 ++- + arch/powerpc/include/asm/eeh.h | 9 +- + arch/powerpc/include/asm/hvcall.h | 38 +++ + arch/powerpc/include/asm/hw_breakpoint.h | 12 + + arch/powerpc/include/asm/hw_irq.h | 11 +- + arch/powerpc/include/asm/icswx.h | 6 +- + arch/powerpc/include/asm/irq.h | 1 - + arch/powerpc/include/asm/machdep.h | 3 - + arch/powerpc/include/asm/mmu_context.h | 2 +- + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 14 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 20 +- + arch/powerpc/include/asm/pci-bridge.h | 6 + + arch/powerpc/include/asm/pnv-ocxl.h | 3 - + arch/powerpc/include/asm/ppc_asm.h | 13 +- + arch/powerpc/include/asm/processor.h | 9 +- + arch/powerpc/include/asm/ptrace.h | 4 - + arch/powerpc/include/asm/reg.h | 20 +- + arch/powerpc/include/asm/reg_booke.h | 1 - + arch/powerpc/include/asm/smp.h | 24 +- + arch/powerpc/include/asm/svm.h | 4 + + arch/powerpc/include/asm/synch.h | 19 +- + arch/powerpc/include/asm/time.h | 86 +---- + arch/powerpc/include/asm/timex.h | 3 - + arch/powerpc/include/asm/tlb.h | 13 - + arch/powerpc/include/asm/topology.h | 20 +- + arch/powerpc/include/asm/uaccess.h | 75 ++-- + arch/powerpc/include/uapi/asm/ptrace.h | 1 + + arch/powerpc/kernel/Makefile | 6 +- + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/btext.c | 17 +- + arch/powerpc/kernel/cputable.c | 16 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 1 + + arch/powerpc/kernel/eeh.c | 145 +++----- + arch/powerpc/kernel/eeh_pe.c | 50 +-- + arch/powerpc/kernel/entry_32.S | 35 +- + arch/powerpc/kernel/entry_64.S | 8 +- + arch/powerpc/kernel/exceptions-64e.S | 11 - + arch/powerpc/kernel/fadump.c | 2 - + arch/powerpc/kernel/fpu.S | 16 - + arch/powerpc/kernel/head_32.h | 73 ++-- + arch/powerpc/kernel/head_40x.S | 1 - + arch/powerpc/kernel/head_64.S | 7 +- + .../powerpc/kernel/{head_32.S => head_book3s_32.S} | 93 +---- + arch/powerpc/kernel/head_booke.h | 1 - + arch/powerpc/kernel/hw_breakpoint.c | 149 +------- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 162 +++++++++ + arch/powerpc/kernel/idle.c | 8 - + arch/powerpc/kernel/irq.c | 73 ++-- + arch/powerpc/kernel/l2cr_6xx.S | 3 +- + arch/powerpc/kernel/misc_32.S | 48 --- + arch/powerpc/kernel/misc_64.S | 1 - + arch/powerpc/kernel/pci-common.c | 114 +++++++ + arch/powerpc/kernel/process.c | 149 ++++---- + arch/powerpc/kernel/prom.c | 5 + + arch/powerpc/kernel/prom_init.c | 17 +- + arch/powerpc/kernel/ptrace/ptrace-noadv.c | 9 +- + arch/powerpc/kernel/rtas.c | 153 +++++++++ + arch/powerpc/kernel/security.c | 34 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 105 +++++- + arch/powerpc/kernel/smp.c | 374 +++++++++++++------- + arch/powerpc/kernel/sysfs.c | 49 ++- + arch/powerpc/kernel/tau_6xx.c | 147 ++++---- + arch/powerpc/kernel/time.c | 62 +--- + arch/powerpc/kernel/tm.S | 35 +- + arch/powerpc/kernel/traps.c | 4 - + arch/powerpc/kernel/vdso32/datapage.S | 2 - + arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 - + arch/powerpc/kvm/book3s_hv.c | 7 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 8 + + arch/powerpc/lib/code-patching.c | 17 +- + arch/powerpc/lib/sstep.c | 9 +- + arch/powerpc/mm/book3s32/hash_low.S | 21 +- + arch/powerpc/mm/book3s32/mmu.c | 94 ++---- + arch/powerpc/mm/book3s64/hash_native.c | 8 +- + arch/powerpc/mm/book3s64/hash_utils.c | 12 +- + arch/powerpc/mm/book3s64/internal.h | 2 + + arch/powerpc/mm/book3s64/mmu_context.c | 4 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 10 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 35 +- + arch/powerpc/mm/book3s64/slb.c | 4 +- + arch/powerpc/mm/drmem.c | 6 +- + arch/powerpc/mm/hugetlbpage.c | 20 +- + arch/powerpc/mm/init_64.c | 39 ++- + arch/powerpc/mm/kasan/kasan_init_32.c | 31 +- + arch/powerpc/mm/mem.c | 6 +- + arch/powerpc/mm/nohash/8xx.c | 7 - + arch/powerpc/mm/nohash/fsl_booke.c | 16 + + arch/powerpc/mm/nohash/tlb.c | 4 - + arch/powerpc/mm/numa.c | 101 +++++- + arch/powerpc/mm/pgtable.c | 6 +- + arch/powerpc/mm/ptdump/8xx.c | 5 + + arch/powerpc/mm/ptdump/bats.c | 59 ---- + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/perf/hv-gpci-requests.h | 6 +- + arch/powerpc/perf/hv-gpci.c | 73 +++- + arch/powerpc/perf/hv-gpci.h | 27 -- + arch/powerpc/perf/imc-pmu.c | 3 - + arch/powerpc/perf/isa207-common.c | 10 + + arch/powerpc/perf/isa207-common.h | 2 + + arch/powerpc/perf/power10-pmu.c | 1 - + arch/powerpc/perf/power5+-pmu.c | 2 + + arch/powerpc/perf/power5-pmu.c | 2 + + arch/powerpc/perf/power6-pmu.c | 2 + + arch/powerpc/perf/power7-pmu.c | 2 + + arch/powerpc/perf/ppc970-pmu.c | 2 + + arch/powerpc/platforms/44x/machine_check.c | 1 + + arch/powerpc/platforms/44x/ppc476.c | 5 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 4 +- + arch/powerpc/platforms/85xx/smp.c | 4 +- + arch/powerpc/platforms/Kconfig | 29 +- + arch/powerpc/platforms/Kconfig.cputype | 18 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 3 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 3 +- + arch/powerpc/platforms/powermac/pmac.h | 2 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powermac/sleep.S | 15 +- + arch/powerpc/platforms/powermac/smp.c | 12 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 98 +++--- + arch/powerpc/platforms/powernv/idle.c | 302 ++++++++++++----- + arch/powerpc/platforms/powernv/ocxl.c | 30 -- + arch/powerpc/platforms/powernv/opal-core.c | 2 +- + arch/powerpc/platforms/powernv/opal-elog.c | 33 +- + arch/powerpc/platforms/powernv/opal-msglog.c | 2 + + arch/powerpc/platforms/powernv/opal-prd.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 8 - + arch/powerpc/platforms/powernv/powernv.h | 7 + + arch/powerpc/platforms/powernv/rng.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 24 ++ + arch/powerpc/platforms/powernv/smp.c | 6 +- + arch/powerpc/platforms/powernv/vas-window.c | 9 +- + arch/powerpc/platforms/ps3/spu.c | 4 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 376 +++++++-------------- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 82 +++-- + arch/powerpc/platforms/pseries/hvCall_inst.c | 23 +- + arch/powerpc/platforms/pseries/iommu.c | 242 ++++++++++--- + arch/powerpc/platforms/pseries/lpar.c | 2 + + arch/powerpc/platforms/pseries/lparcfg.c | 35 ++ + arch/powerpc/platforms/pseries/papr_scm.c | 10 +- + arch/powerpc/platforms/pseries/rng.c | 1 + + arch/powerpc/platforms/pseries/setup.c | 6 + + arch/powerpc/platforms/pseries/svm.c | 26 ++ + arch/powerpc/sysdev/xics/icp-hv.c | 1 + + arch/powerpc/sysdev/xive/common.c | 4 +- + arch/powerpc/tools/checkpatch.sh | 1 - + arch/powerpc/tools/unrel_branch_check.sh | 125 ++++--- + arch/powerpc/xmon/xmon.c | 1 + + arch/sparc/kernel/smp_64.c | 65 +--- + drivers/cpufreq/powernv-cpufreq.c | 9 +- + drivers/cpuidle/cpuidle-powernv.c | 2 +- + drivers/macintosh/smu.c | 4 +- + drivers/macintosh/windfarm_lm75_sensor.c | 2 - + drivers/macintosh/windfarm_lm87_sensor.c | 2 - + drivers/macintosh/windfarm_smu_sat.c | 3 +- + drivers/macintosh/windfarm_smu_sensors.c | 3 +- + drivers/misc/cxl/pci.c | 4 +- + drivers/misc/ocxl/Kconfig | 2 +- + drivers/misc/ocxl/afu_irq.c | 12 +- + drivers/misc/ocxl/link.c | 15 +- + drivers/scsi/cxlflash/ocxl_hw.c | 21 +- + drivers/scsi/cxlflash/ocxl_hw.h | 1 - + drivers/tty/serial/pmac_zilog.c | 2 +- + fs/exec.c | 17 +- + include/linux/cpuhotplug.h | 1 + + include/linux/topology.h | 2 +- + include/misc/ocxl.h | 10 +- + include/uapi/asm-generic/hugetlb_encode.h | 1 + + include/uapi/linux/mman.h | 1 + + .../powerpc/alignment/alignment_handler.c | 12 +- + .../selftests/powerpc/benchmarks/context_switch.c | 6 + + tools/testing/selftests/powerpc/dscr/Makefile | 2 +- + .../selftests/powerpc/dscr/dscr_default_test.c | 2 + + .../selftests/powerpc/dscr/dscr_explicit_test.c | 2 + + .../powerpc/dscr/dscr_inherit_exec_test.c | 2 + + .../selftests/powerpc/dscr/dscr_inherit_test.c | 2 + + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 2 + + .../powerpc/dscr/dscr_sysfs_thread_test.c | 2 + + .../selftests/powerpc/dscr/dscr_user_test.c | 2 + + tools/testing/selftests/powerpc/include/utils.h | 2 +- + tools/testing/selftests/powerpc/mm/bad_accesses.c | 1 + + .../selftests/powerpc/pmu/count_stcx_fail.c | 1 - + tools/testing/selftests/powerpc/pmu/l3_bank_test.c | 3 + + .../selftests/powerpc/pmu/per_event_excludes.c | 2 - + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 48 ++- + .../testing/selftests/powerpc/security/rfi_flush.c | 38 +++ + .../selftests/powerpc/security/spectre_v2.c | 3 + + .../testing/selftests/powerpc/stringloops/memcmp.c | 2 +- + .../powerpc/switch_endian/switch_endian_test.S | 23 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 2 +- + .../selftests/powerpc/syscalls/rtas_filter.c | 285 ++++++++++++++++ + tools/testing/selftests/powerpc/tm/tm-poison.c | 11 +- + tools/testing/selftests/powerpc/tm/tm-tmspr.c | 10 +- + tools/testing/selftests/powerpc/tm/tm-trap.c | 10 +- + .../testing/selftests/powerpc/tm/tm-unavailable.c | 9 +- + tools/testing/selftests/powerpc/tm/tm.h | 3 +- + tools/testing/selftests/powerpc/utils.c | 39 +-- + 225 files changed, 3360 insertions(+), 2489 deletions(-) + rename arch/powerpc/kernel/{head_32.S => head_book3s_32.S} (94%) + create mode 100644 arch/powerpc/kernel/hw_breakpoint_constraints.c + create mode 100644 tools/testing/selftests/powerpc/syscalls/rtas_filter.c +$ git am -3 ../patches/Revert-powerpc_pci-unmap-legacy-INTx-interrupts-when-a-PHB-is-removed.patch +Applying: Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/pci-bridge.h +M arch/powerpc/kernel/pci-common.c +$ git add -A . +$ git commit -v -a --amend +[master 0ed1d4b9aeb1] Merge remote-tracking branch 'powerpc/next' into master + Date: Thu Oct 15 10:27:48 2020 +1100 +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (d97b957e32b1 soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (e8d444d3e98c riscv: remove address space overrides using set_fs()) +$ git merge risc-v/for-next +Auto-merging kernel/bpf/cgroup.c +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/bpf-cgroup.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/firmware/efi/Makefile +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/lib/putuser.S +Auto-merging arch/x86/lib/getuser.S +CONFLICT (content): Merge conflict in arch/x86/lib/getuser.S +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/page_64_types.h +Auto-merging arch/um/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +CONFLICT (content): Merge conflict in arch/s390/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/riscv/kernel/vmlinux.lds.S +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/lib/sstep.c +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/powerpc/include/asm/processor.h +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/microblaze/Kconfig +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/csky/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/Kconfig +Resolved 'arch/ia64/Kconfig' using previous resolution. +Resolved 'arch/m68k/Kconfig' using previous resolution. +Resolved 'arch/riscv/kernel/vmlinux.lds.S' using previous resolution. +Resolved 'arch/s390/Kconfig' using previous resolution. +Recorded preimage for 'arch/x86/lib/getuser.S' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/lib/getuser.S'. +[master 5af24be02d40] Merge remote-tracking branch 'risc-v/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 3 + + arch/alpha/Kconfig | 1 + + arch/arc/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/c6x/Kconfig | 1 + + arch/csky/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/hexagon/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + arch/m68k/Kconfig | 1 + + arch/microblaze/Kconfig | 1 + + arch/mips/Kconfig | 1 + + arch/nds32/Kconfig | 1 + + arch/nios2/Kconfig | 1 + + arch/openrisc/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/powerpc/include/asm/processor.h | 7 - + arch/powerpc/include/asm/thread_info.h | 5 +- + arch/powerpc/include/asm/uaccess.h | 67 ++---- + arch/powerpc/kernel/signal.c | 3 - + arch/powerpc/lib/sstep.c | 6 +- + arch/riscv/Kconfig | 26 +++ + arch/riscv/Makefile | 1 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/include/asm/Kbuild | 1 + + arch/riscv/include/asm/cacheinfo.h | 5 + + arch/riscv/include/asm/efi.h | 55 +++++ + arch/riscv/include/asm/elf.h | 13 ++ + arch/riscv/include/asm/fixmap.h | 16 +- + arch/riscv/include/asm/io.h | 1 + + arch/riscv/include/asm/mmu.h | 2 + + arch/riscv/include/asm/pgtable.h | 5 + + arch/riscv/include/asm/sections.h | 13 ++ + arch/riscv/include/asm/thread_info.h | 6 - + arch/riscv/include/asm/uaccess.h | 177 +++++++-------- + arch/riscv/include/uapi/asm/auxvec.h | 24 ++ + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/cacheinfo.c | 98 ++++++-- + arch/riscv/kernel/efi-header.S | 111 ++++++++++ + arch/riscv/kernel/efi.c | 96 ++++++++ + arch/riscv/kernel/head.S | 18 +- + arch/riscv/kernel/head.h | 2 - + arch/riscv/kernel/image-vars.h | 51 +++++ + arch/riscv/kernel/process.c | 1 - + arch/riscv/kernel/setup.c | 18 +- + arch/riscv/kernel/vmlinux.lds.S | 23 +- + arch/riscv/lib/Makefile | 2 +- + arch/riscv/mm/fault.c | 356 +++++++++++++++++------------- + arch/riscv/mm/init.c | 190 ++++++++++++---- + arch/riscv/mm/ptdump.c | 48 +++- + arch/s390/Kconfig | 1 + + arch/sh/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/um/Kconfig | 1 + + arch/x86/ia32/ia32_aout.c | 1 - + arch/x86/include/asm/page_32_types.h | 11 + + arch/x86/include/asm/page_64_types.h | 38 ++++ + arch/x86/include/asm/processor.h | 60 +---- + arch/x86/include/asm/thread_info.h | 2 - + arch/x86/include/asm/uaccess.h | 26 +-- + arch/x86/kernel/asm-offsets.c | 3 - + arch/x86/lib/getuser.S | 47 ++-- + arch/x86/lib/putuser.S | 25 ++- + arch/xtensa/Kconfig | 1 + + drivers/firmware/efi/Kconfig | 3 +- + drivers/firmware/efi/Makefile | 2 + + drivers/firmware/efi/libstub/Makefile | 10 + + drivers/firmware/efi/libstub/efi-stub.c | 11 +- + drivers/firmware/efi/libstub/riscv-stub.c | 109 +++++++++ + drivers/firmware/efi/riscv-runtime.c | 143 ++++++++++++ + drivers/misc/lkdtm/bugs.c | 10 - + drivers/misc/lkdtm/core.c | 2 - + drivers/misc/lkdtm/lkdtm.h | 2 - + drivers/misc/lkdtm/usercopy.c | 15 -- + fs/proc/inode.c | 119 +++++++--- + fs/proc/proc_sysctl.c | 48 ++-- + fs/read_write.c | 69 +++--- + fs/splice.c | 130 ++--------- + include/asm-generic/uaccess.h | 109 +++++---- + include/linux/bpf-cgroup.h | 2 +- + include/linux/fs.h | 2 - + include/linux/proc_fs.h | 1 + + include/linux/uaccess.h | 22 ++ + kernel/bpf/cgroup.c | 2 +- + lib/test_bitmap.c | 91 ++------ + tools/testing/selftests/lkdtm/tests.txt | 2 - + 87 files changed, 1721 insertions(+), 870 deletions(-) + create mode 100644 arch/riscv/include/asm/efi.h + create mode 100644 arch/riscv/include/asm/sections.h + create mode 100644 arch/riscv/kernel/efi-header.S + create mode 100644 arch/riscv/kernel/efi.c + create mode 100644 arch/riscv/kernel/image-vars.h + create mode 100644 drivers/firmware/efi/libstub/riscv-stub.c + create mode 100644 drivers/firmware/efi/riscv-runtime.c +Merging s390/for-next (ddadd80dc943 Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging drivers/s390/cio/css.c +Auto-merging drivers/s390/cio/chsc.c +Auto-merging drivers/crypto/Kconfig +Removing arch/s390/scripts/Makefile.chkbss +Removing arch/s390/kernel/vdso64/gettimeofday.S +Removing arch/s390/kernel/vdso64/clock_gettime.S +Removing arch/s390/kernel/vdso64/clock_getres.S +Auto-merging arch/s390/kernel/vdso64/Makefile +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/kernel/kprobes.c +Auto-merging arch/s390/include/asm/checksum.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/checksum.h +Auto-merging arch/s390/Kconfig +Resolved 'arch/s390/include/asm/checksum.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c3e58617ccbf] Merge remote-tracking branch 's390/for-next' into master +$ git diff -M --stat --summary HEAD^.. + .../features/vm/ioremap_prot/arch-support.txt | 2 +- + arch/s390/Kconfig | 5 + + arch/s390/Kconfig.debug | 12 - + arch/s390/boot/Makefile | 4 - + arch/s390/boot/compressed/Makefile | 4 - + arch/s390/boot/compressed/decompressor.c | 1 - + arch/s390/boot/compressed/vmlinux.lds.S | 22 +- + arch/s390/boot/head.S | 21 +- + arch/s390/boot/ipl_parm.c | 60 ++- + arch/s390/boot/kaslr.c | 138 ++++--- + arch/s390/boot/pgm_check_info.c | 11 +- + arch/s390/boot/startup.c | 5 +- + arch/s390/boot/text_dma.S | 17 - + arch/s390/boot/uv.c | 3 + + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 3 +- + arch/s390/include/asm/checksum.h | 105 +++--- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/clocksource.h | 7 + + arch/s390/include/asm/clp.h | 3 + + arch/s390/include/asm/gmap.h | 2 - + arch/s390/include/asm/io.h | 8 + + arch/s390/include/asm/ipl.h | 7 + + arch/s390/include/asm/kasan.h | 1 + + arch/s390/include/asm/pci.h | 6 +- + arch/s390/include/asm/pci_clp.h | 19 + + arch/s390/include/asm/pgalloc.h | 2 - + arch/s390/include/asm/pgtable.h | 10 +- + arch/s390/include/asm/ptdump.h | 14 + + arch/s390/include/asm/qdio.h | 10 +- + arch/s390/include/asm/sclp.h | 5 +- + arch/s390/include/asm/set_memory.h | 4 + + arch/s390/include/asm/setup.h | 7 +- + arch/s390/include/asm/smp.h | 1 - + arch/s390/include/asm/stp.h | 100 +++-- + arch/s390/include/asm/tlbflush.h | 2 - + arch/s390/include/asm/uaccess.h | 126 ++++++- + arch/s390/include/asm/uv.h | 7 + + arch/s390/include/asm/vdso.h | 27 +- + arch/s390/include/asm/vdso/clocksource.h | 8 + + arch/s390/include/asm/vdso/data.h | 13 + + arch/s390/include/asm/vdso/gettimeofday.h | 71 ++++ + arch/s390/include/asm/vdso/processor.h | 7 + + arch/s390/include/asm/vdso/vdso.h | 0 + arch/s390/include/asm/vdso/vsyscall.h | 26 ++ + arch/s390/include/asm/vtimer.h | 2 - + arch/s390/include/uapi/asm/pkey.h | 77 +++- + arch/s390/include/uapi/asm/sie.h | 2 +- + arch/s390/kernel/Makefile | 1 + + arch/s390/kernel/asm-offsets.c | 20 - + arch/s390/kernel/crash_dump.c | 16 +- + arch/s390/kernel/diag.c | 13 +- + arch/s390/kernel/dis.c | 22 +- + arch/s390/kernel/early.c | 13 - + arch/s390/kernel/early_printk.c | 2 +- + arch/s390/kernel/entry.S | 6 - + arch/s390/kernel/entry.h | 6 +- + arch/s390/kernel/ipl.c | 119 +++++- + arch/s390/kernel/kprobes.c | 59 ++- + arch/s390/kernel/kprobes_insn_page.S | 22 ++ + arch/s390/kernel/setup.c | 62 +-- + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/time.c | 318 ++++++++++------ + arch/s390/kernel/uv.c | 66 ++-- + arch/s390/kernel/vdso.c | 29 +- + arch/s390/kernel/vdso64/Makefile | 21 +- + arch/s390/kernel/vdso64/clock_getres.S | 50 --- + arch/s390/kernel/vdso64/clock_gettime.S | 163 -------- + arch/s390/kernel/vdso64/gettimeofday.S | 71 ---- + arch/s390/kernel/vdso64/vdso64_generic.c | 18 + + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 38 ++ + arch/s390/lib/string.c | 2 +- + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/dump_pagetables.c | 360 +++++++++--------- + arch/s390/mm/gmap.c | 2 +- + arch/s390/mm/init.c | 2 + + arch/s390/mm/kasan_init.c | 44 ++- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 20 + + arch/s390/pci/Makefile | 1 + + arch/s390/pci/pci.c | 59 +-- + arch/s390/pci/pci_bus.c | 66 +--- + arch/s390/pci/pci_bus.h | 13 - + arch/s390/pci/pci_clp.c | 85 +++-- + arch/s390/pci/pci_event.c | 3 +- + arch/s390/pci/pci_iov.c | 99 +++++ + arch/s390/pci/pci_iov.h | 30 ++ + arch/s390/scripts/Makefile.chkbss | 20 - + drivers/crypto/Kconfig | 24 +- + drivers/s390/char/Makefile | 2 + + drivers/s390/char/con3215.c | 7 +- + drivers/s390/char/raw3270.h | 1 - + drivers/s390/char/sclp.h | 4 +- + drivers/s390/char/sclp_ap.c | 63 ++++ + drivers/s390/char/sclp_early_core.c | 15 +- + drivers/s390/char/sclp_rw.c | 18 - + drivers/s390/char/sclp_rw.h | 2 - + drivers/s390/char/sclp_sdias.c | 8 +- + drivers/s390/char/tape.h | 3 - + drivers/s390/char/tape_std.h | 12 - + drivers/s390/char/zcore.c | 17 +- + drivers/s390/cio/chsc.c | 21 ++ + drivers/s390/cio/css.c | 14 - + drivers/s390/cio/device.h | 1 - + drivers/s390/cio/qdio_main.c | 43 +-- + drivers/s390/cio/qdio_setup.c | 38 +- + drivers/s390/crypto/ap_bus.c | 411 +++++++++++++------- + drivers/s390/crypto/ap_bus.h | 54 ++- + drivers/s390/crypto/ap_card.c | 34 ++ + drivers/s390/crypto/ap_debug.h | 8 + + drivers/s390/crypto/ap_queue.c | 252 ++++++++++--- + drivers/s390/crypto/pkey_api.c | 262 +++++++++++-- + drivers/s390/crypto/zcrypt_api.c | 416 +++++++++++++++------ + drivers/s390/crypto/zcrypt_api.h | 49 ++- + drivers/s390/crypto/zcrypt_card.c | 12 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 411 ++++++++++++++------ + drivers/s390/crypto/zcrypt_ccamisc.h | 74 +++- + drivers/s390/crypto/zcrypt_cex2a.c | 6 +- + drivers/s390/crypto/zcrypt_cex2c.c | 45 ++- + drivers/s390/crypto/zcrypt_cex4.c | 97 +++-- + drivers/s390/crypto/zcrypt_debug.h | 8 + + drivers/s390/crypto/zcrypt_ep11misc.c | 312 ++++++++++++---- + drivers/s390/crypto/zcrypt_ep11misc.h | 63 +++- + drivers/s390/crypto/zcrypt_error.h | 88 ++--- + drivers/s390/crypto/zcrypt_msgtype50.c | 131 ++++--- + drivers/s390/crypto/zcrypt_msgtype6.c | 264 +++++++------ + drivers/s390/crypto/zcrypt_msgtype6.h | 4 +- + drivers/s390/crypto/zcrypt_queue.c | 11 +- + drivers/s390/scsi/zfcp_qdio.c | 2 - + 129 files changed, 4094 insertions(+), 2162 deletions(-) + create mode 100644 arch/s390/include/asm/clocksource.h + create mode 100644 arch/s390/include/asm/ptdump.h + create mode 100644 arch/s390/include/asm/vdso/clocksource.h + create mode 100644 arch/s390/include/asm/vdso/data.h + create mode 100644 arch/s390/include/asm/vdso/gettimeofday.h + create mode 100644 arch/s390/include/asm/vdso/processor.h + create mode 100644 arch/s390/include/asm/vdso/vdso.h + create mode 100644 arch/s390/include/asm/vdso/vsyscall.h + create mode 100644 arch/s390/kernel/kprobes_insn_page.S + delete mode 100644 arch/s390/kernel/vdso64/clock_getres.S + delete mode 100644 arch/s390/kernel/vdso64/clock_gettime.S + delete mode 100644 arch/s390/kernel/vdso64/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso64/vdso64_generic.c + create mode 100644 arch/s390/kernel/vdso64/vdso_user_wrapper.S + create mode 100644 arch/s390/pci/pci_iov.c + create mode 100644 arch/s390/pci/pci_iov.h + delete mode 100644 arch/s390/scripts/Makefile.chkbss + create mode 100644 drivers/s390/char/sclp_ap.c +Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (f06885b3f3e3 um: vector: Add dynamic tap interfaces and scripting) +$ git merge uml/linux-next +Auto-merging arch/um/Kconfig +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 6 ++-- + arch/um/drivers/Kconfig | 6 ++-- + arch/um/drivers/daemon_user.c | 1 + + arch/um/drivers/pcap_user.c | 12 ++++---- + arch/um/drivers/slip_user.c | 2 +- + arch/um/drivers/vector_kern.c | 4 +-- + arch/um/drivers/vector_user.c | 71 ++++++++++++++++++++++++++++++++----------- + arch/um/kernel/sigio.c | 6 ++-- + arch/um/kernel/sysrq.c | 4 +-- + arch/um/kernel/time.c | 15 ++++++--- + arch/um/os-Linux/umid.c | 8 ++--- + arch/um/os-Linux/util.c | 2 +- + arch/x86/um/ptrace_64.c | 13 +------- + arch/x86/um/user-offsets.c | 2 +- + 14 files changed, 91 insertions(+), 61 deletions(-) +Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/uaccess.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fscrypt/master (5b2a828b98ec fscrypt: export fscrypt_d_revalidate()) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (d6e05fb2b680 Merge branch 'for-next-next-v5.9-20200923' into for-next-20200923) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/volumes.c +CONFLICT (content): Merge conflict in fs/btrfs/volumes.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/tests/inode-tests.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.h +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-io-tree.h +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging fs/btrfs/dev-replace.c +CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/ctree.c +Auto-merging fs/btrfs/btrfs_inode.h +Auto-merging fs/btrfs/block-group.c +Recorded preimage for 'fs/btrfs/dev-replace.c' +Recorded preimage for 'fs/btrfs/disk-io.c' +Recorded preimage for 'fs/btrfs/extent_io.h' +Recorded preimage for 'fs/btrfs/inode.c' +Recorded preimage for 'fs/btrfs/volumes.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --HARD +$ git commit --no-edit -v -a +On branch master +nothing to commit, working tree clean +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/include/asm/uaccess.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ceph/master (28e1581c3b4e libceph: clear con->out_msg on Policy::stateful_server faults) +$ git merge ceph/master +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.rst | 6 +- + drivers/block/rbd.c | 8 +- + fs/ceph/addr.c | 416 +++++++++++++++++-------------------- + fs/ceph/caps.c | 128 ++++++++---- + fs/ceph/debugfs.c | 18 +- + fs/ceph/dir.c | 20 +- + fs/ceph/file.c | 85 +++----- + fs/ceph/inode.c | 10 +- + fs/ceph/locks.c | 2 +- + fs/ceph/mds_client.c | 109 ++++++---- + fs/ceph/mds_client.h | 2 +- + fs/ceph/metric.c | 14 ++ + fs/ceph/metric.h | 7 + + fs/ceph/quota.c | 10 +- + fs/ceph/snap.c | 2 +- + fs/ceph/super.c | 8 +- + fs/ceph/super.h | 13 +- + fs/ceph/xattr.c | 3 +- + include/linux/ceph/messenger.h | 2 +- + include/linux/ceph/mon_client.h | 2 +- + include/linux/ceph/osdmap.h | 14 +- + include/linux/ceph/rados.h | 2 +- + include/linux/crush/crush.h | 3 + + net/ceph/messenger.c | 13 +- + net/ceph/mon_client.c | 69 ++++-- + net/ceph/osdmap.c | 166 +++++++++++++-- + 26 files changed, 689 insertions(+), 443 deletions(-) +Merging cifs/for-next (344602068c51 SMB3.1.1: add defines for new signing negotiate context) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_unicode.c | 8 ++++- + fs/cifs/cifsglob.h | 2 ++ + fs/cifs/connect.c | 15 +++++++++- + fs/cifs/inode.c | 13 +++++--- + fs/cifs/readdir.c | 30 ++++++++++--------- + fs/cifs/smb2inode.c | 11 +++---- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2ops.c | 37 ++++++++++++++++++----- + fs/cifs/smb2pdu.h | 80 +++++++++++++++++++++++++++++++++++++++++++++----- + fs/cifs/smb2proto.h | 3 +- + 10 files changed, 160 insertions(+), 41 deletions(-) +Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() over bare printk(KERN_ERR) +$ git merge configfs/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + samples/configfs/configfs_sample.c | 59 ++++++++++++-------------------------- + 2 files changed, 20 insertions(+), 40 deletions(-) +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (915f4c9358db erofs: remove unnecessary enum entries) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (e17632ef8874 exfat: remove useless check in exfat_move_file()) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 29 ++++------ + fs/exfat/exfat_fs.h | 4 +- + fs/exfat/file.c | 4 +- + fs/exfat/inode.c | 5 +- + fs/exfat/namei.c | 153 +++++++++++++++++++--------------------------------- + fs/exfat/nls.c | 2 +- + fs/exfat/super.c | 1 - + 7 files changed, 71 insertions(+), 127 deletions(-) +Merging ext3/for_next (e44b86917b3f Pull direct IO fix from Gabriel Krisman.) +$ git merge ext3/for_next +Auto-merging fs/quota/quota.c +Auto-merging fs/direct-io.c +Merge made by the 'recursive' strategy. + fs/direct-io.c | 69 ++++++++++++++++++------------------------ + fs/ext2/balloc.c | 6 ++-- + fs/ext2/inode.c | 1 - + fs/quota/quota.c | 42 +++++++++++++++++++++---- + fs/quota/quota_v2.c | 1 + + fs/reiserfs/inode.c | 9 ++---- + fs/reiserfs/super.c | 8 ++--- + fs/reiserfs/xattr.c | 7 +++++ + fs/udf/directory.c | 2 +- + fs/udf/file.c | 7 ++--- + fs/udf/ialloc.c | 14 ++++----- + fs/udf/inode.c | 61 +++++++++++++++++++------------------ + fs/udf/misc.c | 6 ++-- + fs/udf/namei.c | 7 ++--- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 47 ++++++++++++++-------------- + fs/udf/symlink.c | 2 +- + fs/udf/udf_i.h | 6 +--- + include/uapi/linux/dqblk_xfs.h | 16 ++++++++-- + 19 files changed, 173 insertions(+), 140 deletions(-) +Merging ext4/dev (9cb3701fb599 ext4: Fix bs < ps issue reported with dioread_nolock mount opt) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 7 +- + fs/ext4/block_validity.c | 10 +- + fs/ext4/ext4.h | 32 ++++-- + fs/ext4/extents.c | 6 +- + fs/ext4/file.c | 2 +- + fs/ext4/fsmap.c | 11 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 5 +- + fs/ext4/indirect.c | 13 +-- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 138 +++++++++++++++++-------- + fs/ext4/mballoc.c | 51 ++++----- + fs/ext4/mmp.c | 10 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 20 ++-- + fs/ext4/resize.c | 14 +-- + fs/ext4/super.c | 263 ++++++++++++++++++++++++++++++++++++++++------- + fs/jbd2/commit.c | 62 +++++------ + fs/jbd2/journal.c | 2 + + fs/jbd2/recovery.c | 76 +++++++++++--- + fs/ocfs2/journal.c | 4 + + include/linux/jbd2.h | 33 +++++- + 22 files changed, 544 insertions(+), 221 deletions(-) +Merging f2fs/dev (788e96d1d399 f2fs: code cleanup by removing unnecessary check) +$ git merge f2fs/dev +Auto-merging include/linux/fs.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + Documentation/filesystems/f2fs.rst | 82 ++++- + fs/f2fs/acl.c | 6 +- + fs/f2fs/checkpoint.c | 17 +- + fs/f2fs/compress.c | 242 +++++++++++---- + fs/f2fs/data.c | 119 +++++++- + fs/f2fs/debug.c | 18 +- + fs/f2fs/dir.c | 109 ++----- + fs/f2fs/extent_cache.c | 37 ++- + fs/f2fs/f2fs.h | 118 +++++--- + fs/f2fs/file.c | 88 +++--- + fs/f2fs/gc.c | 413 +++++++++++++++++++++++-- + fs/f2fs/gc.h | 69 ++++- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 21 +- + fs/f2fs/namei.c | 2 +- + fs/f2fs/node.c | 7 +- + fs/f2fs/segment.c | 522 ++++++++++++++++++++++++++------ + fs/f2fs/segment.h | 71 +++-- + fs/f2fs/super.c | 168 +++++++--- + fs/f2fs/sysfs.c | 22 +- + fs/f2fs/xattr.c | 8 +- + fs/libfs.c | 87 ++++++ + fs/unicode/utf8-core.c | 23 +- + include/linux/f2fs_fs.h | 3 - + include/linux/fs.h | 16 + + include/linux/unicode.h | 3 + + include/trace/events/f2fs.h | 10 +- + 28 files changed, 1795 insertions(+), 493 deletions(-) +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (42d3e2d041f0 virtiofs: calculate number of scatter-gather elements accurately) +$ git merge fuse/for-next +Auto-merging include/linux/dax.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/file.c +CONFLICT (content): Merge conflict in fs/fuse/file.c +Auto-merging fs/dax.c +Auto-merging drivers/dax/super.c +Auto-merging MAINTAINERS +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 29b7cb506283] Merge remote-tracking branch 'fuse/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fuse.rst | 2 +- + MAINTAINERS | 2 +- + drivers/dax/super.c | 3 +- + drivers/virtio/virtio_mmio.c | 31 + + drivers/virtio/virtio_pci_modern.c | 95 +++ + fs/dax.c | 29 +- + fs/fuse/Kconfig | 16 +- + fs/fuse/Makefile | 6 +- + fs/fuse/control.c | 20 +- + fs/fuse/cuse.c | 21 +- + fs/fuse/dax.c | 1365 ++++++++++++++++++++++++++++++++++++ + fs/fuse/dev.c | 189 ++--- + fs/fuse/dir.c | 220 ++++-- + fs/fuse/file.c | 256 ++++--- + fs/fuse/fuse_i.h | 185 ++++- + fs/fuse/inode.c | 391 ++++++++--- + fs/fuse/readdir.c | 10 +- + fs/fuse/virtio_fs.c | 378 ++++++++-- + fs/fuse/xattr.c | 34 +- + include/linux/dax.h | 6 + + include/linux/virtio_config.h | 17 + + include/uapi/linux/fuse.h | 50 +- + include/uapi/linux/virtio_fs.h | 3 + + include/uapi/linux/virtio_mmio.h | 11 + + include/uapi/linux/virtio_pci.h | 11 +- + 25 files changed, 2854 insertions(+), 497 deletions(-) + create mode 100644 fs/fuse/dax.c +$ git am -3 ../mmotm/broken-out/fs-fuse-virtio_fsc-fix-for-mm-memremap_pages-convert-to-struct-range.patch +Applying: fs/fuse/virtio_fs.c: fix for "mm/memremap_pages: convert to 'struct range'" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/fuse/virtio_fs.c +$ git add -A . +$ git commit -v -a --amend +[master fd686799c298] Merge remote-tracking branch 'fuse/for-next' into master + Date: Thu Oct 15 11:58:56 2020 +1100 +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (bbf5c979011a Linux 5.9) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (a2d24bcb97dc nfs: add missing "posix" local_lock constant table definition) +$ git merge nfs-anna/linux-next +Auto-merging include/linux/nfs_xdr.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/fs_context.c +Merge made by the 'recursive' strategy. + fs/lockd/mon.c | 2 +- + fs/nfs/fs_context.c | 1 + + fs/nfs/namespace.c | 12 +- + fs/nfs/nfs42xattr.c | 5 +- + fs/nfs/nfs42xdr.c | 167 ++++++++++++++++++++++ + fs/nfs/nfs4_fs.h | 8 ++ + fs/nfs/nfs4client.c | 2 + + fs/nfs/nfs4file.c | 3 +- + fs/nfs/nfs4proc.c | 263 +++++++++++++++++++++++----------- + fs/nfs/nfs4trace.h | 1 + + fs/nfs/nfs4xdr.c | 7 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 2 +- + include/linux/nfs4.h | 2 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 8 +- + include/linux/sunrpc/bc_xprt.h | 2 +- + include/linux/sunrpc/cache.h | 3 +- + include/linux/sunrpc/msg_prot.h | 2 +- + include/linux/sunrpc/xdr.h | 3 + + include/trace/events/rpcrdma.h | 63 --------- + include/trace/events/sunrpc.h | 286 ++++++++++++++++++++++++++++++++----- + net/sunrpc/backchannel_rqst.c | 2 +- + net/sunrpc/clnt.c | 78 ++-------- + net/sunrpc/rpcb_clnt.c | 129 ++++------------- + net/sunrpc/sched.c | 52 +------ + net/sunrpc/sunrpc.h | 2 +- + net/sunrpc/xdr.c | 305 +++++++++++++++++++++++++++++++++++----- + net/sunrpc/xprt.c | 24 ++-- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + net/sunrpc/xprtrdma/transport.c | 7 - + net/sunrpc/xprtsock.c | 5 +- + 32 files changed, 963 insertions(+), 488 deletions(-) +Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (13a9a9d74d4d SUNRPC: Fix svc_flush_dcache()) +$ git merge cel/cel-next +Already up to date. +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (8f6ee74c2786 ovl: rearrange ovl_can_list()) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.rst | 19 ++++++ + fs/overlayfs/copy_up.c | 59 ++++++++++++---- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/export.c | 2 +- + fs/overlayfs/file.c | 10 ++- + fs/overlayfs/inode.c | 32 +++++---- + fs/overlayfs/namei.c | 57 ++++++++-------- + fs/overlayfs/overlayfs.h | 89 +++++++++++++++--------- + fs/overlayfs/ovl_entry.h | 6 ++ + fs/overlayfs/readdir.c | 38 +++++++++-- + fs/overlayfs/super.c | 117 +++++++++++++++++++++++++++----- + fs/overlayfs/util.c | 96 +++++++++++++------------- + 12 files changed, 368 insertions(+), 159 deletions(-) +Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) +$ git merge ubifs/next +Auto-merging fs/ubifs/tnc.c +Auto-merging fs/ubifs/super.c +Merge made by the 'recursive' strategy. + fs/ubifs/auth.c | 2 +- + fs/ubifs/gc.c | 4 ---- + fs/ubifs/replay.c | 2 -- + fs/ubifs/super.c | 44 ++++++++++++++++++++++++++++++++------------ + fs/ubifs/tnc.c | 3 +-- + 5 files changed, 34 insertions(+), 21 deletions(-) +Merging v9fs/9p-next (7ca1db21ef8e net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid) +$ git merge v9fs/9p-next +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + fs/9p/vfs_file.c | 4 ++-- + net/9p/trans_fd.c | 2 +- + net/9p/trans_xen.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging xfs/for-next (7e75d8faa7e6 xfs: fix Kconfig asking about XFS_SUPPORT_V4 when XFS_FS=n) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/xfs.rst | 32 +++++- + fs/xfs/Kconfig | 25 ++++ + fs/xfs/libxfs/xfs_attr_remote.c | 2 - + fs/xfs/libxfs/xfs_bmap.c | 19 ++-- + fs/xfs/libxfs/xfs_da_format.h | 18 +-- + fs/xfs/libxfs/xfs_defer.c | 232 ++++++++++++++++++++++++++++++++++---- + fs/xfs/libxfs/xfs_defer.h | 37 ++++++ + fs/xfs/libxfs/xfs_inode_buf.h | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 27 +++-- + fs/xfs/scrub/dabtree.c | 14 +++ + fs/xfs/xfs_bmap_item.c | 132 ++++++++++++---------- + fs/xfs/xfs_bmap_util.c | 17 +-- + fs/xfs/xfs_buf_item_recover.c | 2 + + fs/xfs/xfs_dquot.c | 4 +- + fs/xfs/xfs_extfree_item.c | 44 ++++++-- + fs/xfs/xfs_file.c | 10 +- + fs/xfs/xfs_filestream.c | 34 +----- + fs/xfs/xfs_fsmap.c | 48 ++++---- + fs/xfs/xfs_fsmap.h | 6 +- + fs/xfs/xfs_inode.c | 136 +++++++++++++--------- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_ioctl.c | 144 +++++++++++++++-------- + fs/xfs/xfs_iops.c | 4 +- + fs/xfs/xfs_linux.h | 1 - + fs/xfs/xfs_log.c | 44 +++++--- + fs/xfs/xfs_log.h | 2 + + fs/xfs/xfs_log_recover.c | 221 ++++++++++++++++++------------------ + fs/xfs/xfs_qm.c | 16 +-- + fs/xfs/xfs_refcount_item.c | 51 +++++---- + fs/xfs/xfs_rmap_item.c | 42 +++++-- + fs/xfs/xfs_rtalloc.c | 31 ++++- + fs/xfs/xfs_stats.c | 4 + + fs/xfs/xfs_stats.h | 1 + + fs/xfs/xfs_super.c | 44 +++++--- + fs/xfs/xfs_sysctl.c | 36 +++++- + fs/xfs/xfs_trace.h | 1 + + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans.h | 33 +++++- + fs/xfs/xfs_trans_dquot.c | 43 +++---- + 39 files changed, 1041 insertions(+), 521 deletions(-) +Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) +$ git merge zonefs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/zonefs.rst | 15 +++ + fs/zonefs/super.c | 221 ++++++++++++++++++++++++++++++++--- + fs/zonefs/zonefs.h | 10 ++ + 3 files changed, 233 insertions(+), 13 deletions(-) +Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (1ad5f100e3ba locks: Remove extra "0x" in tracepoint format specifier) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (60fb9d4572fa Merge branches 'work.misc', 'work.sparc', 'base.set_fs', 'work.csum_and_copy', 'work.quota-compat', 'compat.mount' and 'work.iov_iter', remote-tracking branch 'vfs/work.epoll' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/udf/super.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/exfat/super.c +Auto-merging fs/erofs/super.c +Auto-merging fs/ceph/super.c +Auto-merging fs/affs/super.c +Auto-merging fs/9p/vfs_super.c +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/processor_32.h | 6 +- + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 12 -- + arch/sparc/kernel/setup_32.c | 3 - + arch/sparc/kernel/setup_64.c | 4 - + arch/sparc/kernel/unaligned_32.c | 96 +-------- + fs/9p/vfs_super.c | 3 +- + fs/adfs/super.c | 3 +- + fs/affs/super.c | 3 +- + fs/befs/linuxvfs.c | 3 +- + fs/bfs/inode.c | 3 +- + fs/ceph/super.c | 3 +- + fs/cramfs/inode.c | 3 +- + fs/efs/super.c | 3 +- + fs/erofs/super.c | 3 +- + fs/exfat/super.c | 3 +- + fs/ext2/super.c | 3 +- + fs/ext4/super.c | 3 +- + fs/f2fs/super.c | 3 +- + fs/fat/inode.c | 3 +- + fs/hfs/super.c | 3 +- + fs/hfsplus/super.c | 3 +- + fs/hpfs/super.c | 3 +- + fs/isofs/inode.c | 3 +- + fs/minix/inode.c | 3 +- + fs/namei.c | 3 +- + fs/namespace.c | 2 + + fs/nilfs2/super.c | 3 +- + fs/ntfs/super.c | 3 +- + fs/omfs/inode.c | 6 +- + fs/proc_namespace.c | 1 + + fs/qnx4/inode.c | 3 +- + fs/qnx6/inode.c | 3 +- + fs/romfs/super.c | 3 +- + fs/squashfs/super.c | 3 +- + fs/stat.c | 70 +++---- + fs/statfs.c | 2 + + fs/sysv/inode.c | 3 +- + fs/udf/super.c | 3 +- + fs/ufs/super.c | 3 +- + fs/xfs/xfs_super.c | 3 +- + fs/zonefs/super.c | 3 +- + include/linux/fcntl.h | 2 +- + include/linux/fs.h | 22 +-- + include/linux/mount.h | 3 +- + include/linux/stat.h | 2 - + include/linux/statfs.h | 6 + + include/uapi/linux/mount.h | 1 + + tools/testing/selftests/mount/.gitignore | 1 + + tools/testing/selftests/mount/Makefile | 4 +- + tools/testing/selftests/mount/nosymfollow-test.c | 218 +++++++++++++++++++++ + tools/testing/selftests/mount/run_nosymfollow.sh | 4 + + .../{run_tests.sh => run_unprivileged_remount.sh} | 0 + 55 files changed, 313 insertions(+), 250 deletions(-) + create mode 100644 tools/testing/selftests/mount/nosymfollow-test.c + create mode 100755 tools/testing/selftests/mount/run_nosymfollow.sh + rename tools/testing/selftests/mount/{run_tests.sh => run_unprivileged_remount.sh} (100%) +Merging printk/for-next (ece33d6abfbc Merge branch 'for-5.10' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (ec8d6eaa6486 Merge branch 'remotes/lorenzo/pci/xilinx') +$ git merge pci/next +Auto-merging drivers/staging/media/atomisp/pci/atomisp_v4l2.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/pci/hotplug/shpchp_ctrl.c +Auto-merging drivers/pci/hotplug/pciehp_ctrl.c +Auto-merging drivers/pci/controller/vmd.c +CONFLICT (content): Merge conflict in drivers/pci/controller/vmd.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/pci/controller/dwc/pci-imx6.c +CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/pci-imx6.c +Auto-merging drivers/pci/controller/Kconfig +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/net/ethernet/marvell/sky2.c +Auto-merging arch/x86/kernel/apic/msi.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apic/msi.c +Resolved 'arch/x86/kernel/apic/msi.c' using previous resolution. +Resolved 'drivers/pci/controller/dwc/pci-imx6.c' using previous resolution. +Resolved 'drivers/pci/controller/vmd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b51549f5899e] Merge remote-tracking branch 'pci/next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 56 ++- + .../devicetree/bindings/pci/layerscape-pci.txt | 2 + + .../devicetree/bindings/pci/rcar-pci-ep.yaml | 8 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 3 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 20 +- + .../devicetree/bindings/pci/uniphier-pcie.txt | 1 + + Documentation/power/pci.rst | 2 +- + arch/arm/include/asm/mach/pci.h | 7 - + arch/arm/kernel/bios32.c | 16 +- + arch/sparc/include/asm/io_32.h | 17 +- + arch/x86/pci/fixup.c | 2 +- + arch/x86/pci/intel_mid_pci.c | 3 +- + drivers/acpi/apei/ghes.c | 63 +++ + drivers/acpi/pci_mcfg.c | 22 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + drivers/misc/pci_endpoint_test.c | 17 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/pci/Kconfig | 62 +++ + drivers/pci/controller/Kconfig | 12 +- + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/pcie-cadence-ep.c | 1 - + drivers/pci/controller/cadence/pcie-cadence-host.c | 8 +- + drivers/pci/controller/dwc/Kconfig | 3 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 46 +-- + drivers/pci/controller/dwc/pci-exynos.c | 45 ++- + drivers/pci/controller/dwc/pci-imx6.c | 87 ++-- + drivers/pci/controller/dwc/pci-keystone.c | 146 ++----- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 100 +++-- + drivers/pci/controller/dwc/pci-meson.c | 164 ++------ + drivers/pci/controller/dwc/pcie-al.c | 70 +--- + drivers/pci/controller/dwc/pcie-artpec6.c | 48 +-- + drivers/pci/controller/dwc/pcie-designware-ep.c | 257 +++++++++--- + drivers/pci/controller/dwc/pcie-designware-host.c | 351 ++++++---------- + drivers/pci/controller/dwc/pcie-designware-plat.c | 4 +- + drivers/pci/controller/dwc/pcie-designware.c | 170 ++++---- + drivers/pci/controller/dwc/pcie-designware.h | 110 ++--- + drivers/pci/controller/dwc/pcie-histb.c | 45 ++- + drivers/pci/controller/dwc/pcie-intel-gw.c | 65 +-- + drivers/pci/controller/dwc/pcie-kirin.c | 49 ++- + drivers/pci/controller/dwc/pcie-qcom.c | 46 +-- + drivers/pci/controller/dwc/pcie-spear13xx.c | 39 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 140 ++----- + drivers/pci/controller/dwc/pcie-uniphier.c | 3 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 7 +- + drivers/pci/controller/pci-aardvark.c | 108 +++-- + drivers/pci/controller/pci-hyperv.c | 50 ++- + drivers/pci/controller/pci-loongson.c | 7 +- + drivers/pci/controller/pci-mvebu.c | 3 - + drivers/pci/controller/pci-tegra.c | 51 +-- + drivers/pci/controller/pci-xgene-msi.c | 4 +- + drivers/pci/controller/pcie-brcmstb.c | 444 ++++++++++++++++++--- + drivers/pci/controller/pcie-hisi-error.c | 327 +++++++++++++++ + drivers/pci/controller/pcie-iproc-bcma.c | 13 +- + drivers/pci/controller/pcie-iproc-msi.c | 13 +- + drivers/pci/controller/pcie-iproc-platform.c | 2 +- + drivers/pci/controller/pcie-xilinx-cpm.c | 4 - + drivers/pci/controller/vmd.c | 347 ++++++++++------ + drivers/pci/ecam.c | 10 + + drivers/pci/hotplug/pciehp_ctrl.c | 4 +- + drivers/pci/hotplug/pciehp_hpc.c | 15 +- + drivers/pci/hotplug/rpadlpar_core.c | 8 +- + drivers/pci/hotplug/shpchp_ctrl.c | 1 - + drivers/pci/p2pdma.c | 10 +- + drivers/pci/pci-acpi.c | 6 +- + drivers/pci/pci-bridge-emul.c | 4 + + drivers/pci/pci-driver.c | 26 -- + drivers/pci/pci-pf-stub.c | 14 +- + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 54 +-- + drivers/pci/pci.h | 9 +- + drivers/pci/pcie/bw_notification.c | 3 + + drivers/pci/pcie/dpc.c | 7 +- + drivers/pci/probe.c | 14 +- + drivers/pci/quirks.c | 78 ++-- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 14 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 14 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- + include/acpi/ghes.h | 18 + + include/asm-generic/io.h | 39 +- + include/linux/pci-ecam.h | 1 + + include/linux/pci-ep-cfs.h | 4 +- + include/linux/pci.h | 7 +- + include/uapi/linux/pci_regs.h | 3 +- + 83 files changed, 2430 insertions(+), 1637 deletions(-) + create mode 100644 drivers/pci/controller/pcie-hisi-error.c +Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) +$ git merge pstore/for-next/pstore +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Resolved '.mailmap' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e208e46417b] Merge remote-tracking branch 'pstore/for-next/pstore' into master +$ git diff -M --stat --summary HEAD^.. +Merging hid/for-next (f5795950202d Merge branch 'for-5.10/vivaldi' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 9 +++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-alps.c | 2 +- + drivers/hid/hid-apple.c | 2 + + drivers/hid/hid-core.c | 15 +++- + drivers/hid/hid-cp2112.c | 19 ++--- + drivers/hid/hid-debug.c | 10 +-- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 4 +- + drivers/hid/hid-ite.c | 4 + + drivers/hid/hid-multitouch.c | 12 +++ + drivers/hid/hid-roccat-kone.c | 23 ++++-- + drivers/hid/hid-vivaldi.c | 144 ++++++++++++++++++++++++++++++++++ + drivers/hid/hid-wiimote-core.c | 10 +-- + drivers/hid/i2c-hid/i2c-hid-core.c | 15 +++- + drivers/hid/intel-ish-hid/ishtp/bus.c | 8 +- + drivers/hid/wacom_wac.c | 4 +- + include/linux/hid.h | 2 + + 18 files changed, 244 insertions(+), 43 deletions(-) + create mode 100644 drivers/hid/hid-vivaldi.c +Merging i2c/i2c/for-next (48f2192f645c Merge branch 'i2c/for-5.10' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 3 + + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 29 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 8 +- + Documentation/devicetree/bindings/i2c/i2c.txt | 5 + + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 12 +- + .../devicetree/bindings/i2c/mellanox,i2c-mlxbf.txt | 42 + + Documentation/i2c/busses/i2c-i801.rst | 1 + + Documentation/i2c/index.rst | 1 + + Documentation/i2c/slave-testunit-backend.rst | 69 + + MAINTAINERS | 6 + + drivers/i2c/Kconfig | 9 +- + drivers/i2c/Makefile | 1 + + drivers/i2c/busses/Kconfig | 20 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- + drivers/i2c/busses/i2c-at91-core.c | 11 +- + drivers/i2c/busses/i2c-bcm2835.c | 8 +- + drivers/i2c/busses/i2c-efm32.c | 12 +- + drivers/i2c/busses/i2c-i801.c | 5 + + drivers/i2c/busses/i2c-imx.c | 76 +- + drivers/i2c/busses/i2c-ismt.c | 12 +- + drivers/i2c/busses/i2c-jz4780.c | 3 +- + drivers/i2c/busses/i2c-mlxbf.c | 2506 ++++++++++++++++++++ + drivers/i2c/busses/i2c-mv64xxx.c | 33 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 3 +- + drivers/i2c/busses/i2c-owl.c | 5 +- + drivers/i2c/busses/i2c-qcom-geni.c | 5 +- + drivers/i2c/busses/i2c-rcar.c | 65 +- + drivers/i2c/busses/i2c-rk3x.c | 19 +- + drivers/i2c/busses/i2c-sh_mobile.c | 86 +- + drivers/i2c/busses/i2c-stm32.c | 12 +- + drivers/i2c/busses/i2c-stm32f4.c | 6 +- + drivers/i2c/busses/i2c-stm32f7.c | 145 +- + drivers/i2c/busses/i2c-tegra.c | 1420 ++++++----- + drivers/i2c/busses/i2c-xiic.c | 62 +- + drivers/i2c/i2c-slave-testunit.c | 175 ++ + drivers/i2c/i2c-smbus.c | 107 + + drivers/i2c/muxes/i2c-mux-gpmux.c | 16 +- + drivers/i2c/muxes/i2c-mux-reg.c | 10 +- + drivers/misc/eeprom/at24.c | 71 +- + drivers/misc/eeprom/eeprom.c | 2 +- + drivers/soc/qcom/qcom-geni-se.c | 4 +- + include/linux/i2c-smbus.h | 12 + + include/linux/i2c.h | 2 +- + 44 files changed, 4144 insertions(+), 958 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.txt + create mode 100644 Documentation/i2c/slave-testunit-backend.rst + create mode 100644 drivers/i2c/busses/i2c-mlxbf.c + create mode 100644 drivers/i2c/i2c-slave-testunit.c +Merging i3c/i3c/next (abea14bfdebb i3c: master: Fix error return in cdns_i3c_master_probe()) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 144 ++++++++++++++++++++++------------- + drivers/i3c/master/i3c-master-cdns.c | 4 +- + 2 files changed, 94 insertions(+), 54 deletions(-) +Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) +$ git merge dmi/dmi-for-next +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (9b20aec24b8a hwmon: (pmbus/max20730) adjust the vout reading given voltage divider) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (4fb220da0dd0 gpiolib: Update indentation in driver.rst for code excerpts) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (c386e0797d26 media: dvb-frontends/drxk_hard.c: fix uninitialized variable warning) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (a2c13eb834dd PM / devfreq: remove a duplicated kernel-doc markup) +$ git merge v4l-dvb-next/master +Auto-merging mm/memblock.c +Auto-merging include/net/cfg80211.h +Auto-merging include/linux/devfreq.h +Auto-merging include/kunit/test.h +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Removing Documentation/driver-api/sound.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/cpufreq.rst | 11 +- + Documentation/admin-guide/pstore-blk.rst | 10 +- + Documentation/block/blk-mq.rst | 12 +- + Documentation/block/inline-encryption.rst | 8 +- + Documentation/conf.py | 65 ++++- + Documentation/core-api/genericirq.rst | 2 + + Documentation/core-api/kernel-api.rst | 6 - + Documentation/core-api/workqueue.rst | 2 + + Documentation/dev-tools/kgdb.rst | 6 +- + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + .../devicetree/bindings/mailbox/omap-mailbox.txt | 2 +- + .../devicetree/bindings/media/i2c/tvp5150.txt | 2 +- + .../bindings/pwm/google,cros-ec-pwm.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 2 +- + .../bindings/sound/google,cros-ec-codec.yaml | 2 +- + Documentation/doc-guide/kernel-doc.rst | 8 + + Documentation/driver-api/basics.rst | 19 +- + Documentation/driver-api/device_link.rst | 13 +- + Documentation/driver-api/fpga/fpga-bridge.rst | 4 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 6 +- + Documentation/driver-api/fpga/fpga-programming.rst | 2 +- + Documentation/driver-api/fpga/fpga-region.rst | 6 +- + Documentation/driver-api/iio/buffers.rst | 2 +- + Documentation/driver-api/iio/core.rst | 6 +- + Documentation/driver-api/iio/hw-consumer.rst | 2 +- + Documentation/driver-api/iio/triggered-buffers.rst | 2 +- + Documentation/driver-api/iio/triggers.rst | 4 +- + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/infrastructure.rst | 4 +- + Documentation/driver-api/libata.rst | 2 +- + Documentation/driver-api/media/cec-core.rst | 2 +- + Documentation/driver-api/media/dtv-frontend.rst | 4 +- + Documentation/driver-api/media/mc-core.rst | 24 +- + Documentation/driver-api/media/v4l2-controls.rst | 2 +- + Documentation/driver-api/media/v4l2-dev.rst | 8 +- + Documentation/driver-api/media/v4l2-device.rst | 6 +- + Documentation/driver-api/media/v4l2-event.rst | 10 +- + Documentation/driver-api/media/v4l2-fh.rst | 16 +- + Documentation/driver-api/media/v4l2-subdev.rst | 2 +- + Documentation/driver-api/mei/mei.rst | 2 +- + Documentation/driver-api/pm/cpuidle.rst | 65 ++--- + Documentation/driver-api/pm/devices.rst | 26 +- + Documentation/driver-api/regulator.rst | 4 +- + Documentation/driver-api/sound.rst | 54 ---- + Documentation/driver-api/target.rst | 12 - + Documentation/driver-api/usb/URB.rst | 2 +- + Documentation/driver-api/usb/gadget.rst | 10 +- + Documentation/driver-api/usb/hotplug.rst | 2 +- + Documentation/driver-api/usb/typec_bus.rst | 8 +- + Documentation/filesystems/fscrypt.rst | 74 +++-- + Documentation/filesystems/fsverity.rst | 2 +- + Documentation/gpu/amdgpu.rst | 7 - + Documentation/gpu/i915.rst | 29 +- + Documentation/networking/ieee802154.rst | 18 +- + Documentation/powerpc/syscall64-abi.rst | 32 +-- + Documentation/sound/designs/tracepoints.rst | 22 +- + Documentation/sound/kernel-api/alsa-driver-api.rst | 1 + + .../sound/kernel-api/writing-an-alsa-driver.rst | 110 ++++---- + Documentation/sphinx/automarkup.py | 69 ++++- + Documentation/sphinx/cdomain.py | 93 ++++++- + Documentation/sphinx/kerneldoc.py | 15 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/trace/ftrace-uses.rst | 12 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 2 +- + .../translations/it_IT/kernel-hacking/locking.rst | 2 + + Documentation/translations/zh_CN/arm64/amu.rst | 4 +- + .../userspace-api/media/cec/cec-func-close.rst | 10 +- + .../userspace-api/media/cec/cec-func-ioctl.rst | 11 +- + .../userspace-api/media/cec/cec-func-open.rst | 10 +- + .../userspace-api/media/cec/cec-func-poll.rst | 14 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 10 +- + .../media/cec/cec-ioc-adap-g-conn-info.rst | 11 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 20 +- + .../media/cec/cec-ioc-adap-g-phys-addr.rst | 15 +- + .../userspace-api/media/cec/cec-ioc-dqevent.rst | 15 +- + .../userspace-api/media/cec/cec-ioc-g-mode.rst | 16 +- + .../userspace-api/media/cec/cec-ioc-receive.rst | 18 +- + .../media/dvb/audio-bilingual-channel-select.rst | 7 +- + .../media/dvb/audio-channel-select.rst | 8 +- + .../userspace-api/media/dvb/audio-clear-buffer.rst | 8 +- + .../userspace-api/media/dvb/audio-continue.rst | 7 +- + .../userspace-api/media/dvb/audio-fclose.rst | 7 +- + .../userspace-api/media/dvb/audio-fopen.rst | 7 +- + .../userspace-api/media/dvb/audio-fwrite.rst | 7 +- + .../media/dvb/audio-get-capabilities.rst | 8 +- + .../userspace-api/media/dvb/audio-get-status.rst | 8 +- + .../userspace-api/media/dvb/audio-pause.rst | 9 +- + .../userspace-api/media/dvb/audio-play.rst | 7 +- + .../media/dvb/audio-select-source.rst | 8 +- + .../userspace-api/media/dvb/audio-set-av-sync.rst | 8 +- + .../media/dvb/audio-set-bypass-mode.rst | 9 +- + .../userspace-api/media/dvb/audio-set-id.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mixer.rst | 9 +- + .../userspace-api/media/dvb/audio-set-mute.rst | 8 +- + .../media/dvb/audio-set-streamtype.rst | 10 +- + .../userspace-api/media/dvb/audio-stop.rst | 9 +- + .../userspace-api/media/dvb/ca-fclose.rst | 7 +- + Documentation/userspace-api/media/dvb/ca-fopen.rst | 7 +- + .../userspace-api/media/dvb/ca-get-cap.rst | 8 +- + .../userspace-api/media/dvb/ca-get-descr-info.rst | 9 +- + .../userspace-api/media/dvb/ca-get-msg.rst | 10 +- + .../userspace-api/media/dvb/ca-get-slot-info.rst | 9 +- + Documentation/userspace-api/media/dvb/ca-reset.rst | 9 +- + .../userspace-api/media/dvb/ca-send-msg.rst | 9 +- + .../userspace-api/media/dvb/ca-set-descr.rst | 8 +- + .../userspace-api/media/dvb/dmx-add-pid.rst | 10 +- + .../userspace-api/media/dvb/dmx-expbuf.rst | 11 +- + .../userspace-api/media/dvb/dmx-fclose.rst | 9 +- + .../userspace-api/media/dvb/dmx-fopen.rst | 5 +- + .../userspace-api/media/dvb/dmx-fread.rst | 7 +- + .../userspace-api/media/dvb/dmx-fwrite.rst | 6 +- + .../userspace-api/media/dvb/dmx-get-pes-pids.rst | 12 +- + .../userspace-api/media/dvb/dmx-get-stc.rst | 12 +- + Documentation/userspace-api/media/dvb/dmx-mmap.rst | 15 +- + .../userspace-api/media/dvb/dmx-munmap.rst | 14 +- + Documentation/userspace-api/media/dvb/dmx-qbuf.rst | 17 +- + .../userspace-api/media/dvb/dmx-querybuf.rst | 9 +- + .../userspace-api/media/dvb/dmx-remove-pid.rst | 10 +- + .../userspace-api/media/dvb/dmx-reqbufs.rst | 9 +- + .../media/dvb/dmx-set-buffer-size.rst | 10 +- + .../userspace-api/media/dvb/dmx-set-filter.rst | 12 +- + .../userspace-api/media/dvb/dmx-set-pes-filter.rst | 13 +- + .../userspace-api/media/dvb/dmx-start.rst | 11 +- + Documentation/userspace-api/media/dvb/dmx-stop.rst | 9 +- + .../media/dvb/fe-diseqc-recv-slave-reply.rst | 9 +- + .../media/dvb/fe-diseqc-reset-overload.rst | 9 +- + .../media/dvb/fe-diseqc-send-burst.rst | 10 +- + .../media/dvb/fe-diseqc-send-master-cmd.rst | 9 +- + .../media/dvb/fe-dishnetwork-send-legacy-cmd.rst | 10 +- + .../media/dvb/fe-enable-high-lnb-voltage.rst | 10 +- + .../userspace-api/media/dvb/fe-get-event.rst | 12 +- + .../userspace-api/media/dvb/fe-get-frontend.rst | 12 +- + .../userspace-api/media/dvb/fe-get-info.rst | 11 +- + .../userspace-api/media/dvb/fe-get-property.rst | 15 +- + .../userspace-api/media/dvb/fe-read-ber.rst | 9 +- + .../media/dvb/fe-read-signal-strength.rst | 9 +- + .../userspace-api/media/dvb/fe-read-snr.rst | 9 +- + .../userspace-api/media/dvb/fe-read-status.rst | 11 +- + .../media/dvb/fe-read-uncorrected-blocks.rst | 9 +- + .../media/dvb/fe-set-frontend-tune-mode.rst | 10 +- + .../userspace-api/media/dvb/fe-set-frontend.rst | 11 +- + .../userspace-api/media/dvb/fe-set-tone.rst | 10 +- + .../userspace-api/media/dvb/fe-set-voltage.rst | 10 +- + .../userspace-api/media/dvb/frontend_f_close.rst | 8 +- + .../userspace-api/media/dvb/frontend_f_open.rst | 10 +- + .../userspace-api/media/dvb/net-add-if.rst | 9 +- + .../userspace-api/media/dvb/net-get-if.rst | 10 +- + .../userspace-api/media/dvb/net-remove-if.rst | 10 +- + .../userspace-api/media/dvb/video-clear-buffer.rst | 8 +- + .../userspace-api/media/dvb/video-command.rst | 10 +- + .../userspace-api/media/dvb/video-continue.rst | 8 +- + .../userspace-api/media/dvb/video-fast-forward.rst | 10 +- + .../userspace-api/media/dvb/video-fclose.rst | 6 +- + .../userspace-api/media/dvb/video-fopen.rst | 6 +- + .../userspace-api/media/dvb/video-freeze.rst | 8 +- + .../userspace-api/media/dvb/video-fwrite.rst | 6 +- + .../media/dvb/video-get-capabilities.rst | 8 +- + .../userspace-api/media/dvb/video-get-event.rst | 8 +- + .../media/dvb/video-get-frame-count.rst | 8 +- + .../userspace-api/media/dvb/video-get-pts.rst | 8 +- + .../userspace-api/media/dvb/video-get-size.rst | 8 +- + .../userspace-api/media/dvb/video-get-status.rst | 7 +- + .../userspace-api/media/dvb/video-play.rst | 8 +- + .../media/dvb/video-select-source.rst | 7 +- + .../userspace-api/media/dvb/video-set-blank.rst | 8 +- + .../media/dvb/video-set-display-format.rst | 8 +- + .../userspace-api/media/dvb/video-set-format.rst | 9 +- + .../media/dvb/video-set-streamtype.rst | 8 +- + .../userspace-api/media/dvb/video-slowmotion.rst | 10 +- + .../userspace-api/media/dvb/video-stillpicture.rst | 8 +- + .../userspace-api/media/dvb/video-stop.rst | 8 +- + .../userspace-api/media/dvb/video-try-command.rst | 8 +- + .../media/mediactl/media-func-close.rst | 10 +- + .../media/mediactl/media-func-ioctl.rst | 10 +- + .../media/mediactl/media-func-open.rst | 10 +- + .../media/mediactl/media-ioc-device-info.rst | 13 +- + .../media/mediactl/media-ioc-enum-entities.rst | 11 +- + .../media/mediactl/media-ioc-enum-links.rst | 13 +- + .../media/mediactl/media-ioc-g-topology.rst | 14 +- + .../media/mediactl/media-ioc-request-alloc.rst | 11 +- + .../media/mediactl/media-ioc-setup-link.rst | 10 +- + .../media/mediactl/media-request-ioc-queue.rst | 7 +- + .../media/mediactl/media-request-ioc-reinit.rst | 8 +- + .../userspace-api/media/mediactl/request-api.rst | 5 +- + .../media/mediactl/request-func-close.rst | 8 +- + .../media/mediactl/request-func-ioctl.rst | 8 +- + .../media/mediactl/request-func-poll.rst | 12 +- + .../userspace-api/media/rc/lirc-get-features.rst | 9 +- + .../userspace-api/media/rc/lirc-get-rec-mode.rst | 12 +- + .../media/rc/lirc-get-rec-resolution.rst | 8 +- + .../userspace-api/media/rc/lirc-get-send-mode.rst | 14 +- + .../userspace-api/media/rc/lirc-get-timeout.rst | 13 +- + Documentation/userspace-api/media/rc/lirc-read.rst | 10 +- + .../media/rc/lirc-set-measure-carrier-mode.rst | 8 +- + .../media/rc/lirc-set-rec-carrier-range.rst | 6 +- + .../media/rc/lirc-set-rec-carrier.rst | 8 +- + .../media/rc/lirc-set-rec-timeout-reports.rst | 8 +- + .../media/rc/lirc-set-rec-timeout.rst | 13 +- + .../media/rc/lirc-set-send-carrier.rst | 8 +- + .../media/rc/lirc-set-send-duty-cycle.rst | 8 +- + .../media/rc/lirc-set-transmitter-mask.rst | 8 +- + .../media/rc/lirc-set-wideband-receiver.rst | 8 +- + .../userspace-api/media/rc/lirc-write.rst | 7 +- + Documentation/userspace-api/media/v4l/buffer.rst | 28 +- + .../userspace-api/media/v4l/dev-capture.rst | 7 +- + .../userspace-api/media/v4l/dev-output.rst | 7 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 19 +- + Documentation/userspace-api/media/v4l/dev-rds.rst | 12 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 31 +-- + Documentation/userspace-api/media/v4l/diff-v4l.rst | 39 +-- + Documentation/userspace-api/media/v4l/dmabuf.rst | 8 +- + Documentation/userspace-api/media/v4l/format.rst | 7 +- + .../userspace-api/media/v4l/func-close.rst | 8 +- + .../userspace-api/media/v4l/func-ioctl.rst | 10 +- + .../userspace-api/media/v4l/func-mmap.rst | 18 +- + .../userspace-api/media/v4l/func-munmap.rst | 14 +- + .../userspace-api/media/v4l/func-open.rst | 14 +- + .../userspace-api/media/v4l/func-poll.rst | 40 ++- + .../userspace-api/media/v4l/func-read.rst | 39 ++- + .../userspace-api/media/v4l/func-select.rst | 42 ++- + .../userspace-api/media/v4l/func-write.rst | 13 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 70 +---- + Documentation/userspace-api/media/v4l/io.rst | 6 +- + .../media/v4l/libv4l-introduction.rst | 30 +- + Documentation/userspace-api/media/v4l/mmap.rst | 26 +- + Documentation/userspace-api/media/v4l/open.rst | 15 +- + Documentation/userspace-api/media/v4l/rw.rst | 18 +- + .../userspace-api/media/v4l/streaming-par.rst | 5 +- + Documentation/userspace-api/media/v4l/userp.rst | 11 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 11 +- + .../userspace-api/media/v4l/vidioc-cropcap.rst | 11 +- + .../media/v4l/vidioc-dbg-g-chip-info.rst | 13 +- + .../media/v4l/vidioc-dbg-g-register.rst | 18 +- + .../userspace-api/media/v4l/vidioc-decoder-cmd.rst | 19 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 19 +- + .../media/v4l/vidioc-dv-timings-cap.rst | 17 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 25 +- + .../media/v4l/vidioc-enum-dv-timings.rst | 16 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 12 +- + .../media/v4l/vidioc-enum-frameintervals.rst | 15 +- + .../media/v4l/vidioc-enum-framesizes.rst | 16 +- + .../media/v4l/vidioc-enum-freq-bands.rst | 12 +- + .../userspace-api/media/v4l/vidioc-enumaudio.rst | 10 +- + .../media/v4l/vidioc-enumaudioout.rst | 10 +- + .../userspace-api/media/v4l/vidioc-enuminput.rst | 14 +- + .../userspace-api/media/v4l/vidioc-enumoutput.rst | 13 +- + .../userspace-api/media/v4l/vidioc-enumstd.rst | 23 +- + .../userspace-api/media/v4l/vidioc-expbuf.rst | 14 +- + .../userspace-api/media/v4l/vidioc-g-audio.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-audioout.rst | 16 +- + .../userspace-api/media/v4l/vidioc-g-crop.rst | 16 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 16 +- + .../media/v4l/vidioc-g-dv-timings.rst | 26 +- + .../userspace-api/media/v4l/vidioc-g-edid.rst | 25 +- + .../userspace-api/media/v4l/vidioc-g-enc-index.rst | 13 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 21 +- + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 18 +- + .../userspace-api/media/v4l/vidioc-g-fmt.rst | 22 +- + .../userspace-api/media/v4l/vidioc-g-frequency.rst | 16 +- + .../userspace-api/media/v4l/vidioc-g-input.rst | 15 +- + .../userspace-api/media/v4l/vidioc-g-jpegcomp.rst | 17 +- + .../userspace-api/media/v4l/vidioc-g-modulator.rst | 17 +- + .../userspace-api/media/v4l/vidioc-g-output.rst | 15 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 30 +- + .../userspace-api/media/v4l/vidioc-g-priority.rst | 16 +- + .../userspace-api/media/v4l/vidioc-g-selection.rst | 15 +- + .../media/v4l/vidioc-g-sliced-vbi-cap.rst | 12 +- + .../userspace-api/media/v4l/vidioc-g-std.rst | 24 +- + .../userspace-api/media/v4l/vidioc-g-tuner.rst | 19 +- + .../userspace-api/media/v4l/vidioc-log-status.rst | 10 +- + .../userspace-api/media/v4l/vidioc-overlay.rst | 10 +- + .../userspace-api/media/v4l/vidioc-prepare-buf.rst | 10 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 17 +- + .../media/v4l/vidioc-query-dv-timings.rst | 15 +- + .../userspace-api/media/v4l/vidioc-querybuf.rst | 10 +- + .../userspace-api/media/v4l/vidioc-querycap.rst | 16 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 22 +- + .../userspace-api/media/v4l/vidioc-querystd.rst | 15 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 10 +- + .../media/v4l/vidioc-s-hw-freq-seek.rst | 11 +- + .../userspace-api/media/v4l/vidioc-streamon.rst | 14 +- + .../v4l/vidioc-subdev-enum-frame-interval.rst | 10 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 11 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 10 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 16 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 17 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 16 +- + .../media/v4l/vidioc-subdev-g-selection.rst | 17 +- + .../media/v4l/vidioc-subdev-querycap.rst | 9 +- + .../media/v4l/vidioc-subscribe-event.rst | 17 +- + .../virt/uml/user_mode_linux_howto_v2.rst | 1 + + Documentation/vm/hmm.rst | 2 +- + Documentation/vm/ksm.rst | 2 +- + Documentation/vm/memory-model.rst | 6 +- + MAINTAINERS | 16 +- + block/bio.c | 4 +- + drivers/base/core.c | 7 +- + drivers/gpu/drm/drm_prime.c | 1 + + drivers/infiniband/ulp/srpt/ib_srpt.h | 1 + + drivers/net/appletalk/Kconfig | 2 +- + drivers/net/hamradio/scc.c | 2 +- + include/drm/drm_dp_helper.h | 2 +- + include/drm/drm_edid.h | 7 - + include/kunit/test.h | 14 +- + include/linux/devfreq.h | 7 +- + include/linux/input/sparse-keymap.h | 1 + + include/linux/math64.h | 8 +- + include/linux/usb/typec_altmode.h | 16 ++ + include/net/cfg80211.h | 1 + + kernel/rcu/tree.c | 14 +- + kernel/workqueue.c | 3 + + mm/ksm.c | 2 +- + mm/memblock.c | 8 +- + scripts/kernel-doc | 305 +++++++++++++++------ + 314 files changed, 1918 insertions(+), 2288 deletions(-) + delete mode 100644 Documentation/driver-api/sound.rst +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (91e0225c546b Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (bc9b9c5ab9d8 cpufreq: qcom: Don't add frequencies without an OPP) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging devfreq/devfreq-next (d353d1202b89 PM / devfreq: tegra30: Improve initial hardware resetting) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (a5663c9b1e31 opp: Allow opp-level to be set to 0) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (48b458591749 thermal: core: Adding missing nlmsg_free() in thermal_genl_sampling_temp()) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/thermal/thermal_netlink.c +Merge made by the 'recursive' strategy. + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 6 ++- + .../bindings/thermal/rcar-gen3-thermal.yaml | 1 + + drivers/thermal/Kconfig | 6 +-- + drivers/thermal/cpufreq_cooling.c | 8 +--- + drivers/thermal/cpuidle_cooling.c | 2 +- + drivers/thermal/devfreq_cooling.c | 3 -- + drivers/thermal/gov_power_allocator.c | 6 +-- + drivers/thermal/imx8mm_thermal.c | 10 ++-- + drivers/thermal/imx_thermal.c | 22 +++------ + .../intel/int340x_thermal/int3400_thermal.c | 51 +++++++++++++++----- + drivers/thermal/rcar_thermal.c | 4 +- + drivers/thermal/st/Kconfig | 2 +- + drivers/thermal/st/stm_thermal.c | 7 +-- + drivers/thermal/sun8i_thermal.c | 16 ++++++- + drivers/thermal/thermal_core.c | 13 ++---- + drivers/thermal/thermal_core.h | 4 +- + drivers/thermal/thermal_netlink.c | 3 +- + drivers/thermal/thermal_sysfs.c | 2 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 54 +++++++++++++++++++++- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 6 +++ + include/linux/idle_inject.h | 2 +- + include/linux/thermal.h | 10 ++-- + 22 files changed, 156 insertions(+), 82 deletions(-) +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (4f2b30fd9b4b fs: dlm: fix race in nodeid2con) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (b51e627158cb swiotlb: Mark max_segment with static keyword) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (1c39c16d64bc Merge branch 'dynamic_sg' into rdma.git for-next) +$ git merge rdma/for-next +Auto-merging include/trace/events/rpcrdma.h +Auto-merging include/linux/overflow.h +Auto-merging drivers/net/ethernet/qlogic/qed/qed_rdma.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cache.c +Auto-merging MAINTAINERS +Auto-merging .clang-format +Merge made by the 'recursive' strategy. + .clang-format | 1 + + Documentation/ABI/stable/sysfs-class-infiniband | 17 - + MAINTAINERS | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 15 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/addr.c | 11 +- + drivers/infiniband/core/cache.c | 72 ++- + drivers/infiniband/core/cm.c | 126 ++-- + drivers/infiniband/core/cm_trace.c | 15 + + drivers/infiniband/core/cm_trace.h | 414 ++++++++++++++ + drivers/infiniband/core/cma.c | 635 +++++++++++---------- + drivers/infiniband/core/cma_configfs.c | 9 +- + drivers/infiniband/core/cma_trace.h | 40 -- + drivers/infiniband/core/core_priv.h | 13 +- + drivers/infiniband/core/counters.c | 15 +- + drivers/infiniband/core/cq.c | 39 +- + drivers/infiniband/core/device.c | 72 +-- + drivers/infiniband/core/rdma_core.c | 34 +- + drivers/infiniband/core/restrack.c | 161 +++--- + drivers/infiniband/core/restrack.h | 10 +- + drivers/infiniband/core/sysfs.c | 15 +- + drivers/infiniband/core/ucma.c | 539 ++++++++--------- + drivers/infiniband/core/umem.c | 139 ++--- + drivers/infiniband/core/umem_odp.c | 291 ++++------ + drivers/infiniband/core/uverbs_cmd.c | 93 ++- + drivers/infiniband/core/uverbs_main.c | 7 +- + drivers/infiniband/core/uverbs_std_types.c | 15 +- + .../infiniband/core/uverbs_std_types_counters.c | 4 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 8 +- + drivers/infiniband/core/uverbs_std_types_device.c | 199 ++++++- + drivers/infiniband/core/uverbs_std_types_wq.c | 2 +- + drivers/infiniband/core/verbs.c | 114 ++-- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 90 +-- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 8 +- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 7 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 11 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 30 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 4 +- + drivers/infiniband/hw/cxgb4/cq.c | 3 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 7 +- + drivers/infiniband/hw/cxgb4/mem.c | 40 +- + drivers/infiniband/hw/cxgb4/provider.c | 11 +- + drivers/infiniband/hw/cxgb4/qp.c | 3 +- + drivers/infiniband/hw/efa/efa.h | 14 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 69 ++- + drivers/infiniband/hw/efa/efa_com_cmd.c | 28 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 18 + + drivers/infiniband/hw/efa/efa_main.c | 4 +- + drivers/infiniband/hw/efa/efa_verbs.c | 258 +++++++-- + drivers/infiniband/hw/hfi1/sdma.c | 22 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 23 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 27 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 74 +-- + drivers/infiniband/hw/hns/hns_roce_hem.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 51 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 4 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 534 ++++++++++++----- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 43 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 81 +-- + drivers/infiniband/hw/hns/hns_roce_pd.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 80 +-- + drivers/infiniband/hw/hns/hns_roce_srq.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw.h | 9 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 10 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 16 +- + drivers/infiniband/hw/i40iw/i40iw_pble.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_type.h | 3 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 63 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 64 ++- + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 3 +- + drivers/infiniband/hw/mlx4/ah.c | 5 - + drivers/infiniband/hw/mlx4/cm.c | 152 ++++- + drivers/infiniband/hw/mlx4/cq.c | 4 +- + drivers/infiniband/hw/mlx4/mad.c | 158 ++--- + drivers/infiniband/hw/mlx4/main.c | 45 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 62 +- + drivers/infiniband/hw/mlx4/mr.c | 35 +- + drivers/infiniband/hw/mlx4/qp.c | 345 +++++------ + drivers/infiniband/hw/mlx4/srq.c | 8 +- + drivers/infiniband/hw/mlx5/ah.c | 9 +- + drivers/infiniband/hw/mlx5/cmd.c | 8 +- + drivers/infiniband/hw/mlx5/cmd.h | 4 +- + drivers/infiniband/hw/mlx5/counters.c | 7 +- + drivers/infiniband/hw/mlx5/cq.c | 16 +- + drivers/infiniband/hw/mlx5/fs.c | 148 ++--- + drivers/infiniband/hw/mlx5/gsi.c | 154 ++--- + drivers/infiniband/hw/mlx5/main.c | 70 ++- + drivers/infiniband/hw/mlx5/mem.c | 4 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 100 +++- + drivers/infiniband/hw/mlx5/mr.c | 189 +++--- + drivers/infiniband/hw/mlx5/odp.c | 56 +- + drivers/infiniband/hw/mlx5/qp.c | 182 +++--- + drivers/infiniband/hw/mlx5/qp.h | 4 +- + drivers/infiniband/hw/mlx5/qpc.c | 5 +- + drivers/infiniband/hw/mlx5/srq.c | 23 +- + drivers/infiniband/hw/mlx5/srq.h | 2 +- + drivers/infiniband/hw/mlx5/srq_cmd.c | 22 +- + drivers/infiniband/hw/mlx5/wr.c | 27 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 39 +- + drivers/infiniband/hw/mthca/mthca_provider.h | 27 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 75 ++- + drivers/infiniband/hw/ocrdma/ocrdma.h | 1 - + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 38 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 6 +- + drivers/infiniband/hw/qedr/main.c | 31 +- + drivers/infiniband/hw/qedr/qedr.h | 33 ++ + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 6 +- + drivers/infiniband/hw/qedr/verbs.c | 438 ++++++++------ + drivers/infiniband/hw/qedr/verbs.h | 11 +- + drivers/infiniband/hw/qib/qib.h | 6 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 7 +- + drivers/infiniband/hw/qib/qib_mad.c | 52 +- + drivers/infiniband/hw/qib/qib_sdma.c | 10 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 5 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 18 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 6 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 9 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 9 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 15 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 10 +- + drivers/infiniband/sw/rdmavt/ah.c | 3 +- + drivers/infiniband/sw/rdmavt/ah.h | 2 +- + drivers/infiniband/sw/rdmavt/cq.c | 3 +- + drivers/infiniband/sw/rdmavt/cq.h | 2 +- + drivers/infiniband/sw/rdmavt/pd.c | 3 +- + drivers/infiniband/sw/rdmavt/pd.h | 2 +- + drivers/infiniband/sw/rdmavt/srq.c | 3 +- + drivers/infiniband/sw/rdmavt/srq.h | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 10 +- + drivers/infiniband/sw/rxe/rxe.c | 43 +- + drivers/infiniband/sw/rxe/rxe.h | 29 +- + drivers/infiniband/sw/rxe/rxe_av.c | 29 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 32 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 35 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 29 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 29 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 29 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 29 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 29 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 29 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 29 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 54 +- + drivers/infiniband/sw/rxe/rxe_net.c | 31 +- + drivers/infiniband/sw/rxe/rxe_net.h | 29 +- + drivers/infiniband/sw/rxe/rxe_opcode.c | 29 +- + drivers/infiniband/sw/rxe/rxe_opcode.h | 29 +- + drivers/infiniband/sw/rxe/rxe_param.h | 29 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 89 +-- + drivers/infiniband/sw/rxe/rxe_pool.h | 36 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 32 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 29 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 29 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 65 +-- + drivers/infiniband/sw/rxe/rxe_req.c | 33 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 29 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 29 +- + drivers/infiniband/sw/rxe/rxe_sysfs.c | 35 +- + drivers/infiniband/sw/rxe/rxe_task.c | 37 +- + drivers/infiniband/sw/rxe/rxe_task.h | 33 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 52 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 48 +- + drivers/infiniband/sw/siw/siw_main.c | 8 +- + drivers/infiniband/sw/siw/siw_verbs.c | 9 +- + drivers/infiniband/sw/siw/siw_verbs.h | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 50 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + + drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 11 + + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 + + drivers/infiniband/ulp/isert/ib_isert.c | 15 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 - + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 4 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 76 ++- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 7 + + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 31 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 23 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 15 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 17 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/mlx5/port.h | 15 +- + include/linux/overflow.h | 1 + + include/linux/qed/qed_rdma_if.h | 2 - + include/linux/qed/qede_rdma.h | 4 +- + include/linux/scatterlist.h | 38 +- + include/rdma/ib_cache.h | 3 + + include/rdma/ib_cm.h | 3 - + include/rdma/ib_umem.h | 46 +- + include/rdma/ib_umem_odp.h | 21 +- + include/rdma/ib_verbs.h | 212 ++----- + include/rdma/rdma_cm.h | 46 +- + include/rdma/restrack.h | 21 +- + include/trace/events/rdma.h | 41 +- + include/trace/events/rpcrdma.h | 1 + + include/uapi/rdma/efa-abi.h | 1 + + include/uapi/rdma/hns-abi.h | 4 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 16 + + include/uapi/rdma/ib_user_ioctl_verbs.h | 15 + + include/uapi/rdma/ib_user_verbs.h | 11 + + include/uapi/rdma/rdma_user_rxe.h | 6 +- + lib/scatterlist.c | 125 +++- + tools/testing/scatterlist/Makefile | 3 +- + tools/testing/scatterlist/linux/mm.h | 35 ++ + tools/testing/scatterlist/main.c | 53 +- + 223 files changed, 5177 insertions(+), 4681 deletions(-) + create mode 100644 drivers/infiniband/core/cm_trace.c + create mode 100644 drivers/infiniband/core/cm_trace.h +Merging net-next/master (50172733d01c Merge tag 'mlx5-updates-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge net-next/master +Removing tools/testing/selftests/bpf/test_tc_neigh.sh +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc_qos.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_devel_QA.rst | 4 +- + MAINTAINERS | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 + + drivers/infiniband/hw/hfi1/ipoib_main.c | 34 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 39 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 154 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 6 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 2 + + drivers/net/ethernet/cadence/macb.h | 10 +- + drivers/net/ethernet/cadence/macb_main.c | 66 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 5 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 53 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 9 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 26 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 335 +++---- + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 8 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 9 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 + + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 33 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 1 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 46 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 2 + + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 178 +++- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 110 ++- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 43 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 19 +- + drivers/net/ethernet/mscc/ocelot.c | 15 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 29 +- + drivers/net/ethernet/mscc/ocelot_net.c | 11 +- + drivers/net/macsec.c | 22 +- + drivers/net/usb/cx82310_eth.c | 78 +- + drivers/net/usb/qmi_wwan.c | 24 +- + drivers/net/usb/usbnet.c | 24 +- + drivers/net/veth.c | 9 + + drivers/net/virtio_net.c | 48 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 23 +- + include/linux/bpf.h | 8 +- + include/linux/bpf_verifier.h | 7 + + include/linux/btf.h | 26 + + include/linux/can/core.h | 7 - + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/qp.h | 6 +- + include/linux/netdevice.h | 6 + + include/linux/skmsg.h | 2 + + include/net/netfilter/nf_tables.h | 6 + + include/net/netfilter/nf_tables_ipv4.h | 33 + + include/net/netfilter/nf_tables_ipv6.h | 46 + + include/net/netns/can.h | 1 - + include/net/tcp.h | 33 - + include/uapi/linux/bpf.h | 101 ++- + include/uapi/linux/can/isotp.h | 1 - + include/uapi/linux/netfilter.h | 1 + + kernel/bpf/arraymap.c | 17 +- + kernel/bpf/btf.c | 25 - + kernel/bpf/hashtab.c | 6 +- + kernel/bpf/helpers.c | 32 + + kernel/bpf/percpu_freelist.c | 101 ++- + kernel/bpf/percpu_freelist.h | 1 + + kernel/bpf/syscall.c | 4 +- + kernel/bpf/verifier.c | 270 +++++- + kernel/trace/bpf_trace.c | 6 + + net/bridge/br_device.c | 21 +- + net/can/Kconfig | 3 +- + net/can/af_can.c | 2 +- + net/can/bcm.c | 4 +- + net/can/gw.c | 4 +- + net/can/isotp.c | 18 +- + net/can/proc.c | 12 - + net/can/raw.c | 4 +- + net/core/dev.c | 49 +- + net/core/filter.c | 107 ++- + net/core/skmsg.c | 161 +++- + net/core/sock_map.c | 37 +- + net/dsa/slave.c | 21 +- + net/dsa/tag_ocelot.c | 34 + + net/ipv4/ip_tunnel_core.c | 23 +- + net/ipv4/tcp_input.c | 3 +- + net/ipv4/tcp_minisocks.c | 1 - + net/ipv4/tcp_vegas.c | 8 +- + net/ipv6/calipso.c | 2 +- + net/mac80211/iface.c | 23 +- + net/netfilter/core.c | 129 ++- + net/netfilter/ipvs/ip_vs_conn.c | 18 +- + net/netfilter/ipvs/ip_vs_core.c | 19 +- + net/netfilter/nf_flow_table_core.c | 12 +- + net/netfilter/nf_flow_table_ip.c | 45 +- + net/netfilter/nf_tables_api.c | 14 +- + net/netfilter/nft_chain_filter.c | 35 +- + net/openvswitch/vport-internal_dev.c | 20 +- + net/tls/tls_main.c | 2 +- + net/unix/af_unix.c | 2 - + net/xdp/xsk_queue.h | 4 + + net/xdp/xskmap.c | 2 +- + net/xfrm/xfrm_interface.c | 22 +- + samples/bpf/Makefile | 15 +- + samples/bpf/hbm.c | 3 +- + samples/bpf/xdp_monitor_kern.c | 60 +- + samples/bpf/xdp_monitor_user.c | 159 +++- + samples/bpf/xdp_redirect_cpu_user.c | 153 ++-- + samples/bpf/xdp_sample_pkts_kern.c | 14 +- + samples/bpf/xdp_sample_pkts_user.c | 1 - + samples/bpf/xdpsock_user.c | 354 ++++++-- + tools/include/uapi/linux/bpf.h | 101 ++- + tools/lib/bpf/libbpf.c | 348 ++++++-- + tools/lib/bpf/xsk.c | 7 +- + tools/testing/selftests/bpf/README.rst | 38 + + tools/testing/selftests/bpf/prog_tests/align.c | 16 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 39 +- + .../selftests/bpf/prog_tests/core_autosize.c | 225 +++++ + tools/testing/selftests/bpf/prog_tests/ksyms.c | 38 +- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 88 ++ + tools/testing/selftests/bpf/prog_tests/pinning.c | 49 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 2 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 12 + + .../selftests/bpf/prog_tests/test_profiler.c | 72 ++ + .../selftests/bpf/prog_tests/xdp_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 19 + + tools/testing/selftests/bpf/progs/profiler.h | 177 ++++ + tools/testing/selftests/bpf/progs/profiler.inc.h | 969 +++++++++++++++++++++ + tools/testing/selftests/bpf/progs/profiler1.c | 6 + + tools/testing/selftests/bpf/progs/profiler2.c | 6 + + tools/testing/selftests/bpf/progs/profiler3.c | 6 + + .../selftests/bpf/progs/test_btf_map_in_map.c | 43 + + .../selftests/bpf/progs/test_core_autosize.c | 172 ++++ + tools/testing/selftests/bpf/progs/test_ksyms_btf.c | 55 ++ + .../bpf/progs/test_misc_tcp_hdr_options.c | 4 +- + .../selftests/bpf/progs/test_sockmap_kern.h | 34 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 40 +- + tools/testing/selftests/bpf/progs/test_tc_peer.c | 45 + + .../selftests/bpf/progs/test_tcp_hdr_options.c | 7 +- + tools/testing/selftests/bpf/test_sockmap.c | 81 +- + tools/testing/selftests/bpf/test_tc_neigh.sh | 168 ---- + tools/testing/selftests/bpf/test_tc_redirect.sh | 204 +++++ + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 5 +- + tools/testing/selftests/bpf/trace_helpers.c | 27 + + tools/testing/selftests/bpf/trace_helpers.h | 4 + + tools/testing/selftests/bpf/verifier/basic.c | 2 +- + .../selftests/bpf/verifier/direct_packet_access.c | 2 +- + tools/testing/selftests/bpf/verifier/ld_imm64.c | 8 - + tools/testing/selftests/bpf/verifier/regalloc.c | 243 ++++++ + .../drivers/net/ocelot/tc_flower_chains.sh | 47 +- + 151 files changed, 5823 insertions(+), 1532 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_autosize.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_btf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_profiler.c + create mode 100644 tools/testing/selftests/bpf/progs/profiler.h + create mode 100644 tools/testing/selftests/bpf/progs/profiler.inc.h + create mode 100644 tools/testing/selftests/bpf/progs/profiler1.c + create mode 100644 tools/testing/selftests/bpf/progs/profiler2.c + create mode 100644 tools/testing/selftests/bpf/progs/profiler3.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_autosize.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_btf.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_peer.c + delete mode 100755 tools/testing/selftests/bpf/test_tc_neigh.sh + create mode 100755 tools/testing/selftests/bpf/test_tc_redirect.sh + create mode 100644 tools/testing/selftests/bpf/verifier/regalloc.c +Merging bpf-next/for-next (ccdf7fae3afa Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (61e7113e48d3 Merge 'xfrm: Add compat layer') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9d8feb460adb RDMA/mlx5: Add sw_owner_v2 bit capability) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (ccdf7fae3afa Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (c2568c8c9e63 Merge branch 'net-Constify-struct-genl_small_ops') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (df41c19abbea drivers/net/wan/hdlc_fr: Move the skb_headroom check out of fr_hard_header) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev device and free hu in h5_close) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_h5.c | 8 ++++++-- + drivers/bluetooth/hci_qca.c | 19 +++++++++++++------ + net/bluetooth/hci_event.c | 5 +++++ + 3 files changed, 24 insertions(+), 8 deletions(-) +Merging mac80211-next/master (ba6ff70a3bb7 mac80211: copy configured beacon tx rate to driver) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (65ae3e4e553f gfs2: Fix comments to glock_hash_walk) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 30 +++------ + fs/gfs2/log.c | 63 +++++++++---------- + fs/gfs2/super.c | 186 +++++++++++++++++++++++++++++++++++++------------------- + fs/gfs2/util.h | 10 +++ + 4 files changed, 173 insertions(+), 116 deletions(-) +Merging mtd/mtd/next (6402f4ce9581 mtd: hyperbus: Fix build failure when only RPCIF_HYPERBUS is enabled) +$ git merge mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +Auto-merging arch/arm/mach-s3c/mach-vstms.c +Auto-merging arch/arm/mach-s3c/mach-rx3715.c +Auto-merging arch/arm/mach-s3c/mach-rx1950.c +Auto-merging arch/arm/mach-s3c/mach-real6410.c +Auto-merging arch/arm/mach-s3c/mach-qt2410.c +Auto-merging arch/arm/mach-s3c/mach-osiris.c +Auto-merging arch/arm/mach-s3c/mach-mini6410.c +Auto-merging arch/arm/mach-s3c/mach-mini2440.c +Auto-merging arch/arm/mach-s3c/mach-jive.c +Auto-merging arch/arm/mach-s3c/mach-hmt.c +Auto-merging arch/arm/mach-s3c/mach-gta02.c +Auto-merging arch/arm/mach-s3c/mach-bast.c +Auto-merging arch/arm/mach-s3c/mach-at2440evb.c +Auto-merging arch/arm/mach-s3c/mach-anubis.c +Auto-merging arch/arm/mach-s3c/common-smdk-s3c24xx.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/nand-controller.yaml | 31 ++ + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 3 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- + arch/arm/mach-davinci/board-mityomapl138.c | 2 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- + arch/arm/mach-s3c/common-smdk-s3c24xx.c | 2 +- + arch/arm/mach-s3c/mach-anubis.c | 2 +- + arch/arm/mach-s3c/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c/mach-bast.c | 2 +- + arch/arm/mach-s3c/mach-gta02.c | 2 +- + arch/arm/mach-s3c/mach-hmt.c | 2 +- + arch/arm/mach-s3c/mach-jive.c | 2 +- + arch/arm/mach-s3c/mach-mini2440.c | 2 +- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm/mach-s3c/mach-osiris.c | 2 +- + arch/arm/mach-s3c/mach-qt2410.c | 2 +- + arch/arm/mach-s3c/mach-real6410.c | 2 +- + arch/arm/mach-s3c/mach-rx1950.c | 2 +- + arch/arm/mach-s3c/mach-rx3715.c | 2 +- + arch/arm/mach-s3c/mach-vstms.c | 2 +- + drivers/mtd/devices/Kconfig | 2 +- + drivers/mtd/devices/lart.c | 10 +- + drivers/mtd/devices/spear_smi.c | 4 +- + drivers/mtd/hyperbus/Kconfig | 7 + + drivers/mtd/hyperbus/Makefile | 1 + + drivers/mtd/hyperbus/hbmc-am654.c | 144 +++++- + drivers/mtd/hyperbus/rpc-if.c | 170 +++++++ + drivers/mtd/lpddr/lpddr2_nvm.c | 35 +- + drivers/mtd/lpddr/lpddr_cmds.c | 28 ++ + drivers/mtd/maps/Kconfig | 11 + + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/physmap-bt1-rom.c | 126 +++++ + drivers/mtd/maps/physmap-bt1-rom.h | 17 + + drivers/mtd/maps/physmap-core.c | 8 +- + drivers/mtd/maps/vmu-flash.c | 11 +- + drivers/mtd/mtdconcat.c | 43 ++ + drivers/mtd/mtdcore.c | 28 +- + drivers/mtd/mtdoops.c | 11 +- + drivers/mtd/nand/Kconfig | 8 + + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/ecc.c | 484 ++++++++++++++++++ + drivers/mtd/nand/onenand/onenand_base.c | 9 +- + drivers/mtd/nand/onenand/onenand_omap2.c | 5 +- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/ams-delta.c | 6 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 16 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 457 +++++++++-------- + drivers/mtd/nand/raw/au1550nd.c | 4 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 3 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 28 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 12 +- + drivers/mtd/nand/raw/cafe_nand.c | 3 +- + drivers/mtd/nand/raw/cs553x_nand.c | 2 +- + drivers/mtd/nand/raw/davinci_nand.c | 38 +- + drivers/mtd/nand/raw/denali.c | 3 +- + drivers/mtd/nand/raw/denali_pci.c | 2 +- + drivers/mtd/nand/raw/diskonchip.c | 3 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 20 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 12 +- + drivers/mtd/nand/raw/fsl_upm.c | 4 +- + drivers/mtd/nand/raw/fsmc_nand.c | 14 +- + drivers/mtd/nand/raw/gpio.c | 4 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 21 +- + drivers/mtd/nand/raw/hisi504_nand.c | 6 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 20 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/marvell_nand.c | 101 ++-- + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/raw/mtk_nand.c | 12 +- + drivers/mtd/nand/raw/mxc_nand.c | 25 +- + drivers/mtd/nand/raw/nand_base.c | 554 ++++++++------------- + drivers/mtd/nand/raw/nand_bch.c | 1 + + drivers/mtd/nand/raw/nand_esmt.c | 15 +- + drivers/mtd/nand/raw/nand_hynix.c | 44 +- + drivers/mtd/nand/raw/nand_jedec.c | 9 +- + drivers/mtd/nand/raw/nand_micron.c | 23 +- + drivers/mtd/nand/raw/nand_onfi.c | 17 +- + drivers/mtd/nand/raw/nand_samsung.c | 22 +- + drivers/mtd/nand/raw/nand_toshiba.c | 19 +- + drivers/mtd/nand/raw/nandsim.c | 8 +- + drivers/mtd/nand/raw/ndfc.c | 2 +- + drivers/mtd/nand/raw/omap2.c | 22 +- + drivers/mtd/nand/raw/orion_nand.c | 4 +- + drivers/mtd/nand/raw/oxnas_nand.c | 3 +- + drivers/mtd/nand/raw/pasemi_nand.c | 6 +- + drivers/mtd/nand/raw/plat_nand.c | 4 +- + drivers/mtd/nand/raw/qcom_nandc.c | 26 +- + drivers/mtd/nand/raw/r852.c | 3 +- + drivers/mtd/nand/raw/s3c2410.c | 20 +- + drivers/mtd/nand/raw/sh_flctl.c | 6 +- + drivers/mtd/nand/raw/sharpsl.c | 2 +- + drivers/mtd/nand/raw/socrates_nand.c | 5 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 11 +- + drivers/mtd/nand/raw/sunxi_nand.c | 27 +- + drivers/mtd/nand/raw/tango_nand.c | 4 +- + drivers/mtd/nand/raw/tegra_nand.c | 37 +- + drivers/mtd/nand/raw/tmio_nand.c | 2 +- + drivers/mtd/nand/raw/txx9ndfmc.c | 2 +- + drivers/mtd/nand/raw/vf610_nfc.c | 17 +- + drivers/mtd/nand/raw/xway_nand.c | 4 +- + drivers/mtd/nand/spi/core.c | 12 +- + drivers/mtd/nand/spi/gigadevice.c | 63 ++- + drivers/mtd/nand/spi/macronix.c | 27 +- + drivers/mtd/nand/spi/toshiba.c | 6 +- + drivers/mtd/parsers/Kconfig | 2 +- + drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/macronix.c | 2 +- + drivers/mtd/spi-nor/winbond.c | 9 + + include/linux/mtd/hyperbus.h | 13 + + include/linux/mtd/nand.h | 188 ++++++- + include/linux/mtd/pfow.h | 33 -- + include/linux/mtd/rawnand.h | 34 +- + include/linux/platform_data/mtd-davinci.h | 9 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 2 +- + 122 files changed, 2317 insertions(+), 1078 deletions(-) + create mode 100644 drivers/mtd/hyperbus/rpc-if.c + create mode 100644 drivers/mtd/maps/physmap-bt1-rom.c + create mode 100644 drivers/mtd/maps/physmap-bt1-rom.h + create mode 100644 drivers/mtd/nand/ecc.c +Merging nand/nand/next (88e315d12fbb mtd: onenand: simplify the return expression of onenand_transfer_auto_oob) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9a3422a110c8 Revert "mtd: spi-nor: Prefer asynchronous probe") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (3093e7c16e12 X.509: Fix modular build of public_key_sm2) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (640eee067d9a Merge tag 'drm-misc-next-fixes-2020-10-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Auto-merging kernel/params.c +Removing include/video/mbxfb.h +Auto-merging include/linux/font.h +Auto-merging include/drm/drm_edid.h +Auto-merging include/drm/drm_dp_helper.h +Removing drivers/video/fbdev/mbx/regs.h +Removing drivers/video/fbdev/mbx/reg_bits.h +Removing drivers/video/fbdev/mbx/mbxfb.c +Removing drivers/video/fbdev/mbx/mbxdebugfs.c +Removing drivers/video/fbdev/mbx/Makefile +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/Makefile +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/tegra/dsi.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_mixer.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_mem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Removing drivers/gpu/drm/mxsfb/mxsfb_out.c +Removing drivers/gpu/drm/mxsfb/mxsfb_crtc.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/i915_sw_fence.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dma.c +Auto-merging drivers/gpu/drm/drm_prime.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/include/kgd_kfd_interface.h +Auto-merging drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h +Auto-merging drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/acpi/acpi_lpss.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/amdgpu.rst +Auto-merging Documentation/fb/fbcon.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_priv.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_context.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/selftests/mock_gem_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 709e4ebaa547] Merge remote-tracking branch 'drm/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/brcm,bcm2711-hdmi.yaml | 117 + + .../bindings/display/brcm,bcm2835-hvs.yaml | 18 +- + .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 5 + + .../bindings/display/brcm,bcm2835-vc4.yaml | 1 + + .../bindings/display/bridge/cdns,mhdp8546.yaml | 169 ++ + .../bindings/display/bridge/lontium,lt9611.yaml | 176 ++ + .../bindings/display/bridge/lvds-codec.yaml | 3 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 4 +- + .../bindings/display/bridge/renesas,lvds.yaml | 2 + + .../bindings/display/bridge/toshiba,tc358762.yaml | 127 + + .../bindings/display/bridge/toshiba,tc358775.yaml | 215 ++ + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 108 + + .../bindings/display/mediatek/mediatek,disp.txt | 2 +- + .../bindings/display/mediatek/mediatek,dpi.txt | 2 +- + .../bindings/display/mediatek/mediatek,dsi.txt | 4 +- + .../bindings/display/mediatek/mediatek,hdmi.txt | 4 + + .../devicetree/bindings/display/msm/dsi.txt | 6 +- + .../bindings/display/panel/ilitek,ili9881c.yaml | 4 +- + .../display/panel/mantix,mlaf057we51-x.yaml | 70 + + .../bindings/display/panel/panel-simple.yaml | 8 + + .../display/panel/rocktech,jh057n00900.yaml | 40 +- + .../devicetree/bindings/display/renesas,du.txt | 6 + + .../devicetree/bindings/display/ssd1307fb.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + Documentation/driver-api/driver-model/devres.rst | 2 +- + Documentation/fb/fbcon.rst | 4 +- + Documentation/gpu/amdgpu.rst | 37 +- + Documentation/gpu/drm-uapi.rst | 114 +- + Documentation/gpu/pl111.rst | 8 +- + Documentation/gpu/todo.rst | 46 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 - + MAINTAINERS | 43 +- + drivers/acpi/acpi_lpss.c | 22 +- + drivers/char/agp/amd-k7-agp.c | 2 +- + drivers/char/agp/nvidia-agp.c | 2 +- + drivers/char/agp/sworks-agp.c | 2 +- + drivers/dma-buf/dma-fence.c | 1 + + drivers/dma-buf/dma-resv.c | 5 + + drivers/dma-buf/heaps/heap-helpers.c | 13 +- + drivers/dma-buf/udmabuf.c | 10 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 188 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 216 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 801 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 43 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 100 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 92 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 105 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 219 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 127 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 313 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 381 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 251 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 102 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 117 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 221 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 276 +++ + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 22 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 24 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 36 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 7 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 104 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 79 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 102 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 63 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 117 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 115 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.h | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 296 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 531 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 26 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 - + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 170 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 - + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 21 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 21 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 30 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 68 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 13 - + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 54 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 15 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 68 +- + drivers/gpu/drm/amd/amdgpu/ta_rap_if.h | 84 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 14 - + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 331 +++ + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 51 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 35 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 28 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 174 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 33 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 51 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 29 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 48 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 8 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 193 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 105 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 53 +- + drivers/gpu/drm/amd/display/Kconfig | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 973 ++++---- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 20 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 668 ++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 4 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 37 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 55 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 102 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 71 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 4 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 33 +- + .../drm/amd/display/dc/bios/command_table_helper.c | 8 + + .../drm/amd/display/dc/bios/command_table_helper.h | 3 + + .../amd/display/dc/bios/command_table_helper2.c | 8 + + .../amd/display/dc/bios/command_table_helper2.h | 3 + + .../dc/bios/dce60/command_table_helper_dce60.c | 354 +++ + .../dc/bios/dce60/command_table_helper_dce60.h | 33 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 7 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 18 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 6 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 174 ++ + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h | 36 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 7 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 169 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 98 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 29 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 63 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 16 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 23 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 37 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 18 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 46 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 369 +++ + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 38 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 176 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 103 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 205 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 18 +- + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 6 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 330 +++ + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 178 ++ + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 32 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 34 + + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 432 ++++ + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 1527 ++++++++++++ + .../gpu/drm/amd/display/dc/dce60/dce60_resource.h | 47 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 266 ++ + .../amd/display/dc/dce60/dce60_timing_generator.h | 39 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 3 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 156 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 83 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 10 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 44 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 8 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 16 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 1 - + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 4 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 30 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 4 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 259 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 8 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 11 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 2 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 2 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 20 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 5 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 20 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 12 + + .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 2 +- + .../amd/display/dc/gpio/dce60/hw_factory_dce60.c | 175 ++ + .../amd/display/dc/gpio/dce60/hw_factory_dce60.h | 32 + + .../amd/display/dc/gpio/dce60/hw_translate_dce60.c | 411 ++++ + .../amd/display/dc/gpio/dce60/hw_translate_dce60.h | 32 + + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 2 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 2 +- + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 10 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 10 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 395 +++ + .../amd/display/dc/irq/dce60/irq_service_dce60.h | 40 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 3 + + drivers/gpu/drm/amd/display/dc/os_types.h | 4 + + .../display/dc/virtual/virtual_stream_encoder.c | 29 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 156 +- + .../drm/amd/display/include/bios_parser_types.h | 6 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 40 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../drm/amd/display/include/link_service_types.h | 1 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 8 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 1 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 17 + + .../drm/amd/display/modules/inc/mod_info_packet.h | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 16 +- + drivers/gpu/drm/amd/include/amd_shared.h | 115 +- + .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 2 - + .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 76 + + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 104 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 0 + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 22 + + .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h | 0 + .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 25 + + .../drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h | 4 +- + .../amd/include/asic_reg/umc/umc_8_7_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 79 + + .../drm/amd/include/asic_reg/uvd/uvd_7_0_offset.h | 3 + + .../drm/amd/include/asic_reg/uvd/uvd_7_0_sh_mask.h | 20 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 15 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 110 + + drivers/gpu/drm/amd/pm/Makefile | 46 + + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c | 479 +++- + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c | 957 +++----- + .../drm/amd/{powerplay => pm}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h | 37 +- + drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h | 8 - + .../gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h | 28 +- + .../drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h | 0 + .../amd/{powerplay => pm}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h | 6 + + .../amd/{powerplay => pm}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/{powerplay => pm}/inc/power_state.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h | 0 + .../drm/amd/{powerplay => pm}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h | 0 + .../amd/{powerplay => pm}/inc/smu10_driver_if.h | 3 +- + .../amd/{powerplay => pm}/inc/smu11_driver_if.h | 0 + .../inc/smu11_driver_if_arcturus.h | 0 + .../{powerplay => pm}/inc/smu11_driver_if_navi10.h | 39 + + .../inc/smu11_driver_if_sienna_cichlid.h | 22 +- + .../amd/{powerplay => pm}/inc/smu12_driver_if.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu75_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_common.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_fusion.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu9_driver_if.h | 0 + drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h | 194 ++ + .../gpu/drm/amd/{powerplay => pm}/inc/smu_types.h | 3 + + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h | 0 + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h | 30 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h | 0 + .../{powerplay => pm}/inc/smu_v11_0_7_pptable.h | 0 + .../amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h | 9 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_pptable.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h | 2 + + .../amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h | 0 + .../drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h | 0 + .../{powerplay => pm}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h | 0 + drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile | 23 +- + .../gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c | 35 +- + .../gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c | 5 +- + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h | 9 - + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h | 0 + .../powerplay/hwmgr/process_pptables_v1_0.c | 0 + .../powerplay/hwmgr/process_pptables_v1_0.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c | 95 +- + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h | 3 +- + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h | 0 + .../powerplay/hwmgr/smu7_clockpowergating.c | 0 + .../powerplay/hwmgr/smu7_clockpowergating.h | 0 + .../{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c | 2 +- + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h | 0 + .../powerplay/hwmgr/vega10_processpptables.c | 0 + .../powerplay/hwmgr/vega10_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c | 140 +- + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h | 1 - + .../amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h | 0 + .../powerplay/hwmgr/vega12_processpptables.c | 2 +- + .../powerplay/hwmgr/vega12_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c | 154 +- + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h | 0 + .../powerplay/hwmgr/vega20_processpptables.c | 8 +- + .../powerplay/hwmgr/vega20_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h | 0 + .../drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c | 0 + .../amd/{amdgpu => pm/powerplay}/sislands_smc.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.c | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c | 7 - + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c | 12 +- + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h | 0 + drivers/gpu/drm/amd/pm/swsmu/Makefile | 36 + + .../drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c | 205 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 33 + + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.c | 146 +- + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c | 483 ++-- + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h | 3 - + .../swsmu/smu11}/sienna_cichlid_ppt.c | 225 +- + .../swsmu/smu11}/sienna_cichlid_ppt.h | 3 - + .../amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c | 329 ++- + drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile | 31 + + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c | 262 +- + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h | 1 + + .../amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c | 12 + + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c | 56 +- + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h | 12 + + .../drm/amd/{powerplay => pm/swsmu}/smu_internal.h | 6 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 4 +- + drivers/gpu/drm/armada/armada_debugfs.c | 2 +- + drivers/gpu/drm/armada/armada_drm.h | 2 + + drivers/gpu/drm/armada/armada_drv.c | 30 +- + drivers/gpu/drm/armada/armada_fbdev.c | 4 +- + drivers/gpu/drm/armada/armada_gem.c | 28 +- + drivers/gpu/drm/armada/armada_overlay.c | 8 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 15 +- + drivers/gpu/drm/ast/ast_cursor.c | 11 +- + drivers/gpu/drm/ast/ast_dp501.c | 23 +- + drivers/gpu/drm/ast/ast_drv.c | 82 +- + drivers/gpu/drm/ast/ast_drv.h | 45 +- + drivers/gpu/drm/ast/ast_main.c | 74 +- + drivers/gpu/drm/ast/ast_mm.c | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 143 +- + drivers/gpu/drm/ast/ast_post.c | 6 +- + drivers/gpu/drm/bridge/Kconfig | 33 + + drivers/gpu/drm/bridge/Makefile | 4 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 - + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 - + drivers/gpu/drm/bridge/cadence/Kconfig | 24 + + drivers/gpu/drm/bridge/cadence/Makefile | 4 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 2532 +++++++++++++++++++ + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 400 +++ + .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.c | 78 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.h | 19 + + drivers/gpu/drm/bridge/lontium-lt9611.c | 1230 ++++++++++ + drivers/gpu/drm/bridge/lvds-codec.c | 29 + + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 109 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 101 +- + drivers/gpu/drm/bridge/panel.c | 7 - + drivers/gpu/drm/bridge/parade-ps8622.c | 100 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 91 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 155 +- + drivers/gpu/drm/bridge/tc358762.c | 280 +++ + drivers/gpu/drm/bridge/tc358764.c | 109 +- + drivers/gpu/drm/bridge/tc358767.c | 123 +- + drivers/gpu/drm/bridge/tc358775.c | 749 ++++++ + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 - + drivers/gpu/drm/drm_atomic_helper.c | 24 +- + drivers/gpu/drm/drm_bridge_connector.c | 1 + + drivers/gpu/drm/drm_cache.c | 2 +- + drivers/gpu/drm/drm_connector.c | 94 +- + drivers/gpu/drm/drm_debugfs_crc.c | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 632 ++++- + drivers/gpu/drm/drm_dp_mst_topology.c | 278 ++- + drivers/gpu/drm/drm_drv.c | 119 +- + drivers/gpu/drm/drm_edid.c | 28 + + drivers/gpu/drm/drm_framebuffer.c | 9 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 23 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 16 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 5 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 169 +- + drivers/gpu/drm/drm_internal.h | 1 + + drivers/gpu/drm/drm_managed.c | 15 +- + drivers/gpu/drm/drm_panel.c | 85 +- + drivers/gpu/drm/drm_prime.c | 104 +- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/drm_vblank.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 27 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 23 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/mdfld_device.c | 20 + + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 55 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +- + drivers/gpu/drm/gma500/mdfld_output.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 70 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- + drivers/gpu/drm/i810/i810_dma.c | 6 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 1 + + drivers/gpu/drm/i915/display/intel_atomic.c | 39 - + drivers/gpu/drm/i915/display/intel_atomic.h | 4 - + drivers/gpu/drm/i915/display/intel_audio.c | 5 - + drivers/gpu/drm/i915/display/intel_bios.c | 10 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 13 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 3 +- + drivers/gpu/drm/i915/display/intel_crt.c | 3 + + drivers/gpu/drm/i915/display/intel_csr.c | 8 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 279 ++- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 + + drivers/gpu/drm/i915/display/intel_display.c | 241 +- + drivers/gpu/drm/i915/display/intel_display.h | 6 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 39 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 54 +- + drivers/gpu/drm/i915/display/intel_dp.c | 1210 ++++----- + drivers/gpu/drm/i915/display/intel_dp.h | 13 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 703 ++++++ + .../gpu/drm/i915/display/intel_dp_link_training.c | 19 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 23 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 87 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 6 + + drivers/gpu/drm/i915/display/intel_fbc.c | 17 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 3 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 208 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 117 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 2 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 28 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_panel.c | 106 +- + drivers/gpu/drm/i915/display/intel_panel.h | 2 + + drivers/gpu/drm/i915/display/intel_psr.c | 110 +- + drivers/gpu/drm/i915/display/intel_psr.h | 5 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 12 +- + drivers/gpu/drm/i915/display/intel_tv.c | 3 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 10 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 89 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 130 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 80 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1637 ++++++++----- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 40 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 152 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 3 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 67 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 11 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 50 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 146 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 75 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 45 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 4 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 7 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 106 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 5 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 181 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 305 ++- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 36 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 47 + + drivers/gpu/drm/i915/gt/intel_context.c | 319 ++- + drivers/gpu/drm/i915/gt/intel_context.h | 13 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 5 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 29 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 34 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 106 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 31 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 97 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 23 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 105 +- + .../gpu/drm/i915/gt/intel_gt_buffer_pool_types.h | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 300 +-- + drivers/gpu/drm/i915/gt/intel_gtt.h | 142 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 169 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 150 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 73 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 9 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 1 + + drivers/gpu/drm/i915/gt/intel_ring.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ring.h | 3 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 42 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 28 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 24 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 183 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 30 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 22 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 34 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 36 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 9 +- + drivers/gpu/drm/i915/gvt/gvt.h | 44 +- + drivers/gpu/drm/i915/gvt/handlers.c | 32 +- + drivers/gpu/drm/i915/gvt/mmio.c | 3 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 17 +- + drivers/gpu/drm/i915/i915_active.c | 244 +- + drivers/gpu/drm/i915/i915_active.h | 31 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 10 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2 + + drivers/gpu/drm/i915/i915_drv.c | 162 +- + drivers/gpu/drm/i915/i915_drv.h | 144 +- + drivers/gpu/drm/i915/i915_gem.c | 107 +- + drivers/gpu/drm/i915/i915_gem.h | 12 + + drivers/gpu/drm/i915/i915_getparam.c | 1 + + drivers/gpu/drm/i915/i915_gpu_error.c | 3 + + drivers/gpu/drm/i915/i915_irq.c | 228 +- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 57 +- + drivers/gpu/drm/i915/i915_reg.h | 70 +- + drivers/gpu/drm/i915/i915_request.c | 223 +- + drivers/gpu/drm/i915/i915_request.h | 8 - + drivers/gpu/drm/i915/i915_suspend.c | 46 +- + drivers/gpu/drm/i915/i915_vma.c | 67 +- + drivers/gpu/drm/i915/i915_vma.h | 13 +- + drivers/gpu/drm/i915/intel_device_info.c | 27 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 16 +- + drivers/gpu/drm/i915/intel_sideband.c | 16 +- + drivers/gpu/drm/i915/intel_uncore.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 41 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 77 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 22 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 4 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 44 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.h | 2 + + drivers/gpu/drm/i915/selftests/mock_gtt.c | 26 +- + drivers/gpu/drm/imx/Kconfig | 2 + + drivers/gpu/drm/imx/Makefile | 1 + + drivers/gpu/drm/imx/dcss/Kconfig | 9 + + drivers/gpu/drm/imx/dcss/Makefile | 6 + + drivers/gpu/drm/imx/dcss/dcss-blkctl.c | 70 + + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 219 ++ + drivers/gpu/drm/imx/dcss/dcss-ctxld.c | 424 ++++ + drivers/gpu/drm/imx/dcss/dcss-dev.c | 325 +++ + drivers/gpu/drm/imx/dcss/dcss-dev.h | 177 ++ + drivers/gpu/drm/imx/dcss/dcss-dpr.c | 562 +++++ + drivers/gpu/drm/imx/dcss/dcss-drv.c | 138 ++ + drivers/gpu/drm/imx/dcss/dcss-dtg.c | 409 ++++ + drivers/gpu/drm/imx/dcss/dcss-kms.c | 198 ++ + drivers/gpu/drm/imx/dcss/dcss-kms.h | 44 + + drivers/gpu/drm/imx/dcss/dcss-plane.c | 405 +++ + drivers/gpu/drm/imx/dcss/dcss-scaler.c | 826 +++++++ + drivers/gpu/drm/imx/dcss/dcss-ss.c | 180 ++ + drivers/gpu/drm/imx/imx-ldb.c | 10 - + drivers/gpu/drm/imx/parallel-display.c | 6 - + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 41 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 38 +- + drivers/gpu/drm/lima/lima_gem.c | 11 +- + drivers/gpu/drm/lima/lima_vm.c | 5 +- + drivers/gpu/drm/mcde/mcde_display.c | 218 +- + drivers/gpu/drm/mcde/mcde_drm.h | 67 +- + drivers/gpu/drm/mcde/mcde_drv.c | 81 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 276 ++- + drivers/gpu/drm/mediatek/Kconfig | 2 +- + drivers/gpu/drm/mediatek/Makefile | 5 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 80 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 38 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 2 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 23 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 37 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 6 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 21 +- + drivers/gpu/drm/mediatek/mtk_hdmi.h | 1 - + drivers/gpu/drm/mgag200/Kconfig | 12 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 227 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 19 +- + drivers/gpu/drm/mgag200/mgag200_mm.c | 8 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 153 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 4 + + drivers/gpu/drm/msm/Kconfig | 19 +- + drivers/gpu/drm/msm/Makefile | 18 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 65 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 77 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 82 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 21 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 120 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 12 + + drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 5 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 182 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 10 + + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 12 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 105 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 82 +- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 109 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 132 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 55 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 145 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 84 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 51 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 13 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 47 - + .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 7 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 24 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 68 - + drivers/gpu/drm/msm/dp/dp_audio.c | 638 +++++ + drivers/gpu/drm/msm/dp/dp_audio.h | 72 + + drivers/gpu/drm/msm/dp/dp_aux.c | 535 ++++ + drivers/gpu/drm/msm/dp/dp_aux.h | 30 + + drivers/gpu/drm/msm/dp/dp_catalog.c | 1019 ++++++++ + drivers/gpu/drm/msm/dp/dp_catalog.h | 131 + + drivers/gpu/drm/msm/dp/dp_ctrl.c | 1869 ++++++++++++++ + drivers/gpu/drm/msm/dp/dp_ctrl.h | 36 + + drivers/gpu/drm/msm/dp/dp_debug.c | 485 ++++ + drivers/gpu/drm/msm/dp/dp_debug.h | 74 + + drivers/gpu/drm/msm/dp/dp_display.c | 1463 +++++++++++ + drivers/gpu/drm/msm/dp/dp_display.h | 39 + + drivers/gpu/drm/msm/dp/dp_drm.c | 164 ++ + drivers/gpu/drm/msm/dp/dp_drm.h | 18 + + drivers/gpu/drm/msm/dp/dp_hpd.c | 69 + + drivers/gpu/drm/msm/dp/dp_hpd.h | 80 + + drivers/gpu/drm/msm/dp/dp_link.c | 1210 +++++++++ + drivers/gpu/drm/msm/dp/dp_link.h | 155 ++ + drivers/gpu/drm/msm/dp/dp_panel.c | 463 ++++ + drivers/gpu/drm/msm/dp/dp_panel.h | 100 + + drivers/gpu/drm/msm/dp/dp_parser.c | 293 +++ + drivers/gpu/drm/msm/dp/dp_parser.h | 136 ++ + drivers/gpu/drm/msm/dp/dp_power.c | 372 +++ + drivers/gpu/drm/msm/dp/dp_power.h | 107 + + drivers/gpu/drm/msm/dp/dp_reg.h | 306 +++ + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 423 ++++ + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 5 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 102 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 255 ++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 4 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 10 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 904 +++++++ + drivers/gpu/drm/msm/msm_drv.c | 28 +- + drivers/gpu/drm/msm/msm_drv.h | 97 +- + drivers/gpu/drm/msm/msm_gem.c | 75 +- + drivers/gpu/drm/msm/msm_gem.h | 10 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 14 +- + drivers/gpu/drm/msm/msm_gpu.c | 56 +- + drivers/gpu/drm/msm/msm_gpu.h | 22 +- + drivers/gpu/drm/msm/msm_gpu_trace.h | 83 + + drivers/gpu/drm/msm/msm_gpummu.c | 17 +- + drivers/gpu/drm/msm/msm_iommu.c | 208 +- + drivers/gpu/drm/msm/msm_mmu.h | 16 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 1 + + drivers/gpu/drm/msm/msm_submitqueue.c | 7 +- + drivers/gpu/drm/mxsfb/Kconfig | 8 +- + drivers/gpu/drm/mxsfb/Makefile | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 343 --- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 273 +-- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 42 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 571 +++++ + drivers/gpu/drm/mxsfb/mxsfb_out.c | 99 - + drivers/gpu/drm/mxsfb/mxsfb_regs.h | 107 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 9 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 7 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 29 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 4 + + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 311 +-- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 440 ++-- + drivers/gpu/drm/nouveau/nouveau_bo.h | 29 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 132 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 72 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 210 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 48 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 34 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 66 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 193 +- + drivers/gpu/drm/nouveau/nouveau_ttm.h | 9 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 7 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 7 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 13 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 - + drivers/gpu/drm/omapdrm/dss/venc.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 17 - + drivers/gpu/drm/omapdrm/omap_gem.c | 14 +- + drivers/gpu/drm/panel/Kconfig | 34 +- + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 4 +- + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 6 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 48 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 12 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 51 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 23 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 25 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 7 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 277 ++- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 35 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 37 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 58 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 49 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +- + drivers/gpu/drm/panel/panel-lvds.c | 13 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 328 +++ + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 60 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 46 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 13 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 6 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 40 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 18 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 20 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 7 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 27 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 9 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 9 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 139 ++ + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 101 + + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 174 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 13 + + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 6 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 7 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 232 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 14 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 61 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 85 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 7 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 42 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 63 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 41 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 51 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 175 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 30 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 61 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 17 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 27 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 37 +- + drivers/gpu/drm/panfrost/panfrost_gpu.h | 2 + + drivers/gpu/drm/panfrost/panfrost_job.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 7 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 4 + + drivers/gpu/drm/pl111/pl111_drv.c | 20 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 22 +- + drivers/gpu/drm/qxl/qxl_drv.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 34 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 112 +- + drivers/gpu/drm/radeon/radeon.h | 10 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_gart.c | 10 +- + drivers/gpu/drm/radeon/radeon_gem.c | 10 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 46 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 29 +- + drivers/gpu/drm/radeon/radeon_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 333 +-- + drivers/gpu/drm/radeon/radeon_vm.c | 6 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- + drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 37 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 54 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 17 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 47 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 - + drivers/gpu/drm/scheduler/sched_fence.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 4 +- + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 17 + + drivers/gpu/drm/sti/sti_dvo.c | 2 - + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 6 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 5 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 + + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 29 +- + drivers/gpu/drm/tegra/output.c | 34 +- + drivers/gpu/drm/tegra/plane.c | 15 +- + drivers/gpu/drm/tegra/rgb.c | 102 +- + drivers/gpu/drm/tegra/sor.c | 7 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 32 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 4 + + drivers/gpu/drm/ttm/Makefile | 3 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 45 +- + drivers/gpu/drm/ttm/ttm_bo.c | 513 ++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 402 +-- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 46 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 12 +- + drivers/gpu/drm/ttm/ttm_memory.c | 9 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 +- + .../ttm/{ttm_bo_manager.c => ttm_range_manager.c} | 84 +- + drivers/gpu/drm/ttm/ttm_resource.c | 146 ++ + drivers/gpu/drm/ttm/ttm_tt.c | 93 +- + drivers/gpu/drm/v3d/v3d_drv.c | 13 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 13 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 10 +- + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 368 ++- + drivers/gpu/drm/vc4/vc4_drv.c | 5 + + drivers/gpu/drm/vc4/vc4_drv.h | 45 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 1650 ++++++++----- + drivers/gpu/drm/vc4/vc4_hdmi.h | 184 ++ + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 521 ++++ + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 442 ++++ + drivers/gpu/drm/vc4/vc4_hvs.c | 269 +- + drivers/gpu/drm/vc4/vc4_kms.c | 256 +- + drivers/gpu/drm/vc4/vc4_plane.c | 224 +- + drivers/gpu/drm/vc4/vc4_regs.h | 177 +- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 57 +- + drivers/gpu/drm/virtio/Kconfig | 3 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 23 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 14 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 36 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 96 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 120 +- + drivers/gpu/drm/vkms/Makefile | 9 +- + drivers/gpu/drm/vkms/vkms_composer.c | 171 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 5 + + drivers/gpu/drm/vkms/vkms_drv.c | 56 +- + drivers/gpu/drm/vkms/vkms_drv.h | 10 +- + drivers/gpu/drm/vkms/vkms_output.c | 4 + + drivers/gpu/drm/vkms/vkms_writeback.c | 142 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 70 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 73 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 60 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 71 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 253 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 5 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 - + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 27 +- + drivers/gpu/host1x/job.c | 22 +- + drivers/media/platform/vsp1/vsp1_drm.c | 8 +- + drivers/phy/cadence/phy-cadence-torrent.c | 4 + + drivers/phy/mediatek/Kconfig | 7 + + drivers/phy/mediatek/Makefile | 5 + + .../mediatek/phy-mtk-hdmi-mt2701.c} | 4 +- + .../mediatek/phy-mtk-hdmi-mt8173.c} | 2 +- + .../mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} | 6 +- + .../mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} | 3 +- + drivers/pwm/pwm-crc.c | 128 +- + drivers/pwm/pwm-lpss-platform.c | 1 - + drivers/pwm/pwm-lpss.c | 85 +- + drivers/pwm/pwm-lpss.h | 3 - + drivers/video/fbdev/Kconfig | 19 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/arkfb.c | 41 +- + drivers/video/fbdev/atmel_lcdfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 51 +- + drivers/video/fbdev/aty/atyfb.h | 4 +- + drivers/video/fbdev/aty/atyfb_base.c | 50 +- + drivers/video/fbdev/aty/radeon_base.c | 12 +- + drivers/video/fbdev/aty/radeon_pm.c | 38 +- + drivers/video/fbdev/aty/radeonfb.h | 3 +- + drivers/video/fbdev/core/fbcon.c | 2 - + drivers/video/fbdev/core/fbmem.c | 14 +- + drivers/video/fbdev/cyber2000fb.c | 13 +- + drivers/video/fbdev/geode/gxfb.h | 5 - + drivers/video/fbdev/geode/gxfb_core.c | 36 +- + drivers/video/fbdev/geode/lxfb.h | 5 - + drivers/video/fbdev/geode/lxfb_core.c | 37 +- + drivers/video/fbdev/geode/lxfb_ops.c | 4 - + drivers/video/fbdev/geode/suspend_gx.c | 4 - + drivers/video/fbdev/i740fb.c | 40 +- + drivers/video/fbdev/kyro/STG4000InitDevice.c | 7 +- + drivers/video/fbdev/mbx/Makefile | 4 - + drivers/video/fbdev/mbx/mbxdebugfs.c | 232 -- + drivers/video/fbdev/mbx/mbxfb.c | 1053 -------- + drivers/video/fbdev/mbx/reg_bits.h | 614 ----- + drivers/video/fbdev/mbx/regs.h | 196 -- + drivers/video/fbdev/nvidia/nvidia.c | 64 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 + + drivers/video/fbdev/s3fb.c | 39 +- + drivers/video/fbdev/savage/savagefb_driver.c | 53 +- + drivers/video/fbdev/sis/init.c | 11 +- + drivers/video/fbdev/sm712fb.c | 8 + + drivers/video/fbdev/ssd1307fb.c | 8 +- + drivers/video/fbdev/sstfb.c | 2 +- + drivers/video/fbdev/tgafb.c | 12 +- + drivers/video/fbdev/udlfb.c | 4 +- + drivers/video/fbdev/vga16fb.c | 14 +- + drivers/video/fbdev/via/via-core.c | 39 +- + drivers/video/fbdev/vt8623fb.c | 41 +- + drivers/virtio/Kconfig | 7 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 6 + + drivers/virtio/virtio_dma_buf.c | 88 + + drivers/xen/gntdev-dmabuf.c | 13 +- + include/drm/bridge/dw_mipi_dsi.h | 1 + + include/drm/drm_atomic_helper.h | 3 + + include/drm/drm_connector.h | 3 + + include/drm/drm_device.h | 2 +- + include/drm/drm_dp_helper.h | 90 +- + include/drm/drm_dp_mst_helper.h | 47 +- + include/drm/drm_drv.h | 20 +- + include/drm/drm_edid.h | 4 + + include/drm/drm_gem_vram_helper.h | 10 +- + include/drm/drm_mm.h | 2 +- + include/drm/drm_mode_config.h | 6 + + include/drm/drm_modes.h | 26 +- + include/drm/drm_panel.h | 15 +- + include/drm/drm_prime.h | 5 +- + include/drm/gpu_scheduler.h | 13 +- + include/drm/i915_pciids.h | 18 +- + include/drm/ttm/ttm_bo_api.h | 123 +- + include/drm/ttm/ttm_bo_driver.h | 458 ++-- + include/drm/ttm/ttm_execbuf_util.h | 19 +- + include/drm/ttm/ttm_memory.h | 26 +- + include/drm/ttm/ttm_placement.h | 9 +- + include/drm/ttm/ttm_resource.h | 237 ++ + include/drm/ttm/ttm_tt.h | 98 +- + include/linux/adreno-smmu-priv.h | 36 + + include/linux/dma-buf.h | 3 +- + include/linux/fb.h | 18 +- + include/linux/font.h | 4 +- + include/linux/moduleparam.h | 7 +- + include/linux/phy/phy.h | 2 + + include/linux/via-core.h | 2 - + include/linux/virtio.h | 1 + + include/linux/virtio_dma_buf.h | 37 + + include/uapi/drm/amdgpu_drm.h | 1 + + include/uapi/drm/drm_mode.h | 21 +- + include/uapi/drm/i915_drm.h | 59 +- + include/uapi/linux/kfd_ioctl.h | 11 +- + include/uapi/linux/virtio_gpu.h | 19 + + include/video/mbxfb.h | 99 - + kernel/params.c | 17 +- + lib/fonts/Kconfig | 7 + + lib/fonts/Makefile | 1 + + lib/fonts/font_6x8.c | 2576 ++++++++++++++++++++ + lib/fonts/fonts.c | 3 + + samples/vfio-mdev/mbochs.c | 3 +- + 1292 files changed, 64792 insertions(+), 20131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_rap_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq_params.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h + mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/Makefile + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c (76%) + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c (81%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h (93%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h (84%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10_driver_if.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_navi10.h (97%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_sienna_cichlid.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9_driver_if.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_types.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h (90%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h (95%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile (70%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c (98%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h (98%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c (93%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h (98%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c (95%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h (97%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c (96%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c (94%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c (98%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c (94%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c (87%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.c (94%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.h (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c (88%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c (82%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h (89%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_internal.h (94%) + create mode 100644 drivers/gpu/drm/bridge/cadence/Kconfig + create mode 100644 drivers/gpu/drm/bridge/cadence/Makefile + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.c + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.h + create mode 100644 drivers/gpu/drm/bridge/lontium-lt9611.c + create mode 100644 drivers/gpu/drm/bridge/tc358762.c + create mode 100644 drivers/gpu/drm/bridge/tc358775.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_breadcrumbs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h + create mode 100644 drivers/gpu/drm/imx/dcss/Kconfig + create mode 100644 drivers/gpu/drm/imx/dcss/Makefile + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-blkctl.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-crtc.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-ctxld.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-dev.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-dev.h + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-dpr.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-drv.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-dtg.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-kms.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-kms.h + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-plane.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-scaler.c + create mode 100644 drivers/gpu/drm/imx/dcss/dcss-ss.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_audio.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_audio.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_aux.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_ctrl.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_debug.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_debug.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_display.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_display.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_drm.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_hpd.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_link.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_link.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_panel.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_parser.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_power.c + create mode 100644 drivers/gpu/drm/msm/dp/dp_power.h + create mode 100644 drivers/gpu/drm/msm/dp/dp_reg.h + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c + delete mode 100644 drivers/gpu/drm/mxsfb/mxsfb_crtc.c + create mode 100644 drivers/gpu/drm/mxsfb/mxsfb_kms.c + delete mode 100644 drivers/gpu/drm/mxsfb/mxsfb_out.c + create mode 100644 drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0.h + rename drivers/gpu/drm/ttm/{ttm_bo_manager.c => ttm_range_manager.c} (63%) + create mode 100644 drivers/gpu/drm/ttm/ttm_resource.c + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.h + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_phy.c + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_regs.h + create mode 100644 drivers/gpu/drm/vkms/vkms_writeback.c + rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%) + rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%) + rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (96%) + rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (95%) + delete mode 100644 drivers/video/fbdev/mbx/Makefile + delete mode 100644 drivers/video/fbdev/mbx/mbxdebugfs.c + delete mode 100644 drivers/video/fbdev/mbx/mbxfb.c + delete mode 100644 drivers/video/fbdev/mbx/reg_bits.h + delete mode 100644 drivers/video/fbdev/mbx/regs.h + create mode 100644 drivers/virtio/virtio_dma_buf.c + create mode 100644 include/drm/ttm/ttm_resource.h + create mode 100644 include/linux/adreno-smmu-priv.h + create mode 100644 include/linux/virtio_dma_buf.h + delete mode 100644 include/video/mbxfb.h + create mode 100644 lib/fonts/font_6x8.c +$ git am -3 ../patches/0001-lib-scatterlist-merge-fix-for-drm-allow-limiting-the.patch +Applying: lib/scatterlist: merge fix for "drm: allow limiting the scatter list size." +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_prime.c +$ git add -A . +$ git commit -v -a --amend +[master d71375b186d9] Merge remote-tracking branch 'drm/drm-next' into master + Date: Thu Oct 15 13:25:46 2020 +1100 +$ git am -3 ../patches/0001-merge-fix-upt-for-iommu_flush_iotlb_all-rename.patch +Applying: merge fix upt for iommu_flush_iotlb_all() rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/msm/msm_iommu.c +$ git add -A . +$ git commit -v -a --amend +[master a0c3a066cf3a] Merge remote-tracking branch 'drm/drm-next' into master + Date: Thu Oct 15 13:25:46 2020 +1100 +Merging amdgpu/drm-next (02c3d98ce25b drm/amdgpu: add another raven1 gfxoff quirk) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 525 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 180 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 9 - + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 172 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h | 28 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 341 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h | 32 + + drivers/gpu/drm/amd/amdgpu/nv.c | 116 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 21 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 41 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 + + drivers/gpu/drm/amd/display/Kconfig | 24 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 63 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 23 - + drivers/gpu/drm/amd/display/dc/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 187 + + .../amd/display/dc/bios/command_table_helper2.c | 11 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 34 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 241 + + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h | 164 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 834 + + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h | 43 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 31 + + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 18 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 18 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 49 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 325 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 9 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 1 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 3 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 3 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 164 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 18 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 15 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 120 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 54 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 47 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 75 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 65 + + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 192 + + .../display/dc/dcn301/dcn301_dio_link_encoder.h | 82 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 81 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h | 60 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c | 42 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h | 32 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 145 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.h | 33 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 218 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.h | 97 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2011 + + .../drm/amd/display/dc/dcn301/dcn301_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 17 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h | 41 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 233 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h | 35 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 39 + + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.h | 33 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1619 + + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 33 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 26 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 6 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 33 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 344 + + .../amd/display/dc/irq/dcn302/irq_service_dcn302.h | 33 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 6 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 55 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 45 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 22 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 8 + + .../amd/display/include/grph_object_ctrl_defs.h | 17 + + .../drm/amd/display/modules/freesync/freesync.c | 55 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/clk/clk_11_5_0_offset.h | 50 + + .../amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h | 70 + + .../amd/include/asic_reg/dcn/dcn_3_0_1_offset.h | 13271 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 53357 ++++++ + .../include/asic_reg/mmhub/mmhub_2_3_0_default.h | 1253 + + .../include/asic_reg/mmhub/mmhub_2_3_0_offset.h | 2439 + + .../include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h | 10331 ++ + .../drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h | 400 + + .../amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h | 942 + + .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 31873 ++++ + .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 152495 ++++++++++++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 67 +- + .../drm/amd/include/dimgrey_cavefish_ip_offset.h | 1049 + + drivers/gpu/drm/amd/include/vangogh_ip_offset.h | 1516 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 47 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 20 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 239 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 53 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h | 120 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 86 + + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h | 8 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 85 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 5 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 88 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 207 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 354 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 7 - + drivers/pci/pcie/err.c | 41 +- + include/drm/amd_asic_type.h | 2 + + include/uapi/drm/amdgpu_drm.h | 4 + + 171 files changed, 280771 insertions(+), 999 deletions(-) + create mode 100755 drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h +Merging drm-intel/for-linux-next (214bba50616f drm/i915: Set all unused color plane offsets to ~0xfff again) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 17 +++++------------ + 2 files changed, 6 insertions(+), 13 deletions(-) +Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (d3c8f2784d32 drm/ingenic: Fix bad revert) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (d1ea91492585 drm/msm/dp: fix incorrect function prototype of dp_debug_get()) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++----- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +++--- + drivers/gpu/drm/imx/imx-tve.c | 38 +++------------------ + drivers/gpu/ipu-v3/ipu-common.c | 67 -------------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 5 files changed, 13 insertions(+), 117 deletions(-) +Merging etnaviv/etnaviv/next (3136fed4f91e drm/etnaviv: Drop local dma_parms) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 -- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 78 ++++++++++++++++++++++--------- + 3 files changed, 55 insertions(+), 27 deletions(-) +Merging regmap/for-next (6e0545c4f083 Merge remote-tracking branch 'regmap/for-5.10' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (f401b2c9931a Merge tag 'asoc-v5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (2ebefde9de62 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (fdf09ab88782 module: statically initialize init section freeing data) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) +Merging input/next (8a30c6eb29e0 Input: Add MAINTAINERS entry for SiS i2c touch input driver) +$ git merge input/next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/input/joystick/Kconfig +Auto-merging drivers/hid/hid-rmi.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a8aa66ebe71e] Merge remote-tracking branch 'input/next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/adc-joystick.yaml | 121 +++++ + .../bindings/input/touchscreen/zinitix.txt | 40 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 7 + + drivers/hid/hid-rmi.c | 2 +- + drivers/input/evdev.c | 19 +- + drivers/input/input-mt.c | 11 +- + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/adc-joystick.c | 264 ++++++++++ + drivers/input/keyboard/ep93xx_keypad.c | 4 +- + drivers/input/keyboard/omap4-keypad.c | 6 +- + drivers/input/keyboard/twl4030_keypad.c | 8 +- + drivers/input/misc/soc_button_array.c | 100 +++- + drivers/input/mouse/synaptics.c | 6 +- + drivers/input/rmi4/Kconfig | 8 + + drivers/input/rmi4/Makefile | 1 + + drivers/input/rmi4/rmi_bus.c | 3 + + drivers/input/rmi4/rmi_driver.h | 1 + + drivers/input/rmi4/rmi_f30.c | 14 +- + drivers/input/rmi4/rmi_f34v7.c | 9 +- + drivers/input/rmi4/rmi_f3a.c | 241 +++++++++ + drivers/input/serio/sun4i-ps2.c | 9 +- + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/elants_i2c.c | 8 +- + drivers/input/touchscreen/imx6ul_tsc.c | 47 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 131 ++--- + drivers/input/touchscreen/stmfts.c | 2 +- + drivers/input/touchscreen/zinitix.c | 581 +++++++++++++++++++++ + drivers/platform/x86/thinkpad_acpi.c | 18 +- + include/linux/rmi.h | 11 +- + include/uapi/linux/input-event-codes.h | 4 + + 33 files changed, 1531 insertions(+), 171 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adc-joystick.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix.txt + create mode 100644 drivers/input/joystick/adc-joystick.c + create mode 100644 drivers/input/rmi4/rmi_f3a.c + create mode 100644 drivers/input/touchscreen/zinitix.c +Merging block/for-next (03b2b7a06710 Merge branch 'io_uring-5.10' into for-next) +$ git merge block/for-next +Auto-merging fs/io_uring.c +Auto-merging drivers/block/nbd.c +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.rst | 8 ++ + block/blk-core.c | 4 + + drivers/block/nbd.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 19 ++-- + drivers/nvme/host/core.c | 4 + + drivers/scsi/scsi_lib.c | 9 ++ + fs/io_uring.c | 188 +++++++++++++++--------------------- + include/linux/blk_types.h | 18 ++++ + mm/readahead.c | 20 ++-- + 9 files changed, 145 insertions(+), 127 deletions(-) +Merging device-mapper/for-next (681cc5e8667e dm: fix request-based DM to not bounce through indirect dm_submit_bio) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Auto-merging block/blk-mq.c +Merge made by the 'recursive' strategy. + block/blk-mq.c | 1 - + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-core.h | 56 ++++- + drivers/md/dm-crypt.c | 17 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-mpath.c | 16 +- + drivers/md/dm-raid.c | 9 - + drivers/md/dm-rq.c | 2 +- + drivers/md/dm-snap-persistent.c | 11 +- + drivers/md/dm-table.c | 84 +------ + drivers/md/dm-thin-metadata.c | 6 +- + drivers/md/dm.c | 404 +++++++++++----------------------- + drivers/md/dm.h | 3 - + drivers/md/persistent-data/dm-btree.c | 3 +- + include/linux/device-mapper.h | 1 - + include/uapi/linux/dm-ioctl.h | 4 +- + 16 files changed, 224 insertions(+), 397 deletions(-) +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (1e23400f1a73 mmc: sdhci_am654: Fix module autoload) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (6d81dc3c79d4 mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI) +$ git merge mfd/for-mfd-next +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/pwm/Kconfig +Auto-merging drivers/mfd/syscon.c +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging Documentation/hwmon/index.rst +Removing Documentation/devicetree/bindings/mfd/lp87565.txt +Removing Documentation/devicetree/bindings/arm/samsung/sysreg.yaml +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 22befe9e487c] Merge remote-tracking branch 'mfd/for-mfd-next' into master +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-m10-bmc | 15 ++ + .../devicetree/bindings/arm/samsung/sysreg.yaml | 45 ---- + .../bindings/gpio/kontron,sl28cpld-gpio.yaml | 54 +++++ + .../bindings/hwmon/kontron,sl28cpld-hwmon.yaml | 27 +++ + .../kontron,sl28cpld-intc.yaml | 54 +++++ + Documentation/devicetree/bindings/mfd/ab8500.txt | 4 +- + Documentation/devicetree/bindings/mfd/act8945a.txt | 2 +- + .../devicetree/bindings/mfd/ene-kb3930.yaml | 55 +++++ + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 3 +- + .../devicetree/bindings/mfd/kontron,sl28cpld.yaml | 153 ++++++++++++ + Documentation/devicetree/bindings/mfd/lp87565.txt | 79 ------ + .../devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 4 + + .../devicetree/bindings/mfd/ti,lp87524-q1.yaml | 112 +++++++++ + .../devicetree/bindings/mfd/ti,lp87561-q1.yaml | 83 +++++++ + .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 101 ++++++++ + .../bindings/pwm/kontron,sl28cpld-pwm.yaml | 35 +++ + .../bindings/watchdog/kontron,sl28cpld-wdt.yaml | 35 +++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sl28cpld.rst | 36 +++ + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-sl28cpld.c | 161 ++++++++++++ + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/sl28cpld-hwmon.c | 142 +++++++++++ + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-sl28cpld.c | 96 ++++++++ + drivers/mfd/Kconfig | 52 +++- + drivers/mfd/Makefile | 3 + + drivers/mfd/dm355evm_msp.c | 76 ++++-- + drivers/mfd/ene-kb3930.c | 212 ++++++++++++++++ + drivers/mfd/intel-lpss-pci.c | 4 + + drivers/mfd/intel-m10-bmc.c | 164 +++++++++++++ + drivers/mfd/kempld-core.c | 117 ++++++++- + drivers/mfd/khadas-mcu.c | 2 + + drivers/mfd/lp87565.c | 4 + + drivers/mfd/madera-core.c | 11 +- + drivers/mfd/mt6360-core.c | 1 - + drivers/mfd/rn5t618.c | 1 + + drivers/mfd/simple-mfd-i2c.c | 57 +++++ + drivers/mfd/sm501.c | 8 +- + drivers/mfd/sprd-sc27xx-spi.c | 28 ++- + drivers/mfd/stmfx.c | 8 +- + drivers/mfd/syscon.c | 2 +- + drivers/mfd/wcd934x.c | 9 +- + drivers/pwm/Kconfig | 10 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-sl28cpld.c | 270 +++++++++++++++++++++ + drivers/watchdog/Kconfig | 11 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/sl28cpld_wdt.c | 229 +++++++++++++++++ + include/linux/mfd/intel-m10-bmc.h | 65 +++++ + include/linux/mfd/lp87565.h | 1 + + 55 files changed, 2493 insertions(+), 186 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-m10-bmc + delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ene-kb3930.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt + create mode 100644 Documentation/devicetree/bindings/mfd/ti,lp87524-q1.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,lp87561-q1.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,lp87565-q1.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml + create mode 100644 Documentation/hwmon/sl28cpld.rst + create mode 100644 drivers/gpio/gpio-sl28cpld.c + create mode 100644 drivers/hwmon/sl28cpld-hwmon.c + create mode 100644 drivers/irqchip/irq-sl28cpld.c + create mode 100644 drivers/mfd/ene-kb3930.c + create mode 100644 drivers/mfd/intel-m10-bmc.c + create mode 100644 drivers/mfd/simple-mfd-i2c.c + create mode 100644 drivers/pwm/pwm-sl28cpld.c + create mode 100644 drivers/watchdog/sl28cpld_wdt.c + create mode 100644 include/linux/mfd/intel-m10-bmc.h +Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header) +$ git merge backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/backlight/common.yaml | 34 ++++ + .../bindings/leds/backlight/kinetic,ktd253.yaml | 46 +++++ + MAINTAINERS | 6 + + drivers/video/backlight/Kconfig | 8 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/ktd253-backlight.c | 198 +++++++++++++++++++++ + drivers/video/backlight/sky81452-backlight.c | 1 + + drivers/video/backlight/tosa_bl.c | 2 +- + drivers/video/backlight/tosa_lcd.c | 2 +- + 9 files changed, 296 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/common.yaml + create mode 100644 Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml + create mode 100644 drivers/video/backlight/ktd253-backlight.c +Merging battery/for-next (6c59a17b0d59 power: supply: bq25980: Fix uninitialized wd_reg_val and overrun) +$ git merge battery/for-next +Removing include/linux/power/smb347-charger.h +Auto-merging drivers/power/supply/sbs-battery.c +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/supply/ingenic,battery.txt +Removing Documentation/devicetree/bindings/power/reset/reboot-mode.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 8 +- + .../bindings/power/reset/ocelot-reset.txt | 7 +- + .../bindings/power/reset/reboot-mode.txt | 25 - + .../bindings/power/reset/reboot-mode.yaml | 47 + + .../devicetree/bindings/power/supply/battery.yaml | 24 + + .../devicetree/bindings/power/supply/bq25890.txt | 4 + + .../devicetree/bindings/power/supply/bq25980.yaml | 114 ++ + .../devicetree/bindings/power/supply/bq27xxx.yaml | 1 + + .../bindings/power/supply/charger-manager.txt | 30 +- + .../bindings/power/supply/gpio-charger.yaml | 31 + + .../bindings/power/supply/ingenic,battery.txt | 31 - + .../bindings/power/supply/ingenic,battery.yaml | 61 + + .../bindings/power/supply/max17040_battery.txt | 21 +- + MAINTAINERS | 4 +- + arch/arm/mach-pxa/tosa.c | 12 +- + arch/arm/mach-sa1100/collie.c | 14 +- + drivers/power/reset/Kconfig | 3 +- + drivers/power/reset/ocelot-reset.c | 55 +- + drivers/power/supply/Kconfig | 36 +- + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 4 +- + drivers/power/supply/bq24257_charger.c | 2 + + drivers/power/supply/bq2515x_charger.c | 14 +- + drivers/power/supply/bq25890_charger.c | 17 +- + drivers/power/supply/bq25980_charger.c | 1314 ++++++++++++++++++++ + drivers/power/supply/bq25980_charger.h | 178 +++ + drivers/power/supply/bq27xxx_battery.c | 102 +- + drivers/power/supply/bq27xxx_battery_hdq.c | 9 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 12 +- + drivers/power/supply/charger-manager.c | 578 +++------ + drivers/power/supply/cpcap-battery.c | 7 +- + drivers/power/supply/ds2780_battery.c | 6 +- + drivers/power/supply/ds2781_battery.c | 6 +- + drivers/power/supply/goldfish_battery.c | 2 + + drivers/power/supply/gpio-charger.c | 172 ++- + drivers/power/supply/ingenic-battery.c | 8 +- + drivers/power/supply/lego_ev3_battery.c | 24 +- + drivers/power/supply/ltc2941-battery-gauge.c | 3 +- + drivers/power/supply/max17040_battery.c | 489 +++++--- + drivers/power/supply/pm2301_charger.c | 7 +- + drivers/power/supply/power_supply_core.c | 19 + + drivers/power/supply/power_supply_sysfs.c | 1 + + drivers/power/supply/rn5t618_power.c | 556 +++++++++ + drivers/power/supply/rt9455_charger.c | 2 + + drivers/power/supply/sbs-battery.c | 125 +- + drivers/power/supply/smb347-charger.c | 692 ++++++----- + drivers/power/supply/test_power.c | 26 +- + drivers/power/supply/ucs1002_power.c | 75 +- + include/linux/power/bq27xxx_battery.h | 1 + + include/linux/power/charger-manager.h | 41 +- + include/linux/power/gpio-charger.h | 6 - + include/linux/power/smb347-charger.h | 114 -- + include/linux/power_supply.h | 7 + + 53 files changed, 3766 insertions(+), 1383 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/bq25980.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/ingenic,battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/ingenic,battery.yaml + create mode 100644 drivers/power/supply/bq25980_charger.c + create mode 100644 drivers/power/supply/bq25980_charger.h + create mode 100644 drivers/power/supply/rn5t618_power.c + delete mode 100644 include/linux/power/smb347-charger.h +Merging regulator/for-next (c6e70a6fd5ce Merge remote-tracking branch 'regulator/for-5.10' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (aa662fc04f5b ima: Fix NULL pointer dereference in ima_file_hash) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging security/integrity/digsig_asymmetric.c +Merge made by the 'recursive' strategy. + security/integrity/digsig_asymmetric.c | 10 ++- + security/integrity/evm/evm_main.c | 9 ++ + security/integrity/ima/ima_appraise.c | 27 ++++-- + security/integrity/ima/ima_crypto.c | 2 + + security/integrity/ima/ima_main.c | 23 ++++- + security/integrity/ima/ima_policy.c | 153 ++++++++++++++++++++++----------- + security/integrity/ima/ima_queue.c | 2 +- + security/integrity/integrity_audit.c | 2 +- + 8 files changed, 161 insertions(+), 67 deletions(-) +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/SafeSetID.rst | 29 +++-- + kernel/capability.c | 2 +- + kernel/groups.c | 2 +- + kernel/sys.c | 10 +- + security/safesetid/lsm.c | 190 +++++++++++++++++++++------- + security/safesetid/lsm.h | 38 ++++-- + security/safesetid/securityfs.c | 190 ++++++++++++++++++++-------- + 7 files changed, 336 insertions(+), 125 deletions(-) +Merging selinux/next (0d50f059c4cd selinux: provide a "no sooner than" date for the checkreqprot removal) +$ git merge selinux/next +Already up to date. +Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (5384d92e4e02 tomoyo: Loosen pathname/domainname validation.) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. +Merging tpmdd/next (865c50e1d279 x86/uaccess: utilize CONFIG_CC_HAS_ASM_GOTO_OUTPUT) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (c5b8e4644607 watchdog: Add Toshiba Visconti watchdog driver) +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/watchdog/toshiba,visconti-wdt.yaml | 54 ++++++ + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/cadence_wdt.c | 9 +- + drivers/watchdog/davinci_wdt.c | 9 +- + drivers/watchdog/imx7ulp_wdt.c | 79 +++++++-- + drivers/watchdog/it87_wdt.c | 6 +- + drivers/watchdog/pcwd_usb.c | 2 +- + drivers/watchdog/rdc321x_wdt.c | 5 +- + drivers/watchdog/renesas_wdt.c | 12 +- + drivers/watchdog/rti_wdt.c | 14 +- + drivers/watchdog/sp5100_tco.c | 18 ++ + drivers/watchdog/sp5100_tco.h | 2 +- + drivers/watchdog/visconti_wdt.c | 195 +++++++++++++++++++++ + drivers/watchdog/watchdog_dev.c | 8 +- + 15 files changed, 374 insertions(+), 48 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml + create mode 100644 drivers/watchdog/visconti_wdt.c +Merging iommu/next (7e3c3883c381 Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging audit/next (c07203516439 audit: Remove redundant null check) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (bd36e51d10e7 dt-bindings: misc: explicitly add #address-cells for slave mode) +$ git merge devicetree/for-next +Auto-merging Documentation/x86/index.rst +CONFLICT (content): Merge conflict in Documentation/x86/index.rst +Removing Documentation/devicetree/booting-without-of.rst +Removing Documentation/devicetree/bindings/watchdog/arm,sp805.txt +Removing Documentation/devicetree/bindings/w1/fsl-imx-owire.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/timer/arm,sp804.txt +Removing Documentation/devicetree/bindings/spmi/spmi.txt +Auto-merging Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml +Auto-merging Documentation/devicetree/bindings/spi/renesas,rspi.yaml +Auto-merging Documentation/devicetree/bindings/sound/tlv320adcx140.yaml +Auto-merging Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml +Removing Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt +Removing Documentation/devicetree/bindings/serial/fsl-lpuart.txt +Removing Documentation/devicetree/bindings/serial/fsl-imx-uart.txt +Removing Documentation/devicetree/bindings/rng/imx-rng.txt +Removing Documentation/devicetree/bindings/riscv/sifive-l2-cache.txt +Removing Documentation/devicetree/bindings/pwm/pwm-sifive.txt +Removing Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt +Removing Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt +Removing Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt +Auto-merging Documentation/devicetree/bindings/pci/rcar-pci-ep.yaml +Removing Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt +Auto-merging Documentation/devicetree/bindings/net/ethernet-controller.yaml +Auto-merging Documentation/devicetree/bindings/mtd/nand-controller.yaml +Auto-merging Documentation/devicetree/bindings/mmc/owl-mmc.yaml +Auto-merging Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml +Auto-merging Documentation/devicetree/bindings/mmc/mmc-controller.yaml +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml +Auto-merging Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml +Auto-merging Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml +Removing Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.txt +Removing Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt +Removing Documentation/devicetree/bindings/hwlock/omap-hwspinlock.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml +Removing Documentation/devicetree/bindings/gpio/gpio-vf610.txt +Auto-merging Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml +Removing Documentation/devicetree/bindings/eeprom/at25.txt +Auto-merging Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml +Removing Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt +Removing Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt +Removing Documentation/devicetree/bindings/crypto/fsl-dcp.txt +Removing Documentation/devicetree/bindings/connector/samsung,usb-connector-11pin.txt +Removing Documentation/devicetree/bindings/clock/sifive/fu540-prci.txt +Removing Documentation/devicetree/bindings/clock/imx8mq-clock.yaml +Removing Documentation/devicetree/bindings/clock/imx8mp-clock.yaml +Removing Documentation/devicetree/bindings/clock/imx8mn-clock.yaml +Removing Documentation/devicetree/bindings/clock/imx8mm-clock.yaml +Removing Documentation/devicetree/bindings/ata/imx-sata.txt +Auto-merging Documentation/devicetree/bindings/arm/tegra.yaml +Auto-merging Documentation/devicetree/bindings/arm/stm32/stm32.yaml +Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Removing Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +Removing Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt +Removing Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt +Removing Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt +Removing Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.txt +Auto-merging Documentation/devicetree/bindings/arm/actions.yaml +Recorded preimage for 'Documentation/x86/index.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/x86/index.rst'. +[master 8767c9c95180] Merge remote-tracking branch 'devicetree/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/.gitignore | 1 + + Documentation/devicetree/bindings/.yamllint | 39 + + Documentation/devicetree/bindings/Makefile | 52 +- + Documentation/devicetree/bindings/arm/actions.yaml | 2 + + Documentation/devicetree/bindings/arm/altera.yaml | 2 + + Documentation/devicetree/bindings/arm/axxia.yaml | 2 + + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 2 + + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 + + .../devicetree/bindings/arm/coresight-cti.yaml | 2 + + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/arm/digicolor.yaml | 2 + + .../bindings/arm/freescale/fsl,imx7ulp-pm.txt | 23 - + .../bindings/arm/freescale/fsl,imx7ulp-pm.yaml | 42 + + .../bindings/arm/freescale/fsl,imx7ulp-sim.txt | 16 - + .../bindings/arm/freescale/fsl,imx7ulp-sim.yaml | 38 + + .../bindings/arm/hisilicon/controller/cpuctrl.yaml | 54 + + .../hisilicon/controller/hi3798cv200-perictrl.yaml | 64 + + .../hisilicon/controller/hi6220-domain-ctrl.yaml | 68 + + .../hisilicon/controller/hip04-bootwrapper.yaml | 34 + + .../arm/hisilicon/controller/hip04-fabric.yaml | 27 + + .../bindings/arm/hisilicon/controller/pctrl.yaml | 34 + + .../bindings/arm/hisilicon/controller/sysctrl.yaml | 132 ++ + .../bindings/arm/hisilicon/hi3519-sysctrl.txt | 14 - + .../arm/hisilicon/hisilicon-low-pin-count.txt | 33 - + .../bindings/arm/hisilicon/hisilicon.txt | 319 ---- + .../bindings/arm/hisilicon/hisilicon.yaml | 67 + + .../bindings/arm/hisilicon/low-pin-count.yaml | 61 + + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 + + .../bindings/arm/mediatek/mediatek,pericfg.yaml | 2 + + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 2 + + Documentation/devicetree/bindings/arm/pmu.yaml | 2 + + .../devicetree/bindings/arm/primecell.yaml | 3 + + Documentation/devicetree/bindings/arm/qcom.yaml | 2 + + Documentation/devicetree/bindings/arm/rda.yaml | 2 + + .../devicetree/bindings/arm/samsung/pmu.yaml | 3 + + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 2 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 2 + + Documentation/devicetree/bindings/arm/tegra.yaml | 2 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 2 + + .../devicetree/bindings/ata/faraday,ftide010.yaml | 2 + + Documentation/devicetree/bindings/ata/imx-sata.txt | 37 - + .../devicetree/bindings/ata/imx-sata.yaml | 83 + + .../devicetree/bindings/ata/pata-common.yaml | 2 + + .../devicetree/bindings/ata/sata-common.yaml | 2 + + .../devicetree/bindings/bus/mti,mips-cdmm.yaml | 2 + + .../devicetree/bindings/bus/renesas,bsc.yaml | 2 + + .../devicetree/bindings/bus/simple-pm-bus.yaml | 2 + + .../bus/socionext,uniphier-system-bus.yaml | 7 + + .../bindings/chrome/google,cros-ec-typec.yaml | 2 + + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 2 + + .../bindings/clock/baikal,bt1-ccu-div.yaml | 6 +- + .../bindings/clock/baikal,bt1-ccu-pll.yaml | 2 +- + .../devicetree/bindings/clock/idt,versaclock5.yaml | 20 +- + .../devicetree/bindings/clock/imx23-clock.yaml | 4 +- + .../devicetree/bindings/clock/imx28-clock.yaml | 6 +- + .../devicetree/bindings/clock/imx6q-clock.yaml | 2 + + .../devicetree/bindings/clock/imx6sl-clock.yaml | 2 + + .../devicetree/bindings/clock/imx6sll-clock.yaml | 2 + + .../devicetree/bindings/clock/imx6sx-clock.yaml | 2 + + .../devicetree/bindings/clock/imx6ul-clock.yaml | 2 + + .../devicetree/bindings/clock/imx8m-clock.yaml | 125 ++ + .../devicetree/bindings/clock/imx8mm-clock.yaml | 68 - + .../devicetree/bindings/clock/imx8mn-clock.yaml | 70 - + .../devicetree/bindings/clock/imx8mp-clock.yaml | 70 - + .../devicetree/bindings/clock/imx8mq-clock.yaml | 72 - + .../devicetree/bindings/clock/intel,cgu-lgm.yaml | 2 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 + + .../bindings/clock/sifive/fu540-prci.txt | 46 - + .../bindings/clock/sifive/fu540-prci.yaml | 60 + + .../bindings/clock/sprd,sc9863a-clk.yaml | 2 + + .../bindings/clock/ti,am654-ehrpwm-tbclk.yaml | 2 + + .../connector/samsung,usb-connector-11pin.txt | 49 - + .../bindings/connector/usb-connector.yaml | 76 +- + .../devicetree/bindings/crypto/fsl-dcp.txt | 18 - + .../devicetree/bindings/crypto/fsl-dcp.yaml | 51 + + .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 15 - + .../devicetree/bindings/crypto/fsl-imx-sahara.yaml | 37 + + .../devicetree/bindings/crypto/fsl-imx-scc.txt | 21 - + .../devicetree/bindings/crypto/fsl-imx-scc.yaml | 54 + + .../bindings/crypto/samsung-slimsss.yaml | 2 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 11 +- + .../bindings/display/brcm,bcm2835-dsi0.yaml | 3 + + .../bindings/display/bridge/ite,it6505.yaml | 5 + + .../bindings/display/bridge/lvds-codec.yaml | 3 + + .../bindings/display/bridge/nwl-dsi.yaml | 15 +- + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 2 + + .../bindings/display/dsi-controller.yaml | 2 + + .../devicetree/bindings/display/msm/gmu.yaml | 2 + + .../devicetree/bindings/display/panel/lvds.yaml | 2 + + .../bindings/display/panel/panel-common.yaml | 2 + + .../display/panel/samsung,amoled-mipi-dsi.yaml | 12 +- + .../bindings/display/panel/tpo,tpg110.yaml | 2 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 23 +- + .../devicetree/bindings/dma/dma-common.yaml | 2 + + .../devicetree/bindings/dma/dma-controller.yaml | 2 + + .../devicetree/bindings/dma/dma-router.yaml | 2 + + .../devicetree/bindings/dma/ingenic,dma.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/ti/k3-udma.yaml | 2 + + .../devicetree/bindings/edac/dmc-520.yaml | 2 + + Documentation/devicetree/bindings/eeprom/at25.txt | 45 - + Documentation/devicetree/bindings/eeprom/at25.yaml | 129 ++ + .../devicetree/bindings/example-schema.yaml | 33 +- + .../devicetree/bindings/extcon/wlf,arizona.yaml | 2 + + .../devicetree/bindings/fsi/ibm,fsi2spi.yaml | 2 + + .../devicetree/bindings/gpio/gpio-vf610.txt | 63 - + .../devicetree/bindings/gpio/gpio-vf610.yaml | 83 + + .../bindings/gpio/socionext,uniphier-gpio.yaml | 2 + + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 1 + + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 4 +- + .../devicetree/bindings/gpu/samsung-rotator.yaml | 6 + + .../devicetree/bindings/gpu/vivante,gc.yaml | 9 +- + .../devicetree/bindings/hwlock/omap-hwspinlock.txt | 41 - + .../bindings/hwlock/ti,omap-hwspinlock.yaml | 76 + + .../bindings/hwmon/adi,axi-fan-control.yaml | 2 + + .../devicetree/bindings/hwmon/adt7475.yaml | 2 + + .../devicetree/bindings/hwmon/baikal,bt1-pvt.yaml | 4 +- + .../bindings/i2c/amlogic,meson6-i2c.yaml | 2 + + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 + + .../devicetree/bindings/i2c/i2c-gpio.yaml | 2 + + .../devicetree/bindings/i2c/i2c-rk3x.yaml | 2 + + .../bindings/i2c/socionext,uniphier-fi2c.yaml | 2 + + .../bindings/i2c/socionext,uniphier-i2c.yaml | 2 + + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 2 + + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 + + .../bindings/iio/accel/adi,adis16240.yaml | 4 + + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 4 + + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 4 + + .../bindings/iio/accel/kionix,kxsd9.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 6 + + .../devicetree/bindings/iio/adc/adi,ad7923.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/qcom,spmi-vadc.yaml | 4 + + .../bindings/iio/adc/samsung,exynos-adc.yaml | 5 + + .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 4 + + .../bindings/iio/amplifiers/adi,hmc425a.yaml | 2 + + Documentation/devicetree/bindings/iio/common.yaml | 2 + + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 10 + + .../devicetree/bindings/iio/frequency/adf4371.yaml | 4 + + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 4 + + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 2 + + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 4 + + .../bindings/iio/imu/invensense,icm42600.yaml | 6 + + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 4 + + .../bindings/iio/light/amstaos,tsl2563.yaml | 2 + + .../bindings/iio/light/dynaimage,al3010.yaml | 2 + + .../bindings/iio/light/dynaimage,al3320a.yaml | 2 + + .../bindings/iio/light/sharp,gp2ap002.yaml | 2 + + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 2 + + .../bindings/iio/proximity/vishay,vcnl3020.yaml | 2 + + .../bindings/input/fsl,mpr121-touchkey.yaml | 2 + + Documentation/devicetree/bindings/input/input.yaml | 2 + + .../devicetree/bindings/input/matrix-keymap.yaml | 2 + + .../bindings/input/touchscreen/touchscreen.yaml | 2 + + .../interrupt-controller/fsl,irqsteer.yaml | 8 +- + .../interrupt-controller/img,meta-intc.txt | 82 - + .../interrupt-controller/ingenic,intc.yaml | 2 + + .../interrupt-controller/loongson,htpic.yaml | 2 + + .../interrupt-controller/loongson,liointc.yaml | 2 + + .../interrupt-controller/loongson,pch-msi.yaml | 2 + + .../interrupt-controller/loongson,pch-pic.yaml | 2 + + .../bindings/interrupt-controller/mti,gic.yaml | 2 +- + .../interrupt-controller/sifive,plic-1.0.0.txt | 58 - + .../interrupt-controller/sifive,plic-1.0.0.yaml | 97 ++ + .../devicetree/bindings/ipmi/ipmi-smic.yaml | 2 + + Documentation/devicetree/bindings/leds/common.yaml | 2 + + .../bindings/leds/leds-class-multicolor.yaml | 3 + + .../devicetree/bindings/leds/leds-lp55xx.yaml | 8 + + .../devicetree/bindings/leds/trigger-source.yaml | 2 + + .../devicetree/bindings/mailbox/fsl,mu.yaml | 6 +- + .../bindings/media/i2c/chrontel,ch7322.yaml | 2 + + .../bindings/media/i2c/imi,rdacm2x-gmsl.yaml | 2 + + .../devicetree/bindings/media/nxp,imx8mq-vpu.yaml | 2 + + .../bindings/media/qcom,msm8916-venus.yaml | 2 + + .../bindings/media/qcom,msm8996-venus.yaml | 2 + + .../bindings/media/qcom,sc7180-venus.yaml | 2 + + .../bindings/media/qcom,sdm845-venus-v2.yaml | 2 + + .../bindings/media/qcom,sdm845-venus.yaml | 2 + + Documentation/devicetree/bindings/media/rc.yaml | 2 + + .../bindings/memory-controllers/fsl/mmdc.yaml | 2 + + .../memory-controllers/renesas,rpc-if.yaml | 2 + + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 2 + + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 10 +- + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 2 + + .../devicetree/bindings/mfd/google,cros-ec.yaml | 8 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 +- + .../devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 9 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 9 +- + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 14 +- + .../bindings/mips/ingenic/ingenic,cpu.yaml | 6 +- + .../bindings/mips/loongson/rs780e-acpi.yaml | 2 + + .../devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 + + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 + + .../devicetree/bindings/mmc/ingenic,mmc.yaml | 2 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 2 + + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 + + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 + + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 + + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 + + .../devicetree/bindings/mmc/sdhci-pxa.yaml | 2 + + .../bindings/mmc/socionext,uniphier-sd.yaml | 2 + + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 2 + + .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 2 + + .../devicetree/bindings/mtd/denali,nand.yaml | 2 + + .../devicetree/bindings/mtd/gpmi-nand.yaml | 18 +- + .../devicetree/bindings/mtd/ingenic,nand.yaml | 2 + + .../devicetree/bindings/mtd/nand-controller.yaml | 2 + + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 2 + + .../devicetree/bindings/net/adi,adin.yaml | 2 + + .../bindings/net/amlogic,meson-dwmac.yaml | 2 + + .../bindings/net/aspeed,ast2600-mdio.yaml | 2 + + .../bindings/net/can/can-transceiver.yaml | 2 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 + + .../bindings/net/ethernet-controller.yaml | 2 + + .../devicetree/bindings/net/ethernet-phy.yaml | 2 + + .../devicetree/bindings/net/marvell,mvusb.yaml | 2 + + Documentation/devicetree/bindings/net/mdio.yaml | 2 + + .../bindings/net/mediatek,star-emac.yaml | 2 + + .../devicetree/bindings/net/nxp,tja11xx.yaml | 2 + + .../devicetree/bindings/net/qca,ar71xx.yaml | 2 + + .../devicetree/bindings/net/qca,ar803x.yaml | 2 + + .../devicetree/bindings/net/qcom,ipa.yaml | 2 + + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 + + .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 2 + + .../devicetree/bindings/net/realtek-bluetooth.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 2 + + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 2 + + .../devicetree/bindings/net/ti,dp83867.yaml | 2 + + .../devicetree/bindings/net/ti,dp83869.yaml | 2 + + .../bindings/net/wireless/microchip,wilc1000.yaml | 4 + + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 40 +- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 2 + + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 + + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 + + .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 21 - + .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 33 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 + + .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 +- + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 2 + + .../bindings/pci/cdns,cdns-pcie-host.yaml | 2 + + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 2 + + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 2 + + .../devicetree/bindings/pci/cdns-pcie.yaml | 2 + + .../devicetree/bindings/pci/host-generic-pci.yaml | 2 + + .../devicetree/bindings/pci/loongson.yaml | 2 + + Documentation/devicetree/bindings/pci/pci-ep.yaml | 2 + + .../devicetree/bindings/pci/rcar-pci-ep.yaml | 2 + + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 2 + + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 2 + + .../devicetree/bindings/pci/versatile.yaml | 2 + + .../devicetree/bindings/perf/fsl-imx-ddr.txt | 22 - + .../devicetree/bindings/perf/fsl-imx-ddr.yaml | 49 + + .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 2 + + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 60 + + .../devicetree/bindings/phy/phy-hi3660-usb3.txt | 26 - + .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 - + .../bindings/phy/qcom,ipq806x-usb-phy-hs.yaml | 2 + + .../bindings/phy/qcom,ipq806x-usb-phy-ss.yaml | 2 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom-usb-ipq4019-phy.yaml | 2 + + .../bindings/pinctrl/cirrus,lochnagar.yaml | 2 + + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 2 + + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 2 + + .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 2 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 2 + + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 2 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 6 +- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 2 + + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 2 + + .../bindings/power/domain-idle-state.yaml | 2 + + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 4 + + .../devicetree/bindings/power/mti,mips-cpc.yaml | 2 + + .../devicetree/bindings/power/pd-samsung.yaml | 2 + + .../devicetree/bindings/power/power-domain.yaml | 2 + + .../bindings/power/supply/act8945a-charger.txt | 2 +- + .../bindings/power/supply/cw2015_battery.yaml | 2 + + .../bindings/power/supply/power-supply.yaml | 2 + + .../bindings/power/supply/rohm,bd99954.yaml | 8 + + .../devicetree/bindings/powerpc/sleep.yaml | 47 + + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 25 +- + .../devicetree/bindings/pwm/pwm-sifive.txt | 33 - + .../devicetree/bindings/pwm/pwm-sifive.yaml | 69 + + Documentation/devicetree/bindings/pwm/pwm.yaml | 2 + + .../bindings/regulator/fixed-regulator.yaml | 2 + + .../regulator/google,cros-ec-regulator.yaml | 2 + + .../bindings/regulator/gpio-regulator.yaml | 2 + + .../bindings/regulator/qcom-labibb-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/regulator.yaml | 2 + + .../bindings/regulator/silergy,sy8827n.yaml | 2 + + .../bindings/regulator/st,stm32-booster.yaml | 2 + + .../bindings/regulator/st,stm32-vrefbuf.yaml | 2 + + .../regulator/vqmmc-ipq4019-regulator.yaml | 2 + + .../devicetree/bindings/regulator/wlf,arizona.yaml | 2 + + .../bindings/remoteproc/qcom,pil-info.yaml | 2 + + .../bindings/reserved-memory/reserved-memory.txt | 3 + + .../devicetree/bindings/reset/fsl,imx7-src.yaml | 19 +- + .../bindings/reset/nuvoton,npcm-reset.txt | 2 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 2 + + .../devicetree/bindings/riscv/sifive-l2-cache.txt | 51 - + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 98 ++ + Documentation/devicetree/bindings/rng/imx-rng.txt | 23 - + Documentation/devicetree/bindings/rng/imx-rng.yaml | 52 + + .../devicetree/bindings/rtc/ingenic,rtc.yaml | 2 + + Documentation/devicetree/bindings/rtc/rtc.yaml | 2 + + Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 2 + + .../devicetree/bindings/serial/fsl-imx-uart.txt | 40 - + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 100 ++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 43 - + .../devicetree/bindings/serial/fsl-lpuart.yaml | 82 + + .../devicetree/bindings/serial/fsl-mxs-auart.txt | 53 - + .../devicetree/bindings/serial/fsl-mxs-auart.yaml | 91 ++ + .../devicetree/bindings/serial/ingenic,uart.yaml | 5 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 2 + + .../devicetree/bindings/serial/renesas,sci.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifa.yaml | 2 + + .../devicetree/bindings/serial/renesas,scifb.yaml | 2 + + .../devicetree/bindings/serial/rs485.yaml | 3 + + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + .../devicetree/bindings/serial/serial.yaml | 2 + + .../bindings/serial/snps-dw-apb-uart.yaml | 2 + + .../bindings/serial/socionext,uniphier-uart.yaml | 2 + + .../devicetree/bindings/serial/sprd-uart.yaml | 2 + + .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 1 + + .../devicetree/bindings/sound/amlogic,aiu.yaml | 2 + + .../bindings/sound/amlogic,g12a-toacodec.yaml | 2 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 2 + + .../devicetree/bindings/sound/amlogic,t9015.yaml | 2 + + .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 + + .../devicetree/bindings/sound/cirrus,madera.yaml | 2 + + .../devicetree/bindings/sound/fsl,easrc.yaml | 2 + + .../bindings/sound/intel,keembay-i2s.yaml | 2 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 + + .../bindings/sound/nvidia,tegra210-admaif.yaml | 2 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 3 + + .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 + + .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 + + .../bindings/sound/rockchip,rk3328-codec.yaml | 2 + + .../devicetree/bindings/sound/tlv320adcx140.yaml | 2 + + .../devicetree/bindings/sound/wlf,arizona.yaml | 2 + + .../bindings/soundwire/soundwire-controller.yaml | 2 + + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 2 + + .../bindings/spi/amlogic,meson6-spifc.yaml | 2 + + .../bindings/spi/mikrotik,rb4xx-spi.yaml | 2 + + .../devicetree/bindings/spi/qca,ar934x-spi.yaml | 2 + + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 2 + + .../devicetree/bindings/spi/renesas,hspi.yaml | 2 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 2 + + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 2 + + .../bindings/spi/socionext,uniphier-spi.yaml | 2 + + .../devicetree/bindings/spi/spi-controller.yaml | 22 +- + .../devicetree/bindings/spi/spi-gpio.yaml | 2 + + Documentation/devicetree/bindings/spi/spi-mux.yaml | 2 + + .../devicetree/bindings/spi/spi-pl022.yaml | 2 + + .../devicetree/bindings/spi/spi-rockchip.yaml | 2 + + .../devicetree/bindings/spi/spi-sifive.yaml | 2 + + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 2 + + .../devicetree/bindings/spi/st,stm32-spi.yaml | 2 + + .../bindings/spmi/qcom,spmi-pmic-arb.txt | 4 +- + Documentation/devicetree/bindings/spmi/spmi.txt | 41 - + Documentation/devicetree/bindings/spmi/spmi.yaml | 77 + + .../bindings/thermal/imx8mm-thermal.yaml | 10 +- + .../devicetree/bindings/thermal/rcar-thermal.yaml | 5 + + .../devicetree/bindings/thermal/sprd-thermal.yaml | 4 + + .../bindings/thermal/thermal-cooling-devices.yaml | 2 + + .../devicetree/bindings/thermal/thermal-idle.yaml | 2 + + .../bindings/thermal/thermal-sensor.yaml | 2 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 2 + + .../devicetree/bindings/timer/arm,sp804.txt | 29 - + .../devicetree/bindings/timer/arm,sp804.yaml | 97 ++ + .../devicetree/bindings/timer/cdns,ttc.yaml | 2 + + .../bindings/timer/samsung,exynos4210-mct.yaml | 25 + + .../bindings/timer/snps,dw-apb-timer.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 18 + + .../devicetree/bindings/usb/ti,tps6598x.yaml | 2 + + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 14 + + .../devicetree/bindings/w1/fsl-imx-owire.txt | 18 - + .../devicetree/bindings/w1/fsl-imx-owire.yaml | 44 + + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/arm,sp805.txt | 32 - + .../devicetree/bindings/watchdog/arm,sp805.yaml | 71 + + .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 2 +- + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 11 +- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 2 + + .../bindings/watchdog/st,stm32-iwdg.yaml | 2 + + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 2 + + .../devicetree/bindings/watchdog/watchdog.yaml | 2 + + Documentation/devicetree/booting-without-of.rst | 1585 -------------------- + Documentation/devicetree/index.rst | 1 - + Documentation/mips/booting.rst | 28 + + Documentation/mips/index.rst | 1 + + Documentation/powerpc/booting.rst | 110 ++ + Documentation/powerpc/index.rst | 1 + + Documentation/sh/booting.rst | 12 + + Documentation/sh/index.rst | 1 + + Documentation/x86/booting-dt.rst | 21 + + Documentation/x86/index.rst | 1 + + drivers/of/platform.c | 2 +- + scripts/Makefile.lib | 2 +- + scripts/dtc/checks.c | 4 +- + scripts/dtc/dtc-parser.y | 4 +- + scripts/dtc/dtx_diff | 3 +- + scripts/dtc/libfdt/fdt.c | 31 +- + scripts/dtc/libfdt/fdt_overlay.c | 3 +- + scripts/dtc/libfdt/fdt_ro.c | 20 +- + scripts/dtc/libfdt/fdt_rw.c | 2 +- + scripts/dtc/libfdt/fdt_strerror.c | 4 +- + scripts/dtc/libfdt/fdt_sw.c | 27 +- + scripts/dtc/libfdt/fdt_wip.c | 2 +- + scripts/dtc/util.h | 1 + + scripts/dtc/version_gen.h | 2 +- + 431 files changed, 3774 insertions(+), 3401 deletions(-) + create mode 100644 Documentation/devicetree/bindings/.yamllint + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hi3798cv200-perictrl.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hi6220-domain-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hip04-bootwrapper.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/hip04-fabric.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/pctrl.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hi3519-sysctrl.txt + delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon-low-pin-count.txt + delete mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml + create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt + create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8m-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mn-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mp-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sifive/fu540-prci.txt + create mode 100644 Documentation/devicetree/bindings/clock/sifive/fu540-prci.yaml + delete mode 100644 Documentation/devicetree/bindings/connector/samsung,usb-connector-11pin.txt + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-dcp.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-dcp.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.yaml + delete mode 100644 Documentation/devicetree/bindings/eeprom/at25.txt + create mode 100644 Documentation/devicetree/bindings/eeprom/at25.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.yaml + delete mode 100644 Documentation/devicetree/bindings/hwlock/omap-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.yaml + delete mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt + create mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt + create mode 100644 Documentation/devicetree/bindings/powerpc/sleep.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-sifive.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-sifive.yaml + delete mode 100644 Documentation/devicetree/bindings/riscv/sifive-l2-cache.txt + create mode 100644 Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/imx-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/imx-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-lpuart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-lpuart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml + delete mode 100644 Documentation/devicetree/bindings/spmi/spmi.txt + create mode 100644 Documentation/devicetree/bindings/spmi/spmi.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/arm,sp804.txt + create mode 100644 Documentation/devicetree/bindings/timer/arm,sp804.yaml + delete mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt + create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/arm,sp805.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/arm,sp805.yaml + delete mode 100644 Documentation/devicetree/booting-without-of.rst + create mode 100644 Documentation/mips/booting.rst + create mode 100644 Documentation/powerpc/booting.rst + create mode 100644 Documentation/sh/booting.rst + create mode 100644 Documentation/x86/booting-dt.rst +Merging mailbox/mailbox-for-next (62c04453381e mailbox: cancel timer before starting it) +$ git merge mailbox/mailbox-for-next +Removing Documentation/devicetree/bindings/mailbox/arm-mhu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/arm,mhu.yaml | 135 ++++++++ + .../devicetree/bindings/mailbox/arm-mhu.txt | 43 --- + drivers/mailbox/Makefile | 2 +- + drivers/mailbox/arm_mhu.c | 3 + + drivers/mailbox/arm_mhu_db.c | 354 +++++++++++++++++++++ + drivers/mailbox/bcm-pdc-mailbox.c | 6 +- + drivers/mailbox/mailbox.c | 8 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 8 +- + 8 files changed, 505 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/arm,mhu.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/arm-mhu.txt + create mode 100644 drivers/mailbox/arm_mhu_db.c +Merging spi/for-next (988731181359 Merge remote-tracking branch 'spi/for-5.10' into spi-next) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (80f92ca9b86c Merge branch 'core/rcu') +$ git merge tip/auto-latest +Removing tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/fork.c +Auto-merging kernel/Makefile +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 70 +++ + Documentation/admin-guide/kernel-parameters.txt | 170 +++++- + Documentation/userspace-api/spec_ctrl.rst | 8 + + MAINTAINERS | 3 +- + arch/arm/include/asm/assembler.h | 11 - + arch/arm/kernel/iwmmxt.S | 2 - + arch/arm/mach-ep93xx/crunch-bits.S | 2 - + arch/um/include/asm/cacheflush.h | 9 + + arch/x86/include/asm/atomic.h | 2 +- + arch/x86/include/asm/atomic64_64.h | 2 +- + arch/x86/include/asm/cacheflush.h | 8 + + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/kernel/cpu/bugs.c | 54 ++ + arch/x86/kernel/smpboot.c | 11 +- + arch/x86/kvm/mmu/page_track.c | 6 +- + arch/x86/mm/tlb.c | 100 +++- + arch/xtensa/kernel/entry.S | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/gpu/drm/i915/i915_utils.h | 3 +- + include/asm-generic/atomic-instrumented.h | 216 +++++--- + include/linux/atomic-arch-fallback.h | 90 +++- + include/linux/atomic-fallback.h | 90 +++- + include/linux/bit_spinlock.h | 4 +- + include/linux/freelist.h | 129 +++++ + include/linux/kprobes.h | 25 +- + include/linux/llist.h | 23 + + include/linux/lockdep.h | 6 +- + include/linux/pagemap.h | 4 +- + include/linux/preempt.h | 37 +- + include/linux/rculist.h | 48 ++ + include/linux/rcupdate.h | 19 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/sched.h | 4 + + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/linux/uaccess.h | 6 +- + include/trace/events/rcu.h | 54 +- + include/uapi/linux/prctl.h | 1 + + kernel/Kconfig.preempt | 4 - + kernel/Makefile | 2 + + kernel/entry/common.c | 2 +- + kernel/fork.c | 4 + + kernel/kprobes.c | 286 ++++------ + kernel/locking/locktorture.c | 2 +- + kernel/rcu/Kconfig | 8 +- + kernel/rcu/Kconfig.debug | 17 +- + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/{rcuperf.c => rcuscale.c} | 330 ++++++------ + kernel/rcu/rcutorture.c | 61 ++- + kernel/rcu/refscale.c | 8 +- + kernel/rcu/srcutree.c | 13 - + kernel/rcu/tree.c | 244 +++++---- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_plugin.h | 40 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 13 - + kernel/scftorture.c | 575 +++++++++++++++++++++ + kernel/sched/core.c | 8 +- + kernel/sched/sched.h | 13 +- + kernel/smp.c | 134 +++++ + kernel/time/tick-sched.c | 2 +- + kernel/trace/trace_kprobe.c | 3 +- + lib/Kconfig.debug | 24 +- + lib/nmi_backtrace.c | 6 +- + scripts/atomic/gen-atomic-fallback.sh | 63 ++- + scripts/atomic/gen-atomic-instrumented.sh | 29 +- + ...rf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} | 6 +- + ...-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} | 14 +- + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 ++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 33 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 36 +- + .../selftests/rcutorture/bin/parse-console.sh | 11 +- + .../selftests/rcutorture/configs/rcu/SRCU-t | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 1 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 + + .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 - + .../configs/{rcuperf => rcuscale}/CFLIST | 0 + .../selftests/rcutorture/configs/rcuscale/CFcommon | 2 + + .../rcutorture/configs/{rcuperf => rcuscale}/TINY | 0 + .../rcutorture/configs/{rcuperf => rcuscale}/TREE | 0 + .../configs/{rcuperf => rcuscale}/TREE54 | 0 + .../configs/{rcuperf => rcuscale}/ver_functions.sh | 4 +- + .../selftests/rcutorture/configs/scf/CFLIST | 2 + + .../selftests/rcutorture/configs/scf/CFcommon | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 9 + + .../rcutorture/configs/scf/NOPREEMPT.boot | 1 + + .../selftests/rcutorture/configs/scf/PREEMPT | 9 + + .../rcutorture/configs/scf/ver_functions.sh | 30 ++ + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 5 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + tools/testing/selftests/rcutorture/doc/initrd.txt | 36 +- + .../selftests/rcutorture/doc/rcu-test-image.txt | 41 +- + .../rcutorture/formal/srcu-cbmc/src/config.h | 1 - + 104 files changed, 2546 insertions(+), 912 deletions(-) + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + create mode 100644 arch/um/include/asm/cacheflush.h + create mode 100644 include/linux/freelist.h + rename kernel/rcu/{rcuperf.c => rcuscale.c} (64%) + create mode 100644 kernel/scftorture.c + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} (92%) + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} (84%) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/CFLIST (100%) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TINY (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE54 (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/ver_functions.sh (88%) + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/ver_functions.sh +Merging clockevents/timers/drivers/next (f087e452f27e clocksource: sp804: enable Hisilicon sp804 timer 64bit mode) +$ git merge clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (eea32b7fdcb5 Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (63ea38a40221 Merge branch 'irq/mstar' into irq/irqchip-next) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (d3c07fac5652 tracing: support "bool" type in synthetic trace events) +$ git merge ftrace/for-next +Auto-merging tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc +Auto-merging kernel/trace/trace_printk.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/kprobes.c +Auto-merging include/linux/tracepoint-defs.h +Auto-merging MAINTAINERS +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging Documentation/trace/histogram.rst +Merge made by the 'recursive' strategy. + Documentation/trace/boottime-trace.rst | 38 ++ + Documentation/trace/events.rst | 15 +- + Documentation/trace/histogram.rst | 18 + + Documentation/trace/kprobetrace.rst | 2 + + Documentation/trace/tracepoints.rst | 27 ++ + Documentation/trace/uprobetracer.rst | 2 + + MAINTAINERS | 1 + + arch/x86/include/asm/msr.h | 20 +- + include/linux/ftrace.h | 11 +- + include/linux/page_ref.h | 42 +-- + include/linux/tracepoint-defs.h | 34 ++ + kernel/kprobes.c | 2 +- + kernel/trace/fgraph.c | 8 +- + kernel/trace/ftrace.c | 24 +- + kernel/trace/ring_buffer.c | 10 + + kernel/trace/synth_event_gen_test.c | 18 +- + kernel/trace/trace.c | 111 ++++-- + kernel/trace/trace.h | 31 +- + kernel/trace/trace_boot.c | 23 +- + kernel/trace/trace_dynevent.c | 10 +- + kernel/trace/trace_events.c | 140 ++++--- + kernel/trace/trace_events_hist.c | 45 ++- + kernel/trace/trace_events_synth.c | 413 ++++++++++++++++++--- + kernel/trace/trace_functions.c | 22 +- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hwlat.c | 8 +- + kernel/trace/trace_kprobe.c | 34 +- + kernel/trace/trace_printk.c | 8 +- + kernel/trace/trace_probe.h | 14 +- + kernel/trace/trace_stack.c | 12 +- + kernel/trace/trace_stat.c | 8 +- + kernel/trace/trace_synth.h | 6 +- + kernel/trace/trace_uprobe.c | 24 +- + kernel/trace/tracing_map.c | 2 +- + tools/bootconfig/main.c | 147 +++++--- + tools/bootconfig/scripts/bconf2ftrace.sh | 199 ++++++++++ + tools/bootconfig/scripts/ftrace.sh | 109 ++++++ + tools/bootconfig/scripts/ftrace2bconf.sh | 244 ++++++++++++ + tools/bootconfig/scripts/xbc.sh | 56 +++ + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 6 + + .../test.d/kprobe/kretprobe_return_suffix.tc | 21 ++ + .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc | 6 + + .../trigger-inter-event-combined-hist.tc | 8 +- + .../trigger-synthetic-event-dynstring.tc | 31 ++ + .../trigger-synthetic_event_syntax_errors.tc | 19 + + 45 files changed, 1705 insertions(+), 332 deletions(-) + create mode 100755 tools/bootconfig/scripts/bconf2ftrace.sh + create mode 100644 tools/bootconfig/scripts/ftrace.sh + create mode 100755 tools/bootconfig/scripts/ftrace2bconf.sh + create mode 100644 tools/bootconfig/scripts/xbc.sh + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc +Merging rcu/rcu/next (a9863c90f503 Merge branch 'urezki-pcount.2020.10.01a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging arch/x86/kernel/kvm.c +Merge made by the 'recursive' strategy. + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + tools/memory-model/Documentation/README | 82 ++++ + .../Documentation/control-dependencies.txt | 256 ++++++++++++ + tools/memory-model/Documentation/litmus-tests.txt | 17 + + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/Documentation/ordering.txt | 461 +++++++++++++++++++++ + tools/memory-model/README | 22 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + 26 files changed, 1733 insertions(+), 108 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/README + create mode 100644 tools/memory-model/Documentation/control-dependencies.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/Documentation/ordering.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (4e5dc64c4319 Merge branches 'kvm-arm64/pt-new' and 'kvm-arm64/pmu-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Auto-merging include/kvm/arm_pmu.h +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/hyp/nvhe/tlb.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Removing arch/arm64/kvm/hyp.S +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm64/kernel/image-vars.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/pgtable-hwdef.h +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/devices/vcpu.rst | 57 +- + arch/arm64/include/asm/assembler.h | 29 +- + arch/arm64/include/asm/hyp_image.h | 36 + + arch/arm64/include/asm/kvm_asm.h | 187 ++- + arch/arm64/include/asm/kvm_host.h | 35 +- + arch/arm64/include/asm/kvm_hyp.h | 9 +- + arch/arm64/include/asm/kvm_mmu.h | 251 +--- + arch/arm64/include/asm/kvm_pgtable.h | 309 +++++ + arch/arm64/include/asm/kvm_ptrauth.h | 6 +- + arch/arm64/include/asm/percpu.h | 28 +- + arch/arm64/include/asm/pgtable-hwdef.h | 24 - + arch/arm64/include/asm/pgtable-prot.h | 19 - + arch/arm64/include/asm/stage2_pgtable.h | 215 ---- + arch/arm64/include/uapi/asm/kvm.h | 16 + + arch/arm64/kernel/image-vars.h | 3 - + arch/arm64/kernel/vmlinux.lds.S | 13 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 70 +- + arch/arm64/kvm/hyp.S | 34 - + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/entry.S | 95 +- + arch/arm64/kvm/hyp/hyp-entry.S | 76 +- + arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 4 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 15 +- + arch/arm64/kvm/hyp/nvhe/.gitignore | 2 + + arch/arm64/kvm/hyp/nvhe/Makefile | 62 +- + arch/arm64/kvm/hyp/nvhe/host.S | 187 +++ + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 67 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 117 ++ + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 19 + + arch/arm64/kvm/hyp/nvhe/switch.c | 48 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 2 - + arch/arm64/kvm/hyp/pgtable.c | 892 +++++++++++++++ + arch/arm64/kvm/hyp/vhe/switch.c | 31 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 4 +- + arch/arm64/kvm/inject_fault.c | 1 + + arch/arm64/kvm/mmu.c | 1761 +++++------------------------ + arch/arm64/kvm/pmu-emul.c | 195 +++- + arch/arm64/kvm/pmu.c | 13 +- + arch/arm64/kvm/reset.c | 40 +- + arch/arm64/kvm/sys_regs.c | 5 +- + arch/arm64/kvm/vgic/vgic-debug.c | 24 +- + arch/arm64/kvm/vgic/vgic-v3.c | 4 +- + include/kvm/arm_pmu.h | 5 + + include/linux/arm-smccc.h | 74 +- + 45 files changed, 2600 insertions(+), 2488 deletions(-) + create mode 100644 arch/arm64/include/asm/hyp_image.h + create mode 100644 arch/arm64/include/asm/kvm_pgtable.h + delete mode 100644 arch/arm64/kvm/hyp.S + create mode 100644 arch/arm64/kvm/hyp/nvhe/.gitignore + create mode 100644 arch/arm64/kvm/hyp/nvhe/host.S + create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp-main.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp.lds.S + create mode 100644 arch/arm64/kvm/hyp/pgtable.c +Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/kvm/book3s.c | 8 +-- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 22 +++++++-- + arch/powerpc/kvm/book3s_hv_interrupts.S | 9 ++-- + arch/powerpc/kvm/book3s_hv_nested.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_pr.c | 2 +- + arch/powerpc/kvm/book3s_xics.c | 86 ++++++++++++++++++++++++++------- + arch/powerpc/kvm/book3s_xive_native.c | 12 +---- + arch/powerpc/kvm/booke.c | 6 +-- + 13 files changed, 110 insertions(+), 48 deletions(-) +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (32118f97f41d x86/xen: Fix typo in xen_pagetable_p2m_free()) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (eff623d602db Merge branch 'for-5.9-fixes' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (1a3f7813f38e MAINTAINERS: update X86 PLATFORM DRIVERS entry with new kernel.org git repo) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (3e98fd6d816c ARM: dts: cros-ec-keyboard: Add alternate keymap for KEY_LEFTMETA) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 + + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/platform/chrome/Kconfig | 10 -- + drivers/platform/chrome/cros_ec_lightbar.c | 12 +-- + drivers/platform/chrome/cros_ec_proto.c | 106 +++++++++++---------- + drivers/platform/chrome/cros_ec_sysfs.c | 26 ++--- + drivers/platform/chrome/cros_ec_trace.h | 27 ++++-- + drivers/platform/chrome/cros_ec_typec.c | 42 +++++++- + drivers/platform/chrome/cros_ec_vbc.c | 4 +- + drivers/pwm/pwm-cros-ec.c | 37 ++++--- + 11 files changed, 154 insertions(+), 115 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (19d2e0cef0b1 leds: pwm: Remove platform_data support) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-pca963x.h +Removing include/linux/leds-tca6507.h +Removing Documentation/devicetree/bindings/leds/tca6507.txt +Auto-merging Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-is31fl319x.txt | 2 + + .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 +++++ + .../devicetree/bindings/leds/leds-lp55xx.yaml | 2 +- + .../devicetree/bindings/leds/leds-pca955x.txt | 1 + + Documentation/devicetree/bindings/leds/tca6507.txt | 49 -- + .../devicetree/bindings/leds/ti,tca6507.yaml | 134 +++++ + Documentation/leds/ledtrig-transient.rst | 7 - + drivers/leds/Kconfig | 31 +- + drivers/leds/Makefile | 2 + + drivers/leds/TODO | 75 +++ + drivers/leds/led-class.c | 5 + + drivers/leds/leds-88pm860x.c | 6 +- + drivers/leds/leds-aat1290.c | 2 +- + drivers/leds/leds-acer-a500.c | 129 +++++ + drivers/leds/leds-an30259a.c | 7 +- + drivers/leds/leds-aw2013.c | 11 +- + drivers/leds/leds-bcm6328.c | 11 +- + drivers/leds/leds-bcm6358.c | 11 +- + drivers/leds/leds-cpcap.c | 7 +- + drivers/leds/leds-cr0014114.c | 3 - + drivers/leds/leds-el15203000.c | 3 - + drivers/leds/leds-gpio.c | 3 - + drivers/leds/leds-ip30.c | 1 + + drivers/leds/leds-is31fl319x.c | 32 +- + drivers/leds/leds-is31fl32xx.c | 33 +- + drivers/leds/leds-ktd2692.c | 4 +- + drivers/leds/leds-lm3532.c | 65 +-- + drivers/leds/leds-lm36274.c | 133 ++--- + drivers/leds/leds-lm3692x.c | 14 +- + drivers/leds/leds-lm3697.c | 100 ++-- + drivers/leds/leds-lp50xx.c | 631 +++++++++++++++++++++ + drivers/leds/leds-lp5521.c | 2 +- + drivers/leds/leds-lp5523.c | 2 +- + drivers/leds/leds-lp5562.c | 2 +- + drivers/leds/leds-lp55xx-common.c | 14 +- + drivers/leds/leds-lp8501.c | 2 +- + drivers/leds/leds-lp8860.c | 6 +- + drivers/leds/leds-lt3593.c | 6 +- + drivers/leds/leds-max77650.c | 24 +- + drivers/leds/leds-max77693.c | 2 +- + drivers/leds/leds-mc13783.c | 8 +- + drivers/leds/leds-mt6323.c | 38 +- + drivers/leds/leds-netxbig.c | 6 +- + drivers/leds/leds-ns2.c | 346 ++++------- + drivers/leds/leds-pca9532.c | 24 +- + drivers/leds/leds-pca955x.c | 8 + + drivers/leds/leds-pca963x.c | 399 ++++++------- + drivers/leds/leds-pm8058.c | 33 +- + drivers/leds/leds-powernv.c | 2 +- + drivers/leds/leds-pwm.c | 49 +- + drivers/leds/leds-sc27xx-bltc.c | 6 +- + drivers/leds/leds-sgm3140.c | 29 +- + drivers/leds/leds-spi-byte.c | 11 +- + drivers/leds/leds-syscon.c | 13 +- + drivers/leds/leds-tca6507.c | 116 ++-- + drivers/leds/leds-tlc591xx.c | 24 +- + drivers/leds/leds-turris-omnia.c | 8 +- + drivers/leds/trigger/ledtrig-cpu.c | 13 +- + include/linux/leds-tca6507.h | 21 - + include/linux/platform_data/leds-pca963x.h | 35 -- + 60 files changed, 1791 insertions(+), 1102 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt + create mode 100644 Documentation/devicetree/bindings/leds/ti,tca6507.yaml + create mode 100644 drivers/leds/TODO + create mode 100644 drivers/leds/leds-acer-a500.c + create mode 100644 drivers/leds/leds-lp50xx.c + delete mode 100644 include/linux/leds-tca6507.h + delete mode 100644 include/linux/platform_data/leds-pca963x.h +Merging ipmi/for-next (8fe7990ceda8 ipmi_si: Fix wrong return value in try_smi_init()) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_bt_sm.c | 4 ++- + drivers/char/ipmi/ipmi_kcs_sm.c | 15 +++++++---- + drivers/char/ipmi/ipmi_msghandler.c | 52 +++++++++++++++++++++++++------------ + drivers/char/ipmi/ipmi_si_intf.c | 19 +++++++++++++- + drivers/char/ipmi/ipmi_smic_sm.c | 35 +++++++++++++++---------- + include/linux/ipmi.h | 2 ++ + include/uapi/linux/ipmi_msgdefs.h | 2 ++ + 7 files changed, 93 insertions(+), 36 deletions(-) +Merging driver-core/driver-core-next (ee4906770ee9 regmap: debugfs: use semicolons rather than commas to separate statements) +$ git merge driver-core/driver-core-next +Auto-merging mm/hugetlb.c +Auto-merging include/linux/property.h +Auto-merging include/linux/device.h +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/base/regmap/regmap-debugfs.c +Auto-merging drivers/base/node.c +Removing drivers/base/devcon.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/core.c +Auto-merging drivers/base/arch_topology.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/sysfs.rst +Auto-merging Documentation/driver-api/index.rst +Auto-merging Documentation/driver-api/driver-model/devres.rst +Removing Documentation/driver-api/device_connection.rst +Merge made by the 'recursive' strategy. + Documentation/driver-api/device_connection.rst | 43 --- + Documentation/driver-api/driver-model/devres.rst | 1 + + .../driver-api/firmware/fallback-mechanisms.rst | 1 + + Documentation/driver-api/index.rst | 1 - + Documentation/filesystems/sysfs.rst | 8 +- + MAINTAINERS | 6 + + drivers/base/Makefile | 2 +- + drivers/base/arch_topology.c | 2 +- + drivers/base/bus.c | 2 +- + drivers/base/cacheinfo.c | 49 ++-- + drivers/base/class.c | 2 +- + drivers/base/core.c | 63 +++-- + drivers/base/cpu.c | 84 +++--- + drivers/base/dd.c | 8 +- + drivers/base/devcon.c | 231 --------------- + drivers/base/devcoredump.c | 2 +- + drivers/base/devres.c | 105 +++++++ + drivers/base/firmware_loader/fallback.c | 4 +- + drivers/base/memory.c | 62 ++-- + drivers/base/node.c | 306 ++++++++++---------- + drivers/base/platform.c | 37 ++- + drivers/base/power/sysfs.c | 160 +++++++---- + drivers/base/power/wakeup_stats.c | 17 +- + drivers/base/property.c | 73 +++++ + drivers/base/soc.c | 64 ++--- + drivers/base/syscore.c | 8 +- + drivers/base/topology.c | 10 +- + drivers/hwmon/pmbus/pmbus_core.c | 28 +- + drivers/iio/adc/xilinx-xadc-core.c | 16 +- + drivers/usb/roles/class.c | 12 +- + drivers/usb/typec/mux.c | 19 +- + fs/sysfs/file.c | 55 ++++ + include/linux/device.h | 58 +--- + include/linux/hugetlb.h | 4 +- + include/linux/property.h | 14 + + include/linux/sysfs.h | 15 + + lib/devres.c | 20 +- + lib/dynamic_debug.c | 27 +- + mm/hugetlb.c | 18 +- + scripts/dev-needs.sh | 315 +++++++++++++++++++++ + 40 files changed, 1135 insertions(+), 817 deletions(-) + delete mode 100644 Documentation/driver-api/device_connection.rst + delete mode 100644 drivers/base/devcon.c + create mode 100755 scripts/dev-needs.sh +Merging usb/usb-next (93578a25d4e2 usb: musb: gadget: Use fallthrough pseudo-keyword) +$ git merge usb/usb-next +Auto-merging sound/usb/mixer_scarlett_gen2.c +Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c +Auto-merging drivers/usb/dwc3/gadget.h +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/ep0.c +Auto-merging drivers/usb/dwc3/dwc3-of-simple.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-of-simple.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/core/message.c +Auto-merging drivers/usb/cdns3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/cdns3/gadget.c +Removing drivers/staging/media/phy-rockchip-dphy-rx0/TODO +Removing drivers/staging/media/phy-rockchip-dphy-rx0/Makefile +Removing drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig +Auto-merging drivers/staging/media/Makefile +Auto-merging drivers/staging/media/Kconfig +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/controller/pcie-brcmstb.c +CONFLICT (content): Merge conflict in drivers/pci/controller/pcie-brcmstb.c +Auto-merging drivers/net/usb/rtl8150.c +Auto-merging drivers/net/usb/pegasus.c +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/acpi/bus.c +Auto-merging arch/arm/boot/dts/sam9x60.dtsi +Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt +Removing Documentation/devicetree/bindings/usb/cdns-usb3.txt +Auto-merging Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +Resolved 'drivers/pci/controller/pcie-brcmstb.c' using previous resolution. +Resolved 'drivers/usb/cdns3/gadget.c' using previous resolution. +Resolved 'drivers/usb/dwc3/dwc3-of-simple.c' using previous resolution. +Resolved 'drivers/usb/dwc3/gadget.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b4fcaadf472e] Merge remote-tracking branch 'usb/usb-next' into master +$ git diff -M --stat --summary HEAD^.. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 21 + + .../devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt | 2 +- + .../bindings/phy/intel,lgm-emmc-phy.yaml | 17 +- + .../devicetree/bindings/phy/intel,lgm-usb-phy.yaml | 58 + + .../bindings/phy/phy-cadence-torrent.yaml | 96 +- + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 95 +- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 76 + + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 74 + + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 13 +- + Documentation/devicetree/bindings/phy/ti-phy.txt | 37 - + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 22 +- + .../devicetree/bindings/usb/atmel-usb.txt | 1 + + .../devicetree/bindings/usb/cdns,usb3.yaml | 96 + + .../devicetree/bindings/usb/cdns-usb3.txt | 45 - + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 9 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 5 + + Documentation/devicetree/bindings/usb/dwc3.txt | 3 + + .../bindings/usb/intel,keembay-dwc3.yaml | 77 + + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 95 + + .../devicetree/bindings/usb/renesas,usb-xhci.yaml | 1 + + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 35 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 1 + + .../devicetree/bindings/usb/ti,hd3ss3220.txt | 38 - + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 82 + + MAINTAINERS | 20 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 13 + + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 22 + + arch/arm/boot/dts/sam9x60.dtsi | 14 + + drivers/acpi/bus.c | 1 + + drivers/bluetooth/ath3k.c | 93 +- + drivers/firmware/Kconfig | 3 +- + drivers/firmware/raspberrypi.c | 61 - + drivers/net/usb/pegasus.c | 61 +- + drivers/net/usb/rtl8150.c | 32 +- + drivers/pci/controller/pcie-brcmstb.c | 17 - + drivers/pci/quirks.c | 57 - + drivers/phy/Kconfig | 11 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 22 +- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 13 +- + drivers/phy/broadcom/phy-bcm-sr-usb.c | 19 +- + drivers/phy/cadence/phy-cadence-salvo.c | 8 +- + drivers/phy/cadence/phy-cadence-sierra.c | 24 +- + drivers/phy/cadence/phy-cadence-torrent.c | 2115 +++++++++++++++++++- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 79 +- + drivers/phy/hisilicon/phy-hi3660-usb3.c | 2 +- + drivers/phy/intel/Kconfig | 22 +- + drivers/phy/intel/Makefile | 5 +- + drivers/phy/intel/phy-intel-keembay-emmc.c | 307 +++ + .../{phy-intel-combo.c => phy-intel-lgm-combo.c} | 0 + .../{phy-intel-emmc.c => phy-intel-lgm-emmc.c} | 0 + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 2 +- + drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 2 +- + drivers/phy/marvell/phy-pxa-28nm-hsic.c | 40 +- + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 33 +- + drivers/phy/phy-lgm-usb.c | 284 +++ + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 21 +- + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 1053 ++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp.h | 80 + + drivers/phy/ralink/phy-ralink-usb.c | 2 +- + drivers/phy/rockchip/Kconfig | 12 + + drivers/phy/rockchip/Makefile | 1 + + .../rockchip}/phy-rockchip-dphy-rx0.c | 1 + + drivers/phy/samsung/phy-exynos5-usbdrd.c | 39 +- + drivers/phy/samsung/phy-samsung-ufs.c | 2 +- + drivers/phy/socionext/Kconfig | 10 + + drivers/phy/socionext/Makefile | 1 + + drivers/phy/socionext/phy-uniphier-ahci.c | 321 +++ + drivers/phy/ti/phy-am654-serdes.c | 325 +-- + drivers/phy/ti/phy-gmii-sel.c | 159 +- + drivers/phy/ti/phy-j721e-wiz.c | 1 - + drivers/phy/ti/phy-omap-usb2.c | 36 +- + drivers/reset/Kconfig | 11 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-raspberrypi.c | 122 ++ + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + .../staging/media/phy-rockchip-dphy-rx0/Kconfig | 13 - + .../staging/media/phy-rockchip-dphy-rx0/Makefile | 2 - + drivers/staging/media/phy-rockchip-dphy-rx0/TODO | 6 - + drivers/thunderbolt/Kconfig | 14 +- + drivers/thunderbolt/Makefile | 4 +- + drivers/thunderbolt/acpi.c | 117 ++ + drivers/thunderbolt/cap.c | 136 +- + drivers/thunderbolt/ctl.c | 23 +- + drivers/thunderbolt/debugfs.c | 701 +++++++ + drivers/thunderbolt/domain.c | 48 +- + drivers/thunderbolt/icm.c | 5 +- + drivers/thunderbolt/lc.c | 151 +- + drivers/thunderbolt/nhi.c | 90 +- + drivers/thunderbolt/nhi_ops.c | 31 +- + drivers/thunderbolt/quirks.c | 2 +- + drivers/thunderbolt/switch.c | 216 +- + drivers/thunderbolt/tb.c | 207 +- + drivers/thunderbolt/tb.h | 160 +- + drivers/thunderbolt/tb_msgs.h | 1 + + drivers/thunderbolt/tb_regs.h | 34 +- + drivers/thunderbolt/test.c | 13 +- + drivers/thunderbolt/usb4.c | 251 ++- + drivers/usb/atm/cxacru.c | 27 +- + drivers/usb/atm/usbatm.c | 14 +- + drivers/usb/c67x00/c67x00-sched.c | 7 +- + drivers/usb/cdns3/cdns3-imx.c | 191 +- + drivers/usb/cdns3/core.c | 202 +- + drivers/usb/cdns3/core.h | 17 + + drivers/usb/cdns3/drd.c | 20 + + drivers/usb/cdns3/drd.h | 5 +- + drivers/usb/cdns3/ep0.c | 10 +- + drivers/usb/cdns3/gadget.c | 274 ++- + drivers/usb/cdns3/gadget.h | 11 +- + drivers/usb/cdns3/host.c | 7 + + drivers/usb/chipidea/ci_hdrc_imx.c | 13 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 2 + + drivers/usb/chipidea/usbmisc_imx.c | 21 + + drivers/usb/class/cdc-acm.c | 79 +- + drivers/usb/class/cdc-acm.h | 19 +- + drivers/usb/class/cdc-wdm.c | 72 +- + drivers/usb/common/usb-conn-gpio.c | 32 +- + drivers/usb/core/Kconfig | 14 + + drivers/usb/core/devices.c | 41 - + drivers/usb/core/driver.c | 8 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 62 +- + drivers/usb/core/message.c | 180 +- + drivers/usb/core/urb.c | 120 +- + drivers/usb/core/usb.h | 1 - + drivers/usb/dwc2/Kconfig | 1 + + drivers/usb/dwc2/Makefile | 2 +- + drivers/usb/dwc2/core.h | 9 + + drivers/usb/dwc2/drd.c | 180 ++ + drivers/usb/dwc2/gadget.c | 42 +- + drivers/usb/dwc2/params.c | 5 +- + drivers/usb/dwc2/platform.c | 43 +- + drivers/usb/dwc3/core.c | 90 +- + drivers/usb/dwc3/core.h | 46 +- + drivers/usb/dwc3/debug.h | 8 +- + drivers/usb/dwc3/debugfs.c | 59 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 41 +- + drivers/usb/dwc3/dwc3-of-simple.c | 1 + + drivers/usb/dwc3/dwc3-pci.c | 3 +- + drivers/usb/dwc3/dwc3-qcom.c | 128 +- + drivers/usb/dwc3/ep0.c | 45 +- + drivers/usb/dwc3/gadget.c | 577 +++--- + drivers/usb/dwc3/gadget.h | 2 +- + drivers/usb/dwc3/trace.h | 17 +- + drivers/usb/dwc3/ulpi.c | 2 +- + drivers/usb/early/ehci-dbgp.c | 15 +- + drivers/usb/early/xhci-dbc.c | 14 +- + drivers/usb/gadget/function/f_acm.c | 8 +- + drivers/usb/gadget/function/f_midi.c | 6 +- + drivers/usb/gadget/function/f_ncm.c | 10 +- + drivers/usb/gadget/function/f_printer.c | 16 +- + drivers/usb/gadget/function/f_tcm.c | 12 +- + drivers/usb/gadget/function/f_uvc.c | 8 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/u_serial.c | 1 + + drivers/usb/gadget/udc/aspeed-vhub/core.c | 10 +- + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 3 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 68 +- + drivers/usb/gadget/udc/atmel_usba_udc.h | 3 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 1 + + drivers/usb/gadget/udc/bdc/bdc_core.c | 9 +- + drivers/usb/gadget/udc/core.c | 82 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 7 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 9 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 17 +- + drivers/usb/gadget/udc/net2272.c | 24 +- + drivers/usb/gadget/udc/net2272.h | 1 + + drivers/usb/gadget/udc/net2280.c | 32 +- + drivers/usb/gadget/udc/net2280.h | 1 + + drivers/usb/gadget/udc/pch_udc.c | 55 +- + drivers/usb/gadget/udc/tegra-xudc.c | 60 +- + drivers/usb/host/bcma-hcd.c | 13 +- + drivers/usb/host/ehci-npcm7xx.c | 8 +- + drivers/usb/host/ehci-platform.c | 16 +- + drivers/usb/host/ehci-sched.c | 20 - + drivers/usb/host/ehci-spear.c | 8 +- + drivers/usb/host/fotg210-hcd.c | 20 +- + drivers/usb/host/ohci-hcd.c | 18 +- + drivers/usb/host/oxu210hp-hcd.c | 21 +- + drivers/usb/host/pci-quirks.c | 35 +- + drivers/usb/host/xhci-dbgtty.c | 6 +- + drivers/usb/host/xhci-debugfs.c | 109 +- + drivers/usb/host/xhci-debugfs.h | 10 + + drivers/usb/host/xhci-mtk.c | 6 +- + drivers/usb/host/xhci-pci.c | 10 + + drivers/usb/host/xhci-plat.c | 44 +- + drivers/usb/host/xhci-plat.h | 1 + + drivers/usb/host/xhci-rcar.c | 43 +- + drivers/usb/host/xhci-ring.c | 23 +- + drivers/usb/host/xhci-tegra.c | 1 - + drivers/usb/host/xhci.c | 11 +- + drivers/usb/host/xhci.h | 3 + + drivers/usb/image/microtek.c | 14 +- + drivers/usb/isp1760/isp1760-hcd.c | 20 +- + drivers/usb/misc/adutux.c | 1 + + drivers/usb/misc/appledisplay.c | 14 +- + drivers/usb/misc/legousbtower.c | 61 +- + drivers/usb/misc/usb3503.c | 18 +- + drivers/usb/misc/usb4604.c | 8 +- + drivers/usb/misc/usblcd.c | 1 - + drivers/usb/misc/yurex.c | 6 +- + drivers/usb/mtu3/mtu3.h | 6 - + drivers/usb/musb/musb_gadget_ep0.c | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-mv-usb.c | 18 +- + drivers/usb/phy/phy-ulpi-viewport.c | 12 +- + drivers/usb/serial/ftdi_sio.c | 37 +- + drivers/usb/serial/ftdi_sio_ids.h | 7 + + drivers/usb/serial/mos7720.c | 8 +- + drivers/usb/serial/option.c | 5 + + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 1 + + drivers/usb/serial/qcserial.c | 4 +- + drivers/usb/storage/isd200.c | 2 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/uas.c | 31 +- + drivers/usb/storage/usb.c | 5 +- + drivers/usb/typec/Kconfig | 24 + + drivers/usb/typec/Makefile | 2 + + drivers/usb/typec/altmodes/displayport.c | 2 +- + drivers/usb/typec/class.c | 15 + + drivers/usb/typec/hd3ss3220.c | 18 +- + drivers/usb/typec/mux/Kconfig | 1 + + drivers/usb/typec/mux/intel_pmc_mux.c | 207 +- + drivers/usb/typec/qcom-pmic-typec.c | 262 +++ + drivers/usb/typec/stusb160x.c | 875 ++++++++ + drivers/usb/typec/tcpm/Kconfig | 14 + + drivers/usb/typec/tcpm/Makefile | 14 +- + drivers/usb/typec/tcpm/tcpci.c | 113 +- + drivers/usb/typec/tcpm/tcpci.h | 25 + + drivers/usb/typec/tcpm/tcpci_maxim.c | 503 +++++ + drivers/usb/typec/tcpm/tcpci_mt6360.c | 212 ++ + drivers/usb/typec/tcpm/tcpm.c | 362 +++- + drivers/usb/usbip/usbip_common.c | 8 +- + drivers/usb/usbip/vhci_hcd.c | 8 +- + include/dt-bindings/phy/phy-cadence-torrent.h | 13 + + include/dt-bindings/phy/phy.h | 1 + + .../dt-bindings/reset/raspberrypi,firmware-reset.h | 13 + + include/linux/iopoll.h | 4 +- + include/linux/usb.h | 9 + + include/linux/usb/gadget.h | 27 +- + include/linux/usb/pd.h | 26 +- + include/linux/usb/tcpm.h | 8 +- + include/linux/usb/typec.h | 1 + + include/soc/bcm2835/raspberrypi-firmware.h | 7 - + sound/usb/6fire/firmware.c | 38 +- + sound/usb/helper.c | 16 +- + sound/usb/helper.h | 1 - + sound/usb/hiface/pcm.c | 14 +- + sound/usb/line6/driver.c | 72 +- + sound/usb/line6/podhd.c | 23 +- + sound/usb/line6/toneport.c | 9 +- + sound/usb/mixer_scarlett_gen2.c | 2 +- + sound/usb/quirks.c | 12 +- + sound/usb/usx2y/us122l.c | 42 +- + 258 files changed, 12884 insertions(+), 2877 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/intel,lgm-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml + create mode 100644 Documentation/devicetree/bindings/usb/cdns,usb3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/cdns-usb3.txt + create mode 100644 Documentation/devicetree/bindings/usb/intel,keembay-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt + create mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml + create mode 100644 drivers/phy/intel/phy-intel-keembay-emmc.c + rename drivers/phy/intel/{phy-intel-combo.c => phy-intel-lgm-combo.c} (100%) + rename drivers/phy/intel/{phy-intel-emmc.c => phy-intel-lgm-emmc.c} (100%) + create mode 100644 drivers/phy/phy-lgm-usb.c + rename drivers/{staging/media/phy-rockchip-dphy-rx0 => phy/rockchip}/phy-rockchip-dphy-rx0.c (99%) + create mode 100644 drivers/phy/socionext/phy-uniphier-ahci.c + create mode 100644 drivers/reset/reset-raspberrypi.c + delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig + delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/Makefile + delete mode 100644 drivers/staging/media/phy-rockchip-dphy-rx0/TODO + create mode 100644 drivers/thunderbolt/acpi.c + create mode 100644 drivers/thunderbolt/debugfs.c + create mode 100644 drivers/usb/dwc2/drd.c + create mode 100644 drivers/usb/typec/qcom-pmic-typec.c + create mode 100644 drivers/usb/typec/stusb160x.c + create mode 100644 drivers/usb/typec/tcpm/tcpci_maxim.c + create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6360.c + create mode 100644 include/dt-bindings/phy/phy-cadence-torrent.h + create mode 100644 include/dt-bindings/reset/raspberrypi,firmware-reset.h +$ git am -3 ../patches/net-usb-rtl8150-dont-incorrectly-assign-random-MAC-addresses.patch +Applying: net: usb: rtl8150: don't incorrectly assign random MAC addresses +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/usb/rtl8150.c +$ git add -A . +$ git commit -v -a --amend +[master 89358820f75e] Merge remote-tracking branch 'usb/usb-next' into master + Date: Thu Oct 15 15:13:44 2020 +1100 +Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (3e765cab8abe USB: serial: option: add Cellient MPL200 card) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (71ac680e6339 usb: chipidea: ci_hdrc_imx: restore pinctrl) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (60f5a24c11f7 phy: qcom-qmp: initialize the pointer to NULL) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4be87603b6dc serial: mcf: add sysrq capability) +$ git merge tty/tty-next +Auto-merging include/linux/qcom-geni-se.h +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/console/sticon.c +CONFLICT (content): Merge conflict in drivers/video/console/sticon.c +Auto-merging drivers/video/console/newport_con.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging Documentation/devicetree/bindings/serial/renesas,scif.yaml +Auto-merging Documentation/devicetree/bindings/serial/renesas,hscif.yaml +Resolved 'drivers/video/console/sticon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 22fba34fb1b0] Merge remote-tracking branch 'tty/tty-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysrq.rst | 2 + + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + drivers/accessibility/speakup/main.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/tty/hvc/Kconfig | 1 + + drivers/tty/hvc/hvcs.c | 14 +- + drivers/tty/ipwireless/hardware.c | 6 +- + drivers/tty/ipwireless/network.c | 4 +- + drivers/tty/ipwireless/tty.c | 2 +- + drivers/tty/n_gsm.c | 38 +- + drivers/tty/n_hdlc.c | 72 +-- + drivers/tty/n_tty.c | 4 +- + drivers/tty/pty.c | 4 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 12 +- + drivers/tty/serial/8250/8250_dw.c | 54 +-- + drivers/tty/serial/8250/8250_fsl.c | 110 ++++- + drivers/tty/serial/8250/8250_ingenic.c | 20 +- + drivers/tty/serial/8250/8250_mtk.c | 1 + + drivers/tty/serial/8250/8250_pci.c | 64 ++- + drivers/tty/serial/8250/8250_port.c | 5 +- + drivers/tty/serial/Kconfig | 2 + + drivers/tty/serial/amba-pl011.c | 11 +- + drivers/tty/serial/atmel_serial.c | 20 +- + drivers/tty/serial/earlycon.c | 9 +- + drivers/tty/serial/fsl_lpuart.c | 77 ++- + drivers/tty/serial/icom.c | 32 +- + drivers/tty/serial/ifx6x60.c | 15 +- + drivers/tty/serial/imx.c | 14 +- + drivers/tty/serial/max310x.c | 29 +- + drivers/tty/serial/men_z135_uart.c | 8 +- + drivers/tty/serial/mvebu-uart.c | 7 +- + drivers/tty/serial/pch_uart.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 19 +- + drivers/tty/serial/sa1100.c | 22 +- + drivers/tty/serial/sc16is7xx.c | 1 + + drivers/tty/serial/serial_core.c | 30 +- + drivers/tty/serial/stm32-usart.c | 33 +- + drivers/tty/serial/timbuart.c | 6 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/synclink.c | 82 ++-- + drivers/tty/synclink_gt.c | 95 ++-- + drivers/tty/synclinkmp.c | 83 ++-- + drivers/tty/sysrq.c | 49 +- + drivers/tty/tty_baudrate.c | 6 +- + drivers/tty/tty_buffer.c | 14 +- + drivers/tty/tty_io.c | 26 +- + drivers/tty/tty_jobctrl.c | 4 +- + drivers/tty/tty_ldisc.c | 3 +- + drivers/tty/vt/consolemap.c | 4 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vc_screen.c | 532 ++++++++++++--------- + drivers/tty/vt/vt.c | 42 +- + drivers/tty/vt/vt_ioctl.c | 60 +-- + drivers/video/console/newport_con.c | 22 +- + drivers/video/fbdev/core/fbcon.c | 10 +- + include/linux/console.h | 2 +- + include/linux/consolemap.h | 3 +- + include/linux/qcom-geni-se.h | 3 + + include/linux/selection.h | 18 +- + 62 files changed, 1045 insertions(+), 777 deletions(-) +Merging char-misc/char-misc-next (f3277cbfba76 binder: fix UAF when releasing todo list) +$ git merge char-misc/char-misc-next +Auto-merging sound/soc/codecs/rt715-sdw.c +Auto-merging sound/soc/codecs/rt711-sdw.c +Auto-merging sound/soc/codecs/rt700-sdw.c +Auto-merging sound/soc/codecs/rt5682-sdw.c +Auto-merging sound/soc/codecs/rt1308-sdw.c +Auto-merging sound/soc/codecs/max98373-sdw.c +Auto-merging security/selinux/hooks.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/module.c +Auto-merging include/linux/fs.h +Auto-merging fs/exec.c +Auto-merging fs/Makefile +Auto-merging drivers/power/supply/bq27xxx_battery_hdq.c +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/misc/ocxl/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/ocxl/Kconfig +Auto-merging drivers/base/firmware_loader/fallback.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/virt/index.rst +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/driver-api/mei/mei.rst +Removing Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml +Removing Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/misc/ocxl/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9f235ca99c32] Merge remote-tracking branch 'char-misc/char-misc-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-bus-mhi | 21 + + Documentation/ABI/testing/sysfs-bus-dfl | 15 + + Documentation/ABI/testing/sysfs-bus-fsi | 8 + + Documentation/ABI/testing/sysfs-bus-mei | 7 + + .../ABI/testing/sysfs-bus-soundwire-slave | 18 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 18 +- + Documentation/ABI/testing/sysfs-driver-w1_therm | 51 +- + .../devicetree/bindings/extcon/extcon-ptn5150.txt | 27 - + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 60 + + .../devicetree/bindings/fsi/fsi-master-aspeed.txt | 12 + + .../bindings/interconnect/interconnect.txt | 24 +- + .../bindings/interconnect/qcom,bcm-voter.yaml | 20 + + .../bindings/interconnect/qcom,osm-l3.yaml | 2 + + .../{qcom,sdm845.yaml => qcom,rpmh.yaml} | 42 +- + .../bindings/interconnect/qcom,sc7180.yaml | 85 - + .../devicetree/bindings/soundwire/qcom,sdw.txt | 1 + + Documentation/driver-api/mei/mei.rst | 37 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 5 +- + Documentation/virt/index.rst | 1 + + Documentation/virt/ne_overview.rst | 95 + + Documentation/w1/slaves/w1_therm.rst | 101 +- + MAINTAINERS | 37 + + drivers/android/binder.c | 57 +- + drivers/android/binder_alloc.c | 57 +- + drivers/android/binder_alloc.h | 5 +- + drivers/android/binder_alloc_selftest.c | 2 +- + drivers/android/binderfs.c | 2 +- + drivers/base/firmware_loader/fallback.c | 21 +- + drivers/base/firmware_loader/fallback.h | 5 +- + drivers/base/firmware_loader/fallback_platform.c | 12 +- + drivers/base/firmware_loader/firmware.h | 7 +- + drivers/base/firmware_loader/main.c | 135 +- + drivers/bus/fsl-mc/dprc-driver.c | 190 +- + drivers/bus/fsl-mc/dprc.c | 141 +- + drivers/bus/fsl-mc/fsl-mc-allocator.c | 12 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 75 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 31 +- + drivers/bus/fsl-mc/mc-io.c | 7 +- + drivers/bus/mhi/Kconfig | 20 +- + drivers/bus/mhi/core/Makefile | 3 +- + drivers/bus/mhi/core/boot.c | 17 +- + drivers/bus/mhi/core/debugfs.c | 411 + + drivers/bus/mhi/core/init.c | 87 +- + drivers/bus/mhi/core/internal.h | 37 +- + drivers/bus/mhi/core/main.c | 27 +- + drivers/bus/mhi/core/pm.c | 28 +- + drivers/char/Kconfig | 3 +- + drivers/char/lp.c | 6 +- + drivers/char/mem.c | 28 + + drivers/char/mspec.c | 5 +- + drivers/extcon/extcon-axp288.c | 13 +- + drivers/extcon/extcon-max14577.c | 2 +- + drivers/extcon/extcon-max77693.c | 2 +- + drivers/extcon/extcon-max77843.c | 2 +- + drivers/extcon/extcon-max8997.c | 2 +- + drivers/extcon/extcon-palmas.c | 20 +- + drivers/extcon/extcon-ptn5150.c | 226 +- + drivers/extcon/extcon-usb-gpio.c | 2 +- + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/fpga/dfl-pci.c | 24 +- + drivers/fpga/dfl.c | 477 +- + drivers/fpga/dfl.h | 103 +- + drivers/fpga/fpga-region.c | 2 +- + drivers/fpga/stratix10-soc.c | 23 +- + drivers/fpga/xilinx-spi.c | 77 +- + drivers/fsi/fsi-core.c | 31 +- + drivers/fsi/fsi-master-aspeed.c | 134 +- + drivers/fsi/fsi-master-ast-cf.c | 7 +- + drivers/fsi/fsi-master-gpio.c | 5 +- + drivers/fsi/fsi-master-hub.c | 15 +- + drivers/fsi/fsi-master.h | 3 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 2 +- + drivers/fsi/fsi-scom.c | 2 +- + drivers/greybus/interface.c | 6 +- + drivers/hwtracing/coresight/Kconfig | 54 +- + drivers/hwtracing/coresight/Makefile | 26 +- + drivers/hwtracing/coresight/coresight-catu.c | 37 +- + drivers/hwtracing/coresight/coresight-catu.h | 2 - + .../coresight/{coresight.c => coresight-core.c} | 216 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 2 + + .../{coresight-cti.c => coresight-cti-core.c} | 97 +- + drivers/hwtracing/coresight/coresight-etb10.c | 28 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 25 +- + drivers/hwtracing/coresight/coresight-etm-perf.h | 5 +- + .../{coresight-etm3x.c => coresight-etm3x-core.c} | 154 +- + .../{coresight-etm4x.c => coresight-etm4x-core.c} | 193 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 11 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 6 + + drivers/hwtracing/coresight/coresight-funnel.c | 65 +- + drivers/hwtracing/coresight/coresight-platform.c | 11 +- + drivers/hwtracing/coresight/coresight-priv.h | 26 +- + drivers/hwtracing/coresight/coresight-replicator.c | 65 +- + drivers/hwtracing/coresight/coresight-stm.c | 31 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 2 + + .../{coresight-tmc.c => coresight-tmc-core.c} | 25 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 21 +- + drivers/hwtracing/coresight/coresight-tmc.h | 3 + + drivers/hwtracing/coresight/coresight-tpiu.c | 20 +- + drivers/hwtracing/intel_th/pci.c | 10 + + drivers/hwtracing/stm/Kconfig | 2 +- + drivers/hwtracing/stm/ftrace.c | 7 +- + drivers/interconnect/Makefile | 2 +- + drivers/interconnect/bulk.c | 117 + + drivers/interconnect/core.c | 140 +- + drivers/interconnect/imx/imx.c | 13 +- + drivers/interconnect/qcom/Kconfig | 20 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/bcm-voter.c | 36 +- + drivers/interconnect/qcom/icc-rpmh.c | 30 + + drivers/interconnect/qcom/icc-rpmh.h | 21 +- + drivers/interconnect/qcom/osm-l3.c | 91 +- + drivers/interconnect/qcom/sc7180.c | 3 +- + drivers/interconnect/qcom/sdm845.c | 3 +- + drivers/interconnect/qcom/sm8150.c | 635 + + drivers/interconnect/qcom/sm8150.h | 154 + + drivers/interconnect/qcom/sm8250.c | 651 + + drivers/interconnect/qcom/sm8250.h | 164 + + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/rts5227.c | 117 +- + drivers/misc/cardreader/rts5228.c | 5 +- + drivers/misc/cardreader/rts5249.c | 162 +- + drivers/misc/cardreader/rts5260.c | 44 +- + drivers/misc/cardreader/rtsx_pcr.c | 24 +- + drivers/misc/cardreader/rtsx_pcr.h | 17 + + drivers/misc/eeprom/at25.c | 5 +- + drivers/misc/eeprom/ee1004.c | 13 +- + drivers/misc/eeprom/eeprom_93xx46.c | 1 + + drivers/misc/fastrpc.c | 20 +- + drivers/misc/habanalabs/Kconfig | 1 - + drivers/misc/habanalabs/common/Makefile | 4 +- + drivers/misc/habanalabs/common/command_buffer.c | 229 +- + .../misc/habanalabs/common/command_submission.c | 107 +- + drivers/misc/habanalabs/common/context.c | 38 +- + drivers/misc/habanalabs/common/debugfs.c | 92 +- + drivers/misc/habanalabs/common/device.c | 31 +- + drivers/misc/habanalabs/common/firmware_if.c | 229 +- + drivers/misc/habanalabs/common/habanalabs.h | 200 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 76 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 105 +- + drivers/misc/habanalabs/common/hw_queue.c | 10 +- + drivers/misc/habanalabs/common/hwmon.c | 60 +- + drivers/misc/habanalabs/common/irq.c | 2 +- + drivers/misc/habanalabs/common/memory.c | 90 +- + drivers/misc/habanalabs/common/mmu.c | 812 +- + drivers/misc/habanalabs/common/mmu_v1.c | 863 ++ + drivers/misc/habanalabs/common/pci.c | 17 +- + drivers/misc/habanalabs/common/sysfs.c | 60 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 254 +- + drivers/misc/habanalabs/gaudi/gaudiP.h | 60 +- + drivers/misc/habanalabs/gaudi/gaudi_security.c | 12351 +++++++++---------- + drivers/misc/habanalabs/goya/goya.c | 89 +- + drivers/misc/habanalabs/goya/goyaP.h | 2 +- + .../include/common/{armcp_if.h => cpucp_if.h} | 298 +- + drivers/misc/habanalabs/include/common/qman_if.h | 2 +- + drivers/misc/habanalabs/include/gaudi/gaudi.h | 2 + + .../misc/habanalabs/include/gaudi/gaudi_masks.h | 273 +- + .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 1 + + .../misc/habanalabs/include/goya/goya_reg_map.h | 1 + + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 2 + + drivers/misc/hisi_hikey_usb.c | 273 + + drivers/misc/mei/Kconfig | 10 + + drivers/misc/mei/Makefile | 3 + + drivers/misc/mei/bus-fixup.c | 12 + + drivers/misc/mei/bus.c | 89 +- + drivers/misc/mei/client.c | 423 +- + drivers/misc/mei/client.h | 22 +- + drivers/misc/mei/debugfs.c | 9 +- + drivers/misc/mei/hbm.c | 101 +- + drivers/misc/mei/hbm.h | 2 + + drivers/misc/mei/hw-virtio.c | 874 ++ + drivers/misc/mei/hw.h | 150 +- + drivers/misc/mei/interrupt.c | 113 +- + drivers/misc/mei/main.c | 284 +- + drivers/misc/mei/mei_dev.h | 34 +- + drivers/misc/mic/scif/scif_nodeqp.c | 2 +- + drivers/misc/mic/scif/scif_rma.c | 4 +- + drivers/misc/mic/vop/Makefile | 2 +- + drivers/misc/mic/vop/vop_main.c | 3 +- + drivers/misc/mic/vop/vop_vringh.c | 24 +- + drivers/misc/ocxl/Kconfig | 2 +- + drivers/misc/ocxl/core.c | 7 +- + drivers/misc/pvpanic.c | 8 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 +- + drivers/nvmem/core.c | 50 +- + drivers/nvmem/mtk-efuse.c | 14 - + drivers/power/supply/bq27xxx_battery_hdq.c | 2 +- + drivers/power/supply/ds2760_battery.c | 2 +- + drivers/power/supply/max1721x_battery.c | 2 +- + drivers/slimbus/core.c | 6 +- + drivers/slimbus/qcom-ngd-ctrl.c | 4 + + drivers/soundwire/Kconfig | 7 +- + drivers/soundwire/Makefile | 3 + + drivers/soundwire/bus.c | 120 +- + drivers/soundwire/bus.h | 52 +- + drivers/soundwire/bus_type.c | 9 + + drivers/soundwire/cadence_master.c | 199 +- + drivers/soundwire/cadence_master.h | 5 + + drivers/soundwire/generic_bandwidth_allocation.c | 425 + + drivers/soundwire/intel.c | 803 +- + drivers/soundwire/intel.h | 4 + + drivers/soundwire/intel_init.c | 22 +- + drivers/soundwire/master.c | 2 + + drivers/soundwire/mipi_disco.c | 18 +- + drivers/soundwire/qcom.c | 118 +- + drivers/soundwire/slave.c | 13 +- + drivers/soundwire/stream.c | 45 +- + drivers/soundwire/sysfs_local.h | 4 + + drivers/soundwire/sysfs_slave.c | 58 +- + drivers/uio/uio.c | 4 +- + drivers/virt/Kconfig | 2 + + drivers/virt/Makefile | 2 + + drivers/virt/fsl_hypervisor.c | 17 +- + drivers/virt/nitro_enclaves/Kconfig | 20 + + drivers/virt/nitro_enclaves/Makefile | 9 + + drivers/virt/nitro_enclaves/ne_misc_dev.c | 1733 +++ + drivers/virt/nitro_enclaves/ne_misc_dev.h | 109 + + drivers/virt/nitro_enclaves/ne_pci_dev.c | 625 + + drivers/virt/nitro_enclaves/ne_pci_dev.h | 327 + + drivers/virt/vboxguest/vboxguest_linux.c | 9 +- + drivers/w1/masters/mxc_w1.c | 14 +- + drivers/w1/slaves/w1_ds2405.c | 2 +- + drivers/w1/slaves/w1_ds2406.c | 2 +- + drivers/w1/slaves/w1_ds2408.c | 2 +- + drivers/w1/slaves/w1_ds2413.c | 2 +- + drivers/w1/slaves/w1_ds2423.c | 2 +- + drivers/w1/slaves/w1_ds2430.c | 2 +- + drivers/w1/slaves/w1_ds2431.c | 2 +- + drivers/w1/slaves/w1_ds2433.c | 2 +- + drivers/w1/slaves/w1_ds2438.c | 2 +- + drivers/w1/slaves/w1_ds250x.c | 2 +- + drivers/w1/slaves/w1_ds2780.c | 2 +- + drivers/w1/slaves/w1_ds2781.c | 2 +- + drivers/w1/slaves/w1_ds2805.c | 2 +- + drivers/w1/slaves/w1_ds28e04.c | 2 +- + drivers/w1/slaves/w1_ds28e17.c | 2 +- + drivers/w1/slaves/w1_therm.c | 459 +- + drivers/w1/w1.c | 4 +- + fs/Makefile | 3 +- + fs/exec.c | 132 +- + fs/kernel_read_file.c | 189 + + include/dt-bindings/interconnect/qcom,icc.h | 26 + + include/dt-bindings/interconnect/qcom,osm-l3.h | 3 + + include/dt-bindings/interconnect/qcom,sm8150.h | 162 + + include/dt-bindings/interconnect/qcom,sm8250.h | 172 + + include/linux/coresight.h | 3 +- + include/linux/firmware.h | 12 + + include/linux/fs.h | 39 - + include/linux/fsl/mc.h | 41 +- + include/linux/ima.h | 20 +- + include/linux/interconnect-provider.h | 24 +- + include/linux/interconnect.h | 22 + + include/linux/kernel_read_file.h | 55 + + include/linux/lsm_hook_defs.h | 6 +- + include/linux/lsm_hooks.h | 13 + + include/linux/mhi.h | 51 +- + include/linux/miscdevice.h | 10 +- + include/linux/nitro_enclaves.h | 11 + + include/linux/security.h | 21 +- + include/linux/soundwire/sdw.h | 48 +- + include/linux/soundwire/sdw_registers.h | 7 - + include/linux/spi/eeprom.h | 2 +- + include/linux/trace.h | 7 + + include/linux/w1.h | 2 +- + include/uapi/linux/coresight-stm.h | 1 + + include/uapi/linux/mei.h | 49 + + include/uapi/linux/nitro_enclaves.h | 359 + + include/uapi/misc/fastrpc.h | 5 +- + include/uapi/misc/habanalabs.h | 87 +- + kernel/kexec.c | 2 +- + kernel/kexec_file.c | 19 +- + kernel/module.c | 24 +- + kernel/trace/trace.c | 270 +- + lib/test_firmware.c | 154 +- + samples/mic/mpssd/mpssd.c | 24 +- + samples/nitro_enclaves/.gitignore | 2 + + samples/nitro_enclaves/Makefile | 16 + + samples/nitro_enclaves/ne_ioctl_sample.c | 883 ++ + security/integrity/digsig.c | 8 +- + security/integrity/ima/ima_fs.c | 10 +- + security/integrity/ima/ima_main.c | 73 +- + security/integrity/ima/ima_policy.c | 1 + + security/loadpin/loadpin.c | 17 +- + security/security.c | 28 +- + security/selinux/hooks.c | 8 +- + sound/soc/codecs/max98373-sdw.c | 18 +- + sound/soc/codecs/rt1308-sdw.c | 17 +- + sound/soc/codecs/rt5682-sdw.c | 20 +- + sound/soc/codecs/rt700-sdw.c | 20 +- + sound/soc/codecs/rt711-sdw.c | 20 +- + sound/soc/codecs/rt715-sdw.c | 38 +- + sound/soc/codecs/wsa881x.c | 1 + + tools/testing/selftests/firmware/fw_filesystem.sh | 91 + + tools/testing/selftests/lkdtm/run.sh | 2 +- + 297 files changed, 24461 insertions(+), 10013 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-bus-mhi + create mode 100644 Documentation/ABI/testing/sysfs-bus-dfl + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml + rename Documentation/devicetree/bindings/interconnect/{qcom,sdm845.yaml => qcom,rpmh.yaml} (60%) + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml + create mode 100644 Documentation/virt/ne_overview.rst + create mode 100644 drivers/bus/mhi/core/debugfs.c + rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} (90%) + rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (93%) + rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (90%) + rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (92%) + rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (95%) + create mode 100644 drivers/interconnect/bulk.c + create mode 100644 drivers/interconnect/qcom/sm8150.c + create mode 100644 drivers/interconnect/qcom/sm8150.h + create mode 100644 drivers/interconnect/qcom/sm8250.c + create mode 100644 drivers/interconnect/qcom/sm8250.h + create mode 100644 drivers/misc/habanalabs/common/mmu_v1.c + rename drivers/misc/habanalabs/include/common/{armcp_if.h => cpucp_if.h} (60%) + create mode 100644 drivers/misc/hisi_hikey_usb.c + create mode 100644 drivers/misc/mei/hw-virtio.c + create mode 100644 drivers/soundwire/generic_bandwidth_allocation.c + create mode 100644 drivers/virt/nitro_enclaves/Kconfig + create mode 100644 drivers/virt/nitro_enclaves/Makefile + create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev.c + create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev.h + create mode 100644 drivers/virt/nitro_enclaves/ne_pci_dev.c + create mode 100644 drivers/virt/nitro_enclaves/ne_pci_dev.h + create mode 100644 fs/kernel_read_file.c + create mode 100644 include/dt-bindings/interconnect/qcom,icc.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8150.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8250.h + create mode 100644 include/linux/kernel_read_file.h + create mode 100644 include/linux/nitro_enclaves.h + create mode 100644 include/uapi/linux/nitro_enclaves.h + create mode 100644 samples/nitro_enclaves/.gitignore + create mode 100644 samples/nitro_enclaves/Makefile + create mode 100644 samples/nitro_enclaves/ne_ioctl_sample.c +Merging extcon/extcon-next (dbc888072a97 extcon: axp288: Use module_platform_driver to simplify the code) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (0173f525b2c1 soundwire: sysfs: add slave status and device number before probe) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (810278da901c thunderbolt: Capitalize comment on top of QUIRK_FORCE_POWER_LINK_CONTROLLER) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (83e491799e63 vfio/fsl-mc: Fixed vfio-fsl-mc driver compilation on 32 bit) +$ git merge vfio/next +Auto-merging include/linux/pci.h +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging arch/s390/pci/pci_clp.c +Auto-merging arch/s390/pci/pci_bus.c +CONFLICT (content): Merge conflict in arch/s390/pci/pci_bus.c +Auto-merging arch/s390/include/asm/pci.h +Auto-merging MAINTAINERS +Resolved 'arch/s390/pci/pci_bus.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 59919e3f9727] Merge remote-tracking branch 'vfio/next' into master +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 14 + + arch/s390/include/asm/pci.h | 4 +- + arch/s390/pci/pci_bus.c | 5 +- + arch/s390/pci/pci_clp.c | 2 + + drivers/pci/iov.c | 1 + + drivers/vfio/Kconfig | 1 + + drivers/vfio/Makefile | 1 + + drivers/vfio/fsl-mc/Kconfig | 9 + + drivers/vfio/fsl-mc/Makefile | 4 + + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 683 ++++++++++++++++++++++++++++++ + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 194 +++++++++ + drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 55 +++ + drivers/vfio/pci/Kconfig | 12 + + drivers/vfio/pci/Makefile | 1 + + drivers/vfio/pci/vfio_pci.c | 38 +- + drivers/vfio/pci/vfio_pci_config.c | 27 +- + drivers/vfio/pci/vfio_pci_private.h | 12 + + drivers/vfio/pci/vfio_pci_zdev.c | 143 +++++++ + drivers/vfio/vfio.c | 9 +- + drivers/vfio/vfio_iommu_type1.c | 20 +- + include/linux/pci.h | 1 + + include/uapi/linux/vfio.h | 29 +- + include/uapi/linux/vfio_zdev.h | 78 ++++ + 23 files changed, 1325 insertions(+), 18 deletions(-) + create mode 100644 drivers/vfio/fsl-mc/Kconfig + create mode 100644 drivers/vfio/fsl-mc/Makefile + create mode 100644 drivers/vfio/fsl-mc/vfio_fsl_mc.c + create mode 100644 drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c + create mode 100644 drivers/vfio/fsl-mc/vfio_fsl_mc_private.h + create mode 100644 drivers/vfio/pci/vfio_pci_zdev.c + create mode 100644 include/uapi/linux/vfio_zdev.h +Merging staging/staging-next (e1f13c879a7c staging: comedi: check validity of wMaxPacketSize of usb endpoints found) +$ git merge staging/staging-next +Removing include/linux/platform_data/ad7291.h +Auto-merging include/linux/iio/iio.h +Removing drivers/staging/wfx/secure_link.h +Removing drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt +Auto-merging drivers/staging/rtl8192e/Kconfig +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/staging/qlge/qlge.h +Removing drivers/staging/most/cdev/Makefile +Removing drivers/staging/most/cdev/Kconfig +Removing drivers/staging/iio/Documentation/trigger.txt +Removing drivers/staging/iio/Documentation/sysfs-bus-iio-light +Removing drivers/staging/iio/Documentation/ring.txt +Removing drivers/staging/iio/Documentation/overview.txt +Removing drivers/staging/iio/Documentation/device.txt +Removing drivers/staging/iio/Documentation/dac/max517 +Auto-merging drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +Auto-merging drivers/iio/adc/stm32-dfsdm-adc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/iio/dac/ltc2632.txt +Removing Documentation/devicetree/bindings/iio/adc/vf610-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc12138.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt +Removing Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt +Removing Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt +Auto-merging Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml +Removing Documentation/devicetree/bindings/iio/adc/nuvoton-nau7802.txt +Removing Documentation/devicetree/bindings/iio/adc/nuvoton,npcm-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/mcp3422.txt +Removing Documentation/devicetree/bindings/iio/adc/mcp320x.txt +Removing Documentation/devicetree/bindings/iio/adc/max9611.txt +Removing Documentation/devicetree/bindings/iio/adc/max1118.txt +Removing Documentation/devicetree/bindings/iio/adc/max11100.txt +Removing Documentation/devicetree/bindings/iio/adc/ltc2497.txt +Removing Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/hi8435.txt +Removing Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt +Removing Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt +Removing Documentation/devicetree/bindings/iio/adc/cpcap-adc.txt +Removing Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt +Removing Documentation/devicetree/bindings/iio/adc/berlin2_adc.txt +Removing Documentation/devicetree/bindings/iio/adc/aspeed_adc.txt +Removing Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt +Removing Documentation/devicetree/bindings/iio/adc/ads1015.txt +Removing Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt +Removing Documentation/devicetree/bindings/iio/adc/ad7949.txt +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 4 + + Documentation/ABI/testing/sysfs-bus-iio | 90 +- + .../ABI/testing/sysfs-bus-iio-accel-adxl372 | 7 + + .../ABI/testing/sysfs-bus-iio-humidity-hdc2010 | 9 + + .../ABI/testing/sysfs-bus-iio-light-tsl2772 | 0 + .../devicetree/bindings/iio/adc/ad7949.txt | 16 - + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 46 + + .../devicetree/bindings/iio/adc/adi,ad7768-1.txt | 41 - + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 89 ++ + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 57 + + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 15 +- + .../devicetree/bindings/iio/adc/ads1015.txt | 73 -- + .../bindings/iio/adc/amlogic,meson-saradc.txt | 48 - + .../bindings/iio/adc/amlogic,meson-saradc.yaml | 149 +++ + .../bindings/iio/adc/aspeed,ast2400-adc.yaml | 55 + + .../devicetree/bindings/iio/adc/aspeed_adc.txt | 22 - + .../devicetree/bindings/iio/adc/berlin2_adc.txt | 19 - + .../devicetree/bindings/iio/adc/cc10001_adc.txt | 22 - + .../bindings/iio/adc/cosmic,10001-adc.yaml | 59 + + .../devicetree/bindings/iio/adc/cpcap-adc.txt | 17 - + .../devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 - + .../bindings/iio/adc/dlg,da9150-gpadc.yaml | 35 + + .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 57 - + .../devicetree/bindings/iio/adc/fsl,imx25-gcq.yaml | 131 ++ + .../devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml | 62 + + .../devicetree/bindings/iio/adc/fsl,vf610-adc.yaml | 81 ++ + .../devicetree/bindings/iio/adc/hi8435.txt | 21 - + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 50 + + .../devicetree/bindings/iio/adc/imx7d-adc.txt | 24 - + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 44 + + .../devicetree/bindings/iio/adc/lpc1850-adc.txt | 20 - + .../devicetree/bindings/iio/adc/lpc32xx-adc.txt | 21 - + .../devicetree/bindings/iio/adc/ltc2497.txt | 13 - + .../bindings/iio/adc/marvell,berlin2-adc.yaml | 50 + + .../devicetree/bindings/iio/adc/max11100.txt | 18 - + .../devicetree/bindings/iio/adc/max1118.txt | 21 - + .../devicetree/bindings/iio/adc/max9611.txt | 27 - + .../bindings/iio/adc/maxim,max11100.yaml | 49 + + .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 62 + + .../devicetree/bindings/iio/adc/maxim,max9611.yaml | 51 + + .../devicetree/bindings/iio/adc/mcp320x.txt | 57 - + .../devicetree/bindings/iio/adc/mcp3422.txt | 19 - + .../bindings/iio/adc/microchip,mcp3201.yaml | 77 ++ + .../bindings/iio/adc/motorola,cpcap-adc.yaml | 53 + + .../bindings/iio/adc/nuvoton,nau7802.yaml | 50 + + .../bindings/iio/adc/nuvoton,npcm-adc.txt | 26 - + .../bindings/iio/adc/nuvoton,npcm750-adc.yaml | 64 + + .../bindings/iio/adc/nuvoton-nau7802.txt | 18 - + .../bindings/iio/adc/nxp,lpc1850-adc.yaml | 61 + + .../bindings/iio/adc/nxp,lpc3220-adc.yaml | 50 + + .../bindings/iio/adc/samsung,exynos-adc.yaml | 15 +- + .../bindings/iio/adc/sprd,sc2720-adc.yaml | 72 ++ + .../bindings/iio/adc/sprd,sc27xx-adc.txt | 40 - + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 45 + + .../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 - + .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 56 + + .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 47 + + .../devicetree/bindings/iio/adc/ti,adc12138.yaml | 86 ++ + .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 59 + + .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 51 + + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 112 ++ + .../devicetree/bindings/iio/adc/ti,ads7950.yaml | 65 + + .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 51 + + .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 52 + + .../bindings/iio/adc/ti,twl4030-madc.yaml | 48 + + .../devicetree/bindings/iio/adc/ti-adc0832.txt | 19 - + .../devicetree/bindings/iio/adc/ti-adc108s102.txt | 18 - + .../devicetree/bindings/iio/adc/ti-adc12138.txt | 37 - + .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 25 - + .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 18 - + .../devicetree/bindings/iio/adc/ti-ads7950.txt | 23 - + .../devicetree/bindings/iio/adc/ti-ads8344.txt | 19 - + .../devicetree/bindings/iio/adc/twl4030-madc.txt | 24 - + .../devicetree/bindings/iio/adc/vf610-adc.txt | 36 - + .../bindings/iio/chemical/atlas,sensor.yaml | 4 + + .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 77 ++ + .../devicetree/bindings/iio/dac/ltc2632.txt | 49 - + .../bindings/iio/gyroscope/adi,adxrs290.yaml | 59 + + .../bindings/iio/humidity/ti,hdc2010.yaml | 45 + + .../devicetree/bindings/iio/light/ams,as73211.yaml | 54 + + .../bindings/iio/light/vishay,vcnl4000.yaml | 4 + + .../bindings/iio/proximity/semtech,sx9310.yaml | 65 + + .../devicetree/bindings/iio/proximity/vl53l0x.txt | 6 + + .../devicetree/bindings/trivial-devices.yaml | 16 + + MAINTAINERS | 72 +- + drivers/counter/microchip-tcb-capture.c | 2 +- + drivers/counter/ti-eqep.c | 2 +- + drivers/iio/Kconfig | 2 +- + drivers/iio/accel/adis16201.c | 26 +- + drivers/iio/accel/adis16209.c | 25 +- + drivers/iio/accel/adxl372.c | 311 ++++- + drivers/iio/accel/adxl372_i2c.c | 8 + + drivers/iio/accel/adxl372_spi.c | 4 +- + drivers/iio/accel/bma180.c | 22 +- + drivers/iio/accel/bma220_spi.c | 85 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/mma8452.c | 20 +- + drivers/iio/adc/Kconfig | 4 +- + drivers/iio/adc/ad7291.c | 35 +- + drivers/iio/adc/ad7292.c | 4 +- + drivers/iio/adc/ad7949.c | 2 +- + drivers/iio/adc/ad9467.c | 124 +- + drivers/iio/adc/adi-axi-adc.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 26 +- + drivers/iio/adc/axp20x_adc.c | 14 +- + drivers/iio/adc/bcm_iproc_adc.c | 4 +- + drivers/iio/adc/envelope-detector.c | 16 +- + drivers/iio/adc/exynos_adc.c | 30 +- + drivers/iio/adc/fsl-imx25-gcq.c | 15 +- + drivers/iio/adc/ltc2497-core.c | 10 +- + drivers/iio/adc/meson_saradc.c | 18 +- + drivers/iio/adc/palmas_gpadc.c | 13 +- + drivers/iio/adc/rcar-gyroadc.c | 30 +- + drivers/iio/adc/stm32-adc-core.c | 80 +- + drivers/iio/adc/stm32-adc.c | 10 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 10 +- + drivers/iio/adc/stm32-dfsdm-core.c | 20 +- + drivers/iio/adc/ti-adc081c.c | 24 +- + drivers/iio/adc/ti-adc0832.c | 11 +- + drivers/iio/adc/ti-adc108s102.c | 5 +- + drivers/iio/adc/ti-adc12138.c | 13 +- + drivers/iio/adc/ti-adc128s052.c | 3 +- + drivers/iio/afe/iio-rescale.c | 8 +- + drivers/iio/amplifiers/Kconfig | 1 + + drivers/iio/amplifiers/hmc425a.c | 9 +- + drivers/iio/buffer/Kconfig | 10 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 12 +- + drivers/iio/chemical/ams-iaq-core.c | 3 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 88 +- + drivers/iio/chemical/atlas-sensor.c | 10 +- + drivers/iio/chemical/scd30_core.c | 9 +- + drivers/iio/chemical/sgp30.c | 29 +- + drivers/iio/chemical/vz89x.c | 18 +- + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 3 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 5 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 11 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 3 +- + drivers/iio/dac/ad5064.c | 6 +- + drivers/iio/dac/ad5446.c | 5 +- + drivers/iio/dac/ad5592r-base.c | 56 +- + drivers/iio/dac/ad5592r.c | 7 +- + drivers/iio/dac/ad5593r.c | 7 +- + drivers/iio/dac/ad5686.c | 8 +- + drivers/iio/dac/ad5686.h | 2 +- + drivers/iio/dac/ad7303.c | 6 +- + drivers/iio/dac/dpot-dac.c | 16 +- + drivers/iio/dac/mcp4725.c | 29 +- + drivers/iio/dac/stm32-dac-core.c | 5 +- + drivers/iio/dac/stm32-dac.c | 13 +- + drivers/iio/dac/ti-dac082s085.c | 5 +- + drivers/iio/dac/ti-dac5571.c | 36 +- + drivers/iio/dac/ti-dac7612.c | 14 +- + drivers/iio/dummy/iio_dummy_evgen.c | 4 +- + drivers/iio/frequency/ad9523.c | 60 +- + drivers/iio/frequency/adf4350.c | 21 +- + drivers/iio/gyro/Kconfig | 12 + + drivers/iio/gyro/Makefile | 1 + + drivers/iio/gyro/adis16080.c | 2 +- + drivers/iio/gyro/adis16136.c | 37 +- + drivers/iio/gyro/adis16260.c | 33 +- + drivers/iio/gyro/adxrs290.c | 710 +++++++++++ + drivers/iio/gyro/itg3200_buffer.c | 15 +- + drivers/iio/health/max30102.c | 15 +- + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/hdc100x.c | 3 +- + drivers/iio/humidity/hdc2010.c | 353 ++++++ + drivers/iio/humidity/htu21.c | 3 +- + drivers/iio/humidity/si7020.c | 3 +- + drivers/iio/iio_core_trigger.h | 4 +- + drivers/iio/imu/adis16400.c | 72 +- + drivers/iio/imu/adis16460.c | 25 +- + drivers/iio/imu/adis16475.c | 18 +- + drivers/iio/imu/adis16480.c | 55 +- + drivers/iio/imu/adis_buffer.c | 76 +- + drivers/iio/imu/adis_trigger.c | 60 - + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 20 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 12 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 14 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 6 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 42 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 134 ++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 + + drivers/iio/industrialio-buffer.c | 46 +- + drivers/iio/industrialio-core.c | 5 +- + drivers/iio/industrialio-event.c | 51 +- + drivers/iio/industrialio-trigger.c | 3 +- + drivers/iio/light/Kconfig | 15 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/as73211.c | 800 +++++++++++++ + drivers/iio/light/cros_ec_light_prox.c | 5 +- + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/light/isl29018.c | 9 +- + drivers/iio/light/si1145.c | 19 +- + drivers/iio/light/tsl2772.c | 10 +- + drivers/iio/magnetometer/ak8974.c | 14 +- + drivers/iio/magnetometer/ak8975.c | 8 +- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 20 +- + drivers/iio/multiplexer/iio-mux.c | 8 +- + drivers/iio/potentiometer/ad5272.c | 5 +- + drivers/iio/potentiometer/ds1803.c | 6 +- + drivers/iio/potentiometer/max5432.c | 8 +- + drivers/iio/potentiometer/max5481.c | 23 +- + drivers/iio/potentiometer/mcp4018.c | 12 +- + drivers/iio/potentiometer/mcp4131.c | 8 +- + drivers/iio/potentiometer/mcp4531.c | 11 +- + drivers/iio/potentiostat/lmp91000.c | 11 +- + drivers/iio/pressure/cros_ec_baro.c | 5 +- + drivers/iio/pressure/icp10100.c | 3 +- + drivers/iio/pressure/ms5611_i2c.c | 6 +- + drivers/iio/pressure/ms5611_spi.c | 6 +- + drivers/iio/pressure/ms5637.c | 3 +- + drivers/iio/pressure/zpa2326_i2c.c | 6 +- + drivers/iio/pressure/zpa2326_spi.c | 6 +- + drivers/iio/proximity/as3935.c | 44 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 3 +- + drivers/iio/proximity/sx9310.c | 427 +++---- + drivers/iio/proximity/vl53l0x-i2c.c | 104 +- + drivers/iio/resolver/ad2s1200.c | 3 +- + drivers/iio/temperature/ltc2983.c | 19 +- + drivers/iio/temperature/mlx90632.c | 283 ++++- + drivers/iio/temperature/tmp007.c | 4 +- + drivers/iio/temperature/tsys01.c | 3 +- + drivers/most/Kconfig | 9 + + drivers/most/Makefile | 1 + + .../{staging/most/cdev/cdev.c => most/most_cdev.c} | 0 + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/comedi/comedi.h | 4 +- + drivers/staging/comedi/comedidev.h | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 4 +- + drivers/staging/comedi/drivers/comedi_8255.c | 2 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 2 +- + drivers/staging/comedi/drivers/pcmuio.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/vmk80xx.c | 3 + + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/emxx_udc.c | 19 +- + drivers/staging/emxx_udc/emxx_udc.h | 461 ++++--- + drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 55 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 441 ++++--- + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 2 +- + drivers/staging/fwserial/fwserial.c | 2 +- + drivers/staging/greybus/audio_codec.c | 4 +- + drivers/staging/greybus/audio_module.c | 6 +- + drivers/staging/greybus/audio_topology.c | 20 +- + drivers/staging/greybus/gbphy.h | 4 +- + drivers/staging/hikey9xx/Kconfig | 49 + + drivers/staging/hikey9xx/Makefile | 7 + + drivers/staging/hikey9xx/TODO | 5 + + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 342 ++++++ + drivers/staging/hikey9xx/hi6421v600-regulator.c | 478 ++++++++ + drivers/staging/hikey9xx/hisi-spmi-controller.c | 358 ++++++ + .../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml | 159 +++ + .../hikey9xx/hisilicon,hisi-spmi-controller.yaml | 62 + + drivers/staging/hikey9xx/phy-hi3670-usb3.c | 671 +++++++++++ + drivers/staging/hikey9xx/phy-hi3670-usb3.yaml | 72 ++ + drivers/staging/iio/Documentation/dac/max517 | 41 - + drivers/staging/iio/Documentation/device.txt | 74 -- + drivers/staging/iio/Documentation/overview.txt | 57 - + drivers/staging/iio/Documentation/ring.txt | 47 - + .../staging/iio/Documentation/sysfs-bus-iio-light | 79 -- + drivers/staging/iio/Documentation/trigger.txt | 31 - + drivers/staging/iio/accel/adis16203.c | 26 +- + drivers/staging/iio/accel/adis16240.c | 25 +- + drivers/staging/iio/frequency/ad9834.c | 1 - + drivers/staging/kpc2000/kpc_dma/fileops.c | 4 +- + drivers/staging/ks7010/ks7010_sdio.c | 6 +- + drivers/staging/ks7010/ks_hostif.c | 6 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 68 +- + .../staging/media/atomisp/include/media/lm3554.h | 7 +- + drivers/staging/media/tegra-vde/iommu.c | 4 +- + drivers/staging/most/Kconfig | 2 - + drivers/staging/most/Makefile | 1 - + drivers/staging/most/cdev/Kconfig | 13 - + drivers/staging/most/cdev/Makefile | 4 - + drivers/staging/most/dim2/dim2.c | 6 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 6 +- + drivers/staging/mt7621-pci/TODO | 2 +- + drivers/staging/nvec/nvec.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 3 +- + drivers/staging/pi433/pi433_if.h | 26 +- + drivers/staging/qlge/qlge.h | 20 +- + drivers/staging/qlge/qlge_dbg.c | 28 +- + drivers/staging/qlge/qlge_main.c | 20 +- + drivers/staging/qlge/qlge_mpi.c | 15 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 78 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 58 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 790 ++---------- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 92 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 4 +- + drivers/staging/rtl8188eu/hal/odm.c | 65 +- + drivers/staging/rtl8188eu/hal/phy.c | 49 +- + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 25 +- + drivers/staging/rtl8188eu/hal/rf.c | 1 + + drivers/staging/rtl8188eu/hal/rf_cfg.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 6 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 3 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 5 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 13 +- + drivers/staging/rtl8188eu/include/ieee80211.h | 10 - + drivers/staging/rtl8188eu/include/osdep_service.h | 1 + + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 3 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 2 + + drivers/staging/rtl8188eu/include/rtw_security.h | 62 +- + drivers/staging/rtl8188eu/include/wifi.h | 34 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 329 +++-- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 46 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 10 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 52 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 27 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- + drivers/staging/rtl8192e/rtllib_tx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 9 +- + drivers/staging/rtl8192u/r8192U_dm.c | 12 +- + drivers/staging/rtl8192u/r8192U_hw.h | 1 + + drivers/staging/rtl8192u/r8192U_wx.c | 41 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 5 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 6 - + drivers/staging/rtl8192u/r819xU_firmware_img.h | 3 - + drivers/staging/rtl8192u/r819xU_phy.c | 30 +- + drivers/staging/rtl8192u/r819xU_phyreg.h | 3 - + drivers/staging/rtl8712/rtl8712_recv.c | 19 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 4 +- + drivers/staging/rtl8712/rtl871x_io.c | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 16 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 11 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 2 +- + drivers/staging/rtl8712/rtl871x_recv.c | 20 +- + drivers/staging/rtl8712/rtl871x_security.c | 8 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 34 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 2 +- + drivers/staging/rtl8712/usb_intf.c | 2 +- + drivers/staging/rtl8712/usb_ops_linux.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 74 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 11 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 11 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 87 -- + .../rtl8723bs/include/osdep_service_linux.h | 14 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 3 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 42 +- + drivers/staging/rts5208/rtsx_transport.c | 24 +- + drivers/staging/sm750fb/sm750.c | 3 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +- + .../include/linux/raspberrypi/vchiq.h | 11 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 24 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 1257 ++++++++++---------- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 25 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 14 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 29 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +- + drivers/staging/vt6655/device_main.c | 6 +- + drivers/staging/vt6655/mac.h | 2 +- + drivers/staging/vt6655/rxtx.c | 24 +- + .../bindings/net/wireless/silabs,wfx.yaml | 125 ++ + .../bindings/net/wireless/siliabs,wfx.txt | 98 -- + drivers/staging/wfx/TODO | 19 - + drivers/staging/wfx/bh.c | 75 +- + drivers/staging/wfx/bh.h | 2 +- + drivers/staging/wfx/bus.h | 2 +- + drivers/staging/wfx/bus_sdio.c | 2 +- + drivers/staging/wfx/bus_spi.c | 2 +- + drivers/staging/wfx/data_rx.c | 11 +- + drivers/staging/wfx/data_rx.h | 2 +- + drivers/staging/wfx/data_tx.c | 74 +- + drivers/staging/wfx/data_tx.h | 5 +- + drivers/staging/wfx/debug.c | 27 +- + drivers/staging/wfx/fwio.c | 4 +- + drivers/staging/wfx/hif_api_cmd.h | 256 ++-- + drivers/staging/wfx/hif_api_general.h | 131 +- + drivers/staging/wfx/hif_api_mib.h | 50 +- + drivers/staging/wfx/hif_rx.c | 91 +- + drivers/staging/wfx/hif_tx.c | 116 +- + drivers/staging/wfx/hif_tx.h | 12 +- + drivers/staging/wfx/hif_tx_mib.c | 124 +- + drivers/staging/wfx/hif_tx_mib.h | 13 +- + drivers/staging/wfx/hwio.c | 2 +- + drivers/staging/wfx/hwio.h | 2 +- + drivers/staging/wfx/key.c | 12 +- + drivers/staging/wfx/key.h | 2 +- + drivers/staging/wfx/main.c | 33 +- + drivers/staging/wfx/main.h | 4 +- + drivers/staging/wfx/queue.c | 16 +- + drivers/staging/wfx/queue.h | 3 +- + drivers/staging/wfx/scan.c | 6 +- + drivers/staging/wfx/scan.h | 2 +- + drivers/staging/wfx/secure_link.h | 59 - + drivers/staging/wfx/sta.c | 348 +++--- + drivers/staging/wfx/sta.h | 4 +- + drivers/staging/wfx/traces.h | 2 +- + drivers/staging/wfx/wfx.h | 7 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 18 +- + drivers/staging/wlan-ng/p80211netdev.c | 11 +- + drivers/staging/wlan-ng/prism2mgmt.c | 24 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 4 +- + include/linux/iio/buffer-dmaengine.h | 4 - + include/linux/iio/common/cros_ec_sensors_core.h | 4 +- + include/linux/iio/iio.h | 3 +- + include/linux/iio/imu/adis.h | 53 +- + include/linux/iio/trigger_consumer.h | 2 +- + include/linux/iio/types.h | 1 + + include/linux/mfd/hi6421-spmi-pmic.h | 53 + + include/linux/platform_data/ad7291.h | 13 - + include/linux/platform_data/ad7793.h | 2 +- + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 2 + + 435 files changed, 11419 insertions(+), 7209 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-accel-adxl372 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc2010 + rename drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2x7x => Documentation/ABI/testing/sysfs-bus-iio-light-tsl2772 (100%) + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ad7949.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7291.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7949.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ads1015.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed,ast2400-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed_adc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/berlin2_adc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/cosmic,10001-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/cpcap-adc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/dlg,da9150-gpadc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/hi8435.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/holt,hi8435.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/lpc32xx-adc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ltc2497.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/marvell,berlin2-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max11100.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max1118.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/max9611.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max11100.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max1118.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max9611.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/mcp320x.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/mcp3422.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,mcp3201.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/motorola,cpcap-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nuvoton,nau7802.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/nuvoton,npcm-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/nuvoton,npcm750-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/nuvoton-nau7802.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,lpc3220-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/sprd,sc27xx-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stmpe-adc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc0832.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc108s102.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc12138.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc128s052.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc161s626.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1015.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads7950.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads8344.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,tlc4541.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,twl4030-madc.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc12138.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/vf610-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lltc,ltc2632.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ltc2632.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml + create mode 100644 Documentation/devicetree/bindings/iio/humidity/ti,hdc2010.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/ams,as73211.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml + create mode 100644 drivers/iio/gyro/adxrs290.c + create mode 100644 drivers/iio/humidity/hdc2010.c + create mode 100644 drivers/iio/light/as73211.c + rename drivers/{staging/most/cdev/cdev.c => most/most_cdev.c} (100%) + create mode 100644 drivers/staging/hikey9xx/Kconfig + create mode 100644 drivers/staging/hikey9xx/Makefile + create mode 100644 drivers/staging/hikey9xx/TODO + create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c + create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c + create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c + create mode 100644 drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml + create mode 100644 drivers/staging/hikey9xx/hisilicon,hisi-spmi-controller.yaml + create mode 100644 drivers/staging/hikey9xx/phy-hi3670-usb3.c + create mode 100644 drivers/staging/hikey9xx/phy-hi3670-usb3.yaml + delete mode 100644 drivers/staging/iio/Documentation/dac/max517 + delete mode 100644 drivers/staging/iio/Documentation/device.txt + delete mode 100644 drivers/staging/iio/Documentation/overview.txt + delete mode 100644 drivers/staging/iio/Documentation/ring.txt + delete mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-light + delete mode 100644 drivers/staging/iio/Documentation/trigger.txt + delete mode 100644 drivers/staging/most/cdev/Kconfig + delete mode 100644 drivers/staging/most/cdev/Makefile + create mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml + delete mode 100644 drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt + delete mode 100644 drivers/staging/wfx/secure_link.h + create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h + delete mode 100644 include/linux/platform_data/ad7291.h +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Auto-merging drivers/mux/adgs1408.c +Merge made by the 'recursive' strategy. +Merging icc/icc-next (5a42868ade31 interconnect: qcom: sc7180: Init BCMs before creating the nodes) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 3 +++ + drivers/interconnect/qcom/sc7180.c | 6 +++--- + drivers/interconnect/qcom/sdm845.c | 8 ++++---- + 3 files changed, 10 insertions(+), 7 deletions(-) +Merging dmaengine/next (fc143e38ddd4 dmaengine: owl-dma: fix kernel-doc style for enum) +$ git merge dmaengine/next +Auto-merging drivers/dma/ti/k3-udma-glue.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 20 ++ + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../bindings/dma/snps,dma-spear1340.yaml | 7 +- + drivers/dma/altera-msgdma.c | 8 +- + drivers/dma/at_hdmac.c | 7 +- + drivers/dma/at_xdmac.c | 7 +- + drivers/dma/bcm2835-dma.c | 3 - + drivers/dma/coh901318.c | 7 +- + drivers/dma/dma-axi-dmac.c | 141 +++++++++---- + drivers/dma/dma-jz4780.c | 7 +- + drivers/dma/dmaengine.c | 24 +-- + drivers/dma/dmatest.c | 23 ++- + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 2 +- + drivers/dma/dw-edma/dw-edma-v0-regs.h | 2 +- + drivers/dma/dw/core.c | 12 +- + drivers/dma/dw/dw.c | 7 +- + drivers/dma/dw/idma32.c | 5 +- + drivers/dma/dw/of.c | 7 +- + drivers/dma/ep93xx_dma.c | 7 +- + drivers/dma/fsl_raid.c | 8 +- + drivers/dma/fsldma.c | 6 +- + drivers/dma/idxd/device.c | 10 +- + drivers/dma/idxd/idxd.h | 3 + + drivers/dma/idxd/init.c | 2 + + drivers/dma/idxd/irq.c | 2 +- + drivers/dma/idxd/sysfs.c | 95 +++++++++ + drivers/dma/imx-dma.c | 9 +- + drivers/dma/imx-sdma.c | 2 - + drivers/dma/ioat/dma.c | 12 +- + drivers/dma/ioat/dma.h | 2 +- + drivers/dma/ioat/init.c | 4 +- + drivers/dma/iop-adma.c | 19 +- + drivers/dma/ipu/ipu_idmac.c | 6 +- + drivers/dma/k3dma.c | 6 +- + drivers/dma/mediatek/mtk-cqdma.c | 7 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 7 +- + drivers/dma/mmp_pdma.c | 6 +- + drivers/dma/mmp_tdma.c | 6 +- + drivers/dma/mpc512x_dma.c | 6 +- + drivers/dma/mv_xor.c | 7 +- + drivers/dma/mv_xor_v2.c | 8 +- + drivers/dma/mxs-dma.c | 9 +- + drivers/dma/nbpfaxi.c | 6 +- + drivers/dma/owl-dma.c | 3 +- + drivers/dma/pch_dma.c | 42 ++-- + drivers/dma/pl330.c | 30 ++- + drivers/dma/plx_dma.c | 7 +- + drivers/dma/ppc4xx/adma.c | 7 +- + drivers/dma/qcom/bam_dma.c | 10 +- + drivers/dma/qcom/hidma.c | 6 +- + drivers/dma/qcom/hidma_ll.c | 6 +- + drivers/dma/sa11x0-dma.c | 6 +- + drivers/dma/sf-pdma/sf-pdma.c | 25 ++- + drivers/dma/sh/Kconfig | 4 +- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/sh/shdma-base.c | 2 +- + drivers/dma/sirf-dma.c | 6 +- + drivers/dma/ste_dma40.c | 10 +- + drivers/dma/stm32-dma.c | 8 +- + drivers/dma/stm32-dmamux.c | 9 +- + drivers/dma/stm32-mdma.c | 9 +- + drivers/dma/sun6i-dma.c | 6 +- + drivers/dma/tegra20-apb-dma.c | 7 +- + drivers/dma/ti/Makefile | 5 +- + drivers/dma/ti/k3-psil-j7200.c | 175 +++++++++++++++++ + drivers/dma/ti/k3-psil-j721e.c | 3 + + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 19 +- + drivers/dma/ti/k3-udma-glue.c | 17 +- + drivers/dma/ti/k3-udma.c | 64 +++--- + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/timb_dma.c | 6 +- + drivers/dma/txx9dmac.c | 14 +- + drivers/dma/virt-dma.c | 6 +- + drivers/dma/xgene-dma.c | 7 +- + drivers/dma/xilinx/xilinx_dma.c | 45 ++--- + drivers/dma/xilinx/xilinx_dpdma.c | 218 ++++++++++++++++++++- + drivers/dma/xilinx/zynqmp_dma.c | 8 +- + drivers/dma/zx_dma.c | 6 +- + include/linux/dmaengine.h | 17 +- + include/linux/platform_data/dma-dw.h | 2 + + 81 files changed, 930 insertions(+), 437 deletions(-) + create mode 100644 drivers/dma/ti/k3-psil-j7200.c +Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging scsi/for-next (9dcbbd959cef Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sym53c8xx_2/sym_hipd.c +Auto-merging drivers/scsi/sym53c8xx_2/sym_fw.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/qlogicpti.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla4xxx/ql4_nx.c +Auto-merging drivers/scsi/qla4xxx/ql4_init.c +Auto-merging drivers/scsi/qla2xxx/qla_version.h +Auto-merging drivers/scsi/qla2xxx/qla_tmpl.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_nx2.c +Auto-merging drivers/scsi/qla2xxx/qla_nvme.h +Auto-merging drivers/scsi/qla2xxx/qla_nvme.c +Auto-merging drivers/scsi/qla2xxx/qla_mid.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_iocb.c +Auto-merging drivers/scsi/qla2xxx/qla_inline.h +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_gs.c +Auto-merging drivers/scsi/qla2xxx/qla_gbl.h +Auto-merging drivers/scsi/qla2xxx/qla_fw.h +Auto-merging drivers/scsi/qla2xxx/qla_dfs.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_dbg.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/myrb.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_ctl.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid.c +Auto-merging drivers/scsi/lpfc/lpfc_ct.c +Auto-merging drivers/scsi/libsas/sas_discover.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/isci/phy.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas.h +Auto-merging drivers/scsi/csiostor/csio_hw.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/aic7xxx/aic7xxx_core.c +Auto-merging drivers/scsi/aic7xxx/aic79xx_osm.c +Auto-merging drivers/scsi/aic7xxx/aic79xx_core.c +Auto-merging drivers/scsi/aacraid/linit.c +Auto-merging drivers/scsi/aacraid/commsup.c +Auto-merging drivers/scsi/aacraid/aachba.c +CONFLICT (content): Merge conflict in drivers/scsi/aacraid/aachba.c +Auto-merging drivers/scsi/53c700.c +Auto-merging drivers/message/fusion/mptscsih.c +Auto-merging MAINTAINERS +Resolved 'drivers/scsi/aacraid/aachba.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0503c855c611] Merge remote-tracking branch 'scsi/for-next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ufs/ufs-mediatek.txt | 4 +- + Documentation/scsi/scsi_mid_low_api.rst | 6 - + Documentation/scsi/smartpqi.rst | 14 +- + MAINTAINERS | 28 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/message/fusion/mptfc.c | 6 +- + drivers/message/fusion/mptscsih.c | 3 +- + drivers/s390/scsi/zfcp_erp.c | 8 +- + drivers/s390/scsi/zfcp_fsf.c | 10 +- + drivers/scsi/53c700.c | 4 - + drivers/scsi/aacraid/aachba.c | 11 +- + drivers/scsi/aacraid/commctrl.c | 20 +- + drivers/scsi/aacraid/commsup.c | 9 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 3 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- + drivers/scsi/aic94xx/aic94xx.h | 8 - + drivers/scsi/arcmsr/arcmsr.h | 102 ++- + drivers/scsi/arcmsr/arcmsr_hba.c | 377 ++++++--- + drivers/scsi/arm/cumana_2.c | 19 +- + drivers/scsi/arm/eesox.c | 9 +- + drivers/scsi/arm/oak.c | 2 +- + drivers/scsi/arm/powertec.c | 9 +- + drivers/scsi/be2iscsi/be_main.c | 4 +- + drivers/scsi/bfa/bfad.c | 1 + + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 10 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 6 +- + drivers/scsi/bnx2i/bnx2i_init.c | 2 - + drivers/scsi/csiostor/csio_hw.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 8 +- + drivers/scsi/cxgbi/libcxgbi.h | 16 - + drivers/scsi/dc395x.c | 41 +- + drivers/scsi/dpt_i2o.c | 3 - + drivers/scsi/esas2r/esas2r_ioctl.c | 28 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 8 +- + drivers/scsi/fdomain_isa.c | 5 +- + drivers/scsi/fnic/fnic_debugfs.c | 6 +- + drivers/scsi/fnic/fnic_fcs.c | 9 - + drivers/scsi/fnic/fnic_main.c | 5 +- + drivers/scsi/fnic/fnic_scsi.c | 3 +- + drivers/scsi/fnic/vnic_wq_copy.c | 8 +- + drivers/scsi/gdth.c | 153 ++-- + drivers/scsi/hisi_sas/Kconfig | 1 + + drivers/scsi/hisi_sas/hisi_sas.h | 37 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 123 ++- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 24 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 251 ++++-- + drivers/scsi/hpsa.c | 17 +- + drivers/scsi/hpsa.h | 1 + + drivers/scsi/hpsa_cmd.h | 1 + + drivers/scsi/ibmvscsi/ibmvfc.c | 229 +++++- + drivers/scsi/ibmvscsi/ibmvfc.h | 160 +++- + drivers/scsi/initio.c | 14 +- + drivers/scsi/isci/host.c | 2 - + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/isci/phy.c | 2 +- + drivers/scsi/isci/remote_node_table.h | 2 +- + drivers/scsi/jazz_esp.c | 14 +- + drivers/scsi/libfc/fc_disc.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 8 +- + drivers/scsi/libsas/sas_discover.c | 8 +- + drivers/scsi/lpfc/lpfc_attr.c | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 2 + + drivers/scsi/lpfc/lpfc_debugfs.c | 5 +- + drivers/scsi/mac_esp.c | 14 +- + drivers/scsi/megaraid.c | 192 ++--- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 67 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 21 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 16 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 366 ++++++++- + drivers/scsi/mvsas/mv_init.c | 4 - + drivers/scsi/mvumi.c | 1 + + drivers/scsi/myrb.c | 11 +- + drivers/scsi/myrs.c | 8 +- + drivers/scsi/nsp32.c | 4 +- + drivers/scsi/pm8001/pm8001_ctl.c | 6 +- + drivers/scsi/pm8001/pm8001_defs.h | 27 +- + drivers/scsi/pm8001/pm8001_hwi.c | 38 +- + drivers/scsi/pm8001/pm8001_init.c | 221 ++++-- + drivers/scsi/pm8001/pm8001_sas.h | 15 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 109 +-- + drivers/scsi/pmcraid.c | 3 - + drivers/scsi/qedf/qedf.h | 9 + + drivers/scsi/qedf/qedf_els.c | 34 +- + drivers/scsi/qedf/qedf_io.c | 12 +- + drivers/scsi/qedf/qedf_main.c | 151 +++- + drivers/scsi/qedi/qedi.h | 6 + + drivers/scsi/qedi/qedi_fw.c | 30 +- + drivers/scsi/qedi/qedi_iscsi.c | 7 + + drivers/scsi/qedi/qedi_main.c | 131 +++- + drivers/scsi/qla1280.c | 18 +- + drivers/scsi/qla2xxx/qla_attr.c | 97 +-- + drivers/scsi/qla2xxx/qla_dbg.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 66 +- + drivers/scsi/qla2xxx/qla_dfs.c | 297 +++++--- + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 8 +- + drivers/scsi/qla2xxx/qla_gs.c | 7 +- + drivers/scsi/qla2xxx/qla_init.c | 99 ++- + drivers/scsi/qla2xxx/qla_inline.h | 98 ++- + drivers/scsi/qla2xxx/qla_iocb.c | 57 +- + drivers/scsi/qla2xxx/qla_isr.c | 61 +- + drivers/scsi/qla2xxx/qla_mbx.c | 71 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_nvme.c | 42 +- + drivers/scsi/qla2xxx/qla_nvme.h | 4 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 147 +--- + drivers/scsi/qla2xxx/qla_target.c | 21 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 53 +- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- + drivers/scsi/qla4xxx/ql4_init.c | 3 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/qlogicpti.c | 14 +- + drivers/scsi/scsi_debug.c | 83 +- + drivers/scsi/scsi_error.c | 37 +- + drivers/scsi/scsi_lib.c | 185 ++--- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_transport_fc.c | 1 + + drivers/scsi/sd.c | 128 +++- + drivers/scsi/sd.h | 1 + + drivers/scsi/sense_codes.h | 54 +- + drivers/scsi/smartpqi/Kconfig | 4 +- + drivers/scsi/smartpqi/smartpqi.h | 7 +- + drivers/scsi/smartpqi/smartpqi_init.c | 476 +++++++----- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 2 +- + drivers/scsi/sni_53c710.c | 14 +- + drivers/scsi/snic/snic_debugfs.c | 16 +- + drivers/scsi/snic/snic_scsi.c | 8 +- + drivers/scsi/snic/vnic_cq.c | 8 +- + drivers/scsi/sr.c | 17 +- + drivers/scsi/sun3x_esp.c | 14 +- + drivers/scsi/sun_esp.c | 14 +- + drivers/scsi/sym53c8xx_2/sym_fw.c | 6 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 6 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/Kconfig | 1 - + drivers/scsi/ufs/ufs-exynos.c | 13 +- + drivers/scsi/ufs/ufs-mediatek.c | 266 ++++++- + drivers/scsi/ufs/ufs-mediatek.h | 29 +- + drivers/scsi/ufs/ufs-qcom.c | 262 +------ + drivers/scsi/ufs/ufs-qcom.h | 11 - + drivers/scsi/ufs/ufs-sysfs.c | 10 +- + drivers/scsi/ufs/ufshcd-crypto.c | 4 +- + drivers/scsi/ufs/ufshcd-pci.c | 127 +++- + drivers/scsi/ufs/ufshcd.c | 846 +++++++++++++-------- + drivers/scsi/ufs/ufshcd.h | 21 + + drivers/scsi/ufs/ufshci.h | 1 + + drivers/scsi/ufs/unipro.h | 3 + + drivers/scsi/virtio_scsi.c | 7 +- + drivers/target/iscsi/iscsi_target.c | 2 - + drivers/target/target_core_rd.c | 2 +- + drivers/target/target_core_user.c | 344 ++++----- + include/scsi/scsi_cmnd.h | 3 +- + include/scsi/scsi_common.h | 7 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_transport_fc.h | 1 + + include/trace/events/target.h | 12 +- + 168 files changed, 4920 insertions(+), 2748 deletions(-) +Merging scsi-mkp/for-next (1ef16a407f54 scsi: qla2xxx: Fix return of uninitialized value in rval) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (65457c87de66 vdpa/mlx5: Fix failure to bring link up) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/mlx5/net/mlx5_vnet.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) +Merging rpmsg/for-next (05383bf01edf Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/rpmsg/qcom_glink_native.c +Auto-merging drivers/remoteproc/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-remoteproc | 44 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 281 ++++ + drivers/hwspinlock/sprd_hwspinlock.c | 2 - + drivers/remoteproc/Kconfig | 13 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/mtk_common.h | 32 + + drivers/remoteproc/mtk_scp.c | 203 ++- + drivers/remoteproc/mtk_scp_ipi.c | 9 +- + drivers/remoteproc/qcom_q6v5_mss.c | 16 +- + drivers/remoteproc/remoteproc_coredump.c | 6 +- + drivers/remoteproc/remoteproc_debugfs.c | 23 +- + drivers/remoteproc/remoteproc_sysfs.c | 119 ++ + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 1395 ++++++++++++++++++++ + drivers/rpmsg/mtk_rpmsg.c | 9 +- + drivers/rpmsg/qcom_glink_native.c | 70 +- + drivers/rpmsg/qcom_smd.c | 32 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 7 +- + include/linux/remoteproc.h | 8 +- + 20 files changed, 2187 insertions(+), 87 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml + create mode 100644 drivers/remoteproc/ti_k3_r5_remoteproc.c +$ git am -3 ../patches/0001-Revert-remoteproc-mediatek-Add-support-for-mt8192-SC.patch +Applying: Revert "remoteproc/mediatek: Add support for mt8192 SCP" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/remoteproc/mtk_common.h +M drivers/remoteproc/mtk_scp.c +M drivers/remoteproc/mtk_scp_ipi.c +$ git add -A . +$ git commit -v -a --amend +[master d541b139f603] Merge remote-tracking branch 'rpmsg/for-next' into master + Date: Thu Oct 15 15:47:22 2020 +1100 +Merging gpio/for-next (3d6e8262d3c0 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (cf048e05b687 tools: gpio: add debounce support to gpio-event-mon) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (c348abca14dc Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/renesas,rza1-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 240 +++ + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 139 +- + .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 4 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 + + .../bindings/pinctrl/pinctrl-mt8192.yaml | 155 ++ + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 21 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 132 ++ + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 188 -- + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 193 ++ + .../bindings/pinctrl/renesas,rza1-pinctrl.txt | 223 -- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 190 ++ + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzn1-pinctrl.txt | 153 -- + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 129 ++ + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 92 + + MAINTAINERS | 7 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + drivers/pinctrl/Kconfig | 37 +- + drivers/pinctrl/Makefile | 6 +- + drivers/pinctrl/actions/Kconfig | 6 + + drivers/pinctrl/actions/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-owl.c | 4 +- + drivers/pinctrl/actions/pinctrl-s500.c | 1727 +++++++++++++++ + drivers/pinctrl/actions/pinctrl-s700.c | 2 +- + drivers/pinctrl/actions/pinctrl-s900.c | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 17 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 8 +- + drivers/pinctrl/devicetree.c | 5 +- + drivers/pinctrl/freescale/Kconfig | 5 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 13 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 57 +- + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 3 + + drivers/pinctrl/freescale/pinctrl-imx8qm.c | 3 + + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 + + drivers/pinctrl/freescale/pinctrl-scu.c | 5 + + drivers/pinctrl/intel/Kconfig | 12 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 24 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 22 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 170 +- + drivers/pinctrl/intel/pinctrl-intel.c | 24 +- + drivers/pinctrl/intel/pinctrl-intel.h | 7 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 60 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 42 +- + drivers/pinctrl/mediatek/Kconfig | 14 + + drivers/pinctrl/mediatek/Makefile | 2 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 11 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 103 + + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 362 ++++ + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1409 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt8167.h | 1248 +++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8192.h | 2275 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 11 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 16 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 6 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 7 + + drivers/pinctrl/pinctrl-ingenic.c | 349 ++- + drivers/pinctrl/pinctrl-mcp23s08.c | 47 +- + drivers/pinctrl/pinctrl-ocelot.c | 8 +- + drivers/pinctrl/pinctrl-sx150x.c | 17 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 630 ++++++ + drivers/pinctrl/{sh-pfc => renesas}/Kconfig | 238 +- + drivers/pinctrl/{sh-pfc => renesas}/Makefile | 8 +- + drivers/pinctrl/{sh-pfc => renesas}/core.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/core.h | 0 + drivers/pinctrl/{sh-pfc => renesas}/gpio.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c | 121 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c | 2 +- + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c | 0 + drivers/pinctrl/{ => renesas}/pinctrl-rza1.c | 11 +- + drivers/pinctrl/{ => renesas}/pinctrl-rza2.c | 4 +- + drivers/pinctrl/{ => renesas}/pinctrl-rzn1.c | 6 +- + drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c | 0 + drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h | 0 + drivers/pinctrl/spear/pinctrl-spear310.c | 8 +- + drivers/pinctrl/spear/pinctrl-spear320.c | 8 +- + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 13 +- + drivers/pinctrl/sunxi/Kconfig | 10 + + drivers/pinctrl/sunxi/Makefile | 2 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 105 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 708 ++++++ + drivers/pinctrl/visconti/Kconfig | 14 + + drivers/pinctrl/visconti/Makefile | 3 + + drivers/pinctrl/visconti/pinctrl-common.c | 305 +++ + drivers/pinctrl/visconti/pinctrl-common.h | 96 + + drivers/pinctrl/visconti/pinctrl-tmpv7700.c | 355 +++ + include/dt-bindings/pinctrl/mt8192-pinfunc.h | 1344 ++++++++++++ + 118 files changed, 12916 insertions(+), 1127 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s500-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza1-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza1-ports.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml + create mode 100644 drivers/pinctrl/actions/pinctrl-s500.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8167.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8192.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8167.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8192.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8226.c + rename drivers/pinctrl/{sh-pfc => renesas}/Kconfig (51%) + rename drivers/pinctrl/{sh-pfc => renesas}/Makefile (92%) + rename drivers/pinctrl/{sh-pfc => renesas}/core.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/core.h (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/gpio.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c (98%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c (100%) + rename drivers/pinctrl/{ => renesas}/pinctrl-rza1.c (99%) + rename drivers/pinctrl/{ => renesas}/pinctrl-rza2.c (99%) + rename drivers/pinctrl/{ => renesas}/pinctrl-rzn1.c (99%) + rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c (100%) + rename drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h (100%) + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c + create mode 100644 drivers/pinctrl/visconti/Kconfig + create mode 100644 drivers/pinctrl/visconti/Makefile + create mode 100644 drivers/pinctrl/visconti/pinctrl-common.c + create mode 100644 drivers/pinctrl/visconti/pinctrl-common.h + create mode 100644 drivers/pinctrl/visconti/pinctrl-tmpv7700.c + create mode 100644 include/dt-bindings/pinctrl/mt8192-pinfunc.h +Merging pinctrl-intel/for-next (a0bf06dc51db pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (bbf5c979011a Linux 5.9) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3b1954cd57bf dt-bindings: pwm: renesas,pwm-rcar: Add r8a7742 support) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 2 + + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 + + drivers/pwm/core.c | 17 ++------ + drivers/pwm/pwm-bcm2835.c | 10 ++--- + drivers/pwm/pwm-img.c | 3 +- + drivers/pwm/pwm-jz4740.c | 9 ++--- + drivers/pwm/pwm-pca9685.c | 45 +++++++++++++--------- + drivers/pwm/pwm-rockchip.c | 15 ++++---- + drivers/pwm/pwm-sifive.c | 8 ++-- + drivers/pwm/pwm-sprd.c | 7 +--- + drivers/pwm/pwm-sun4i.c | 36 ++++++----------- + drivers/pwm/sysfs.c | 4 +- + 12 files changed, 67 insertions(+), 90 deletions(-) +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (4c8511317b4e doc: dev-tools: kselftest.rst: Update examples and paths) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kselftest.rst | 35 +++++++---- + tools/testing/selftests/Makefile | 34 ++++------ + tools/testing/selftests/firmware/.gitignore | 2 + + tools/testing/selftests/lib.mk | 9 ++- + tools/testing/selftests/netfilter/.gitignore | 2 + + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/run_kselftest.sh | 93 ++++++++++++++++++++++++++++ + 7 files changed, 135 insertions(+), 41 deletions(-) + create mode 100644 tools/testing/selftests/firmware/.gitignore + create mode 100644 tools/testing/selftests/netfilter/.gitignore + create mode 100755 tools/testing/selftests/run_kselftest.sh +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + tools/testing/selftests/livepatch/functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging coresight/next (347732627745 coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (179b4bcc4c0c rtc: rv8803: simplify the return expression of rv8803_nvram_write) +$ git merge rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/rtc/rtc.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/rtc-ds1307.txt | 9 +- + Documentation/devicetree/bindings/rtc/rtc.yaml | 10 + + drivers/rtc/rtc-cmos.c | 2 + + drivers/rtc/rtc-ds1307.c | 76 ++++- + drivers/rtc/rtc-ds1685.c | 8 +- + drivers/rtc/rtc-fsl-ftm-alarm.c | 4 +- + drivers/rtc/rtc-meson-vrtc.c | 7 +- + drivers/rtc/rtc-pcf2127.c | 4 +- + drivers/rtc/rtc-rs5c313.c | 34 +-- + drivers/rtc/rtc-rv8803.c | 8 +- + drivers/rtc/rtc-rx8010.c | 332 +++++++++------------ + drivers/rtc/rtc-s3c.c | 9 +- + drivers/rtc/rtc-st-lpc.c | 2 +- + 13 files changed, 254 insertions(+), 251 deletions(-) +Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (61f764c307f6 eeprom: at24: Support custom device names for AT24 EEPROMs) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc()) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_msi_test.c | 5 +---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging seccomp/for-next/seccomp (dfe719fef03d seccomp: Make duplicate listener detection non-racy) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (9b80e4c4ddac overflow: Add __must_check attribute to check_*() helpers) +$ git merge kspp/for-next/kspp +Already up to date. +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (1cf257875246 slimbus: qcom-ngd-ctrl: disable ngd in qmi server down callback) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (02200a863b9a nvmem: core: fix missing of_node_put() in of_nvmem_device_get()) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. +Merging xarray/main (84c34df158cf XArray: Fix xas_create_range for ranges above 4 billion) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + include/linux/radix-tree.h | 3 ++- + include/linux/xarray.h | 34 +++++++++++++++++++---------- + lib/idr.c | 1 + + lib/radix-tree.c | 1 - + lib/test_xarray.c | 32 ++++++++++++++++++++++----- + lib/xarray.c | 25 ++++++++++++++++++++- + mm/workingset.c | 13 ++--------- + tools/testing/radix-tree/idr-test.c | 29 ++++++++++++++++++++++++ + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/local_lock.h | 8 +++++++ + tools/testing/radix-tree/test.h | 4 ---- + 11 files changed, 116 insertions(+), 35 deletions(-) + create mode 100644 tools/testing/radix-tree/linux/local_lock.h +Merging hyperv/hyperv-next (626b901f6044 Drivers: hv: vmbus: Add parsing of VMbus interrupt in ACPI DSDT) +$ git merge hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/mshyperv.h | 1 + + arch/x86/kernel/cpu/mshyperv.c | 7 ++++++- + drivers/hv/hv.c | 2 +- + drivers/hv/vmbus_drv.c | 30 +++++++++++++++++++++++++++--- + include/asm-generic/mshyperv.h | 4 +++- + 5 files changed, 38 insertions(+), 6 deletions(-) +Merging auxdisplay/auxdisplay (bbf5c979011a Linux 5.9) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) +$ git merge kgdb/kgdb/for-next +Merge made by the 'recursive' strategy. + include/linux/kgdb.h | 18 ++++++++++++++++ + kernel/debug/debug_core.c | 48 ++++++++++++++++++++++++++++++++--------- + kernel/debug/gdbstub.c | 5 ++--- + kernel/debug/kdb/kdb_bp.c | 9 ++++++++ + kernel/debug/kdb/kdb_bt.c | 4 ++-- + kernel/debug/kdb/kdb_debugger.c | 2 -- + kernel/debug/kdb/kdb_io.c | 22 +++++++++++-------- + kernel/debug/kdb/kdb_main.c | 8 +++---- + kernel/debug/kdb/kdb_private.h | 4 ---- + lib/Kconfig.kgdb | 15 +++++++++++++ + 10 files changed, 101 insertions(+), 34 deletions(-) +Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (0c16d9635e3a RDMA/umem: Move to allocate SG table from pages) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e1e66168c769 Merge branch 'devm_fpga_mgr_register' into for-next) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + drivers/fpga/altera-pr-ip-core-plat.c | 10 ----- + drivers/fpga/altera-pr-ip-core.c | 4 +- + drivers/fpga/altera-ps-spi.c | 14 +----- + drivers/fpga/dfl-fme-mgr.c | 13 +----- + drivers/fpga/fpga-mgr.c | 81 +++++++++++++++++++++++++++++------ + drivers/fpga/ice40-spi.c | 14 +----- + drivers/fpga/machxo2-spi.c | 14 +----- + drivers/fpga/socfpga.c | 14 +----- + drivers/fpga/ts73xx-fpga.c | 14 +----- + drivers/fpga/xilinx-spi.c | 14 +----- + drivers/fpga/zynqmp-fpga.c | 21 +-------- + include/linux/fpga/fpga-mgr.h | 2 + + 12 files changed, 80 insertions(+), 135 deletions(-) +Merging kunit/test (9123e3a74ec7 Linux 5.9-rc1) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (d2585f5164c2 lib: kunit: add bitfield test conversion to KUnit) +$ git merge kunit-next/kunit +Auto-merging lib/kunit/test.c +CONFLICT (content): Merge conflict in lib/kunit/test.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging include/kunit/test.h +Auto-merging include/asm-generic/vmlinux.lds.h +Resolved 'lib/kunit/test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f1d2196d2b43] Merge remote-tracking branch 'kunit-next/kunit' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/index.rst | 1 + + Documentation/dev-tools/kunit/style.rst | 205 +++++++++++++++++++++ + Documentation/dev-tools/kunit/usage.rst | 5 + + include/asm-generic/vmlinux.lds.h | 10 +- + include/kunit/test.h | 76 +++++--- + init/main.c | 4 + + lib/Kconfig.debug | 23 ++- + lib/Makefile | 2 +- + lib/{test_bitfield.c => bitfield_kunit.c} | 92 ++++----- + lib/kunit/Makefile | 3 +- + lib/kunit/executor.c | 43 +++++ + lib/kunit/test.c | 13 +- + tools/testing/kunit/kunit_parser.py | 76 ++++++-- + .../test_data/test_is_test_passed-all_passed.log | Bin 1562 -> 1567 bytes + .../kunit/test_data/test_is_test_passed-crash.log | Bin 3016 -> 3021 bytes + .../test_data/test_is_test_passed-failure.log | Bin 1700 -> 1705 bytes + 16 files changed, 443 insertions(+), 110 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/style.rst + rename lib/{test_bitfield.c => bitfield_kunit.c} (66%) + create mode 100644 lib/kunit/executor.c +Merging trivial/for-next (2a9b29b28983 xtensa: fix Kconfig typo) +$ git merge trivial/for-next +Auto-merging scripts/spelling.txt +Auto-merging kernel/printk/printk_safe.c +Auto-merging init/main.c +Auto-merging arch/xtensa/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/xtensa/Kconfig | 2 +- + drivers/hid/hid-logitech-dj.c | 2 +- + fs/vboxsf/dir.c | 2 +- + include/linux/scif.h | 8 ++++---- + init/main.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + scripts/spelling.txt | 4 ---- + tools/testing/selftests/vm/config | 1 + + 10 files changed, 12 insertions(+), 15 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (298edb32160f bus: mhi: debugfs: Print channel context read-pointer) +$ git merge mhi/mhi-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging security/security.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/watch_queue.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/mount.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/watch_queue.rst +Merge made by the 'recursive' strategy. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 35 files changed, 411 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock/for-next +Auto-merging include/linux/pgtable.h +Merge made by the 'recursive' strategy. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (2095725c325b drivers/edac: convert pci counters to counter_atomic32) +$ git merge counters/counters +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Auto-merging drivers/char/ipmi/ipmi_msghandler.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_msghandler.c +Auto-merging drivers/base/devcoredump.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/android/binder.c +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging drivers/acpi/acpi_extlog.c +Auto-merging MAINTAINERS +Resolved 'drivers/char/ipmi/ipmi_msghandler.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c4afed076b81] Merge remote-tracking branch 'counters/counters' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/counters.rst | 109 +++++++++++++++++ + MAINTAINERS | 8 ++ + drivers/acpi/acpi_extlog.c | 5 +- + drivers/acpi/apei/ghes.c | 5 +- + drivers/android/binder.c | 41 ++++--- + drivers/android/binder_internal.h | 3 +- + drivers/base/dd.c | 19 +-- + drivers/base/devcoredump.c | 5 +- + drivers/base/test/test_async_driver_probe.c | 26 ++-- + drivers/char/ipmi/ipmi_msghandler.c | 9 +- + drivers/char/ipmi/ipmi_si_intf.c | 9 +- + drivers/edac/edac_pci.h | 5 +- + drivers/edac/edac_pci_sysfs.c | 28 ++--- + drivers/misc/vmw_vmci/vmci_guest.c | 9 +- + include/linux/counters.h | 176 +++++++++++++++++++++++++++ + lib/Kconfig | 9 ++ + lib/Makefile | 1 + + lib/test_counters.c | 162 ++++++++++++++++++++++++ + tools/testing/selftests/lib/Makefile | 1 + + tools/testing/selftests/lib/config | 1 + + tools/testing/selftests/lib/test_counters.sh | 10 ++ + 21 files changed, 567 insertions(+), 74 deletions(-) + create mode 100644 Documentation/core-api/counters.rst + create mode 100644 include/linux/counters.h + create mode 100644 lib/test_counters.c + create mode 100755 tools/testing/selftests/lib/test_counters.sh +Merging akpm-current/current (c12679c08a47 lib, uaccess: add failure injection to usercopy functions) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/Makefile.ubsan +Auto-merging mm/workingset.c +Auto-merging mm/readahead.c +CONFLICT (content): Merge conflict in mm/readahead.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/xarray.c +Auto-merging lib/test_xarray.c +Auto-merging lib/scatterlist.c +Auto-merging lib/radix-tree.c +Auto-merging lib/idr.c +Auto-merging lib/devres.c +Auto-merging lib/bitmap.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/user_namespace.c +Auto-merging kernel/sys.c +Auto-merging kernel/smp.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/kexec_core.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/direct.c +Auto-merging include/linux/xarray.h +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/nodemask.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging fs/romfs/super.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/vfio/pci/vfio_pci.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/base/node.c +Auto-merging drivers/base/memory.c +Auto-merging drivers/acpi/acpi_memhotplug.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/mm/pgtable.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/ia64/mm/init.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/powerpc/platforms/pseries/hotplug-memory.c' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'mm/filemap.c' using previous resolution. +Recorded preimage for 'mm/readahead.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/readahead.c'. +[master 70c83fefff92] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/core-api/xarray.rst | 16 +- + Documentation/fault-injection/fault-injection.rst | 7 +- + arch/ia64/mm/init.c | 4 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 29 +- + arch/powerpc/include/asm/nohash/pgtable.h | 5 - + arch/powerpc/mm/pgtable.c | 5 - + arch/powerpc/platforms/powernv/memtrace.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 3 +- + drivers/base/memory.c | 3 +- + drivers/base/node.c | 33 ++- + drivers/block/zram/zram_drv.c | 2 +- + drivers/dax/kmem.c | 2 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 3 - + drivers/rapidio/devices/rio_mport_cdev.c | 18 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 38 ++- + drivers/virtio/virtio_mem.c | 3 +- + drivers/xen/balloon.c | 2 +- + fs/aio.c | 9 +- + fs/autofs/dev-ioctl.c | 8 +- + fs/binfmt_elf.c | 263 ++++-------------- + fs/binfmt_elf_fdpic.c | 162 ++--------- + fs/buffer.c | 56 +++- + fs/configfs/dir.c | 2 +- + fs/configfs/file.c | 2 +- + fs/coredump.c | 236 +++++++++++++++- + fs/ext4/verity.c | 4 +- + fs/f2fs/verity.c | 4 +- + fs/inode.c | 2 + + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/cpfile.c | 6 +- + fs/nilfs2/page.c | 1 - + fs/nilfs2/sufile.c | 4 +- + fs/ocfs2/namei.c | 17 +- + fs/proc/page.c | 40 +-- + fs/proc/task_mmu.c | 18 -- + fs/ramfs/file-nommu.c | 2 +- + fs/ramfs/inode.c | 12 + + fs/romfs/super.c | 1 + + fs/userfaultfd.c | 28 +- + include/linux/bitops.h | 13 +- + include/linux/blkdev.h | 1 + + include/linux/bvec.h | 6 +- + include/linux/coredump.h | 11 + + include/linux/fault-inject-usercopy.h | 22 ++ + include/linux/fs.h | 28 +- + include/linux/idr.h | 13 +- + include/linux/ioport.h | 11 +- + include/linux/jiffies.h | 3 +- + include/linux/kernel.h | 150 +---------- + include/linux/list.h | 29 +- + include/linux/memory_hotplug.h | 42 +-- + include/linux/memremap.h | 6 + + include/linux/minmax.h | 153 +++++++++++ + include/linux/mm.h | 5 +- + include/linux/mmzone.h | 17 +- + include/linux/nmi.h | 1 + + include/linux/node.h | 16 +- + include/linux/nodemask.h | 2 +- + include/linux/page-flags.h | 6 +- + include/linux/page_owner.h | 6 +- + include/linux/pagemap.h | 107 +++++++- + include/linux/sched.h | 10 +- + include/linux/sched/mm.h | 25 -- + include/linux/uaccess.h | 12 +- + include/linux/vmstat.h | 2 +- + include/linux/wait.h | 4 +- + include/linux/xarray.h | 22 ++ + include/ras/ras_event.h | 3 + + kernel/acct.c | 2 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/dma/direct.c | 2 +- + kernel/fork.c | 4 +- + kernel/futex.c | 2 +- + kernel/hung_task.c | 44 +++ + kernel/irq/timings.c | 2 +- + kernel/jump_label.c | 2 +- + kernel/kcsan/encoding.h | 2 +- + kernel/kexec_core.c | 2 +- + kernel/kexec_file.c | 2 +- + kernel/kthread.c | 2 +- + kernel/livepatch/state.c | 2 +- + kernel/panic.c | 12 +- + kernel/pid_namespace.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/range.c | 3 +- + kernel/relay.c | 2 +- + kernel/resource.c | 110 ++++++-- + kernel/smp.c | 2 +- + kernel/sys.c | 2 +- + kernel/sysctl.c | 8 +- + kernel/user_namespace.c | 2 +- + kernel/watchdog.c | 21 ++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 13 + + lib/Kconfig.ubsan | 14 + + lib/Makefile | 1 + + lib/bitmap.c | 2 +- + lib/crc32.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/dynamic_queue_limits.c | 4 +- + lib/earlycpio.c | 2 +- + lib/fault-inject-usercopy.c | 39 +++ + lib/find_bit.c | 1 + + lib/hexdump.c | 1 + + lib/idr.c | 9 +- + lib/iov_iter.c | 5 + + lib/libcrc32c.c | 2 +- + lib/math/rational.c | 2 +- + lib/math/reciprocal_div.c | 1 + + lib/mpi/mpi-bit.c | 2 +- + lib/percpu_counter.c | 2 +- + lib/radix-tree.c | 2 +- + lib/scatterlist.c | 2 +- + lib/strncpy_from_user.c | 3 + + lib/syscall.c | 2 +- + lib/test_hmm.c | 2 +- + lib/test_sysctl.c | 2 +- + lib/test_xarray.c | 65 +++++ + lib/usercopy.c | 5 +- + lib/xarray.c | 208 ++++++++++++++- + mm/Kconfig | 2 +- + mm/compaction.c | 6 +- + mm/debug_vm_pgtable.c | 219 ++++++++------- + mm/filemap.c | 58 ++-- + mm/gup.c | 61 +++-- + mm/highmem.c | 4 +- + mm/huge_memory.c | 34 +-- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 27 +- + mm/khugepaged.c | 2 +- + mm/madvise.c | 52 +--- + mm/memory-failure.c | 311 ++++++++++------------ + mm/memory.c | 7 +- + mm/memory_hotplug.c | 211 ++++++--------- + mm/memremap.c | 23 +- + mm/migrate.c | 11 +- + mm/mmap.c | 50 ++-- + mm/mmu_notifier.c | 2 +- + mm/page-writeback.c | 1 + + mm/page_alloc.c | 239 +++++++++++------ + mm/page_isolation.c | 16 +- + mm/page_owner.c | 10 +- + mm/page_poison.c | 20 +- + mm/page_reporting.c | 4 +- + mm/readahead.c | 130 ++++----- + mm/rmap.c | 10 +- + mm/shmem.c | 2 +- + mm/shuffle.c | 2 +- + mm/slab.c | 2 +- + mm/slab.h | 1 - + mm/slub.c | 2 +- + mm/sparse.c | 2 + + mm/swap.c | 4 +- + mm/swap_state.c | 2 +- + mm/swapfile.c | 5 +- + mm/truncate.c | 6 +- + mm/util.c | 3 +- + mm/vmscan.c | 18 +- + mm/vmstat.c | 40 +-- + mm/workingset.c | 2 +- + scripts/Makefile.ubsan | 10 +- + scripts/checkpatch.pl | 250 ++++++++++++----- + scripts/const_structs.checkpatch | 3 + + scripts/gdb/linux/proc.py | 15 +- + scripts/gdb/linux/tasks.py | 9 +- + scripts/get_maintainer.pl | 9 +- + tools/testing/selftests/exec/.gitignore | 1 + + tools/testing/selftests/exec/Makefile | 9 +- + tools/testing/selftests/exec/load_address.c | 68 +++++ + 176 files changed, 2633 insertions(+), 1785 deletions(-) + create mode 100644 include/linux/fault-inject-usercopy.h + create mode 100644 include/linux/minmax.h + create mode 100644 lib/fault-inject-usercopy.c + create mode 100644 tools/testing/selftests/exec/load_address.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/51)
Rebasing (2/51)
Rebasing (3/51)
Rebasing (4/51)
Rebasing (5/51)
Rebasing (6/51)
Rebasing (7/51)
Rebasing (8/51)
Rebasing (9/51)
Rebasing (10/51)
Rebasing (11/51)
Rebasing (12/51)
Rebasing (13/51)
Rebasing (14/51)
Rebasing (15/51)
Rebasing (16/51)
Rebasing (17/51)
Rebasing (18/51)
Rebasing (19/51)
Rebasing (20/51)
Rebasing (21/51)
Rebasing (22/51)
Rebasing (23/51)
Rebasing (24/51)
Rebasing (25/51)
Rebasing (26/51)
Rebasing (27/51)
Rebasing (28/51)
Rebasing (29/51)
Rebasing (30/51)
Rebasing (31/51)
Rebasing (32/51)
Rebasing (33/51)
Rebasing (34/51)
Rebasing (35/51)
Rebasing (36/51)
Rebasing (37/51)
Rebasing (38/51)
Rebasing (39/51)
Rebasing (40/51)
Rebasing (41/51)
Rebasing (42/51)
Rebasing (43/51)
Rebasing (44/51)
Rebasing (45/51)
Rebasing (46/51)
Rebasing (47/51)
Rebasing (48/51)
Rebasing (49/51)
Rebasing (50/51)
Rebasing (51/51)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5048830f8b64...5432eb6812cf akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5432eb6812cf mm: remove duplicate include statement in mmu.c) +$ git merge --no-ff akpm/master +Removing tools/testing/selftests/vm/gup_benchmark.c +Merge made by the 'recursive' strategy. + Documentation/core-api/pin_user_pages.rst | 6 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/mm/mmu.c | 1 - + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/Makefile | 2 +- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/xen/grant-table.c | 27 ++- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 132 +++++++------- + drivers/gpu/drm/i915/gt/shmem_utils.c | 76 ++------ + drivers/xen/xenbus/xenbus_client.c | 30 ++-- + fs/binfmt_elf.c | 3 + + fs/buffer.c | 6 +- + fs/exec.c | 8 + + fs/io_uring.c | 2 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 5 +- + include/linux/memcontrol.h | 12 -- + include/linux/mm.h | 2 +- + include/linux/mm_types.h | 10 ++ + include/linux/mmap_lock.h | 16 +- + include/linux/pid.h | 1 + + include/linux/sched/mm.h | 39 ++--- + include/linux/syscalls.h | 2 + + include/linux/vmalloc.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + kernel/exit.c | 19 -- + kernel/pid.c | 19 ++ + kernel/sys_ni.c | 1 + + mm/Kconfig | 24 ++- + mm/Makefile | 2 +- + mm/gup.c | 2 + + mm/{gup_benchmark.c => gup_test.c} | 124 ++++++++----- + mm/gup_test.h | 32 ++++ + mm/madvise.c | 125 +++++++++++-- + mm/memcontrol.c | 75 +++++--- + mm/memory-failure.c | 18 +- + mm/memory.c | 16 +- + mm/memory_hotplug.c | 46 +++-- + mm/migrate.c | 71 +++++--- + mm/mmap.c | 74 +++++--- + mm/nommu.c | 7 - + mm/percpu.c | 3 +- + mm/slab.h | 3 - + mm/vmalloc.c | 147 ++++++++-------- + mm/zsmalloc.c | 10 +- + tools/testing/selftests/vm/.gitignore | 3 +- + tools/testing/selftests/vm/Makefile | 38 +++- + tools/testing/selftests/vm/check_config.sh | 31 ++++ + tools/testing/selftests/vm/config | 2 +- + tools/testing/selftests/vm/gup_benchmark.c | 143 --------------- + tools/testing/selftests/vm/gup_test.c | 194 +++++++++++++++++++++ + tools/testing/selftests/vm/hmm-tests.c | 12 +- + .../selftests/vm/{run_vmtests => run_vmtests.sh} | 24 ++- + 71 files changed, 1034 insertions(+), 652 deletions(-) + rename mm/{gup_benchmark.c => gup_test.c} (56%) + create mode 100644 mm/gup_test.h + create mode 100644 tools/testing/selftests/vm/check_config.sh + delete mode 100644 tools/testing/selftests/vm/gup_benchmark.c + create mode 100644 tools/testing/selftests/vm/gup_test.c + rename tools/testing/selftests/vm/{run_vmtests => run_vmtests.sh} (91%) + mode change 100755 => 100644 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1c7f69bd19fe --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201015 |