diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-26 11:58:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-26 11:58:06 +1100 |
| commit | 2ef991b5fdbe828dc8fb8af473dab160729570ed (patch) | |
| tree | 0642fc17bce4c75a84e9d0f5fdf5b4b650cf3c14 | |
| parent | 41a91bb39347c68e01a29d3217ca9598df6db385 (diff) | |
| download | linux-next-next-20201026.tar.gz | |
Add linux-next specific files for 20201026next-20201026
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 | 4466 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5129 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e0c159e1a0e5 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,330 @@ +Name SHA1 +---- ---- +origin 986b9eacb25910865b50e5f298aa8e2df7642f1b +fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +kbuild-current f11901ed723d1351843771c3a84b03a253bbf8b2 +arc-current 8c42a5c02bec6c7eccf08957be3c6c8fccf9790b +arm-current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arm64-fixes 39e4716caa598a07a98598b2e7cd03055ce25fb9 +arm-soc-fixes 6869f774b1cd2bf20b4e4c5bfa13da311e02d495 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes 7ff3a2a626f7161c94fb58a0058dbdaedaa9d166 +m68k-current 50c5feeea0af99a4401fd54fd72bec1333a496ca +powerpc-fixes 4ff753feab021242144818b9a3ba011238218145 +s390-fixes 549738f15da0e5a00275977623be199fbbf7df50 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 435ccfa894e35e3d4a1799e6ac030e48a7b69ef5 +bpf 18ded910b589839e38a51623a179837ab4cc3789 +ipsec 7fe94612dd4cfcd35fe0ec87745fb31ad2be71f8 +netfilter c77761c8a59405cb7aa44188b30fffe13fbdd02d +ipvs 48d072c4e8cdb542ade06727c31d7851bcc40a89 +wireless-drivers df41c19abbeaae6e24c8e31cff5fdb48632be380 +mac80211 9ff9b0d392ea08090cd1780fb196f36dbb586529 +rdma-fixes a1b8638ba1320e6684aa98233c15255eb803fac7 +sound-current 033e4040d453f1f7111e5957a54f3019eb089cc6 +sound-asoc-fixes 8099fe48df2c723e60b1e5ee842feb7f9f9f689b +regmap-fixes 549738f15da0e5a00275977623be199fbbf7df50 +regulator-fixes dc3afaa95f47a46bb0797649599cb9f79f3bc87e +spi-fixes 91cbcc28a2ee9be65b7cd074df93b597983c0181 +pci-current 76a6b0b90d532ed9bb9f6069aa12859c185e5b99 +driver-core.current d76913908102044f14381df865bb74df17a538cb +tty.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +usb-gadget-fixes 51609fba0cca69206a213171ce0cdf2dfc9cb21d +usb-serial-fixes 856deb866d16e29bd65952e0289066f6078af773 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 850280156f6421a404f2351bee07a0e7bedfd4c6 +staging.current d76913908102044f14381df865bb74df17a538cb +char-misc.current 270315b8235e3d10c2e360cff56c2f9e0915a252 +soundwire-fixes 3fbbf2148a406b3e350fe91e6fdd78eb42ecad24 +thunderbolt-fixes bbf5c979011a099af5dc76498918ed7df445635b +input-current bb0bc0cfeabc0d6865865e8d3a601bea6711f951 +crypto-current c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b +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 77377064c3a94911339f13ce113b3abf265e06da +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 01ffb99d0f849ecf8e38fde828a66dba64818052 +scsi-fixes bcf3a2953d36bbfb9bd44ccb3db0897d935cc485 +drm-fixes dded93ffbb8c4a578adf13b54cd62519908a23f8 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes bbf5c979011a099af5dc76498918ed7df445635b +mmc-fixes 0add6e9b88d0632a25323aaf4987dbacb0e4ae64 +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 f11901ed723d1351843771c3a84b03a253bbf8b2 +compiler-attributes bbf5c979011a099af5dc76498918ed7df445635b +dma-mapping 6857a5ebaabc5b9d989872700b4b71dd2a6d6453 +asm-generic 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +arc def9d2780727cec3313ed3522d0123158d87224d +arm adc5f7029376049873289be305d507022281b8dd +arm64 66dd3474702aa98d5844367e1577cdad78ef7c65 +arm-perf 887e2cff0f8dc4dac4c35e631b711325c6dd65b8 +arm-soc 4bb6c7b93462215bfd1f2acf15eaad3e95852350 +amlogic ef751721ccde569a8a8ee1ccced2a183f928d670 +aspeed 48127d01a153e6121cbe17379dec36fb0615a4a4 +at91 d1f170f8447df1fed9c6c8ce9789724ee972c8bb +drivers-memory 94ca85733699e09c691e63c5bc2475f92f9dd52a +imx-mxs bc421f7da477103250ecab17d600055849edcf3d +keystone 703dff8cb900d84bf95bf046114f8eefc95e8943 +mediatek 6c7949eccdbd4e0716ad0035f844b956e04eb8b4 +mvebu f89c9685f6a1782c3e4c86aca636036009d22efd +omap 7a159a1ad494f85a655802dc423a684786a6d468 +qcom abea2a011c54c2724f7fcee64444ced7b9e51aa5 +raspberrypi 4564363351e2680e55edc23c7953aebd2acb4ab7 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 1ff27687ae7e65b4b29db46b5b84319977d9085e +reset 089a64570bde1fa8d7dff0e7e165d771ce3c4f36 +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 5484f9cbe94e30d3a86e70d738b60c41ec6a4d35 +powerpc ffd0b25ca049a477cb757e5bcf2d5e1664d12e5d +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl d97b957e32b1e7527a9b6652fa6e795f2861df7d +risc-v f69e1c7418b1034c5b2964adacfc72f4da8aa30c +s390 ddadd80dc9431179f251928b956bf65342b8a9e8 +sh b0cfc315ff38c423a5ce9ce159bd5baa4135e688 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f06885b3f3e3884f98351d7b72a4fc8400911cde +xtensa 4ca4c562efb67cd4e224ff560f4b1f2c86314906 +fscrypt 5b2a828b98ec1872799b1b4d82113c76a12d594f +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs c4795f038f2eb930a83c37e7ec5167be54993c63 +ceph 28e1581c3b4ea5f98530064a103c6217bedeea73 +cifs aef0388aa92c5583eeac401710e16db48be4c9ac +configfs 76ecfcb0852eb0390881a695a2f349b804d80147 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 915f4c9358db6f96f08934dd683ae297aaa0fb91 +exfat f9893351acaecf0a414baf9942b48d5bb5c688c6 +ext3 e44b86917b3fec1a26753135360ca326d6be1e22 +ext4 1322181170bb01bce3c228b82ae3d5c6b793164f +f2fs d76913908102044f14381df865bb74df17a538cb +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 42d3e2d041f08d1f8f078da005c936648ba77405 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 40a03b750bb3ded71a0f21a0b7dfbf3b24068dcb +nfs-anna 8c39076c276be0b31982e44654e2c2357473258a +nfsd 856deb866d16e29bd65952e0289066f6078af773 +cel 13a9a9d74d4d9689ad65938966dbc66386063648 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs be4df0cea08a8b59eb38d73de988b7ba8022df41 +ubifs e2a05cc7f8229e150243cdae40f2af9021d67a4a +v9fs 7ca1db21ef8e0e6725b4d25deed1ca196f7efb28 +xfs 2e76f188fd90d9ac29adbb82c30345f84d04bfa4 +zonefs 48bfd5c6fac10e10b7066bf4aeb919ed9a4e87d3 +iomap 1a31182edd0083bb9f26e582ed39f92f898c4d0a +djw-vfs 407e9c63ee571f44a2dfb0828fc30daa02abb6dc +file-locks 455dbb8345130bf9d8c996df0f87dd7ea672e735 +vfs bcc4e60be0f83ced77b3efe8999a590673332557 +printk 26911e6b1302714956e166d9aad95a429900349f +pci 28e34e751f6c50098d9bcecb30c97634b6126730 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid f5795950202d1da56468736e0eb35397d3b766c3 +i2c 48f2192f645ceaade37bf88279d5e0b332416407 +i3c abea14bfdebbe9bd02f2ad24a1f3a878ed21c8f0 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 9b20aec24b8ab2860ea41182ba554dfcc444c0c8 +jc_docs 62af696471e58bdfcf416fd56f032a60853c2bae +v4l-dvb c386e0797d26a32e354daf4480c5d40165db66a1 +v4l-dvb-next cafcadac71cb4fd022318e3824a3bb60d99ba915 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 54e1ca2a19234787050e494833aad6800f8ee645 +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 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +bpf-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +ipsec-next 61e7113e48d3ca1ea692b5c6376a4b545b312166 +mlx5-next 9d8feb460adb90e89e64101ce2c1cfcd548a6d83 +netfilter-next 3cb12d27ff655e57e8efe3486dca2a22f4e30578 +ipvs-next c2568c8c9e636a56abf31da4b28b65d3ded02524 +wireless-drivers-next df41c19abbeaae6e24c8e31cff5fdb48632be380 +bluetooth 44d59235ace59f8b493044d693174e60b571e2e1 +mac80211-next 9ff9b0d392ea08090cd1780fb196f36dbb586529 +gfs2 bedb0f056faa94e953e7b3da5a77d25e0008364b +mtd 6402f4ce95811db7df72244ca84860332e4c2518 +nand 88e315d12fbb50c0bd12549bb04a051a4b4bc744 +spi-nor 9a3422a110c868e511387a81df25a315eaa3a7b8 +crypto 3093e7c16e12d729c325adb3c53dde7308cefbd8 +drm b45b6fbc671c60f56fd119c443e5570f83175928 +amdgpu 02c3d98ce25b3e4f0b8e830be054c8f4f7f944c1 +drm-intel 5c6c13cd1102caf92d006a3cf4591c0229019daf +drm-tegra d9f980ebcd01d90a2a76ea2383c925abf9223cab +drm-misc 2580a493a97da4a302cb66251b558bfc04c16e68 +drm-msm d1ea914925856d397b0b3241428f20b945e31434 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm efd5a93d2a894a1efde45ed12c17cb32f1740812 +etnaviv 3136fed4f91e02ad754464bf1ec15e22b800cc69 +regmap 6e0545c4f08368e67496111778a726f9a2031f26 +sound 033e4040d453f1f7111e5957a54f3019eb089cc6 +sound-asoc 8099fe48df2c723e60b1e5ee842feb7f9f9f689b +modules fdf09ab887829cd1b671e45d9549f8ec1ffda0fa +input 8a30c6eb29e036f729b4dd6982462ca15d062087 +block 2120d12a2ad30f1c0f0fc108338d499a735504fc +device-mapper 681cc5e8667e8579a2da8fa4090c48a2d73fc3bb +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +mfd 6d81dc3c79d46b66b29712eb1ac5ad2cbe4231d2 +backlight 97ecfda1a8ffc5ffc9681d0dfa65fd5b39839dfe +battery 7007fab4ae82c092cb52691c338f1b776005e32b +regulator dc3afaa95f47a46bb0797649599cb9f79f3bc87e +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 91cbcc28a2ee9be65b7cd074df93b597983c0181 +tip 65609b26b21a169a05d1482db6c1b52d8a4abe0d +clockevents f087e452f27e6342f938b92b2254b077bf1d9145 +edac eea32b7fdcb57e070997e77c4b7c3cc02b379f93 +irqchip a7480c5d725c4ecfc627e70960f249c34f5d13e8 +ftrace e1981f75d398c0afe83c8ffa4e5864f037967409 +rcu a9863c90f5031a8fde56351f09fade3cec3ea4f0 +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 4e5dc64c43192b4fd4c96ac150a8f013065f5f5b +kvm-ppc cf59eb13e151ef42c37ae31864046c17e481ed8f +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 1a89c1dc9520b908e7894652ee2b19db9de37b64 +percpu eff623d602db1e9510220f7d14558c2358562307 +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 1a3f7813f38e400b0b63492b626b425f0a043d0b +chrome-platform 3e98fd6d816cd82f529345870efd435f06e02803 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 3e4fb4346c781068610d03c12b16c0cfb0fd24a3 +ipmi 9ff9b0d392ea08090cd1780fb196f36dbb586529 +driver-core d76913908102044f14381df865bb74df17a538cb +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 d76913908102044f14381df865bb74df17a538cb +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 599809540f173f572c32a35d712accdc14d6357c +dmaengine fc143e38ddd47d3b01ac276786ee78edf053bf5d +cgroup 65026da59cda16baf6c3e98b74ec439f366e468f +scsi 9dcbbd959cef85b74ec52d83bc0129244c519ae2 +scsi-mkp 1ef16a407f544408d3559e4de2ed05591df4da75 +vhost 70a62fce262854c4aabaa47e46e82fce9f3f3938 +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 fb11305101c217e1cba2e1b48326901e8e3c39d7 +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 5808c7567a27e009f92201369010a99a26ac23ea 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..edb8098fff93 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4466 @@ +$ date -R +Mon, 26 Oct 2020 08:02:39 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild +Merging origin/master (986b9eacb259 kernel/sys.c: fix prototype of prctl_get_tid_address()) +$ git merge origin/master +Updating f9893351acae..986b9eacb259 +Fast-forward + Documentation/ABI/testing/sysfs-driver-xen-blkback | 9 + + .../ABI/testing/sysfs-driver-xen-blkfront | 11 +- + Documentation/admin-guide/LSM/SafeSetID.rst | 29 +- + Documentation/admin-guide/cpu-load.rst | 63 +- + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/admin-guide/sysctl/vm.rst | 2 + + Documentation/arm64/hugetlbpage.rst | 2 + + Documentation/block/queue-sysfs.rst | 8 + + Documentation/core-api/dma-api.rst | 49 +- + 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 + + .../devicetree/bindings/input/adc-joystick.yaml | 121 + + .../bindings/input/touchscreen/zinitix.txt | 40 + + .../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/net/socionext-netsec.txt | 4 +- + .../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 | 10 + + Documentation/driver-api/index.rst | 1 - + Documentation/fault-injection/provoke-crashes.rst | 56 +- + Documentation/fb/fbcon.rst | 2 +- + Documentation/networking/ip-sysctl.rst | 4 +- + Documentation/networking/nf_flowtable.rst | 2 +- + Documentation/process/deprecated.rst | 44 +- + Documentation/process/submitting-patches.rst | 7 + + .../translations/zh_CN/arm64/hugetlbpage.rst | 45 + + Documentation/translations/zh_CN/arm64/index.rst | 1 + + Documentation/virt/kvm/api.rst | 216 +- + Documentation/virt/kvm/cpuid.rst | 88 +- + Documentation/virt/kvm/devices/vcpu.rst | 57 +- + Documentation/vm/mmu_notifier.rst | 2 +- + Documentation/vm/page_migration.rst | 2 +- + Documentation/vm/page_owner.rst | 2 +- + Documentation/vm/slub.rst | 2 +- + Documentation/x86/x86_64/mm.rst | 2 +- + MAINTAINERS | 84 +- + arch/alpha/kernel/signal.c | 1 - + arch/arc/kernel/perf_event.c | 27 +- + arch/arc/kernel/signal.c | 2 +- + arch/arm/Kconfig | 12 +- + arch/arm/Kconfig.debug | 29 +- + arch/arm/Makefile | 7 +- + 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/cros-ec-keyboard.dtsi | 1 + + 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/iwg20d-q7-common.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 | 14 +- + 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/common/sa1111.c | 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/kernel/signal.c | 1 - + 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/cpuidle44xx.c | 4 +- + 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-omap/Kconfig | 2 +- + arch/arm/plat-samsung/include/plat/samsung-time.h | 26 - + arch/arm/plat-samsung/watchdog-reset.c | 93 - + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 8 +- + arch/arm64/Makefile | 4 +- + 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 | 7 +- + 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 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + 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/sdm630.dtsi | 8 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 14 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 380 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 101 +- + 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 | 206 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 314 ++- + 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/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/memory.h | 5 +- + 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/pgtable.h | 4 +- + arch/arm64/include/asm/stage2_pgtable.h | 215 -- + arch/arm64/include/uapi/asm/kvm.h | 16 + + arch/arm64/kernel/fpsimd.c | 4 +- + arch/arm64/kernel/image-vars.h | 3 - + arch/arm64/kernel/pointer_auth.c | 4 + + arch/arm64/kernel/proton-pack.c | 40 +- + arch/arm64/kernel/signal.c | 1 - + arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +- + 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 +- + arch/arm64/mm/init.c | 30 +- + 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/boot/dts/brcm/bcm63268.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6362.dtsi | 6 + + arch/mips/include/asm/kvm_host.h | 4 +- + arch/mips/kernel/signal.c | 1 - + arch/mips/kvm/entry.c | 21 +- + arch/mips/kvm/mips.c | 3 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/kvm/vz.c | 2 +- + 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/parisc/kernel/sys_parisc.c | 73 +- + arch/parisc/kernel/syscalls/syscall.tbl | 12 +- + arch/parisc/kernel/time.c | 11 +- + arch/powerpc/include/asm/asm-const.h | 13 + + arch/powerpc/include/asm/cputable.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/include/asm/uaccess.h | 4 +- + arch/powerpc/kernel/cputable.c | 13 +- + arch/powerpc/kernel/eeh.c | 5 - + arch/powerpc/kernel/mce.c | 7 +- + arch/powerpc/kernel/signal.c | 1 - + arch/powerpc/kernel/smp.c | 70 +- + arch/powerpc/kernel/traps.c | 2 +- + 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 | 24 +- + 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 +- + arch/powerpc/platforms/powernv/opal-dump.c | 52 +- + arch/powerpc/platforms/powernv/opal-elog.c | 11 +- + arch/powerpc/platforms/pseries/ras.c | 118 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/thread_info.h | 6 - + arch/riscv/include/asm/uaccess.h | 177 +- + arch/riscv/kernel/process.c | 1 - + arch/riscv/kernel/signal.c | 4 +- + arch/riscv/lib/Makefile | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/signal.c | 1 - + arch/s390/mm/init.c | 11 + + 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/boot/compressed/head_64.S | 3 + + arch/x86/boot/compressed/ident_map_64.c | 27 +- + arch/x86/boot/compressed/kaslr.c | 8 - + arch/x86/boot/compressed/pgtable_64.c | 16 + + arch/x86/include/asm/kvm_host.h | 70 +- + arch/x86/include/asm/svm.h | 90 +- + arch/x86/include/asm/uaccess.h | 10 +- + arch/x86/include/asm/vmx.h | 2 +- + arch/x86/include/uapi/asm/kvm.h | 20 + + arch/x86/include/uapi/asm/svm.h | 2 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/cpuid.c | 137 +- + arch/x86/kvm/cpuid.h | 15 + + arch/x86/kvm/emulate.c | 22 +- + arch/x86/kvm/hyperv.c | 11 + + arch/x86/kvm/ioapic.c | 5 +- + arch/x86/kvm/kvm_cache_regs.h | 2 +- + arch/x86/kvm/lapic.c | 43 +- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.h | 5 - + arch/x86/kvm/mmu/mmu.c | 974 +++----- + arch/x86/kvm/mmu/mmu_internal.h | 88 +- + arch/x86/kvm/mmu/mmutrace.h | 21 +- + arch/x86/kvm/mmu/paging_tmpl.h | 50 +- + arch/x86/kvm/mmu/spte.c | 318 +++ + arch/x86/kvm/mmu/spte.h | 252 ++ + arch/x86/kvm/mmu/tdp_iter.c | 182 ++ + arch/x86/kvm/mmu/tdp_iter.h | 60 + + arch/x86/kvm/mmu/tdp_mmu.c | 1157 +++++++++ + arch/x86/kvm/mmu/tdp_mmu.h | 48 + + arch/x86/kvm/svm/avic.c | 7 +- + arch/x86/kvm/svm/nested.c | 351 +-- + arch/x86/kvm/svm/sev.c | 26 +- + arch/x86/kvm/svm/svm.c | 404 ++- + arch/x86/kvm/svm/svm.h | 103 +- + arch/x86/kvm/trace.h | 128 +- + arch/x86/kvm/vmx/capabilities.h | 10 +- + arch/x86/kvm/vmx/nested.c | 178 +- + arch/x86/kvm/vmx/posted_intr.c | 332 +++ + arch/x86/kvm/vmx/posted_intr.h | 99 + + arch/x86/kvm/vmx/vmcs.h | 7 + + arch/x86/kvm/vmx/vmenter.S | 34 + + arch/x86/kvm/vmx/vmx.c | 1259 ++++------ + arch/x86/kvm/vmx/vmx.h | 143 +- + arch/x86/kvm/vmx/{ops.h => vmx_ops.h} | 0 + arch/x86/kvm/x86.c | 694 +++++- + arch/x86/kvm/x86.h | 5 +- + arch/x86/mm/fault.c | 13 +- + arch/x86/xen/smp.c | 19 +- + arch/x86/xen/xen-ops.h | 2 + + arch/xtensa/kernel/signal.c | 2 +- + block/blk-core.c | 4 + + block/blk-mq-cpumap.c | 2 +- + block/blk-mq.c | 4 +- + drivers/acpi/acpi_dbg.c | 3 + + drivers/acpi/acpi_processor.c | 1 - + drivers/acpi/acpica/hwgpe.c | 4 +- + drivers/acpi/apei/ghes.c | 2 +- + 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/acpi/utils.c | 4 - + drivers/android/binder.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-eh.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/pata_ns87415.c | 3 +- + drivers/ata/sata_rcar.c | 2 +- + drivers/base/power/domain.c | 167 +- + drivers/base/power/main.c | 1 - + drivers/block/nbd.c | 2 +- + drivers/block/null_blk_zoned.c | 69 +- + drivers/block/rnbd/rnbd-clt.c | 19 +- + drivers/block/skd_main.c | 1 - + drivers/block/xen-blkback/xenbus.c | 22 +- + drivers/block/xen-blkfront.c | 20 +- + drivers/block/zram/zram_drv.c | 8 +- + drivers/bus/brcmstb_gisb.c | 100 +- + drivers/char/random.c | 1 - + 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/acpi-cpufreq.c | 3 +- + drivers/cpufreq/cpufreq.c | 15 +- + drivers/cpufreq/intel_pstate.c | 22 +- + 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/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 11 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 111 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 4 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 27 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 + + 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/gem/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 2 + + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 18 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 +- + 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/gt/selftest_reset.c | 196 ++ + drivers/gpu/drm/i915/i915_drv.h | 6 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- + drivers/gpu/drm/i915/intel_uncore.c | 27 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/hid/hid-rmi.c | 2 +- + drivers/hwmon/s3c-hwmon.c | 2 +- + drivers/i2c/i2c-core-acpi.c | 11 +- + drivers/idle/intel_idle.c | 15 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.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/cros_ec_keyb.c | 2 +- + 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/hil_mlc.c | 21 +- + drivers/input/serio/hp_sdc_mlc.c | 8 +- + 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/s3c2410_ts.c | 37 +- + drivers/input/touchscreen/stmfts.c | 2 +- + drivers/input/touchscreen/zinitix.c | 581 +++++ + drivers/irqchip/Makefile | 1 - + drivers/lightnvm/core.c | 5 +- + 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/net/dsa/bcm_sf2.c | 2 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 1 - + drivers/net/ethernet/chelsio/inline_crypto/Kconfig | 1 + + .../chelsio/inline_crypto/chtls/chtls_cm.c | 19 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 5 +- + 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/ibm/ibmvnic.c | 5 + + 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/mediatek/Kconfig | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 8 +- + drivers/net/ethernet/sfc/efx_common.c | 1 + + drivers/net/ethernet/sfc/rx_common.c | 1 - + drivers/net/ethernet/socionext/netsec.c | 24 +- + drivers/net/pcs/Kconfig | 3 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/virtio_net.c | 48 +- + drivers/net/wan/hdlc.c | 10 +- + drivers/net/wan/hdlc_raw_eth.c | 1 + + drivers/net/wan/lmc/lmc_proto.c | 4 - + drivers/nfc/st21nfca/core.c | 1 - + drivers/nfc/trf7970a.c | 1 - + 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 +- + drivers/nvme/host/core.c | 4 + + drivers/nvme/host/fc.c | 138 +- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 2 + + drivers/nvme/host/rdma.c | 6 +- + drivers/nvme/target/core.c | 3 +- + drivers/nvme/target/passthru.c | 18 +- + 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/platform/x86/thinkpad_acpi.c | 18 +- + drivers/power/Kconfig | 1 - + drivers/power/Makefile | 1 - + drivers/power/avs/Kconfig | 37 - + drivers/power/avs/Makefile | 4 - + drivers/power/supply/s3c_adc_battery.c | 2 +- + drivers/powercap/Kconfig | 2 +- + drivers/powercap/intel_rapl_common.c | 82 +- + drivers/powercap/intel_rapl_msr.c | 5 +- + drivers/pwm/Kconfig | 2 +- + drivers/pwm/pwm-cros-ec.c | 37 +- + 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/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 | 117 +- + 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/soc/actions/owl-sps-helper.c | 1 + + 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/Kconfig | 16 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 2 +- + drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} | 0 + drivers/soc/qcom/llcc-qcom.c | 7 +- + drivers/soc/qcom/pdr_internal.h | 2 +- + 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/rockchip/Kconfig | 8 + + drivers/soc/rockchip/Makefile | 1 + + .../rockchip/io-domain.c} | 0 + 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 | 2 + + 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/{power/avs => soc/ti}/smartreflex.c | 0 + drivers/soc/ti/ti_sci_pm_domains.c | 251 +- + drivers/soc/versatile/soc-integrator.c | 2 +- + drivers/soc/xilinx/zynqmp_power.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/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + drivers/target/target_core_rd.c | 2 +- + 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 + drivers/vdpa/mlx5/net/mlx5_vnet.c | 12 +- + drivers/vhost/vdpa.c | 9 +- + drivers/vhost/vhost.c | 5 +- + drivers/vhost/vhost.h | 2 +- + drivers/vhost/vringh.c | 9 +- + .../video/fbdev/s3c2410fb-regs-lcd.h | 28 +- + drivers/video/fbdev/s3c2410fb.c | 16 +- + drivers/virtio/Kconfig | 6 + + drivers/virtio/virtio.c | 15 + + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_input.c | 2 +- + drivers/virtio/virtio_mem.c | 2 +- + drivers/watchdog/Kconfig | 10 +- + drivers/xen/events/events_2l.c | 7 +- + drivers/xen/events/events_base.c | 94 +- + drivers/xen/events/events_fifo.c | 9 +- + drivers/xen/events/events_internal.h | 70 +- + fs/9p/vfs_super.c | 3 +- + fs/Makefile | 2 +- + 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/cifs/Makefile | 2 +- + fs/cifs/asn1.c | 16 +- + fs/cifs/cifs_unicode.c | 8 +- + fs/cifs/cifsacl.c | 5 +- + fs/cifs/cifsfs.c | 8 + + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 20 +- + fs/cifs/cifsproto.h | 2 + + fs/cifs/connect.c | 264 +- + fs/cifs/fs_context.c | 221 ++ + fs/cifs/fs_context.h | 58 + + fs/cifs/inode.c | 57 +- + fs/cifs/readdir.c | 60 +- + fs/cifs/smb2glob.h | 1 + + fs/cifs/smb2inode.c | 23 +- + fs/cifs/smb2maperror.c | 4 +- + fs/cifs/smb2ops.c | 213 +- + fs/cifs/smb2pdu.c | 53 +- + fs/cifs/smb2pdu.h | 121 +- + fs/cifs/smb2proto.h | 6 +- + fs/cifs/smb2transport.c | 8 +- + fs/cifs/smbfsctl.h | 2 + + fs/cifs/trace.h | 18 +- + fs/cifs/transport.c | 5 +- + 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/file_table.c | 2 +- + 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 + + fs/hfs/super.c | 3 +- + fs/hfsplus/super.c | 3 +- + fs/hpfs/super.c | 3 +- + fs/io-wq.c | 68 +- + fs/io-wq.h | 1 + + fs/io_uring.c | 186 +- + fs/isofs/inode.c | 3 +- + fs/minix/inode.c | 3 +- + fs/namei.c | 3 +- + fs/namespace.c | 4 +- + 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 | 544 +--- + fs/remap_range.c | 571 +++++ + fs/romfs/super.c | 3 +- + fs/splice.c | 63 +- + 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_bmap_util.c | 18 +- + fs/xfs/xfs_file.c | 40 +- + fs/xfs/xfs_linux.h | 6 + + fs/xfs/xfs_log_recover.c | 8 + + fs/xfs/xfs_super.c | 3 +- + fs/zonefs/super.c | 3 +- + include/asm-generic/uaccess.h | 109 +- + include/dt-bindings/clock/tegra234-clock.h | 14 + + include/dt-bindings/mux/mux-j721e-wiz.h | 53 - + include/dt-bindings/mux/ti-serdes.h | 93 + + include/dt-bindings/pinctrl/omap.h | 2 +- + include/dt-bindings/power/meson-axg-power.h | 14 + + 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/kvm/arm_pmu.h | 5 + + include/linux/arm-smccc.h | 74 +- + include/linux/blk_types.h | 18 + + include/linux/clk/samsung.h | 56 + + include/linux/cpuidle.h | 5 - + include/linux/dma-map-ops.h | 23 + + include/linux/dma-mapping.h | 24 - + include/linux/fcntl.h | 2 +- + include/linux/filter.h | 9 + + include/linux/fs.h | 30 +- + include/linux/hil_mlc.h | 2 +- + include/linux/intel_rapl.h | 7 +- + include/linux/iocontext.h | 6 - + include/linux/kvm_host.h | 2 + + include/linux/mailbox/mtk-cmdq-mailbox.h | 6 +- + include/linux/mount.h | 3 +- + include/linux/netlink.h | 2 +- + 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/pm_domain.h | 24 + + include/linux/pm_runtime.h | 2 +- + include/linux/prandom.h | 55 +- + include/linux/pruss_driver.h | 54 + + include/linux/qcom-geni-se.h | 4 +- + include/linux/rmi.h | 11 +- + include/linux/scmi_protocol.h | 32 +- + include/linux/seqlock.h | 2 +- + include/linux/slab.h | 2 - + 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/splice.h | 4 +- + include/linux/stat.h | 2 - + include/linux/statfs.h | 6 + + include/linux/task_work.h | 11 +- + include/linux/tee_drv.h | 3 + + include/linux/tracehook.h | 4 +- + include/linux/uaccess.h | 4 + + include/linux/virtio_config.h | 10 + + include/media/drv-intf/s3c_camif.h | 4 - + include/net/netfilter/nf_tables.h | 6 + + include/scsi/scsi_cmnd.h | 3 +- + include/soc/fsl/qman.h | 4 +- + include/soc/tegra/fuse.h | 3 + + include/trace/events/kvm.h | 2 +- + include/uapi/linux/bpf.h | 22 +- + include/uapi/linux/input-event-codes.h | 4 + + include/uapi/linux/kvm.h | 19 + + include/uapi/linux/mount.h | 1 + + include/uapi/linux/perf_event.h | 2 +- + include/uapi/linux/tee.h | 13 + + include/xen/events.h | 8 - + kernel/bpf/syscall.c | 1 - + kernel/bpf/verifier.c | 11 +- + kernel/capability.c | 2 +- + kernel/dma/remap.c | 2 +- + kernel/entry/common.c | 1 - + kernel/entry/kvm.c | 4 +- + kernel/events/uprobes.c | 2 +- + kernel/futex.c | 5 + + kernel/groups.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/sched/core.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 5 +- + kernel/sched/fair.c | 2 +- + kernel/sched/sched.h | 15 +- + kernel/sys.c | 16 +- + kernel/task_work.c | 30 +- + kernel/time/timer.c | 9 +- + kernel/trace/ring_buffer.c | 10 +- + lib/fonts/font_6x8.c | 8 +- + lib/random32.c | 525 ++-- + lib/scatterlist.c | 2 +- + mm/filemap.c | 222 -- + net/bridge/netfilter/ebt_dnat.c | 2 +- + net/bridge/netfilter/ebt_redirect.c | 2 +- + net/bridge/netfilter/ebt_snat.c | 2 +- + net/core/dev.c | 6 +- + net/core/filter.c | 161 +- + net/core/rtnetlink.c | 13 +- + net/core/sock.c | 2 +- + net/dsa/tag_ksz.c | 2 + + net/ipv4/icmp.c | 7 +- + net/ipv4/nexthop.c | 2 +- + net/ipv4/tcp_input.c | 2 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/mpls/mpls_iptunnel.c | 1 + + net/mptcp/Kconfig | 6 +- + net/mptcp/options.c | 3 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 +- + net/netfilter/nf_conntrack_proto_tcp.c | 19 +- + net/netfilter/nf_dup_netdev.c | 1 + + net/netfilter/nf_tables_api.c | 6 +- + net/netfilter/nf_tables_offload.c | 4 +- + net/netfilter/nft_fwd_netdev.c | 1 + + net/nfc/netlink.c | 2 +- + net/openvswitch/flow_table.c | 58 +- + net/openvswitch/flow_table.h | 8 +- + net/sched/act_ct.c | 4 +- + net/sched/act_tunnel_key.c | 2 +- + net/sched/cls_api.c | 2 +- + net/tipc/bcast.c | 10 +- + net/tipc/crypto.c | 4 +- + samples/bpf/sockex3_kern.c | 8 +- + scripts/bpf_helpers_doc.py | 1 + + scripts/checkpatch.pl | 12 +- + security/keys/keyctl.c | 2 +- + security/safesetid/lsm.c | 190 +- + security/safesetid/lsm.h | 38 +- + security/safesetid/securityfs.c | 190 +- + security/yama/yama_lsm.c | 2 +- + sound/pci/hda/hda_jack.c | 18 +- + sound/pci/hda/patch_ca0132.c | 18 +- + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/s3c2412-i2s.c | 7 - + sound/soc/samsung/s3c24xx-i2s.c | 7 - + sound/sparc/dbri.c | 2 +- + sound/usb/format.c | 1 + + tools/include/uapi/linux/bpf.h | 22 +- + tools/lib/bpf/bpf_helpers.h | 2 + + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 57 +- + .../bpf/progs/test_ksyms_btf_null_check.c | 31 + + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 5 +- + .../selftests/bpf/progs/test_tc_neigh_fib.c | 155 ++ + tools/testing/selftests/bpf/test_tc_redirect.sh | 18 +- + tools/testing/selftests/bpf/verifier/sock.c | 25 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + tools/testing/selftests/kvm/include/x86_64/vmx.h | 2 +- + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 168 ++ + tools/testing/selftests/kvm/x86_64/user_msr_test.c | 248 ++ + 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 + tools/testing/selftests/net/config | 1 + + .../selftests/net/forwarding/vxlan_asymmetric.sh | 10 + + .../selftests/net/forwarding/vxlan_symmetric.sh | 10 + + tools/testing/selftests/net/mptcp/config | 1 + + tools/testing/selftests/net/rtnetlink.sh | 5 + + .../powerpc/alignment/alignment_handler.c | 8 +- + tools/testing/selftests/timens/Makefile | 2 +- + tools/testing/selftests/timens/futex.c | 110 + + virt/kvm/eventfd.c | 4 +- + virt/kvm/kvm_main.c | 16 +- + 1861 files changed, 52163 insertions(+), 35318 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/input/adc-joystick.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix.txt + 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 Documentation/translations/zh_CN/arm64/hugetlbpage.rst + 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 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 + create mode 100644 arch/x86/kvm/mmu/spte.c + create mode 100644 arch/x86/kvm/mmu/spte.h + create mode 100644 arch/x86/kvm/mmu/tdp_iter.c + create mode 100644 arch/x86/kvm/mmu/tdp_iter.h + create mode 100644 arch/x86/kvm/mmu/tdp_mmu.c + create mode 100644 arch/x86/kvm/mmu/tdp_mmu.h + create mode 100644 arch/x86/kvm/vmx/posted_intr.c + create mode 100644 arch/x86/kvm/vmx/posted_intr.h + rename arch/x86/kvm/vmx/{ops.h => vmx_ops.h} (100%) + create mode 100644 drivers/firmware/arm_scmi/system.c + 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 + delete mode 100644 drivers/power/avs/Kconfig + delete mode 100644 drivers/power/avs/Makefile + 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 + rename drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} (100%) + create mode 100644 drivers/soc/renesas/r8a779a0-sysc.c + rename drivers/{power/avs/rockchip-io-domain.c => soc/rockchip/io-domain.c} (100%) + 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 drivers/{power/avs => soc/ti}/smartreflex.c (100%) + 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 fs/cifs/fs_context.c + create mode 100644 fs/cifs/fs_context.h + create mode 100644 fs/remap_range.c + create mode 100644 include/dt-bindings/clock/tegra234-clock.h + delete mode 100644 include/dt-bindings/mux/mux-j721e-wiz.h + create mode 100644 include/dt-bindings/mux/ti-serdes.h + create mode 100644 include/dt-bindings/power/meson-axg-power.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%) + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_btf_null_check.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_neigh_fib.c + create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/user_msr_test.c + 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%) + create mode 100644 tools/testing/selftests/timens/futex.c +Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (f11901ed723d Merge tag 'xfs-5.10-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (8c42a5c02bec ARC: perf: redo the pct irq missing in device-tree handling) +$ 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 +Already up to date. +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 (4ff753feab02 powerpc/pseries: Avoid using addr_to_pfn in real mode) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (549738f15da0 Linux 5.9-rc8) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_64.c +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 (435ccfa894e3 tcp: Prevent low rmem stalls with SO_RCVLOWAT.) +$ git merge net/master +Merge made by the 'recursive' strategy. + .../chelsio/inline_crypto/chtls/chtls_io.c | 7 +++- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 2 + + drivers/net/ethernet/pensando/ionic/ionic_fw.c | 6 +-- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 29 +++++++------ + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 47 ++++++++-------------- + drivers/net/ethernet/pensando/ionic/ionic_txrx.h | 1 - + drivers/net/ipa/gsi_trans.c | 21 +++++++--- + net/ipv4/tcp.c | 2 + + net/ipv4/tcp_input.c | 3 +- + 13 files changed, 65 insertions(+), 65 deletions(-) +Merging bpf/master (18ded910b589 tcp: fix to update snd_wl1 in bulk receiver fast path) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (7fe94612dd4c xfrm: interface: fix the priorities for ipip and ipv6 tunnels) +$ git merge ipsec/master +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 (c77761c8a594 netfilter: nf_fwd_netdev: clear timestamp in forwarding path) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (48d072c4e8cd selftests: netfilter: add time counter check) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (df41c19abbea drivers/net/wan/hdlc_fr: Move the skb_headroom check out of fr_hard_header) +$ git merge wireless-drivers/master +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 (033e4040d453 ALSA: hda - Fix the return value if cb func is already registered) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (8099fe48df2c Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/wsa881x.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/cs42l51.c | 22 +++++++++++- + sound/soc/codecs/wsa881x.c | 2 ++ + 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 +++++++++++++---- + sound/soc/qcom/sdm845.c | 2 ++ + sound/soc/sof/loader.c | 5 +++ + 11 files changed, 106 insertions(+), 40 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 (dc3afaa95f47 Merge remote-tracking branch 'regulator/for-5.10' into regulator-linus) +$ git merge regulator-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging spi-fixes/for-linus (91cbcc28a2ee Merge remote-tracking branch 'spi/for-5.10' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) +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 (d76913908102 Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block) +$ 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 c1bb781d9555] 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 (d76913908102 Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block) +$ 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 +Already up to date. +Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/poly1305_glue.c | 1 + + 1 file changed, 1 insertion(+) +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 (77377064c3a9 KVM: ioapic: break infinite recursion on lazy EOI) +$ 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 (01ffb99d0f84 dt-bindings: More whitespace clean-ups in schema files) +$ git merge devicetree-fixes/dt/linus +Removing Documentation/devicetree/bindings/input/cros-ec-keyb.txt +Removing Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/toshiba,tc358775.yaml | 18 ++-- + .../bindings/display/panel/ilitek,ili9881c.yaml | 5 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 6 +- + .../bindings/gpio/kontron,sl28cpld-gpio.yaml | 4 +- + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 63 +++++++++++++ + .../devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt | 39 -------- + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 3 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 3 +- + .../bindings/iio/adc/cosmic,10001-adc.yaml | 4 +- + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 2 +- + .../devicetree/bindings/input/cros-ec-keyb.txt | 72 --------------- + .../bindings/input/google,cros-ec-keyb.yaml | 92 +++++++++++++++++++ + .../interrupt-controller/ti,pruss-intc.yaml | 12 +-- + Documentation/devicetree/bindings/leds/common.yaml | 2 +- + .../bindings/leds/leds-class-multicolor.yaml | 9 +- + .../devicetree/bindings/mailbox/mtk-gce.txt | 2 +- + .../devicetree/bindings/mfd/ene-kb3930.yaml | 2 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 56 +++++++++++ + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 8 +- + .../devicetree/bindings/mmc/sdhci-am654.yaml | 15 ++- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 18 ++-- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 6 +- + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 20 ++-- + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 102 ++++++++++----------- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 2 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 6 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 24 ++--- + .../bindings/power/reset/reboot-mode.yaml | 6 +- + .../bindings/power/supply/ingenic,battery.yaml | 8 +- + .../power/supply/summit,smb347-charger.yaml | 16 ++-- + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 4 +- + Documentation/devicetree/bindings/rng/imx-rng.yaml | 6 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 34 +++---- + .../bindings/sound/google,cros-ec-codec.yaml | 26 ++++-- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 4 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 4 +- + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 40 ++++---- + .../devicetree/bindings/timer/arm,sp804.yaml | 12 +-- + .../devicetree/bindings/usb/cdns,usb3.yaml | 4 +- + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- + .../devicetree/bindings/w1/fsl-imx-owire.yaml | 8 +- + drivers/of/of_reserved_mem.c | 13 ++- + 43 files changed, 455 insertions(+), 335 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt + delete mode 100644 Documentation/devicetree/bindings/input/cros-ec-keyb.txt + create mode 100644 Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml +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 (0add6e9b88d0 mmc: sdhci-of-esdhc: set timeout to max before tuning) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-of-esdhc.c | 11 +++++++++++ + drivers/mmc/host/sdhci.c | 6 ++++-- + 2 files changed, 15 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 (f11901ed723d Merge tag 'xfs-5.10-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (6857a5ebaabc dma-mapping: document dma_{alloc,free}_pages) +$ git merge dma-mapping/for-next +Already up to date. +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 (66dd3474702a arm64: proton-pack: Update comment to reflect new function name) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (4bb6c7b93462 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 223 +++++++++++++++++++++++++++++++++ + 1 file changed, 223 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (ef751721ccde Merge branch 'v5.10/fixes' 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 | 52 ++++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++- + .../boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 ++ + 5 files changed, 67 insertions(+), 2 deletions(-) +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 +Already up to date! +Merge made by the 'recursive' strategy. +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 (6c7949eccdbd Merge branch 'v5.10-tmp/soc' into for-next) +$ git merge mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 + + MAINTAINERS | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt6779-evb.dts | 31 +++ + arch/arm64/boot/dts/mediatek/mt6779.dtsi | 271 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 33 ++- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +- + drivers/soc/mediatek/mtk-scpsys.c | 5 +- + 10 files changed, 342 insertions(+), 7 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt6779.dtsi +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 (089a64570bde reset: meson: make it possible to build as a module) +$ git merge reset/reset/next +Auto-merging drivers/reset/Kconfig +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 3 ++- + drivers/reset/reset-meson.c | 8 +++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging rockchip/for-next (ba0ceb95f560 Merge branch 'v5.10-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 a858ffb7bbfe] Merge remote-tracking branch 'sunxi/sunxi/for-next' into master +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml | 3 +++ + 1 file changed, 3 insertions(+) +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 +Already up to date. +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 (5484f9cbe94e parisc: Switch to clockevent based timers) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/irq.c | 7 +- + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/time.c | 164 +++++++++++++++++++----------------- + 4 files changed, 90 insertions(+), 88 deletions(-) +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 (f69e1c7418b1 RISC-V: Fix the VDSO symbol generaton for binutils-2.35+) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/vdso/Makefile +CONFLICT (content): Merge conflict in arch/riscv/kernel/vdso/Makefile +Recorded preimage for 'arch/riscv/kernel/vdso/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/kernel/vdso/Makefile'. +[master 75ee063ccbd9] Merge remote-tracking branch 'risc-v/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/riscv/kernel/vdso/.gitignore | 1 + + arch/riscv/kernel/vdso/Makefile | 17 ++++++++--------- + arch/riscv/kernel/vdso/so2s.sh | 6 ++++++ + 3 files changed, 15 insertions(+), 9 deletions(-) + create mode 100755 arch/riscv/kernel/vdso/so2s.sh +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 +Already up to date. +Merging cifs/for-next (aef0388aa92c cifs: update internal module version number) +$ git merge cifs/for-next +Already up to date. +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 (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge exfat/dev +Already up to date. +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 (1322181170bb ext4: fix invalid inode checksum) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (d76913908102 Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block) +$ 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 (40a03b750bb3 Merge tag 'sound-fix-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ 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 +Already up to date. +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 +Already up to date. +Merging xfs/for-next (2e76f188fd90 xfs: cancel intents immediately if process_intents fails) +$ 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 +Already up to date. +Merging file-locks/locks-next (455dbb834513 locks: Fix UBSAN undefined behaviour in flock64_to_posix_lock) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/locks.c | 2 +- + include/linux/pagevec.h | 3 --- + mm/swap.c | 9 --------- + 3 files changed, 1 insertion(+), 13 deletions(-) +Merging vfs/for-next (bcc4e60be0f8 Merge branch 'work.set_fs' into for-next) +$ git merge vfs/for-next +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 +-------------------------------- + 8 files changed, 5 insertions(+), 121 deletions(-) +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 (28e34e751f6c Merge branch 'remotes/lorenzo/pci/xilinx') +$ git merge pci/next +Already up to date. +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 117fdfb155d4] 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 +Merge made by the 'recursive' strategy. + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-at91-core.c | 11 ++--- + drivers/i2c/busses/i2c-imx.c | 44 +++++++++++++++---- + drivers/i2c/busses/i2c-mv64xxx.c | 28 ++++++++++++- + drivers/i2c/busses/i2c-sh_mobile.c | 86 +++++++++++++++++++++++++++++--------- + drivers/soc/qcom/qcom-geni-se.c | 4 +- + 6 files changed, 136 insertions(+), 39 deletions(-) +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 +Already up to date. +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 (62af696471e5 docs: Add two missing entries in vm sysctl index) +$ 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 (cafcadac71cb docs: fs: api-summary.rst: get rid of kernel-doc include) +$ git merge v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/net.rst | 1 + + Documentation/conf.py | 2 +- + Documentation/dev-tools/kasan.rst | 2 + + .../devicetree/bindings/clock/hi6220-clock.txt | 2 +- + Documentation/filesystems/api-summary.rst | 3 - + Documentation/hwmon/adm1266.rst | 2 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/mp2975.rst | 14 ++- + Documentation/locking/lockdep-design.rst | 51 ++++---- + Documentation/networking/devlink/ice.rst | 1 + + Documentation/networking/statistics.rst | 3 +- + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 9 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 12 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 1 + + .../bindings/net/wireless/silabs,wfx.yaml | 2 +- + include/kunit/test.h | 16 +-- + include/linux/blk-mq.h | 2 + + include/linux/pagemap.h | 8 +- + include/linux/phy.h | 40 +------ + include/linux/refcount.h | 130 ++++++++++----------- + scripts/kernel-doc | 6 +- + 26 files changed, 164 insertions(+), 153 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 (54e1ca2a1923 Merge branch 'acpi-utils' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (bc9b9c5ab9d8 cpufreq: qcom: Don't add frequencies without an OPP) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string) +$ git merge cpupower/cpupower +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 (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (bedb0f056faa gfs2: Recover statfs info in journal head) +$ git merge gfs2/for-next +Already up to date. +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 (b45b6fbc671c Merge tag 'drm-intel-next-fixes-2020-10-22' 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/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +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/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.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 98dbcbc53d72] 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 (5c6c13cd1102 drm/i915: Drop runtime-pm assert from vgpu io accessors) +$ git merge drm-intel/for-linux-next +Already up to date. +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 (2580a493a97d dt-binding: display: Require two resets on mantix panel) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + .../display/panel/mantix,mlaf057we51-x.yaml | 4 ++++ + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 25 +++++++++++++++------- + 2 files changed, 21 insertions(+), 8 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 (033e4040d453 ALSA: hda - Fix the return value if cb func is already registered) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (8099fe48df2c 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 +Already up to date. +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 (2120d12a2ad3 Merge branch 'libata-5.10' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (dc3afaa95f47 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 +Already up to date. +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 +Already up to date. +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 (91cbcc28a2ee Merge remote-tracking branch 'spi/for-5.10' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (65609b26b21a Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/processor.h +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/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 +++++++-- + 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/freelist.h | 129 +++++++++++ + include/linux/kprobes.h | 25 ++- + include/linux/llist.h | 23 ++ + include/linux/sched.h | 4 + + include/uapi/linux/prctl.h | 1 + + kernel/fork.c | 4 + + kernel/kprobes.c | 286 ++++++++---------------- + kernel/trace/trace_kprobe.c | 3 +- + scripts/atomic/gen-atomic-fallback.sh | 63 +++++- + scripts/atomic/gen-atomic-instrumented.sh | 29 ++- + 32 files changed, 925 insertions(+), 366 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 (a7480c5d725c irqchip/sifive-plic: Fix broken irq_set_affinity() callback) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 3 +-- + drivers/irqchip/irq-bcm2836.c | 2 +- + drivers/irqchip/irq-mst-intc.c | 4 ++-- + drivers/irqchip/irq-sifive-plic.c | 2 +- + drivers/irqchip/irq-stm32-exti.c | 4 ++++ + kernel/irq/Kconfig | 1 + + 6 files changed, 10 insertions(+), 6 deletions(-) +Merging ftrace/for-next (e1981f75d398 ring-buffer: Update the description for ring_buffer_wait) +$ 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 lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/lockdep.h +CONFLICT (content): Merge conflict in include/linux/lockdep.h +Auto-merging drivers/gpu/drm/i915/Kconfig.debug +Auto-merging arch/x86/kernel/kvm.c +Resolved 'include/linux/lockdep.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 547860a9f8dc] Merge remote-tracking branch 'rcu/rcu/next' into master +$ git diff -M --stat --summary HEAD^.. + .../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 ++ + arch/arm/include/asm/assembler.h | 11 - + arch/arm/kernel/iwmmxt.S | 2 - + arch/arm/mach-ep93xx/crunch-bits.S | 2 - + arch/xtensa/kernel/entry.S | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 - + drivers/gpu/drm/i915/i915_utils.h | 3 +- + include/linux/bit_spinlock.h | 4 +- + include/linux/lockdep.h | 6 +- + include/linux/pagemap.h | 4 +- + include/linux/preempt.h | 37 +- + include/linux/uaccess.h | 6 +- + kernel/Kconfig.preempt | 4 - + kernel/rcu/tree.c | 79 ++-- + kernel/sched/core.c | 6 +- + lib/Kconfig.debug | 3 - + 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 ++ + .../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 - + 47 files changed, 1777 insertions(+), 244 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 +Already up to date. +Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (1a89c1dc9520 Documentation: add xen.fifo_events kernel parameter description) +$ 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 +Already up to date. +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 (d76913908102 Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block) +$ 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 +Already up to date. +Merging staging/staging-next (d76913908102 Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block) +$ 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 +Merge made by the 'recursive' strategy. + drivers/scsi/ufs/ufshcd.h | 1 - + 1 file changed, 1 deletion(-) +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 (70a62fce2628 vdpa_sim: implement get_iova_range()) +$ git merge vhost/linux-next +Auto-merging drivers/vdpa/vdpa_sim/vdpa_sim.c +Merge made by the 'recursive' strategy. + drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++++++++ + drivers/vhost/vdpa.c | 41 ++++++++++++++++++++++++++++++++++++++++ + include/linux/vdpa.h | 15 +++++++++++++++ + include/uapi/linux/vhost.h | 4 ++++ + include/uapi/linux/vhost_types.h | 9 +++++++++ + 5 files changed, 81 insertions(+) +Merging rpmsg/for-next (a689837cb172 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/hwspinlock/sprd_hwspinlock.c | 2 -- + 1 file changed, 2 deletions(-) +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 +Already up to date. +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 +Already up to date. +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 +Already up to date. +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 (fb11305101c2 XArray: Fix split documentation) +$ git merge xarray/main +Merge made by the 'recursive' strategy. + lib/xarray.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +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 +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f62702601825] 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 +$ git am -3 ../patches/0001-rest-of-merge-fix-up-for-syscall-conflict.patch +Applying: rest of merge fix up for syscall conflict +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +M include/uapi/asm-generic/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master 653a6367cc1b] Merge remote-tracking branch 'notifications/notifications-pipe-core' into master + Date: Mon Oct 26 10:14:26 2020 +1100 +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 38919def33fd] 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/swap.c +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 +Auto-merging Documentation/admin-guide/sysctl/vm.rst +Resolved 'include/linux/sched.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d2b9c5096014] 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 ++++++++++++------- + 24 files changed, 279 insertions(+), 79 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/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 0fb7d857ca62...5808c7567a27 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5808c7567a27 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..468f3d09747a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20201026 |