diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-21 15:04:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-21 15:04:38 +1100 |
| commit | 5302568121ba345f5c22528aefd72d775f25221e (patch) | |
| tree | 08a00055ee8d951677be4b7515a791d3a5fbd29d | |
| parent | b717fbffe3b9c0f9f33f979a7f26d3eca83d311f (diff) | |
Add linux-next specific files for 20201021next-20201021
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 | 10237 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 10900 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..10a0861f04b3 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,330 @@ +Name SHA1 +---- ---- +origin 38525c6919e2f6b27c1855905f342a0def3cbdcf +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 d1781f23704707d350b8c9006e2bdf5394bf91b2 +s390-fixes 549738f15da0e5a00275977623be199fbbf7df50 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 618355cc6a0d9c23da2be171b72686f1f94a4fc1 +bpf 8568c3cefd5143fa0dc09f90e1bc9dc8905292f4 +ipsec 7fe94612dd4cfcd35fe0ec87745fb31ad2be71f8 +netfilter 31cc578ae2de19c748af06d859019dced68e325d +ipvs 48d072c4e8cdb542ade06727c31d7851bcc40a89 +wireless-drivers df41c19abbeaae6e24c8e31cff5fdb48632be380 +mac80211 9ff9b0d392ea08090cd1780fb196f36dbb586529 +rdma-fixes a1b8638ba1320e6684aa98233c15255eb803fac7 +sound-current 7da4c510abff8ad47eb2d7cc9a97def5a411947f +sound-asoc-fixes 8101e3024d76b0854b0a375c52540ff80bfcdf9e +regmap-fixes 549738f15da0e5a00275977623be199fbbf7df50 +regulator-fixes b7c11f48ff81faf54bbf2cf16840617e11a4d6a6 +spi-fixes d4f3a651ab82685c63e6fb38bec20b3ccf08c085 +pci-current 76a6b0b90d532ed9bb9f6069aa12859c185e5b99 +driver-core.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +tty.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb-gadget-fixes 51609fba0cca69206a213171ce0cdf2dfc9cb21d +usb-serial-fixes 856deb866d16e29bd65952e0289066f6078af773 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 850280156f6421a404f2351bee07a0e7bedfd4c6 +staging.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +char-misc.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +soundwire-fixes 3fbbf2148a406b3e350fe91e6fdd78eb42ecad24 +thunderbolt-fixes bbf5c979011a099af5dc76498918ed7df445635b +input-current bb0bc0cfeabc0d6865865e8d3a601bea6711f951 +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 9c785122ab647e996b6930688c0fc8b99e0d58a5 +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 b3e1ea16fb39fb6e1a1cf1dbdd6738531de3dc7d +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 2c3bd2a5c86fe744e8377733c5e511a5ca1e14f5 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 84814460eef9af0fb56a4698341c9cb7996a6312 +pidfd-fixes bda4c60d02e9ceeee726f73250b808fad0663dd6 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +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 6f8360f873346205bd7b81b8f5b0238151ab3df8 +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 0eb3b4ab762df44f2cff982ddb8f42b3085f4e52 +asm-generic 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arc def9d2780727cec3313ed3522d0123158d87224d +arm adc5f7029376049873289be305d507022281b8dd +arm64 3b92fa7485eba16b05166fddf38ab42f2ff6ab95 +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 7c1ae3208ef27423c8a7c4f5ef247a2f14d4e3c5 +sunxi a2e5e8054a26622be6e402ce1d017655d0d160c8 +tegra 9ea55312ba1093068cf81f5899fadcaf61bf60b2 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 48a78787c0f352cc4ea3a6a4bf0c4f732e861712 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 5f56888fad46812bab9ecb455d92da675ef4fbd0 +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 bbf5c979011a099af5dc76498918ed7df445635b +powerpc ffd0b25ca049a477cb757e5bcf2d5e1664d12e5d +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v e8d444d3e98c255f91d228984abc46cfdfaf48b4 +s390 ddadd80dc9431179f251928b956bf65342b8a9e8 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f06885b3f3e3884f98351d7b72a4fc8400911cde +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c4795f038f2eb930a83c37e7ec5167be54993c63 +ceph 28e1581c3b4ea5f98530064a103c6217bedeea73 +cifs 3ece60e3e78e6066b4ea02dea6687e5d373c6a77 +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat e17632ef887466e30b5328db398966b106fb0bf0 +ext3 e44b86917b3fec1a26753135360ca326d6be1e22 +ext4 8d8282d4a35839e8a3c5c2e20ddcf860790880aa +f2fs 071a0578b0ce0b0e543d1e38ee6926b9cc21c198 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 42d3e2d041f08d1f8f078da005c936648ba77405 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs bbf5c979011a099af5dc76498918ed7df445635b +nfs-anna 8c39076c276be0b31982e44654e2c2357473258a +nfsd 856deb866d16e29bd65952e0289066f6078af773 +cel 13a9a9d74d4d9689ad65938966dbc66386063648 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs be4df0cea08a8b59eb38d73de988b7ba8022df41 +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs 894645546bb12ce008dcba0f68834d270fcd1dde +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 407e9c63ee571f44a2dfb0828fc30daa02abb6dc +file-locks 1ad5f100e3ba73fe75615f720fa721f039759ee6 +vfs bcc4e60be0f83ced77b3efe8999a590673332557 +printk 26911e6b1302714956e166d9aad95a429900349f +pci 065c21a8f8a466bf640ca46f8f7c07f119a9bc26 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid f5795950202d1da56468736e0eb35397d3b766c3 +i2c 48f2192f645ceaade37bf88279d5e0b332416407 +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 9b20aec24b8ab2860ea41182ba554dfcc444c0c8 +jc_docs 4fb220da0dd03d3699776220d86ac84b38941c0c +v4l-dvb c386e0797d26a32e354daf4480c5d40165db66a1 +v4l-dvb-next f4a45be35c346c3a6c0faa51559e984b19b16e3f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm bca751af60f1852239ce4227ad340b97414a0cc6 +cpufreq-arm bc9b9c5ab9d8d16157737db539929d57562926e9 +cpupower 527b7779e5ecabb057089b760140309bdcacc16a +devfreq 953327265ee428d91d9f6aa331a40114a5831230 +opp a5663c9b1e31c00e0bdfaf4d92eb51358fc3950f +thermal 48b458591749d35c927351b4960b49e35af30fe6 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 4f2b30fd9b4bd6e3620fe55786df7fc5f89ad526 +swiotlb b51e627158cb0f67569aa46b5a08b568d20a81a4 +rdma c7a198c700763ac89abbb166378f546aeb9afb33 +net-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +bpf-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +ipsec-next 61e7113e48d3ca1ea692b5c6376a4b545b312166 +mlx5-next 9d8feb460adb90e89e64101ce2c1cfcd548a6d83 +netfilter-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +ipvs-next c2568c8c9e636a56abf31da4b28b65d3ded02524 +wireless-drivers-next df41c19abbeaae6e24c8e31cff5fdb48632be380 +bluetooth 44d59235ace59f8b493044d693174e60b571e2e1 +mac80211-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +gfs2 3288b677fbb51aba0d580320892b0f446e22dbc4 +mtd 6402f4ce95811db7df72244ca84860332e4c2518 +nand 88e315d12fbb50c0bd12549bb04a051a4b4bc744 +spi-nor 9a3422a110c868e511387a81df25a315eaa3a7b8 +crypto 3093e7c16e12d729c325adb3c53dde7308cefbd8 +drm 40b99050455b9a6cb8faf15dcd41888312184720 +amdgpu 02c3d98ce25b3e4f0b8e830be054c8f4f7f944c1 +drm-intel 4a9bb58aba6db4eba2a8b3aa1edc415c94a669a8 +drm-tegra d9f980ebcd01d90a2a76ea2383c925abf9223cab +drm-misc 272d70895113ef00c03ab325787d159ee51718c8 +drm-msm d1ea914925856d397b0b3241428f20b945e31434 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm efd5a93d2a894a1efde45ed12c17cb32f1740812 +etnaviv 3136fed4f91e02ad754464bf1ec15e22b800cc69 +regmap 6e0545c4f08368e67496111778a726f9a2031f26 +sound 7da4c510abff8ad47eb2d7cc9a97def5a411947f +sound-asoc 8101e3024d76b0854b0a375c52540ff80bfcdf9e +modules fdf09ab887829cd1b671e45d9549f8ec1ffda0fa +input 8a30c6eb29e036f729b4dd6982462ca15d062087 +block 268d95ae6fd1cdb44365ed74b1c7631e84c2883c +device-mapper 681cc5e8667e8579a2da8fa4090c48a2d73fc3bb +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +backlight 97ecfda1a8ffc5ffc9681d0dfa65fd5b39839dfe +battery 7007fab4ae82c092cb52691c338f1b776005e32b +regulator b7c11f48ff81faf54bbf2cf16840617e11a4d6a6 +security bc62d68e2a0a69fcdcf28aca8edb01abf306b698 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity aa662fc04f5b290b3979332588bf8d812b189962 +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 03ca0ec138927b16fab0dad7b869f42eb2849c94 +selinux 0d50f059c4cdc9e436f6f4db8779ac0795bfdadf +smack edd615371b668404d06699c04f5f90c4f438814a +tomoyo 5384d92e4e02661d2b08e9e20c7b2cd3b0b82db6 +tpmdd d3b03163a328f8680119bf93c9534e0f018e2a0b +watchdog c5b8e4644607b0319fd86a36fb0caad54ee2021e +iommu 7e3c3883c381aeda903778d7e99fc4cd523be610 +audit c07203516439b9cd9f7b3cbed82a77164de5af40 +devicetree bd36e51d10e7c2b7d39ffa7d075aed98a8e7473c +mailbox c7dacf5b0f32957b24ef29df1207dc2cd8307743 +spi 988731181359efd771ae967f94936906fa38868a +tip c8cd075be67b25278b7a2eb47b21002228a11b9c +clockevents f087e452f27e6342f938b92b2254b077bf1d9145 +edac eea32b7fdcb57e070997e77c4b7c3cc02b379f93 +irqchip d26dd4131d0d6ad7aa294a7f8d18782b47c27c93 +ftrace ce66f6136460a51acfc32de4481fe8fd69dfd50b +rcu a9863c90f5031a8fde56351f09fade3cec3ea4f0 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 4e5dc64c43192b4fd4c96ac150a8f013065f5f5b +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 5f7f77400ab5b357b5fdb7122c3442239672186c +percpu eff623d602db1e9510220f7d14558c2358562307 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 1a3f7813f38e400b0b63492b626b425f0a043d0b +chrome-platform 3e98fd6d816cd82f529345870efd435f06e02803 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +ipmi 9ff9b0d392ea08090cd1780fb196f36dbb586529 +driver-core 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb-gadget b2c586eb07efab982419f32b7c3bd96829bc8bcd +usb-serial 3e765cab8abe7f84cb80d4a7a973fc97d5742647 +usb-chipidea-next 71ac680e6339e744d87647a1ca27b2e87dba2eac +phy-next 60f5a24c11f7fa0c8c74018cfd4c25a3f432fdaf +tty 270315b8235e3d10c2e360cff56c2f9e0915a252 +char-misc 270315b8235e3d10c2e360cff56c2f9e0915a252 +extcon 736696906a3c2f7495748bcf74e590fcbcd34623 +soundwire 0173f525b2c1b02a51784e2119d434593235aed1 +thunderbolt 810278da901c15fba475394edb7f1271c3806658 +vfio 2e6cfd496f5b57034cf2aec738799571b5a52124 +staging 270315b8235e3d10c2e360cff56c2f9e0915a252 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 599809540f173f572c32a35d712accdc14d6357c +dmaengine fc143e38ddd47d3b01ac276786ee78edf053bf5d +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi 9dcbbd959cef85b74ec52d83bc0129244c519ae2 +scsi-mkp 1ef16a407f544408d3559e4de2ed05591df4da75 +vhost 65457c87de6646fa684c3f3e134b8291322d3f33 +rpmsg a689837cb1723a6c77318304af7d6160fc45b6cf +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 f4cb5e9daedf56671badc93ac7f364043aa33886 +rtc 35331b506f6c67a0b4042fac1ae2785cef9ac8c3 +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 294a7f1613ee49a608361bd319519561c0ca7e72 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi 298edb32160f6ae0595ec05a1cc4fdd1d4d8db18 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters 2095725c325bed4fde39f5be20c46f618e934c9d +akpm-current e3a9e6be957d7e6b76d951a6cad81d44fd25fc35 +akpm b1d66dafef662e95df63ae2f81245df2abd125c5 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..3fa103c9b917 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10237 @@ +$ date -R +Wed, 21 Oct 2020 08:23:19 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 94% (6802/7171)
Updating files: 95% (6813/7171)
Updating files: 96% (6885/7171)
Updating files: 97% (6956/7171)
Updating files: 98% (7028/7171)
Updating files: 99% (7100/7171)
Updating files: 100% (7171/7171)
Updating files: 100% (7171/7171), done. +HEAD is now at c48b75b7271d Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound +Merging origin/master (38525c6919e2 Merge tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge origin/master +Updating c48b75b7271d..38525c6919e2 +Fast-forward + .clang-format | 1 + + .mailmap | 1 + + CREDITS | 4 + + Documentation/ABI/stable/sysfs-class-infiniband | 17 - + Documentation/ABI/stable/sysfs-driver-dma-idxd | 20 + + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 25 + + .../testing/sysfs-bus-event_source-devices-hv_gpci | 38 + + Documentation/ABI/testing/sysfs-class-power | 8 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 180 +- + Documentation/admin-guide/pm/cpufreq.rst | 11 +- + Documentation/admin-guide/pstore-blk.rst | 10 +- + Documentation/admin-guide/sysctl/net.rst | 20 +- + Documentation/admin-guide/xfs.rst | 32 +- + Documentation/block/blk-mq.rst | 12 +- + Documentation/block/inline-encryption.rst | 8 +- + Documentation/bpf/bpf_devel_QA.rst | 23 +- + Documentation/bpf/btf.rst | 25 + + Documentation/bpf/index.rst | 1 + + Documentation/bpf/prog_sk_lookup.rst | 98 + + Documentation/conf.py | 65 +- + Documentation/core-api/dma-api.rst | 99 +- + Documentation/core-api/dma-attributes.rst | 8 - + Documentation/core-api/genericirq.rst | 2 + + Documentation/core-api/kernel-api.rst | 6 - + Documentation/core-api/workqueue.rst | 2 + + Documentation/core-api/xarray.rst | 16 +- + Documentation/dev-tools/kgdb.rst | 6 +- + Documentation/dev-tools/kselftest.rst | 35 +- + Documentation/dev-tools/kunit/index.rst | 1 + + Documentation/dev-tools/kunit/style.rst | 205 ++ + Documentation/dev-tools/kunit/usage.rst | 5 + + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../bindings/dma/snps,dma-spear1340.yaml | 7 +- + .../devicetree/bindings/mailbox/arm,mhu.yaml | 135 + + .../devicetree/bindings/mailbox/arm-mhu.txt | 43 - + .../devicetree/bindings/mailbox/omap-mailbox.txt | 2 +- + .../devicetree/bindings/media/i2c/tvp5150.txt | 2 +- + .../devicetree/bindings/mips/ingenic/devices.yaml | 5 + + .../devicetree/bindings/mtd/nand-controller.yaml | 31 + + .../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 +- + .../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 +- + .../power/supply/summit,smb347-charger.yaml | 152 + + .../devicetree/bindings/ptp/ptp-qoriq.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 +- + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 6 +- + .../bindings/thermal/rcar-gen3-thermal.yaml | 1 + + Documentation/doc-guide/kernel-doc.rst | 8 + + Documentation/driver-api/80211/cfg80211.rst | 392 +-- + .../driver-api/80211/mac80211-advanced.rst | 151 +- + Documentation/driver-api/80211/mac80211.rst | 148 +- + 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/fault-injection/fault-injection.rst | 7 +- + .../features/vm/ioremap_prot/arch-support.txt | 2 +- + Documentation/filesystems/f2fs.rst | 82 +- + Documentation/filesystems/fscrypt.rst | 74 +- + Documentation/filesystems/fsverity.rst | 2 +- + Documentation/filesystems/fuse.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 19 + + Documentation/filesystems/zonefs.rst | 15 + + Documentation/gpu/amdgpu.rst | 4 +- + Documentation/gpu/i915.rst | 29 +- + 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/ieee802154.rst | 18 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/kapi.rst | 9 + + Documentation/networking/l2tp.rst | 939 ++++-- + Documentation/networking/scaling.rst | 6 +- + Documentation/networking/statistics.rst | 179 + + Documentation/networking/vxlan.rst | 28 + + Documentation/powerpc/isa-versions.rst | 4 + + Documentation/powerpc/ptrace.rst | 1 + + 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 | 108 +- + Documentation/sphinx/cdomain.py | 93 +- + Documentation/sphinx/kerneldoc.py | 15 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/trace/boottime-trace.rst | 38 + + Documentation/trace/events.rst | 15 +- + Documentation/trace/ftrace-uses.rst | 12 +- + Documentation/trace/histogram.rst | 18 + + Documentation/trace/kprobetrace.rst | 2 + + Documentation/trace/tracepoints.rst | 27 + + Documentation/trace/uprobetracer.rst | 2 + + .../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 | 116 +- + Makefile | 4 +- + arch/Kconfig | 7 + + arch/alpha/kernel/pci_iommu.c | 11 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + 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/dma.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 + + 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/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/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/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-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-pxa/tosa.c | 12 +- + arch/arm/mach-s3c24xx/common-smdk.c | 2 +- + arch/arm/mach-s3c24xx/mach-anubis.c | 2 +- + arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c24xx/mach-bast.c | 2 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 2 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 2 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 2 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- + arch/arm/mach-sa1100/collie.c | 14 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mm/cache-l2x0.c | 16 +- + arch/arm/mm/dma-mapping-nommu.c | 3 + + arch/arm/mm/dma-mapping.c | 9 +- + arch/arm/mm/init.c | 2 +- + arch/arm/mm/mmu.c | 1 - + arch/arm/tools/syscall.tbl | 1 + + arch/arm/xen/mm.c | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 + + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 50 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 63 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 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/Makefile | 2 +- + arch/ia64/kernel/dma-mapping.c | 14 +- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/mm/init.c | 9 +- + 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/dma.c | 2 +- + arch/m68k/kernel/signal.c | 6 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/dma.c | 3 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/mm/consistent.c | 2 +- + arch/microblaze/mm/init.c | 2 +- + arch/mips/Kbuild.platforms | 2 - + arch/mips/Kconfig | 159 +- + 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/bmips/dma.c | 4 +- + 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/boot/dts/mscc/ocelot.dtsi | 4 +- + arch/mips/cavium-octeon/dma-octeon.c | 4 +- + 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/dma-direct.h | 4 +- + arch/mips/include/asm/futex.h | 4 +- + arch/mips/include/asm/idle.h | 2 + + arch/mips/include/asm/jazzdma.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/jazz/jazzdma.c | 105 +- + 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 | 78 +- + arch/mips/kernel/signal.c | 8 +- + arch/mips/kernel/syscall.c | 2 +- + 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/mips/kernel/traps.c | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 10 +- + arch/mips/loongson2ef/common/mem.c | 12 +- + arch/mips/loongson2ef/fuloong-2e/dma.c | 4 +- + arch/mips/loongson2ef/lemote-2f/dma.c | 4 +- + arch/mips/loongson32/common/prom.c | 4 +- + arch/mips/loongson64/dma.c | 4 +- + arch/mips/loongson64/numa.c | 29 +- + arch/mips/loongson64/reset.c | 5 - + arch/mips/mm/c-r4k.c | 17 +- + arch/mips/mm/dma-noncoherent.c | 51 +- + 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 | 9 +- + arch/mips/pci/pci-ar71xx.c | 4 +- + arch/mips/pci/pci-ar724x.c | 9 +- + arch/mips/pci/pci-xtalk-bridge.c | 4 +- + 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/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-dma.c | 4 +- + 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 +- + arch/nds32/kernel/dma.c | 2 +- + arch/openrisc/kernel/dma.c | 2 +- + arch/parisc/Kconfig | 2 +- + 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/drivers.c | 1 + + arch/parisc/kernel/entry.S | 14 +- + arch/parisc/kernel/inventory.c | 30 + + arch/parisc/kernel/pci-dma.c | 8 +- + arch/parisc/kernel/smp.c | 9 +- + arch/parisc/kernel/syscall.S | 10 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/lib/bitops.c | 6 +- + arch/parisc/lib/iomap.c | 18 + + 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/t1040rdb.dts | 107 + + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 78 + + 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 | 36 +- + 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/dma-direct.h | 4 +- + 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/iommu.h | 2 +- + 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/nohash/pgtable.h | 5 - + arch/powerpc/include/asm/pci.h | 2 +- + 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/dma-iommu.c | 2 + + 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/iommu.c | 11 +- + 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/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/syscalls/syscall.tbl | 1 + + 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/dma-noncoherent.c | 2 +- + 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 | 11 +- + 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/memtrace.c | 2 +- + 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/ps3/system-bus.c | 6 +- + 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/ibmebus.c | 2 +- + 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/platforms/pseries/vio.c | 4 +- + 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/riscv/Kconfig | 25 + + 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/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/setup.c | 18 +- + arch/riscv/kernel/vmlinux.lds.S | 23 +- + arch/riscv/mm/fault.c | 356 +- + arch/riscv/mm/init.c | 190 +- + arch/riscv/mm/ptdump.c | 48 +- + 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/ccwdev.h | 9 +- + arch/s390/include/asm/checksum.h | 105 +- + arch/s390/include/asm/chsc.h | 7 + + 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/css_chars.h | 4 +- + 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 | 64 +- + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + 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/net/bpf_jit_comp.c | 61 +- + 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_dma.c | 10 +- + 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 - + 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/sh/kernel/syscalls/syscall.tbl | 1 + + 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/kernel/smp_64.c | 65 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/mm/io-unit.c | 2 +- + arch/sparc/mm/iommu.c | 2 +- + 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/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/include/asm/mshyperv.h | 1 + + arch/x86/include/asm/msr.h | 20 +- + arch/x86/include/asm/nospec-branch.h | 16 +- + arch/x86/kernel/amd_gart_64.c | 12 +- + arch/x86/kernel/cpu/mshyperv.c | 7 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/setup.c | 2 + + arch/x86/kvm/mmu/page_track.c | 6 +- + arch/x86/net/bpf_jit_comp.c | 310 +- + arch/x86/pci/sta2x11-fixup.c | 6 +- + arch/x86/um/ptrace_64.c | 13 +- + arch/x86/um/user-offsets.c | 2 +- + arch/x86/xen/grant-table.c | 27 +- + arch/x86/xen/pci-swiotlb-xen.c | 2 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/kernel/pci-dma.c | 3 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/mm/init.c | 2 +- + block/bio.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 3 +- + drivers/acpi/arm64/iort.c | 6 +- + drivers/acpi/scan.c | 2 +- + drivers/atm/atmtcp.c | 2 +- + drivers/base/core.c | 9 +- + drivers/base/dd.c | 2 +- + drivers/base/memory.c | 3 +- + drivers/base/node.c | 33 +- + drivers/bcma/driver_pci_host.c | 4 +- + drivers/block/nbd.c | 6 +- + drivers/block/xen-blkback/blkback.c | 22 +- + drivers/block/xen-blkback/xenbus.c | 5 +- + drivers/block/zram/zram_drv.c | 2 +- + 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/cpufreq/powernv-cpufreq.c | 9 +- + drivers/cpuidle/cpuidle-powernv.c | 2 +- + drivers/crypto/Kconfig | 24 +- + 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 | 98 - + drivers/dax/kmem.c | 50 +- + drivers/dax/super.c | 3 +- + drivers/dma-buf/heaps/cma_heap.c | 2 +- + 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 +- + drivers/firewire/ohci.c | 26 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/broadcom/bcm47xx_sprom.c | 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/firmware/qemu_fw_cfg.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 +- + drivers/gpu/drm/drm_prime.c | 25 +- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 - + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 132 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 76 +- + 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/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 15 +- + 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-logitech-dj.c | 2 +- + 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 +- + drivers/hv/hv.c | 2 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/hv/vmbus_drv.c | 30 +- + drivers/i3c/master.c | 144 +- + drivers/i3c/master/i3c-master-cdns.c | 4 +- + 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 | 77 +- + 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 | 542 ++- + 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 | 10 +- + 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/ipoib_main.c | 34 +- + 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 | 39 +- + 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 | 68 +- + 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 + + drivers/iommu/amd/iommu.c | 3 +- + drivers/iommu/dma-iommu.c | 46 +- + drivers/iommu/intel/dmar.c | 2 +- + drivers/iommu/intel/iommu.c | 10 +- + drivers/iommu/io-pgtable-arm.c | 5 - + 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/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 | 12 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 8 +- + 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/cxl/pci.c | 4 +- + 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/misc/ocxl/Kconfig | 2 +- + drivers/misc/ocxl/afu_irq.c | 12 +- + drivers/misc/ocxl/link.c | 15 +- + 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 + + drivers/mtd/ubi/wl.c | 13 + + drivers/net/Kconfig | 4 + + drivers/net/Makefile | 2 + + drivers/net/appletalk/Kconfig | 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/m_can/m_can_platform.c | 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 | 19 +- + 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/au1000_eth.c | 15 +- + 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 | 735 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 162 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 173 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 6 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 336 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 2 + + 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 | 21 +- + drivers/net/ethernet/cadence/macb_main.c | 80 +- + 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_flower.c | 175 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 15 + + .../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 | 225 +- + .../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/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/freescale/enetc/enetc_vf.c | 7 +- + drivers/net/ethernet/freescale/fec_main.c | 38 +- + 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/i825xx/lasi_82596.c | 37 +- + drivers/net/ethernet/i825xx/lib82596.c | 148 +- + drivers/net/ethernet/i825xx/sni_82596.c | 23 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 7 +- + drivers/net/ethernet/ibm/ibmveth.c | 19 +- + 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 | 159 +- + 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.c | 6 + + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 + + 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 | 35 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 349 +- + 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 | 6 +- + 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/korina.c | 3 +- + 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 | 5 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 5 +- + 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 | 8 +- + .../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 | 66 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + .../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 | 182 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 110 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 29 +- + .../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 | 881 +++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 97 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 663 +++- + 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_cmd.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 24 +- + 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 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 31 +- + 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 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 23 +- + .../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 | 114 +- + drivers/net/ethernet/mscc/ocelot.h | 2 + + drivers/net/ethernet/mscc/ocelot_flower.c | 565 +++- + drivers/net/ethernet/mscc/ocelot_io.c | 17 + + drivers/net/ethernet/mscc/ocelot_net.c | 61 +- + 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 | 24 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 38 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 17 + + .../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/seeq/sgiseeq.c | 28 +- + 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 | 67 +- + 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/hamradio/scc.c | 2 +- + 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 | 53 +- + 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 | 30 +- + 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/cx82310_eth.c | 78 +- + drivers/net/usb/kaweth.c | 261 +- + drivers/net/usb/net1080.c | 1 - + drivers/net/usb/qmi_wwan.c | 24 +- + drivers/net/usb/smsc75xx.c | 13 +- + drivers/net/usb/smsc95xx.c | 488 +-- + drivers/net/usb/usbnet.c | 30 +- + drivers/net/veth.c | 18 +- + drivers/net/virtio_net.c | 55 +- + 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/quantenna/qtnfmac/commands.c | 2 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 24 +- + .../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/net/xen-netback/common.h | 15 + + drivers/net/xen-netback/interface.c | 61 +- + drivers/net/xen-netback/netback.c | 11 +- + drivers/net/xen-netback/rx.c | 13 +- + 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/address.c | 73 +- + drivers/of/base.c | 1 + + 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/power/reset/Kconfig | 4 +- + 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 +- + drivers/ptp/ptp_ines.c | 91 +- + drivers/ptp/ptp_qoriq.c | 20 +- + drivers/rapidio/devices/rio_mport_cdev.c | 18 +- + drivers/remoteproc/remoteproc_core.c | 25 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + 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_cmd.c | 2 +- + 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 | 43 +- + drivers/s390/cio/chsc.h | 8 +- + drivers/s390/cio/css.c | 25 +- + drivers/s390/cio/css.h | 4 +- + drivers/s390/cio/device.h | 1 - + drivers/s390/cio/device_ops.c | 93 +- + 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/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/s390/scsi/zfcp_qdio.c | 2 - + drivers/scsi/53c700.c | 121 +- + drivers/scsi/53c700.h | 17 +- + drivers/scsi/cxlflash/ocxl_hw.c | 21 +- + drivers/scsi/cxlflash/ocxl_hw.h | 1 - + drivers/scsi/sgiwd93.c | 14 +- + drivers/ssb/pci.c | 7 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 10 +- + drivers/target/target_core_user.c | 6 +- + 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 | 11 +- + drivers/thermal/thermal_sysfs.c | 2 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 54 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 6 + + drivers/tty/serial/sb1250-duart.c | 9 +- + drivers/usb/core/message.c | 6 - + drivers/usb/core/usb.c | 12 - + drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 38 +- + drivers/video/console/Kconfig | 1 + + drivers/video/console/sticon.c | 297 +- + drivers/video/console/sticore.c | 284 +- + drivers/video/fbdev/sticore.h | 27 +- + drivers/virtio/virtio_mem.c | 3 +- + drivers/xen/balloon.c | 2 +- + drivers/xen/events/events_2l.c | 9 +- + drivers/xen/events/events_base.c | 423 ++- + drivers/xen/events/events_fifo.c | 83 +- + drivers/xen/events/events_internal.h | 20 +- + drivers/xen/evtchn.c | 7 +- + drivers/xen/pvcalls-back.c | 76 +- + drivers/xen/swiotlb-xen.c | 4 +- + drivers/xen/xen-pciback/pci_stub.c | 13 +- + drivers/xen/xen-pciback/pciback.h | 12 +- + drivers/xen/xen-pciback/pciback_ops.c | 48 +- + drivers/xen/xen-pciback/xenbus.c | 2 +- + drivers/xen/xen-scsiback.c | 23 +- + drivers/xen/xenbus/xenbus_client.c | 30 +- + fs/afs/cell.c | 328 +- + fs/afs/dynroot.c | 23 +- + fs/afs/internal.h | 20 +- + fs/afs/main.c | 2 +- + fs/afs/mntpt.c | 4 +- + fs/afs/proc.c | 23 +- + fs/afs/server.c | 7 +- + fs/afs/super.c | 18 +- + fs/afs/vl_alias.c | 8 +- + fs/afs/vl_rotate.c | 2 +- + fs/afs/volume.c | 6 +- + fs/autofs/dev-ioctl.c | 8 +- + fs/binfmt_elf.c | 266 +- + fs/binfmt_elf_fdpic.c | 162 +- + fs/buffer.c | 6 +- + fs/configfs/dir.c | 2 +- + fs/configfs/file.c | 2 +- + fs/coredump.c | 236 +- + fs/dax.c | 29 +- + fs/direct-io.c | 69 +- + fs/dlm/netlink.c | 6 +- + fs/exec.c | 17 +- + fs/ext2/balloc.c | 6 +- + fs/ext2/inode.c | 1 - + fs/ext4/verity.c | 4 +- + 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/verity.c | 4 +- + fs/f2fs/xattr.c | 8 +- + 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 | 255 +- + 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 +- + fs/inode.c | 2 + + fs/io_uring.c | 8 +- + fs/libfs.c | 87 + + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/cpfile.c | 6 +- + fs/nilfs2/page.c | 1 - + fs/nilfs2/sufile.c | 4 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 5 +- + fs/overlayfs/copy_up.c | 59 +- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/export.c | 2 +- + fs/overlayfs/file.c | 88 +- + fs/overlayfs/inode.c | 32 +- + fs/overlayfs/namei.c | 57 +- + fs/overlayfs/overlayfs.h | 92 +- + fs/overlayfs/ovl_entry.h | 6 + + fs/overlayfs/readdir.c | 76 +- + fs/overlayfs/super.c | 117 +- + fs/overlayfs/util.c | 96 +- + fs/proc/task_mmu.c | 18 - + fs/quota/quota.c | 42 +- + fs/quota/quota_v2.c | 1 + + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/inode.c | 9 +- + fs/reiserfs/super.c | 8 +- + fs/reiserfs/xattr.c | 7 + + fs/romfs/super.c | 1 + + fs/ubifs/auth.c | 2 +- + fs/ubifs/debug.c | 1 + + fs/ubifs/gc.c | 4 - + fs/ubifs/ioctl.c | 1 - + fs/ubifs/journal.c | 7 +- + fs/ubifs/orphan.c | 2 + + fs/ubifs/replay.c | 2 - + fs/ubifs/super.c | 44 +- + fs/ubifs/tnc.c | 6 +- + fs/ubifs/xattr.c | 2 + + 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 +- + fs/unicode/utf8-core.c | 23 +- + fs/userfaultfd.c | 28 +- + fs/vboxsf/dir.c | 2 +- + 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/libxfs/xfs_rtbitmap.c | 11 +- + fs/xfs/scrub/dabtree.c | 14 + + fs/xfs/xfs_bmap_item.c | 132 +- + fs/xfs/xfs_buf_item_recover.c | 2 + + fs/xfs/xfs_dquot.c | 4 +- + fs/xfs/xfs_extfree_item.c | 44 +- + fs/xfs/xfs_filestream.c | 34 +- + fs/xfs/xfs_fsmap.c | 48 +- + fs/xfs/xfs_fsmap.h | 6 +- + fs/xfs/xfs_inode.c | 123 +- + 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 +- + fs/zonefs/super.c | 221 +- + fs/zonefs/zonefs.h | 10 + + include/asm-generic/Kbuild | 1 - + include/asm-generic/dma-contiguous.h | 10 - + include/asm-generic/mshyperv.h | 4 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/dt-bindings/power/summit,smb347-charger.h | 19 + + include/kunit/test.h | 90 +- + include/linux/bcm47xx_sprom.h | 10 + + include/linux/bcm963xx_tag.h | 2 +- + include/linux/bitops.h | 13 +- + include/linux/blkdev.h | 1 + + include/linux/bpf-cgroup.h | 25 + + include/linux/bpf.h | 149 +- + include/linux/bpf_local_storage.h | 163 + + include/linux/bpf_lsm.h | 29 + + include/linux/bpf_types.h | 3 + + include/linux/bpf_verifier.h | 28 +- + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 68 +- + include/linux/btf_ids.h | 59 +- + include/linux/bvec.h | 6 +- + include/linux/can/core.h | 9 +- + include/linux/can/dev.h | 27 +- + include/linux/can/rx-offload.h | 3 + + include/linux/cma.h | 2 + + include/linux/cookie.h | 51 + + include/linux/coredump.h | 11 + + include/linux/cpuhotplug.h | 1 + + include/linux/dax.h | 6 + + include/linux/devfreq.h | 7 +- + 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/dmaengine.h | 17 +- + include/linux/dsa/8021q.h | 51 +- + include/linux/ethtool.h | 30 + + include/linux/f2fs_fs.h | 3 - + include/linux/fault-inject-usercopy.h | 22 + + include/linux/filter.h | 12 +- + include/linux/fs.h | 44 +- + include/linux/fsl/ptp_qoriq.h | 3 + + include/linux/ftrace.h | 11 +- + include/linux/gfp.h | 6 +- + include/linux/hid.h | 2 + + include/linux/idle_inject.h | 2 +- + include/linux/idr.h | 13 +- + 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/input/sparse-keymap.h | 1 + + include/linux/ioport.h | 11 +- + include/linux/ipv6.h | 22 - + include/linux/jiffies.h | 3 +- + include/linux/kernel.h | 150 +- + include/linux/kgdb.h | 18 + + include/linux/list.h | 29 +- + include/linux/math64.h | 8 +- + 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/memcontrol.h | 12 - + include/linux/memory_hotplug.h | 42 +- + include/linux/micrel_phy.h | 1 + + include/linux/minmax.h | 153 + + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/driver.h | 3 +- + include/linux/mlx5/eswitch.h | 15 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/mlx5/port.h | 15 +- + include/linux/mlx5/qp.h | 6 +- + include/linux/mm.h | 7 +- + include/linux/mmzone.h | 17 +- + 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/net.h | 3 + + include/linux/netdevice.h | 105 +- + include/linux/netfilter/nf_conntrack_common.h | 2 +- + include/linux/netlink.h | 30 +- + include/linux/node.h | 16 +- + include/linux/nodemask.h | 2 +- + include/linux/of.h | 5 + + include/linux/of_mdio.h | 6 + + include/linux/overflow.h | 1 + + include/linux/page-flags.h | 6 +- + include/linux/page_owner.h | 6 +- + include/linux/page_ref.h | 42 +- + include/linux/pagemap.h | 107 +- + 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/pid.h | 1 + + include/linux/platform_data/dma-dw.h | 2 + + include/linux/platform_data/macb.h | 20 - + include/linux/platform_data/mtd-davinci.h | 9 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 2 +- + 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 + + include/linux/prefetch.h | 8 + + include/linux/ptp_classify.h | 78 +- + include/linux/qed/qed_if.h | 82 +- + include/linux/qed/qed_rdma_if.h | 2 - + include/linux/qed/qede_rdma.h | 4 +- + include/linux/rculist.h | 48 + + include/linux/rcupdate.h | 19 +- + include/linux/rcupdate_trace.h | 13 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/scatterlist.h | 38 +- + include/linux/sched.h | 2 +- + include/linux/sched/mm.h | 64 +- + include/linux/scif.h | 8 +- + include/linux/skbuff.h | 8 + + include/linux/skmsg.h | 19 +- + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/linux/sock_diag.h | 14 +- + include/linux/stmmac.h | 3 + + include/linux/syscalls.h | 2 + + include/linux/tcp.h | 21 +- + include/linux/thermal.h | 10 +- + include/linux/topology.h | 2 +- + include/linux/tracepoint-defs.h | 34 + + include/linux/uaccess.h | 12 +- + include/linux/unicode.h | 3 + + include/linux/usb/typec_altmode.h | 16 + + include/linux/vmalloc.h | 7 +- + include/linux/vmstat.h | 2 +- + include/linux/xarray.h | 22 + + include/misc/ocxl.h | 10 +- + 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 | 113 +- + 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_log.h | 1 + + include/net/netfilter/nf_tables.h | 23 +- + include/net/netfilter/nf_tables_core.h | 11 + + include/net/netfilter/nf_tables_ipv4.h | 33 + + include/net/netfilter/nf_tables_ipv6.h | 46 + + include/net/netlink.h | 105 +- + include/net/netns/can.h | 1 - + 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_tunnel_key.h | 5 +- + include/net/tc_act/tc_vlan.h | 2 + + include/net/tcp.h | 40 +- + include/net/tls.h | 4 - + 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/ras/ras_event.h | 3 + + 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/soc/mscc/ocelot.h | 76 +- + include/soc/mscc/ocelot_ptp.h | 3 +- + include/soc/mscc/ocelot_vcap.h | 202 +- + include/trace/events/afs.h | 109 + + include/trace/events/devlink.h | 37 + + include/trace/events/f2fs.h | 10 +- + include/trace/events/rcu.h | 54 +- + include/trace/events/rdma.h | 41 +- + include/trace/events/rpcrdma.h | 1 + + include/trace/events/rxrpc.h | 35 +- + include/uapi/asm-generic/hugetlb_encode.h | 1 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/bpf.h | 655 +++- + include/uapi/linux/can/isotp.h | 165 + + include/uapi/linux/can/raw.h | 3 + + include/uapi/linux/devlink.h | 69 + + include/uapi/linux/dqblk_xfs.h | 16 +- + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/ethtool_netlink.h | 18 +- + include/uapi/linux/fuse.h | 50 +- + 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/mman.h | 1 + + include/uapi/linux/mroute.h | 5 +- + include/uapi/linux/netfilter.h | 3 +- + include/uapi/linux/netfilter/nf_tables.h | 10 + + 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 + + include/uapi/linux/virtio_fs.h | 3 + + 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 | 12 +- + include/xen/events.h | 21 + + init/Kconfig | 3 + + init/main.c | 6 +- + kernel/Makefile | 4 +- + kernel/acct.c | 10 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/arraymap.c | 102 +- + 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 | 1221 ++++++- + kernel/bpf/core.c | 29 +- + kernel/bpf/cpumap.c | 17 +- + kernel/bpf/devmap.c | 17 +- + kernel/bpf/hashtab.c | 22 +- + kernel/bpf/helpers.c | 58 + + 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/percpu_freelist.c | 101 +- + kernel/bpf/percpu_freelist.h | 1 + + 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 + + .../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 | 331 +- + kernel/bpf/task_iter.c | 15 +- + kernel/bpf/trampoline.c | 63 +- + kernel/bpf/verifier.c | 1388 ++++++-- + kernel/cgroup/cpuset.c | 2 +- + 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 - + 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 | 270 +- + 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 +- + kernel/entry/common.c | 2 +- + kernel/exit.c | 19 - + kernel/fork.c | 4 +- + kernel/futex.c | 2 +- + 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/kprobes.c | 2 +- + kernel/kthread.c | 2 +- + kernel/livepatch/state.c | 2 +- + kernel/locking/locktorture.c | 2 +- + kernel/panic.c | 12 +- + kernel/pid.c | 19 + + kernel/pid_namespace.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/printk/printk_ringbuffer.c | 5 +- + kernel/printk/printk_safe.c | 2 +- + kernel/range.c | 3 +- + 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/tasks.h | 53 +- + kernel/rcu/tree.c | 179 +- + 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/relay.c | 2 +- + kernel/resource.c | 110 +- + kernel/scftorture.c | 575 ++++ + kernel/smp.c | 136 +- + kernel/sys.c | 2 +- + kernel/sys_ni.c | 1 + + kernel/taskstats.c | 40 +- + kernel/time/tick-sched.c | 2 +- + kernel/trace/bpf_trace.c | 172 +- + 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 | 142 +- + 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 +- + kernel/user_namespace.c | 2 +- + kernel/workqueue.c | 3 + + lib/Kconfig.debug | 51 +- + lib/Kconfig.kgdb | 15 + + lib/Kconfig.ubsan | 14 + + lib/Makefile | 3 +- + lib/{test_bitfield.c => bitfield_kunit.c} | 90 +- + lib/bitmap.c | 4 +- + lib/crc32.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/decompress_unzstd.c | 7 +- + 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/kunit/Makefile | 3 +- + lib/kunit/executor.c | 43 + + lib/kunit/test.c | 13 +- + lib/libcrc32c.c | 2 +- + lib/math/rational.c | 2 +- + lib/math/reciprocal_div.c | 1 + + lib/mpi/mpi-bit.c | 2 +- + lib/nlattr.c | 122 +- + lib/nmi_backtrace.c | 6 +- + lib/percpu_counter.c | 2 +- + lib/radix-tree.c | 2 +- + lib/scatterlist.c | 135 +- + 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 | 8 +- + mm/cma.h | 2 - + mm/compaction.c | 6 +- + mm/debug_vm_pgtable.c | 207 +- + mm/filemap.c | 64 +- + mm/gup.c | 61 +- + mm/gup_benchmark.c | 15 +- + mm/highmem.c | 4 +- + mm/huge_memory.c | 45 +- + mm/hugetlb.c | 4 +- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 27 +- + mm/khugepaged.c | 2 +- + mm/ksm.c | 2 +- + mm/madvise.c | 177 +- + mm/memblock.c | 8 +- + mm/memcontrol.c | 75 +- + mm/memory-failure.c | 329 +- + mm/memory.c | 24 +- + mm/memory_hotplug.c | 257 +- + mm/memremap.c | 3 +- + mm/migrate.c | 82 +- + mm/mmap.c | 81 +- + mm/mmu_notifier.c | 2 +- + mm/nommu.c | 7 - + mm/page-writeback.c | 1 + + mm/page_alloc.c | 243 +- + mm/page_isolation.c | 16 +- + mm/page_owner.c | 10 +- + mm/page_poison.c | 20 +- + mm/page_reporting.c | 4 +- + mm/percpu.c | 3 +- + mm/readahead.c | 130 +- + mm/rmap.c | 10 +- + mm/shmem.c | 2 +- + mm/shuffle.c | 2 +- + mm/slab.c | 2 +- + mm/slab.h | 4 - + mm/slub.c | 2 +- + mm/sparse.c | 2 + + mm/swap_state.c | 2 +- + mm/truncate.c | 6 +- + mm/util.c | 3 +- + mm/vmalloc.c | 147 +- + mm/vmscan.c | 5 +- + mm/vmstat.c | 8 +- + mm/workingset.c | 2 +- + mm/zsmalloc.c | 10 +- + 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_device.c | 21 +- + 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 | 14 + + net/can/Makefile | 3 + + net/can/af_can.c | 8 +- + net/can/bcm.c | 6 +- + net/can/gw.c | 6 +- + net/can/isotp.c | 1424 ++++++++ + net/can/j1939/transport.c | 2 + + net/can/proc.c | 14 +- + net/can/raw.c | 34 +- + net/core/bpf_sk_storage.c | 836 +---- + net/core/datagram.c | 33 +- + net/core/dev.c | 179 +- + net/core/devlink.c | 896 ++++- + net/core/drop_monitor.c | 139 +- + net/core/filter.c | 962 +++++- + 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 | 195 +- + net/core/sock.c | 32 +- + net/core/sock_diag.c | 9 +- + net/core/sock_map.c | 441 ++- + 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 | 212 +- + 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 | 60 +- + 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 | 29 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_diag.c | 17 + + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/ip_gre.c | 15 +- + 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_tunnel_core.c | 23 +- + net/ipv4/ip_vti.c | 9 +- + net/ipv4/ipmr.c | 14 +- + net/ipv4/netfilter/nf_log_arp.c | 19 +- + net/ipv4/netfilter/nf_log_ipv4.c | 6 +- + net/ipv4/nexthop.c | 66 +- + net/ipv4/ping.c | 29 +- + net/ipv4/raw.c | 5 +- + net/ipv4/route.c | 23 +- + 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 | 226 +- + net/ipv4/tcp_ipv4.c | 18 +- + net/ipv4/tcp_metrics.c | 6 +- + 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/tcp_vegas.c | 8 +- + 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/calipso.c | 2 +- + net/ipv6/icmp.c | 7 +- + net/ipv6/inet6_hashtables.c | 6 +- + net/ipv6/ip6_fib.c | 16 +- + net/ipv6/ip6_gre.c | 33 +- + net/ipv6/ip6_output.c | 4 +- + net/ipv6/ip6_vti.c | 8 +- + net/ipv6/netfilter/ip6t_NPT.c | 39 + + net/ipv6/netfilter/nf_log_ipv6.c | 8 +- + net/ipv6/route.c | 6 +- + 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 | 1561 ++++----- + 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 | 120 +- + net/mptcp/pm.c | 94 +- + net/mptcp/pm_netlink.c | 325 +- + net/mptcp/protocol.c | 570 +++- + net/mptcp/protocol.h | 71 +- + net/mptcp/subflow.c | 119 +- + net/ncsi/ncsi-netlink.c | 6 +- + net/netfilter/Kconfig | 1 + + net/netfilter/core.c | 129 +- + net/netfilter/ipset/ip_set_core.c | 17 +- + net/netfilter/ipvs/Kconfig | 1 - + net/netfilter/ipvs/ip_vs_conn.c | 18 +- + net/netfilter/ipvs/ip_vs_core.c | 19 +- + net/netfilter/ipvs/ip_vs_ctl.c | 13 +- + net/netfilter/ipvs/ip_vs_sync.c | 3 - + net/netfilter/ipvs/ip_vs_xmit.c | 6 + + net/netfilter/nf_conntrack_core.c | 25 +- + net/netfilter/nf_conntrack_netlink.c | 5 +- + net/netfilter/nf_conntrack_standalone.c | 6 +- + net/netfilter/nf_flow_table_core.c | 12 +- + net/netfilter/nf_flow_table_ip.c | 45 +- + net/netfilter/nf_log_common.c | 12 + + net/netfilter/nf_tables_api.c | 121 +- + 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_chain_filter.c | 35 +- + net/netfilter/nft_cmp.c | 13 +- + net/netfilter/nft_payload.c | 28 + + 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 | 28 +- + 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 | 71 +- + net/rxrpc/call_object.c | 43 + + net/rxrpc/conn_client.c | 1092 +++--- + net/rxrpc/conn_event.c | 20 +- + 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 | 82 +- + 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 | 21 +- + 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 | 5 +- + net/tipc/msg.h | 8 +- + net/tipc/name_distr.c | 10 +- + 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 | 96 +- + 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_device.c | 11 +- + net/tls/tls_main.c | 27 +- + net/unix/af_unix.c | 3 - + 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 | 377 ++- + net/xdp/xsk_diag.c | 20 +- + net/xdp/xsk_queue.h | 18 +- + net/xdp/xskmap.c | 15 +- + net/xfrm/Kconfig | 11 + + net/xfrm/Makefile | 1 + + net/xfrm/xfrm_compat.c | 625 ++++ + net/xfrm/xfrm_interface.c | 31 +- + net/xfrm/xfrm_state.c | 77 +- + net/xfrm/xfrm_user.c | 110 +- + samples/bpf/.gitignore | 1 + + samples/bpf/Makefile | 36 +- + samples/bpf/cpustat_kern.c | 36 +- + samples/bpf/cpustat_user.c | 47 +- + samples/bpf/hbm.c | 3 +- + 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_monitor_kern.c | 60 +- + samples/bpf/xdp_monitor_user.c | 159 +- + samples/bpf/xdp_redirect_cpu_user.c | 155 +- + samples/bpf/xdp_sample_pkts_kern.c | 14 +- + samples/bpf/xdp_sample_pkts_user.c | 1 - + samples/bpf/xdpsock_user.c | 406 ++- + samples/bpf/xsk_fwd.c | 1085 ++++++ + samples/configfs/configfs_sample.c | 59 +- + scripts/Makefile.ubsan | 10 +- + scripts/bpf_helpers_doc.py | 4 + + scripts/checkpatch.pl | 238 +- + scripts/coccicheck | 17 +- + scripts/coccinelle/api/alloc/zalloc-simple.cocci | 16 +- + scripts/coccinelle/api/kfree_mismatch.cocci | 228 ++ + .../api/{kzfree.cocci => kfree_sensitive.cocci} | 35 +- + scripts/coccinelle/api/kobj_to_dev.cocci | 45 + + scripts/coccinelle/api/kvmalloc.cocci | 256 ++ + scripts/coccinelle/free/ifnullfree.cocci | 11 +- + scripts/coccinelle/iterators/for_each_child.cocci | 358 ++ + scripts/coccinelle/misc/excluded_middle.cocci | 39 + + scripts/coccinelle/misc/flexible_array.cocci | 88 + + scripts/coccinelle/misc/uninitialized_var.cocci | 51 + + scripts/const_structs.checkpatch | 3 + + scripts/gdb/linux/proc.py | 15 +- + scripts/gdb/linux/tasks.py | 9 +- + scripts/get_maintainer.pl | 9 +- + scripts/kernel-doc | 305 +- + scripts/link-vmlinux.sh | 6 +- + scripts/spelling.txt | 4 - + security/bpf/hooks.c | 6 + + 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 +- + sound/mips/hal2.c | 58 +- + tools/arch/parisc/include/uapi/asm/mman.h | 1 - + 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 + + 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 | 8 +- + tools/build/feature/Makefile | 10 +- + tools/build/feature/test-all.c | 19 +- + tools/build/feature/test-libbfd-buildid.c | 8 + + tools/build/feature/test-libelf-mmap.c | 9 - + tools/include/linux/btf_ids.h | 59 +- + tools/include/uapi/linux/bpf.h | 655 +++- + 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 | 3539 ++++++++++++++------ + 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 | 383 ++- + tools/lib/bpf/xsk.h | 9 + + tools/lib/perf/evlist.c | 3 + + tools/lib/perf/include/perf/event.h | 16 +- + tools/lib/traceevent/event-parse-api.c | 8 +- + tools/lib/traceevent/event-parse-local.h | 24 +- + tools/lib/traceevent/event-parse.c | 125 +- + tools/lib/traceevent/event-parse.h | 8 - + tools/lib/traceevent/event-plugin.c | 2 +- + tools/lib/traceevent/parse-filter.c | 23 +- + tools/perf/Documentation/perf-c2c.txt | 34 +- + tools/perf/Documentation/perf-config.txt | 5 + + tools/perf/Documentation/perf-diff.txt | 4 + + tools/perf/Documentation/perf-ftrace.txt | 3 +- + tools/perf/Documentation/perf-inject.txt | 6 +- + tools/perf/Documentation/perf-intel-pt.txt | 53 +- + tools/perf/Documentation/perf-list.txt | 1 + + tools/perf/Documentation/perf-record.txt | 56 +- + tools/perf/Documentation/perf-stat.txt | 60 +- + tools/perf/Documentation/perf.txt | 69 +- + tools/perf/Documentation/topdown.txt | 256 ++ + tools/perf/Makefile.config | 29 +- + tools/perf/Makefile.perf | 24 +- + tools/perf/arch/arm64/util/Build | 1 + + tools/perf/arch/arm64/util/tsc.c | 21 + + tools/perf/arch/powerpc/util/header.c | 7 +- + tools/perf/arch/x86/annotate/instructions.c | 1 + + tools/perf/arch/x86/util/Build | 2 +- + tools/perf/arch/x86/util/group.c | 28 - + tools/perf/arch/x86/util/topdown.c | 63 + + tools/perf/arch/x86/util/tsc.c | 73 +- + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 1 + + tools/perf/bench/inject-buildid.c | 476 +++ + tools/perf/bench/numa.c | 67 +- + tools/perf/builtin-bench.c | 1 + + tools/perf/builtin-buildid-cache.c | 25 +- + tools/perf/builtin-c2c.c | 85 +- + tools/perf/builtin-diff.c | 119 +- + tools/perf/builtin-ftrace.c | 84 +- + tools/perf/builtin-inject.c | 203 +- + tools/perf/builtin-list.c | 7 - + tools/perf/builtin-record.c | 68 +- + tools/perf/builtin-sched.c | 24 +- + tools/perf/builtin-script.c | 10 +- + tools/perf/builtin-stat.c | 136 +- + tools/perf/builtin-trace.c | 6 +- + tools/perf/builtin-version.c | 1 - + tools/perf/check-headers.sh | 22 +- + tools/perf/perf-sys.h | 22 +- + .../perf/pmu-events/arch/powerpc/power8/cache.json | 10 +- + .../pmu-events/arch/powerpc/power8/frontend.json | 12 +- + .../pmu-events/arch/powerpc/power8/marked.json | 10 +- + .../perf/pmu-events/arch/powerpc/power8/other.json | 16 +- + .../arch/powerpc/power8/translation.json | 2 +- + .../arch/powerpc/power9/nest_metrics.json | 35 +- + tools/perf/pmu-events/arch/x86/amdzen1/branch.json | 5 + + tools/perf/pmu-events/arch/x86/amdzen1/cache.json | 41 + + .../pmu-events/arch/x86/amdzen1/data-fabric.json | 98 + + .../pmu-events/arch/x86/amdzen1/recommended.json | 178 + + tools/perf/pmu-events/arch/x86/amdzen2/cache.json | 23 + + .../pmu-events/arch/x86/amdzen2/data-fabric.json | 98 + + .../pmu-events/arch/x86/amdzen2/recommended.json | 178 + + .../pmu-events/arch/x86/cascadelakex/cache.json | 28 +- + .../arch/x86/cascadelakex/clx-metrics.json | 153 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 34 + + .../pmu-events/arch/x86/cascadelakex/memory.json | 704 ++-- + .../pmu-events/arch/x86/cascadelakex/other.json | 1100 +++--- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 10 - + .../arch/x86/cascadelakex/uncore-memory.json | 12 +- + .../arch/x86/cascadelakex/uncore-other.json | 21 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 2348 ++++++------- + .../arch/x86/skylakex/floating-point.json | 96 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 656 ++-- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 1977 +++++------ + tools/perf/pmu-events/arch/x86/skylakex/other.json | 172 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 1206 ++++--- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 141 +- + .../arch/x86/skylakex/uncore-memory.json | 26 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 730 +++- + .../arch/x86/skylakex/virtual-memory.json | 358 +- + tools/perf/pmu-events/jevents.c | 237 +- + tools/perf/pmu-events/jevents.h | 23 - + tools/perf/pmu-events/pmu-events.h | 6 + + tools/perf/scripts/python/futex-contention.py | 51 +- + tools/perf/tests/Build | 2 + + tools/perf/tests/attr.c | 2 +- + tools/perf/tests/builtin-test.c | 8 + + tools/perf/tests/expand-cgroup.c | 241 ++ + tools/perf/tests/make | 2 + + tools/perf/tests/parse-events.c | 58 +- + tools/perf/tests/parse-metric.c | 4 +- + tools/perf/tests/pe-file-parsing.c | 98 + + tools/perf/tests/pe-file.c | 14 + + tools/perf/tests/pe-file.exe | Bin 0 -> 75595 bytes + tools/perf/tests/pe-file.exe.debug | Bin 0 -> 141644 bytes + tools/perf/tests/python-use.c | 1 + + tools/perf/tests/sdt.c | 6 +- + tools/perf/tests/shell/buildid.sh | 101 + + tools/perf/tests/shell/test_arm_coresight.sh | 183 + + tools/perf/tests/tests.h | 2 + + tools/perf/trace/beauty/mmap.c | 74 +- + tools/perf/trace/beauty/mmap_flags.sh | 16 +- + tools/perf/trace/beauty/mmap_prot.sh | 30 + + tools/perf/trace/beauty/mremap_flags.sh | 18 + + tools/perf/util/Build | 2 + + tools/perf/util/annotate.c | 5 +- + tools/perf/util/bpf-loader.c | 12 +- + tools/perf/util/build-id.c | 48 +- + tools/perf/util/build-id.h | 12 +- + tools/perf/util/callchain.c | 99 + + tools/perf/util/callchain.h | 9 + + tools/perf/util/cgroup.c | 115 +- + tools/perf/util/cgroup.h | 3 + + tools/perf/util/config.c | 2 +- + tools/perf/util/config.h | 2 + + tools/perf/util/dso.c | 23 +- + tools/perf/util/dso.h | 7 +- + tools/perf/util/dsos.c | 9 +- + tools/perf/util/event.c | 2 +- + tools/perf/util/evlist.c | 123 +- + tools/perf/util/evlist.h | 8 +- + tools/perf/util/evsel.c | 109 + + tools/perf/util/evsel.h | 93 +- + tools/perf/util/group.h | 8 - + tools/perf/util/header.c | 15 +- + tools/perf/util/intel-pt.c | 8 +- + tools/perf/util/jitdump.c | 14 +- + tools/perf/util/machine.c | 12 + + tools/perf/util/machine.h | 4 + + tools/perf/util/map.c | 21 +- + tools/perf/util/map.h | 14 + + tools/perf/util/metricgroup.c | 177 +- + tools/perf/util/metricgroup.h | 9 +- + tools/perf/util/parse-events.c | 23 +- + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-events.l | 2 +- + tools/perf/util/parse-events.y | 8 +- + tools/perf/util/print_binary.c | 2 +- + tools/perf/util/probe-event.c | 69 +- + tools/perf/util/probe-finder.c | 63 +- + tools/perf/util/probe-finder.h | 7 +- + tools/perf/util/python.c | 21 +- + tools/perf/util/record.c | 3 +- + tools/perf/util/record.h | 1 + + .../util/scripting-engines/trace-event-python.c | 2 +- + tools/perf/util/stat-display.c | 1 - + tools/perf/util/stat-shadow.c | 89 + + tools/perf/util/stat.c | 4 + + tools/perf/util/stat.h | 10 + + tools/perf/util/stream.c | 342 ++ + tools/perf/util/stream.h | 41 + + tools/perf/util/symbol-elf.c | 107 +- + tools/perf/util/symbol-minimal.c | 31 +- + tools/perf/util/symbol.c | 155 +- + tools/perf/util/symbol.h | 11 +- + tools/perf/util/synthetic-events.c | 10 +- + tools/perf/util/topdown.c | 58 + + tools/perf/util/topdown.h | 12 + + tools/perf/util/tsc.c | 81 + + tools/perf/util/tsc.h | 5 + + tools/perf/util/util.h | 6 + + 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_parser.py | 76 +- + tools/testing/kunit/kunit_tool_test.py | 33 + + .../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 + tools/testing/scatterlist/Makefile | 3 +- + tools/testing/scatterlist/linux/mm.h | 35 + + tools/testing/scatterlist/main.c | 53 +- + tools/testing/selftests/Makefile | 34 +- + tools/testing/selftests/bpf/.gitignore | 2 - + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/README.rst | 59 + + 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/align.c | 16 +- + 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 | 74 +- + .../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 +- + .../selftests/bpf/prog_tests/core_autosize.c | 225 ++ + .../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 | 42 +- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 88 + + 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 +- + tools/testing/selftests/bpf/prog_tests/pinning.c | 49 +- + .../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 | 610 ++++ + .../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 +- + .../selftests/bpf/prog_tests/test_profiler.c | 72 + + tools/testing/selftests/bpf/prog_tests/trace_ext.c | 111 + + .../selftests/bpf/prog_tests/xdp_noinline.c | 51 +- + 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 + + tools/testing/selftests/bpf/progs/connect4_prog.c | 19 + + .../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/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 + + 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 | 74 + + .../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_autosize.c | 172 + + .../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 + + tools/testing/selftests/bpf/progs/test_ksyms_btf.c | 55 + + .../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_kern.h | 34 +- + .../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 | 148 + + tools/testing/selftests/bpf/progs/test_tc_peer.c | 45 + + .../selftests/bpf/progs/test_tcp_hdr_options.c | 626 ++++ + 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_sockmap.c | 81 +- + tools/testing/selftests/bpf/test_tc_redirect.sh | 204 ++ + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 152 + + tools/testing/selftests/bpf/test_verifier.c | 19 +- + tools/testing/selftests/bpf/trace_helpers.c | 27 + + tools/testing/selftests/bpf/trace_helpers.h | 4 + + tools/testing/selftests/bpf/verifier/and.c | 16 + + tools/testing/selftests/bpf/verifier/basic.c | 2 +- + 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 + + .../selftests/bpf/verifier/direct_packet_access.c | 2 +- + tools/testing/selftests/bpf/verifier/ld_imm64.c | 8 - + tools/testing/selftests/bpf/verifier/map_ptr.c | 32 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 47 + + tools/testing/selftests/bpf/verifier/regalloc.c | 269 ++ + .../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 | 316 ++ + tools/testing/selftests/exec/.gitignore | 1 + + tools/testing/selftests/exec/Makefile | 9 +- + tools/testing/selftests/exec/load_address.c | 68 + + tools/testing/selftests/firmware/.gitignore | 2 + + .../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 + + tools/testing/selftests/lib.mk | 9 +- + tools/testing/selftests/livepatch/functions.sh | 2 +- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 3 + + 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 +- + tools/testing/selftests/net/vrf_route_leaking.sh | 626 ++++ + tools/testing/selftests/netfilter/.gitignore | 2 + + tools/testing/selftests/netfilter/nf-queue.c | 61 +- + tools/testing/selftests/netfilter/nft_meta.sh | 32 +- + tools/testing/selftests/netfilter/nft_queue.sh | 70 +- + .../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/eeh/eeh-basic.sh | 9 +- + 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 +- + tools/testing/selftests/ptrace/.gitignore | 1 + + ...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/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 + + tools/testing/selftests/rcutorture/doc/initrd.txt | 36 +- + .../selftests/rcutorture/doc/rcu-test-image.txt | 41 +- + tools/testing/selftests/run_kselftest.sh | 93 + + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/vm/hmm-tests.c | 2 +- + 4644 files changed, 185728 insertions(+), 85472 deletions(-) + create mode 100644 Documentation/bpf/prog_sk_lookup.rst + create mode 100644 Documentation/dev-tools/kunit/style.rst + create mode 100644 Documentation/devicetree/bindings/mailbox/arm,mhu.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/arm-mhu.txt + 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/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 Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml + delete mode 100644 Documentation/driver-api/sound.rst + 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 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 + delete mode 100644 arch/arm/include/asm/dma-contiguous.h + delete mode 100644 arch/m68k/include/asm/uaccess_mm.h + delete mode 100644 arch/m68k/include/asm/uaccess_no.h + 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/board.c + 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 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 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/dma/ti/k3-psil-j7200.c + create mode 100644 drivers/firmware/efi/libstub/riscv-stub.c + create mode 100644 drivers/firmware/efi/riscv-runtime.c + create mode 100644 drivers/hid/hid-vivaldi.c + create mode 100644 drivers/infiniband/core/cm_trace.c + create mode 100644 drivers/infiniband/core/cm_trace.h + create mode 100644 drivers/mailbox/arm_mhu_db.c + 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 + 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 (76%) + 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 drivers/power/supply/bq25980_charger.c + create mode 100644 drivers/power/supply/bq25980_charger.h + create mode 100644 drivers/power/supply/rn5t618_power.c + create mode 100644 drivers/s390/char/sclp_ap.c + create mode 100644 fs/fuse/dax.c + delete mode 100644 include/asm-generic/dma-contiguous.h + create mode 100644 include/dt-bindings/power/summit,smb347-charger.h + create mode 100644 include/linux/bpf_local_storage.h + create mode 100644 include/linux/cookie.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 + create mode 100644 include/linux/fault-inject-usercopy.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/minmax.h + 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/linux/power/smb347-charger.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 + rename arch/mips/pnx833x/stb22x/Makefile => kernel/bpf/preload/iterators/.gitignore (70%) + 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 + 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 + rename kernel/rcu/{rcuperf.c => rcuscale.c} (64%) + create mode 100644 kernel/scftorture.c + rename lib/{test_bitfield.c => bitfield_kunit.c} (67%) + create mode 100644 lib/fault-inject-usercopy.c + create mode 100644 lib/kunit/executor.c + 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 scripts/coccinelle/api/kfree_mismatch.cocci + rename scripts/coccinelle/api/{kzfree.cocci => kfree_sensitive.cocci} (67%) + create mode 100644 scripts/coccinelle/api/kobj_to_dev.cocci + create mode 100644 scripts/coccinelle/api/kvmalloc.cocci + create mode 100644 scripts/coccinelle/iterators/for_each_child.cocci + create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci + create mode 100644 scripts/coccinelle/misc/flexible_array.cocci + create mode 100644 scripts/coccinelle/misc/uninitialized_var.cocci + 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/bpf/bpftool/Documentation/common_options.rst + create mode 100644 tools/build/feature/test-libbfd-buildid.c + delete mode 100644 tools/build/feature/test-libelf-mmap.c + create mode 100644 tools/perf/Documentation/topdown.txt + create mode 100644 tools/perf/arch/arm64/util/tsc.c + delete mode 100644 tools/perf/arch/x86/util/group.c + create mode 100644 tools/perf/arch/x86/util/topdown.c + create mode 100644 tools/perf/bench/inject-buildid.c + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen1/data-fabric.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen1/recommended.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen2/data-fabric.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen2/recommended.json + delete mode 100644 tools/perf/pmu-events/jevents.h + create mode 100644 tools/perf/tests/expand-cgroup.c + create mode 100644 tools/perf/tests/pe-file-parsing.c + create mode 100644 tools/perf/tests/pe-file.c + create mode 100644 tools/perf/tests/pe-file.exe + create mode 100644 tools/perf/tests/pe-file.exe.debug + create mode 100755 tools/perf/tests/shell/buildid.sh + create mode 100755 tools/perf/tests/shell/test_arm_coresight.sh + create mode 100755 tools/perf/trace/beauty/mmap_prot.sh + create mode 100755 tools/perf/trace/beauty/mremap_flags.sh + delete mode 100644 tools/perf/util/group.h + create mode 100644 tools/perf/util/stream.c + create mode 100644 tools/perf/util/stream.h + create mode 100644 tools/perf/util/topdown.c + create mode 100644 tools/perf/util/topdown.h + create mode 100644 tools/testing/kunit/kunit_json.py + 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/core_autosize.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/d_path.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_btf.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/test_profiler.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/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/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_autosize.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_ksyms_btf.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_tc_peer.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_redirect.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 100644 tools/testing/selftests/bpf/verifier/regalloc.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 100644 tools/testing/selftests/exec/load_address.c + create mode 100644 tools/testing/selftests/firmware/.gitignore + 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 + 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 + create mode 100755 tools/testing/selftests/net/vrf_route_leaking.sh + create mode 100644 tools/testing/selftests/netfilter/.gitignore + create mode 100644 tools/testing/selftests/powerpc/syscalls/rtas_filter.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 + create mode 100755 tools/testing/selftests/run_kselftest.sh +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 +Already up to date. +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 (d1781f237047 selftests/powerpc: Make alignment handler test P9N DD2.1 vector CI load workaround) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/mce.c | 7 +-- + arch/powerpc/kernel/smp.c | 70 +++++++++++----------- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/platforms/powernv/opal-dump.c | 52 +++++++++++----- + arch/powerpc/platforms/powernv/opal-elog.c | 11 +++- + .../powerpc/alignment/alignment_handler.c | 8 ++- + 6 files changed, 90 insertions(+), 60 deletions(-) +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 (618355cc6a0d nfc: remove unneeded break) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.rst | 4 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 1 - + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 1 - + drivers/net/ethernet/faraday/ftgmac100.c | 5 ++ + drivers/net/ethernet/faraday/ftgmac100.h | 8 +++ + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 23 +++++---- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 - + drivers/net/ethernet/korina.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 8 +-- + drivers/net/pcs/Kconfig | 3 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/wan/lmc/lmc_proto.c | 4 -- + drivers/nfc/st21nfca/core.c | 1 - + drivers/nfc/trf7970a.c | 1 - + net/core/dev.c | 2 +- + net/dsa/tag_ksz.c | 2 + + net/ipv4/icmp.c | 7 ++- + net/ipv4/nexthop.c | 2 +- + net/openvswitch/flow_table.c | 58 +++++++++++++--------- + net/openvswitch/flow_table.h | 8 ++- + net/tipc/bcast.c | 10 +++- + tools/testing/selftests/net/config | 1 + + .../selftests/net/forwarding/vxlan_asymmetric.sh | 10 ++++ + .../selftests/net/forwarding/vxlan_symmetric.sh | 10 ++++ + tools/testing/selftests/net/rtnetlink.sh | 5 ++ + 26 files changed, 123 insertions(+), 60 deletions(-) +Merging bpf/master (8568c3cefd51 bpf: selftest: Ensure the return value of the bpf_per_cpu_ptr() must be checked) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/syscall.c | 1 - + kernel/bpf/verifier.c | 11 ++--- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 57 +++++++++++++++------- + .../bpf/progs/test_ksyms_btf_null_check.c | 31 ++++++++++++ + tools/testing/selftests/bpf/verifier/sock.c | 25 ++++++++++ + 5 files changed, 100 insertions(+), 25 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_btf_null_check.c +Merging ipsec/master (7fe94612dd4c xfrm: interface: fix the priorities for ipip and ipv6 tunnels) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_interface.c +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 (31cc578ae2de netfilter: nftables_offload: KASAN slab-out-of-bounds Read in nft_flow_rule_create) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + Documentation/networking/nf_flowtable.rst | 2 +- + include/net/netfilter/nf_tables.h | 6 ++++++ + net/bridge/netfilter/ebt_dnat.c | 2 +- + net/bridge/netfilter/ebt_redirect.c | 2 +- + net/bridge/netfilter/ebt_snat.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 ++++++---- + net/netfilter/nf_conntrack_proto_tcp.c | 19 +++++++++++++------ + net/netfilter/nf_tables_api.c | 6 +++--- + net/netfilter/nf_tables_offload.c | 4 ++-- + 10 files changed, 35 insertions(+), 19 deletions(-) +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 +Already up to date. +Merging mac80211/master (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (7da4c510abff ALSA: usb-audio: Line6 Pod Go interface requires static clock rate quirk) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_ca0132.c | 18 ++++++++++++------ + sound/sparc/dbri.c | 2 +- + sound/usb/format.c | 1 + + 3 files changed, 14 insertions(+), 7 deletions(-) +Merging sound-asoc-fixes/for-linus (8101e3024d76 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 ++++++ + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++---- + 7 files changed, 76 insertions(+), 39 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 (b7c11f48ff81 Merge remote-tracking branch 'regulator/for-5.10' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +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 (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 +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/cdns3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/cdns3/gadget.c +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 0c9c4d4cec03] Merge remote-tracking branch 'usb-gadget-fixes/fixes' into master +$ git diff -M --stat --summary HEAD^.. +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 (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (bbf5c979011a Linux 5.9) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (bb0bc0cfeabc Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +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 +Merge made by the 'recursive' strategy. + .../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 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 (9c785122ab64 Merge branch 'misc-5.10' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 1 + + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/inode.c | 8 +++++++- + fs/btrfs/sysfs.c | 10 ++++++++++ + 4 files changed, 19 insertions(+), 2 deletions(-) +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 (b3e1ea16fb39 mmc: sdhci: Use Auto CMD Auto Select only when v4_mode is true) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +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 (2c3bd2a5c86f hv_balloon: disable warning when floor reached) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/hv_balloon.c +Merge made by the 'recursive' strategy. + drivers/hv/hv_balloon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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/user_namespace.c +Auto-merging kernel/sys.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/pid.c +Auto-merging kernel/cgroup/cgroup.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 (3e4fb4346c78 Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge spdx/spdx-linus +Already up to date. +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 +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +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 +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +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 kernel/params.c +Auto-merging include/linux/fs.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc_qos.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 (6f8360f87334 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.ubsan +Auto-merging scripts/Makefile.kcsan +Auto-merging lib/Kconfig.debug +Auto-merging kernel/Makefile +Auto-merging include/asm-generic/Kbuild +Auto-merging arch/s390/kernel/vdso64/Makefile +Auto-merging arch/riscv/Makefile +Auto-merging arch/powerpc/Makefile +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 a7992101a5f8] Merge remote-tracking branch 'kbuild/for-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/process/submit-checklist.rst | 3 +- + MAINTAINERS | 1 + + Makefile | 94 ++-- + 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 | 5 +- + 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 | 4 +- + arch/um/include/asm/Kbuild | 1 + + arch/x86/entry/vdso/Makefile | 4 +- + include/asm-generic/Kbuild | 1 + + include/asm-generic/module.lds.h | 10 + + kernel/Makefile | 3 - + lib/Kconfig.debug | 10 +- + scripts/.gitignore | 1 + + scripts/Kbuild.include | 2 - + scripts/Makefile | 3 + + scripts/Makefile.build | 2 +- + 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 | 19 +- + scripts/package/mkdebian | 44 +- + scripts/setlocalversion | 21 +- + tools/testing/selftests/bpf/Makefile | 2 +- + 52 files changed, 681 insertions(+), 1026 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 (0eb3b4ab762d ARM/sa1111: add a missing include of dma-map-ops.h) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/arm/common/sa1111.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Already up to date. +Merging arm64/for-next/core (3b92fa7485eb arm64: link with -z norelro regardless of CONFIG_RELOCATABLE) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 4 ++-- + arch/arm64/include/asm/memory.h | 5 ++--- + arch/arm64/include/asm/pgtable.h | 4 ++-- + arch/arm64/kernel/fpsimd.c | 4 ++-- + arch/arm64/kernel/pointer_auth.c | 4 ++++ + arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +- + arch/arm64/mm/init.c | 30 ++++++++++-------------------- + 8 files changed, 24 insertions(+), 30 deletions(-) +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 include/linux/qcom-geni-se.h +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c +Auto-merging drivers/tty/serial/Kconfig +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/reset/Kconfig +Auto-merging drivers/pwm/Kconfig +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/firmware/Kconfig +Auto-merging drivers/dma/ti/k3-udma-glue.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 +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 +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/mach-davinci/board-dm646x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/include/debug/brcmstb.S +Auto-merging arch/arm/boot/dts/sam9x60.dtsi +Auto-merging arch/arm/boot/dts/r8a7742.dtsi +Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts +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 +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml +Removing Documentation/devicetree/bindings/arm/ti/k3.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 +Auto-merging Documentation/devicetree/bindings/arm/actions.yaml +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.yaml' using previous resolution. +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 a049afa0dfe3] 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 + + .../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/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 | 31 +- + 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/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 - + 1229 files changed, 34931 insertions(+), 26115 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/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/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 (7c1ae3208ef2 Merge tag 'scmi-fixes-5.10' 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 772f9fef10df] 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 (5f56888fad46 Merge branches 'clk-ingenic', 'clk-at91', 'clk-kconfig', 'clk-imx', 'clk-qcom', 'clk-prima2' and 'clk-bcm' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/tegra/clk-tegra210-emc.c +Auto-merging drivers/clk/samsung/clk-exynos4.c +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/imx/clk-imx8mq.c | 4 +- + 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/gdsc.c | 8 + + 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 + + 104 files changed, 5122 insertions(+), 459 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 +Already up to date. +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 +Already up to date. +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 (bbf5c979011a Linux 5.9) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (ffd0b25ca049 Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed") +$ git merge powerpc/next +Already up to date. +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 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/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/s390/Kconfig' using previous resolution. +Resolved 'arch/x86/lib/getuser.S' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 74a1ff7dfa72] 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 | 1 + + arch/riscv/include/asm/thread_info.h | 6 -- + arch/riscv/include/asm/uaccess.h | 177 ++++++++++++++++---------------- + arch/riscv/kernel/process.c | 1 - + arch/riscv/lib/Makefile | 2 +- + 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/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 - + 57 files changed, 509 insertions(+), 629 deletions(-) +Merging s390/for-next (ddadd80dc943 Merge branch 'features' into for-next) +$ git merge s390/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Already up to date. +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 (c4795f038f2e Merge branch 'for-next-current-v5.9-20201015' into for-next-20201015) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (3ece60e3e78e cifs: make const array static, makes object smaller) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_unicode.c | 8 ++++- + fs/cifs/cifsacl.c | 5 +-- + fs/cifs/cifsfs.c | 8 +++++ + fs/cifs/cifsglob.h | 4 +++ + fs/cifs/cifsproto.h | 2 ++ + fs/cifs/connect.c | 15 ++++++++- + fs/cifs/inode.c | 13 ++++--- + fs/cifs/readdir.c | 35 +++++++++---------- + fs/cifs/smb2glob.h | 1 + + fs/cifs/smb2inode.c | 11 +++--- + fs/cifs/smb2maperror.c | 4 +-- + fs/cifs/smb2ops.c | 64 ++++++++++++++++++++++++++--------- + fs/cifs/smb2pdu.c | 53 ++++++++++++++++++++++++----- + fs/cifs/smb2pdu.h | 90 +++++++++++++++++++++++++++++++++++++++++++------ + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 8 +++-- + fs/cifs/trace.h | 18 ++++++---- + fs/cifs/transport.c | 5 +-- + 18 files changed, 267 insertions(+), 80 deletions(-) +Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() over bare printk(KERN_ERR) +$ git merge configfs/for-next +Already up to date. +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (8d8282d4a358 ext4: add fast commit stats in procfs) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ialloc.c +CONFLICT (content): Merge conflict in fs/ext4/ialloc.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/dir.c +Recorded preimage for 'fs/ext4/ialloc.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/ext4/ialloc.c'. +[master 0626e032302b] Merge remote-tracking branch 'ext4/dev' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext4/journal.rst | 66 + + Documentation/filesystems/journalling.rst | 33 + + fs/ext4/Makefile | 2 +- + fs/ext4/acl.c | 2 + + fs/ext4/balloc.c | 14 +- + fs/ext4/block_validity.c | 10 +- + fs/ext4/dir.c | 4 +- + fs/ext4/ext4.h | 133 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/extents.c | 315 +++- + fs/ext4/extents_status.c | 24 + + fs/ext4/fast_commit.c | 2128 ++++++++++++++++++++++++++++ + fs/ext4/fast_commit.h | 159 +++ + fs/ext4/file.c | 12 +- + fs/ext4/fsmap.c | 11 +- + fs/ext4/fsync.c | 4 +- + fs/ext4/ialloc.c | 173 ++- + fs/ext4/indirect.c | 13 +- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 268 +++- + fs/ext4/ioctl.c | 22 +- + fs/ext4/mballoc.c | 257 +++- + fs/ext4/mmp.c | 10 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 206 ++- + fs/ext4/resize.c | 14 +- + fs/ext4/super.c | 352 ++++- + fs/ext4/sysfs.c | 2 + + fs/ext4/xattr.c | 3 + + fs/jbd2/commit.c | 106 +- + fs/jbd2/journal.c | 245 +++- + fs/jbd2/recovery.c | 135 +- + fs/ocfs2/journal.c | 4 + + include/linux/jbd2.h | 124 +- + include/trace/events/ext4.h | 228 ++- + 35 files changed, 4697 insertions(+), 388 deletions(-) + create mode 100644 fs/ext4/fast_commit.c + create mode 100644 fs/ext4/fast_commit.h +Merging f2fs/dev (071a0578b0ce Merge tag 'ovl-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs) +$ git merge f2fs/dev +Already up to date. +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 +Already up to date. +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 (8c39076c276b NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag) +$ git merge nfs-anna/linux-next +Auto-merging include/trace/events/rpcrdma.h +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/nfs4idmap.c | 15 +- + fs/nfs/nfs4proc.c | 272 +++++++++++++++++++++++------------ + fs/nfs/nfs4trace.h | 1 + + fs/nfs/nfs4xdr.c | 7 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 2 +- + fs/nfs/sysfs.c | 11 +- + fs/nfs/sysfs.h | 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 ++++++++++++++++++++++++++++++++----- + include/uapi/linux/nfs4.h | 3 + + 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 +- + 36 files changed, 989 insertions(+), 502 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 (be4df0cea08a ovl: use generic vfs_ioc_setflags_prepare() helper) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) +$ git merge ubifs/next +Already up to date. +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 (894645546bb1 xfs: fix Kconfig asking about XFS_SUPPORT_V4 when XFS_FS=n) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) +$ git merge zonefs/for-next +Already up to date. +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 (407e9c63ee57 vfs: move the generic write and copy checks out of mm) +$ git merge djw-vfs/vfs-for-next +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Auto-merging fs/Makefile +CONFLICT (content): Merge conflict in fs/Makefile +Resolved 'fs/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 234b9b9c3eae] Merge remote-tracking branch 'djw-vfs/vfs-for-next' into master +$ git diff -M --stat --summary HEAD^.. + fs/Makefile | 2 +- + fs/read_write.c | 544 ++++++++++---------------------------------------- + fs/remap_range.c | 571 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 8 +- + mm/filemap.c | 222 --------------------- + 5 files changed, 681 insertions(+), 666 deletions(-) + create mode 100644 fs/remap_range.c +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 (bcc4e60be0f8 Merge branch 'work.set_fs' 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/romfs/super.c +Auto-merging fs/read_write.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/read_write.c | 10 +- + 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 + 56 files changed, 319 insertions(+), 254 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 (26911e6b1302 Merge branch 'for-5.10-fixup' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (065c21a8f8a4 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/pcie-brcmstb.c +CONFLICT (content): Merge conflict in drivers/pci/controller/pcie-brcmstb.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 +Auto-merging Documentation/devicetree/bindings/pci/rcar-pci-ep.yaml +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/pcie-brcmstb.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 8e2ce017b89e] 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 | 362 +++++++---------- + 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-v3-semi.c | 1 - + 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/aspm.c | 294 +++++++------- + drivers/pci/pcie/bw_notification.c | 3 + + drivers/pci/pcie/dpc.c | 7 +- + drivers/pci/probe.c | 17 +- + 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 | 8 +- + include/uapi/linux/pci_regs.h | 6 +- + 85 files changed, 2591 insertions(+), 1789 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 604947690345] 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. +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 +Already up to date. +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 (f4a45be35c34 PM / devfreq: remove a duplicated kernel-doc markup) +$ git merge v4l-dvb-next/master +Auto-merging include/drm/drm_edid.h +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/drm_prime.c +Auto-merging Documentation/gpu/amdgpu.rst +Merge made by the 'recursive' strategy. + Documentation/gpu/amdgpu.rst | 7 ------- + drivers/gpu/drm/drm_prime.c | 1 + + include/drm/drm_dp_helper.h | 2 +- + include/drm/drm_edid.h | 7 ------- + 4 files changed, 2 insertions(+), 15 deletions(-) +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 (bca751af60f1 Merge branches 'powercap' and 'pm-domains' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/soc/ti/Makefile +CONFLICT (content): Merge conflict in drivers/soc/ti/Makefile +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/soc/ti/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/soc/ti/Makefile'. +[master 7ca1160b5393] Merge remote-tracking branch 'pm/linux-next' into master +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 12 +- + arch/arm/plat-omap/Kconfig | 2 +- + drivers/acpi/acpi_dbg.c | 3 + + drivers/acpi/acpi_processor.c | 1 - + drivers/acpi/acpica/hwgpe.c | 4 +- + drivers/acpi/dptf/Kconfig | 29 +++- + drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- + drivers/acpi/dptf/dptf_power.c | 2 +- + drivers/acpi/reboot.c | 11 ++ + drivers/base/power/domain.c | 167 +++++++++++++++++++-- + drivers/cpufreq/acpi-cpufreq.c | 3 +- + drivers/cpufreq/cpufreq.c | 15 +- + drivers/cpufreq/intel_pstate.c | 22 ++- + drivers/idle/intel_idle.c | 15 +- + drivers/power/avs/Kconfig | 20 --- + drivers/power/avs/Makefile | 2 - + drivers/powercap/Kconfig | 2 +- + drivers/powercap/intel_rapl_common.c | 82 ++-------- + drivers/powercap/intel_rapl_msr.c | 5 +- + drivers/soc/rockchip/Kconfig | 8 + + drivers/soc/rockchip/Makefile | 1 + + .../rockchip/io-domain.c} | 0 + drivers/soc/ti/Makefile | 1 + + drivers/{power/avs => soc/ti}/smartreflex.c | 0 + include/linux/cpuidle.h | 5 - + include/linux/intel_rapl.h | 7 +- + include/linux/pm_domain.h | 24 +++ + kernel/sched/cpufreq_schedutil.c | 5 +- + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + 30 files changed, 304 insertions(+), 150 deletions(-) + rename drivers/{power/avs/rockchip-io-domain.c => soc/rockchip/io-domain.c} (100%) + rename drivers/{power/avs => soc/ti}/smartreflex.c (100%) +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 +Already up to date. +Merging devfreq/devfreq-next (953327265ee4 PM / devfreq: Add tracepoint for frequency changes) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 37 ++++++++++++++++++++++++++------- + drivers/devfreq/governor.h | 1 + + drivers/devfreq/governor_passive.c | 42 +++++++++----------------------------- + include/trace/events/devfreq.h | 30 ++++++++++++++++++++++++++- + 4 files changed, 70 insertions(+), 40 deletions(-) +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 +Already up to date. +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 (c7a198c70076 RDMA/ucma: Fix use after free in destroy id flow) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-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 (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-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 (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (3288b677fbb5 gfs2: Recover statfs info in journal head) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 68 ++++++++-------- + fs/gfs2/bmap.c | 62 ++++++++++----- + fs/gfs2/bmap.h | 1 + + fs/gfs2/glock.c | 52 +++++------- + fs/gfs2/glops.c | 36 +++++---- + fs/gfs2/incore.h | 29 ++++--- + fs/gfs2/log.c | 89 ++++++++++++--------- + fs/gfs2/log.h | 2 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/lops.h | 1 + + fs/gfs2/meta_io.c | 81 +++++++++++++++++-- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 173 ++++++++++++++++++++++++++-------------- + fs/gfs2/recovery.c | 108 +++++++++++++++++++++++++ + fs/gfs2/rgrp.c | 19 ++--- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 220 +++++++++++++++++++++++++++++++++++---------------- + fs/gfs2/super.h | 5 ++ + fs/gfs2/sys.c | 5 +- + fs/gfs2/trace_gfs2.h | 7 +- + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 10 +++ + 22 files changed, 675 insertions(+), 301 deletions(-) +Merging mtd/mtd/next (6402f4ce9581 mtd: hyperbus: Fix build failure when only RPCIF_HYPERBUS is enabled) +$ git merge mtd/mtd/next +Already up to date. +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 (40b99050455b Merge tag 'drm-intel-next-fixes-2020-10-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +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 +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.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/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.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 +Resolved 'drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1805eac15db5] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + 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 | 18 +- + 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 | 218 +- + 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, 280766 insertions(+), 1005 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 (4a9bb58aba6d drm/i915/gt: Wait for CSB entries on Tigerlake) +$ 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_display.c | 8 +++ + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 31 ++++++++---- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 10 +++- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 58 ++++++++++++++-------- + drivers/gpu/drm/i915/gt/intel_mocs.c | 16 ++++-- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- + 7 files changed, 86 insertions(+), 42 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 (272d70895113 Fonts: Support FONT_EXTRA_WORDS macros for font_6x8) +$ git merge drm-misc/for-linux-next +Auto-merging Documentation/fb/fbcon.rst +Merge made by the 'recursive' strategy. + Documentation/fb/fbcon.rst | 2 +- + lib/fonts/font_6x8.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +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 (7da4c510abff ALSA: usb-audio: Line6 Pod Go interface requires static clock rate quirk) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (8101e3024d76 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 +Already up to date. +Merging block/for-next (268d95ae6fd1 Merge branch 'io_uring-5.10' into for-next) +$ git merge block/for-next +Auto-merging mm/filemap.c +Auto-merging lib/scatterlist.c +Auto-merging kernel/entry/common.c +Auto-merging fs/namespace.c +Auto-merging fs/io_uring.c +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging arch/powerpc/kernel/signal.c +Auto-merging arch/m68k/kernel/signal.c +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.rst | 8 + + arch/alpha/kernel/signal.c | 1 - + arch/arc/kernel/signal.c | 2 +- + arch/arm/kernel/signal.c | 1 - + arch/arm64/kernel/signal.c | 1 - + arch/c6x/kernel/signal.c | 4 +- + arch/csky/kernel/signal.c | 1 - + arch/h8300/kernel/signal.c | 4 +- + arch/hexagon/kernel/process.c | 1 - + arch/ia64/kernel/process.c | 2 +- + arch/m68k/kernel/signal.c | 2 +- + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/kernel/signal.c | 1 - + arch/nds32/kernel/signal.c | 4 +- + arch/nios2/kernel/signal.c | 2 +- + arch/openrisc/kernel/signal.c | 1 - + arch/parisc/kernel/signal.c | 4 +- + arch/powerpc/kernel/signal.c | 1 - + arch/riscv/kernel/signal.c | 4 +- + arch/s390/kernel/signal.c | 1 - + arch/sh/kernel/signal_32.c | 4 +- + arch/sparc/kernel/signal_32.c | 4 +- + arch/sparc/kernel/signal_64.c | 4 +- + arch/um/kernel/process.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- + arch/xtensa/kernel/signal.c | 2 +- + block/blk-core.c | 4 + + block/blk-mq-cpumap.c | 2 +- + block/blk-mq.c | 2 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/android/binder.c | 2 +- + drivers/ata/sata_rcar.c | 2 +- + drivers/block/nbd.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 19 +- + drivers/block/skd_main.c | 1 - + drivers/block/zram/zram_drv.c | 8 +- + drivers/lightnvm/core.c | 5 +- + drivers/nvme/host/core.c | 4 + + drivers/scsi/scsi_lib.c | 9 + + fs/file_table.c | 2 +- + fs/io-wq.c | 57 ++- + fs/io-wq.h | 19 +- + fs/io_uring.c | 748 +++++++++++++++++++-------------- + fs/namespace.c | 2 +- + fs/proc/base.c | 4 + + include/linux/blk_types.h | 18 + + include/linux/io_uring.h | 27 +- + include/linux/iocontext.h | 6 - + include/linux/task_work.h | 11 +- + include/linux/tracehook.h | 4 +- + kernel/entry/common.c | 1 - + kernel/entry/kvm.c | 4 +- + kernel/events/uprobes.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/task_work.c | 30 +- + lib/scatterlist.c | 2 +- + mm/filemap.c | 8 + + mm/readahead.c | 20 +- + security/keys/keyctl.c | 2 +- + security/yama/yama_lsm.c | 2 +- + 62 files changed, 650 insertions(+), 452 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 +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (3e4fb4346c78 Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ 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 +Already up to date. +Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (b7c11f48ff81 Merge remote-tracking branch 'regulator/for-5.10' into regulator-linus) +$ 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 +Already up to date. +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 +Auto-merging kernel/sys.c +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 (d3b03163a328 tpm_tis: Disable interrupts on ThinkPad T490s) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm_tis.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) +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 +Already up to date. +Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback) +$ git merge mailbox/mailbox-for-next +Already up to date. +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 (c8cd075be67b Merge branch 'core/rcu') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/fork.c +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 arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 70 +++++ + Documentation/admin-guide/kernel-parameters.txt | 17 ++ + Documentation/userspace-api/spec_ctrl.rst | 8 + + 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/entry/syscalls/syscall_64.tbl | 10 +- + 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/kexec-bzimage64.c | 3 +- + arch/x86/kernel/smpboot.c | 11 +- + arch/x86/kernel/unwind_orc.c | 9 +- + 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 +- + drivers/video/fbdev/hyperv_fb.c | 9 +- + 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/sched.h | 4 + + include/linux/seqlock.h | 2 +- + include/linux/uaccess.h | 6 +- + include/uapi/linux/prctl.h | 1 + + kernel/Kconfig.preempt | 4 - + kernel/fork.c | 4 + + kernel/kprobes.c | 286 +++++++-------------- + kernel/rcu/tree.c | 79 ++---- + kernel/sched/core.c | 8 +- + kernel/sched/sched.h | 15 +- + kernel/trace/trace_kprobe.c | 3 +- + lib/Kconfig.debug | 3 - + scripts/atomic/gen-atomic-fallback.sh | 63 ++++- + scripts/atomic/gen-atomic-instrumented.sh | 29 ++- + .../selftests/rcutorture/configs/rcu/SRCU-t | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 1 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 - + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 5 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + .../rcutorture/formal/srcu-cbmc/src/config.h | 1 - + 55 files changed, 982 insertions(+), 508 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 +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 (d26dd4131d0d irqchip/mips: Drop selection of IRQ_DOMAIN_HIERARCHY) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 3 +-- + drivers/irqchip/irq-mst-intc.c | 4 ++-- + kernel/irq/Kconfig | 1 + + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging ftrace/for-next (ce66f6136460 tracing: Remove __init from __trace_early_add_new_event()) +$ git merge ftrace/for-next +Already up to date. +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 (5f7f77400ab5 xen/events: block rogue events for some time) +$ 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 +Auto-merging drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +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 (3e4fb4346c78 Merge tag 'spdx-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge usb/usb-next +Already up to date. +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 (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (736696906a3c dt-bindings: extcon: add binding for TUSB320) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-tusb320.yaml | 41 +++++ + drivers/extcon/Kconfig | 8 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-usbc-tusb320.c | 184 +++++++++++++++++++++ + 4 files changed, 234 insertions(+) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml + create mode 100644 drivers/extcon/extcon-usbc-tusb320.c +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 (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages) +$ git merge vfio/next +Auto-merging include/linux/pci.h +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/vfio/pci/vfio_pci.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 0be4e717510b] 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_intrs.c | 4 +- + 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 | 23 +- + include/linux/pci.h | 1 + + include/uapi/linux/vfio.h | 29 +- + include/uapi/linux/vfio_zdev.h | 78 ++++ + 24 files changed, 1330 insertions(+), 20 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 (270315b8235e Merge tag 'riscv-for-linus-5.10-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge staging/staging-next +Already up to date. +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 (599809540f17 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 +Already up to date. +Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (9dcbbd959cef Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sym53c8xx_2/sym_hipd.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/qla4xxx/ql4_nx.c +Auto-merging drivers/scsi/qla2xxx/qla_nx2.c +Auto-merging drivers/scsi/qla2xxx/qla_nvme.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_dfs.c +Auto-merging drivers/scsi/myrb.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/53c700.c +Merge made by the 'recursive' strategy. + drivers/scsi/53c700.c | 4 - + drivers/scsi/arcmsr/arcmsr.h | 102 ++++++++- + drivers/scsi/arcmsr/arcmsr_hba.c | 377 ++++++++++++++++++++++++++-------- + drivers/scsi/bfa/bfad.c | 1 + + drivers/scsi/dc395x.c | 25 +-- + drivers/scsi/fcoe/fcoe_sysfs.c | 8 +- + drivers/scsi/fnic/vnic_wq_copy.c | 8 +- + drivers/scsi/gdth.c | 151 +++++++------- + drivers/scsi/initio.c | 14 +- + drivers/scsi/isci/remote_node_table.h | 2 +- + drivers/scsi/myrb.c | 5 +- + 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/qla2xxx/qla_dfs.c | 68 +----- + drivers/scsi/qla2xxx/qla_isr.c | 42 ++-- + drivers/scsi/qla2xxx/qla_nvme.c | 8 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/scsi_lib.c | 108 ++++------ + drivers/scsi/sd.c | 27 +-- + drivers/scsi/snic/vnic_cq.c | 8 +- + drivers/scsi/sr.c | 17 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/ufshcd.h | 1 - + drivers/target/target_core_rd.c | 2 +- + include/scsi/scsi_cmnd.h | 3 +- + 30 files changed, 818 insertions(+), 585 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 (a689837cb172 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 | 199 ++- + 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, 2183 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 +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 +Already up to date! +Merge made by the 'recursive' strategy. +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 +Already up to date. +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (f4cb5e9daedf coresight: etm4x: Skip setting LPOVERRIDE bit for qcom,skip-power-up) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (35331b506f6c rtc: r9701: set range) +$ git merge rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/rtc/rtc.yaml +Merge made by the 'recursive' strategy. + .../bindings/rtc/microcrystal,rv3032.yaml | 64 ++ + .../devicetree/bindings/rtc/rtc-ds1307.txt | 9 +- + Documentation/devicetree/bindings/rtc/rtc.yaml | 16 + + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + 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-mt6397.c | 3 +- + drivers/rtc/rtc-pcf2127.c | 4 +- + drivers/rtc/rtc-r9701.c | 43 +- + drivers/rtc/rtc-rs5c313.c | 34 +- + drivers/rtc/rtc-rv3028.c | 213 +++-- + drivers/rtc/rtc-rv3032.c | 925 +++++++++++++++++++++ + 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 +- + include/linux/mfd/mt6397/rtc.h | 1 - + 21 files changed, 1403 insertions(+), 368 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/microcrystal,rv3032.yaml + create mode 100644 drivers/rtc/rtc-rv3032.c +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 +Auto-merging mm/workingset.c +Auto-merging lib/xarray.c +Auto-merging lib/test_xarray.c +Auto-merging lib/radix-tree.c +Auto-merging lib/idr.c +Auto-merging include/linux/xarray.h +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 +Already up to date. +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 +Already up to date. +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 (294a7f1613ee lib: kunit: Fix compilation test when using TEST_BIT_FIELD_COMPILE) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +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 +CONFLICT (content): Merge conflict in 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 +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/watch_queue.rst +Recorded preimage for 'arch/alpha/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/arm/tools/syscall.tbl' +Recorded preimage for 'arch/arm64/include/asm/unistd32.h' +Recorded preimage for 'arch/ia64/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/m68k/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/microblaze/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/mips/kernel/syscalls/syscall_n32.tbl' +Recorded preimage for 'arch/mips/kernel/syscalls/syscall_n64.tbl' +Recorded preimage for 'arch/mips/kernel/syscalls/syscall_o32.tbl' +Recorded preimage for 'arch/parisc/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/powerpc/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/s390/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/sh/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/sparc/kernel/syscalls/syscall.tbl' +Recorded preimage for 'arch/x86/entry/syscalls/syscall_32.tbl' +Recorded preimage for 'arch/x86/entry/syscalls/syscall_64.tbl' +Recorded preimage for 'arch/xtensa/kernel/syscalls/syscall.tbl' +Recorded preimage for 'include/uapi/asm-generic/unistd.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/alpha/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/arm/tools/syscall.tbl'. +Recorded resolution for 'arch/arm64/include/asm/unistd32.h'. +Recorded resolution for 'arch/ia64/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/m68k/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/microblaze/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/mips/kernel/syscalls/syscall_n32.tbl'. +Recorded resolution for 'arch/mips/kernel/syscalls/syscall_n64.tbl'. +Recorded resolution for 'arch/mips/kernel/syscalls/syscall_o32.tbl'. +Recorded resolution for 'arch/parisc/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/powerpc/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/s390/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/sh/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/sparc/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'arch/x86/entry/syscalls/syscall_32.tbl'. +Recorded resolution for 'arch/x86/entry/syscalls/syscall_64.tbl'. +Recorded resolution for 'arch/xtensa/kernel/syscalls/syscall.tbl'. +Recorded resolution for 'include/uapi/asm-generic/unistd.h'. +[master 5394c6318b32] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + 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 | 2 + + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 34 files changed, 409 insertions(+), 4 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 c6221be3d1a0] 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 (e3a9e6be957d aio: simplify read_events()) +$ git merge --no-ff akpm-current/current +Auto-merging mm/mmap.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging fs/buffer.c +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 112854fde735] Merge branch 'akpm-current/current' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/vm.rst | 4 +-- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + fs/aio.c | 9 ++---- + fs/buffer.c | 56 +++++++++++++++++++++++++++++++-- + fs/ocfs2/namei.c | 17 ++++++++-- + fs/proc/page.c | 40 ++++++++++++----------- + fs/ramfs/inode.c | 12 +++++++ + include/linux/memremap.h | 6 ++++ + include/linux/nmi.h | 1 + + include/linux/sched.h | 8 +++++ + include/linux/wait.h | 4 +-- + kernel/hung_task.c | 44 ++++++++++++++++++++++++++ + kernel/sysctl.c | 8 ++--- + kernel/watchdog.c | 21 +++++++++++++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 6 ++++ + mm/huge_memory.c | 2 ++ + mm/memremap.c | 20 ++++++++++++ + mm/mmap.c | 43 ++++++++++++++++--------- + mm/swap.c | 4 +-- + mm/swapfile.c | 5 +-- + mm/vmscan.c | 13 +++----- + mm/vmstat.c | 32 ++++++++++++------- + scripts/checkpatch.pl | 12 ++++--- + 25 files changed, 286 insertions(+), 84 deletions(-) +$ 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)
dropping e967937bf079d95eefa1e8ba81358294df6f226b ia64: fix build error with !COREDUMP -- patch contents already upstream +Rebasing (2/51)
error: could not apply d4a6a7ae85df... mm, memcg: rework remote charging API to support nesting +Resolve all conflicts manually, mark them as resolved with +"git add/rm <conflicted_files>", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply d4a6a7ae85df... mm, memcg: rework remote charging API to support nesting +Auto-merging mm/memcontrol.c +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + d82a990a57cc...b1d66dafef66 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (b1d66dafef66 selftests/vm: fix an improper dependency upon executable script permissions) +$ 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/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + fs/exec.c | 8 + + include/linux/mm_types.h | 10 ++ + include/linux/mmap_lock.h | 16 +- + mm/Kconfig | 21 ++- + mm/Makefile | 2 +- + mm/gup.c | 2 + + mm/{gup_benchmark.c => gup_test.c} | 109 ++++++++---- + mm/gup_test.h | 32 ++++ + 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 | 10 +- + .../selftests/vm/{run_vmtests => run_vmtests.sh} | 24 ++- + 19 files changed, 442 insertions(+), 213 deletions(-) + rename mm/{gup_benchmark.c => gup_test.c} (61%) + 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..efe119665fac --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201021 |