diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000000000000000000000000000000..82e59acc5682aa745e3764cc3a181fbb11544bbe
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,298 @@
+Name SHA1
+---- ----
+origin c027c7cf1577bc2333449447c6e48c93126a56b0
+fixes ed3ce4cfc91901fb3a7823d78e343d387307bc59
+kspp-gustavo 6f6c95f090011742906b5ba9e93d7e5cc30a3321
+kbuild-current 207a369e3c085799e7836221f64e7a7329985fb6
+arc-current 85d6adcbbe6dfc557755543c6c39b497d3032cdc
+arm-current d410a8a49e3e00e07d43037e90f776d522b25a6a
+arm64-fixes 74698f6971f25d045301139413578865fc2bd8f9
+m68k-current bed1369f51901b17108a4bb4f7210aab183bea42
+powerpc-fixes 8f5b27347e88b171c755562f0090ce40e514fc00
+sparc 7d762d69145a54d169f58e56d6dac57a5508debc
+fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215
+net 46b1c18f9deb326a7e18348e668e4c7ab7c7458b
+bpf 07f12b26e21ab359261bf75cfcb424fdc7daeb6d
+ipsec d235c48b40d399328585a68f3f9bf7cc3062d586
+netfilter ecef67cb10db7b83b3b71c61dbb29aa070ab0112
+ipvs b2e3d68d1251a051a620f9086e18f7ffa6833b5b
+wireless-drivers d5fa9c55e5f32e1ebe2a1e4b5e4a21d54db17a16
+mac80211 d235c48b40d399328585a68f3f9bf7cc3062d586
+rdma-fixes f09ef134a7ca3f0d2ce485a757f5b79809ebb803
+sound-current a634090a0f242caa8ebc91967b118995a80eb13b
+sound-asoc-fixes b5e806ae4ad81de66c334d3d333fa42f960fbbd1
+regmap-fixes f17b5f06cb92ef2250513a1e154c47b78df07d40
+regulator-fixes 8cd0aeaa0868c6b2ffb383cef899d52bb052991e
+spi-fixes 22e78ec655e8cb1080a354ddbcc16e8087fc8726
+pci-current f57a98e1b71357713e44c57268a53d9c803f0626
+driver-core.current d13937116f1e82bf508a6325111b322c30c85eb9
+tty.current d13937116f1e82bf508a6325111b322c30c85eb9
+usb.current d13937116f1e82bf508a6325111b322c30c85eb9
+usb-gadget-fixes a53469a68eb886e84dd8b69a1458a623d3591793
+usb-serial-fixes 8d7fa3d4ea3f0ca69554215e87411494e6346fdc
+usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef
+phy 827cb0323928952c0db9515aba9d534fb1285b3f
+staging.current d13937116f1e82bf508a6325111b322c30c85eb9
+char-misc.current d13937116f1e82bf508a6325111b322c30c85eb9
+soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+thunderbolt-fixes 5908e6b738e3357af42c10e1183753c70a0117a9
+input-current 7ad222b3aed350adfc27ee7eec4587ffe55dfdce
+crypto-current f86d17e9efe010b894db231329ee36b24bcc1b24
+ide adf040ddd00152bda99aa9bc2afef9075ac88b34
+vfio-fixes 9a71ac7e15a723e90fc40388b4b92eefaabf747c
+kselftest-fixes 7d4e591bc051d3382c45caaa2530969fb42ed23d
+modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0
+slave-dma-fixes d13937116f1e82bf508a6325111b322c30c85eb9
+backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a
+mtd-fixes 3e35730dd7540bad2d4e002703996391d9be49a0
+spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2
+mfd-fixes 48a2ca0ee3994df53da230c7079a18a70ec914f9
+v4l-dvb-fixes 7bdf2c8fee51d79ec6e487b392e2046de02ddf7f
+reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0
+mips-fixes e0bf304e4a00d66d90904a6c5b93141f177cf6d2
+at91-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+omap-fixes dc30e70391376ba3987aeb856ae6d9c0706534f1
+kvm-fixes de3ccd26fafc707b09792d9b633c8b5b48865315
+kvms390-fixes b10bd9a256aec504c14a7c9b6fccb6301ecf290a
+hwmon-fixes ff066653aeed8ee2d4dadb1e35774dd91ecbb19f
+nvdimm-fixes 11189c1089da413aa4b5fd6be4c4d47c78968819
+btrfs-fixes 8834f5600cf3c8db365e18a3d5cac2c2780c81e5
+vfs-fixes d3d6a18d7d351cbcc9b33dbedf710e65f8ce1595
+dma-mapping-fixes 60d8cd572f655aac6107a2330dced004ad1fe3d7
+i3c-fixes f36c1f9a8dfd6a78e6c3fe7aff5e722b84307597
+drivers-x86-fixes 6a730fcb9cb472ba2d42b26a50ac65dacdd68882
+samsung-krzk-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a
+devicetree-fixes 5fa98c2eda35fcd1a1d91a9785c390f54688240c
+scsi-fixes 388b4e6a00bb3097278ed1648ac5a1cb48c894e6
+drm-fixes 17fb465f16027ea22225b282295f5b8af19992e0
+drm-intel-fixes 5908e6b738e3357af42c10e1183753c70a0117a9
+mmc-fixes e30be063d6dbcc0f18b1eb25fa709fdef89201fb
+rtc-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+gnss-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+hyperv-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c
+drm-misc-fixes 04b9c48851582aa0971b7d4e9d42c872b8acd0e2
+kbuild 85d89b922ba2675311541af70c55b4414c0272d9
+compiler-attributes a3b22b9f11d9fbc48b0291ea92259a5a810e9438
+leaks 982ef2f7ef0afda90e90c1fde3d519f3a7537123
+dma-mapping 9eb9e96e97b3381e94cba81d93f4a390c26ca6cb
+asm-generic d724444ab97d2cdf1c4dbfc1ff65d0b18a9631e0
+arc 5908e6b738e3357af42c10e1183753c70a0117a9
+arm 585f8003e2e7aa474a04ca82d6f0cbbb68b793a7
+arm64 b855b58ac1b7891b219e1d9ef60c45c774cadefe
+arm-perf cf2d65ec1d21f986bc128697aff5f52fef1ff12a
+arm-soc 48d1dbf3918f75dc4f3d3b01534fccd39e52bea4
+actions fb9c1c1deb5ece57810afdbd743358d02e632d2c
+alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2
+amlogic a973ebe8b4d72b32eabcec40e2cac91e4455b541
+aspeed e1542521499070f88b18846f676b4cd2a166aee5
+at91 69dd6b9f7d5826118532f1301b06306a6be6f821
+bcm2835 1ee128f4fff29c1938f25160b0dafbe9feb57d1f
+imx-mxs fe0b295f61aff476da854e7200122686a7b89e0c
+keystone 3c3a43c81bdaaec61aef208f94e8273b0309635c
+mediatek d542127adb0cc087c8aa93418a18a9648a4e6316
+mvebu c51f7f86355238c3baf230444484c5d61846eb4d
+omap af3b69ea03a28ec3382673ce8342639a7dd63dd0
+reset dbfc54534dfcaee004d54137d9b34d000f847e41
+qcom 75920dd0498d445273ce7ca634a4cb61f30f7bf2
+renesas f4435b0d605e15347b8c0edc96b6fc6887d150ec
+rockchip 8444545ff72a19e19f9793156a56fd18c6236a9b
+samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4
+samsung-krzk 8ecb112edde9bf7e345eff4468dccedd41b7a067
+sunxi 1fc3dc28913476d552ad4f0f0c9ca8a91a248ac7
+tegra d92dde4f12f1b48e3a1d330ad25e3780c99e8f60
+clk 43ae730290ff57d7365d78b4821fb71bbccfdce7
+clk-samsung 81faa30df9b6e9088ea5ca488860616192e7b763
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky 88d5f20a813960499a82151846754d7843412030
+h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406
+ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5
+m68k 28713169d879b67be2ef2f84dcf54905de238294
+m68knommu d7e9d01ac2920959b474c6363dba269a868f4db9
+microblaze 226a893bbb1f4495d7139fd57143475ada0de61d
+mips aeb669d41ffabb91b1542f1f802cb12a989fced0
+nds32 bfeffd155283772bbe78c6a05dec7c0128ee500c
+nios2 1c286267aedf5c9bd8e1ef66ca2583009b930281
+openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff
+parisc-hd 6a5280012da50ae985da4acacc865d5e8bf30a48
+powerpc 9580b71b5a7863c24a9bd18bcd2ad759b86b1eff
+fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7
+risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78
+risc-v 79a47bad61bb340aed94e73b471616b246b2ecf3
+sifive 467e050e9760fc31dcf854ec88401e18419f5f78
+s390 9fe567d09f0f061b7776859fb01c31f89044578f
+sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e
+sh ac21fc2dcb405cf250ad3f1228f64f64930d9211
+uml 940b241d9050fc354f68c182e99fc3da1ff36bc0
+xtensa 036ef74b3ecb3804fd5c024a764d793c34b72644
+fscrypt f5e55e777cc93eae1416f0fa4908e8846b6d7825
+befs 55d945e2e4aa148ef38bdfabb9569af78183a539
+btrfs 29dcea88779c856c7dc92040a0c01233263101d4
+btrfs-kdave 836b12f8c30d74dafa241d239dad6bdcf1af596a
+ceph 6cbbda12cb4f22b55f975d01b04647f542955a70
+cifs bb4369db96f204a3f5f0ef9a0e6a663195315bb7
+configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590
+ecryptfs d43388dea04b18f516bd7c837d9222fe7309b12d
+ext3 2337494f7c0f067b02f683021101d7f160120100
+ext4 0df6f46995a9fc92a6b9e591428e77527dd9609a
+f2fs 100e23619856fed5b792f3c70af15bdab914fce5
+fuse fabf7e0262d0bd57739d29aeac94c44b0542ff1f
+jfs 2e3bc6125154c691e987e2554f2c99ec10f83b73
+nfs a73881c96d73ee72b7dbbd38a6eeef66182a8ef7
+nfs-anna a3b22b9f11d9fbc48b0291ea92259a5a810e9438
+nfsd c54f24e338ed2a35218f117a4a1afb5f9e2b4e64
+orangefs 6e356d45950e2d26b63531a2fd112c987da7a933
+overlayfs 993a0b2aec52754f0897b1dab4c453be8217cae5
+ubifs 2fe8b2d5578d7d142982e3bf62e4c0caf8b8fe02
+v9fs 5e3cc1ee1405a7eb3487ed24f786dec01b4cbe1f
+xfs 1b9598c8fb9965fff901c4caa21fed9644c34df3
+file-locks bf77ae4c98d721a9aae3840970d46669a78e034a
+vfs c0abe5af73411c10e82f130cdd748f00c5182d65
+printk b60706644282af04e4aa57da5af57470d453cd1f
+pci 68e9f622555b8ea6d2c48a7fc204faabe13481eb
+pstore 93ee4b7d9f0632690713aee604c49e298e634094
+hid c81eee9fb58c1b2e57d32de7371a8640f56d7fe2
+i2c a8219c9b698895e412923c43ab0507392abcd120
+i3c 988bb4a1937bd083267444dda21b901dc6a959b3
+dmi 57361846b52bc686112da6ca5368d11210796804
+hwmon-staging 985e225142cf0cb826401f5448763f13ee712b3a
+jc_docs 19c3fe285cbaa5aa36d60638fc5c37706f2a1c3e
+v4l-dvb 26b190053ec0db030697e2e19a8f8f13550b9ff7
+v4l-dvb-next 9fabe1d108ca4755a880de43f751f1c054f8894d
+fbdev 4c83c2f75a8f4737a8fb177bb7f2ffe464f567ca
+pm 65787f5965bc6f8f34ce54cdee4c4074bb3fffc4
+cpufreq-arm 0334906c06967142c8805fbe88acf787f65d3d26
+cpupower ae2917093fb60bdc1ed3e5757b74801420569a9a
+opp a9a744dd5b82843a9c99d9f97794fb51bc2ed8dd
+thermal b537f89a9e4b9f10bf108c7871f3bfa5c2d8d2c9
+thermal-soc 8834f5600cf3c8db365e18a3d5cac2c2780c81e5
+ieee1394 c820518f6ca150d099aaeb7b71ad9e96c61113c0
+dlm 8526e331c56f35bb52e88e8c0d3cba2195bc348f
+swiotlb 22cb45d7692ab502dd47dc5a607b3af240ee1e37
+rdma bb618451544ca9152a1a213d0a2b93d231c4cce1
+net-next 41bc0ddb80e0380ab88b3902e638c89b3453b421
+bpf-next ea5bade929bf04355aeed58a3c9f5ef2c3afe2ac
+ipsec-next 590ce401c207fd944827eb5aa5e87d834eddb149
+mlx5-next 37b6bb77c6fdad36f0d7bd425c005a014d5dffe4
+netfilter-next db8ab38880e06dedbfc879e75f5b0ddc495f4eb6
+nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382
+ipvs-next e2f7cc72cbf42e037229d8bd998966569662442f
+wireless-drivers-next 501faf710230b67e470b314868110357cf3a554d
+bluetooth d5fa9c55e5f32e1ebe2a1e4b5e4a21d54db17a16
+mac80211-next be9cefe796f3abfbef02e66fbe3bff766b93b867
+gfs2 2abbf9a4d262511999ac11b4ddc8521c9ee72b88
+mtd 9220d7befc9c28bf714701e6e26163644750d871
+nand 53bcbb839438df54024d97e8e698d21329d2c9a0
+spi-nor 225c0eda36bdb5327dc0125f4cf222c4cfd802aa
+crypto 0918f18c7179e8cdf718d01531a81b28130b4217
+drm 7fbd5d784f75750199c21918da9b2fc92af371e6
+drm-intel 96e0adb4af421d0c835854ba765ad36678086bd2
+drm-tegra ca52507efc03f6e81bd1b845882b049ed96bd192
+drm-misc 37406a60fac7de336dec331a8707a94462ac5a5e
+drm-msm f1a427d9d23805d70eddee0b1fb8d7d341f1c3d8
+hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120
+mali-dp dcc9d76b6d834d06a317e27fa8242d7e009135ac
+imx-drm a0ea4ffff2662c10ca69d5e246adf5543fd945b9
+etnaviv 9e05352340d3a3e68c144136db9810b26ebb88c3
+kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4
+regmap 66fb181d6f824f7695417e8c19560c5b57dc8c2d
+sound a634090a0f242caa8ebc91967b118995a80eb13b
+sound-asoc 8f3d4afab208db15a924f8b71f9e500915a597d8
+modules 93d77e7f1410c366050d6035dcba1a5167c7cf0b
+input 44466306ebecc73c68835f5fe27d119591a1ab5c
+block c6b7e26ecf51f1c97a282aa0db56b8055377c7ed
+device-mapper cf603f07ca7de72b3364cb3988bc3265e3e65721
+pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc
+mmc d4721339dcca7def04909a8e60da43c19a24d8bf
+kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd d2d833e0bf2bad221a955626b942b38312630894
+backlight cec2b18832e26bc866bef2be22eff4e25bbc4034
+battery 655ab0bc462d1ae2aa344b1ecf35ca1a3ed726dc
+regulator 218965f160f674ff9b3555539b0b0193987df7c5
+security 0d556c66dadd12198f04e204c947eea5bc6a5a90
+apparmor df4d55f2e1b8e5b047fdf8702b61c6df240911ea
+integrity e7fde070f39bc058c356cf366cb17ac2d643abb0
+selinux 45189a1998e00f6375ebd49d1e18161acddd73de
+tpmdd 5812f97c0a225958a34b5af3888f55bdd8cdaf29
+watchdog 458c8961c194f2d2cb6ffed3dd9b6692d74ad65e
+iommu d05e4c8600c36084ce9de6249bb972c9bdd75b7e
+dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff
+vfio 0cfd027be1d6def4a462cdc180c055143af24069
+trivial 75a24b822d383489badd343cab4cb171d09f93ef
+audit 131d34cb07957151c369366b158690057d2bce5e
+devicetree 935665c1a117f34662549f01e1c9bc5ea7132556
+mailbox d69e11648e486ee0f21cb246f687b083f0d4e124
+spi e6a9a55b2cb4fec7811405c943024f9137cc3c07
+tip 371f210ec2a3c322111cdebd0315ca271c008be0
+clockevents dbfc6db7ba46e73b97dc32b9013f01d9b91d630e
+edac-amd 580b5cf50ca8f4781961382d54959683341b3126
+irqchip 28528fca4908142bd1a3247956cba56c9c667d71
+ftrace 1c347a94ca79ef89156c7ad5d3a44bb2320a7047
+rcu e880edadc14970cad557e65849ba6d1457d18589
+kvm 71783e09b4874c845819b5658b968d8b5b899333
+kvm-arm c88b093693ccbe41991ef2e9b1d251945e6e54ed
+kvm-ppc 2b57ecd0208f7ac0b20b1b171698f027481a39f6
+kvms390 11ba5961a2156a4f210627ed8421387e2531b100
+xen-tip 1d988ed46543ca36c010634c97ac32114362ddb1
+percpu 1b046b445c0f856c3c1eed38a348bd87cc2dc730
+workqueues 8bdc6201785d0b5231bfd77bf2b62726395092d7
+drivers-x86 238f9c11351f8af8534ae0318b4d9acc77b09ee8
+chrome-platform 0d2f2a3da1f2a9ebeb66bb03073dd149fccf1bdd
+hsi 1ff85bfa1614df6cacec780cd5922dc0b1c340c7
+leds 5ddb0869bfc1bca6cfc592c74c64a026f936638c
+ipmi 038903593317691cf5f87ba1286627f5e8ab5660
+driver-core 36cf3b1363f464c40f6ce647d3ac0ae9617d5fbc
+usb 1c7cf3d5e1c181caca75012b65252288c18a25f2
+usb-gadget 5895d311d28f2605e2f71c1a3e043ed38f3ac9d2
+usb-serial 6431866b6707d27151be381252d6eef13025cfce
+usb-chipidea-next bc65fae4b1f01e269dad0cf62d721107d6bc93e2
+phy-next 203d9b11928cf68907344c24bd78726fa69de6cb
+tty f694936c3b5a4c140ded5b673555d95aedc866b9
+char-misc 142a0f83b216a607aebed42e54a1be620765e28c
+extcon 3dfed89512d3b65f6f092cfaaee53b0698bbf75e
+soundwire bfeffd155283772bbe78c6a05dec7c0128ee500c
+thunderbolt 5908e6b738e3357af42c10e1183753c70a0117a9
+staging 1f08c4a54b7cb62ed6450808c37d06c907f1a2dd
+mux a1ad5ff63944ea4c3666d9a454fb3203930829a0
+icc fcf9d0b7d2f50003efe0ba280be458f27671010d
+slave-dma 58810c58b9e763a82c3df3bfaaf2ed5104dfa555
+cgroup 6a613d24effcb875271b8a1c510172e2d6eaaee8
+scsi 8c1ceb38e449e9366104464845b7a47beafb274d
+scsi-mkp 26af1a368e40618d67956b1f883fbcfec292c5d8
+target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636
+target-bva 60cc43fc888428bb2f18f08997432d426a243338
+vhost e7afa2912187b6973797a9471dbdf3e8fdd3f6cf
+rpmsg 6a4ac1cc9997a505cb462bd698f2dbf1a543b35e
+gpio c378b3aa015931a46c91d6ccc2fe04d97801d060
+gpio-brgl 2a9e27408e12de455b9fcf66b5d0166f2129579e
+pinctrl dcab77888da978a1853158ff86b93b5cf7f07d25
+pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a
+pwm 7ca17b207127240b1e4c8687ba7b9077e655336d
+userns cf43a757fd49442bc38f76088b70c2299eed2c2f
+ktest 6cd110a91f52197e3392809cd43466bfe2c524d0
+random 05cbbb6f9ed50c9a64a25c1903712681d4480edb
+kselftest 0e27ded1159f62ab1a4e723796246bd5b1793b93
+y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc
+livepatching b420648f103d74bd6c96da4ecf09d78356e6a700
+coresight 37af13cc74d1d0c97ffc571fe92f1199ca0df780
+rtc 51f896ffd1a5aacbda82ed82552c4077e3cc3b68
+nvdimm c610002ab34fb55ce16d75d8d55d9ced1105834a
+at24 950bcbbe31548636d24e49b3abaf3780204f7fe8
+ntb 8af642c76ef5e19f5750838b3863a1d93ba2f7a7
+kspp ddf89e25fad841d41d0921dcaf8559300ad327f1
+init_task e1e871aff3ded26348c631b1370e257d401cd22d
+cisco 84a401a2750628747120a1ff6a54e846bbb9c5f1
+gnss d4584bbfcf2a8f5b6605be9eba465bba59ce68c8
+fsi d20810530b7109a95abef5130e6dcec09c5180d7
+siox 1e4b044d22517cae7047c99038abb444423243ca
+slimbus 81648d8bc2224278494dd7d7bcbdc428457832ed
+nvmem c86d78c459db1e468410538e2143eb5d37416d69
+xarray 4a5c8d898948d1ac876522cdd62f07a78104bfe9
+hyperv 396ae57ef1ef978d1d21cdb7586ba184a3f22453
+auxdisplay a3b22b9f11d9fbc48b0291ea92259a5a810e9438
+kgdb-dt 97498c96a1869f6e8563a042e490f187a39f68e7
+pidfd f67dcc84eb36917d554ab3ce5a6bf7295c31228a
+devfreq 08cacec421f6a14b3679cdc53bf746891ca19910
+akpm-current d24bf9977ff5670f0a130820c4aa1112898cdd18
+akpm 67f7dd3a2da4905351212c6ae70c4c3c65578959
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000000000000000000000000000000..b64d9ed322898cfa01b19cd93b4a69112fc74c88
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,300 @@
+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#master
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+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
+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
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/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/kishon/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
+slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.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.infradead.org/linux-mtd.git#master
+spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/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.infradead.org/linux-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
+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
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next
+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/arm/arm-soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next
+alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/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
+bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-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
+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
+c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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
+risc-v-pjw git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/riscv.git#for-next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next
+sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+sh git git://git.libc.org/linux-sh#for-next
+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/linux/kernel/git/tytso/fscrypt.git#master
+befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+btrfs-kdave 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
+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
+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
+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.infradead.org/ubifs-2.6.git#linux-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
+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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
+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
+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/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/davem/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master
+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
+nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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.infradead.org/linux-mtd.git#mtd/next
+nand git git://git.infradead.org/linux-mtd.git#nand/next
+spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-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
+hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd
+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
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/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
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+tpmdd git git://git.infradead.org/users/jjs/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
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+vfio git git://github.com/awilliam/linux-vfio.git#next
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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#clockevents/next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#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.infradead.org/linux-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/j.anaszewski/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/kishon/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
+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
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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
+target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://github.com/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
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task
+cisco git https://github.com/daniel-walker/cisco-linux.git#for-next
+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/benh/linux-fsi.git#master
+siox git https://git.pengutronix.de/git/ukl/linux#siox/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/linux-dax.git#xarray
+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-dt 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
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git#for-next
+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 0000000000000000000000000000000000000000..2e1822ccf097f146f869f3af032f89d2802b63c4
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,15180 @@
+$ date -R
+Mon, 04 Mar 2019 07:43:22 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 7d762d69145a afs: Fix manually set volume location server list
+Merging origin/master (c027c7cf1577 Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc)
+$ git merge origin/master
+Updating 7d762d69145a..c027c7cf1577
+Fast-forward
+ arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
+ arch/arm/crypto/sha256-armv4.pl | 3 +-
+ arch/arm/crypto/sha256-core.S_shipped | 3 +-
+ arch/arm/crypto/sha512-armv4.pl | 3 +-
+ arch/arm/crypto/sha512-core.S_shipped | 3 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
+ arch/arm64/crypto/chacha-neon-core.S | 20 ++++-
+ arch/mips/bcm63xx/dev-enet.c | 8 ++
+ arch/mips/kernel/cmpxchg.c | 3 +-
+ arch/mips/kernel/setup.c | 3 +-
+ arch/mips/lantiq/xway/vmmc.c | 4 +-
+ arch/mips/net/ebpf_jit.c | 2 +-
+ arch/x86/include/asm/hyperv-tlfs.h | 2 +-
+ arch/x86/include/asm/uaccess.h | 6 +-
+ drivers/crypto/ccree/cc_pm.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +++++-
+ drivers/gpu/drm/bochs/bochs_drv.c | 4 +
+ drivers/gpu/drm/drm_atomic_helper.c | 9 ++
+ drivers/iommu/dmar.c | 2 +-
+ drivers/mmc/core/block.c | 6 --
+ drivers/mmc/core/core.c | 2 +-
+ drivers/mmc/core/queue.c | 9 +-
+ drivers/mmc/host/cqhci.c | 13 ++-
+ drivers/mmc/host/mmc_spi.c | 1 +
+ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 +
+ drivers/mmc/host/sdhci-esdhc-imx.c | 9 +-
+ drivers/mmc/host/tmio_mmc.h | 5 ++
+ drivers/mmc/host/tmio_mmc_core.c | 17 ++--
+ drivers/net/dsa/lantiq_gswip.c | 6 ++
+ drivers/net/dsa/mv88e6xxx/chip.c | 14 +++-
+ drivers/net/dsa/mv88e6xxx/port.c | 8 +-
+ drivers/net/dsa/mv88e6xxx/port.h | 1 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 9 ++
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 4 +
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 +++
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++
+ drivers/net/ethernet/microchip/enc28j60.c | 2 +-
+ drivers/net/ethernet/microchip/lan743x_main.c | 16 +++-
+ drivers/net/geneve.c | 11 ++-
+ drivers/net/hyperv/netvsc_drv.c | 22 ++++-
+ drivers/net/phy/dp83867.c | 3 +
+ drivers/net/phy/micrel.c | 13 ++-
+ drivers/net/phy/phylink.c | 4 +
+ drivers/net/tun.c | 4 +-
+ drivers/net/xen-netback/hash.c | 2 +
+ drivers/net/xen-netback/interface.c | 7 ++
+ drivers/net/xen-netback/netback.c | 10 +--
+ drivers/scsi/3w-9xxx.c | 14 ++--
+ drivers/scsi/3w-sas.c | 12 ++-
+ drivers/scsi/aic94xx/aic94xx_init.c | 8 +-
+ drivers/scsi/bfa/bfad.c | 18 ++--
+ drivers/scsi/csiostor/csio_init.c | 7 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 8 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 +-
+ drivers/scsi/hptiop.c | 10 ++-
+ drivers/scsi/lpfc/lpfc_init.c | 19 +++--
+ drivers/scsi/scsi_lib.c | 1 -
+ drivers/tee/optee/core.c | 4 +-
+ fs/hugetlbfs/inode.c | 12 +++
+ fs/orangefs/file.c | 4 -
+ include/linux/netdevice.h | 2 +-
+ include/net/icmp.h | 9 +-
+ include/net/ip.h | 4 +-
+ kernel/bpf/syscall.c | 6 +-
+ kernel/bpf/verifier.c | 3 +-
+ lib/Kconfig.kasan | 22 +++++
+ mm/hugetlb.c | 16 +++-
+ mm/migrate.c | 11 +++
+ mm/mmap.c | 7 +-
+ net/dsa/dsa2.c | 16 ++--
+ net/dsa/port.c | 1 +
+ net/ipv4/cipso_ipv4.c | 20 ++++-
+ net/ipv4/fib_frontend.c | 4 +
+ net/ipv4/icmp.c | 7 +-
+ net/ipv4/ip_input.c | 9 +-
+ net/ipv4/ip_options.c | 22 +++--
+ net/ipv4/netlink.c | 17 +++-
+ net/ipv4/route.c | 2 +-
+ net/ipv6/route.c | 7 +-
+ net/ipv6/sit.c | 1 +
+ net/mpls/af_mpls.c | 3 +
+ net/netlabel/netlabel_kapi.c | 3 +-
+ net/nfc/llcp_commands.c | 20 +++++
+ net/nfc/llcp_core.c | 24 +++++-
+ net/sched/act_ipt.c | 3 +-
+ net/sched/act_skbedit.c | 3 +-
+ net/sched/act_tunnel_key.c | 3 +-
+ net/sched/sch_netem.c | 10 ++-
+ net/sctp/chunk.c | 2 +-
+ net/socket.c | 1 +
+ net/tipc/socket.c | 6 +-
+ scripts/Makefile.kasan | 2 +-
+ tools/testing/selftests/net/pmtu.sh | 96 ++++++++++++++++++----
+ tools/testing/selftests/net/udpgro.sh | 8 +-
+ tools/testing/selftests/net/udpgso_bench_rx.c | 42 +++++++---
+ virt/kvm/kvm_main.c | 2 +-
+ 98 files changed, 673 insertions(+), 196 deletions(-)
+Merging fixes/master (ed3ce4cfc919 adfs: mark expected switch fall-throughs)
+$ git merge fixes/master
+Merge made by the 'recursive' strategy.
+ drivers/scsi/aic7xxx/aic79xx_core.c | 14 +++++++++-----
+ drivers/scsi/bfa/bfa_fcs_lport.c | 8 ++------
+ drivers/scsi/bfa/bfa_fcs_rport.c | 19 +++++++------------
+ drivers/scsi/bfa/bfa_ioc.c | 9 +++------
+ drivers/scsi/esas2r/esas2r_init.c | 3 ++-
+ drivers/scsi/qla4xxx/ql4_os.c | 2 +-
+ drivers/scsi/st.c | 4 ++++
+ fs/adfs/dir_f.c | 6 ++++++
+ 8 files changed, 34 insertions(+), 31 deletions(-)
+Merging kspp-gustavo/for-next/kspp (6f6c95f09001 ASN.1: mark expected switch fall-through)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging fs/afs/yfsclient.c
+Auto-merging fs/afs/rxrpc.c
+Auto-merging fs/afs/flock.c
+Auto-merging drivers/scsi/lpfc/lpfc_nvme.c
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/syscall.h | 28 ++++++++++++++++++
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | 17 +++++++++++
+ drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 ++
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 2 ++
+ drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 1 +
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 12 ++++++--
+ drivers/scsi/be2iscsi/be_iscsi.c | 1 +
+ drivers/scsi/be2iscsi/be_main.c | 1 +
+ drivers/scsi/bfa/bfa_fcpim.c | 6 ++--
+ drivers/scsi/csiostor/csio_wr.c | 1 +
+ drivers/scsi/imm.c | 33 +++++++++++-----------
+ drivers/scsi/lpfc/lpfc_ct.c | 2 ++
+ drivers/scsi/lpfc/lpfc_els.c | 1 +
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 1 +
+ drivers/scsi/lpfc/lpfc_nvme.c | 1 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 8 +++---
+ drivers/scsi/osst.c | 6 ++++
+ drivers/scsi/ppa.c | 1 +
+ drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 ++
+ drivers/scsi/sym53c8xx_2/sym_nvram.c | 1 +
+ fs/affs/super.c | 3 +-
+ fs/afs/cmservice.c | 8 ++++++
+ fs/afs/file.c | 2 ++
+ fs/afs/flock.c | 1 +
+ fs/afs/fsclient.c | 31 ++++++++++++--------
+ fs/afs/misc.c | 9 ++++++
+ fs/afs/rxrpc.c | 1 +
+ fs/afs/vlclient.c | 18 +++++++-----
+ fs/afs/yfsclient.c | 30 +++++++++++++-------
+ fs/btrfs/ref-verify.c | 1 +
+ fs/btrfs/volumes.h | 1 +
+ fs/ceph/file.c | 1 +
+ fs/configfs/dir.c | 2 ++
+ fs/ext2/inode.c | 2 ++
+ fs/ext4/hash.c | 2 ++
+ fs/ext4/indirect.c | 4 +++
+ fs/f2fs/node.c | 2 ++
+ fs/fcntl.c | 2 +-
+ fs/gfs2/bmap.c | 4 +--
+ fs/jffs2/fs.c | 1 +
+ fs/libfs.c | 2 ++
+ fs/locks.c | 2 +-
+ fs/nfsd/nfs4proc.c | 1 +
+ fs/nfsd/nfs4state.c | 1 +
+ fs/ocfs2/cluster/quorum.c | 1 +
+ fs/seq_file.c | 1 +
+ fs/signalfd.c | 1 +
+ fs/ufs/util.h | 4 +--
+ kernel/time/hrtimer.c | 1 +
+ kernel/time/tick-broadcast.c | 1 +
+ kernel/time/timer.c | 1 +
+ lib/asn1_decoder.c | 4 +++
+ lib/cmdline.c | 5 ++++
+ lib/zstd/bitstream.h | 5 ++++
+ lib/zstd/compress.c | 1 +
+ lib/zstd/decompress.c | 5 +++-
+ lib/zstd/huf_compress.c | 2 ++
+ 64 files changed, 236 insertions(+), 64 deletions(-)
+Merging kbuild-current/fixes (207a369e3c08 sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (85d6adcbbe6d ARC: boot log: cut down on verbosity)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 9 ++
+ arch/arc/Makefile | 6 +
+ arch/arc/boot/dts/abilis_tb100.dtsi | 58 ++++-----
+ arch/arc/boot/dts/abilis_tb100_dvk.dts | 14 +--
+ arch/arc/boot/dts/abilis_tb101.dtsi | 58 ++++-----
+ arch/arc/boot/dts/abilis_tb101_dvk.dts | 14 +--
+ arch/arc/boot/dts/abilis_tb10x.dtsi | 60 ++++-----
+ arch/arc/boot/dts/axc001.dtsi | 6 +-
+ arch/arc/boot/dts/axc003.dtsi | 16 +--
+ arch/arc/boot/dts/axc003_idu.dtsi | 16 +--
+ arch/arc/boot/dts/axs10x_mb.dtsi | 22 ++--
+ arch/arc/boot/dts/hsdk.dts | 33 ++++-
+ arch/arc/boot/dts/vdk_axc003.dtsi | 4 +-
+ arch/arc/boot/dts/vdk_axc003_idu.dtsi | 4 +-
+ arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 18 +--
+ arch/arc/configs/hsdk_defconfig | 1 +
+ arch/arc/include/asm/arcregs.h | 12 +-
+ arch/arc/include/asm/irqflags-arcv2.h | 8 +-
+ arch/arc/include/asm/perf_event.h | 2 +-
+ arch/arc/kernel/head.S | 6 +
+ arch/arc/kernel/intc-arcv2.c | 2 +-
+ arch/arc/kernel/setup.c | 223 +++++++++++++++++----------------
+ arch/arc/kernel/troubleshoot.c | 5 +-
+ arch/arc/lib/Makefile | 8 +-
+ arch/arc/lib/memcpy-archs-unaligned.S | 47 +++++++
+ 25 files changed, 385 insertions(+), 267 deletions(-)
+ create mode 100644 arch/arc/lib/memcpy-archs-unaligned.S
+Merging arm-current/fixes (d410a8a49e3e ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/common/mcpm_entry.c | 2 +-
+ arch/arm/include/asm/suspend.h | 1 +
+ arch/arm/kernel/head-nommu.S | 4 ++--
+ arch/arm/kernel/patch.c | 6 +++---
+ arch/arm/kernel/sleep.S | 12 ++++++++++++
+ arch/arm/kernel/unwind.c | 14 +++++++-------
+ 6 files changed, 26 insertions(+), 13 deletions(-)
+Merging arm64-fixes/for-next/fixes (74698f6971f2 arm64: Relax GIC version check during early boot)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (8f5b27347e88 powerpc/powernv/sriov: Register IOMMU groups for VFs)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list)
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (46b1c18f9deb net: sched: put back q.qlen into a single location)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ include/net/sch_generic.h | 31 +++++++++++++------------------
+ net/core/gen_stats.c | 2 --
+ net/sched/sch_generic.c | 13 ++++++-------
+ 3 files changed, 19 insertions(+), 27 deletions(-)
+Merging bpf/master (07f12b26e21a net: sit: fix memory leak in sit_init_net())
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (d235c48b40d3 net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X)
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (ecef67cb10db tun: remove unnecessary memory barrier)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (d5fa9c55e5f3 Merge tag 'mlx5-updates-2019-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
+$ git merge wireless-drivers/master
+Auto-merging net/sched/sch_generic.c
+Removing net/ipv6/netfilter/nft_redir_ipv6.c
+Removing net/ipv6/netfilter/nft_masq_ipv6.c
+Removing net/ipv6/netfilter/nft_chain_nat_ipv6.c
+Removing net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+Removing net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
+Removing net/ipv4/netfilter/nft_redir_ipv4.c
+Removing net/ipv4/netfilter/nft_masq_ipv4.c
+Removing net/ipv4/netfilter/nft_chain_nat_ipv4.c
+Removing net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
+Auto-merging include/net/sch_generic.h
+Removing include/net/netfilter/nft_redir.h
+Removing include/net/netfilter/nft_masq.h
+Removing include/net/netfilter/nf_nat_l4proto.h
+Removing include/net/netfilter/nf_nat_l3proto.h
+Removing include/net/netfilter/nf_nat_core.h
+Removing drivers/net/wireless/mediatek/mt76/usb_mcu.c
+Removing drivers/net/wireless/intel/iwlwifi/mvm/tof.h
+Removing drivers/net/wireless/intel/iwlwifi/mvm/tof.c
+Removing drivers/net/wireless/intel/iwlwifi/fw/api/tof.h
+Removing drivers/net/phy/aquantia.c
+Removing drivers/net/ethernet/mellanox/mlx5/core/mad.c
+Removing arch/xtensa/include/uapi/asm/socket.h
+Removing arch/x86/include/uapi/asm/socket.h
+Removing arch/s390/include/uapi/asm/socket.h
+Removing arch/ia64/include/uapi/asm/socket.h
+Removing Documentation/networking/phy.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/bpf/btf.rst | 870 ++
+ Documentation/bpf/index.rst | 7 +
+ Documentation/devicetree/bindings/net/btusb.txt | 3 +
+ Documentation/devicetree/bindings/net/dsa/ksz.txt | 102 +-
+ .../devicetree/bindings/net/dsa/mt7530.txt | 6 +-
+ .../devicetree/bindings/net/fsl-enetc.txt | 69 +
+ Documentation/devicetree/bindings/net/macb.txt | 4 +-
+ .../bindings/net/marvell-armada-370-neta.txt | 2 +-
+ .../bindings/net/mdio-mux-multiplexer.txt | 82 +
+ .../devicetree/bindings/net/mediatek-bluetooth.txt | 64 +
+ Documentation/devicetree/bindings/net/nixge.txt | 72 +-
+ .../devicetree/bindings/net/qcom,ethqos.txt | 64 +
+ .../bindings/net/wireless/mediatek,mt76.txt | 19 +
+ .../bindings/phy/phy-armada38x-comphy.txt | 40 +
+ .../devicetree/bindings/ptp/ptp-qoriq.txt | 5 +
+ Documentation/driver-api/80211/mac80211.rst | 3 +
+ .../device_drivers/freescale/dpaa2/dpio-driver.rst | 14 +-
+ .../networking/device_drivers/intel/e100.rst | 1 +
+ .../networking/device_drivers/intel/e1000.rst | 1 +
+ .../networking/device_drivers/intel/e1000e.rst | 1 +
+ .../networking/device_drivers/intel/fm10k.rst | 1 +
+ .../networking/device_drivers/intel/i40e.rst | 1 +
+ .../networking/device_drivers/intel/iavf.rst | 1 +
+ .../networking/device_drivers/intel/ice.rst | 1 +
+ .../networking/device_drivers/intel/igb.rst | 1 +
+ .../networking/device_drivers/intel/igbvf.rst | 1 +
+ .../networking/device_drivers/intel/ixgb.rst | 1 +
+ .../networking/device_drivers/intel/ixgbe.rst | 1 +
+ .../networking/device_drivers/intel/ixgbevf.rst | 1 +
+ .../networking/device_drivers/stmicro/stmmac.txt | 2 +-
+ Documentation/networking/devlink-health.txt | 86 +
+ Documentation/networking/devlink-info-versions.rst | 43 +
+ Documentation/networking/devlink-params-mlxsw.txt | 10 +
+ Documentation/networking/dsa/dsa.txt | 13 -
+ Documentation/networking/filter.txt | 31 +-
+ .../networking/{ieee802154.txt => ieee802154.rst} | 193 +-
+ Documentation/networking/index.rst | 4 +
+ Documentation/networking/phy.rst | 447 +
+ Documentation/networking/phy.txt | 427 -
+ Documentation/networking/sfp-phylink.rst | 268 +
+ Documentation/networking/snmp_counter.rst | 295 +-
+ Documentation/networking/switchdev.txt | 27 +-
+ Documentation/networking/timestamping.txt | 43 +-
+ Documentation/sysctl/net.txt | 15 +
+ MAINTAINERS | 28 +-
+ arch/alpha/include/uapi/asm/socket.h | 49 +-
+ arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +
+ arch/arm/boot/dts/armada-38x.dtsi | 37 +
+ arch/arm/boot/dts/ls1021a.dtsi | 1 +
+ arch/arm/mach-orion5x/common.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
+ arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
+ arch/arm/net/bpf_jit_32.c | 53 +-
+ arch/arm/net/bpf_jit_32.h | 2 +
+ arch/arm/plat-orion/common.c | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 17 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 35 +
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 13 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 46 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 13 -
+ arch/arm64/net/bpf_jit_comp.c | 37 +-
+ arch/ia64/include/uapi/asm/Kbuild | 1 +
+ arch/ia64/include/uapi/asm/socket.h | 120 -
+ arch/m68k/coldfire/m5272.c | 2 +-
+ arch/mips/ar7/platform.c | 4 +-
+ arch/mips/bcm47xx/setup.c | 2 +-
+ arch/mips/include/uapi/asm/socket.h | 49 +-
+ arch/parisc/include/uapi/asm/socket.h | 48 +-
+ arch/powerpc/include/asm/ppc-opcode.h | 1 +
+ arch/powerpc/include/uapi/asm/socket.h | 4 +-
+ arch/powerpc/net/bpf_jit.h | 4 +
+ arch/powerpc/net/bpf_jit_comp64.c | 121 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/Makefile | 2 +-
+ arch/riscv/net/Makefile | 1 +
+ arch/riscv/net/bpf_jit_comp.c | 1602 ++
+ arch/s390/include/asm/pnet.h | 8 -
+ arch/s390/include/uapi/asm/Kbuild | 1 +
+ arch/s390/include/uapi/asm/socket.h | 117 -
+ arch/s390/net/bpf_jit_comp.c | 70 +-
+ arch/s390/net/pnet.c | 11 +
+ arch/sparc/include/uapi/asm/posix_types.h | 10 +
+ arch/sparc/include/uapi/asm/socket.h | 51 +-
+ arch/x86/include/uapi/asm/Kbuild | 1 +
+ arch/x86/include/uapi/asm/socket.h | 1 -
+ arch/x86/net/bpf_jit_comp.c | 46 +-
+ arch/x86/net/bpf_jit_comp32.c | 121 +-
+ arch/xtensa/include/asm/Kbuild | 1 +
+ arch/xtensa/include/uapi/asm/Kbuild | 1 +
+ arch/xtensa/include/uapi/asm/socket.h | 122 -
+ drivers/bcma/bcma_private.h | 9 +-
+ drivers/bcma/driver_gpio.c | 2 +-
+ drivers/bcma/host_pci.c | 2 +
+ drivers/bcma/host_soc.c | 4 +-
+ drivers/bcma/main.c | 45 +-
+ drivers/bluetooth/Kconfig | 4 +-
+ drivers/bluetooth/btmrvl_drv.h | 2 -
+ drivers/bluetooth/btmrvl_sdio.c | 43 +-
+ drivers/bluetooth/btmtkuart.c | 538 +-
+ drivers/bluetooth/btqca.c | 19 +
+ drivers/bluetooth/btqca.h | 8 +-
+ drivers/bluetooth/btqcomsmd.c | 31 +-
+ drivers/bluetooth/btrtl.c | 10 +-
+ drivers/bluetooth/btusb.c | 75 +
+ drivers/bluetooth/h4_recv.h | 7 +-
+ drivers/bluetooth/hci_h4.c | 4 +
+ drivers/bluetooth/hci_ldisc.c | 24 +-
+ drivers/bluetooth/hci_qca.c | 121 +-
+ drivers/crypto/chelsio/chtls/chtls_cm.c | 4 +
+ drivers/infiniband/hw/bnxt_re/Kconfig | 1 -
+ drivers/infiniband/hw/mlx4/Kconfig | 1 -
+ drivers/infiniband/hw/mlx5/cmd.c | 37 +
+ drivers/infiniband/hw/mlx5/cmd.h | 2 +
+ drivers/infiniband/hw/mlx5/ib_rep.c | 77 +-
+ drivers/infiniband/hw/mlx5/ib_rep.h | 10 +-
+ drivers/infiniband/hw/mlx5/mad.c | 11 +-
+ drivers/infiniband/hw/mlx5/main.c | 95 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 5 +-
+ drivers/infiniband/hw/mlx5/mr.c | 39 +-
+ drivers/isdn/gigaset/ser-gigaset.c | 2 +-
+ drivers/isdn/hisax/hfc_pci.c | 2 +-
+ drivers/isdn/hisax/netjet.c | 6 +-
+ drivers/isdn/hisax/q931.c | 2 +-
+ drivers/isdn/hisax/st5481.h | 2 +-
+ drivers/isdn/i4l/isdn_common.c | 7 +-
+ drivers/isdn/i4l/isdn_tty.c | 2 +-
+ drivers/isdn/i4l/isdn_v110.c | 2 +-
+ drivers/isdn/isdnloop/isdnloop.c | 2 +-
+ drivers/isdn/mISDN/socket.c | 2 +-
+ drivers/net/Kconfig | 8 +-
+ drivers/net/appletalk/cops.c | 2 +-
+ drivers/net/bonding/bond_3ad.c | 188 +-
+ drivers/net/bonding/bond_main.c | 1 -
+ drivers/net/bonding/bond_netlink.c | 67 +
+ drivers/net/bonding/bond_options.c | 2 +
+ drivers/net/caif/caif_spi.c | 30 +-
+ drivers/net/dsa/b53/b53_common.c | 4 +-
+ drivers/net/dsa/b53/b53_priv.h | 2 +-
+ drivers/net/dsa/bcm_sf2.c | 48 +-
+ drivers/net/dsa/bcm_sf2.h | 8 +-
+ drivers/net/dsa/bcm_sf2_cfp.c | 206 +-
+ drivers/net/dsa/bcm_sf2_regs.h | 4 +
+ drivers/net/dsa/dsa_loop.c | 2 +-
+ drivers/net/dsa/lan9303-core.c | 3 +-
+ drivers/net/dsa/lantiq_gswip.c | 29 +-
+ drivers/net/dsa/microchip/ksz9477.c | 154 +-
+ drivers/net/dsa/microchip/ksz_common.c | 144 +-
+ drivers/net/dsa/microchip/ksz_common.h | 23 +-
+ drivers/net/dsa/microchip/ksz_priv.h | 15 +-
+ drivers/net/dsa/mt7530.c | 103 +-
+ drivers/net/dsa/mt7530.h | 9 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 70 +-
+ drivers/net/dsa/mv88e6xxx/port.c | 2 +
+ drivers/net/dsa/mv88e6xxx/ptp.c | 2 +-
+ drivers/net/dsa/qca8k.c | 21 +-
+ drivers/net/dsa/qca8k.h | 1 +
+ drivers/net/dsa/rtl8366rb.c | 3 +-
+ drivers/net/dsa/vitesse-vsc73xx.c | 3 +-
+ drivers/net/ethernet/3com/3c509.c | 2 +
+ drivers/net/ethernet/3com/3c515.c | 4 +-
+ drivers/net/ethernet/3com/3c59x.c | 4 +-
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 6 +-
+ drivers/net/ethernet/amd/lance.c | 2 +-
+ drivers/net/ethernet/amd/ni65.c | 2 +-
+ drivers/net/ethernet/apple/mace.c | 2 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +-
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 14 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 25 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 16 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 21 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 12 +
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 2 +
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 116 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 68 +-
+ drivers/net/ethernet/arc/emac_main.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 4 +-
+ drivers/net/ethernet/broadcom/Kconfig | 1 -
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 178 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 12 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 106 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 27 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 196 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 58 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 256 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 12 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 4 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.c | 11 +-
+ drivers/net/ethernet/cadence/macb_main.c | 13 +-
+ drivers/net/ethernet/cavium/Kconfig | 1 -
+ .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_core.c | 3 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 24 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 25 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 15 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 213 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 166 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 450 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 322 +-
+ drivers/net/ethernet/chelsio/cxgb4/smt.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 98 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 6 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 32 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 14 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 252 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 37 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +-
+ drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 +-
+ drivers/net/ethernet/davicom/dm9000.c | 1 +
+ drivers/net/ethernet/dec/tulip/eeprom.c | 4 +-
+ drivers/net/ethernet/dlink/dl2k.c | 4 +-
+ drivers/net/ethernet/dlink/sundance.c | 5 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 4 -
+ drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
+ drivers/net/ethernet/fealnx.c | 2 +-
+ drivers/net/ethernet/freescale/Kconfig | 1 +
+ drivers/net/ethernet/freescale/Makefile | 3 +
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +-
+ drivers/net/ethernet/freescale/dpaa2/Makefile | 1 +
+ .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 237 +
+ .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h | 31 +
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 208 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 42 +-
+ drivers/net/ethernet/freescale/enetc/Kconfig | 31 +
+ drivers/net/ethernet/freescale/enetc/Makefile | 19 +
+ drivers/net/ethernet/freescale/enetc/enetc.c | 1604 ++
+ drivers/net/ethernet/freescale/enetc/enetc.h | 230 +
+ drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 210 +
+ .../net/ethernet/freescale/enetc/enetc_ethtool.c | 597 +
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 533 +
+ drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 199 +
+ drivers/net/ethernet/freescale/enetc/enetc_msg.c | 164 +
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 943 ++
+ drivers/net/ethernet/freescale/enetc/enetc_pf.h | 55 +
+ drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 144 +
+ drivers/net/ethernet/freescale/enetc/enetc_vf.c | 255 +
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 5 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 7 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.c | 47 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 22 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 676 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 18 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 78 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 92 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 17 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 97 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 4 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 105 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 5 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 808 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 55 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 133 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 25 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 4 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 155 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 20 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 192 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 5 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 12 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 13 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 3 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 28 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 14 +
+ drivers/net/ethernet/huawei/hinic/hinic_main.c | 10 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 11 +-
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 8 +-
+ drivers/net/ethernet/i825xx/lib82596.c | 2 +-
+ drivers/net/ethernet/ibm/emac/Kconfig | 12 -
+ drivers/net/ethernet/ibm/emac/core.c | 64 +-
+ drivers/net/ethernet/ibm/emac/core.h | 10 +-
+ drivers/net/ethernet/intel/e1000e/80003es2lan.c | 33 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 21 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 14 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 26 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 244 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 221 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 124 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 -
+ drivers/net/ethernet/intel/iavf/iavf_main.c | 195 +-
+ drivers/net/ethernet/intel/ice/ice.h | 18 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 77 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 181 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 11 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 812 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_lib.c | 378 +-
+ drivers/net/ethernet/intel/ice/ice_lib.h | 5 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 264 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.c | 82 +
+ drivers/net/ethernet/intel/ice/ice_sched.c | 197 +-
+ drivers/net/ethernet/intel/ice/ice_sched.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 9 +
+ drivers/net/ethernet/intel/ice/ice_status.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_switch.c | 17 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 97 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 32 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 94 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 75 +-
+ drivers/net/ethernet/intel/igc/Makefile | 3 +-
+ drivers/net/ethernet/intel/igc/igc.h | 34 +-
+ drivers/net/ethernet/intel/igc/igc_base.c | 76 +-
+ drivers/net/ethernet/intel/igc/igc_base.h | 25 -
+ drivers/net/ethernet/intel/igc/igc_defines.h | 4 +
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 1032 ++
+ drivers/net/ethernet/intel/igc/igc_hw.h | 1 +
+ drivers/net/ethernet/intel/igc/igc_main.c | 118 +-
+ drivers/net/ethernet/intel/igc/igc_phy.c | 8 -
+ drivers/net/ethernet/intel/igc/igc_regs.h | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +-
+ .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 17 -
+ drivers/net/ethernet/jme.c | 5 +-
+ drivers/net/ethernet/lantiq_etop.c | 6 +-
+ drivers/net/ethernet/lantiq_xrx200.c | 1 -
+ drivers/net/ethernet/marvell/mvneta.c | 63 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 15 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 450 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 11 +-
+ drivers/net/ethernet/mediatek/Kconfig | 2 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 50 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 -
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 57 +-
+ .../mellanox/mlx5/core/diag/fs_tracepoint.c | 2 +
+ .../mellanox/mlx5/core/diag/fs_tracepoint.h | 35 +
+ drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 112 +
+ drivers/net/ethernet/mellanox/mlx5/core/ecpf.h | 33 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 52 +-
+ .../ethernet/mellanox/mlx5/core/en/monitor_stats.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 142 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/en/reporter.h | 15 +
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 309 +
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 90 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 319 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 342 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 177 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 154 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 940 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 16 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 444 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 74 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 505 +-
+ drivers/net/ethernet/mellanox/mlx5/core/events.c | 2 +
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 78 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.h | 65 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 315 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 26 +
+ .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 205 +
+ .../net/ethernet/mellanox/mlx5/core/lib/port_tun.h | 24 +
+ drivers/net/ethernet/mellanox/mlx5/core/mad.c | 75 -
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 73 +
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 11 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 54 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 115 +-
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 18 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 35 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 35 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 35 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h | 35 +-
+ .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h | 35 +-
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h | 36 +-
+ .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h | 35 +-
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c | 35 +-
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h | 36 +-
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 -
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 11 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 6 +
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 117 +
+ drivers/net/ethernet/mellanox/mlxsw/core_env.h | 10 +
+ drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 275 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 477 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 260 +-
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 855 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 55 +-
+ .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 6 +-
+ .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 25 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 27 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 40 +-
+ .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 40 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 1 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 145 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 1330 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 40 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 313 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 257 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 4 +-
+ .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 157 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 296 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 128 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 37 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 2 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c | 217 +-
+ drivers/net/ethernet/microchip/lan743x_main.h | 17 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 13 +-
+ drivers/net/ethernet/moxa/moxart_ether.h | 1 +
+ drivers/net/ethernet/mscc/ocelot.c | 68 +-
+ drivers/net/ethernet/mscc/ocelot.h | 1 +
+ drivers/net/ethernet/mscc/ocelot_board.c | 2 +
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 72 +-
+ drivers/net/ethernet/natsemi/sonic.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +-
+ drivers/net/ethernet/netronome/Kconfig | 1 -
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 229 +-
+ drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/bpf/main.h | 51 +-
+ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 13 +-
+ drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 74 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 201 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 8 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 3 +
+ drivers/net/ethernet/netronome/nfp/flower/main.c | 109 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 89 +-
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 413 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 27 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 155 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 612 +-
+ drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 +
+ drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 181 +
+ drivers/net/ethernet/netronome/nfp/nfp_main.c | 41 +
+ drivers/net/ethernet/netronome/nfp/nfp_main.h | 2 +
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 +-
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 53 -
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 5 +-
+ drivers/net/ethernet/netronome/nfp/nfp_port.c | 23 +-
+ drivers/net/ethernet/netronome/nfp/nfp_port.h | 4 +-
+ .../net/ethernet/netronome/nfp/nfp_shared_buf.c | 1 +
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 346 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 21 +
+ .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 6 +-
+ drivers/net/ethernet/ni/nixge.c | 118 +-
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 2 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 11 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 13 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 253 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 12 +
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 3 +-
+ drivers/net/ethernet/qlogic/qed/qed_hw.c | 11 +
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 126 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 3 +
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 32 +
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 121 +
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 56 +-
+ drivers/net/ethernet/qlogic/qed/qed_ptp.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 +
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 22 +
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 9 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 3 +
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 11 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c | 572 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 292 +-
+ drivers/net/ethernet/qlogic/qede/qede_rdma.c | 63 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 +-
+ drivers/net/ethernet/realtek/atp.c | 27 +-
+ drivers/net/ethernet/realtek/r8169.c | 750 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 79 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 3 +-
+ drivers/net/ethernet/rocker/rocker.h | 2 -
+ drivers/net/ethernet/rocker/rocker_main.c | 125 +-
+ drivers/net/ethernet/rocker/rocker_ofdpa.c | 15 +-
+ drivers/net/ethernet/sfc/ef10.c | 16 +-
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sfc/mcdi.c | 56 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 8 +
+ drivers/net/ethernet/sfc/mtd.c | 3 +
+ drivers/net/ethernet/sfc/rx.c | 3 +-
+ drivers/net/ethernet/sfc/tx.c | 2 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 2 +-
+ drivers/net/ethernet/sgi/meth.c | 27 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/sis/sis900.c | 2 +-
+ drivers/net/ethernet/smsc/smc911x.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 545 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 24 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 7 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 176 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 9 +-
+ drivers/net/ethernet/sun/sungem.c | 2 +-
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
+ drivers/net/fddi/skfp/pcmplc.c | 1 +
+ drivers/net/hamradio/baycom_ser_fdx.c | 26 -
+ drivers/net/ipvlan/Makefile | 3 +-
+ drivers/net/ipvlan/ipvlan.h | 37 +-
+ drivers/net/ipvlan/ipvlan_core.c | 105 +-
+ drivers/net/ipvlan/ipvlan_l3s.c | 227 +
+ drivers/net/ipvlan/ipvlan_main.c | 117 +-
+ drivers/net/macvlan.c | 10 +-
+ drivers/net/netdevsim/bpf.c | 5 +-
+ drivers/net/netdevsim/netdev.c | 23 +-
+ drivers/net/phy/Kconfig | 12 +
+ drivers/net/phy/Makefile | 5 +
+ drivers/net/phy/amd.c | 7 +-
+ drivers/net/phy/aquantia.c | 193 -
+ drivers/net/phy/aquantia.h | 16 +
+ drivers/net/phy/aquantia_hwmon.c | 250 +
+ drivers/net/phy/aquantia_main.c | 283 +
+ drivers/net/phy/at803x.c | 77 +-
+ drivers/net/phy/bcm-cygnus.c | 10 +-
+ drivers/net/phy/bcm-phy-lib.c | 10 +-
+ drivers/net/phy/bcm-phy-lib.h | 10 +-
+ drivers/net/phy/bcm63xx.c | 6 +-
+ drivers/net/phy/bcm7xxx.c | 6 +-
+ drivers/net/phy/bcm87xx.c | 7 +-
+ drivers/net/phy/broadcom.c | 6 +-
+ drivers/net/phy/cicada.c | 7 +-
+ drivers/net/phy/cortina.c | 11 +-
+ drivers/net/phy/davicom.c | 7 +-
+ drivers/net/phy/dp83640.c | 15 +-
+ drivers/net/phy/dp83822.c | 12 +-
+ drivers/net/phy/dp83848.c | 12 +-
+ drivers/net/phy/dp83867.c | 59 +-
+ drivers/net/phy/dp83tc811.c | 15 +-
+ drivers/net/phy/et1011c.c | 7 +-
+ drivers/net/phy/fixed_phy.c | 121 +-
+ drivers/net/phy/icplus.c | 7 +-
+ drivers/net/phy/intel-xway.c | 11 +-
+ drivers/net/phy/lxt.c | 7 +-
+ drivers/net/phy/marvell.c | 7 +-
+ drivers/net/phy/marvell10g.c | 237 +-
+ drivers/net/phy/mdio-bcm-iproc.c | 10 +-
+ drivers/net/phy/mdio-bcm-unimac.c | 6 +-
+ drivers/net/phy/mdio-bitbang.c | 7 +-
+ drivers/net/phy/mdio-boardinfo.c | 6 +-
+ drivers/net/phy/mdio-cavium.c | 7 +-
+ drivers/net/phy/mdio-cavium.h | 5 +-
+ drivers/net/phy/mdio-gpio.c | 7 +-
+ drivers/net/phy/mdio-i2c.c | 5 +-
+ drivers/net/phy/mdio-i2c.h | 5 +-
+ drivers/net/phy/mdio-moxart.c | 7 +-
+ drivers/net/phy/mdio-mux-bcm-iproc.c | 13 +-
+ drivers/net/phy/mdio-mux-gpio.c | 7 +-
+ drivers/net/phy/mdio-mux-mmioreg.c | 5 +-
+ drivers/net/phy/mdio-mux-multiplexer.c | 122 +
+ drivers/net/phy/mdio-mux.c | 7 +-
+ drivers/net/phy/mdio-octeon.c | 7 +-
+ drivers/net/phy/mdio-sun4i.c | 7 +-
+ drivers/net/phy/mdio-thunder.c | 7 +-
+ drivers/net/phy/mdio-xgene.c | 14 +-
+ drivers/net/phy/mdio-xgene.h | 14 +-
+ drivers/net/phy/mdio_bus.c | 20 +-
+ drivers/net/phy/mdio_device.c | 7 +-
+ drivers/net/phy/meson-gxl.c | 12 +-
+ drivers/net/phy/micrel.c | 49 +-
+ drivers/net/phy/microchip.c | 14 +-
+ drivers/net/phy/mscc.c | 1 +
+ drivers/net/phy/national.c | 7 +-
+ drivers/net/phy/phy-c45.c | 290 +-
+ drivers/net/phy/phy-core.c | 354 +-
+ drivers/net/phy/phy.c | 107 +-
+ drivers/net/phy/phy_device.c | 395 +-
+ drivers/net/phy/phy_led_triggers.c | 14 +-
+ drivers/net/phy/phylink.c | 41 +-
+ drivers/net/phy/qsemi.c | 7 +-
+ drivers/net/phy/realtek.c | 16 +-
+ drivers/net/phy/sfp.c | 1 +
+ drivers/net/phy/smsc.c | 6 +-
+ drivers/net/phy/spi_ks8995.c | 5 +-
+ drivers/net/phy/ste10Xp.c | 7 +-
+ drivers/net/phy/swphy.c | 16 +-
+ drivers/net/phy/teranetics.c | 5 +-
+ drivers/net/phy/uPD60620.c | 7 +-
+ drivers/net/phy/vitesse.c | 9 +-
+ drivers/net/phy/xilinx_gmii2rgmii.c | 11 +-
+ drivers/net/sb1000.c | 11 +-
+ drivers/net/tap.c | 4 +-
+ drivers/net/team/team.c | 1 -
+ drivers/net/tun.c | 4 +-
+ drivers/net/usb/cdc-phonet.c | 4 +-
+ drivers/net/usb/lan78xx.c | 3 +-
+ drivers/net/usb/pegasus.c | 1 +
+ drivers/net/usb/rtl8150.c | 3 +-
+ drivers/net/usb/sr9700.c | 2 +-
+ drivers/net/veth.c | 7 +-
+ drivers/net/virtio_net.c | 1 +
+ drivers/net/vxlan.c | 575 +-
+ drivers/net/wan/cosa.c | 2 +-
+ drivers/net/wan/dscc4.c | 50 +-
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ drivers/net/wan/lmc/Makefile | 2 +-
+ drivers/net/wan/lmc/lmc_main.c | 3 +-
+ drivers/net/wan/sbni.c | 2 +-
+ drivers/net/wan/wanxl.c | 7 +-
+ drivers/net/wan/z85230.c | 2 +-
+ drivers/net/wimax/i2400m/rx.c | 4 +-
+ drivers/net/wimax/i2400m/usb.c | 1 +
+ drivers/net/wireless/ath/ath10k/Makefile | 2 +-
+ drivers/net/wireless/ath/ath10k/ahb.c | 16 +-
+ drivers/net/wireless/ath/ath10k/ahb.h | 13 +-
+ drivers/net/wireless/ath/ath10k/bmi.c | 13 +-
+ drivers/net/wireless/ath/ath10k/bmi.h | 13 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 183 +-
+ drivers/net/wireless/ath/ath10k/ce.h | 31 +-
+ drivers/net/wireless/ath/ath10k/core.c | 74 +-
+ drivers/net/wireless/ath/ath10k/core.h | 44 +-
+ drivers/net/wireless/ath/ath10k/coredump.c | 15 +-
+ drivers/net/wireless/ath/ath10k/coredump.h | 13 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 20 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 33 +-
+ drivers/net/wireless/ath/ath10k/debugfs_sta.c | 30 +-
+ drivers/net/wireless/ath/ath10k/hif.h | 29 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 22 +-
+ drivers/net/wireless/ath/ath10k/htc.h | 14 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 15 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 135 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 153 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 70 +-
+ drivers/net/wireless/ath/ath10k/hw.c | 55 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 48 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 249 +-
+ drivers/net/wireless/ath/ath10k/mac.h | 13 +-
+ drivers/net/wireless/ath/ath10k/p2p.c | 13 +-
+ drivers/net/wireless/ath/ath10k/p2p.h | 13 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 62 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 16 +-
+ drivers/net/wireless/ath/ath10k/qmi.c | 13 +-
+ drivers/net/wireless/ath/ath10k/qmi.h | 13 +-
+ drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 242 +-
+ drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 47 +-
+ drivers/net/wireless/ath/ath10k/rx_desc.h | 13 +-
+ drivers/net/wireless/ath/ath10k/sdio.c | 83 +-
+ drivers/net/wireless/ath/ath10k/sdio.h | 13 +-
+ drivers/net/wireless/ath/ath10k/snoc.c | 93 +-
+ drivers/net/wireless/ath/ath10k/snoc.h | 15 +-
+ drivers/net/wireless/ath/ath10k/spectral.c | 16 +-
+ drivers/net/wireless/ath/ath10k/spectral.h | 13 +-
+ drivers/net/wireless/ath/ath10k/swap.c | 13 +-
+ drivers/net/wireless/ath/ath10k/swap.h | 13 +-
+ drivers/net/wireless/ath/ath10k/targaddrs.h | 13 +-
+ drivers/net/wireless/ath/ath10k/testmode.c | 15 +-
+ drivers/net/wireless/ath/ath10k/testmode.h | 13 +-
+ drivers/net/wireless/ath/ath10k/testmode_i.h | 13 +-
+ drivers/net/wireless/ath/ath10k/thermal.c | 13 +-
+ drivers/net/wireless/ath/ath10k/thermal.h | 13 +-
+ drivers/net/wireless/ath/ath10k/trace.c | 13 +-
+ drivers/net/wireless/ath/ath10k/trace.h | 13 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 19 +-
+ drivers/net/wireless/ath/ath10k/txrx.h | 13 +-
+ drivers/net/wireless/ath/ath10k/usb.c | 16 +-
+ drivers/net/wireless/ath/ath10k/usb.h | 13 +-
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 44 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 197 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 68 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 133 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 121 +-
+ drivers/net/wireless/ath/ath10k/wow.c | 20 +-
+ drivers/net/wireless/ath/ath10k/wow.h | 13 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 12 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 14 -
+ drivers/net/wireless/ath/ath9k/common-spectral.c | 3 +
+ drivers/net/wireless/ath/ath9k/debug.c | 5 +-
+ drivers/net/wireless/ath/ath9k/debug.h | 8 -
+ drivers/net/wireless/ath/ath9k/debug_sta.c | 70 -
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +-
+ drivers/net/wireless/ath/ath9k/init.c | 9 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 18 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 247 +-
+ drivers/net/wireless/ath/carl9170/rx.c | 2 +-
+ drivers/net/wireless/ath/regd.h | 2 +
+ drivers/net/wireless/ath/regd_common.h | 2 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 20 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 23 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 12 +-
+ drivers/net/wireless/ath/wil6210/main.c | 13 +-
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 10 +-
+ drivers/net/wireless/ath/wil6210/trace.h | 3 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 254 +-
+ drivers/net/wireless/ath/wil6210/txrx.h | 51 +-
+ drivers/net/wireless/ath/wil6210/txrx_edma.c | 11 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 16 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 83 +-
+ drivers/net/wireless/broadcom/b43/debugfs.c | 36 +-
+ drivers/net/wireless/broadcom/b43legacy/debugfs.c | 35 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 22 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 10 +
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 577 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 48 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 135 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 19 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 15 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 22 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +-
+ .../broadcom/brcm80211/brcmfmac/firmware.c | 8 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 25 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 18 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 10 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.c | 38 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 114 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 88 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 65 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 27 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 71 +-
+ .../broadcom/brcm80211/brcmfmac/tracepoint.c | 9 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 10 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/debug.c | 26 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/debug.h | 2 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +-
+ .../wireless/broadcom/brcm80211/brcmutil/Makefile | 4 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 5 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +-
+ drivers/net/wireless/intel/iwlegacy/common.h | 6 +-
+ drivers/net/wireless/intel/iwlegacy/debug.c | 34 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 162 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 141 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 47 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 23 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/main.c | 21 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 32 +
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 22 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 48 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 28 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 10 +
+ .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 55 +
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 180 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 33 +-
+ .../net/wireless/intel/iwlwifi/fw/api/location.h | 878 ++
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 27 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 26 +-
+ .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 51 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 24 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 11 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 15 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 19 +-
+ .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 34 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tof.h | 393 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 18 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1302 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 107 +-
+ drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 11 +-
+ drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 106 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 37 +-
+ drivers/net/wireless/intel/iwlwifi/fw/img.h | 31 +-
+ drivers/net/wireless/intel/iwlwifi/fw/init.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 26 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 67 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 6 +
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 23 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 104 +-
+ .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 3 +-
+ .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 47 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-io.c | 120 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-io.h | 82 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 18 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 96 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 11 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 41 +
+ drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 7 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 10 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 813 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 229 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 654 +
+ .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 244 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 148 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/led.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 322 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 577 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 262 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 15 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 177 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 25 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 23 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 21 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 56 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 12 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 197 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 20 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 519 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 33 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 305 -
+ drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 89 -
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 186 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 66 +-
+ .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 16 +-
+ .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 297 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 74 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 194 +-
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 254 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 22 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 75 +-
+ drivers/net/wireless/intersil/orinoco/mic.c | 10 +-
+ drivers/net/wireless/mac80211_hwsim.c | 7 +-
+ drivers/net/wireless/marvell/libertas/debugfs.c | 6 -
+ drivers/net/wireless/marvell/libertas/mesh.c | 5 +
+ drivers/net/wireless/marvell/libertas_tf/cmd.c | 9 +-
+ drivers/net/wireless/marvell/libertas_tf/if_usb.c | 38 +-
+ .../net/wireless/marvell/libertas_tf/libertas_tf.h | 18 +-
+ drivers/net/wireless/marvell/libertas_tf/main.c | 105 +-
+ drivers/net/wireless/marvell/mwifiex/Kconfig | 2 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 23 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 5 +-
+ drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 +
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 5 +
+ drivers/net/wireless/marvell/mwifiex/sdio.h | 70 +
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 11 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/Kconfig | 1 +
+ drivers/net/wireless/mediatek/mt76/Makefile | 6 +-
+ drivers/net/wireless/mediatek/mt76/dma.c | 60 +-
+ drivers/net/wireless/mediatek/mt76/dma.h | 2 +-
+ drivers/net/wireless/mediatek/mt76/eeprom.c | 24 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 82 +-
+ drivers/net/wireless/mediatek/mt76/mcu.c | 60 +
+ drivers/net/wireless/mediatek/mt76/mt76.h | 72 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/Kconfig | 9 +
+ drivers/net/wireless/mediatek/mt76/mt7603/Makefile | 6 +
+ drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 186 +
+ drivers/net/wireless/mediatek/mt76/mt7603/core.c | 73 +
+ .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 56 +
+ drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 215 +
+ drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 168 +
+ drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h | 86 +
+ drivers/net/wireless/mediatek/mt76/mt7603/init.c | 578 +
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 1749 +++
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.h | 242 +
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 709 +
+ drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 483 +
+ drivers/net/wireless/mediatek/mt76/mt7603/mcu.h | 110 +
+ drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 253 +
+ drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 80 +
+ drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 774 +
+ drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 85 +
+ drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 16 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 7 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 41 +-
+ .../net/wireless/mediatek/mt76/mt76x0/initvals.h | 1 +
+ drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 4 -
+ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 30 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 9 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 44 +-
+ .../net/wireless/mediatek/mt76/mt76x0/usb_mcu.c | 7 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02.h | 30 +-
+ .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 6 +
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 303 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 18 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 70 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h | 6 +
+ drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 166 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 47 -
+ drivers/net/wireless/mediatek/mt76/mt76x02_phy.h | 1 -
+ drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 38 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 14 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 17 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 102 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 167 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 1 +
+ drivers/net/wireless/mediatek/mt76/mt76x2/mac.c | 3 +
+ drivers/net/wireless/mediatek/mt76/mt76x2/mac.h | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h | 23 -
+ drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 -
+ .../net/wireless/mediatek/mt76/mt76x2/mt76x2u.h | 2 -
+ drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 26 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 96 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 6 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_phy.c | 1 +
+ drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 6 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 35 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 37 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c | 13 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 24 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_mcu.c | 2 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_phy.c | 3 +-
+ drivers/net/wireless/mediatek/mt76/tx.c | 22 +-
+ drivers/net/wireless/mediatek/mt76/usb.c | 210 +-
+ drivers/net/wireless/mediatek/mt76/usb_mcu.c | 56 -
+ drivers/net/wireless/mediatek/mt76/util.c | 42 +
+ drivers/net/wireless/mediatek/mt7601u/dma.c | 6 +-
+ drivers/net/wireless/mediatek/mt7601u/eeprom.h | 2 +-
+ drivers/net/wireless/quantenna/Makefile | 1 +
+ drivers/net/wireless/quantenna/qtnfmac/bus.h | 19 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 83 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 92 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.h | 24 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.c | 21 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/debug.c | 31 +-
+ drivers/net/wireless/quantenna/qtnfmac/debug.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c | 197 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.h | 17 +-
+ .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 6 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 63 +-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.c | 16 +-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.h | 28 +-
+ .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h | 17 +-
+ .../net/wireless/quantenna/qtnfmac/shm_ipc_defs.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/trans.c | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/trans.h | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/util.c | 17 +-
+ drivers/net/wireless/quantenna/qtnfmac/util.h | 17 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 143 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 27 -
+ drivers/net/wireless/ralink/rt2x00/rt61pci.c | 93 +-
+ drivers/net/wireless/ray_cs.c | 4 +-
+ .../net/wireless/realtek/rtl818x/rtl8180/Makefile | 2 +-
+ drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 8 +-
+ .../net/wireless/realtek/rtl818x/rtl8187/Makefile | 2 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 40 +-
+ drivers/net/wireless/realtek/rtlwifi/base.h | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbt_precomp.h | 27 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 35 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h | 27 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 27 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 27 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h | 27 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h | 26 +-
+ .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 17 +-
+ .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 17 +-
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 26 +-
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 27 +-
+ .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 27 +-
+ .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 25 +-
+ drivers/net/wireless/realtek/rtlwifi/cam.c | 27 +-
+ drivers/net/wireless/realtek/rtlwifi/cam.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 36 +-
+ drivers/net/wireless/realtek/rtlwifi/core.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.c | 39 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.h | 27 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.c | 79 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.h | 28 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/ps.c | 27 +-
+ drivers/net/wireless/realtek/rtlwifi/ps.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/rc.c | 28 +-
+ drivers/net/wireless/realtek/rtlwifi/rc.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/regd.c | 35 +-
+ drivers/net/wireless/realtek/rtlwifi/regd.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 29 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/table.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 32 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/dm_common.h | 30 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 45 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/fw_common.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192c/main.c | 27 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 51 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/phy_common.h | 32 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/dm.h | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 73 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 37 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.h | 32 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/reg.h | 85 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 138 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/table.c | 29 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 38 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/dm.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 313 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.h | 34 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/led.h | 24 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 34 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.h | 29 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 42 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/reg.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 138 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/table.c | 34 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/table.h | 42 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 95 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 32 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 50 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 42 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 92 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 94 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/reg.h | 54 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/table.c | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/table.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.h | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/reg.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/table.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/def.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/dm.h | 29 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 36 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.h | 33 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 48 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/led.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 70 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/phy.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/reg.h | 75 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/rf.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/table.c | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/table.h | 20 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.h | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/btc.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/def.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 121 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 25 +-
+ .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c | 26 +-
+ .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h | 25 +-
+ .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 29 +-
+ .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 34 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 28 +-
+ .../wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h | 44 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/reg.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 36 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/table.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 29 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/dm.h | 23 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 40 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 32 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/phy.h | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8723be/pwrseq.c | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8723be/pwrseq.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/reg.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/table.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 26 +-
+ .../realtek/rtlwifi/rtl8723com/dm_common.c | 26 +-
+ .../realtek/rtlwifi/rtl8723com/dm_common.h | 26 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.c | 26 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723com/main.c | 26 +-
+ .../realtek/rtlwifi/rtl8723com/phy_common.c | 26 +-
+ .../realtek/rtlwifi/rtl8723com/phy_common.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/def.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.h | 36 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 128 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 260 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/led.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/led.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 158 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.h | 30 +-
+ .../wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c | 26 +-
+ .../wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/reg.h | 60 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.h | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 213 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/table.h | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/stats.c | 27 +-
+ drivers/net/wireless/realtek/rtlwifi/stats.h | 26 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 33 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.h | 31 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 403 +-
+ drivers/net/wireless/rsi/rsi_91x_debugfs.c | 13 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c | 3 +
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 106 +-
+ drivers/net/wireless/rsi/rsi_91x_main.c | 7 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 174 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 39 +-
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 9 +-
+ drivers/net/wireless/rsi/rsi_main.h | 23 +
+ drivers/net/wireless/rsi/rsi_mgmt.h | 35 +
+ drivers/net/wireless/st/cw1200/debug.c | 26 +-
+ drivers/net/wireless/st/cw1200/fwio.c | 4 +-
+ drivers/net/wireless/st/cw1200/queue.c | 1 -
+ drivers/net/wireless/st/cw1200/scan.c | 5 +-
+ drivers/net/wireless/ti/wl1251/debugfs.c | 59 +-
+ drivers/net/wireless/ti/wl12xx/debugfs.c | 20 +-
+ drivers/net/wireless/ti/wl18xx/debugfs.c | 20 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 2 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c | 28 +-
+ drivers/net/wireless/ti/wlcore/debugfs.h | 10 +-
+ drivers/net/wireless/ti/wlcore/main.c | 7 +-
+ drivers/net/wireless/virt_wifi.c | 8 -
+ drivers/net/xen-netback/netback.c | 15 +-
+ drivers/net/xen-netback/xenbus.c | 2 +-
+ drivers/of/of_mdio.c | 9 +-
+ drivers/phy/marvell/Kconfig | 10 +
+ drivers/phy/marvell/Makefile | 1 +
+ drivers/phy/marvell/phy-armada38x-comphy.c | 237 +
+ drivers/ptp/Kconfig | 4 +-
+ drivers/ptp/Makefile | 4 +-
+ drivers/ptp/ptp_qoriq.c | 518 +-
+ drivers/ptp/ptp_qoriq_debugfs.c | 101 +
+ drivers/s390/net/Makefile | 2 +-
+ drivers/s390/net/qeth_core.h | 164 +-
+ drivers/s390/net/qeth_core_main.c | 1202 +-
+ drivers/s390/net/qeth_core_mpc.c | 23 +-
+ drivers/s390/net/qeth_core_mpc.h | 17 +-
+ drivers/s390/net/qeth_core_sys.c | 64 +-
+ drivers/s390/net/qeth_ethtool.c | 370 +
+ drivers/s390/net/qeth_l2_main.c | 548 +-
+ drivers/s390/net/qeth_l3_main.c | 363 +-
+ drivers/s390/net/qeth_l3_sys.c | 12 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 76 +-
+ drivers/usb/core/usb-acpi.c | 163 +-
+ fs/dlm/lowcomms.c | 4 +-
+ include/linux/bcma/bcma.h | 11 +-
+ include/linux/bpf-cgroup.h | 2 +-
+ include/linux/bpf.h | 94 +-
+ include/linux/bpf_types.h | 2 +
+ include/linux/bpf_verifier.h | 7 +
+ include/linux/btf.h | 1 +
+ include/linux/etherdevice.h | 1 +
+ include/linux/ethtool.h | 19 +-
+ include/linux/filter.h | 25 +-
+ include/linux/fsl/ptp_qoriq.h | 70 +-
+ include/linux/ieee80211.h | 117 +-
+ include/linux/igmp.h | 19 +-
+ include/linux/in.h | 5 +
+ include/linux/ip.h | 5 +
+ include/linux/ipv6.h | 6 +
+ include/linux/marvell_phy.h | 2 +
+ include/linux/mdio.h | 44 +
+ include/linux/mlx5/device.h | 9 +-
+ include/linux/mlx5/driver.h | 68 +-
+ include/linux/mlx5/eswitch.h | 19 +-
+ include/linux/mlx5/mlx5_ifc.h | 91 +-
+ include/linux/mlx5/port.h | 32 +-
+ include/linux/mlx5/vport.h | 35 +-
+ include/linux/mm_types.h | 7 +
+ include/linux/netdevice.h | 60 +-
+ include/linux/netfilter/nf_conntrack_proto_gre.h | 17 +-
+ include/linux/netfilter/x_tables.h | 4 +-
+ include/linux/netfilter_ipv4.h | 6 -
+ include/linux/netfilter_ipv6.h | 60 +-
+ include/linux/netlink.h | 1 +
+ include/linux/objagg.h | 21 +-
+ include/linux/phy.h | 169 +-
+ include/linux/phy_fixed.h | 23 +-
+ include/linux/phylink.h | 8 +
+ include/linux/platform_data/b53.h | 2 +-
+ include/linux/platform_data/dsa.h | 68 +
+ include/linux/platform_data/mv88e6xxx.h | 2 +-
+ include/linux/ptr_ring.h | 1 -
+ include/linux/qed/qed_if.h | 22 +-
+ include/linux/qed/qede_rdma.h | 10 +-
+ include/linux/rhashtable.h | 8 -
+ include/linux/skbuff.h | 46 +-
+ include/linux/socket.h | 8 +
+ include/linux/virtio_net.h | 2 +-
+ include/net/act_api.h | 2 +-
+ include/net/addrconf.h | 28 +-
+ include/net/bluetooth/bluetooth.h | 2 +-
+ include/net/bluetooth/hci.h | 12 +
+ include/net/bluetooth/hci_core.h | 1 +
+ include/net/bond_3ad.h | 17 +
+ include/net/cfg80211.h | 288 +-
+ include/net/devlink.h | 370 +
+ include/net/dsa.h | 71 +-
+ include/net/flow.h | 2 +
+ include/net/flow_offload.h | 203 +
+ include/net/ieee80211_radiotap.h | 9 +-
+ include/net/inet_connection_sock.h | 29 +-
+ include/net/inet_frag.h | 16 +-
+ include/net/ip_tunnels.h | 5 +-
+ include/net/ip_vs.h | 3 -
+ include/net/ipv6_frag.h | 11 +-
+ include/net/lwtunnel.h | 2 +
+ include/net/mac80211.h | 223 +-
+ include/net/net_namespace.h | 4 +
+ include/net/netfilter/br_netfilter.h | 1 -
+ include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 +
+ include/net/netfilter/ipv4/nf_reject.h | 1 +
+ include/net/netfilter/ipv6/nf_reject.h | 1 +
+ include/net/netfilter/nf_conntrack.h | 12 +-
+ include/net/netfilter/nf_conntrack_core.h | 5 +-
+ include/net/netfilter/nf_conntrack_l4proto.h | 122 +-
+ include/net/netfilter/nf_nat.h | 49 +-
+ include/net/netfilter/nf_nat_core.h | 29 -
+ include/net/netfilter/nf_nat_l3proto.h | 50 -
+ include/net/netfilter/nf_nat_l4proto.h | 16 -
+ include/net/netfilter/nf_reject.h | 27 +
+ include/net/netfilter/nf_tables.h | 29 +-
+ include/net/netfilter/nf_tables_core.h | 16 +
+ include/net/netfilter/nft_masq.h | 22 -
+ include/net/netfilter/nft_redir.h | 22 -
+ include/net/netlink.h | 8 +-
+ include/net/netns/conntrack.h | 30 +-
+ include/net/netns/ipv6.h | 2 +-
+ include/net/netns/xdp.h | 13 +
+ include/net/pkt_cls.h | 28 +-
+ include/net/sch_generic.h | 71 +-
+ include/net/sctp/structs.h | 4 +
+ include/net/smc.h | 1 +
+ include/net/sock.h | 1 +
+ include/net/switchdev.h | 84 +-
+ include/net/tc_act/tc_csum.h | 2 +-
+ include/net/tc_act/tc_gact.h | 2 +-
+ include/net/tc_act/tc_mirred.h | 4 +-
+ include/net/tc_act/tc_pedit.h | 2 +-
+ include/net/tc_act/tc_sample.h | 2 +-
+ include/net/tc_act/tc_skbedit.h | 2 +-
+ include/net/tc_act/tc_tunnel_key.h | 4 +-
+ include/net/tc_act/tc_vlan.h | 2 +-
+ include/net/tcp.h | 20 +-
+ include/net/tls.h | 118 +-
+ include/net/vxlan.h | 37 +-
+ include/net/xdp_sock.h | 1 +
+ include/trace/events/devlink.h | 98 +
+ include/trace/events/mlxsw.h | 119 +
+ include/trace/events/neigh.h | 206 +
+ include/uapi/asm-generic/socket.h | 50 +-
+ include/uapi/linux/batadv_packet.h | 4 +-
+ include/uapi/linux/batman_adv.h | 192 +-
+ include/uapi/linux/bpf.h | 106 +-
+ include/uapi/linux/devlink.h | 47 +
+ include/uapi/linux/errqueue.h | 5 +
+ include/uapi/linux/ethtool.h | 35 +-
+ include/uapi/linux/icmpv6.h | 2 +
+ include/uapi/linux/if_bonding.h | 24 +
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/igmp.h | 1 +
+ include/uapi/linux/in.h | 9 +-
+ include/uapi/linux/mdio.h | 19 +
+ include/uapi/linux/mroute.h | 9 +-
+ include/uapi/linux/mroute6.h | 9 +-
+ include/uapi/linux/netfilter/nf_tables.h | 19 +-
+ include/uapi/linux/nl80211.h | 44 +-
+ include/uapi/linux/pkt_cls.h | 58 +-
+ include/uapi/linux/pkt_sched.h | 2 +-
+ include/uapi/linux/rds.h | 11 +
+ include/uapi/linux/sctp.h | 4 +
+ include/uapi/linux/tc_act/tc_bpf.h | 2 -
+ include/uapi/linux/tc_act/tc_connmark.h | 2 -
+ include/uapi/linux/tc_act/tc_csum.h | 2 -
+ include/uapi/linux/tc_act/tc_gact.h | 1 -
+ include/uapi/linux/tc_act/tc_ife.h | 1 -
+ include/uapi/linux/tc_act/tc_ipt.h | 3 -
+ include/uapi/linux/tc_act/tc_mirred.h | 1 -
+ include/uapi/linux/tc_act/tc_nat.h | 2 -
+ include/uapi/linux/tc_act/tc_pedit.h | 2 -
+ include/uapi/linux/tc_act/tc_sample.h | 2 -
+ include/uapi/linux/tc_act/tc_skbedit.h | 2 -
+ include/uapi/linux/tc_act/tc_skbmod.h | 2 -
+ include/uapi/linux/tc_act/tc_tunnel_key.h | 2 -
+ include/uapi/linux/tc_act/tc_vlan.h | 2 -
+ include/uapi/linux/time.h | 29 +-
+ include/uapi/linux/time_types.h | 40 +
+ include/uapi/linux/tls.h | 19 +
+ include/uapi/linux/xdp_diag.h | 72 +
+ kernel/Kconfig.locks | 3 +
+ kernel/bpf/arraymap.c | 23 +-
+ kernel/bpf/btf.c | 146 +-
+ kernel/bpf/cgroup.c | 3 +-
+ kernel/bpf/core.c | 278 +-
+ kernel/bpf/disasm.c | 34 +-
+ kernel/bpf/hashtab.c | 63 +-
+ kernel/bpf/helpers.c | 96 +
+ kernel/bpf/local_storage.c | 16 +-
+ kernel/bpf/map_in_map.c | 5 +
+ kernel/bpf/offload.c | 45 +-
+ kernel/bpf/syscall.c | 45 +-
+ kernel/bpf/verifier.c | 954 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ lib/objagg.c | 583 +-
+ lib/rhashtable.c | 2 +-
+ lib/test_objagg.c | 199 +-
+ lib/test_rhashtable.c | 13 +-
+ net/6lowpan/debugfs.c | 42 +-
+ net/8021q/vlan_dev.c | 1 -
+ net/Kconfig | 13 +-
+ net/atm/proc.c | 3 +-
+ net/batman-adv/Kconfig | 2 +-
+ net/batman-adv/Makefile | 2 +-
+ net/batman-adv/bat_algo.c | 2 +-
+ net/batman-adv/bat_algo.h | 2 +-
+ net/batman-adv/bat_iv_ogm.c | 2 +-
+ net/batman-adv/bat_iv_ogm.h | 2 +-
+ net/batman-adv/bat_v.c | 2 +-
+ net/batman-adv/bat_v.h | 2 +-
+ net/batman-adv/bat_v_elp.c | 2 +-
+ net/batman-adv/bat_v_elp.h | 2 +-
+ net/batman-adv/bat_v_ogm.c | 2 +-
+ net/batman-adv/bat_v_ogm.h | 2 +-
+ net/batman-adv/bitarray.c | 2 +-
+ net/batman-adv/bitarray.h | 2 +-
+ net/batman-adv/bridge_loop_avoidance.c | 2 +-
+ net/batman-adv/bridge_loop_avoidance.h | 2 +-
+ net/batman-adv/debugfs.c | 2 +-
+ net/batman-adv/debugfs.h | 2 +-
+ net/batman-adv/distributed-arp-table.c | 403 +-
+ net/batman-adv/distributed-arp-table.h | 21 +-
+ net/batman-adv/fragmentation.c | 2 +-
+ net/batman-adv/fragmentation.h | 2 +-
+ net/batman-adv/gateway_client.c | 3 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 3 +-
+ net/batman-adv/gateway_common.h | 8 +-
+ net/batman-adv/hard-interface.c | 2 +-
+ net/batman-adv/hard-interface.h | 2 +-
+ net/batman-adv/hash.c | 2 +-
+ net/batman-adv/hash.h | 2 +-
+ net/batman-adv/icmp_socket.c | 2 +-
+ net/batman-adv/icmp_socket.h | 2 +-
+ net/batman-adv/log.c | 2 +-
+ net/batman-adv/log.h | 2 +-
+ net/batman-adv/main.c | 2 +-
+ net/batman-adv/main.h | 4 +-
+ net/batman-adv/multicast.c | 6 +-
+ net/batman-adv/multicast.h | 2 +-
+ net/batman-adv/netlink.c | 1082 +-
+ net/batman-adv/netlink.h | 8 +-
+ net/batman-adv/network-coding.c | 2 +-
+ net/batman-adv/network-coding.h | 2 +-
+ net/batman-adv/originator.c | 2 +-
+ net/batman-adv/originator.h | 2 +-
+ net/batman-adv/routing.c | 6 +-
+ net/batman-adv/routing.h | 2 +-
+ net/batman-adv/send.c | 2 +-
+ net/batman-adv/send.h | 2 +-
+ net/batman-adv/soft-interface.c | 15 +-
+ net/batman-adv/soft-interface.h | 2 +-
+ net/batman-adv/sysfs.c | 66 +-
+ net/batman-adv/sysfs.h | 2 +-
+ net/batman-adv/tp_meter.c | 2 +-
+ net/batman-adv/tp_meter.h | 2 +-
+ net/batman-adv/trace.c | 2 +-
+ net/batman-adv/trace.h | 2 +-
+ net/batman-adv/translation-table.c | 2 +-
+ net/batman-adv/translation-table.h | 2 +-
+ net/batman-adv/tvlv.c | 2 +-
+ net/batman-adv/tvlv.h | 2 +-
+ net/batman-adv/types.h | 2 +-
+ net/bluetooth/6lowpan.c | 11 +-
+ net/bluetooth/a2mp.c | 2 +-
+ net/bluetooth/af_bluetooth.c | 16 +-
+ net/bluetooth/hci_core.c | 48 +-
+ net/bluetooth/hci_event.c | 8 +-
+ net/bluetooth/hci_sock.c | 7 +-
+ net/bluetooth/l2cap_core.c | 84 +-
+ net/bluetooth/l2cap_sock.c | 2 +-
+ net/bluetooth/mgmt.c | 14 +-
+ net/bluetooth/rfcomm/core.c | 1 +
+ net/bluetooth/rfcomm/sock.c | 2 +-
+ net/bluetooth/sco.c | 2 +-
+ net/bpf/test_run.c | 82 +
+ net/bpfilter/Makefile | 2 +-
+ net/bpfilter/main.c | 2 +-
+ net/bridge/br_fdb.c | 3 +-
+ net/bridge/br_multicast.c | 177 +-
+ net/bridge/br_netfilter_hooks.c | 8 +-
+ net/bridge/br_private.h | 3 +-
+ net/bridge/br_switchdev.c | 28 +-
+ net/bridge/netfilter/ebtables.c | 137 +-
+ net/bridge/netfilter/nft_reject_bridge.c | 10 +-
+ net/caif/cfpkt_skbuff.c | 16 +-
+ net/compat.c | 78 +-
+ net/core/Makefile | 2 +-
+ net/core/dev.c | 98 +-
+ net/core/devlink.c | 2036 ++-
+ net/core/dst.c | 6 +-
+ net/core/ethtool.c | 262 +-
+ net/core/filter.c | 582 +-
+ net/core/flow_dissector.c | 92 +-
+ net/core/flow_offload.c | 153 +
+ net/core/lwt_bpf.c | 265 +-
+ net/core/lwtunnel.c | 16 +-
+ net/core/neighbour.c | 11 +
+ net/core/net-sysfs.c | 12 +-
+ net/core/net-traces.c | 8 +
+ net/core/net_namespace.c | 38 +-
+ net/core/page_pool.c | 22 +-
+ net/core/rtnetlink.c | 128 +-
+ net/core/scm.c | 27 +
+ net/core/skmsg.c | 25 +-
+ net/core/sock.c | 253 +-
+ net/core/sysctl_net_core.c | 18 +
+ net/dccp/input.c | 2 +-
+ net/dccp/timer.c | 4 +-
+ net/decnet/dn_fib.c | 2 +-
+ net/dsa/Kconfig | 2 +-
+ net/dsa/dsa2.c | 3 +-
+ net/dsa/dsa_priv.h | 9 +-
+ net/dsa/master.c | 56 +-
+ net/dsa/port.c | 61 +-
+ net/dsa/slave.c | 166 +-
+ net/dsa/switch.c | 42 +
+ net/dsa/tag_dsa.c | 9 +
+ net/dsa/tag_edsa.c | 9 +
+ net/dsa/tag_ksz.c | 2 +
+ net/ethernet/eth.c | 13 +
+ net/ieee802154/6lowpan/reassembly.c | 142 +-
+ net/ipv4/af_inet.c | 11 +-
+ net/ipv4/devinet.c | 86 +-
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/icmp.c | 4 +-
+ net/ipv4/igmp.c | 104 +-
+ net/ipv4/inet_fragment.c | 301 +-
+ net/ipv4/ip_fragment.c | 291 +-
+ net/ipv4/ip_gre.c | 112 +-
+ net/ipv4/ip_input.c | 2 +-
+ net/ipv4/ip_tunnel.c | 104 +-
+ net/ipv4/ip_tunnel_core.c | 18 +
+ net/ipv4/ipconfig.c | 27 +-
+ net/ipv4/ipip.c | 2 +-
+ net/ipv4/ipmr.c | 149 +-
+ net/ipv4/netfilter.c | 18 -
+ net/ipv4/netfilter/Kconfig | 50 +-
+ net/ipv4/netfilter/Makefile | 7 -
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
+ net/ipv4/netfilter/iptable_nat.c | 8 +-
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 388 -
+ net/ipv4/netfilter/nf_reject_ipv4.c | 9 +-
+ net/ipv4/netfilter/nft_chain_nat_ipv4.c | 87 -
+ net/ipv4/netfilter/nft_masq_ipv4.c | 90 -
+ net/ipv4/netfilter/nft_redir_ipv4.c | 82 -
+ net/ipv4/route.c | 79 +-
+ net/ipv4/tcp.c | 108 +-
+ net/ipv4/tcp_bbr.c | 180 +-
+ net/ipv4/tcp_input.c | 43 +-
+ net/ipv4/tcp_ipv4.c | 4 +-
+ net/ipv4/tcp_minisocks.c | 55 +-
+ net/ipv4/tcp_output.c | 82 +-
+ net/ipv4/tcp_timer.c | 87 +-
+ net/ipv4/udp_tunnel.c | 15 +-
+ net/ipv6/addrconf.c | 95 +-
+ net/ipv6/addrconf_core.c | 6 +
+ net/ipv6/addrlabel.c | 47 +-
+ net/ipv6/af_inet6.c | 7 +
+ net/ipv6/icmp.c | 32 +-
+ net/ipv6/ila/ila_xlat.c | 17 +-
+ net/ipv6/ip6_gre.c | 4 +-
+ net/ipv6/ip6_offload.c | 33 +-
+ net/ipv6/ip6_udp_tunnel.c | 15 +-
+ net/ipv6/ip6mr.c | 78 +-
+ net/ipv6/mcast.c | 2 +
+ net/ipv6/mcast_snoop.c | 84 +-
+ net/ipv6/netfilter.c | 13 +-
+ net/ipv6/netfilter/Kconfig | 48 +-
+ net/ipv6/netfilter/Makefile | 7 -
+ net/ipv6/netfilter/ip6table_nat.c | 8 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 261 +-
+ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 412 -
+ net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 223 -
+ net/ipv6/netfilter/nf_reject_ipv6.c | 3 +
+ net/ipv6/netfilter/nft_chain_nat_ipv6.c | 85 -
+ net/ipv6/netfilter/nft_fib_ipv6.c | 9 +-
+ net/ipv6/netfilter/nft_masq_ipv6.c | 91 -
+ net/ipv6/netfilter/nft_redir_ipv6.c | 83 -
+ net/ipv6/reassembly.c | 234 +-
+ net/ipv6/route.c | 78 +-
+ net/ipv6/tcp_ipv6.c | 4 +-
+ net/kcm/kcmsock.c | 4 +-
+ net/mac80211/agg-tx.c | 2 +-
+ net/mac80211/cfg.c | 14 +-
+ net/mac80211/debugfs.c | 8 +-
+ net/mac80211/debugfs_sta.c | 103 +-
+ net/mac80211/driver-ops.h | 38 +-
+ net/mac80211/ht.c | 8 +
+ net/mac80211/ibss.c | 8 +-
+ net/mac80211/ieee80211_i.h | 39 +-
+ net/mac80211/main.c | 24 +-
+ net/mac80211/mesh.c | 10 +-
+ net/mac80211/mesh.h | 2 +
+ net/mac80211/mesh_hwmp.c | 32 +-
+ net/mac80211/mesh_pathtbl.c | 24 +-
+ net/mac80211/mesh_plink.c | 4 +-
+ net/mac80211/mlme.c | 269 +-
+ net/mac80211/rc80211_minstrel_ht.c | 25 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 7 +-
+ net/mac80211/rx.c | 21 +-
+ net/mac80211/scan.c | 160 +-
+ net/mac80211/spectmgmt.c | 6 +
+ net/mac80211/sta_info.c | 46 +-
+ net/mac80211/sta_info.h | 38 +
+ net/mac80211/status.c | 6 +
+ net/mac80211/tdls.c | 6 +-
+ net/mac80211/trace.h | 46 +-
+ net/mac80211/tx.c | 154 +-
+ net/mac80211/util.c | 137 +-
+ net/mpls/af_mpls.c | 103 +-
+ net/mpls/mpls_iptunnel.c | 4 +-
+ net/netfilter/Kconfig | 16 +-
+ net/netfilter/Makefile | 6 +-
+ net/netfilter/ipvs/ip_vs_core.c | 49 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 18 +-
+ net/netfilter/ipvs/ip_vs_ftp.c | 4 +-
+ net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 2 -
+ net/netfilter/ipvs/ip_vs_proto_sctp.c | 15 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 23 +-
+ net/netfilter/ipvs/ip_vs_proto_udp.c | 23 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 4 +-
+ net/netfilter/nf_conntrack_amanda.c | 9 +-
+ net/netfilter/nf_conntrack_core.c | 235 +-
+ net/netfilter/nf_conntrack_expect.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 18 +-
+ net/netfilter/nf_conntrack_pptp.c | 2 +-
+ net/netfilter/nf_conntrack_proto.c | 514 +-
+ net/netfilter/nf_conntrack_proto_dccp.c | 134 +-
+ net/netfilter/nf_conntrack_proto_generic.c | 85 +-
+ net/netfilter/nf_conntrack_proto_gre.c | 196 +-
+ net/netfilter/nf_conntrack_proto_icmp.c | 67 +-
+ net/netfilter/nf_conntrack_proto_icmpv6.c | 69 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 128 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 210 +-
+ net/netfilter/nf_conntrack_proto_udp.c | 80 +-
+ net/netfilter/nf_conntrack_sip.c | 42 +
+ net/netfilter/nf_conntrack_standalone.c | 427 +-
+ net/netfilter/nf_flow_table_core.c | 2 +-
+ net/netfilter/nf_nat_core.c | 209 +-
+ net/netfilter/nf_nat_helper.c | 15 +-
+ .../nf_nat_masquerade.c} | 208 +-
+ net/netfilter/nf_nat_proto.c | 744 +-
+ net/netfilter/nf_tables_api.c | 145 +-
+ net/netfilter/nf_tables_core.c | 40 +-
+ net/netfilter/nfnetlink_cttimeout.c | 19 +-
+ net/netfilter/nft_bitwise.c | 5 +-
+ net/netfilter/nft_byteorder.c | 6 +-
+ net/netfilter/nft_chain_nat.c | 108 +
+ net/netfilter/nft_cmp.c | 6 +-
+ net/netfilter/nft_compat.c | 281 +-
+ net/netfilter/nft_counter.c | 2 +-
+ net/netfilter/nft_ct.c | 4 +-
+ net/netfilter/nft_dynset.c | 5 +-
+ net/netfilter/nft_hash.c | 121 -
+ net/netfilter/nft_immediate.c | 6 +-
+ net/netfilter/nft_masq.c | 180 +-
+ net/netfilter/nft_meta.c | 12 +
+ net/netfilter/nft_nat.c | 2 -
+ net/netfilter/nft_objref.c | 5 +-
+ net/netfilter/nft_payload.c | 6 +-
+ net/netfilter/nft_quota.c | 2 +-
+ net/netfilter/nft_range.c | 5 +-
+ net/netfilter/nft_redir.c | 154 +-
+ net/netfilter/nft_rt.c | 6 +-
+ net/netfilter/nft_set_hash.c | 38 +-
+ net/netfilter/nft_tunnel.c | 41 +-
+ net/netfilter/utils.c | 25 +-
+ net/netfilter/x_tables.c | 4 +-
+ net/netfilter/xt_CT.c | 2 +-
+ net/netfilter/xt_IDLETIMER.c | 14 +-
+ net/netfilter/xt_addrtype.c | 16 +-
+ net/netfilter/xt_nat.c | 2 +-
+ net/netfilter/xt_physdev.c | 9 +-
+ net/netfilter/xt_recent.c | 4 +-
+ net/netlink/af_netlink.c | 18 +-
+ net/openvswitch/Kconfig | 2 -
+ net/openvswitch/conntrack.c | 14 +-
+ net/openvswitch/meter.c | 3 +-
+ net/packet/af_packet.c | 26 +-
+ net/rds/af_rds.c | 47 +-
+ net/rds/connection.c | 21 +-
+ net/rds/ib.c | 11 +
+ net/rds/ib.h | 4 +-
+ net/rds/ib_cm.c | 72 +-
+ net/rds/ib_recv.c | 4 +-
+ net/rds/ib_send.c | 5 +-
+ net/rds/rdma_transport.c | 14 +
+ net/rds/rdma_transport.h | 6 +
+ net/rds/rds.h | 14 +-
+ net/rds/recv.c | 19 +-
+ net/rds/send.c | 7 +-
+ net/rds/tcp.c | 8 +
+ net/rds/tcp_listen.c | 2 +-
+ net/rds/threads.c | 1 +
+ net/rose/af_rose.c | 4 +-
+ net/rxrpc/local_object.c | 2 +-
+ net/sched/act_api.c | 2 +-
+ net/sched/act_bpf.c | 2 +-
+ net/sched/act_connmark.c | 2 +-
+ net/sched/act_csum.c | 33 +-
+ net/sched/act_gact.c | 2 +-
+ net/sched/act_ife.c | 2 +-
+ net/sched/act_ipt.c | 4 +-
+ net/sched/act_mirred.c | 2 +-
+ net/sched/act_nat.c | 2 +-
+ net/sched/act_pedit.c | 4 +-
+ net/sched/act_police.c | 2 +-
+ net/sched/act_sample.c | 2 +-
+ net/sched/act_simple.c | 4 +-
+ net/sched/act_skbedit.c | 2 +-
+ net/sched/act_skbmod.c | 2 +-
+ net/sched/act_tunnel_key.c | 29 +-
+ net/sched/act_vlan.c | 2 +-
+ net/sched/cls_api.c | 1327 +-
+ net/sched/cls_basic.c | 41 +-
+ net/sched/cls_bpf.c | 17 +-
+ net/sched/cls_cgroup.c | 17 +-
+ net/sched/cls_flow.c | 17 +-
+ net/sched/cls_flower.c | 97 +-
+ net/sched/cls_fw.c | 20 +-
+ net/sched/cls_matchall.c | 45 +-
+ net/sched/cls_route.c | 21 +-
+ net/sched/cls_rsvp.h | 23 +-
+ net/sched/cls_tcindex.c | 34 +-
+ net/sched/cls_u32.c | 22 +-
+ net/sched/sch_api.c | 26 +-
+ net/sched/sch_generic.c | 8 +-
+ net/sched/sch_pie.c | 110 +-
+ net/sctp/associola.c | 9 +-
+ net/sctp/outqueue.c | 2 +-
+ net/sctp/socket.c | 773 +-
+ net/smc/af_smc.c | 116 +-
+ net/smc/smc_cdc.c | 29 +-
+ net/smc/smc_cdc.h | 9 +-
+ net/smc/smc_close.c | 7 +-
+ net/smc/smc_core.c | 11 +-
+ net/smc/smc_diag.c | 3 +-
+ net/smc/smc_ib.c | 25 +-
+ net/smc/smc_ib.h | 2 +
+ net/smc/smc_netns.h | 20 +
+ net/smc/smc_pnet.c | 669 +-
+ net/smc/smc_pnet.h | 13 +-
+ net/smc/smc_tx.c | 17 +-
+ net/socket.c | 50 +-
+ net/switchdev/switchdev.c | 269 +-
+ net/tipc/link.c | 2 +-
+ net/tipc/socket.c | 4 +-
+ net/tipc/topsrv.c | 3 -
+ net/tipc/trace.c | 4 +-
+ net/tls/tls_device.c | 29 +-
+ net/tls/tls_device_fallback.c | 3 +-
+ net/tls/tls_main.c | 126 +-
+ net/tls/tls_sw.c | 616 +-
+ net/vmw_vsock/af_vsock.c | 6 +-
+ net/wireless/core.h | 13 +-
+ net/wireless/mlme.c | 8 +-
+ net/wireless/nl80211.c | 168 +-
+ net/wireless/nl80211.h | 3 +-
+ net/wireless/pmsr.c | 2 +-
+ net/wireless/reg.c | 77 +-
+ net/wireless/reg.h | 2 +
+ net/wireless/scan.c | 595 +-
+ net/wireless/util.c | 6 +-
+ net/wireless/wext-compat.c | 2 +
+ net/xdp/Kconfig | 8 +
+ net/xdp/Makefile | 1 +
+ net/xdp/xdp_umem.c | 14 +
+ net/xdp/xsk.c | 36 +-
+ net/xdp/xsk.h | 12 +
+ net/xdp/xsk_diag.c | 191 +
+ samples/bpf/Makefile | 8 +-
+ samples/bpf/bpf_insn.h | 20 +
+ samples/bpf/xdp1_user.c | 34 +-
+ samples/bpf/xdp_adjust_tail_user.c | 38 +-
+ samples/bpf/xdp_redirect_cpu_user.c | 196 +-
+ samples/bpf/xdp_redirect_map_user.c | 106 +-
+ samples/bpf/xdp_redirect_user.c | 103 +-
+ samples/bpf/xdp_router_ipv4_user.c | 179 +-
+ samples/bpf/xdp_rxq_info_user.c | 41 +-
+ samples/bpf/xdp_sample_pkts_user.c | 81 +-
+ samples/bpf/xdp_tx_iptunnel_user.c | 71 +-
+ samples/bpf/xdpsock_user.c | 30 +-
+ tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 5 +-
+ .../bpf/bpftool/Documentation/bpftool-feature.rst | 85 +
+ tools/bpf/bpftool/Documentation/bpftool-map.rst | 29 +-
+ tools/bpf/bpftool/Documentation/bpftool-net.rst | 1 +
+ tools/bpf/bpftool/Documentation/bpftool-perf.rst | 1 +
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 3 +-
+ tools/bpf/bpftool/Documentation/bpftool.rst | 5 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 110 +-
+ tools/bpf/bpftool/btf_dumper.c | 98 +-
+ tools/bpf/bpftool/cfg.c | 9 +-
+ tools/bpf/bpftool/feature.c | 764 +
+ tools/bpf/bpftool/main.c | 3 +-
+ tools/bpf/bpftool/main.h | 4 +
+ tools/bpf/bpftool/map.c | 232 +-
+ tools/bpf/bpftool/prog.c | 10 +-
+ tools/include/linux/filter.h | 20 +
+ tools/include/uapi/linux/bpf.h | 106 +-
+ tools/include/uapi/linux/if_link.h | 1 +
+ tools/include/uapi/linux/tc_act/tc_bpf.h | 2 -
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/Makefile | 17 +-
+ tools/lib/bpf/bpf.c | 80 +-
+ tools/lib/bpf/bpf.h | 3 +
+ tools/lib/bpf/btf.c | 2164 ++-
+ tools/lib/bpf/btf.h | 45 +-
+ tools/lib/bpf/libbpf.c | 202 +-
+ tools/lib/bpf/libbpf.h | 41 +-
+ tools/lib/bpf/libbpf.map | 24 +
+ tools/lib/bpf/libbpf_probes.c | 242 +
+ tools/lib/bpf/libbpf_util.h | 30 +
+ tools/lib/bpf/netlink.c | 85 +
+ tools/lib/bpf/test_libbpf.cpp | 4 +-
+ tools/perf/util/bpf-loader.c | 26 +-
+ tools/testing/selftests/bpf/.gitignore | 1 +
+ tools/testing/selftests/bpf/Makefile | 108 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 8 +
+ tools/testing/selftests/bpf/bpf_util.h | 9 +
+ tools/testing/selftests/bpf/flow_dissector_load.c | 43 +-
+ tools/testing/selftests/bpf/flow_dissector_load.h | 55 +
+ tools/testing/selftests/bpf/{ => progs}/bpf_flow.c | 0
+ .../selftests/bpf/{ => progs}/connect4_prog.c | 0
+ .../selftests/bpf/{ => progs}/connect6_prog.c | 0
+ .../testing/selftests/bpf/{ => progs}/dev_cgroup.c | 0
+ .../selftests/bpf/{ => progs}/get_cgroup_id_kern.c | 0
+ .../selftests/bpf/{ => progs}/netcnt_prog.c | 0
+ .../selftests/bpf/{ => progs}/sample_map_ret0.c | 0
+ .../selftests/bpf/{ => progs}/sample_ret0.c | 0
+ .../selftests/bpf/{ => progs}/sendmsg4_prog.c | 0
+ .../selftests/bpf/{ => progs}/sendmsg6_prog.c | 0
+ .../selftests/bpf/{ => progs}/socket_cookie_prog.c | 0
+ .../selftests/bpf/{ => progs}/sockmap_parse_prog.c | 0
+ .../bpf/{ => progs}/sockmap_tcp_msg_prog.c | 0
+ .../bpf/{ => progs}/sockmap_verdict_prog.c | 0
+ .../selftests/bpf/{ => progs}/test_adjust_tail.c | 0
+ .../selftests/bpf/{ => progs}/test_btf_haskv.c | 0
+ .../selftests/bpf/{ => progs}/test_btf_nokv.c | 0
+ .../bpf/{ => progs}/test_get_stack_rawtp.c | 0
+ .../testing/selftests/bpf/{ => progs}/test_l4lb.c | 0
+ .../selftests/bpf/{ => progs}/test_l4lb_noinline.c | 0
+ .../bpf/{ => progs}/test_lirc_mode2_kern.c | 0
+ .../selftests/bpf/progs/test_lwt_ip_encap.c | 85 +
+ .../selftests/bpf/{ => progs}/test_lwt_seg6local.c | 0
+ .../selftests/bpf/{ => progs}/test_map_in_map.c | 0
+ tools/testing/selftests/bpf/progs/test_map_lock.c | 66 +
+ .../selftests/bpf/{ => progs}/test_obj_id.c | 0
+ .../selftests/bpf/{ => progs}/test_pkt_access.c | 0
+ .../selftests/bpf/{ => progs}/test_pkt_md_access.c | 0
+ .../selftests/bpf/{ => progs}/test_queue_map.c | 0
+ .../bpf/{ => progs}/test_select_reuseport_kern.c | 0
+ .../bpf/{ => progs}/test_sk_lookup_kern.c | 0
+ .../bpf/{ => progs}/test_skb_cgroup_id_kern.c | 0
+ .../selftests/bpf/progs/test_sock_fields_kern.c | 152 +
+ .../selftests/bpf/{ => progs}/test_sockhash_kern.c | 0
+ .../selftests/bpf/{ => progs}/test_sockmap_kern.c | 0
+ tools/testing/selftests/bpf/progs/test_spin_lock.c | 108 +
+ .../selftests/bpf/{ => progs}/test_stack_map.c | 0
+ .../bpf/{ => progs}/test_stacktrace_build_id.c | 0
+ .../bpf/{ => progs}/test_stacktrace_map.c | 0
+ .../selftests/bpf/{ => progs}/test_tcp_estats.c | 0
+ .../selftests/bpf/{ => progs}/test_tcpbpf_kern.c | 0
+ .../bpf/{ => progs}/test_tcpnotify_kern.c | 0
+ .../selftests/bpf/{ => progs}/test_tracepoint.c | 0
+ .../selftests/bpf/{ => progs}/test_tunnel_kern.c | 0
+ tools/testing/selftests/bpf/{ => progs}/test_xdp.c | 0
+ .../selftests/bpf/{ => progs}/test_xdp_meta.c | 0
+ .../selftests/bpf/{ => progs}/test_xdp_noinline.c | 0
+ .../selftests/bpf/{ => progs}/test_xdp_redirect.c | 0
+ .../selftests/bpf/{ => progs}/test_xdp_vlan.c | 0
+ .../testing/selftests/bpf/{ => progs}/xdp_dummy.c | 0
+ tools/testing/selftests/bpf/tcp_client.py | 3 +-
+ tools/testing/selftests/bpf/tcp_server.py | 5 +-
+ tools/testing/selftests/bpf/test_btf.c | 1246 +-
+ tools/testing/selftests/bpf/test_flow_dissector.c | 2 -
+ tools/testing/selftests/bpf/test_libbpf_open.c | 30 +-
+ tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 376 +
+ tools/testing/selftests/bpf/test_maps.c | 41 +-
+ tools/testing/selftests/bpf/test_offload.py | 135 +-
+ tools/testing/selftests/bpf/test_progs.c | 209 +-
+ tools/testing/selftests/bpf/test_sock.c | 9 +-
+ tools/testing/selftests/bpf/test_sock_fields.c | 327 +
+ tools/testing/selftests/bpf/test_socket_cookie.c | 4 +-
+ tools/testing/selftests/bpf/test_sockmap.c | 1 -
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 6 +-
+ tools/testing/selftests/bpf/test_verifier.c | 15575 +------------------
+ tools/testing/selftests/bpf/verifier/.gitignore | 1 +
+ tools/testing/selftests/bpf/verifier/and.c | 50 +
+ .../testing/selftests/bpf/verifier/array_access.c | 219 +
+ tools/testing/selftests/bpf/verifier/basic.c | 23 +
+ tools/testing/selftests/bpf/verifier/basic_call.c | 50 +
+ tools/testing/selftests/bpf/verifier/basic_instr.c | 134 +
+ tools/testing/selftests/bpf/verifier/basic_stack.c | 64 +
+ .../testing/selftests/bpf/verifier/basic_stx_ldx.c | 45 +
+ tools/testing/selftests/bpf/verifier/bounds.c | 508 +
+ .../selftests/bpf/verifier/bounds_deduction.c | 124 +
+ .../bpf/verifier/bounds_mix_sign_unsign.c | 406 +
+ .../testing/selftests/bpf/verifier/bpf_get_stack.c | 44 +
+ tools/testing/selftests/bpf/verifier/calls.c | 1942 +++
+ tools/testing/selftests/bpf/verifier/cfg.c | 70 +
+ .../selftests/bpf/verifier/cgroup_inv_retcode.c | 72 +
+ tools/testing/selftests/bpf/verifier/cgroup_skb.c | 197 +
+ .../selftests/bpf/verifier/cgroup_storage.c | 220 +
+ tools/testing/selftests/bpf/verifier/const_or.c | 60 +
+ tools/testing/selftests/bpf/verifier/ctx.c | 93 +
+ tools/testing/selftests/bpf/verifier/ctx_sk_msg.c | 181 +
+ tools/testing/selftests/bpf/verifier/ctx_skb.c | 1034 ++
+ tools/testing/selftests/bpf/verifier/dead_code.c | 159 +
+ .../selftests/bpf/verifier/direct_packet_access.c | 633 +
+ .../bpf/verifier/direct_stack_access_wraparound.c | 40 +
+ tools/testing/selftests/bpf/verifier/div0.c | 184 +
+ .../testing/selftests/bpf/verifier/div_overflow.c | 104 +
+ .../selftests/bpf/verifier/helper_access_var_len.c | 614 +
+ .../selftests/bpf/verifier/helper_packet_access.c | 460 +
+ .../selftests/bpf/verifier/helper_value_access.c | 953 ++
+ tools/testing/selftests/bpf/verifier/jit.c | 88 +
+ tools/testing/selftests/bpf/verifier/jmp32.c | 746 +
+ tools/testing/selftests/bpf/verifier/jset.c | 167 +
+ tools/testing/selftests/bpf/verifier/jump.c | 180 +
+ tools/testing/selftests/bpf/verifier/junk_insn.c | 45 +
+ tools/testing/selftests/bpf/verifier/ld_abs.c | 286 +
+ tools/testing/selftests/bpf/verifier/ld_dw.c | 36 +
+ tools/testing/selftests/bpf/verifier/ld_imm64.c | 141 +
+ tools/testing/selftests/bpf/verifier/ld_ind.c | 72 +
+ tools/testing/selftests/bpf/verifier/leak_ptr.c | 67 +
+ tools/testing/selftests/bpf/verifier/lwt.c | 189 +
+ tools/testing/selftests/bpf/verifier/map_in_map.c | 62 +
+ .../selftests/bpf/verifier/map_ptr_mixing.c | 100 +
+ tools/testing/selftests/bpf/verifier/map_ret_val.c | 65 +
+ tools/testing/selftests/bpf/verifier/masking.c | 322 +
+ tools/testing/selftests/bpf/verifier/meta_access.c | 235 +
+ .../bpf/verifier/perf_event_sample_period.c | 59 +
+ .../selftests/bpf/verifier/prevent_map_lookup.c | 74 +
+ tools/testing/selftests/bpf/verifier/raw_stack.c | 305 +
+ .../testing/selftests/bpf/verifier/ref_tracking.c | 607 +
+ tools/testing/selftests/bpf/verifier/runtime_jit.c | 80 +
+ .../selftests/bpf/verifier/search_pruning.c | 156 +
+ tools/testing/selftests/bpf/verifier/sock.c | 384 +
+ tools/testing/selftests/bpf/verifier/spill_fill.c | 76 +
+ tools/testing/selftests/bpf/verifier/spin_lock.c | 333 +
+ tools/testing/selftests/bpf/verifier/stack_ptr.c | 317 +
+ tools/testing/selftests/bpf/verifier/uninit.c | 39 +
+ tools/testing/selftests/bpf/verifier/unpriv.c | 522 +
+ tools/testing/selftests/bpf/verifier/value.c | 104 +
+ .../selftests/bpf/verifier/value_adj_spill.c | 43 +
+ .../selftests/bpf/verifier/value_illegal_alu.c | 94 +
+ .../testing/selftests/bpf/verifier/value_or_null.c | 152 +
+ .../selftests/bpf/verifier/value_ptr_arith.c | 796 +
+ tools/testing/selftests/bpf/verifier/var_off.c | 66 +
+ tools/testing/selftests/bpf/verifier/xadd.c | 97 +
+ tools/testing/selftests/bpf/verifier/xdp.c | 14 +
+ .../bpf/verifier/xdp_direct_packet_access.c | 900 ++
+ .../drivers/net/mlxsw/blackhole_routes.sh | 200 +
+ .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 3 +-
+ .../selftests/drivers/net/mlxsw/qos_dscp_router.sh | 3 +-
+ .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 459 +-
+ .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 -
+ .../selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh | 126 +
+ tools/testing/selftests/net/config | 3 +-
+ tools/testing/selftests/net/forwarding/config | 2 +
+ .../selftests/net/forwarding/devlink_lib.sh | 2 +-
+ .../net/forwarding/forwarding.config.sample | 3 +
+ .../selftests/net/forwarding/ipip_flat_gre.sh | 63 +
+ .../selftests/net/forwarding/ipip_flat_gre_key.sh | 63 +
+ .../selftests/net/forwarding/ipip_flat_gre_keys.sh | 63 +
+ .../selftests/net/forwarding/ipip_hier_gre.sh | 63 +
+ .../selftests/net/forwarding/ipip_hier_gre_key.sh | 63 +
+ .../selftests/net/forwarding/ipip_hier_gre_keys.sh | 63 +
+ tools/testing/selftests/net/forwarding/ipip_lib.sh | 349 +
+ tools/testing/selftests/net/forwarding/lib.sh | 9 +-
+ .../net/forwarding/mirror_gre_bridge_1q_lag.sh | 11 +-
+ .../selftests/net/forwarding/mirror_gre_changes.sh | 1 +
+ .../selftests/net/forwarding/mirror_gre_flower.sh | 4 +-
+ .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 88 +-
+ .../testing/selftests/net/forwarding/mirror_lib.sh | 5 +-
+ .../selftests/net/forwarding/router_broadcast.sh | 3 +-
+ .../selftests/net/forwarding/vxlan_asymmetric.sh | 567 +
+ .../selftests/net/forwarding/vxlan_symmetric.sh | 551 +
+ tools/testing/selftests/net/ip_defrag.c | 69 +-
+ tools/testing/selftests/net/ip_defrag.sh | 16 +
+ tools/testing/selftests/net/rtnetlink.sh | 140 +-
+ tools/testing/selftests/net/tls.c | 164 +-
+ .../networking/timestamping/rxtimestamp.c | 1 +
+ tools/testing/selftests/tc-testing/.gitignore | 1 +
+ tools/testing/selftests/tc-testing/TdcPlugin.py | 4 +-
+ .../creating-testcases/AddingTestCases.txt | 5 +
+ .../tc-testing/plugin-lib/valgrindPlugin.py | 16 +-
+ .../tc-testing/tc-tests/filters/concurrency.json | 177 +
+ tools/testing/selftests/tc-testing/tdc.py | 15 +-
+ tools/testing/selftests/tc-testing/tdc_batch.py | 58 +-
+ tools/testing/selftests/tc-testing/tdc_config.py | 1 +
+ .../testing/selftests/tc-testing/tdc_multibatch.py | 65 +
+ 2050 files changed, 105712 insertions(+), 54690 deletions(-)
+ create mode 100644 Documentation/bpf/btf.rst
+ create mode 100644 Documentation/devicetree/bindings/net/fsl-enetc.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-multiplexer.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-armada38x-comphy.txt
+ create mode 100644 Documentation/networking/devlink-health.txt
+ create mode 100644 Documentation/networking/devlink-info-versions.rst
+ create mode 100644 Documentation/networking/devlink-params-mlxsw.txt
+ rename Documentation/networking/{ieee802154.txt => ieee802154.rst} (58%)
+ create mode 100644 Documentation/networking/phy.rst
+ delete mode 100644 Documentation/networking/phy.txt
+ create mode 100644 Documentation/networking/sfp-phylink.rst
+ delete mode 100644 arch/ia64/include/uapi/asm/socket.h
+ create mode 100644 arch/riscv/net/Makefile
+ create mode 100644 arch/riscv/net/bpf_jit_comp.c
+ delete mode 100644 arch/s390/include/uapi/asm/socket.h
+ delete mode 100644 arch/x86/include/uapi/asm/socket.h
+ delete mode 100644 arch/xtensa/include/uapi/asm/socket.h
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h
+ create mode 100644 drivers/net/ethernet/freescale/enetc/Kconfig
+ create mode 100644 drivers/net/ethernet/freescale/enetc/Makefile
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc.h
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_hw.h
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_mdio.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_msg.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pf.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pf.h
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_ptp.c
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_vf.c
+ create mode 100644 drivers/net/ethernet/intel/igc/igc_ethtool.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ecpf.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ecpf.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/mad.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_env.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_env.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+ create mode 100644 drivers/net/ipvlan/ipvlan_l3s.c
+ delete mode 100644 drivers/net/phy/aquantia.c
+ create mode 100644 drivers/net/phy/aquantia.h
+ create mode 100644 drivers/net/phy/aquantia_hwmon.c
+ create mode 100644 drivers/net/phy/aquantia_main.c
+ create mode 100644 drivers/net/phy/mdio-mux-multiplexer.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/location.h
+ delete mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/tof.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
+ delete mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tof.c
+ delete mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tof.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mcu.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/Kconfig
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/Makefile
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/core.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/init.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mac.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/main.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mcu.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/pci.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/regs.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/soc.c
+ delete mode 100644 drivers/net/wireless/mediatek/mt76/usb_mcu.c
+ create mode 100644 drivers/phy/marvell/phy-armada38x-comphy.c
+ create mode 100644 drivers/ptp/ptp_qoriq_debugfs.c
+ create mode 100644 drivers/s390/net/qeth_ethtool.c
+ create mode 100644 include/linux/platform_data/dsa.h
+ create mode 100644 include/net/flow_offload.h
+ delete mode 100644 include/net/netfilter/nf_nat_core.h
+ delete mode 100644 include/net/netfilter/nf_nat_l3proto.h
+ delete mode 100644 include/net/netfilter/nf_nat_l4proto.h
+ create mode 100644 include/net/netfilter/nf_reject.h
+ delete mode 100644 include/net/netfilter/nft_masq.h
+ delete mode 100644 include/net/netfilter/nft_redir.h
+ create mode 100644 include/net/netns/xdp.h
+ create mode 100644 include/trace/events/mlxsw.h
+ create mode 100644 include/trace/events/neigh.h
+ create mode 100644 include/uapi/linux/time_types.h
+ create mode 100644 include/uapi/linux/xdp_diag.h
+ create mode 100644 net/core/flow_offload.c
+ delete mode 100644 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
+ delete mode 100644 net/ipv4/netfilter/nft_chain_nat_ipv4.c
+ delete mode 100644 net/ipv4/netfilter/nft_masq_ipv4.c
+ delete mode 100644 net/ipv4/netfilter/nft_redir_ipv4.c
+ delete mode 100644 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
+ delete mode 100644 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+ delete mode 100644 net/ipv6/netfilter/nft_chain_nat_ipv6.c
+ delete mode 100644 net/ipv6/netfilter/nft_masq_ipv6.c
+ delete mode 100644 net/ipv6/netfilter/nft_redir_ipv6.c
+ rename net/{ipv4/netfilter/nf_nat_masquerade_ipv4.c => netfilter/nf_nat_masquerade.c} (51%)
+ create mode 100644 net/netfilter/nft_chain_nat.c
+ create mode 100644 net/smc/smc_netns.h
+ create mode 100644 net/xdp/xsk.h
+ create mode 100644 net/xdp/xsk_diag.c
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-feature.rst
+ create mode 100644 tools/bpf/bpftool/feature.c
+ create mode 100644 tools/lib/bpf/libbpf_probes.c
+ create mode 100644 tools/lib/bpf/libbpf_util.h
+ create mode 100644 tools/testing/selftests/bpf/flow_dissector_load.h
+ rename tools/testing/selftests/bpf/{ => progs}/bpf_flow.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/connect4_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/connect6_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/dev_cgroup.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/get_cgroup_id_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/netcnt_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sample_map_ret0.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sample_ret0.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sendmsg4_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sendmsg6_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/socket_cookie_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sockmap_parse_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sockmap_tcp_msg_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/sockmap_verdict_prog.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_adjust_tail.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_btf_haskv.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_btf_nokv.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_get_stack_rawtp.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_l4lb.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_l4lb_noinline.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_lirc_mode2_kern.c (100%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_lwt_ip_encap.c
+ rename tools/testing/selftests/bpf/{ => progs}/test_lwt_seg6local.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_map_in_map.c (100%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_map_lock.c
+ rename tools/testing/selftests/bpf/{ => progs}/test_obj_id.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_pkt_access.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_pkt_md_access.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_queue_map.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_select_reuseport_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_sk_lookup_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_skb_cgroup_id_kern.c (100%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sock_fields_kern.c
+ rename tools/testing/selftests/bpf/{ => progs}/test_sockhash_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_sockmap_kern.c (100%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_spin_lock.c
+ rename tools/testing/selftests/bpf/{ => progs}/test_stack_map.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_stacktrace_build_id.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_stacktrace_map.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_tcp_estats.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_tcpbpf_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_tcpnotify_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_tracepoint.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_tunnel_kern.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_xdp.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_xdp_meta.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_xdp_noinline.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_xdp_redirect.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/test_xdp_vlan.c (100%)
+ rename tools/testing/selftests/bpf/{ => progs}/xdp_dummy.c (100%)
+ create mode 100755 tools/testing/selftests/bpf/test_lwt_ip_encap.sh
+ create mode 100644 tools/testing/selftests/bpf/test_sock_fields.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/.gitignore
+ create mode 100644 tools/testing/selftests/bpf/verifier/and.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/array_access.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/basic.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/basic_call.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/basic_instr.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/basic_stack.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/basic_stx_ldx.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/bounds.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/bounds_deduction.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/calls.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/cfg.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_skb.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/cgroup_storage.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/const_or.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ctx.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_msg.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ctx_skb.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/dead_code.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/div0.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/div_overflow.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/helper_access_var_len.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/helper_packet_access.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/helper_value_access.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/jit.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/jmp32.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/jset.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/jump.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/junk_insn.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ld_abs.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ld_dw.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ld_imm64.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ld_ind.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/leak_ptr.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/lwt.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/map_ret_val.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/masking.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/meta_access.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/perf_event_sample_period.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/raw_stack.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/sock.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/spill_fill.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/spin_lock.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/stack_ptr.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/uninit.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/value.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/value_adj_spill.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/value_or_null.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/var_off.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/xadd.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/xdp.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/blackhole_routes.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre_key.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_flat_gre_keys.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre_key.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ipip_hier_gre_keys.sh
+ create mode 100644 tools/testing/selftests/net/forwarding/ipip_lib.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_asymmetric.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_symmetric.sh
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json
+ create mode 100755 tools/testing/selftests/tc-testing/tdc_multibatch.py
+Merging mac80211/master (d235c48b40d3 net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (f09ef134a7ca iw_cxgb4: cq/qp mask depends on bar2 pages in a host page)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (a634090a0f24 ALSA: usb-audio: Add quirk for MOTU MicroBook II)
+$ git merge sound-current/for-linus
+Removing sound/soc/generic/simple-scu-card.c
+Removing sound/soc/generic/audio-graph-scu-card.c
+Removing sound/firewire/fireface/ff-protocol-ff800.c
+Removing sound/firewire/fireface/ff-protocol-ff400.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/sound/simple-scu-card.txt
+Removing Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/adi,adau1977.txt | 13 +-
+ Documentation/devicetree/bindings/sound/ak4458.txt | 2 +-
+ .../bindings/sound/audio-graph-scu-card.txt | 123 -
+ .../devicetree/bindings/sound/cs35l36.txt | 168 +
+ Documentation/devicetree/bindings/sound/cs4341.txt | 22 +
+ .../bindings/sound/davinci-mcasp-audio.txt | 17 +
+ .../devicetree/bindings/sound/fsl,micfil.txt | 32 +
+ .../bindings/sound/google,cros-ec-codec.txt | 26 +
+ .../bindings/sound/ingenic,jz4725b-codec.txt | 20 +
+ .../bindings/sound/ingenic,jz4740-codec.txt | 20 +
+ Documentation/devicetree/bindings/sound/mt6358.txt | 18 +
+ .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 36 +
+ .../devicetree/bindings/sound/mtk-btcvsd-snd.txt | 24 +
+ .../bindings/sound/nvidia,tegra30-hda.txt | 5 +
+ .../bindings/sound/qcom,msm8916-wcd-analog.txt | 7 +-
+ .../devicetree/bindings/sound/qcom,wcd9335.txt | 10 +-
+ .../bindings/sound/rockchip,rk3328-codec.txt | 23 +
+ .../devicetree/bindings/sound/sgtl5000.txt | 9 +
+ .../devicetree/bindings/sound/simple-scu-card.txt | 94 -
+ .../devicetree/bindings/sound/sprd-pcm.txt | 23 +
+ .../bindings/sound/xlnx,audio-formatter.txt | 29 +
+ .../devicetree/bindings/sound/xlnx,spdif.txt | 28 +
+ Documentation/sound/hd-audio/models.rst | 4 +-
+ .../sound/kernel-api/writing-an-alsa-driver.rst | 35 +-
+ Documentation/sound/soc/dpcm.rst | 10 +-
+ MAINTAINERS | 8 +
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 1 +
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 1 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1 +
+ drivers/gpio/gpiolib-acpi.c | 15 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 1 -
+ drivers/media/pci/solo6x10/solo6x10-g723.c | 4 +-
+ drivers/media/pci/tw686x/tw686x-audio.c | 3 +-
+ include/linux/acpi.h | 7 +
+ include/sound/core.h | 1 -
+ include/sound/cs35l36.h | 43 +
+ include/sound/dmaengine_pcm.h | 4 -
+ include/sound/hda_register.h | 2 +
+ include/sound/hda_verbs.h | 2 +
+ include/sound/hdaudio.h | 3 +
+ include/sound/info.h | 36 +-
+ include/sound/memalloc.h | 1 -
+ include/sound/pcm.h | 29 +-
+ include/sound/simple_card_utils.h | 4 +-
+ include/sound/soc-acpi.h | 33 +-
+ include/sound/soc-dapm.h | 27 +-
+ include/sound/soc-topology.h | 8 +-
+ include/sound/soc.h | 73 +-
+ sound/ac97/bus.c | 2 +-
+ sound/aoa/core/gpio-feature.c | 1 +
+ sound/aoa/soundbus/i2sbus/core.c | 4 -
+ sound/arm/aaci.c | 4 +-
+ sound/arm/pxa2xx-ac97.c | 1 -
+ sound/atmel/ac97c.c | 4 +-
+ sound/core/compress_offload.c | 11 +-
+ sound/core/info.c | 131 +-
+ sound/core/init.c | 31 +-
+ sound/core/memalloc.c | 2 +
+ sound/core/oss/pcm_oss.c | 1 -
+ sound/core/pcm.c | 163 +-
+ sound/core/pcm_lib.c | 9 +-
+ sound/core/pcm_local.h | 1 +
+ sound/core/pcm_memory.c | 62 +-
+ sound/core/pcm_native.c | 315 +-
+ sound/drivers/aloop.c | 14 +-
+ sound/drivers/dummy.c | 12 +-
+ sound/drivers/opl4/opl4_proc.c | 4 -
+ sound/drivers/pcsp/pcsp.c | 1 -
+ sound/drivers/vx/vx_core.c | 9 +-
+ sound/firewire/Kconfig | 1 +
+ sound/firewire/bebob/bebob.c | 14 +-
+ sound/firewire/bebob/bebob_proc.c | 12 +-
+ sound/firewire/dice/dice-proc.c | 12 +-
+ sound/firewire/dice/dice.c | 12 +-
+ sound/firewire/digi00x/digi00x-proc.c | 16 +-
+ sound/firewire/fireface/Makefile | 4 +-
+ sound/firewire/fireface/ff-midi.c | 2 +-
+ sound/firewire/fireface/ff-pcm.c | 2 +-
+ sound/firewire/fireface/ff-proc.c | 229 +-
+ sound/firewire/fireface/ff-protocol-ff400.c | 161 -
+ sound/firewire/fireface/ff-protocol-ff800.c | 143 -
+ sound/firewire/fireface/ff-protocol-former.c | 597 +++
+ sound/firewire/fireface/ff-protocol-latter.c | 430 ++
+ sound/firewire/fireface/ff-stream.c | 40 +-
+ sound/firewire/fireface/ff-transaction.c | 143 +-
+ sound/firewire/fireface/ff.c | 28 +
+ sound/firewire/fireface/ff.h | 23 +-
+ sound/firewire/fireworks/fireworks_proc.c | 12 +-
+ sound/firewire/motu/amdtp-motu.c | 4 +-
+ sound/firewire/motu/motu-proc.c | 12 +-
+ sound/firewire/oxfw/oxfw-proc.c | 12 +-
+ sound/firewire/tascam/tascam-proc.c | 12 +-
+ sound/hda/hdac_controller.c | 8 +-
+ sound/hda/hdac_i915.c | 4 +-
+ sound/hda/hdac_stream.c | 44 +-
+ sound/i2c/other/ak4113.c | 5 +-
+ sound/i2c/other/ak4114.c | 5 +-
+ sound/i2c/other/ak4xxx-adda.c | 8 +-
+ sound/isa/ad1816a/ad1816a_lib.c | 3 +-
+ sound/isa/als100.c | 1 -
+ sound/isa/cmi8328.c | 1 -
+ sound/isa/cmi8330.c | 3 +-
+ sound/isa/es1688/es1688.c | 2 -
+ sound/isa/es1688/es1688_lib.c | 6 +-
+ sound/isa/es18xx.c | 4 +-
+ sound/isa/gus/gus_irq.c | 5 +-
+ sound/isa/gus/gus_main.c | 13 +-
+ sound/isa/gus/gus_mem.c | 6 +-
+ sound/isa/gus/gus_pcm.c | 4 +-
+ sound/isa/opti9xx/miro.c | 5 +-
+ sound/isa/sb/jazz16.c | 1 -
+ sound/isa/sb/sb16.c | 1 -
+ sound/isa/sb/sb16_csp.c | 5 +-
+ sound/isa/sb/sb16_main.c | 12 +-
+ sound/isa/sb/sb8.c | 1 -
+ sound/isa/sb/sb8_main.c | 2 +-
+ sound/isa/sscape.c | 7 +-
+ sound/isa/wss/wss_lib.c | 3 +-
+ sound/mips/hal2.c | 31 +-
+ sound/mips/sgio2audio.c | 7 +-
+ sound/parisc/harmony.c | 10 +-
+ sound/pci/ac97/ac97_proc.c | 26 +-
+ sound/pci/ad1889.c | 13 +-
+ sound/pci/ak4531_codec.c | 5 +-
+ sound/pci/ali5451/ali5451.c | 8 +-
+ sound/pci/als300.c | 1 -
+ sound/pci/als4000.c | 1 -
+ sound/pci/asihpi/asihpi.c | 6 +-
+ sound/pci/atiixp.c | 24 +-
+ sound/pci/atiixp_modem.c | 8 +-
+ sound/pci/aw2/aw2-alsa.c | 40 +-
+ sound/pci/azt3328.c | 4 -
+ sound/pci/bt87x.c | 10 +-
+ sound/pci/ca0106/ca0106_main.c | 19 +-
+ sound/pci/ca0106/ca0106_proc.c | 40 +-
+ sound/pci/cmipci.c | 9 +-
+ sound/pci/cs4281.c | 5 +-
+ sound/pci/cs46xx/cs46xx_dsp_spos.h | 6 -
+ sound/pci/cs46xx/cs46xx_lib.c | 6 -
+ sound/pci/cs46xx/dsp_spos.c | 133 +-
+ sound/pci/cs46xx/dsp_spos_scb_lib.c | 19 +-
+ sound/pci/cs5535audio/cs5535audio_pm.c | 1 -
+ sound/pci/ctxfi/ctatc.c | 8 -
+ sound/pci/echoaudio/echoaudio.c | 19 +-
+ sound/pci/emu10k1/emu10k1.c | 6 -
+ sound/pci/emu10k1/emu10k1x.c | 12 +-
+ sound/pci/emu10k1/emupcm.c | 22 +-
+ sound/pci/emu10k1/emuproc.c | 81 +-
+ sound/pci/emu10k1/p16v.c | 17 +-
+ sound/pci/ens1370.c | 9 +-
+ sound/pci/es1938.c | 1 -
+ sound/pci/es1968.c | 1 -
+ sound/pci/fm801.c | 1 -
+ sound/pci/hda/hda_beep.c | 151 +-
+ sound/pci/hda/hda_beep.h | 5 -
+ sound/pci/hda/hda_codec.c | 56 +-
+ sound/pci/hda/hda_proc.c | 9 +-
+ sound/pci/hda/hda_tegra.c | 132 +-
+ sound/pci/hda/patch_hdmi.c | 10 +-
+ sound/pci/hda/patch_realtek.c | 66 +-
+ sound/pci/ice1712/ews.c | 7 +-
+ sound/pci/ice1712/ice1712.c | 8 +-
+ sound/pci/ice1712/ice1724.c | 8 +-
+ sound/pci/ice1712/pontis.c | 12 +-
+ sound/pci/ice1712/prodigy192.c | 5 +-
+ sound/pci/ice1712/prodigy_hifi.c | 8 +-
+ sound/pci/ice1712/quartet.c | 4 +-
+ sound/pci/intel8x0.c | 8 +-
+ sound/pci/intel8x0m.c | 9 +-
+ sound/pci/korg1212/korg1212.c | 6 +-
+ sound/pci/lola/lola_proc.c | 16 +-
+ sound/pci/lx6464es/lx6464es.c | 16 +-
+ sound/pci/maestro3.c | 1 -
+ sound/pci/mixart/mixart.c | 6 +-
+ sound/pci/nm256/nm256.c | 1 -
+ sound/pci/oxygen/oxygen_lib.c | 12 +-
+ sound/pci/oxygen/pcm1796.h | 1 -
+ sound/pci/oxygen/xonar_pcm179x.c | 71 +-
+ sound/pci/pcxhr/pcxhr.c | 21 +-
+ sound/pci/riptide/riptide.c | 7 +-
+ sound/pci/rme32.c | 5 +-
+ sound/pci/rme96.c | 7 +-
+ sound/pci/rme9652/hdsp.c | 5 +-
+ sound/pci/rme9652/hdspm.c | 75 +-
+ sound/pci/rme9652/rme9652.c | 6 +-
+ sound/pci/sis7019.c | 1 -
+ sound/pci/sonicvibes.c | 6 +-
+ sound/pci/trident/trident_main.c | 8 +-
+ sound/pci/via82xx.c | 8 +-
+ sound/pci/via82xx_modem.c | 16 +-
+ sound/pci/ymfpci/ymfpci_main.c | 10 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 6 +-
+ sound/ppc/pmac.c | 1 -
+ sound/ppc/snd_ps3.c | 6 +-
+ sound/ppc/tumbler.c | 1 +
+ sound/sh/aica.c | 14 +-
+ sound/soc/Kconfig | 1 +
+ sound/soc/Makefile | 1 +
+ sound/soc/amd/acp-pcm-dma.c | 26 +-
+ sound/soc/amd/raven/acp3x-pcm-dma.c | 8 +-
+ sound/soc/codecs/Kconfig | 67 +-
+ sound/soc/codecs/Makefile | 14 +
+ sound/soc/codecs/ad193x.c | 76 +-
+ sound/soc/codecs/ad193x.h | 8 +
+ sound/soc/codecs/adau1977.c | 12 +-
+ sound/soc/codecs/adau7002.c | 45 +
+ sound/soc/codecs/ak4118.c | 1 +
+ sound/soc/codecs/ak4458.c | 79 +-
+ sound/soc/codecs/cros_ec_codec.c | 441 ++
+ sound/soc/codecs/cs35l36.c | 1957 ++++++++
+ sound/soc/codecs/cs35l36.h | 446 ++
+ sound/soc/codecs/cs4271.c | 4 +-
+ sound/soc/codecs/cs4341.c | 346 ++
+ sound/soc/codecs/cs47l24.c | 52 +-
+ sound/soc/codecs/da7219-aad.c | 2 +-
+ sound/soc/codecs/da7219.c | 197 +-
+ sound/soc/codecs/da7219.h | 2 +
+ sound/soc/codecs/dmic.c | 4 +-
+ sound/soc/codecs/es8316.c | 200 +-
+ sound/soc/codecs/es8316.h | 7 +
+ sound/soc/codecs/hdac_hdmi.c | 87 +-
+ sound/soc/codecs/jz4725b.c | 598 +++
+ sound/soc/codecs/jz4740.c | 26 +-
+ sound/soc/codecs/max98090.c | 15 -
+ sound/soc/codecs/max98373.c | 6 +-
+ sound/soc/codecs/max9860.c | 3 +-
+ sound/soc/codecs/max98927.c | 8 +-
+ sound/soc/codecs/msm8916-wcd-analog.c | 3 +
+ sound/soc/codecs/msm8916-wcd-digital.c | 23 +-
+ sound/soc/codecs/mt6351.c | 4 +-
+ sound/soc/codecs/mt6358.c | 2336 +++++++++
+ sound/soc/codecs/mt6358.h | 2314 +++++++++
+ sound/soc/codecs/nau8824.c | 2 +-
+ sound/soc/codecs/nau8825.c | 1 +
+ sound/soc/codecs/pcm186x.c | 8 +-
+ sound/soc/codecs/pcm3060.c | 35 +
+ sound/soc/codecs/pcm3060.h | 5 +
+ sound/soc/codecs/pcm512x.c | 37 +-
+ sound/soc/codecs/rk3328_codec.c | 519 ++
+ sound/soc/codecs/rk3328_codec.h | 210 +
+ sound/soc/codecs/rl6347a.c | 4 +-
+ sound/soc/codecs/rt274.c | 19 +-
+ sound/soc/codecs/rt286.c | 8 +-
+ sound/soc/codecs/rt298.c | 12 +-
+ sound/soc/codecs/rt5514.c | 1 +
+ sound/soc/codecs/rt5640.c | 6 +-
+ sound/soc/codecs/rt5645.c | 66 +-
+ sound/soc/codecs/rt5651.c | 67 +-
+ sound/soc/codecs/rt5651.h | 1 +
+ sound/soc/codecs/rt5670.c | 54 -
+ sound/soc/codecs/rt5677.c | 8 +-
+ sound/soc/codecs/rt5682.c | 8 +
+ sound/soc/codecs/sgtl5000.c | 19 +-
+ sound/soc/codecs/ssm2602.c | 71 +-
+ sound/soc/codecs/tlv320aic31xx.c | 16 +-
+ sound/soc/codecs/tlv320aic32x4.c | 31 +-
+ sound/soc/codecs/tlv320aic32x4.h | 1 +
+ sound/soc/codecs/tlv320aic3x.c | 25 +-
+ sound/soc/codecs/tscs42xx.c | 2 +-
+ sound/soc/codecs/wcd-clsh-v2.c | 576 +++
+ sound/soc/codecs/wcd-clsh-v2.h | 49 +
+ sound/soc/codecs/wcd9335.c | 5244 ++++++++++++++++++++
+ sound/soc/codecs/wcd9335.h | 640 +++
+ sound/soc/codecs/wm5102.c | 64 +-
+ sound/soc/codecs/wm5110.c | 80 +-
+ sound/soc/codecs/wm8741.c | 22 +-
+ sound/soc/codecs/wm8770.c | 18 +-
+ sound/soc/codecs/wm8904.c | 21 +-
+ sound/soc/codecs/wm8962.c | 9 +-
+ sound/soc/codecs/wm8995.c | 29 +-
+ sound/soc/codecs/wm8996.c | 9 +-
+ sound/soc/codecs/wm8997.c | 60 +-
+ sound/soc/codecs/wm8998.c | 60 +-
+ sound/soc/codecs/wm_adsp.c | 498 +-
+ sound/soc/codecs/wm_adsp.h | 4 +-
+ sound/soc/dwc/dwc-pcm.c | 3 +-
+ sound/soc/fsl/Kconfig | 9 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl-asoc-card.c | 1 +
+ sound/soc/fsl/fsl_esai.c | 7 +-
+ sound/soc/fsl/fsl_micfil.c | 826 +++
+ sound/soc/fsl/fsl_micfil.h | 283 ++
+ sound/soc/fsl/fsl_sai.c | 8 +-
+ sound/soc/fsl/fsl_spdif.c | 12 +-
+ sound/soc/fsl/fsl_spdif.h | 2 +-
+ sound/soc/fsl/fsl_ssi.c | 6 +-
+ sound/soc/fsl/imx-sgtl5000.c | 12 +-
+ sound/soc/fsl/imx-spdif.c | 4 +-
+ sound/soc/generic/Kconfig | 17 -
+ sound/soc/generic/Makefile | 4 -
+ sound/soc/generic/audio-graph-card.c | 481 +-
+ sound/soc/generic/audio-graph-scu-card.c | 501 --
+ sound/soc/generic/simple-card-utils.c | 25 +-
+ sound/soc/generic/simple-card.c | 479 +-
+ sound/soc/generic/simple-scu-card.c | 474 --
+ sound/soc/intel/atom/sst-atom-controls.c | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 11 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 45 +-
+ sound/soc/intel/atom/sst/sst_drv_interface.c | 2 +-
+ sound/soc/intel/atom/sst/sst_loader.c | 2 +-
+ sound/soc/intel/baytrail/sst-baytrail-ipc.c | 3 +-
+ sound/soc/intel/baytrail/sst-baytrail-pcm.c | 17 +-
+ sound/soc/intel/boards/Kconfig | 1 +
+ sound/soc/intel/boards/bdw-rt5677.c | 14 +
+ sound/soc/intel/boards/broadwell.c | 16 +
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 114 +-
+ sound/soc/intel/boards/bxt_rt298.c | 13 +
+ sound/soc/intel/boards/bytcht_da7213.c | 8 +
+ sound/soc/intel/boards/bytcht_es8316.c | 336 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 23 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 180 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 +
+ sound/soc/intel/boards/cht_bsw_nau8824.c | 12 +
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 9 +
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 23 +-
+ sound/soc/intel/boards/haswell.c | 15 +
+ sound/soc/intel/boards/kbl_da7219_max98927.c | 207 +-
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 25 +-
+ sound/soc/intel/common/soc-acpi-intel-byt-match.c | 92 +-
+ sound/soc/intel/common/soc-acpi-intel-cht-match.c | 70 +-
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 5 +-
+ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 10 +-
+ sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +-
+ .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 20 +-
+ sound/soc/intel/common/soc-acpi-intel-icl-match.c | 5 +-
+ sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 19 +
+ sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +-
+ sound/soc/intel/haswell/sst-haswell-pcm.c | 14 +-
+ sound/soc/intel/skylake/skl-messages.c | 2 +-
+ sound/soc/intel/skylake/skl-pcm.c | 12 +-
+ sound/soc/intel/skylake/skl-topology.c | 2 +-
+ sound/soc/mediatek/Kconfig | 19 +
+ sound/soc/mediatek/Makefile | 1 +
+ sound/soc/mediatek/common/Makefile | 2 +
+ .../soc/mediatek/common/mtk-afe-platform-driver.c | 6 +-
+ sound/soc/mediatek/common/mtk-btcvsd.c | 1364 +++++
+ sound/soc/mediatek/mt8183/Makefile | 13 +
+ sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 611 +++
+ sound/soc/mediatek/mt8183/mt8183-afe-clk.h | 38 +
+ sound/soc/mediatek/mt8183/mt8183-afe-common.h | 108 +
+ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 1237 +++++
+ sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 501 ++
+ sound/soc/mediatek/mt8183/mt8183-dai-hostless.c | 118 +
+ sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 1040 ++++
+ sound/soc/mediatek/mt8183/mt8183-dai-pcm.c | 318 ++
+ sound/soc/mediatek/mt8183/mt8183-dai-tdm.c | 639 +++
+ sound/soc/mediatek/mt8183/mt8183-interconnection.h | 33 +
+ sound/soc/mediatek/mt8183/mt8183-reg.h | 1666 +++++++
+ sound/soc/meson/axg-fifo.c | 7 +-
+ sound/soc/pxa/Makefile | 1 -
+ sound/soc/qcom/Kconfig | 4 +-
+ sound/soc/qcom/apq8016_sbc.c | 21 +-
+ sound/soc/qcom/apq8096.c | 71 +-
+ sound/soc/qcom/common.c | 10 +-
+ sound/soc/qcom/sdm845.c | 2 +
+ sound/soc/samsung/dma.h | 3 +-
+ sound/soc/samsung/dmaengine.c | 16 +-
+ sound/soc/samsung/i2s.c | 731 +--
+ sound/soc/samsung/odroid.c | 206 +-
+ sound/soc/samsung/pcm.c | 2 +-
+ sound/soc/samsung/s3c2412-i2s.c | 2 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 2 +-
+ sound/soc/samsung/spdif.c | 2 +-
+ sound/soc/sh/fsi.c | 5 +-
+ sound/soc/sh/rcar/core.c | 45 +-
+ sound/soc/sh/rcar/gen.c | 24 +
+ sound/soc/sh/rcar/rsnd.h | 27 +
+ sound/soc/sh/rcar/src.c | 125 +-
+ sound/soc/sh/rcar/ssiu.c | 24 +-
+ sound/soc/sh/siu_pcm.c | 15 +-
+ sound/soc/soc-compress.c | 177 +-
+ sound/soc/soc-core.c | 262 +-
+ sound/soc/soc-dapm.c | 271 +-
+ sound/soc/soc-generic-dmaengine-pcm.c | 18 +-
+ sound/soc/soc-pcm.c | 5 +
+ sound/soc/soc-topology.c | 166 +-
+ sound/soc/sprd/Kconfig | 6 +
+ sound/soc/sprd/Makefile | 4 +
+ sound/soc/sprd/sprd-pcm-dma.c | 562 +++
+ sound/soc/sprd/sprd-pcm-dma.h | 15 +
+ sound/soc/stm/stm32_adfsdm.c | 5 +-
+ sound/soc/stm/stm32_i2s.c | 136 +-
+ sound/soc/stm/stm32_sai.c | 11 +-
+ sound/soc/stm/stm32_sai_sub.c | 8 +-
+ sound/soc/sunxi/sun4i-codec.c | 149 +-
+ sound/soc/sunxi/sun50i-codec-analog.c | 4 +-
+ sound/soc/ti/davinci-mcasp.c | 175 +-
+ sound/soc/txx9/txx9aclc.c | 4 +-
+ sound/soc/uniphier/aio-dma.c | 3 +-
+ sound/soc/xilinx/Kconfig | 14 +
+ sound/soc/xilinx/Makefile | 4 +
+ sound/soc/xilinx/xlnx_formatter_pcm.c | 709 +++
+ sound/soc/xilinx/xlnx_spdif.c | 339 ++
+ sound/soc/xtensa/xtfpga-i2s.c | 6 +-
+ sound/sparc/dbri.c | 19 +-
+ sound/spi/at73c213.c | 2 +-
+ sound/synth/emux/emux_proc.c | 4 -
+ sound/usb/card.c | 1 -
+ sound/usb/card.h | 1 +
+ sound/usb/format.c | 2 +
+ sound/usb/line6/driver.c | 4 +-
+ sound/usb/line6/pod.c | 3 +-
+ sound/usb/mixer.c | 13 +-
+ sound/usb/mixer_quirks.c | 6 +-
+ sound/usb/pcm.c | 4 +
+ sound/usb/proc.c | 14 +-
+ sound/usb/quirks-table.h | 65 +
+ sound/usb/quirks.c | 119 +-
+ sound/usb/usx2y/usbusx2yaudio.c | 21 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 19 +-
+ sound/x86/intel_hdmi_audio.c | 15 +-
+ 412 files changed, 34393 insertions(+), 6007 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs35l36.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs4341.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/mt6358.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/mt8183-afe-pcm.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/mtk-btcvsd-snd.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/sprd-pcm.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/xlnx,spdif.txt
+ create mode 100644 include/sound/cs35l36.h
+ delete mode 100644 sound/firewire/fireface/ff-protocol-ff400.c
+ delete mode 100644 sound/firewire/fireface/ff-protocol-ff800.c
+ create mode 100644 sound/firewire/fireface/ff-protocol-former.c
+ create mode 100644 sound/firewire/fireface/ff-protocol-latter.c
+ create mode 100644 sound/soc/codecs/cros_ec_codec.c
+ create mode 100644 sound/soc/codecs/cs35l36.c
+ create mode 100644 sound/soc/codecs/cs35l36.h
+ create mode 100644 sound/soc/codecs/cs4341.c
+ create mode 100644 sound/soc/codecs/jz4725b.c
+ create mode 100644 sound/soc/codecs/mt6358.c
+ create mode 100644 sound/soc/codecs/mt6358.h
+ create mode 100644 sound/soc/codecs/rk3328_codec.c
+ create mode 100644 sound/soc/codecs/rk3328_codec.h
+ create mode 100644 sound/soc/codecs/wcd-clsh-v2.c
+ create mode 100644 sound/soc/codecs/wcd-clsh-v2.h
+ create mode 100644 sound/soc/codecs/wcd9335.c
+ create mode 100644 sound/soc/codecs/wcd9335.h
+ create mode 100644 sound/soc/fsl/fsl_micfil.c
+ create mode 100644 sound/soc/fsl/fsl_micfil.h
+ delete mode 100644 sound/soc/generic/audio-graph-scu-card.c
+ delete mode 100644 sound/soc/generic/simple-scu-card.c
+ create mode 100644 sound/soc/mediatek/common/mtk-btcvsd.c
+ create mode 100644 sound/soc/mediatek/mt8183/Makefile
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-clk.h
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-common.h
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-adda.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-hostless.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-i2s.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-pcm.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-dai-tdm.c
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-interconnection.h
+ create mode 100644 sound/soc/mediatek/mt8183/mt8183-reg.h
+ create mode 100644 sound/soc/sprd/Kconfig
+ create mode 100644 sound/soc/sprd/Makefile
+ create mode 100644 sound/soc/sprd/sprd-pcm-dma.c
+ create mode 100644 sound/soc/sprd/sprd-pcm-dma.h
+ create mode 100644 sound/soc/xilinx/xlnx_formatter_pcm.c
+ create mode 100644 sound/soc/xilinx/xlnx_spdif.c
+Merging sound-asoc-fixes/for-linus (b5e806ae4ad8 Merge branch 'asoc-5.0' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Already up to date.
+Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (8cd0aeaa0868 Merge branch 'regulator-5.0' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/axp20x-regulator.c | 18 ++++----
+ drivers/regulator/bcm590xx-regulator.c | 4 ++
+ drivers/regulator/core.c | 12 ++---
+ drivers/regulator/da9052-regulator.c | 64 +++++++++++++--------------
+ drivers/regulator/lochnagar-regulator.c | 4 +-
+ drivers/regulator/max77620-regulator.c | 10 ++++-
+ drivers/regulator/mc13783-regulator.c | 78 ++++++++++++++++-----------------
+ drivers/regulator/mc13892-regulator.c | 64 +++++++++++++--------------
+ drivers/regulator/mc13xxx.h | 20 ++++-----
+ drivers/regulator/pv88060-regulator.c | 2 +-
+ drivers/regulator/pv88080-regulator.c | 2 +-
+ drivers/regulator/pv88090-regulator.c | 2 +-
+ drivers/regulator/s2mpa01.c | 10 ++---
+ drivers/regulator/s2mps11.c | 6 +--
+ drivers/regulator/stpmic1_regulator.c | 7 +--
+ drivers/regulator/tps65218-regulator.c | 5 ++-
+ drivers/regulator/uniphier-regulator.c | 8 ++--
+ drivers/regulator/wm831x-dcdc.c | 4 +-
+ 18 files changed, 165 insertions(+), 155 deletions(-)
+Merging spi-fixes/for-linus (22e78ec655e8 Merge branch 'spi-5.0' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-dw.c | 36 ++++++++---------
+ drivers/spi/spi-fsl-dspi.c | 2 +-
+ drivers/spi/spi-fsl-lpspi.c | 92 ++++++++++++++++++++++--------------------
+ drivers/spi/spi-gpio.c | 4 +-
+ drivers/spi/spi-mem.c | 3 +-
+ drivers/spi/spi-npcm-pspi.c | 3 +-
+ drivers/spi/spi-omap2-mcspi.c | 4 +-
+ drivers/spi/spi-pxa2xx.c | 1 +
+ drivers/spi/spi-sprd.c | 10 +++--
+ drivers/spi/spi-ti-qspi.c | 6 +--
+ drivers/spi/spi-topcliff-pch.c | 6 +++
+ 11 files changed, 91 insertions(+), 76 deletions(-)
+Merging pci-current/for-linus (f57a98e1b713 PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX))
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (d13937116f1e Linux 5.0-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (d13937116f1e Linux 5.0-rc6)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (d13937116f1e Linux 5.0-rc6)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition in _probe)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (8d7fa3d4ea3f USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/cp210x.c | 1 +
+ drivers/usb/serial/ftdi_sio.c | 2 ++
+ drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++
+ 3 files changed, 9 insertions(+)
+Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Merge made by the 'recursive' strategy.
+Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (d13937116f1e Linux 5.0-rc6)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (d13937116f1e Linux 5.0-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (5908e6b738e3 Linux 5.0-rc8)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (7ad222b3aed3 Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK)
+$ git merge input-current/for-linus
+Already up to date.
+Merging crypto-current/master (f86d17e9efe0 crypto: arm64/chacha - fix hchacha_block_neon() for big endian)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (7d4e591bc051 selftests: timers: use LDLIBS instead of LDFLAGS)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging slave-dma-fixes/fixes (d13937116f1e Linux 5.0-rc6)
+$ git merge slave-dma-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/master (3e35730dd754 mtd: powernv_flash: Fix device registration error)
+$ git merge mtd-fixes/master
+Already up to date.
+Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
+$ git merge spi-nor-fixes/spi-nor/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (7bdf2c8fee51 media: v4l: ioctl: Sanitize num_planes before using it)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/media/v4l2-core/v4l2-ioctl.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (e0bf304e4a00 MIPS: fix memory setup for platforms with PHYS_OFFSET != 0)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (dc30e7039137 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized)
+$ git merge omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (de3ccd26fafc KVM: MMU: record maximum physical address width in kvm_mmu_extended_role)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (ff066653aeed hwmon: (pmbus/tps53679) Fix driver info initialization in probe routine)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/pmbus/tps53679.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (8834f5600cf3 Linux 5.0-rc5)
+$ git merge btrfs-fixes/next-fixes
+Already up to date.
+Merging vfs-fixes/fixes (d3d6a18d7d35 aio: Fix locking in aio_poll())
+$ git merge vfs-fixes/fixes
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging fs/namespace.c
+Auto-merging fs/aio.c
+Merge made by the 'recursive' strategy.
+ fs/aio.c | 12 ++++++---
+ fs/exec.c | 2 +-
+ fs/kernfs/mount.c | 8 ++++--
+ fs/namespace.c | 2 +-
+ kernel/cgroup/cgroup-internal.h | 2 +-
+ kernel/cgroup/cgroup-v1.c | 58 +++++++++--------------------------------
+ kernel/cgroup/cgroup.c | 25 +++++++++---------
+ 7 files changed, 44 insertions(+), 65 deletions(-)
+Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (6a730fcb9cb4 Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (388b4e6a00bb scsi: core: Avoid that system resume triggers a kernel warning)
+$ git merge scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (17fb465f1602 drm/bochs: Fix the ID mismatch error)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (5908e6b738e3 Linux 5.0-rc8)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (e30be063d6db mmc: sdhci-esdhc-imx: correct the fix of ERR004536)
+$ git merge mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (bfeffd155283 Linux 5.0-rc1)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (04b9c4885158 drm/bochs: Fix the ID mismatch error)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_file.c | 22 ++++++++++++++++------
+ drivers/gpu/drm/drm_ioctl.c | 22 +++++++++++++++++-----
+ include/drm/drm_drv.h | 2 +-
+ 3 files changed, 34 insertions(+), 12 deletions(-)
+Merging kbuild/for-next (85d89b922ba2 Merge branch 'kconfig' into for-next)
+$ git merge kbuild/for-next
+Auto-merging scripts/kallsyms.c
+Auto-merging init/Kconfig
+Auto-merging Makefile
+Auto-merging Documentation/devicetree/bindings/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/Makefile | 2 +-
+ Documentation/kbuild/kbuild.txt | 15 +-
+ Documentation/kbuild/makefiles.txt | 9 +-
+ Documentation/kbuild/modules.txt | 2 +-
+ Kbuild | 25 +--
+ Makefile | 201 +++++++++---------
+ arch/mips/boot/Makefile | 2 +-
+ arch/powerpc/boot/Makefile | 2 +-
+ arch/s390/boot/Makefile | 6 +-
+ arch/s390/boot/compressed/Makefile | 4 +-
+ arch/s390/scripts/Makefile.chkbss | 25 +--
+ arch/x86/realmode/rm/Makefile | 3 +-
+ init/Kconfig | 17 ++
+ kernel/trace/Kconfig | 1 +
+ scripts/Kbuild.include | 16 +-
+ scripts/Makefile | 3 +-
+ scripts/Makefile.build | 29 +--
+ scripts/Makefile.host | 6 +-
+ scripts/Makefile.lib | 42 ++--
+ scripts/Makefile.modpost | 2 +-
+ scripts/gdb/linux/Makefile | 25 +--
+ scripts/kallsyms.c | 13 +-
+ scripts/kconfig/Makefile | 9 +-
+ scripts/kconfig/conf.c | 13 --
+ scripts/kconfig/expr.h | 2 +-
+ scripts/kconfig/gconf.c | 330 ++++++++++++++---------------
+ scripts/kconfig/{zconf.l => lexer.l} | 2 +-
+ scripts/kconfig/lkc.h | 2 +-
+ scripts/kconfig/{zconf.y => parser.y} | 0
+ scripts/link-vmlinux.sh | 46 +---
+ scripts/mkcompile_h | 4 +-
+ scripts/package/Makefile | 4 +-
+ scripts/package/builddeb | 10 +-
+ scripts/package/buildtar | 2 +-
+ scripts/package/mkdebian | 6 +-
+ 35 files changed, 406 insertions(+), 474 deletions(-)
+ rename scripts/kconfig/{zconf.l => lexer.l} (99%)
+ rename scripts/kconfig/{zconf.y => parser.y} (100%)
+Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging leaks/leaks-next (982ef2f7ef0a leaking_addresses: Completely remove --version flag)
+$ git merge leaks/leaks-next
+Merge made by the 'recursive' strategy.
+ scripts/leaking_addresses.pl | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+Merging dma-mapping/for-next (9eb9e96e97b3 Documentation/DMA-API-HOWTO: update dma_mask sections)
+$ git merge dma-mapping/for-next
+Auto-merging drivers/mfd/Kconfig
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/Kconfig
+Removing arch/arc/include/asm/dma-mapping.h
+Auto-merging arch/arc/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt | 121 +++++++--------------
+ Documentation/DMA-API.txt | 29 +----
+ arch/arc/Kconfig | 3 +-
+ arch/arc/include/asm/Kbuild | 1 +
+ arch/arc/include/asm/dma-mapping.h | 13 ---
+ arch/arm/Kconfig | 5 +-
+ arch/arm/include/asm/dma-mapping.h | 9 --
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 12 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 3 +-
+ arch/arm/mm/dma-mapping.c | 2 +
+ arch/arm64/Kconfig | 4 +-
+ arch/arm64/include/asm/dma-mapping.h | 9 --
+ arch/csky/Kconfig | 2 -
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/asm/dma-mapping.h | 10 --
+ arch/mips/mm/dma-noncoherent.c | 8 ++
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/kernel/dma-swiotlb.c | 1 +
+ arch/powerpc/kernel/dma.c | 1 +
+ arch/riscv/Kconfig | 1 -
+ arch/sh/Kconfig | 2 +-
+ arch/sh/boards/mach-ap325rxa/setup.c | 5 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 6 +-
+ arch/sh/boards/mach-kfr2r09/setup.c | 5 +-
+ arch/sh/boards/mach-migor/setup.c | 5 +-
+ arch/sh/boards/mach-se/7724/setup.c | 6 +-
+ arch/sh/drivers/pci/fixups-dreamcast.c | 3 +-
+ arch/sparc/kernel/iommu.c | 13 +--
+ arch/sparc/kernel/kernel.h | 6 +-
+ arch/sparc/kernel/pci.c | 46 +++-----
+ arch/sparc/kernel/pci_sun4v.c | 18 +--
+ arch/unicore32/Kconfig | 1 -
+ arch/x86/Kconfig | 1 -
+ arch/xtensa/Kconfig | 1 -
+ drivers/base/Kconfig | 77 -------------
+ .../media/common/videobuf2/videobuf2-dma-contig.c | 41 ++-----
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 3 +-
+ drivers/mfd/Kconfig | 3 +
+ drivers/of/Kconfig | 6 +-
+ drivers/parisc/ccio-dma.c | 4 +-
+ drivers/usb/host/ohci-sm501.c | 3 +-
+ drivers/usb/host/ohci-tmio.c | 2 +-
+ include/linux/device.h | 2 +
+ include/linux/dma-mapping.h | 61 +++++------
+ kernel/dma/Kconfig | 121 ++++++++++++++++++++-
+ kernel/dma/Makefile | 2 +-
+ kernel/dma/coherent.c | 50 ++-------
+ kernel/dma/debug.c | 108 ++++++------------
+ kernel/dma/direct.c | 14 +++
+ lib/Kconfig.debug | 36 ------
+ 50 files changed, 344 insertions(+), 544 deletions(-)
+ delete mode 100644 arch/arc/include/asm/dma-mapping.h
+Merging asm-generic/master (d724444ab97d asm-generic/page.h: fix typo in #error text requiring a real asm/page.h)
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/uapi/asm/mman.h | 4 +---
+ arch/mips/include/uapi/asm/mman.h | 4 +---
+ arch/parisc/include/uapi/asm/mman.h | 4 +---
+ arch/x86/mm/mpx.c | 2 +-
+ arch/xtensa/include/uapi/asm/mman.h | 4 +---
+ include/asm-generic/page.h | 2 +-
+ include/drm/drmP.h | 3 +--
+ include/uapi/asm-generic/mman-common.h | 4 +---
+ include/uapi/linux/mman.h | 4 ++++
+ 9 files changed, 12 insertions(+), 19 deletions(-)
+Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (585f8003e2e7 Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next)
+$ git merge arm/for-next
+Auto-merging arch/arm/mm/dma-mapping.c
+Removing arch/arm/mach-oxnas/hotplug.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/arm/kernel_mode_neon.txt | 4 +-
+ arch/arm/Kconfig | 3 +-
+ arch/arm/Kconfig-nommu | 2 +
+ arch/arm/Makefile | 2 +-
+ arch/arm/boot/bootp/Makefile | 2 +-
+ arch/arm/boot/bootp/init.S | 2 +-
+ arch/arm/boot/compressed/Makefile | 2 -
+ arch/arm/boot/compressed/ll_char_wr.S | 4 +-
+ arch/arm/include/asm/assembler.h | 12 +--
+ arch/arm/include/asm/barrier.h | 2 +
+ arch/arm/include/asm/hardware/entry-macro-iomd.S | 10 +--
+ arch/arm/include/asm/pgtable.h | 3 +
+ arch/arm/include/asm/processor.h | 6 +-
+ arch/arm/include/asm/smp.h | 1 -
+ arch/arm/include/asm/smp_twd.h | 16 ----
+ arch/arm/include/asm/spinlock.h | 3 +-
+ arch/arm/include/asm/uaccess.h | 3 +-
+ arch/arm/include/asm/v7m.h | 2 +-
+ arch/arm/include/asm/vfpmacros.h | 8 +-
+ arch/arm/include/debug/tegra.S | 2 +-
+ arch/arm/kernel/debug.S | 2 +-
+ arch/arm/kernel/entry-armv.S | 12 +--
+ arch/arm/kernel/entry-common.S | 2 +-
+ arch/arm/kernel/entry-header.S | 11 +--
+ arch/arm/kernel/entry-v7m.S | 4 +
+ arch/arm/kernel/hyp-stub.S | 4 +-
+ arch/arm/kernel/machine_kexec.c | 5 +-
+ arch/arm/kernel/smp.c | 10 +--
+ arch/arm/kernel/smp_twd.c | 66 --------------
+ arch/arm/lib/Makefile | 2 +-
+ arch/arm/lib/bitops.h | 8 +-
+ arch/arm/lib/clear_user.S | 2 +-
+ arch/arm/lib/copy_from_user.S | 2 +-
+ arch/arm/lib/copy_page.S | 4 +-
+ arch/arm/lib/copy_template.S | 6 +-
+ arch/arm/lib/copy_to_user.S | 2 +-
+ arch/arm/lib/csumpartial.S | 20 ++---
+ arch/arm/lib/csumpartialcopygeneric.S | 4 +-
+ arch/arm/lib/csumpartialcopyuser.S | 2 +-
+ arch/arm/lib/div64.S | 4 +-
+ arch/arm/lib/floppydma.S | 10 +--
+ arch/arm/lib/io-readsb.S | 20 ++---
+ arch/arm/lib/io-readsl.S | 2 +-
+ arch/arm/lib/io-readsw-armv3.S | 6 +-
+ arch/arm/lib/io-readsw-armv4.S | 12 +--
+ arch/arm/lib/io-writesb.S | 20 ++---
+ arch/arm/lib/io-writesl.S | 2 +-
+ arch/arm/lib/io-writesw-armv3.S | 2 +-
+ arch/arm/lib/io-writesw-armv4.S | 6 +-
+ arch/arm/lib/lib1funcs.S | 4 +-
+ arch/arm/lib/memcpy.S | 4 +-
+ arch/arm/lib/memmove.S | 24 ++---
+ arch/arm/lib/memset.S | 42 ++++-----
+ arch/arm/lib/xor-neon.c | 2 +-
+ arch/arm/mach-actions/platsmp.c | 15 ----
+ arch/arm/mach-exynos/headsmp.S | 2 +-
+ arch/arm/mach-exynos/platsmp.c | 31 ++++---
+ arch/arm/mach-ks8695/include/mach/entry-macro.S | 2 +-
+ arch/arm/mach-omap2/prm_common.c | 4 +-
+ arch/arm/mach-oxnas/Makefile | 1 -
+ arch/arm/mach-oxnas/hotplug.c | 109 -----------------------
+ arch/arm/mach-oxnas/platsmp.c | 4 -
+ arch/arm/mach-prima2/common.h | 2 +
+ arch/arm/mach-prima2/headsmp.S | 2 +-
+ arch/arm/mach-prima2/hotplug.c | 3 +-
+ arch/arm/mach-prima2/platsmp.c | 17 ++--
+ arch/arm/mach-qcom/platsmp.c | 26 ------
+ arch/arm/mach-spear/generic.h | 2 +
+ arch/arm/mach-spear/headsmp.S | 2 +-
+ arch/arm/mach-spear/hotplug.c | 4 +-
+ arch/arm/mach-spear/platsmp.c | 27 +++---
+ arch/arm/mach-tegra/reset-handler.S | 2 +-
+ arch/arm/mm/cache-v6.S | 8 +-
+ arch/arm/mm/copypage-v4mc.c | 3 +-
+ arch/arm/mm/copypage-v4wb.c | 3 +-
+ arch/arm/mm/copypage-v4wt.c | 3 +-
+ arch/arm/mm/dma-mapping.c | 2 +-
+ arch/arm/mm/idmap.c | 4 +-
+ arch/arm/mm/init.c | 69 +-------------
+ arch/arm/mm/pmsa-v8.c | 4 +-
+ arch/arm/mm/proc-v7m.S | 7 +-
+ drivers/amba/bus.c | 45 ++++++++--
+ drivers/hwtracing/coresight/coresight-etm3x.c | 44 +++------
+ drivers/hwtracing/coresight/coresight-etm4x.c | 21 +++--
+ drivers/hwtracing/coresight/coresight-priv.h | 40 +++++++++
+ drivers/hwtracing/coresight/coresight-stm.c | 14 +--
+ drivers/hwtracing/coresight/coresight-tmc.c | 30 ++-----
+ include/linux/amba/bus.h | 39 ++++++++
+ lib/raid6/Makefile | 2 +-
+ 89 files changed, 414 insertions(+), 596 deletions(-)
+ delete mode 100644 arch/arm/mach-oxnas/hotplug.c
+Merging arm64/for-next/core (b855b58ac1b7 arm64: mmu: drop paging_init comments)
+$ git merge arm64/for-next/core
+Auto-merging kernel/irq/manage.c
+Auto-merging kernel/irq/irqdesc.c
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/efi.h
+Auto-merging drivers/firmware/efi/runtime-wrappers.c
+Auto-merging drivers/firmware/efi/arm-runtime.c
+Auto-merging arch/arm64/mm/dump.c
+Auto-merging arch/arm64/kvm/hyp/switch.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/kernel/ptrace.c
+Auto-merging arch/arm64/kernel/probes/kprobes.c
+Auto-merging arch/arm64/include/asm/memory.h
+Removing arch/arm64/include/asm/memblock.h
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/arm/pmu.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/arm64/booting.txt | 5 +
+ Documentation/arm64/pointer-authentication.txt | 5 +
+ Documentation/arm64/silicon-errata.txt | 1 +
+ Documentation/devicetree/bindings/arm/pmu.txt | 70 ----
+ Documentation/devicetree/bindings/arm/pmu.yaml | 87 +++++
+ MAINTAINERS | 3 +-
+ arch/arm/include/asm/arch_gicv3.h | 33 ++
+ arch/arm64/Kconfig | 36 ++-
+ arch/arm64/Kconfig.platforms | 2 +-
+ arch/arm64/include/asm/alternative.h | 4 +-
+ arch/arm64/include/asm/arch_gicv3.h | 32 ++
+ arch/arm64/include/asm/asm-uaccess.h | 2 +-
+ arch/arm64/include/asm/assembler.h | 36 ++-
+ arch/arm64/include/asm/cpucaps.h | 3 +-
+ arch/arm64/include/asm/cpufeature.h | 10 +
+ arch/arm64/include/asm/cputype.h | 9 +
+ arch/arm64/include/asm/daifflags.h | 60 +++-
+ arch/arm64/include/asm/efi.h | 11 +
+ arch/arm64/include/asm/hardirq.h | 31 ++
+ arch/arm64/include/asm/io.h | 1 +
+ arch/arm64/include/asm/irqflags.h | 100 ++++--
+ arch/arm64/include/asm/kvm_host.h | 16 +
+ arch/arm64/include/asm/memblock.h | 21 --
+ arch/arm64/include/asm/memory.h | 5 +-
+ arch/arm64/include/asm/mmu.h | 1 +
+ arch/arm64/include/asm/pgtable-hwdef.h | 1 +
+ arch/arm64/include/asm/processor.h | 3 +
+ arch/arm64/include/asm/ptdump.h | 9 +-
+ arch/arm64/include/asm/ptrace.h | 26 +-
+ arch/arm64/include/asm/thread_info.h | 1 -
+ arch/arm64/include/asm/uaccess.h | 36 +--
+ arch/arm64/include/uapi/asm/ptrace.h | 13 +
+ arch/arm64/kernel/alternative.c | 60 +++-
+ arch/arm64/kernel/asm-offsets.c | 21 +-
+ arch/arm64/kernel/cpufeature.c | 41 ++-
+ arch/arm64/kernel/entry.S | 60 +++-
+ arch/arm64/kernel/irq.c | 3 +
+ arch/arm64/kernel/kgdb.c | 14 +-
+ arch/arm64/kernel/perf_event.c | 2 +-
+ arch/arm64/kernel/probes/kprobes.c | 6 +
+ arch/arm64/kernel/process.c | 51 +++
+ arch/arm64/kernel/ptrace.c | 147 +++++++++
+ arch/arm64/kernel/setup.c | 1 -
+ arch/arm64/kernel/smp.c | 33 ++
+ arch/arm64/kernel/traps.c | 8 +-
+ arch/arm64/kvm/hyp/switch.c | 16 +
+ arch/arm64/mm/dump.c | 4 +-
+ arch/arm64/mm/fault.c | 9 +-
+ arch/arm64/mm/init.c | 20 +-
+ arch/arm64/mm/mmu.c | 5 -
+ arch/arm64/mm/proc.S | 12 +-
+ arch/arm64/mm/ptdump_debugfs.c | 7 +-
+ arch/riscv/include/asm/io.h | 36 +--
+ drivers/firmware/efi/arm-runtime.c | 6 +-
+ drivers/firmware/efi/runtime-wrappers.c | 17 +-
+ drivers/irqchip/irq-gic-v3.c | 265 ++++++++++++++--
+ drivers/perf/xgene_pmu.c | 2 -
+ include/asm-generic/io.h | 20 +-
+ include/linux/efi.h | 5 +-
+ include/linux/hardirq.h | 7 +
+ include/linux/interrupt.h | 18 ++
+ include/linux/irq.h | 10 +
+ include/linux/irqdesc.h | 5 +
+ include/uapi/linux/elf.h | 2 +
+ kernel/irq/chip.c | 54 ++++
+ kernel/irq/debugfs.c | 6 +-
+ kernel/irq/internals.h | 2 +
+ kernel/irq/irqdesc.c | 35 ++
+ kernel/irq/manage.c | 405 +++++++++++++++++++++++-
+ lib/raid6/neon.uc | 5 +-
+ lib/raid6/recov_neon_inner.c | 19 +-
+ 72 files changed, 1746 insertions(+), 371 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/pmu.yaml
+ delete mode 100644 arch/arm64/include/asm/memblock.h
+Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but not used variable 'config')
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (48d1dbf3918f arm-soc: document merges)
+$ git merge arm-soc/for-next
+Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+Auto-merging arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+Auto-merging arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
+Auto-merging arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+Auto-merging arch/arm64/Kconfig.platforms
+CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
+Removing arch/arm/mach-pxa/raumfeld.c
+Removing arch/arm/mach-pxa/include/mach/pxa25x-udc.h
+Auto-merging arch/arm/mach-exynos/platsmp.c
+Removing arch/arm/mach-davinci/irq.c
+Removing arch/arm/mach-davinci/include/mach/entry-macro.S
+Removing arch/arm/mach-davinci/cp_intc.h
+Removing arch/arm/mach-davinci/cp_intc.c
+Removing arch/arm/configs/raumfeld_defconfig
+Removing arch/arm/boot/dts/skeleton64.dtsi
+Removing arch/arm/boot/dts/skeleton.dtsi
+Auto-merging arch/arm/boot/dts/ls1021a.dtsi
+Auto-merging arch/arm/boot/dts/armada-38x.dtsi
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/arm/technologic.txt
+Removing Documentation/devicetree/bindings/arm/shmobile.txt
+Removing Documentation/devicetree/bindings/arm/olimex.txt
+Removing Documentation/devicetree/bindings/arm/i2se.txt
+Removing Documentation/devicetree/bindings/arm/fsl.txt
+Removing Documentation/devicetree/bindings/arm/compulab-boards.txt
+Removing Documentation/devicetree/bindings/arm/bhf.txt
+Removing Documentation/devicetree/bindings/arm/armadeus.txt
+Resolved 'arch/arm64/Kconfig.platforms' using previous resolution.
+Resolved 'arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts' using previous resolution.
+Resolved 'arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4d25e5f47455] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/amlogic.txt | 1 +
+ Documentation/devicetree/bindings/arm/armadeus.txt | 6 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 +
+ Documentation/devicetree/bindings/arm/bhf.txt | 6 -
+ Documentation/devicetree/bindings/arm/bitmain.yaml | 18 +
+ .../devicetree/bindings/arm/compulab-boards.txt | 25 -
+ Documentation/devicetree/bindings/arm/cpus.yaml | 1 +
+ .../bindings/arm/freescale/fsl,imx7ulp-sim.txt | 16 +
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 15 +-
+ Documentation/devicetree/bindings/arm/fsl.txt | 237 ---
+ Documentation/devicetree/bindings/arm/fsl.yaml | 232 +++
+ Documentation/devicetree/bindings/arm/i2se.txt | 22 -
+ Documentation/devicetree/bindings/arm/mediatek.txt | 14 +-
+ Documentation/devicetree/bindings/arm/olimex.txt | 10 -
+ Documentation/devicetree/bindings/arm/renesas.yaml | 238 +++
+ .../devicetree/bindings/arm/rockchip.yaml | 17 +
+ Documentation/devicetree/bindings/arm/shmobile.txt | 155 --
+ .../bindings/arm/socionext/milbeaut.yaml | 22 +
+ .../devicetree/bindings/arm/technologic.txt | 23 -
+ Documentation/devicetree/bindings/arm/tegra.yaml | 2 +
+ Documentation/devicetree/bindings/bus/imx-weim.txt | 32 +-
+ .../bindings/clock/nvidia,tegra124-dfll.txt | 83 +-
+ .../bindings/cpufreq/nvidia,tegra124-cpufreq.txt | 6 +-
+ .../display/amlogic,simple-framebuffer.txt | 33 +
+ .../bindings/firmware/nvidia,tegra186-bpmp.txt | 1 -
+ .../bindings/firmware/nvidia,tegra210-bpmp.txt | 35 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 6 +
+ .../bindings/input/touchscreen/ti-tsc-adc.txt | 8 +
+ .../interrupt-controller/mediatek,sysirq.txt | 1 +
+ .../devicetree/bindings/net/cpsw-phy-sel.txt | 2 +-
+ .../bindings/nvmem/xlnx,zynqmp-nvmem.txt | 46 +
+ Documentation/devicetree/bindings/opp/opp.txt | 3 +
+ .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 3 +
+ .../devicetree/bindings/power/qcom,rpmpd.txt | 145 ++
+ .../bindings/power/reset/xlnx,zynqmp-power.txt | 25 +
+ .../bindings/power/xlnx,zynqmp-genpd.txt | 34 +
+ .../bindings/reset/brcm,brcmstb-reset.txt | 27 +
+ .../devicetree/bindings/reset/fsl,imx7-src.txt | 7 +-
+ .../bindings/reset/xlnx,zynqmp-reset.txt | 52 +
+ .../bindings/soc/amlogic/clk-measure.txt | 2 +
+ .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 +
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 +
+ .../devicetree/bindings/sram/milbeaut-smp-sram.txt | 24 +
+ .../devicetree/bindings/sram/sunxi-sram.txt | 1 +
+ .../bindings/timer/socionext,milbeaut-timer.txt | 17 +
+ .../devicetree/bindings/vendor-prefixes.txt | 5 +
+ MAINTAINERS | 93 +-
+ arch/arm/Kconfig | 4 +
+ arch/arm/Makefile | 1 +
+ arch/arm/arm-soc-for-next-contents.txt | 259 +++
+ arch/arm/boot/dts/Makefile | 16 +-
+ arch/arm/boot/dts/alphascale-asm9260.dtsi | 3 +-
+ arch/arm/boot/dts/alpine.dtsi | 8 +-
+ arch/arm/boot/dts/am335x-baltos-ir2110.dts | 4 -
+ arch/arm/boot/dts/am335x-baltos-ir3220.dts | 4 -
+ arch/arm/boot/dts/am335x-baltos-ir5221.dts | 4 -
+ arch/arm/boot/dts/am335x-chiliboard.dts | 8 +-
+ arch/arm/boot/dts/am335x-guardian.dts | 511 ++++++
+ arch/arm/boot/dts/am335x-icev2.dts | 4 -
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 4 -
+ arch/arm/boot/dts/am335x-lxm.dts | 4 -
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 5 -
+ arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 5 -
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 4 -
+ arch/arm/boot/dts/am335x-shc.dts | 4 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 17 +-
+ arch/arm/boot/dts/am3874-iceboard.dts | 496 +++++
+ arch/arm/boot/dts/am437x-gp-evm.dts | 2 +-
+ arch/arm/boot/dts/am437x-l4.dtsi | 17 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 5 +-
+ arch/arm/boot/dts/arm-realview-eb.dtsi | 4 +-
+ arch/arm/boot/dts/arm-realview-pb1176.dts | 4 +-
+ arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 +-
+ arch/arm/boot/dts/arm-realview-pbx.dtsi | 4 +-
+ arch/arm/boot/dts/armada-370-rd.dts | 42 -
+ arch/arm/boot/dts/armada-388-clearfog.dts | 58 -
+ arch/arm/boot/dts/armada-38x.dtsi | 4 +-
+ arch/arm/boot/dts/armada-39x.dtsi | 3 +-
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 47 -
+ arch/arm/boot/dts/artpec6.dtsi | 3 +-
+ .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 10 +
+ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 55 +-
+ arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 145 ++
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 5 +
+ arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 8 +
+ arch/arm/boot/dts/aspeed-g4.dtsi | 1 +
+ arch/arm/boot/dts/aspeed-g5.dtsi | 34 +-
+ arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 2 +-
+ arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 30 +
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 4 +
+ arch/arm/boot/dts/at91-wb45n.dts | 2 +-
+ arch/arm/boot/dts/at91-wb50n.dts | 4 +-
+ arch/arm/boot/dts/at91rm9200.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9261.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9263.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9g45.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9rl.dtsi | 4 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi | 4 +-
+ arch/arm/boot/dts/atlas6-evb.dts | 1 +
+ arch/arm/boot/dts/atlas6.dtsi | 1 -
+ arch/arm/boot/dts/atlas7.dtsi | 1 -
+ arch/arm/boot/dts/axm55xx.dtsi | 4 +-
+ arch/arm/boot/dts/bcm-cygnus.dtsi | 9 +-
+ arch/arm/boot/dts/bcm-nsp.dtsi | 4 +-
+ arch/arm/boot/dts/bcm11351.dtsi | 4 +-
+ arch/arm/boot/dts/bcm21664-garnet.dts | 1 +
+ arch/arm/boot/dts/bcm21664.dtsi | 4 +-
+ arch/arm/boot/dts/bcm23550-sparrow.dts | 1 +
+ arch/arm/boot/dts/bcm23550.dtsi | 4 +-
+ arch/arm/boot/dts/bcm28155-ap.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 11 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 4 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 68 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 175 ++
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 74 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 74 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +-
+ arch/arm/boot/dts/bcm283x.dtsi | 17 +-
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 1 +
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 1 +
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 1 +
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 1 +
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 1 +
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 1 +
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 1 +
+ arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 1 +
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 1 +
+ arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 1 +
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 1 +
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 1 +
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 1 +
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 1 +
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 71 +
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 4 +-
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 1 +
+ arch/arm/boot/dts/bcm5301x.dtsi | 3 +-
+ arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts | 1 +
+ arch/arm/boot/dts/bcm53573.dtsi | 3 +-
+ arch/arm/boot/dts/bcm63138.dtsi | 4 +-
+ arch/arm/boot/dts/bcm7445.dtsi | 2 -
+ arch/arm/boot/dts/bcm947189acdbmr.dts | 1 +
+ arch/arm/boot/dts/bcm953012er.dts | 1 +
+ arch/arm/boot/dts/bcm953012hr.dts | 1 +
+ arch/arm/boot/dts/bcm953012k.dts | 1 +
+ arch/arm/boot/dts/cx92755.dtsi | 4 +-
+ arch/arm/boot/dts/da850-lcdk.dts | 10 +-
+ arch/arm/boot/dts/dm814x.dtsi | 79 +-
+ arch/arm/boot/dts/dove.dtsi | 4 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 15 +-
+ arch/arm/boot/dts/ep7209.dtsi | 4 +-
+ arch/arm/boot/dts/ep7211-edb7211.dts | 1 +
+ arch/arm/boot/dts/exynos3250.dtsi | 3 +
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 4 +-
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 7 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 6 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 -
+ arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 8 +
+ arch/arm/boot/dts/exynos5422-odroidxu4.dts | 4 +-
+ arch/arm/boot/dts/imx27.dtsi | 2 +-
+ arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 16 +
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 34 +-
+ arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 555 ++++++
+ arch/arm/boot/dts/imx6-logicpd-som.dtsi | 365 ++++
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 5 +-
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 595 ++++++
+ arch/arm/boot/dts/imx6dl-yapp4-draco.dts | 58 +
+ arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 50 +
+ arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 54 +
+ arch/arm/boot/dts/imx6q-logicpd.dts | 120 ++
+ arch/arm/boot/dts/imx6q-tbs2910.dts | 49 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 26 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 26 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 14 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 6 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 8 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 19 +-
+ arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi | 148 ++
+ arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi | 55 +
+ .../boot/dts/imx6ul-phytec-phyboard-segin-full.dts | 89 +
+ .../arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi | 329 ++++
+ arch/arm/boot/dts/imx6ull-colibri.dtsi | 8 +-
+ arch/arm/boot/dts/imx6ull.dtsi | 12 +
+ arch/arm/boot/dts/imx7ulp.dtsi | 19 +-
+ arch/arm/boot/dts/integrator.dtsi | 10 +-
+ arch/arm/boot/dts/integratorcp.dts | 89 +-
+ arch/arm/boot/dts/kirkwood-dir665.dts | 47 -
+ arch/arm/boot/dts/kirkwood-linksys-viper.dts | 47 -
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 47 -
+ arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 9 -
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 41 -
+ arch/arm/boot/dts/kirkwood.dtsi | 3 +-
+ arch/arm/boot/dts/lpc3250-ea3250.dts | 20 +-
+ arch/arm/boot/dts/lpc3250-phy3250.dts | 87 +-
+ arch/arm/boot/dts/lpc32xx.dtsi | 32 +-
+ arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 -
+ arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 -
+ arch/arm/boot/dts/lpc4357-myd-lpc4357.dts | 619 +++++++
+ arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 1 +
+ arch/arm/boot/dts/ls1021a-qds.dts | 1 +
+ arch/arm/boot/dts/ls1021a-twr.dts | 1 +
+ arch/arm/boot/dts/ls1021a.dtsi | 18 +-
+ arch/arm/boot/dts/meson.dtsi | 10 +-
+ arch/arm/boot/dts/meson6-atv1200.dts | 1 +
+ arch/arm/boot/dts/meson6.dtsi | 8 +
+ arch/arm/boot/dts/meson8-minix-neo-x8.dts | 1 +
+ arch/arm/boot/dts/meson8.dtsi | 89 +-
+ arch/arm/boot/dts/meson8b-ec100.dts | 128 ++
+ arch/arm/boot/dts/meson8b-mxq.dts | 1 +
+ arch/arm/boot/dts/meson8b-odroidc1.dts | 6 +
+ arch/arm/boot/dts/meson8b.dtsi | 83 +-
+ arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 6 +
+ arch/arm/boot/dts/meson8m2.dtsi | 4 +
+ arch/arm/boot/dts/milbeaut-m10v-evb.dts | 32 +
+ arch/arm/boot/dts/milbeaut-m10v.dtsi | 95 +
+ arch/arm/boot/dts/mmp2-brownstone.dts | 1 +
+ arch/arm/boot/dts/mmp2.dtsi | 4 +-
+ arch/arm/boot/dts/moxart.dtsi | 3 +-
+ arch/arm/boot/dts/mps2.dtsi | 6 +-
+ arch/arm/boot/dts/mt2701-evb.dts | 1 +
+ arch/arm/boot/dts/mt2701.dtsi | 3 +-
+ arch/arm/boot/dts/mt6580-evbp1.dts | 1 +
+ arch/arm/boot/dts/mt6580.dtsi | 1 -
+ arch/arm/boot/dts/mt6589-aquaris5.dts | 1 +
+ arch/arm/boot/dts/mt6589.dtsi | 3 +-
+ arch/arm/boot/dts/mt6592-evb.dts | 2 +-
+ arch/arm/boot/dts/mt6592.dtsi | 3 +-
+ arch/arm/boot/dts/mt7623.dtsi | 15 +-
+ arch/arm/boot/dts/mt8127-moose.dts | 1 +
+ arch/arm/boot/dts/mt8127.dtsi | 3 +-
+ arch/arm/boot/dts/mt8135-evbp1.dts | 1 +
+ arch/arm/boot/dts/mt8135.dtsi | 3 +-
+ arch/arm/boot/dts/nspire.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-evm-common.dtsi | 7 +-
+ arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 10 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 39 +-
+ arch/arm/boot/dts/omap3-gta04a5.dts | 2 +-
+ arch/arm/boot/dts/omap4-droid4-xt894.dts | 10 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 6 +-
+ arch/arm/boot/dts/omap4-sdp.dts | 30 +
+ arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 1 +
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 1 +
+ arch/arm/boot/dts/orion5x-lswsgl.dts | 1 +
+ .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 1 +
+ arch/arm/boot/dts/orion5x-netgear-wnr854t.dts | 1 +
+ arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 1 +
+ arch/arm/boot/dts/orion5x.dtsi | 4 +-
+ arch/arm/boot/dts/ox810se.dtsi | 4 +-
+ arch/arm/boot/dts/ox820.dtsi | 4 +-
+ arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 1 -
+ arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 1 -
+ arch/arm/boot/dts/prima2-evb.dts | 1 +
+ arch/arm/boot/dts/prima2.dtsi | 1 -
+ arch/arm/boot/dts/pxa168.dtsi | 4 +-
+ arch/arm/boot/dts/pxa2xx.dtsi | 3 +-
+ arch/arm/boot/dts/pxa910.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 8 +-
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 9 +-
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 11 +-
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 8 +-
+ arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 1 +
+ arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 25 +-
+ arch/arm/boot/dts/qcom-msm8960.dtsi | 9 +-
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 130 ++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 19 +-
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 1 +
+ arch/arm/boot/dts/r7s9210-rza2mevb.dts | 82 +
+ arch/arm/boot/dts/r7s9210.dtsi | 218 +++
+ arch/arm/boot/dts/r8a7743.dtsi | 43 +-
+ arch/arm/boot/dts/r8a7744.dtsi | 188 +-
+ arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 18 +
+ arch/arm/boot/dts/r8a7778.dtsi | 28 +
+ arch/arm/boot/dts/r8a7779.dtsi | 26 +
+ arch/arm/boot/dts/r8a7790-stout.dts | 15 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 1 -
+ arch/arm/boot/dts/rk3036.dtsi | 1 +
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 -
+ arch/arm/boot/dts/rk3066a-mk808.dts | 1 -
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 2 -
+ arch/arm/boot/dts/rk3066a.dtsi | 48 +
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 19 +-
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 1 -
+ arch/arm/boot/dts/rk3229-evb.dts | 1 -
+ arch/arm/boot/dts/rk3288-fennec.dts | 1 -
+ arch/arm/boot/dts/rk3288-firefly-reload.dts | 1 -
+ arch/arm/boot/dts/rk3288-miqi.dts | 1 -
+ arch/arm/boot/dts/rk3288-popmetal.dts | 1 -
+ arch/arm/boot/dts/rk3288-rock2-square.dts | 1 -
+ arch/arm/boot/dts/rk3288-tinker-s.dts | 1 -
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +
+ arch/arm/boot/dts/rk3288-vyasa.dts | 1 -
+ arch/arm/boot/dts/rv1108-elgin-r1.dts | 208 +++
+ arch/arm/boot/dts/rv1108-evb.dts | 20 +-
+ arch/arm/boot/dts/rv1108.dtsi | 37 +
+ arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +-
+ arch/arm/boot/dts/s5pv210-aries.dtsi | 90 +
+ arch/arm/boot/dts/s5pv210-fascinate4g.dts | 7 -
+ arch/arm/boot/dts/s5pv210-galaxys.dts | 7 -
+ arch/arm/boot/dts/s5pv210.dtsi | 25 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 4 +-
+ arch/arm/boot/dts/sama5d3.dtsi | 4 +-
+ arch/arm/boot/dts/sama5d4.dtsi | 4 +-
+ arch/arm/boot/dts/skeleton.dtsi | 18 -
+ arch/arm/boot/dts/skeleton64.dtsi | 14 -
+ arch/arm/boot/dts/socfpga.dtsi | 16 +
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 18 +
+ arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts | 130 ++
+ arch/arm/boot/dts/spear13xx.dtsi | 4 +-
+ arch/arm/boot/dts/spear3xx.dtsi | 4 +-
+ arch/arm/boot/dts/spear600.dtsi | 4 +-
+ arch/arm/boot/dts/ste-nomadik-nhk15.dts | 85 +-
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +-
+ arch/arm/boot/dts/ste-u300.dts | 2 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 1 +
+ arch/arm/boot/dts/stm32746g-eval.dts | 1 +
+ arch/arm/boot/dts/stm32f429-disco.dts | 1 +
+ arch/arm/boot/dts/stm32f429.dtsi | 64 +-
+ arch/arm/boot/dts/stm32f469-disco.dts | 1 +
+ arch/arm/boot/dts/stm32f746-disco.dts | 1 +
+ arch/arm/boot/dts/stm32f746.dtsi | 4 +-
+ arch/arm/boot/dts/stm32f769-disco.dts | 1 +
+ arch/arm/boot/dts/stm32h743.dtsi | 4 +-
+ arch/arm/boot/dts/stm32h743i-disco.dts | 1 +
+ arch/arm/boot/dts/stm32h743i-eval.dts | 1 +
+ arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 7 +
+ arch/arm/boot/dts/stm32mp157c-ed1.dts | 8 +
+ arch/arm/boot/dts/stm32mp157c-ev1.dts | 10 +-
+ arch/arm/boot/dts/stm32mp157c.dtsi | 97 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 44 +
+ arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 7 +-
+ .../boot/dts/sun5i-reference-design-tablet.dtsi | 2 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 5 +
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 175 +-
+ arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 4 +
+ arch/arm/boot/dts/sun8i-a23.dtsi | 20 +
+ arch/arm/boot/dts/sun8i-a33.dtsi | 194 +-
+ .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +
+ arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 8 +
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 8 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 25 +
+ arch/arm/boot/dts/sun8i-q8-common.dtsi | 37 +
+ arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 41 +
+ arch/arm/boot/dts/sun8i-r40.dtsi | 15 +
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 44 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 44 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 65 +
+ arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 16 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 3 +-
+ arch/arm/boot/dts/tegra114-dalmore.dts | 2 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +-
+ arch/arm/boot/dts/tegra124-nyan.dtsi | 2 +-
+ arch/arm/boot/dts/tegra124-venice2.dts | 2 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 2 +-
+ arch/arm/boot/dts/tegra30-beaver.dts | 2 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/versatile-ab.dts | 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_a7.dts | 5 +
+ arch/arm/boot/dts/vf610-bk4.dts | 31 +
+ arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +-
+ arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 311 ++++
+ arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 3 +
+ arch/arm/boot/dts/vt8500.dtsi | 9 +-
+ arch/arm/boot/dts/wm8505.dtsi | 9 +-
+ arch/arm/boot/dts/wm8650.dtsi | 9 +-
+ arch/arm/boot/dts/wm8750.dtsi | 9 +-
+ arch/arm/boot/dts/wm8850.dtsi | 9 +-
+ arch/arm/boot/dts/zx296702-ad1.dts | 1 +
+ arch/arm/boot/dts/zx296702.dtsi | 4 +-
+ arch/arm/boot/dts/zynq-zturn.dts | 2 +-
+ arch/arm/configs/axm55xx_defconfig | 4 -
+ arch/arm/configs/bcm2835_defconfig | 3 +
+ arch/arm/configs/integrator_defconfig | 9 +-
+ arch/arm/configs/lpc18xx_defconfig | 31 +-
+ arch/arm/configs/lpc32xx_defconfig | 65 +-
+ arch/arm/configs/milbeaut_m10v_defconfig | 119 ++
+ arch/arm/configs/multi_v7_defconfig | 10 +-
+ arch/arm/configs/nhk8815_defconfig | 41 +-
+ arch/arm/configs/omap2plus_defconfig | 83 +-
+ arch/arm/configs/pxa_defconfig | 5 -
+ arch/arm/configs/raumfeld_defconfig | 197 --
+ arch/arm/configs/s5pv210_defconfig | 47 +-
+ arch/arm/configs/shmobile_defconfig | 48 +-
+ arch/arm/configs/socfpga_defconfig | 25 +-
+ arch/arm/configs/spear3xx_defconfig | 6 +-
+ arch/arm/mach-bcm/Kconfig | 1 +
+ arch/arm/mach-davinci/Kconfig | 19 +-
+ arch/arm/mach-davinci/Makefile | 3 -
+ arch/arm/mach-davinci/asp.h | 8 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 91 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 55 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 15 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 21 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 19 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 41 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 84 +-
+ arch/arm/mach-davinci/board-sffsdr.c | 15 +-
+ arch/arm/mach-davinci/common.c | 18 -
+ arch/arm/mach-davinci/cp_intc.c | 215 ---
+ arch/arm/mach-davinci/cp_intc.h | 57 -
+ arch/arm/mach-davinci/da830.c | 128 +-
+ arch/arm/mach-davinci/da850.c | 154 +-
+ arch/arm/mach-davinci/davinci.h | 4 +
+ arch/arm/mach-davinci/devices-da8xx.c | 147 +-
+ arch/arm/mach-davinci/devices.c | 40 +-
+ arch/arm/mach-davinci/dm355.c | 78 +-
+ arch/arm/mach-davinci/dm365.c | 102 +-
+ arch/arm/mach-davinci/dm644x.c | 68 +-
+ arch/arm/mach-davinci/dm646x.c | 82 +-
+ arch/arm/mach-davinci/include/mach/common.h | 14 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 2 +
+ arch/arm/mach-davinci/include/mach/entry-macro.S | 39 -
+ arch/arm/mach-davinci/irq.c | 117 --
+ arch/arm/mach-davinci/{include/mach => }/irqs.h | 4 -
+ arch/arm/mach-davinci/usb-da8xx.c | 9 +-
+ arch/arm/mach-davinci/usb.c | 15 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 1 -
+ arch/arm/mach-exynos/platsmp.c | 4 +-
+ arch/arm/mach-imx/Makefile | 3 +-
+ arch/arm/mach-imx/common.h | 10 +
+ arch/arm/mach-imx/cpuidle-imx7ulp.c | 60 +
+ arch/arm/mach-imx/cpuidle.h | 5 +
+ arch/arm/mach-imx/mach-imx7ulp.c | 46 +
+ arch/arm/mach-imx/pm-imx7ulp.c | 49 +-
+ arch/arm/mach-lpc32xx/phy3250.c | 84 -
+ arch/arm/mach-lpc32xx/pm.c | 13 +-
+ arch/arm/mach-mediatek/Kconfig | 4 +
+ arch/arm/mach-mediatek/mediatek.c | 3 +-
+ arch/arm/mach-mediatek/platsmp.c | 2 +-
+ arch/arm/mach-meson/Kconfig | 1 -
+ arch/arm/mach-milbeaut/Kconfig | 20 +
+ arch/arm/mach-milbeaut/Makefile | 1 +
+ arch/arm/mach-milbeaut/platsmp.c | 143 ++
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 131 +-
+ arch/arm/mach-pxa/Kconfig | 18 -
+ arch/arm/mach-pxa/Makefile | 3 -
+ arch/arm/mach-pxa/include/mach/pxa25x-udc.h | 0
+ arch/arm/mach-pxa/raumfeld.c | 1187 ------------
+ arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 +-
+ arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 +
+ arch/arm/mach-socfpga/socfpga.c | 3 +-
+ arch/arm/mach-sunxi/sunxi.c | 2 +-
+ arch/arm/mach-tegra/iomap.h | 9 +
+ arch/arm/mach-tegra/sleep-tegra20.S | 2 -
+ arch/arm/mach-tegra/sleep-tegra30.S | 25 +-
+ arch/arm64/Kconfig.platforms | 14 +-
+ arch/arm64/boot/dts/Makefile | 1 +
+ arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 53 +
+ arch/arm64/boot/dts/actions/s700.dtsi | 66 +-
+ arch/arm64/boot/dts/actions/s900.dtsi | 18 +-
+ arch/arm64/boot/dts/al/alpine-v2.dtsi | 8 +-
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 8 +
+ .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 +
+ .../boot/dts/allwinner/sun50i-a64-olinuxino.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-teres-i.dts | 10 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 38 +-
+ .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 4 +
+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 8 +-
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 44 +-
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 37 +-
+ arch/arm64/boot/dts/amlogic/Makefile | 1 +
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 30 +-
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 33 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 28 +
+ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 70 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 31 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 +
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 +
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 8 +-
+ arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 16 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 16 +-
+ arch/arm64/boot/dts/arm/Makefile | 1 +
+ arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi | 2 +-
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 2 +-
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi | 106 +-
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts | 277 +++
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 108 +-
+ arch/arm64/boot/dts/arm/juno-r1.dts | 12 +-
+ arch/arm64/boot/dts/arm/juno-r2.dts | 18 +-
+ arch/arm64/boot/dts/arm/juno.dts | 18 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 106 +-
+ .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 27 +
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 14 +-
+ .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 4 +-
+ arch/arm64/boot/dts/bitmain/Makefile | 3 +
+ arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts | 50 +
+ arch/arm64/boot/dts/bitmain/bm1880.dtsi | 119 ++
+ arch/arm64/boot/dts/broadcom/Makefile | 3 +-
+ .../boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts | 2 +
+ arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 8 +-
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 16 +-
+ arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 96 +-
+ arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 8 +-
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 16 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 +-
+ arch/arm64/boot/dts/freescale/Makefile | 2 +
+ .../boot/dts/freescale/fsl-ls1012a-oxalis.dts | 96 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 11 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 97 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 26 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 133 ++
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 47 +
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 304 +++-
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 137 ++
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 446 +++++
+ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 3 +-
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 16 +-
+ arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 16 +-
+ .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 4 +-
+ arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 +-
+ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +-
+ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 18 +-
+ arch/arm64/boot/dts/hisilicon/hip05.dtsi | 32 +-
+ arch/arm64/boot/dts/hisilicon/hip06.dtsi | 32 +-
+ arch/arm64/boot/dts/hisilicon/hip07.dtsi | 128 +-
+ arch/arm64/boot/dts/lg/lg1312.dtsi | 8 +-
+ arch/arm64/boot/dts/lg/lg1313.dtsi | 8 +-
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 12 +
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 162 ++
+ arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 82 +-
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 4 -
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 4 -
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 8 +-
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 18 +-
+ .../dts/marvell/armada-ap810-ap0-octa-core.dtsi | 16 +-
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 15 +-
+ arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 98 +
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 555 ++++++
+ arch/arm64/boot/dts/mediatek/mt6797-evb.dts | 2 +
+ arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts | 2 +
+ arch/arm64/boot/dts/mediatek/mt6797.dtsi | 28 +
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 13 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 +-
+ arch/arm64/boot/dts/nvidia/Makefile | 1 +
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 18 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 10 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 33 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 12 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 93 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 21 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 34 +-
+ .../boot/dts/nvidia/tegra210-p2894-0050-a08.dts | 9 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 1858 +++++++++++++++++++
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 34 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 96 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 +
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 16 +-
+ arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 36 +-
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 24 +
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 278 +++
+ arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +
+ arch/arm64/boot/dts/qcom/pms405.dtsi | 79 +
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 19 +
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 359 ++++
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 84 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 1046 +++++++++--
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/Makefile | 1 +
+ arch/arm64/boot/dts/renesas/cat875.dtsi | 44 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 14 +-
+ arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 106 ++
+ arch/arm64/boot/dts/renesas/r8a774c0-ek874.dts | 14 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1911 ++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 56 +-
+ .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 3 +-
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 52 +-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 +-
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 26 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 223 ++-
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 4 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 138 ++
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 71 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 3 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 +
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 26 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 22 +-
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 1 -
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 91 +
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts | 66 +
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 703 +++++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 606 +++++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 110 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 83 +-
+ .../dts/rockchip/rk3399-sapphire-excavator.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 4 +-
+ .../boot/dts/socionext/uniphier-ld20-global.dts | 4 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 55 +-
+ .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 10 +-
+ arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 55 +-
+ arch/arm64/boot/dts/sprd/sc2731.dtsi | 56 +-
+ arch/arm64/boot/dts/sprd/sc9836.dtsi | 8 +-
+ arch/arm64/boot/dts/sprd/sc9860.dtsi | 16 +-
+ arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 16 +
+ arch/arm64/boot/dts/synaptics/as370.dtsi | 8 +-
+ arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 8 +-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 118 ++
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 +
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 65 +
+ arch/arm64/boot/dts/ti/k3-am654.dtsi | 8 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 1 +
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 +-
+ arch/arm64/boot/dts/zte/zx296718.dtsi | 8 +-
+ arch/arm64/configs/defconfig | 32 +-
+ drivers/bus/fsl-mc/fsl-mc-allocator.c | 11 +
+ drivers/bus/fsl-mc/mc-io.c | 13 +
+ drivers/bus/hisi_lpc.c | 5 +-
+ drivers/bus/imx-weim.c | 70 +-
+ drivers/char/hw_random/Kconfig | 15 +
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/optee-rng.c | 306 ++++
+ drivers/clk/tegra/Kconfig | 5 +
+ drivers/clk/tegra/Makefile | 2 +-
+ drivers/clk/tegra/clk-dfll.c | 459 ++++-
+ drivers/clk/tegra/clk-dfll.h | 6 +-
+ drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 520 +++++-
+ drivers/clk/tegra/cvb.c | 12 +-
+ drivers/clk/tegra/cvb.h | 7 +-
+ drivers/clocksource/Kconfig | 9 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/timer-milbeaut.c | 161 ++
+ drivers/cpufreq/Kconfig.arm | 4 +-
+ drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
+ drivers/cpufreq/tegra124-cpufreq.c | 44 +-
+ drivers/crypto/caam/caamalg_qi2.c | 6 +-
+ drivers/firmware/imx/misc.c | 38 +
+ drivers/firmware/imx/scu-pd.c | 1 +
+ drivers/firmware/raspberrypi.c | 11 +
+ drivers/firmware/tegra/Makefile | 3 +
+ drivers/firmware/tegra/bpmp-private.h | 34 +
+ drivers/firmware/tegra/bpmp-tegra186.c | 305 ++++
+ drivers/firmware/tegra/bpmp-tegra210.c | 243 +++
+ drivers/firmware/tegra/bpmp.c | 376 ++--
+ drivers/firmware/ti_sci.c | 21 +-
+ drivers/firmware/xilinx/Kconfig | 1 +
+ drivers/firmware/xilinx/zynqmp.c | 166 ++
+ drivers/input/keyboard/davinci_keyscan.c | 4 -
+ drivers/irqchip/Kconfig | 10 +
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-davinci-aintc.c | 163 ++
+ drivers/irqchip/irq-davinci-cp-intc.c | 260 +++
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/bcm2835-pm.c | 92 +
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 16 +-
+ drivers/net/ethernet/ti/Kconfig | 6 +-
+ drivers/net/ethernet/ti/cpsw.h | 6 +
+ drivers/nvmem/Kconfig | 10 +
+ drivers/nvmem/Makefile | 2 +
+ drivers/nvmem/zynqmp_nvmem.c | 86 +
+ drivers/opp/core.c | 18 +
+ drivers/opp/of.c | 2 +
+ drivers/opp/opp.h | 2 +
+ drivers/reset/Kconfig | 12 +-
+ drivers/reset/Makefile | 2 +
+ drivers/reset/reset-brcmstb.c | 132 ++
+ drivers/reset/reset-imx7.c | 172 +-
+ drivers/reset/reset-socfpga.c | 2 +-
+ drivers/reset/reset-sunxi.c | 1 +
+ drivers/reset/reset-zynqmp.c | 114 ++
+ drivers/soc/amlogic/meson-canvas.c | 18 +-
+ drivers/soc/amlogic/meson-clk-measure.c | 196 ++
+ drivers/soc/bcm/Kconfig | 12 +
+ drivers/soc/bcm/Makefile | 1 +
+ drivers/soc/bcm/bcm2835-power.c | 661 +++++++
+ drivers/soc/fsl/Kconfig | 1 +
+ drivers/soc/fsl/dpio/dpio-cmd.h | 6 +
+ drivers/soc/fsl/dpio/dpio-driver.c | 93 +-
+ drivers/soc/fsl/dpio/dpio-service.c | 46 +-
+ drivers/soc/fsl/dpio/dpio.c | 39 +
+ drivers/soc/fsl/dpio/dpio.h | 9 +
+ drivers/soc/fsl/dpio/qbman-portal.c | 5 +-
+ drivers/soc/fsl/guts.c | 10 +-
+ drivers/soc/imx/Kconfig | 2 +-
+ drivers/soc/imx/gpcv2.c | 76 +-
+ drivers/soc/qcom/Kconfig | 18 +
+ drivers/soc/qcom/Makefile | 2 +
+ drivers/soc/qcom/llcc-sdm845.c | 6 +
+ drivers/soc/qcom/llcc-slice.c | 101 +-
+ drivers/soc/qcom/qcom_gsbi.c | 7 +-
+ drivers/soc/qcom/rmtfs_mem.c | 32 +-
+ drivers/soc/qcom/rpmh.c | 37 +-
+ drivers/soc/qcom/rpmhpd.c | 406 +++++
+ drivers/soc/qcom/rpmpd.c | 315 ++++
+ drivers/soc/qcom/smd-rpm.c | 1 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 12 +-
+ drivers/soc/tegra/fuse/speedo-tegra210.c | 2 +-
+ drivers/soc/tegra/pmc.c | 424 +++--
+ drivers/soc/ti/knav_dma.c | 2 +-
+ drivers/soc/xilinx/Kconfig | 20 +
+ drivers/soc/xilinx/Makefile | 2 +
+ drivers/soc/xilinx/zynqmp_pm_domains.c | 321 ++++
+ drivers/soc/xilinx/zynqmp_power.c | 178 ++
+ drivers/tee/optee/Makefile | 1 +
+ drivers/tee/optee/core.c | 4 +
+ drivers/tee/optee/device.c | 160 ++
+ drivers/tee/optee/optee_msg.h | 26 +-
+ drivers/tee/optee/optee_private.h | 3 +
+ drivers/tee/optee/optee_smc.h | 26 +-
+ drivers/tee/optee/supp.c | 10 +-
+ drivers/tee/tee_core.c | 78 +-
+ drivers/usb/host/ohci-da8xx.c | 118 +-
+ drivers/watchdog/bcm2835_wdt.c | 26 +-
+ include/dt-bindings/clock/r8a7778-clock.h | 2 +
+ include/dt-bindings/power/mt8173-power.h | 6 +-
+ include/dt-bindings/power/qcom-rpmpd.h | 39 +
+ include/dt-bindings/power/xlnx-zynqmp-power.h | 39 +
+ .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 134 ++
+ include/dt-bindings/reset/imx8mq-reset.h | 64 +
+ include/dt-bindings/reset/xlnx-zynqmp-resets.h | 130 ++
+ include/dt-bindings/soc/bcm2835-pm.h | 28 +
+ include/linux/davinci_emac.h | 1 -
+ include/linux/firmware/imx/svc/misc.h | 3 +
+ include/linux/firmware/xlnx-zynqmp.h | 184 ++
+ include/linux/fsl/guts.h | 2 -
+ include/linux/fsl/mc.h | 1 +
+ include/linux/irqchip/irq-davinci-aintc.h | 27 +
+ include/linux/irqchip/irq-davinci-cp-intc.h | 25 +
+ include/linux/mfd/bcm2835-pm.h | 14 +
+ include/linux/mod_devicetable.h | 9 +
+ include/linux/platform_data/usb-davinci.h | 14 -
+ include/linux/pm_opp.h | 7 +
+ include/linux/reset/socfpga.h | 7 +
+ include/linux/reset/sunxi.h | 7 +
+ include/linux/soc/qcom/llcc-qcom.h | 6 +
+ include/linux/tee_drv.h | 50 +-
+ include/soc/bcm2835/raspberrypi-firmware.h | 4 +
+ include/soc/fsl/dpaa2-io.h | 15 +-
+ include/soc/tegra/bpmp.h | 13 +-
+ include/soc/tegra/pmc.h | 6 -
+ scripts/mod/devicetable-offsets.c | 3 +
+ scripts/mod/file2alias.c | 19 +
+ 772 files changed, 31167 insertions(+), 6629 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/bhf.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bitmain.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/compulab-boards.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/fsl.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/fsl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/i2se.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/olimex.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/renesas.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/technologic.txt
+ create mode 100644 Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt
+ create mode 100644 Documentation/devicetree/bindings/firmware/nvidia,tegra210-bpmp.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt
+ create mode 100644 Documentation/devicetree/bindings/power/qcom,rpmpd.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt
+ create mode 100644 Documentation/devicetree/bindings/power/xlnx,zynqmp-genpd.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
+ create mode 100644 Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/socionext,milbeaut-timer.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/am335x-guardian.dts
+ create mode 100644 arch/arm/boot/dts/am3874-iceboard.dts
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
+ create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+ create mode 100644 arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+ create mode 100644 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6-logicpd-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-draco.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-hydra.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-ursa.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-logicpd.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi
+ create mode 100644 arch/arm/boot/dts/lpc4357-myd-lpc4357.dts
+ create mode 100644 arch/arm/boot/dts/milbeaut-m10v-evb.dts
+ create mode 100644 arch/arm/boot/dts/milbeaut-m10v.dtsi
+ create mode 100644 arch/arm/boot/dts/r7s9210-rza2mevb.dts
+ create mode 100644 arch/arm/boot/dts/r7s9210.dtsi
+ create mode 100644 arch/arm/boot/dts/rv1108-elgin-r1.dts
+ delete mode 100644 arch/arm/boot/dts/skeleton.dtsi
+ delete mode 100644 arch/arm/boot/dts/skeleton64.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
+ create mode 100644 arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts
+ create mode 100644 arch/arm/configs/milbeaut_m10v_defconfig
+ delete mode 100644 arch/arm/configs/raumfeld_defconfig
+ delete mode 100644 arch/arm/mach-davinci/cp_intc.c
+ delete mode 100644 arch/arm/mach-davinci/cp_intc.h
+ delete mode 100644 arch/arm/mach-davinci/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-davinci/irq.c
+ rename arch/arm/mach-davinci/{include/mach => }/irqs.h (98%)
+ create mode 100644 arch/arm/mach-imx/cpuidle-imx7ulp.c
+ create mode 100644 arch/arm/mach-milbeaut/Kconfig
+ create mode 100644 arch/arm/mach-milbeaut/Makefile
+ create mode 100644 arch/arm/mach-milbeaut/platsmp.c
+ delete mode 100644 arch/arm/mach-pxa/include/mach/pxa25x-udc.h
+ delete mode 100644 arch/arm/mach-pxa/raumfeld.c
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
+ create mode 100644 arch/arm64/boot/dts/arm/fvp-base-revc.dts
+ create mode 100644 arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
+ create mode 100644 arch/arm64/boot/dts/bitmain/Makefile
+ create mode 100644 arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts
+ create mode 100644 arch/arm64/boot/dts/bitmain/bm1880.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-oxalis.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+ create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2894-0050-a08.dts
+ create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/cat875.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0-ek874.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+ create mode 100644 drivers/char/hw_random/optee-rng.c
+ create mode 100644 drivers/clocksource/timer-milbeaut.c
+ create mode 100644 drivers/firmware/tegra/bpmp-private.h
+ create mode 100644 drivers/firmware/tegra/bpmp-tegra186.c
+ create mode 100644 drivers/firmware/tegra/bpmp-tegra210.c
+ create mode 100644 drivers/irqchip/irq-davinci-aintc.c
+ create mode 100644 drivers/irqchip/irq-davinci-cp-intc.c
+ create mode 100644 drivers/mfd/bcm2835-pm.c
+ create mode 100644 drivers/nvmem/zynqmp_nvmem.c
+ create mode 100644 drivers/reset/reset-brcmstb.c
+ create mode 100644 drivers/reset/reset-zynqmp.c
+ create mode 100644 drivers/soc/bcm/bcm2835-power.c
+ create mode 100644 drivers/soc/qcom/rpmhpd.c
+ create mode 100644 drivers/soc/qcom/rpmpd.c
+ create mode 100644 drivers/soc/xilinx/zynqmp_pm_domains.c
+ create mode 100644 drivers/soc/xilinx/zynqmp_power.c
+ create mode 100644 drivers/tee/optee/device.c
+ create mode 100644 include/dt-bindings/power/qcom-rpmpd.h
+ create mode 100644 include/dt-bindings/power/xlnx-zynqmp-power.h
+ create mode 100644 include/dt-bindings/reset/amlogic,meson-g12a-reset.h
+ create mode 100644 include/dt-bindings/reset/imx8mq-reset.h
+ create mode 100644 include/dt-bindings/reset/xlnx-zynqmp-resets.h
+ create mode 100644 include/dt-bindings/soc/bcm2835-pm.h
+ create mode 100644 include/linux/irqchip/irq-davinci-aintc.h
+ create mode 100644 include/linux/irqchip/irq-davinci-cp-intc.h
+ create mode 100644 include/linux/mfd/bcm2835-pm.h
+ create mode 100644 include/linux/reset/socfpga.h
+ create mode 100644 include/linux/reset/sunxi.h
+Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
+$ git merge actions/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
+$ git merge alpine/alpine/for-next
+Already up to date.
+Merging amlogic/for-next (a973ebe8b4d7 Merge branch 'v5.1/drivers' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/meson8.dtsi | 5 +++
+ arch/arm/boot/dts/meson8b.dtsi | 5 +++
+ arch/arm64/boot/dts/amlogic/Makefile | 1 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 38 ++++++++++++++++++++++
+ 6 files changed, 51 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
+Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
+$ git merge aspeed/for-next
+Already up to date.
+Merging at91/at91-next (69dd6b9f7d58 Merge branches 'at91-soc' and 'at91-dt' into at91-next)
+$ git merge at91/at91-next
+Auto-merging arch/arm/boot/dts/sama5d2.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/atmel-at91.txt | 1 +
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 54 ++++++
+ arch/arm/boot/dts/sama5d2.dtsi | 6 +-
+ arch/arm/mach-at91/at91sam9.c | 18 ++
+ arch/arm/mach-at91/generic.h | 2 +
+ arch/arm/mach-at91/pm.c | 193 ++++++++++++++-------
+ arch/arm/mach-at91/pm_suspend.S | 111 ++++++++----
+ include/linux/clk/at91_pmc.h | 1 +
+ 8 files changed, 289 insertions(+), 97 deletions(-)
+Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
+$ git merge bcm2835/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (fe0b295f61af Merge branch 'imx/maintainers' into for-next)
+$ git merge imx-mxs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (d542127adb0c Merge branch 'v5.0-next/soc' into for-next)
+$ git merge mediatek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (c51f7f863552 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging omap/for-next (af3b69ea03a2 Merge branch 'omap-for-v5.1/cpsw' into for-next)
+$ git merge omap/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging reset/reset/next (dbfc54534dfc dt-bindings: reset: meson: add g12a bindings)
+$ git merge reset/reset/next
+Already up to date.
+Merging qcom/for-next (75920dd0498d Merge tag 'qcom-fixes-for-5.0-rc8' into doof)
+$ git merge qcom/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (f4435b0d605e Merge branch 'fixes-for-v5.1' into next)
+$ git merge renesas/next
+Auto-merging arch/arm64/boot/dts/renesas/r8a77990.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 7 +++----
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 +++----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+Merging rockchip/for-next (8444545ff72a Merge branch 'v5.1-clk/next' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/rockchip/clk-rk3188.c | 4 ++--
+ drivers/clk/rockchip/clk-rk3328.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+Merging samsung/for-next (bebc6082da0a Linux 4.14)
+$ git merge samsung/for-next
+Already up to date.
+Merging samsung-krzk/for-next (8ecb112edde9 Merge branch 'fixes-late-dt' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+Merging sunxi/sunxi/for-next (1fc3dc289134 Merge remote-tracking branches 'korg/sunxi/sunxi/dt-for-5.1', 'korg/sunxi/sunxi/dt64-for-5.1' and 'korg/sunxi/sunxi/h3-h5-for-5.1' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging tegra/for-next (d92dde4f12f1 Merge branch for-5.1/fixes into for-next)
+$ git merge tegra/for-next
+Auto-merging arch/arm64/boot/dts/nvidia/tegra186.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 -
+ 1 file changed, 1 deletion(-)
+Merging clk/clk-next (43ae730290ff Merge branch 'clk-parent-rewrite' (early part) into clk-next)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/tegra/clk-dfll.c
+Removing drivers/clk/meson/gxbb-aoclk-32k.c
+Removing drivers/clk/meson/clkc.h
+Removing drivers/clk/meson/clk-triphase.c
+Removing Documentation/devicetree/bindings/clock/fixed-factor-clock.txt
+Removing Documentation/devicetree/bindings/clock/fixed-clock.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/actions,owl-cmu.txt | 7 +-
+ .../bindings/clock/amlogic,gxbb-aoclkc.txt | 1 +
+ .../bindings/clock/amlogic,gxbb-clkc.txt | 1 +
+ .../devicetree/bindings/clock/exynos5433-clock.txt | 23 +
+ .../devicetree/bindings/clock/fixed-clock.txt | 23 -
+ .../devicetree/bindings/clock/fixed-clock.yaml | 44 +
+ .../bindings/clock/fixed-factor-clock.txt | 28 -
+ .../bindings/clock/fixed-factor-clock.yaml | 56 +
+ .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 +
+ .../devicetree/bindings/clock/imx8mm-clock.txt | 29 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 +
+ Documentation/driver-model/devres.txt | 2 +
+ arch/arm/mach-omap2/omap_hwmod.c | 16 +-
+ drivers/acpi/acpi_lpss.c | 2 +-
+ drivers/clk/Kconfig | 6 +
+ drivers/clk/Makefile | 3 +-
+ drivers/clk/actions/Kconfig | 5 +
+ drivers/clk/actions/Makefile | 1 +
+ drivers/clk/actions/owl-pll.c | 2 +-
+ drivers/clk/actions/owl-pll.h | 30 +-
+ drivers/clk/actions/owl-s500.c | 525 +++++
+ drivers/clk/at91/clk-audio-pll.c | 9 +-
+ drivers/clk/at91/clk-programmable.c | 3 -
+ drivers/clk/at91/sama5d2.c | 3 +-
+ drivers/clk/clk-clps711x.c | 61 +-
+ drivers/clk/clk-devres.c | 11 +
+ drivers/clk/clk-fixed-mmio.c | 101 +
+ drivers/clk/clk-fractional-divider.c | 2 +-
+ drivers/clk/clk-gpio.c | 39 +-
+ drivers/clk/clk-highbank.c | 1 +
+ drivers/clk/clk-max77686.c | 28 +-
+ drivers/clk/clk-qoriq.c | 5 +-
+ drivers/clk/clk-stm32mp1.c | 37 +-
+ drivers/clk/clk-twl6040.c | 53 +-
+ drivers/clk/clk.c | 262 ++-
+ drivers/clk/clk.h | 23 +-
+ drivers/clk/clkdev.c | 231 +-
+ drivers/clk/imx/Kconfig | 6 +
+ drivers/clk/imx/Makefile | 4 +-
+ drivers/clk/imx/clk-composite-8m.c | 2 +-
+ drivers/clk/imx/clk-imx51-imx53.c | 1 +
+ drivers/clk/imx/clk-imx6q.c | 1 +
+ drivers/clk/imx/clk-imx6sx.c | 1 +
+ drivers/clk/imx/clk-imx7d.c | 1 +
+ drivers/clk/imx/clk-imx7ulp.c | 16 +-
+ drivers/clk/imx/clk-imx8mm.c | 675 ++++++
+ drivers/clk/imx/clk-imx8mq.c | 254 +--
+ drivers/clk/imx/clk-imx8qxp.c | 1 +
+ drivers/clk/imx/clk-pll14xx.c | 392 ++++
+ drivers/clk/imx/clk-sccg-pll.c | 514 ++++-
+ drivers/clk/imx/clk-scu.c | 123 +-
+ drivers/clk/imx/clk-scu.h | 16 +-
+ drivers/clk/imx/clk-vf610.c | 1 +
+ drivers/clk/imx/clk.h | 38 +-
+ drivers/clk/ingenic/cgu.c | 13 +-
+ drivers/clk/ingenic/cgu.h | 2 +-
+ drivers/clk/ingenic/jz4740-cgu.c | 2 +-
+ drivers/clk/mediatek/clk-gate.c | 4 +-
+ drivers/clk/mediatek/clk-gate.h | 3 +-
+ drivers/clk/mediatek/clk-mt2701.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712.c | 9 +-
+ drivers/clk/mediatek/clk-mt6797.c | 68 +-
+ drivers/clk/mediatek/clk-mt8173.c | 4 +-
+ drivers/clk/mediatek/clk-mtk.c | 4 +-
+ drivers/clk/mediatek/clk-mtk.h | 29 +-
+ drivers/clk/meson/Kconfig | 101 +-
+ drivers/clk/meson/Makefile | 29 +-
+ drivers/clk/meson/axg-aoclk.c | 193 +-
+ drivers/clk/meson/axg-aoclk.h | 13 +-
+ drivers/clk/meson/axg-audio.c | 5 +-
+ drivers/clk/meson/axg.c | 69 +-
+ drivers/clk/meson/clk-dualdiv.c | 138 ++
+ drivers/clk/meson/clk-dualdiv.h | 33 +
+ drivers/clk/meson/clk-input.c | 7 +-
+ drivers/clk/meson/clk-input.h | 19 +
+ drivers/clk/meson/clk-mpll.c | 12 +-
+ drivers/clk/meson/clk-mpll.h | 30 +
+ drivers/clk/meson/clk-phase.c | 75 +-
+ drivers/clk/meson/clk-phase.h | 26 +
+ drivers/clk/meson/clk-pll.c | 216 +-
+ drivers/clk/meson/clk-pll.h | 49 +
+ drivers/clk/meson/clk-regmap.c | 5 +
+ drivers/clk/meson/clk-regmap.h | 20 +
+ drivers/clk/meson/clk-triphase.c | 68 -
+ drivers/clk/meson/clkc.h | 127 --
+ drivers/clk/meson/g12a-aoclk.c | 454 ++++
+ drivers/clk/meson/g12a-aoclk.h | 34 +
+ drivers/clk/meson/g12a.c | 2359 ++++++++++++++++++++
+ drivers/clk/meson/g12a.h | 175 ++
+ drivers/clk/meson/gxbb-aoclk-32k.c | 193 --
+ drivers/clk/meson/gxbb-aoclk.c | 268 ++-
+ drivers/clk/meson/gxbb-aoclk.h | 20 +-
+ drivers/clk/meson/gxbb.c | 296 ++-
+ drivers/clk/meson/meson-aoclk.c | 54 +-
+ drivers/clk/meson/meson-aoclk.h | 13 +-
+ drivers/clk/meson/meson-eeclk.c | 63 +
+ drivers/clk/meson/meson-eeclk.h | 25 +
+ drivers/clk/meson/meson8b.c | 374 +++-
+ drivers/clk/meson/meson8b.h | 11 +-
+ drivers/clk/meson/parm.h | 46 +
+ drivers/clk/meson/sclk-div.c | 10 +-
+ drivers/clk/meson/{clkc-audio.h => sclk-div.h} | 16 +-
+ drivers/clk/meson/vid-pll-div.c | 10 +-
+ drivers/clk/meson/vid-pll-div.h | 20 +
+ drivers/clk/mmp/clk-of-mmp2.c | 5 +-
+ drivers/clk/mvebu/armada-370.c | 4 +-
+ drivers/clk/mvebu/armada-xp.c | 4 +-
+ drivers/clk/mvebu/dove.c | 8 +-
+ drivers/clk/mvebu/kirkwood.c | 2 +
+ drivers/clk/mvebu/mv98dx3236.c | 4 +-
+ drivers/clk/qcom/clk-rcg.h | 5 +-
+ drivers/clk/qcom/clk-rcg2.c | 24 +-
+ drivers/clk/qcom/clk-rpmh.c | 146 ++
+ drivers/clk/qcom/clk-smd-rpm.c | 63 +
+ drivers/clk/qcom/common.c | 8 +
+ drivers/clk/qcom/common.h | 2 +
+ drivers/clk/qcom/gcc-ipq8074.c | 10 +-
+ drivers/clk/qcom/gcc-mdm9615.c | 11 +-
+ drivers/clk/qcom/gcc-msm8996.c | 10 +-
+ drivers/clk/qcom/gcc-msm8998.c | 61 +-
+ drivers/clk/qcom/gcc-qcs404.c | 10 +-
+ drivers/clk/qcom/gcc-sdm660.c | 11 +-
+ drivers/clk/qcom/gcc-sdm845.c | 5 +
+ drivers/clk/qcom/mmcc-msm8996.c | 10 +-
+ drivers/clk/renesas/r8a774a1-cpg-mssr.c | 4 +-
+ drivers/clk/renesas/r8a774c0-cpg-mssr.c | 15 +-
+ drivers/clk/renesas/r8a77980-cpg-mssr.c | 8 +
+ drivers/clk/renesas/rcar-gen3-cpg.c | 147 +-
+ drivers/clk/renesas/rcar-gen3-cpg.h | 4 +
+ drivers/clk/samsung/clk-exynos4.c | 1 +
+ drivers/clk/samsung/clk-exynos5-subcmu.c | 13 +-
+ drivers/clk/samsung/clk-exynos5433.c | 38 +-
+ drivers/clk/samsung/clk-s3c2443.c | 2 +-
+ drivers/clk/samsung/clk.h | 2 +-
+ drivers/clk/socfpga/clk-gate.c | 22 +-
+ drivers/clk/socfpga/clk-pll-a10.c | 1 +
+ drivers/clk/socfpga/clk-pll.c | 1 +
+ drivers/clk/tegra/clk-dfll.c | 18 +-
+ drivers/clk/ti/adpll.c | 2 +-
+ drivers/clk/ti/apll.c | 4 +-
+ drivers/clk/ti/autoidle.c | 101 +-
+ drivers/clk/ti/clk.c | 80 +-
+ drivers/clk/ti/clkctrl.c | 2 +-
+ drivers/clk/ti/clock.h | 5 +-
+ drivers/clk/ti/clockdomain.c | 2 +-
+ drivers/clk/ti/divider.c | 2 +-
+ drivers/clk/ti/dpll.c | 11 +-
+ drivers/clk/ti/dpll3xxx.c | 2 +-
+ drivers/clk/ti/gate.c | 2 +-
+ drivers/clk/ti/interface.c | 4 +-
+ drivers/clk/ti/mux.c | 2 +-
+ drivers/clk/uniphier/clk-uniphier-cpugear.c | 2 +-
+ drivers/clk/x86/clk-lpt.c | 2 +-
+ drivers/clk/x86/clk-st.c | 3 +-
+ include/dt-bindings/clock/actions,s500-cmu.h | 78 +
+ include/dt-bindings/clock/axg-aoclkc.h | 7 +-
+ include/dt-bindings/clock/exynos5433.h | 8 +-
+ include/dt-bindings/clock/g12a-aoclkc.h | 34 +
+ include/dt-bindings/clock/g12a-clkc.h | 135 ++
+ include/dt-bindings/clock/gxbb-aoclkc.h | 7 +
+ include/dt-bindings/clock/imx5-clock.h | 3 +-
+ include/dt-bindings/clock/imx8mm-clock.h | 244 ++
+ include/dt-bindings/clock/imx8mq-clock.h | 11 +-
+ include/dt-bindings/clock/marvell,mmp2.h | 1 +
+ include/dt-bindings/clock/meson8b-clkc.h | 1 +
+ include/dt-bindings/clock/mt2712-clk.h | 3 +-
+ include/dt-bindings/clock/mt8173-clk.h | 3 +-
+ include/dt-bindings/clock/qcom,rpmcc.h | 10 +
+ include/dt-bindings/clock/qcom,rpmh.h | 1 +
+ include/dt-bindings/clock/r8a774a1-cpg-mssr.h | 1 +
+ include/dt-bindings/clock/r8a774c0-cpg-mssr.h | 1 +
+ include/dt-bindings/clock/stm32mp1-clks.h | 3 -
+ include/dt-bindings/reset/g12a-aoclkc.h | 18 +
+ include/linux/clk-provider.h | 3 +
+ include/linux/clk.h | 36 +
+ include/linux/clk/ti.h | 1 +
+ include/linux/clkdev.h | 4 +
+ include/linux/platform_data/{ => x86}/clk-lpss.h | 0
+ 178 files changed, 9450 insertions(+), 1630 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.txt
+ create mode 100644 drivers/clk/actions/owl-s500.c
+ create mode 100644 drivers/clk/clk-fixed-mmio.c
+ create mode 100644 drivers/clk/imx/clk-imx8mm.c
+ create mode 100644 drivers/clk/imx/clk-pll14xx.c
+ create mode 100644 drivers/clk/meson/clk-dualdiv.c
+ create mode 100644 drivers/clk/meson/clk-dualdiv.h
+ create mode 100644 drivers/clk/meson/clk-input.h
+ create mode 100644 drivers/clk/meson/clk-mpll.h
+ create mode 100644 drivers/clk/meson/clk-phase.h
+ create mode 100644 drivers/clk/meson/clk-pll.h
+ delete mode 100644 drivers/clk/meson/clk-triphase.c
+ delete mode 100644 drivers/clk/meson/clkc.h
+ create mode 100644 drivers/clk/meson/g12a-aoclk.c
+ create mode 100644 drivers/clk/meson/g12a-aoclk.h
+ create mode 100644 drivers/clk/meson/g12a.c
+ create mode 100644 drivers/clk/meson/g12a.h
+ delete mode 100644 drivers/clk/meson/gxbb-aoclk-32k.c
+ create mode 100644 drivers/clk/meson/meson-eeclk.c
+ create mode 100644 drivers/clk/meson/meson-eeclk.h
+ create mode 100644 drivers/clk/meson/parm.h
+ rename drivers/clk/meson/{clkc-audio.h => sclk-div.h} (54%)
+ create mode 100644 drivers/clk/meson/vid-pll-div.h
+ create mode 100644 include/dt-bindings/clock/actions,s500-cmu.h
+ create mode 100644 include/dt-bindings/clock/g12a-aoclkc.h
+ create mode 100644 include/dt-bindings/clock/g12a-clkc.h
+ create mode 100644 include/dt-bindings/clock/imx8mm-clock.h
+ create mode 100644 include/dt-bindings/reset/g12a-aoclkc.h
+ rename include/linux/platform_data/{ => x86}/clk-lpss.h (100%)
+Merging clk-samsung/for-next (81faa30df9b6 clk: samsung: exynos5433: Add selected IMEM clocks)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge c6x/for-linux-next
+Already up to date.
+Merging csky/linux-next (88d5f20a8139 csky: Fixup vdsp&fpu issues in kernel)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/Makefile | 2 +-
+ arch/csky/abiv2/memmove.S | 6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
+$ git merge h8300/h8300-next
+Already up to date.
+Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
+$ git merge ia64/next
+Already up to date.
+Merging m68k/for-next (28713169d879 m68k: Add -ffreestanding to CFLAGS)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Makefile | 5 ++++-
+ arch/m68k/apollo/Makefile | 2 +-
+ arch/m68k/atari/config.c | 2 +-
+ arch/m68k/configs/amcore_defconfig | 20 -------------------
+ arch/m68k/configs/amiga_defconfig | 37 ++---------------------------------
+ arch/m68k/configs/apollo_defconfig | 34 ++------------------------------
+ arch/m68k/configs/atari_defconfig | 33 ++-----------------------------
+ arch/m68k/configs/bvme6000_defconfig | 33 ++-----------------------------
+ arch/m68k/configs/hp300_defconfig | 34 ++------------------------------
+ arch/m68k/configs/mac_defconfig | 34 ++------------------------------
+ arch/m68k/configs/multi_defconfig | 34 ++------------------------------
+ arch/m68k/configs/mvme147_defconfig | 34 ++------------------------------
+ arch/m68k/configs/mvme16x_defconfig | 33 ++-----------------------------
+ arch/m68k/configs/q40_defconfig | 38 ++----------------------------------
+ arch/m68k/configs/sun3_defconfig | 33 ++-----------------------------
+ arch/m68k/configs/sun3x_defconfig | 34 ++------------------------------
+ arch/m68k/include/asm/macints.h | 3 ---
+ arch/m68k/kernel/signal.c | 3 ++-
+ arch/m68k/mac/misc.c | 18 ++++-------------
+ arch/m68k/mac/via.c | 20 +++++++++++--------
+ drivers/dio/dio.c | 4 ++--
+ 21 files changed, 50 insertions(+), 438 deletions(-)
+Merging m68knommu/for-next (d7e9d01ac292 m68k: add ColdFire mcf5441x eDMA platform support)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/device.c | 81 +++++++++++++++++++++++++++++++++++++++
+ arch/m68k/coldfire/m5441x.c | 4 +-
+ arch/m68k/include/asm/m5441xsim.h | 15 ++++++++
+ 3 files changed, 98 insertions(+), 2 deletions(-)
+Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/kernel/setup.c | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+Merging mips/mips-next (aeb669d41ffa MIPS: lantiq: Remove separate GPHY Firmware loader)
+$ git merge mips/mips-next
+Removing drivers/soc/lantiq/gphy.c
+Removing arch/mips/sgi-ip27/ip27-irqno.c
+Removing arch/mips/sgi-ip27/ip27-irq-pci.c
+Auto-merging arch/mips/net/ebpf_jit.c
+Auto-merging arch/mips/mm/dma-noncoherent.c
+Auto-merging arch/mips/kernel/setup.c
+Auto-merging arch/mips/kernel/mips-cm.c
+Auto-merging arch/mips/include/asm/pgtable.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable.h
+Removing arch/mips/include/asm/octeon/cvmx-smix-defs.h
+Auto-merging arch/mips/include/asm/barrier.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/barrier.h
+Removing arch/mips/ath79/pci.h
+Removing arch/mips/ath79/pci.c
+Removing arch/mips/ath79/machtypes.h
+Removing arch/mips/ath79/mach-ubnt-xm.c
+Removing arch/mips/ath79/mach-pb44.c
+Removing arch/mips/ath79/mach-db120.c
+Removing arch/mips/ath79/mach-ap81.c
+Removing arch/mips/ath79/mach-ap136.c
+Removing arch/mips/ath79/mach-ap121.c
+Removing arch/mips/ath79/irq.c
+Removing arch/mips/ath79/dev-wmac.h
+Removing arch/mips/ath79/dev-wmac.c
+Removing arch/mips/ath79/dev-usb.h
+Removing arch/mips/ath79/dev-usb.c
+Removing arch/mips/ath79/dev-spi.h
+Removing arch/mips/ath79/dev-spi.c
+Removing arch/mips/ath79/dev-leds-gpio.h
+Removing arch/mips/ath79/dev-leds-gpio.c
+Removing arch/mips/ath79/dev-gpio-buttons.h
+Removing arch/mips/ath79/dev-gpio-buttons.c
+Removing arch/mips/ath79/dev-common.h
+Removing arch/mips/ath79/dev-common.c
+Auto-merging arch/mips/Kconfig
+Removing Documentation/devicetree/bindings/mips/lantiq/rcu-gphy.txt
+Resolved 'arch/mips/include/asm/barrier.h' using previous resolution.
+Resolved 'arch/mips/include/asm/pgtable.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 961791d10343] Merge remote-tracking branch 'mips/mips-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mips/lantiq/rcu-gphy.txt | 36 ---
+ .../devicetree/bindings/mips/lantiq/rcu.txt | 18 --
+ arch/mips/Kconfig | 13 +-
+ arch/mips/Makefile | 2 +
+ arch/mips/ath79/Kconfig | 73 -----
+ arch/mips/ath79/Makefile | 23 +-
+ arch/mips/ath79/clock.c | 342 +++++++++-----------
+ arch/mips/ath79/common.h | 5 -
+ arch/mips/ath79/dev-common.c | 159 ---------
+ arch/mips/ath79/dev-common.h | 18 --
+ arch/mips/ath79/dev-gpio-buttons.c | 56 ----
+ arch/mips/ath79/dev-gpio-buttons.h | 23 --
+ arch/mips/ath79/dev-leds-gpio.c | 54 ----
+ arch/mips/ath79/dev-leds-gpio.h | 21 --
+ arch/mips/ath79/dev-spi.c | 38 ---
+ arch/mips/ath79/dev-spi.h | 22 --
+ arch/mips/ath79/dev-usb.c | 242 --------------
+ arch/mips/ath79/dev-usb.h | 17 -
+ arch/mips/ath79/dev-wmac.c | 155 ---------
+ arch/mips/ath79/dev-wmac.h | 17 -
+ arch/mips/ath79/irq.c | 169 ----------
+ arch/mips/ath79/mach-ap121.c | 92 ------
+ arch/mips/ath79/mach-ap136.c | 156 ---------
+ arch/mips/ath79/mach-ap81.c | 100 ------
+ arch/mips/ath79/mach-db120.c | 136 --------
+ arch/mips/ath79/mach-pb44.c | 128 --------
+ arch/mips/ath79/mach-ubnt-xm.c | 126 --------
+ arch/mips/ath79/machtypes.h | 28 --
+ arch/mips/ath79/pci.c | 273 ----------------
+ arch/mips/ath79/pci.h | 35 --
+ arch/mips/ath79/setup.c | 78 +----
+ arch/mips/bcm47xx/buttons.c | 2 +-
+ arch/mips/bcm47xx/leds.c | 10 +-
+ arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 14 +
+ arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 6 +
+ .../cavium-octeon/executive/cvmx-helper-board.c | 86 +----
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 39 +--
+ arch/mips/cavium-octeon/oct_ilm.c | 32 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 64 ++++
+ arch/mips/configs/xway_defconfig | 1 -
+ arch/mips/include/asm/Kbuild | 1 -
+ arch/mips/include/asm/barrier.h | 19 ++
+ arch/mips/include/asm/cacheflush.h | 2 -
+ arch/mips/include/asm/cmpxchg.h | 104 +++++-
+ arch/mips/include/asm/cpu-features.h | 13 +
+ arch/mips/include/asm/cpu.h | 1 +
+ arch/mips/include/asm/ginvt.h | 56 ++++
+ arch/mips/include/asm/irqflags.h | 2 +-
+ arch/mips/include/asm/mach-ath79/ath79.h | 4 -
+ arch/mips/include/asm/mach-ip27/irq.h | 12 +-
+ arch/mips/include/asm/mach-ip27/mmzone.h | 9 -
+ arch/mips/include/asm/mach-loongson32/platform.h | 4 -
+ arch/mips/include/asm/mipsregs.h | 11 +
+ arch/mips/include/asm/mmu.h | 6 +-
+ arch/mips/include/asm/mmu_context.h | 139 ++++----
+ arch/mips/include/asm/octeon/cvmx-helper-board.h | 12 -
+ arch/mips/include/asm/octeon/cvmx-smix-defs.h | 276 ----------------
+ arch/mips/include/asm/pci/bridge.h | 206 ++++++------
+ arch/mips/include/asm/pgtable.h | 51 +--
+ arch/mips/include/asm/smp-ops.h | 1 +
+ arch/mips/include/asm/sn/addrs.h | 72 +----
+ arch/mips/include/asm/sn/arch.h | 2 -
+ arch/mips/include/asm/sn/io.h | 2 +-
+ arch/mips/include/asm/sn/sn0/addrs.h | 5 -
+ arch/mips/include/asm/tlbflush.h | 5 +-
+ arch/mips/jz4740/setup.c | 14 +-
+ arch/mips/kernel/cpu-probe.c | 55 +++-
+ arch/mips/kernel/irq.c | 4 +-
+ arch/mips/kernel/mips-cm.c | 4 +-
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 21 +-
+ arch/mips/kernel/segment.c | 15 +-
+ arch/mips/kernel/setup.c | 7 +-
+ arch/mips/kernel/smp.c | 69 +++-
+ arch/mips/kernel/spinlock_test.c | 21 +-
+ arch/mips/kernel/traps.c | 4 +-
+ arch/mips/kernel/unaligned.c | 17 +-
+ arch/mips/kvm/emulate.c | 8 +-
+ arch/mips/kvm/mips.c | 5 +
+ arch/mips/kvm/trap_emul.c | 30 +-
+ arch/mips/kvm/vz.c | 8 +-
+ arch/mips/lantiq/Kconfig | 4 -
+ arch/mips/lib/dump_tlb.c | 22 +-
+ arch/mips/loongson32/Kconfig | 2 -
+ arch/mips/loongson32/Platform | 4 +-
+ arch/mips/loongson32/common/platform.c | 63 ----
+ arch/mips/loongson32/ls1b/board.c | 28 --
+ arch/mips/math-emu/me-debugfs.c | 23 +-
+ arch/mips/mm/Makefile | 16 +-
+ arch/mips/mm/c-octeon.c | 18 --
+ arch/mips/mm/c-r3k.c | 25 --
+ arch/mips/mm/c-r4k.c | 124 +------
+ arch/mips/mm/c-tx39.c | 21 --
+ arch/mips/mm/cache.c | 1 -
+ arch/mips/mm/context.c | 291 +++++++++++++++++
+ arch/mips/mm/dma-noncoherent.c | 9 +-
+ arch/mips/mm/init.c | 7 +
+ arch/mips/mm/sc-debugfs.c | 15 +-
+ arch/mips/mm/tlb-r3k.c | 14 +-
+ arch/mips/mm/tlb-r4k.c | 71 ++--
+ arch/mips/mm/tlb-r8k.c | 10 +-
+ arch/mips/pci/Makefile | 1 +
+ arch/mips/pci/fixup-ath79.c | 21 ++
+ arch/mips/pci/ops-bridge.c | 68 ++--
+ arch/mips/pci/pci-ip27.c | 49 +--
+ arch/mips/ralink/bootrom.c | 8 +-
+ arch/mips/sgi-ip27/Makefile | 3 +-
+ arch/mips/sgi-ip27/ip27-hubio.c | 4 +-
+ arch/mips/sgi-ip27/ip27-init.c | 39 +--
+ arch/mips/sgi-ip27/ip27-irq-pci.c | 266 ---------------
+ arch/mips/sgi-ip27/ip27-irq.c | 357 ++++++++++++++-------
+ arch/mips/sgi-ip27/ip27-irqno.c | 48 ---
+ arch/mips/sgi-ip27/ip27-memory.c | 34 +-
+ arch/mips/sgi-ip27/ip27-nmi.c | 64 ++--
+ arch/mips/sgi-ip27/ip27-smp.c | 5 +-
+ arch/mips/sgi-ip27/ip27-timer.c | 42 +--
+ arch/mips/sgi-ip27/ip27-xtalk.c | 13 +-
+ drivers/soc/lantiq/Makefile | 1 -
+ drivers/soc/lantiq/gphy.c | 224 -------------
+ include/dt-bindings/clock/ath79-clk.h | 4 +-
+ 119 files changed, 1610 insertions(+), 4615 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mips/lantiq/rcu-gphy.txt
+ delete mode 100644 arch/mips/ath79/dev-common.c
+ delete mode 100644 arch/mips/ath79/dev-common.h
+ delete mode 100644 arch/mips/ath79/dev-gpio-buttons.c
+ delete mode 100644 arch/mips/ath79/dev-gpio-buttons.h
+ delete mode 100644 arch/mips/ath79/dev-leds-gpio.c
+ delete mode 100644 arch/mips/ath79/dev-leds-gpio.h
+ delete mode 100644 arch/mips/ath79/dev-spi.c
+ delete mode 100644 arch/mips/ath79/dev-spi.h
+ delete mode 100644 arch/mips/ath79/dev-usb.c
+ delete mode 100644 arch/mips/ath79/dev-usb.h
+ delete mode 100644 arch/mips/ath79/dev-wmac.c
+ delete mode 100644 arch/mips/ath79/dev-wmac.h
+ delete mode 100644 arch/mips/ath79/irq.c
+ delete mode 100644 arch/mips/ath79/mach-ap121.c
+ delete mode 100644 arch/mips/ath79/mach-ap136.c
+ delete mode 100644 arch/mips/ath79/mach-ap81.c
+ delete mode 100644 arch/mips/ath79/mach-db120.c
+ delete mode 100644 arch/mips/ath79/mach-pb44.c
+ delete mode 100644 arch/mips/ath79/mach-ubnt-xm.c
+ delete mode 100644 arch/mips/ath79/machtypes.h
+ delete mode 100644 arch/mips/ath79/pci.c
+ delete mode 100644 arch/mips/ath79/pci.h
+ create mode 100644 arch/mips/include/asm/ginvt.h
+ delete mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h
+ create mode 100644 arch/mips/mm/context.c
+ create mode 100644 arch/mips/pci/fixup-ath79.c
+ delete mode 100644 arch/mips/sgi-ip27/ip27-irq-pci.c
+ delete mode 100644 arch/mips/sgi-ip27/ip27-irqno.c
+ delete mode 100644 drivers/soc/lantiq/gphy.c
+Merging nds32/next (bfeffd155283 Linux 5.0-rc1)
+$ git merge nds32/next
+Already up to date.
+Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE)
+$ git merge nios2/for-next
+Auto-merging arch/nios2/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/nios2/Kconfig | 1 -
+ arch/nios2/include/asm/pgtable.h | 1 -
+ arch/nios2/include/asm/tlbflush.h | 19 +++-
+ arch/nios2/kernel/nios2_ksyms.c | 12 +++
+ arch/nios2/mm/cacheflush.c | 7 +-
+ arch/nios2/mm/fault.c | 2 +-
+ arch/nios2/mm/tlb.c | 191 ++++++++++++++++++++---------------
+ arch/nios2/platform/Kconfig.platform | 9 --
+ 8 files changed, 141 insertions(+), 101 deletions(-)
+Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (6a5280012da5 parisc: use memblock_alloc() instead of custom get_memblock())
+$ git merge parisc-hd/for-next
+Auto-merging drivers/parisc/ccio-dma.c
+Merge made by the 'recursive' strategy.
+ arch/parisc/boot/Makefile | 6 ----
+ arch/parisc/include/asm/dma-mapping.h | 46 -----------------------------
+ arch/parisc/include/asm/hardirq.h | 1 +
+ arch/parisc/include/asm/pci.h | 4 +--
+ arch/parisc/include/asm/pdc.h | 1 +
+ arch/parisc/include/asm/pdcpat.h | 4 +++
+ arch/parisc/include/uapi/asm/pdc.h | 26 +++++++++++++++--
+ arch/parisc/kernel/firmware.c | 24 +++++++++++++++
+ arch/parisc/kernel/irq.c | 19 ++++++++----
+ arch/parisc/kernel/processor.c | 9 ++++++
+ arch/parisc/kernel/setup.c | 1 +
+ arch/parisc/kernel/smp.c | 1 +
+ arch/parisc/kernel/traps.c | 4 +--
+ arch/parisc/mm/init.c | 52 ++++++++++++---------------------
+ drivers/parisc/ccio-dma.c | 11 +++++--
+ drivers/parisc/dino.c | 11 ++++---
+ drivers/parisc/eisa.c | 2 ++
+ drivers/parisc/hppb.c | 2 ++
+ drivers/parisc/iommu.h | 55 +++++++++++++++++++++++++++++++++++
+ drivers/parisc/iosapic.c | 17 +----------
+ drivers/parisc/lba_pci.c | 30 +++++++++++++------
+ drivers/parisc/sba_iommu.c | 2 ++
+ 22 files changed, 197 insertions(+), 131 deletions(-)
+ create mode 100644 drivers/parisc/iommu.h
+Merging powerpc/next (9580b71b5a78 powerpc/32: Clear on-stack exception marker upon exception return)
+$ git merge powerpc/next
+Auto-merging kernel/dma/swiotlb.c
+Auto-merging kernel/dma/direct.c
+Auto-merging kernel/dma/Kconfig
+CONFLICT (content): Merge conflict in kernel/dma/Kconfig
+Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
+CONFLICT (modify/delete): arch/powerpc/kernel/dma.c deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/kernel/dma.c left in tree.
+Auto-merging arch/powerpc/kernel/dma-swiotlb.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/dma-swiotlb.c
+Auto-merging arch/powerpc/include/asm/ppc-opcode.h
+Auto-merging arch/powerpc/Kconfig
+Resolved 'arch/powerpc/kernel/dma-swiotlb.c' using previous resolution.
+Resolved 'kernel/dma/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/powerpc/kernel/dma.c
+arch/powerpc/kernel/dma.c: needs merge
+rm 'arch/powerpc/kernel/dma.c'
+$ git commit -v -a
+[master d8f8a53e93c6] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/Kconfig | 79 ++-
+ arch/powerpc/Kconfig.debug | 4 -
+ arch/powerpc/Makefile | 11 +-
+ arch/powerpc/boot/dts/Makefile | 1 +
+ arch/powerpc/boot/dts/akebono.dts | 2 +-
+ arch/powerpc/boot/dts/bluestone.dts | 2 +-
+ arch/powerpc/boot/dts/currituck.dts | 2 +-
+ arch/powerpc/boot/dts/iss4xx-mpic.dts | 2 +-
+ arch/powerpc/boot/dts/wii.dts | 22 +
+ arch/powerpc/include/asm/asm-prototypes.h | 14 +-
+ arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 +
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 11 +
+ arch/powerpc/include/asm/book3s/64/hash.h | 32 +-
+ arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +-
+ arch/powerpc/include/asm/book3s/64/pgalloc.h | 8 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 16 +-
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 30 +-
+ arch/powerpc/include/asm/checksum.h | 4 -
+ arch/powerpc/include/asm/device.h | 10 +-
+ arch/powerpc/include/asm/dma-direct.h | 18 +-
+ arch/powerpc/include/asm/dma-mapping.h | 92 ----
+ arch/powerpc/include/asm/eeh.h | 10 +-
+ arch/powerpc/include/asm/eeh_event.h | 1 +
+ arch/powerpc/include/asm/exception-64s.h | 4 +-
+ arch/powerpc/include/asm/hvsi.h | 2 +-
+ arch/powerpc/include/asm/iommu.h | 17 +
+ arch/powerpc/include/asm/ipic.h | 3 -
+ arch/powerpc/include/asm/irq.h | 18 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 3 +-
+ arch/powerpc/include/asm/livepatch.h | 7 +-
+ arch/powerpc/include/asm/machdep.h | 4 +-
+ arch/powerpc/include/asm/mce.h | 2 +-
+ arch/powerpc/include/asm/mmu.h | 13 +
+ arch/powerpc/include/asm/nmi.h | 2 +
+ arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 3 +-
+ arch/powerpc/include/asm/page.h | 14 +-
+ arch/powerpc/include/asm/pci-bridge.h | 7 +-
+ arch/powerpc/include/asm/pci.h | 2 -
+ arch/powerpc/include/asm/pgtable.h | 1 -
+ arch/powerpc/include/asm/powernv.h | 3 +-
+ arch/powerpc/include/asm/ppc-opcode.h | 16 +-
+ arch/powerpc/include/asm/ppc-pci.h | 4 +-
+ arch/powerpc/include/asm/processor.h | 108 +----
+ arch/powerpc/include/asm/ptrace.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 9 +-
+ arch/powerpc/include/asm/sections.h | 7 +
+ arch/powerpc/include/asm/smp.h | 17 +-
+ arch/powerpc/include/asm/swiotlb.h | 5 -
+ arch/powerpc/include/asm/task_size_32.h | 21 +
+ arch/powerpc/include/asm/task_size_64.h | 79 +++
+ arch/powerpc/include/asm/thread_info.h | 19 -
+ arch/powerpc/include/asm/topology.h | 2 +
+ arch/powerpc/kernel/Makefile | 15 +-
+ arch/powerpc/kernel/asm-offsets.c | 15 +-
+ arch/powerpc/kernel/cpu_setup_6xx.S | 4 +
+ arch/powerpc/kernel/dma-iommu.c | 75 ++-
+ arch/powerpc/kernel/dma-mask.c | 12 +
+ arch/powerpc/kernel/dma-swiotlb.c | 90 ----
+ arch/powerpc/kernel/dma.c | 363 --------------
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 17 +-
+ arch/powerpc/kernel/eeh.c | 190 ++++++--
+ arch/powerpc/kernel/eeh_cache.c | 36 +-
+ arch/powerpc/kernel/eeh_driver.c | 86 ++--
+ arch/powerpc/kernel/eeh_event.c | 16 +-
+ arch/powerpc/kernel/eeh_pe.c | 68 ++-
+ arch/powerpc/kernel/eeh_sysfs.c | 3 +-
+ arch/powerpc/kernel/entry_32.S | 97 ++--
+ arch/powerpc/kernel/entry_64.S | 53 +-
+ arch/powerpc/kernel/epapr_hcalls.S | 5 +-
+ arch/powerpc/kernel/exceptions-64e.S | 14 +-
+ arch/powerpc/kernel/exceptions-64s.S | 94 +++-
+ arch/powerpc/kernel/head_32.S | 160 +++---
+ arch/powerpc/kernel/head_40x.S | 9 +-
+ arch/powerpc/kernel/head_44x.S | 8 +-
+ arch/powerpc/kernel/head_64.S | 20 +-
+ arch/powerpc/kernel/head_8xx.S | 124 +++--
+ arch/powerpc/kernel/head_booke.h | 12 +-
+ arch/powerpc/kernel/head_fsl_booke.S | 16 +-
+ arch/powerpc/kernel/idle_6xx.S | 8 +-
+ arch/powerpc/kernel/idle_book3e.S | 2 +-
+ arch/powerpc/kernel/idle_e500.S | 8 +-
+ arch/powerpc/kernel/idle_power4.S | 2 +-
+ arch/powerpc/kernel/irq.c | 119 +----
+ arch/powerpc/kernel/kgdb.c | 28 --
+ arch/powerpc/kernel/machine_kexec_64.c | 6 +-
+ arch/powerpc/kernel/mce.c | 11 +-
+ arch/powerpc/kernel/misc_32.S | 17 +-
+ arch/powerpc/kernel/pci-common.c | 21 +-
+ arch/powerpc/kernel/process.c | 68 +--
+ arch/powerpc/kernel/ptrace.c | 18 +-
+ arch/powerpc/kernel/setup-common.c | 5 +-
+ arch/powerpc/kernel/setup_32.c | 26 +-
+ arch/powerpc/kernel/setup_64.c | 51 +-
+ arch/powerpc/kernel/smp.c | 109 ++---
+ arch/powerpc/kernel/stacktrace.c | 102 ++--
+ arch/powerpc/kernel/syscalls.c | 2 +-
+ arch/powerpc/kernel/syscalls/syscalltbl.sh | 4 +-
+ arch/powerpc/kernel/systbl.S | 6 +-
+ arch/powerpc/kernel/time.c | 1 -
+ arch/powerpc/kernel/trace/Makefile | 3 +-
+ arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 6 +-
+ arch/powerpc/kernel/traps.c | 133 ++++-
+ arch/powerpc/kernel/udbg.c | 2 +-
+ arch/powerpc/kernel/vdso32/Makefile | 1 +
+ arch/powerpc/kernel/vdso64/Makefile | 1 +
+ arch/powerpc/kernel/vmlinux.lds.S | 14 +-
+ arch/powerpc/kvm/Makefile | 5 -
+ arch/powerpc/kvm/book3s.c | 7 +
+ arch/powerpc/kvm/book3s_hv.c | 25 +-
+ arch/powerpc/kvm/book3s_hv_hmi.c | 1 +
+ arch/powerpc/kvm/book3s_hv_ras.c | 58 +--
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 66 +--
+ arch/powerpc/lib/Makefile | 3 +-
+ arch/powerpc/lib/sstep.c | 114 ++++-
+ arch/powerpc/lib/test_emulate_step.c | 535 ++++++++++++++++++++-
+ arch/powerpc/lib/test_emulate_step_exec_instr.S | 150 ++++++
+ arch/powerpc/math-emu/Makefile | 2 +-
+ arch/powerpc/mm/40x_mmu.c | 2 +-
+ arch/powerpc/mm/44x_mmu.c | 2 +-
+ arch/powerpc/mm/8xx_mmu.c | 91 ++--
+ arch/powerpc/mm/Makefile | 15 +-
+ arch/powerpc/mm/dma-noncoherent.c | 40 +-
+ arch/powerpc/mm/fsl_booke_mmu.c | 2 +-
+ arch/powerpc/mm/hash_low_32.S | 76 ++-
+ arch/powerpc/mm/hash_utils_64.c | 6 +-
+ arch/powerpc/mm/hugetlbpage-hash64.c | 3 +-
+ arch/powerpc/mm/hugetlbpage-radix.c | 5 +-
+ arch/powerpc/mm/init_32.c | 6 +-
+ arch/powerpc/mm/init_64.c | 2 -
+ arch/powerpc/mm/mem.c | 61 +--
+ arch/powerpc/mm/mmu_decl.h | 10 +-
+ arch/powerpc/mm/numa.c | 9 +-
+ arch/powerpc/mm/pgtable_32.c | 42 +-
+ arch/powerpc/mm/ppc_mmu_32.c | 186 +++++--
+ .../{dump_linuxpagetables-8xx.c => ptdump/8xx.c} | 2 +-
+ arch/powerpc/mm/ptdump/Makefile | 9 +
+ arch/powerpc/mm/{dump_bats.c => ptdump/bats.c} | 0
+ .../book3s64.c} | 2 +-
+ .../hashpagetable.c} | 2 +-
+ .../mm/{dump_linuxpagetables.c => ptdump/ptdump.c} | 20 +-
+ .../mm/{dump_linuxpagetables.h => ptdump/ptdump.h} | 0
+ .../mm/{dump_sr.c => ptdump/segment_regs.c} | 0
+ .../shared.c} | 2 +-
+ arch/powerpc/mm/slb.c | 5 +
+ arch/powerpc/mm/slice.c | 10 +-
+ arch/powerpc/mm/tlb_nohash.c | 2 +-
+ arch/powerpc/net/bpf_jit32.h | 5 +-
+ arch/powerpc/perf/power9-events-list.h | 24 +
+ arch/powerpc/perf/power9-pmu.c | 4 +
+ arch/powerpc/platforms/44x/Kconfig | 1 +
+ arch/powerpc/platforms/44x/ppc476.c | 1 +
+ arch/powerpc/platforms/44x/warp.c | 2 +-
+ arch/powerpc/platforms/83xx/suspend-asm.S | 34 +-
+ arch/powerpc/platforms/85xx/corenet_generic.c | 5 +-
+ arch/powerpc/platforms/85xx/ge_imp3a.c | 2 -
+ arch/powerpc/platforms/85xx/mpc8536_ds.c | 2 -
+ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 4 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 -
+ arch/powerpc/platforms/85xx/p1010rdb.c | 1 -
+ arch/powerpc/platforms/85xx/p1022_ds.c | 2 -
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 2 -
+ arch/powerpc/platforms/85xx/qemu_e500.c | 1 +
+ arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 -
+ arch/powerpc/platforms/Kconfig.cputype | 9 +
+ arch/powerpc/platforms/cell/iommu.c | 172 +------
+ arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
+ arch/powerpc/platforms/cell/spu_syscalls.c | 1 -
+ arch/powerpc/platforms/cell/spufs/file.c | 5 +-
+ arch/powerpc/platforms/embedded6xx/wii.c | 24 -
+ arch/powerpc/platforms/pasemi/iommu.c | 2 +-
+ arch/powerpc/platforms/pasemi/setup.c | 51 --
+ arch/powerpc/platforms/powernv/Makefile | 5 +-
+ arch/powerpc/platforms/powernv/idle.c | 27 +-
+ arch/powerpc/platforms/powernv/npu-dma.c | 16 +-
+ arch/powerpc/platforms/powernv/opal-call.c | 283 +++++++++++
+ arch/powerpc/platforms/powernv/opal-msglog.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 344 ++-----------
+ arch/powerpc/platforms/powernv/opal.c | 3 +-
+ arch/powerpc/platforms/powernv/pci-ioda-tce.c | 1 -
+ arch/powerpc/platforms/powernv/pci-ioda.c | 146 ++----
+ arch/powerpc/platforms/powernv/smp.c | 25 +
+ arch/powerpc/platforms/ps3/device-init.c | 4 +-
+ arch/powerpc/platforms/ps3/os-area.c | 4 +-
+ arch/powerpc/platforms/ps3/system-bus.c | 4 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 19 +
+ arch/powerpc/platforms/pseries/iommu.c | 99 +---
+ arch/powerpc/platforms/pseries/lparcfg.c | 1 +
+ arch/powerpc/platforms/pseries/vio.c | 95 ++--
+ arch/powerpc/sysdev/6xx-suspend.S | 5 +-
+ arch/powerpc/sysdev/dart_iommu.c | 58 +--
+ arch/powerpc/sysdev/fsl_pci.c | 25 +-
+ arch/powerpc/sysdev/ipic.c | 35 --
+ arch/powerpc/sysdev/tsi108_dev.c | 2 +-
+ arch/powerpc/sysdev/xive/common.c | 2 +-
+ arch/powerpc/xmon/Makefile | 1 +
+ arch/powerpc/xmon/ppc-dis.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ drivers/misc/cxl/guest.c | 2 +
+ drivers/misc/cxl/pci.c | 39 +-
+ drivers/misc/cxl/vphb.c | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 1 +
+ drivers/vfio/vfio_spapr_eeh.c | 6 +-
+ include/linux/swiotlb.h | 3 -
+ kernel/dma/Kconfig | 3 +
+ kernel/dma/direct.c | 3 +-
+ kernel/dma/mapping.c | 11 +-
+ kernel/dma/swiotlb.c | 12 -
+ kernel/resource.c | 4 -
+ .../selftests/powerpc/benchmarks/null_syscall.c | 2 +-
+ tools/testing/selftests/powerpc/include/reg.h | 8 +
+ tools/testing/selftests/powerpc/include/utils.h | 2 +
+ .../selftests/powerpc/pmu/ebb/fork_cleanup_test.c | 1 -
+ tools/testing/selftests/powerpc/tm/.gitignore | 1 +
+ tools/testing/selftests/powerpc/tm/Makefile | 4 +-
+ .../powerpc/tm/tm-signal-context-force-tm.c | 184 +++++++
+ tools/testing/selftests/vm/map_hugetlb.c | 29 +-
+ 216 files changed, 3619 insertions(+), 2993 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/task_size_32.h
+ create mode 100644 arch/powerpc/include/asm/task_size_64.h
+ create mode 100644 arch/powerpc/kernel/dma-mask.c
+ delete mode 100644 arch/powerpc/kernel/dma.c
+ create mode 100644 arch/powerpc/lib/test_emulate_step_exec_instr.S
+ rename arch/powerpc/mm/{dump_linuxpagetables-8xx.c => ptdump/8xx.c} (97%)
+ create mode 100644 arch/powerpc/mm/ptdump/Makefile
+ rename arch/powerpc/mm/{dump_bats.c => ptdump/bats.c} (100%)
+ rename arch/powerpc/mm/{dump_linuxpagetables-book3s64.c => ptdump/book3s64.c} (98%)
+ rename arch/powerpc/mm/{dump_hashpagetable.c => ptdump/hashpagetable.c} (99%)
+ rename arch/powerpc/mm/{dump_linuxpagetables.c => ptdump/ptdump.c} (94%)
+ rename arch/powerpc/mm/{dump_linuxpagetables.h => ptdump/ptdump.h} (100%)
+ rename arch/powerpc/mm/{dump_sr.c => ptdump/segment_regs.c} (100%)
+ rename arch/powerpc/mm/{dump_linuxpagetables-generic.c => ptdump/shared.c} (97%)
+ create mode 100644 arch/powerpc/platforms/powernv/opal-call.c
+ create mode 100644 tools/testing/selftests/powerpc/tm/tm-signal-context-force-tm.c
+Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
+$ git merge fsl/next
+Already up to date.
+Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
+$ git merge risc-v-pjw/for-next
+Already up to date.
+Merging risc-v/for-next (79a47bad61bb riscv: remove the HAVE_KPROBES option)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/riscv/Kconfig | 3 ---
+ arch/riscv/kernel/cpu.c | 28 ++++++++++++----------------
+ arch/riscv/kernel/cpufeature.c | 13 +++++++------
+ arch/riscv/kernel/ftrace.c | 2 +-
+ arch/riscv/kernel/setup.c | 6 +++---
+ arch/riscv/kernel/smpboot.c | 4 ++--
+ 6 files changed, 25 insertions(+), 31 deletions(-)
+Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
+$ git merge sifive/for-next
+Already up to date.
+Merging s390/features (9fe567d09f0f s390/dasd: fix read device characteristic with CONFIG_VMAP_STACK=y)
+$ git merge s390/features
+Auto-merging drivers/s390/net/qeth_core_main.c
+Auto-merging drivers/s390/crypto/ap_bus.c
+Auto-merging arch/s390/pci/pci.c
+Auto-merging arch/s390/kernel/swsusp.S
+Auto-merging arch/s390/kernel/setup.c
+Auto-merging arch/s390/kernel/early.c
+Removing arch/s390/kernel/compat_wrapper.c
+Merge made by the 'recursive' strategy.
+ Documentation/kmsg/s390/cpum_cf_common | 36 ++
+ Documentation/kmsg/s390/cpum_cf_diag | 45 ++
+ arch/s390/Kconfig | 2 +
+ arch/s390/boot/als.c | 20 +-
+ arch/s390/boot/boot.h | 2 +
+ arch/s390/boot/ipl_parm.c | 66 ++-
+ arch/s390/boot/startup.c | 1 +
+ arch/s390/boot/string.c | 1 +
+ arch/s390/hypfs/hypfs.h | 6 +-
+ arch/s390/hypfs/hypfs_dbfs.c | 8 +-
+ arch/s390/hypfs/hypfs_diag.c | 9 +-
+ arch/s390/hypfs/hypfs_diag0c.c | 6 +-
+ arch/s390/hypfs/hypfs_sprp.c | 6 +-
+ arch/s390/hypfs/hypfs_vm.c | 3 +-
+ arch/s390/hypfs/inode.c | 11 +-
+ arch/s390/include/asm/cpu_mcf.h | 126 ++++++
+ arch/s390/include/asm/cpu_mf-insn.h | 22 +
+ arch/s390/include/asm/cpu_mf.h | 18 +-
+ arch/s390/include/asm/diag.h | 12 +
+ arch/s390/include/asm/ftrace.h | 25 ++
+ arch/s390/include/asm/jump_label.h | 14 +-
+ arch/s390/include/asm/pci.h | 1 -
+ arch/s390/include/asm/perf_event.h | 2 +-
+ arch/s390/include/asm/qdio.h | 4 +-
+ arch/s390/include/asm/sclp.h | 1 +
+ arch/s390/include/asm/string.h | 28 +-
+ arch/s390/include/asm/syscall_wrapper.h | 135 ++++++
+ arch/s390/include/asm/vx-insn.h | 8 +-
+ arch/s390/include/uapi/asm/posix_types.h | 6 +
+ arch/s390/kernel/Makefile | 6 +-
+ arch/s390/kernel/compat_linux.c | 235 +----------
+ arch/s390/kernel/compat_wrapper.c | 186 ---------
+ arch/s390/kernel/debug.c | 6 -
+ arch/s390/kernel/diag.c | 1 +
+ arch/s390/kernel/early.c | 2 -
+ arch/s390/kernel/entry.S | 4 +-
+ arch/s390/kernel/head64.S | 2 -
+ arch/s390/kernel/kdebugfs.c | 2 -
+ arch/s390/kernel/perf_cpum_cf.c | 224 ++--------
+ arch/s390/kernel/perf_cpum_cf_common.c | 201 +++++++++
+ arch/s390/kernel/perf_cpum_cf_diag.c | 693 +++++++++++++++++++++++++++++++
+ arch/s390/kernel/perf_cpum_cf_events.c | 1 +
+ arch/s390/kernel/setup.c | 60 ++-
+ arch/s390/kernel/swsusp.S | 6 +-
+ arch/s390/kernel/sys_s390.c | 16 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 286 ++++++-------
+ arch/s390/kernel/sysinfo.c | 2 -
+ arch/s390/kernel/vtime.c | 4 +-
+ arch/s390/lib/string.c | 28 ++
+ arch/s390/mm/extmem.c | 133 +-----
+ arch/s390/mm/kasan_init.c | 2 -
+ arch/s390/mm/mmap.c | 33 +-
+ arch/s390/mm/pgtable.c | 2 -
+ arch/s390/pci/pci.c | 22 +-
+ arch/s390/pci/pci_debug.c | 15 +-
+ drivers/s390/block/dasd.c | 19 +-
+ drivers/s390/char/sclp.h | 4 +-
+ drivers/s390/char/sclp_early.c | 2 +
+ drivers/s390/cio/qdio_setup.c | 6 +-
+ drivers/s390/cio/vfio_ccw_cp.c | 55 ++-
+ drivers/s390/crypto/ap_bus.c | 19 +-
+ drivers/s390/crypto/ap_bus.h | 3 +-
+ drivers/s390/crypto/ap_queue.c | 7 +-
+ drivers/s390/crypto/pkey_api.c | 2 +-
+ drivers/s390/crypto/vfio_ap_drv.c | 44 +-
+ drivers/s390/crypto/vfio_ap_ops.c | 4 +-
+ drivers/s390/crypto/vfio_ap_private.h | 1 +
+ drivers/s390/net/ism_drv.c | 12 +-
+ drivers/s390/net/qeth_core_main.c | 4 +-
+ drivers/s390/scsi/zfcp_qdio.c | 4 +-
+ include/linux/syscalls.h | 4 +
+ ipc/syscall.c | 20 +-
+ kernel/sys_ni.c | 1 +
+ 73 files changed, 1927 insertions(+), 1080 deletions(-)
+ create mode 100644 Documentation/kmsg/s390/cpum_cf_common
+ create mode 100644 Documentation/kmsg/s390/cpum_cf_diag
+ create mode 100644 arch/s390/include/asm/cpu_mcf.h
+ create mode 100644 arch/s390/include/asm/cpu_mf-insn.h
+ create mode 100644 arch/s390/include/asm/syscall_wrapper.h
+ delete mode 100644 arch/s390/kernel/compat_wrapper.c
+ create mode 100644 arch/s390/kernel/perf_cpum_cf_common.c
+ create mode 100644 arch/s390/kernel/perf_cpum_cf_diag.c
+Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge sparc-next/master
+Already up to date.
+Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
+$ git merge sh/for-next
+Already up to date.
+Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (036ef74b3ecb Merge branch 'xtensa-5.1' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Auto-merging arch/xtensa/include/asm/Kbuild
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/xtensa/booting.txt | 19 ++++
+ arch/xtensa/Kconfig | 2 +
+ arch/xtensa/include/asm/Kbuild | 2 +
+ arch/xtensa/include/asm/cmpxchg.h | 36 +++++-
+ arch/xtensa/include/asm/spinlock.h | 185 +------------------------------
+ arch/xtensa/include/asm/spinlock_types.h | 15 +--
+ arch/xtensa/include/asm/thread_info.h | 9 --
+ arch/xtensa/kernel/process.c | 6 +-
+ arch/xtensa/kernel/smp.c | 38 ++++---
+ arch/xtensa/kernel/time.c | 53 +++++----
+ arch/xtensa/kernel/traps.c | 5 +-
+ 11 files changed, 113 insertions(+), 257 deletions(-)
+ create mode 100644 Documentation/xtensa/booting.txt
+Merging fscrypt/master (f5e55e777cc9 fscrypt: return -EXDEV for incompatible rename or link into encrypted dir)
+$ git merge fscrypt/master
+Removing include/linux/fscrypt_supp.h
+Removing include/linux/fscrypt_notsupp.h
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fscrypt.rst | 16 +-
+ arch/mips/configs/generic_defconfig | 2 +-
+ arch/nds32/configs/defconfig | 2 +-
+ arch/s390/configs/debug_defconfig | 2 +-
+ arch/s390/configs/performance_defconfig | 2 +-
+ fs/crypto/Kconfig | 6 +-
+ fs/crypto/fscrypt_private.h | 1 -
+ fs/crypto/hooks.c | 6 +-
+ fs/crypto/policy.c | 3 +-
+ fs/ext4/Kconfig | 15 --
+ fs/ext4/dir.c | 10 +-
+ fs/ext4/ext4.h | 12 +-
+ fs/ext4/ext4_jbd2.h | 2 +-
+ fs/ext4/extents.c | 4 +-
+ fs/ext4/ialloc.c | 2 +-
+ fs/ext4/inode.c | 24 +-
+ fs/ext4/ioctl.c | 4 +-
+ fs/ext4/move_extent.c | 3 +-
+ fs/ext4/namei.c | 18 +-
+ fs/ext4/page-io.c | 9 +-
+ fs/ext4/readpage.c | 5 +-
+ fs/ext4/super.c | 6 +-
+ fs/ext4/sysfs.c | 4 +-
+ fs/f2fs/Kconfig | 12 +-
+ fs/f2fs/data.c | 4 +-
+ fs/f2fs/dir.c | 10 +-
+ fs/f2fs/f2fs.h | 14 +-
+ fs/f2fs/file.c | 10 +-
+ fs/f2fs/inode.c | 4 +-
+ fs/f2fs/namei.c | 6 +-
+ fs/f2fs/super.c | 8 +-
+ fs/f2fs/sysfs.c | 4 +-
+ fs/ubifs/Kconfig | 12 +-
+ fs/ubifs/Makefile | 2 +-
+ fs/ubifs/ioctl.c | 4 +-
+ fs/ubifs/sb.c | 2 +-
+ fs/ubifs/super.c | 2 +-
+ fs/ubifs/ubifs.h | 5 +-
+ include/linux/fs.h | 4 +-
+ include/linux/fscrypt.h | 420 +++++++++++++++++++++++++++++++-
+ include/linux/fscrypt_notsupp.h | 231 ------------------
+ include/linux/fscrypt_supp.h | 204 ----------------
+ 42 files changed, 516 insertions(+), 600 deletions(-)
+ delete mode 100644 include/linux/fscrypt_notsupp.h
+ delete mode 100644 include/linux/fscrypt_supp.h
+Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+ fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 51 insertions(+), 46 deletions(-)
+Merging btrfs/next (29dcea88779c Linux 4.17)
+$ git merge btrfs/next
+Already up to date.
+Merging btrfs-kdave/for-next (836b12f8c30d Merge branch 'for-next-next-v5.0-20190228' into for-next-20190228)
+$ git merge btrfs-kdave/for-next
+Auto-merging fs/btrfs/volumes.h
+Auto-merging fs/btrfs/ref-verify.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/acl.c | 9 +
+ fs/btrfs/async-thread.c | 10 +-
+ fs/btrfs/backref.c | 22 ++-
+ fs/btrfs/compression.c | 253 ++++++++++++++--------------
+ fs/btrfs/compression.h | 52 +++++-
+ fs/btrfs/ctree.c | 74 ++++-----
+ fs/btrfs/ctree.h | 63 +++++--
+ fs/btrfs/delayed-ref.c | 15 +-
+ fs/btrfs/delayed-ref.h | 11 --
+ fs/btrfs/dev-replace.c | 9 +-
+ fs/btrfs/disk-io.c | 121 ++++++++------
+ fs/btrfs/extent-tree.c | 364 +++++++++++++++++++++++++++-------------
+ fs/btrfs/extent_io.c | 193 +++++++++++++++-------
+ fs/btrfs/extent_io.h | 15 +-
+ fs/btrfs/extent_map.c | 5 +-
+ fs/btrfs/extent_map.h | 1 +
+ fs/btrfs/file.c | 5 +-
+ fs/btrfs/inode.c | 353 +++++++++++++++++++++++----------------
+ fs/btrfs/ioctl.c | 108 ++++--------
+ fs/btrfs/locking.c | 108 ++++++------
+ fs/btrfs/locking.h | 15 +-
+ fs/btrfs/lzo.c | 31 +++-
+ fs/btrfs/props.c | 32 +++-
+ fs/btrfs/qgroup.c | 385 ++++++++++++++++++++++++++++++++-----------
+ fs/btrfs/qgroup.h | 120 ++++++++++++--
+ fs/btrfs/ref-verify.c | 4 +-
+ fs/btrfs/relocation.c | 119 +++++++++----
+ fs/btrfs/root-tree.c | 25 ++-
+ fs/btrfs/scrub.c | 51 ++++--
+ fs/btrfs/super.c | 13 +-
+ fs/btrfs/transaction.c | 60 +++++--
+ fs/btrfs/tree-checker.c | 24 ++-
+ fs/btrfs/tree-checker.h | 8 +
+ fs/btrfs/tree-defrag.c | 2 +-
+ fs/btrfs/tree-log.c | 282 +++++++++++++++++++++++++------
+ fs/btrfs/volumes.c | 208 ++++++++++++-----------
+ fs/btrfs/volumes.h | 5 +-
+ fs/btrfs/zlib.c | 45 ++++-
+ fs/btrfs/zstd.c | 321 ++++++++++++++++++++++++++++++++++--
+ include/trace/events/btrfs.h | 30 +---
+ include/uapi/linux/btrfs.h | 2 +
+ 41 files changed, 2424 insertions(+), 1149 deletions(-)
+Merging ceph/master (6cbbda12cb4f rbd: remove experimental designation from kernel layering)
+$ git merge ceph/master
+Auto-merging fs/ceph/file.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/ceph.txt | 4 +
+ drivers/block/rbd.c | 131 +++++--
+ fs/ceph/caps.c | 72 ++--
+ fs/ceph/debugfs.c | 27 --
+ fs/ceph/dir.c | 455 +++++++++++++++++++-----
+ fs/ceph/file.c | 13 +-
+ fs/ceph/inode.c | 52 +--
+ fs/ceph/mds_client.c | 698 ++++++++++++++++++++++++++++++-------
+ fs/ceph/mds_client.h | 43 ++-
+ fs/ceph/snap.c | 159 ++++++++-
+ fs/ceph/super.c | 21 +-
+ fs/ceph/super.h | 43 ++-
+ fs/ceph/xattr.c | 20 +-
+ include/linux/ceph/types.h | 1 +
+ net/ceph/osdmap.c | 5 +-
+ 15 files changed, 1400 insertions(+), 344 deletions(-)
+Merging cifs/for-next (bb4369db96f2 smb3: for kerberos mounts display the credential uid used)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_dfs_ref.c | 4 +-
+ fs/cifs/cifs_fs_sb.h | 1 +
+ fs/cifs/cifsfs.c | 3 +-
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/cifsglob.h | 64 +++++++--
+ fs/cifs/cifsproto.h | 8 +-
+ fs/cifs/cifssmb.c | 54 +++++---
+ fs/cifs/connect.c | 66 +++++++--
+ fs/cifs/file.c | 353 +++++++++++++++++++++++++++++++-----------------
+ fs/cifs/inode.c | 2 +-
+ fs/cifs/link.c | 14 +-
+ fs/cifs/smb1ops.c | 8 +-
+ fs/cifs/smb2misc.c | 24 ++--
+ fs/cifs/smb2ops.c | 114 +++++++++++++---
+ fs/cifs/smb2pdu.c | 175 +++++++++++++++---------
+ fs/cifs/smb2pdu.h | 4 +-
+ fs/cifs/smb2transport.c | 15 +-
+ fs/cifs/smbdirect.c | 6 +-
+ fs/cifs/trace.h | 89 +++++++++++-
+ fs/cifs/transport.c | 197 ++++++++++++++++++++++-----
+ 20 files changed, 887 insertions(+), 316 deletions(-)
+Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 29 +++++++++++++++++++++++------
+ fs/ecryptfs/keystore.c | 5 +++--
+ 2 files changed, 26 insertions(+), 8 deletions(-)
+Merging ext3/for_next (2337494f7c0f Merge udf cleanup.)
+$ git merge ext3/for_next
+Auto-merging include/linux/fs.h
+Auto-merging fs/ext2/inode.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ fs/Makefile | 3 +-
+ fs/ext2/dir.c | 35 +---
+ fs/ext2/ext2.h | 17 +-
+ fs/ext2/file.c | 1 +
+ fs/ext2/ialloc.c | 2 -
+ fs/ext2/inode.c | 28 ++-
+ fs/ext2/namei.c | 2 +
+ fs/ext2/super.c | 44 +++--
+ fs/ext2/symlink.c | 2 +
+ fs/ext2/xattr.c | 1 +
+ fs/fs_types.c | 105 ++++++++++
+ fs/notify/fanotify/Kconfig | 1 +
+ fs/notify/fanotify/fanotify.c | 267 +++++++++++++++++++++----
+ fs/notify/fanotify/fanotify.h | 116 +++++++++--
+ fs/notify/fanotify/fanotify_user.c | 373 ++++++++++++++++++++++++-----------
+ fs/notify/fsnotify.c | 15 +-
+ fs/notify/inotify/inotify.h | 1 +
+ fs/notify/inotify/inotify_fsnotify.c | 18 +-
+ fs/notify/inotify/inotify_user.c | 5 +-
+ fs/notify/mark.c | 42 +++-
+ fs/notify/notification.c | 42 ++--
+ fs/statfs.c | 14 ++
+ fs/udf/super.c | 51 +++--
+ include/linux/fanotify.h | 26 ++-
+ include/linux/fs.h | 17 +-
+ include/linux/fs_types.h | 75 +++++++
+ include/linux/fsnotify.h | 73 +++++--
+ include/linux/fsnotify_backend.h | 67 ++++---
+ include/linux/statfs.h | 3 +
+ include/uapi/linux/fanotify.h | 29 +++
+ 31 files changed, 1113 insertions(+), 363 deletions(-)
+ create mode 100644 fs/fs_types.c
+ create mode 100644 include/linux/fs_types.h
+Merging ext4/dev (0df6f46995a9 jbd2: jbd2_get_transaction does not need to return a value)
+$ git merge ext4/dev
+Auto-merging fs/ext4/sysfs.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/page-io.c
+Auto-merging fs/ext4/ioctl.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/indirect.c
+Auto-merging fs/ext4/extents.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-ext4 | 7 +++
+ fs/ext4/Kconfig | 2 +-
+ fs/ext4/ext4.h | 9 ++-
+ fs/ext4/extents.c | 29 ++++-----
+ fs/ext4/indirect.c | 2 +
+ fs/ext4/inode.c | 21 +++----
+ fs/ext4/ioctl.c | 101 +++++++++++++++++++++++---------
+ fs/ext4/mballoc.c | 7 +--
+ fs/ext4/page-io.c | 4 +-
+ fs/ext4/resize.c | 3 +-
+ fs/ext4/super.c | 1 -
+ fs/ext4/sysfs.c | 13 ++++
+ fs/ext4/xattr.c | 3 +
+ fs/jbd2/checkpoint.c | 17 +++++-
+ fs/jbd2/commit.c | 6 +-
+ fs/jbd2/journal.c | 90 ++++++++++++----------------
+ fs/jbd2/transaction.c | 83 +++++++++++++++++++-------
+ 17 files changed, 251 insertions(+), 147 deletions(-)
+Merging f2fs/dev (100e23619856 f2fs: print more parameters in trace_f2fs_map_blocks)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/sysfs.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/namei.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/dir.c
+Auto-merging fs/f2fs/data.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++
+ Documentation/filesystems/f2fs.txt | 2 +
+ fs/f2fs/checkpoint.c | 16 +++--
+ fs/f2fs/data.c | 20 +++---
+ fs/f2fs/debug.c | 39 +++++------
+ fs/f2fs/dir.c | 13 ++--
+ fs/f2fs/extent_cache.c | 2 +-
+ fs/f2fs/f2fs.h | 60 +++++++++--------
+ fs/f2fs/file.c | 42 ++++++------
+ fs/f2fs/inline.c | 4 +-
+ fs/f2fs/namei.c | 3 +-
+ fs/f2fs/node.c | 4 +-
+ fs/f2fs/segment.c | 71 ++++++++++++++++-----
+ fs/f2fs/segment.h | 2 +-
+ fs/f2fs/super.c | 110 ++++++++++++++++++++++----------
+ fs/f2fs/sysfs.c | 17 ++++-
+ fs/f2fs/trace.c | 20 ++++--
+ fs/f2fs/xattr.c | 2 +-
+ include/linux/f2fs_fs.h | 20 +++---
+ include/trace/events/f2fs.h | 47 +++++++++++++-
+ 20 files changed, 338 insertions(+), 163 deletions(-)
+Merging fuse/for-next (fabf7e0262d0 fuse: cache readdir calls if filesystem opts out of opendir)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/control.c | 4 +-
+ fs/fuse/cuse.c | 7 +-
+ fs/fuse/dev.c | 115 +++++++++-------
+ fs/fuse/dir.c | 54 +++-----
+ fs/fuse/file.c | 342 ++++++++++++++++++++++++++--------------------
+ fs/fuse/fuse_i.h | 28 ++--
+ fs/fuse/inode.c | 26 ++--
+ fs/fuse/readdir.c | 4 +-
+ include/uapi/linux/fuse.h | 7 +-
+ 9 files changed, 327 insertions(+), 260 deletions(-)
+Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/acl.c | 3 ++-
+ fs/jfs/jfs_incore.h | 6 ++++--
+ fs/jfs/jfs_logmgr.c | 18 +++++++++---------
+ fs/jfs/jfs_logmgr.h | 10 +++++-----
+ fs/jfs/jfs_mount.c | 4 ++--
+ fs/jfs/jfs_superblock.h | 8 ++++----
+ fs/jfs/namei.c | 2 +-
+ fs/jfs/super.c | 8 +++++---
+ 8 files changed, 32 insertions(+), 27 deletions(-)
+Merging nfs/linux-next (a73881c96d73 SUNRPC: Fix an Oops in udp_poll())
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c | 14 -
+ fs/lockd/clntxdr.c | 14 -
+ fs/nfs/callback_xdr.c | 64 ++--
+ fs/nfs/delegation.c | 22 +-
+ fs/nfs/delegation.h | 1 +
+ fs/nfs/dir.c | 98 ++++-
+ fs/nfs/direct.c | 7 +-
+ fs/nfs/file.c | 44 ++-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 2 +-
+ fs/nfs/flexfilelayout/flexfilelayoutdev.c | 12 +-
+ fs/nfs/inode.c | 33 +-
+ fs/nfs/internal.h | 5 +-
+ fs/nfs/io.c | 12 +-
+ fs/nfs/namespace.c | 8 +-
+ fs/nfs/nfs2xdr.c | 124 +++----
+ fs/nfs/nfs3acl.c | 2 -
+ fs/nfs/nfs3xdr.c | 209 ++++-------
+ fs/nfs/nfs42xdr.c | 21 +-
+ fs/nfs/nfs4client.c | 33 +-
+ fs/nfs/nfs4namespace.c | 5 +-
+ fs/nfs/nfs4proc.c | 117 +++---
+ fs/nfs/nfs4session.c | 7 +-
+ fs/nfs/nfs4session.h | 5 +-
+ fs/nfs/nfs4state.c | 1 +
+ fs/nfs/nfs4trace.h | 25 ++
+ fs/nfs/nfs4xdr.c | 529 ++++++++-------------------
+ fs/nfs/nfstrace.c | 1 +
+ fs/nfs/nfstrace.h | 85 +++++
+ fs/nfs/pagelist.c | 47 ++-
+ fs/nfs/pnfs.c | 33 +-
+ fs/nfs/pnfs.h | 1 +
+ fs/nfs/read.c | 2 +-
+ fs/nfs/super.c | 2 +-
+ fs/nfs/unlink.c | 8 +-
+ fs/nfs/write.c | 19 +-
+ fs/nfsd/nfs4callback.c | 13 -
+ include/linux/nfs_page.h | 10 +
+ include/linux/nfs_xdr.h | 2 +-
+ include/linux/sunrpc/auth.h | 44 ++-
+ include/linux/sunrpc/clnt.h | 3 +
+ include/linux/sunrpc/gss_krb5_enctypes.h | 42 ++-
+ include/linux/sunrpc/xdr.h | 23 +-
+ include/linux/sunrpc/xprt.h | 7 -
+ include/linux/sunrpc/xprtsock.h | 1 +
+ include/trace/events/rpcgss.h | 361 +++++++++++++++++++
+ include/trace/events/rpcrdma.h | 12 +-
+ include/trace/events/sunrpc.h | 361 ++++++++++++++++++-
+ net/sunrpc/Kconfig | 16 +
+ net/sunrpc/auth.c | 136 +++----
+ net/sunrpc/auth_gss/Makefile | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 551 ++++++++++++++---------------
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 29 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +-
+ net/sunrpc/auth_gss/gss_mech_switch.c | 27 +-
+ net/sunrpc/auth_gss/gss_rpc_upcall.c | 15 +-
+ net/sunrpc/auth_gss/gss_rpc_upcall.h | 16 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.c | 15 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.h | 17 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 3 +-
+ net/sunrpc/auth_gss/trace.c | 11 +
+ net/sunrpc/auth_null.c | 56 +--
+ net/sunrpc/auth_unix.c | 122 ++++---
+ net/sunrpc/backchannel_rqst.c | 1 -
+ net/sunrpc/clnt.c | 390 ++++++++++----------
+ net/sunrpc/sched.c | 7 +
+ net/sunrpc/svc.c | 19 +-
+ net/sunrpc/xdr.c | 121 ++++---
+ net/sunrpc/xprt.c | 16 +-
+ net/sunrpc/xprtrdma/backchannel.c | 3 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 4 +-
+ net/sunrpc/xprtrdma/rpc_rdma.c | 22 +-
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 -
+ net/sunrpc/xprtrdma/transport.c | 2 -
+ net/sunrpc/xprtrdma/verbs.c | 2 +
+ net/sunrpc/xprtrdma/xprt_rdma.h | 12 +-
+ net/sunrpc/xprtsock.c | 313 +++++++++-------
+ 76 files changed, 2558 insertions(+), 1870 deletions(-)
+ create mode 100644 include/trace/events/rpcgss.h
+ create mode 100644 net/sunrpc/auth_gss/trace.c
+Merging nfs-anna/linux-next (a3b22b9f11d9 Linux 5.0-rc7)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (c54f24e338ed nfsd: fix performance-limiting session calculation)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfsd/nfs4callback.c
+Merge made by the 'recursive' strategy.
+ fs/nfsd/nfs4callback.c | 4 ++--
+ fs/nfsd/nfs4state.c | 8 ++++----
+ net/sunrpc/svc_xprt.c | 24 +++++++++++++++++++-----
+ net/sunrpc/svcsock.c | 20 ++++++++++----------
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 12 +++---------
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 17 ++++-------------
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 4 ----
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 +++------
+ 8 files changed, 45 insertions(+), 53 deletions(-)
+Merging orangefs/for-next (6e356d45950e orangefs: remove two un-needed BUG_ONs...)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up)
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/copy_up.c | 59 ++++++++++++++++++++++++++++++++++++------------
+ fs/overlayfs/overlayfs.h | 2 ++
+ fs/overlayfs/util.c | 55 ++++++++++++++++++++++++++++----------------
+ 3 files changed, 81 insertions(+), 35 deletions(-)
+Merging ubifs/linux-next (2fe8b2d5578d ubifs: Reject unsupported ioctl flags explicitly)
+$ git merge ubifs/linux-next
+Auto-merging fs/ubifs/ioctl.c
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/cdev.c | 30 ++++++++
+ drivers/mtd/ubi/ubi.h | 1 +
+ drivers/mtd/ubi/wl.c | 174 ++++++++++++++++++++++++++++++++++++++++++--
+ fs/ubifs/ioctl.c | 8 ++
+ include/uapi/mtd/ubi-user.h | 5 ++
+ 5 files changed, 211 insertions(+), 7 deletions(-)
+Merging v9fs/9p-next (5e3cc1ee1405 9p: use inode->i_lock to protect i_size_write() under 32-bit)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs_vfs.h | 23 +++++++++++++++++++++--
+ fs/9p/vfs_file.c | 6 +++++-
+ fs/9p/vfs_inode.c | 23 +++++++++++------------
+ fs/9p/vfs_inode_dotl.c | 27 ++++++++++++++-------------
+ fs/9p/vfs_super.c | 4 ++--
+ net/9p/trans_xen.c | 2 +-
+ 6 files changed, 54 insertions(+), 31 deletions(-)
+Merging xfs/for-next (1b9598c8fb99 xfs: fix reporting supported extra file attributes for statx())
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/xfs.txt | 3 +-
+ fs/xfs/libxfs/xfs_ag.c | 6 +-
+ fs/xfs/libxfs/xfs_ag_resv.c | 2 +-
+ fs/xfs/libxfs/xfs_alloc.c | 12 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 74 ++--
+ fs/xfs/libxfs/xfs_attr.c | 17 +
+ fs/xfs/libxfs/xfs_attr.h | 2 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 21 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 8 +-
+ fs/xfs/libxfs/xfs_bmap.c | 302 +++++++++------
+ fs/xfs/libxfs/xfs_bmap.h | 16 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 13 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 49 ++-
+ fs/xfs/libxfs/xfs_da_format.h | 3 +
+ fs/xfs/libxfs/xfs_dir2.c | 17 +
+ fs/xfs/libxfs/xfs_dir2.h | 1 +
+ fs/xfs/libxfs/xfs_dir2_block.c | 10 +-
+ fs/xfs/libxfs/xfs_dir2_data.c | 12 +-
+ fs/xfs/libxfs/xfs_dir2_leaf.c | 100 +----
+ fs/xfs/libxfs/xfs_dir2_node.c | 10 +-
+ fs/xfs/libxfs/xfs_dquot_buf.c | 4 +
+ fs/xfs/libxfs/xfs_errortag.h | 4 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 3 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 29 +-
+ fs/xfs/libxfs/xfs_iext_tree.c | 13 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 11 +-
+ fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
+ fs/xfs/libxfs/xfs_refcount_btree.c | 3 +-
+ fs/xfs/libxfs/xfs_rmap_btree.c | 3 +-
+ fs/xfs/libxfs/xfs_sb.c | 7 +-
+ fs/xfs/libxfs/xfs_shared.h | 4 +-
+ fs/xfs/libxfs/xfs_symlink_remote.c | 3 +-
+ fs/xfs/libxfs/xfs_types.c | 24 ++
+ fs/xfs/libxfs/xfs_types.h | 3 +
+ fs/xfs/scrub/agheader.c | 10 +-
+ fs/xfs/scrub/agheader_repair.c | 12 +-
+ fs/xfs/scrub/attr.c | 11 +
+ fs/xfs/scrub/bmap.c | 27 ++
+ fs/xfs/scrub/dir.c | 6 +
+ fs/xfs/scrub/ialloc.c | 330 +++++++++++-----
+ fs/xfs/scrub/repair.c | 3 +-
+ fs/xfs/scrub/repair.h | 3 -
+ fs/xfs/scrub/rtbitmap.c | 5 +-
+ fs/xfs/scrub/trace.h | 45 +++
+ fs/xfs/xfs_aops.c | 266 +++++++------
+ fs/xfs/xfs_aops.h | 24 +-
+ fs/xfs/xfs_attr_list.c | 1 +
+ fs/xfs/xfs_bmap_util.c | 9 +-
+ fs/xfs/xfs_buf.c | 72 +++-
+ fs/xfs/xfs_buf.h | 8 +-
+ fs/xfs/xfs_error.c | 6 +-
+ fs/xfs/xfs_error.h | 1 +
+ fs/xfs/xfs_file.c | 31 +-
+ fs/xfs/xfs_fsops.c | 1 +
+ fs/xfs/xfs_globals.c | 2 +-
+ fs/xfs/xfs_inode.c | 769 +++++++++++++++++++++++++++----------
+ fs/xfs/xfs_inode.h | 3 +
+ fs/xfs/xfs_iomap.c | 518 ++++++++++++-------------
+ fs/xfs/xfs_iomap.h | 7 +-
+ fs/xfs/xfs_iops.c | 21 +-
+ fs/xfs/xfs_log_recover.c | 14 +-
+ fs/xfs/xfs_mount.c | 5 +
+ fs/xfs/xfs_mount.h | 10 +-
+ fs/xfs/xfs_ondisk.h | 21 +
+ fs/xfs/xfs_pnfs.c | 2 +-
+ fs/xfs/xfs_reflink.c | 150 +++-----
+ fs/xfs/xfs_reflink.h | 18 +-
+ fs/xfs/xfs_super.c | 22 +-
+ fs/xfs/xfs_sysctl.h | 1 +
+ fs/xfs/xfs_sysfs.c | 24 ++
+ fs/xfs/xfs_trace.h | 115 ++++--
+ fs/xfs/xfs_trans_bmap.c | 1 -
+ fs/xfs/xfs_trans_buf.c | 2 +-
+ fs/xfs/xfs_trans_extfree.c | 1 -
+ fs/xfs/xfs_trans_refcount.c | 1 -
+ fs/xfs/xfs_trans_rmap.c | 1 -
+ fs/xfs/xfs_xattr.c | 3 +
+ 77 files changed, 2134 insertions(+), 1239 deletions(-)
+Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks())
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (c0abe5af7341 Merge branches 'work.mount', 'work.misc' and 'work.iov_iter' into for-next)
+$ git merge vfs/for-next
+Auto-merging security/security.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/relay.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging include/linux/fs.h
+Auto-merging fs/proc/internal.h
+Auto-merging fs/namespace.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/Makefile
+CONFLICT (content): Merge conflict in fs/Makefile
+Auto-merging .clang-format
+Resolved 'fs/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3179cc4b12db] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .clang-format | 1 -
+ Documentation/filesystems/mount_api.txt | 709 ++++++++++++++++++++++++++++++++
+ arch/x86/kernel/cpu/resctrl/internal.h | 16 +
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 185 +++++----
+ fs/Kconfig | 7 +
+ fs/Makefile | 2 +-
+ fs/afs/internal.h | 9 +-
+ fs/afs/mntpt.c | 149 +++----
+ fs/afs/super.c | 430 +++++++++----------
+ fs/afs/volume.c | 4 +-
+ fs/devpts/inode.c | 1 +
+ fs/filesystems.c | 4 +
+ fs/fs_context.c | 642 +++++++++++++++++++++++++++++
+ fs/fs_parser.c | 447 ++++++++++++++++++++
+ fs/hugetlbfs/inode.c | 358 +++++++++-------
+ fs/internal.h | 13 +-
+ fs/kernfs/kernfs-internal.h | 1 +
+ fs/kernfs/mount.c | 119 ++----
+ fs/mount.h | 5 +
+ fs/namei.c | 4 +-
+ fs/namespace.c | 395 +++++++++++-------
+ fs/orangefs/inode.c | 7 +-
+ fs/pipe.c | 32 +-
+ fs/pnode.c | 5 -
+ fs/pnode.h | 3 +-
+ fs/proc/inode.c | 52 +--
+ fs/proc/internal.h | 5 +-
+ fs/proc/root.c | 236 ++++++++---
+ fs/read_write.c | 10 +-
+ fs/splice.c | 8 +-
+ fs/stat.c | 12 +-
+ fs/super.c | 344 +++++++++++++---
+ fs/sysfs/mount.c | 73 +++-
+ include/linux/errno.h | 1 +
+ include/linux/fs.h | 14 +-
+ include/linux/fs_context.h | 188 +++++++++
+ include/linux/fs_parser.h | 151 +++++++
+ include/linux/kernfs.h | 39 +-
+ include/linux/lsm_hooks.h | 21 +
+ include/linux/mount.h | 3 +
+ include/linux/pipe_fs_i.h | 8 +-
+ include/linux/security.h | 18 +-
+ include/linux/uio.h | 8 -
+ ipc/mqueue.c | 94 ++++-
+ ipc/namespace.c | 2 +-
+ kernel/cgroup/cgroup-internal.h | 49 ++-
+ kernel/cgroup/cgroup-v1.c | 394 +++++++++---------
+ kernel/cgroup/cgroup.c | 223 ++++++----
+ kernel/cgroup/cpuset.c | 56 ++-
+ kernel/relay.c | 1 -
+ kernel/trace/trace.c | 2 -
+ lib/iov_iter.c | 17 +-
+ net/smc/smc_rx.c | 1 -
+ security/security.c | 10 +
+ security/selinux/hooks.c | 88 +++-
+ security/selinux/include/security.h | 10 +-
+ security/smack/smack.h | 19 +-
+ security/smack/smack_lsm.c | 92 ++++-
+ 58 files changed, 4424 insertions(+), 1373 deletions(-)
+ create mode 100644 Documentation/filesystems/mount_api.txt
+ create mode 100644 fs/fs_context.c
+ create mode 100644 fs/fs_parser.c
+ create mode 100644 include/linux/fs_context.h
+ create mode 100644 include/linux/fs_parser.h
+Merging printk/for-next (b60706644282 lib/vsprintf: Remove %pCr remnant in comment)
+$ git merge printk/for-next
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/printk/printk.c
+Merge made by the 'recursive' strategy.
+ kernel/printk/printk.c | 84 +++++++++++++++++++++++++++++++++++++++++---------
+ lib/Kconfig.debug | 17 ++++++++++
+ lib/vsprintf.c | 1 -
+ 3 files changed, 86 insertions(+), 16 deletions(-)
+Merging pci/next (68e9f622555b Merge branch 'remotes/lorenzo/pci/vmd')
+$ git merge pci/next
+Auto-merging drivers/spi/spi-topcliff-pch.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/controller/dwc/pci-imx6.c
+Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 18 +-
+ .../devicetree/bindings/pci/layerscape-pci.txt | 3 +
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 4 +-
+ Documentation/devicetree/bindings/pci/ti-pci.txt | 11 +-
+ MAINTAINERS | 2 +-
+ arch/arm/boot/dts/imx7d.dtsi | 9 +
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 34 +++-
+ arch/x86/hyperv/hv_init.c | 1 +
+ arch/x86/pci/fixup.c | 16 ++
+ drivers/dma/pch_dma.c | 1 -
+ drivers/gpio/gpio-ml-ioh.c | 2 -
+ drivers/gpio/gpio-pch.c | 1 -
+ drivers/i2c/busses/i2c-eg20t.c | 1 -
+ drivers/misc/pch_phub.c | 1 -
+ drivers/misc/pci_endpoint_test.c | 1 +
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 +-
+ drivers/pci/controller/dwc/Kconfig | 4 +-
+ drivers/pci/controller/dwc/Makefile | 2 +-
+ drivers/pci/controller/dwc/pci-dra7xx.c | 94 +++++++++
+ drivers/pci/controller/dwc/pci-imx6.c | 224 +++++++++++++++++++--
+ drivers/pci/controller/dwc/pci-layerscape-ep.c | 156 ++++++++++++++
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 16 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 113 +++++------
+ drivers/pci/controller/dwc/pcie-designware-plat.c | 19 +-
+ drivers/pci/controller/dwc/pcie-designware.c | 6 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 60 +++---
+ drivers/pci/controller/dwc/pcie-qcom.c | 2 +-
+ drivers/pci/controller/pci-aardvark.c | 2 +-
+ drivers/pci/controller/pci-hyperv.c | 59 +++---
+ drivers/pci/controller/pci-mvebu.c | 2 +-
+ drivers/pci/controller/pcie-cadence-ep.c | 25 +--
+ drivers/pci/controller/pcie-rockchip-ep.c | 16 +-
+ drivers/pci/controller/vmd.c | 15 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 97 +++++----
+ drivers/pci/endpoint/pci-epc-core.c | 53 +++++
+ drivers/pci/endpoint/pci-epf-core.c | 4 +-
+ drivers/pci/hotplug/ibmphp.h | 1 -
+ drivers/pci/hotplug/ibmphp_core.c | 2 -
+ drivers/pci/hotplug/ibmphp_hpc.c | 47 ++---
+ drivers/pci/hotplug/pciehp_hpc.c | 21 +-
+ drivers/pci/of.c | 2 +-
+ drivers/pci/pci-bridge-emul.c | 86 +++++---
+ drivers/pci/pci-bridge-emul.h | 13 +-
+ drivers/pci/pci-driver.c | 4 +-
+ drivers/pci/pci.c | 82 +++++++-
+ drivers/pci/pcie/aer.c | 9 +-
+ drivers/pci/pcie/dpc.c | 27 ++-
+ drivers/pci/pcie/pme.c | 27 ---
+ drivers/pci/pcie/portdrv_pci.c | 8 +-
+ drivers/pci/probe.c | 120 +++++++++--
+ drivers/pci/quirks.c | 4 +-
+ drivers/pci/setup-bus.c | 63 ++----
+ drivers/spi/spi-topcliff-pch.c | 1 -
+ drivers/tty/serial/pch_uart.c | 2 -
+ drivers/usb/gadget/udc/pch_udc.c | 1 -
+ include/linux/msi.h | 12 +-
+ include/linux/pci-epc.h | 31 ++-
+ include/linux/pci.h | 3 +
+ include/linux/pci_ids.h | 4 +
+ 59 files changed, 1213 insertions(+), 438 deletions(-)
+ create mode 100644 drivers/pci/controller/dwc/pci-layerscape-ep.c
+Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write)
+$ git merge pstore/for-next/pstore
+Merge made by the 'recursive' strategy.
+ fs/pstore/platform.c | 3 +++
+ fs/pstore/ram.c | 64 ++++++++++++++++++++++++----------------------------
+ 2 files changed, 32 insertions(+), 35 deletions(-)
+Merging hid/for-next (c81eee9fb58c Merge branch 'for-5.1/hid-uclogic' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 13 +
+ drivers/hid/Makefile | 5 +
+ drivers/hid/hid-asus.c | 247 ++++-
+ drivers/hid/hid-elan.c | 2 +-
+ drivers/hid/hid-ids.h | 20 +-
+ drivers/hid/hid-input.c | 3 +
+ drivers/hid/hid-kye.c | 83 ++
+ drivers/hid/hid-lg.c | 60 ++
+ drivers/hid/hid-lg4ff.c | 6 +
+ drivers/hid/hid-maltron.c | 165 +++
+ drivers/hid/hid-multitouch.c | 6 +
+ drivers/hid/hid-quirks.c | 33 +-
+ drivers/hid/hid-roccat-kone.c | 1 +
+ drivers/hid/hid-sony.c | 31 +-
+ drivers/hid/hid-steam.c | 34 +-
+ drivers/hid/hid-topseed.c | 3 +
+ drivers/hid/hid-uclogic-core.c | 418 ++++++++
+ drivers/hid/hid-uclogic-params.c | 1122 ++++++++++++++++++++
+ drivers/hid/hid-uclogic-params.h | 207 ++++
+ drivers/hid/{hid-uclogic.c => hid-uclogic-rdesc.c} | 822 ++++++--------
+ drivers/hid/hid-uclogic-rdesc.h | 155 +++
+ drivers/hid/hid-viewsonic.c | 105 ++
+ drivers/hid/i2c-hid/i2c-hid-core.c | 9 +
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 32 +-
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 4 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.h | 6 +-
+ drivers/hid/intel-ish-hid/ishtp/bus.c | 27 +-
+ drivers/hid/intel-ish-hid/ishtp/bus.h | 6 +-
+ drivers/hid/intel-ish-hid/ishtp/client.h | 2 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 97 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.h | 2 +-
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 -
+ drivers/hid/wacom_sys.c | 32 +
+ drivers/hid/wacom_wac.c | 24 +-
+ 35 files changed, 3049 insertions(+), 739 deletions(-)
+ create mode 100644 drivers/hid/hid-maltron.c
+ create mode 100644 drivers/hid/hid-uclogic-core.c
+ create mode 100644 drivers/hid/hid-uclogic-params.c
+ create mode 100644 drivers/hid/hid-uclogic-params.h
+ rename drivers/hid/{hid-uclogic.c => hid-uclogic-rdesc.c} (67%)
+ create mode 100644 drivers/hid/hid-uclogic-rdesc.h
+ create mode 100644 drivers/hid/hid-viewsonic.c
+Merging i2c/i2c/for-next (a8219c9b6988 Merge branch 'i2c/for-5.1' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Removing include/linux/platform_data/i2c-cbus-gpio.h
+Removing include/linux/platform_data/at24.h
+Auto-merging include/linux/acpi.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/eeprom/at24.txt | 3 +
+ Documentation/devicetree/bindings/i2c/i2c-mtk.txt | 1 +
+ .../devicetree/bindings/i2c/i2c-xscale.txt | 20 +
+ Documentation/i2c/fault-codes | 4 +
+ Documentation/i2c/gpio-fault-injection | 61 +-
+ MAINTAINERS | 1 -
+ arch/arm/mach-omap1/board-nokia770.c | 18 +-
+ drivers/i2c/algos/i2c-algo-bit.c | 25 +-
+ drivers/i2c/busses/i2c-aspeed.c | 120 +++-
+ drivers/i2c/busses/i2c-brcmstb.c | 13 +-
+ drivers/i2c/busses/i2c-cbus-gpio.c | 80 +--
+ drivers/i2c/busses/i2c-designware-core.h | 2 +
+ drivers/i2c/busses/i2c-designware-master.c | 6 +
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 7 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 3 +
+ drivers/i2c/busses/i2c-exynos5.c | 11 +-
+ drivers/i2c/busses/i2c-gpio.c | 134 +++-
+ drivers/i2c/busses/i2c-imx.c | 37 +-
+ drivers/i2c/busses/i2c-iop3xx.c | 8 +
+ drivers/i2c/busses/i2c-mt65xx.c | 6 +-
+ drivers/i2c/busses/i2c-ocores.c | 308 +++++++--
+ drivers/i2c/busses/i2c-rcar.c | 49 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 8 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 121 ++--
+ drivers/i2c/busses/i2c-sprd.c | 34 +-
+ drivers/i2c/busses/i2c-synquacer.c | 5 -
+ drivers/i2c/busses/i2c-tegra.c | 740 ++++++++++++++++++---
+ drivers/i2c/busses/i2c-zx2967.c | 8 +-
+ drivers/i2c/i2c-core-base.c | 12 +-
+ drivers/i2c/i2c-core-of.c | 14 +-
+ drivers/i2c/i2c-core-smbus.c | 2 +-
+ drivers/i2c/i2c-dev.c | 2 +-
+ drivers/misc/eeprom/at24.c | 169 +++--
+ include/linux/acpi.h | 11 -
+ include/linux/i2c-algo-bit.h | 33 +-
+ include/linux/i2c.h | 45 ++
+ include/linux/platform_data/at24.h | 60 --
+ include/linux/platform_data/i2c-cbus-gpio.h | 27 -
+ include/linux/platform_data/i2c-ocores.h | 6 +-
+ include/trace/events/smbus.h | 6 +-
+ 40 files changed, 1560 insertions(+), 660 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-xscale.txt
+ delete mode 100644 include/linux/platform_data/at24.h
+ delete mode 100644 include/linux/platform_data/i2c-cbus-gpio.h
+Merging i3c/i3c/next (988bb4a1937b i3c: master: dw-i3c-master: mark expected switch fall-through)
+$ git merge i3c/i3c/next
+Auto-merging drivers/i3c/master/dw-i3c-master.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/i3c/master/dw-i3c-master.c | 1 +
+ 2 files changed, 2 insertions(+)
+Merging dmi/master (57361846b52b Linux 4.19-rc2)
+$ git merge dmi/master
+Already up to date.
+Merging hwmon-staging/hwmon-next (985e225142cf dt-bindings: hwmon: Add missing documentation for lm75)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hwmon/ad741x.txt | 15 +
+ .../devicetree/bindings/hwmon/dps650ab.txt | 11 +
+ .../devicetree/bindings/hwmon/hih6130.txt | 12 +
+ .../devicetree/bindings/hwmon/ina3221.txt | 10 +
+ Documentation/devicetree/bindings/hwmon/lm75.txt | 37 ++
+ .../devicetree/bindings/hwmon/pwm-fan.txt | 3 +
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/hwmon/lm85 | 9 +-
+ drivers/hwmon/ad7418.c | 78 ++-
+ drivers/hwmon/adm1029.c | 67 +--
+ drivers/hwmon/adt7462.c | 4 +
+ drivers/hwmon/dell-smm-hwmon.c | 97 +++-
+ drivers/hwmon/f71882fg.c | 2 +-
+ drivers/hwmon/gl518sm.c | 120 ++--
+ drivers/hwmon/gl520sm.c | 184 +++---
+ drivers/hwmon/gpio-fan.c | 2 +-
+ drivers/hwmon/hih6130.c | 21 +-
+ drivers/hwmon/hwmon.c | 4 +-
+ drivers/hwmon/i5500_temp.c | 14 +-
+ drivers/hwmon/i5k_amb.c | 12 +-
+ drivers/hwmon/ibmaem.c | 15 +-
+ drivers/hwmon/ibmpex.c | 14 +-
+ drivers/hwmon/iio_hwmon.c | 2 +-
+ drivers/hwmon/ina209.c | 151 +++--
+ drivers/hwmon/ina3221.c | 36 +-
+ drivers/hwmon/jc42.c | 8 +-
+ drivers/hwmon/k8temp.c | 12 +-
+ drivers/hwmon/lineage-pem.c | 77 ++-
+ drivers/hwmon/lm73.c | 34 +-
+ drivers/hwmon/lm75.c | 6 +-
+ drivers/hwmon/lm77.c | 45 +-
+ drivers/hwmon/lm80.c | 138 ++---
+ drivers/hwmon/lm83.c | 62 +-
+ drivers/hwmon/lm85.c | 43 +-
+ drivers/hwmon/lm90.c | 12 +-
+ drivers/hwmon/lm92.c | 39 +-
+ drivers/hwmon/lm93.c | 630 +++++++++------------
+ drivers/hwmon/lm95241.c | 8 +-
+ drivers/hwmon/lm95245.c | 8 +-
+ drivers/hwmon/ltc2990.c | 32 +-
+ drivers/hwmon/ltc4151.c | 11 +-
+ drivers/hwmon/ltc4222.c | 56 +-
+ drivers/hwmon/ltc4245.c | 8 +-
+ drivers/hwmon/ltc4261.c | 28 +-
+ drivers/hwmon/max16065.c | 225 +++-----
+ drivers/hwmon/max1619.c | 33 +-
+ drivers/hwmon/max31722.c | 8 +-
+ drivers/hwmon/max31790.c | 6 +-
+ drivers/hwmon/max6639.c | 92 ++-
+ drivers/hwmon/max6642.c | 31 +-
+ drivers/hwmon/max6650.c | 6 +-
+ drivers/hwmon/mc13783-adc.c | 49 +-
+ drivers/hwmon/nct7904.c | 10 +-
+ drivers/hwmon/nsa320-hwmon.c | 8 +-
+ drivers/hwmon/ntc_thermistor.c | 106 ++--
+ drivers/hwmon/occ/common.c | 3 +-
+ drivers/hwmon/occ/common.h | 3 +-
+ drivers/hwmon/occ/p8_i2c.c | 3 +-
+ drivers/hwmon/occ/p9_sbe.c | 3 +-
+ drivers/hwmon/occ/sysfs.c | 13 +-
+ drivers/hwmon/pc87360.c | 427 +++++++-------
+ drivers/hwmon/pc87427.c | 317 +++++------
+ drivers/hwmon/pmbus/pmbus.c | 64 ++-
+ drivers/hwmon/powr1220.c | 144 ++---
+ drivers/hwmon/pwm-fan.c | 43 +-
+ drivers/hwmon/sch5627.c | 146 ++---
+ drivers/hwmon/sch5636.c | 202 +++----
+ drivers/hwmon/scmi-hwmon.c | 2 +-
+ drivers/hwmon/scpi-hwmon.c | 4 +-
+ drivers/hwmon/sht15.c | 34 +-
+ drivers/hwmon/sht21.c | 17 +-
+ drivers/hwmon/sht3x.c | 50 +-
+ drivers/hwmon/smsc47b397.c | 24 +-
+ drivers/hwmon/stts751.c | 64 +--
+ drivers/hwmon/tc654.c | 60 +-
+ drivers/hwmon/tc74.c | 4 +-
+ drivers/hwmon/tmp102.c | 4 +-
+ drivers/hwmon/tmp103.c | 20 +-
+ drivers/hwmon/tmp421.c | 4 +-
+ drivers/hwmon/vexpress-hwmon.c | 25 +-
+ drivers/hwmon/via-cputemp.c | 15 +-
+ 81 files changed, 2178 insertions(+), 2270 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/ad741x.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/lm75.txt
+Merging jc_docs/docs-next (19c3fe285cba docs: Explicitly state that the 'Fixes:' tag shouldn't split lines)
+$ git merge jc_docs/docs-next
+Auto-merging security/selinux/hooks.c
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/module.h
+Removing Documentation/security/SELinux-sctp.rst
+Auto-merging Documentation/networking/index.rst
+Removing Documentation/networking/checksum-offloads.txt
+Auto-merging Documentation/filesystems/sysfs.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/DMA-API.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API.txt | 6 +-
+ Documentation/DMA-ISA-LPC.txt | 4 +-
+ Documentation/admin-guide/README.rst | 2 +-
+ Documentation/admin-guide/kernel-parameters.txt | 13 +-
+ Documentation/admin-guide/perf-security.rst | 253 ++++--
+ Documentation/admin-guide/tainted-kernels.rst | 159 +++-
+ Documentation/cgroup-v1/memory.txt | 7 +-
+ Documentation/core-api/kernel-api.rst | 4 -
+ Documentation/core-api/memory-allocation.rst | 10 +-
+ Documentation/core-api/mm-api.rst | 2 +-
+ Documentation/dev-tools/kcov.rst | 2 +-
+ Documentation/doc-guide/kernel-doc.rst | 17 +-
+ Documentation/doc-guide/sphinx.rst | 12 +-
+ Documentation/driver-api/dmaengine/client.rst | 7 +
+ Documentation/fault-injection/fault-injection.txt | 2 +-
+ Documentation/filesystems/binderfs.rst | 68 ++
+ Documentation/filesystems/index.rst | 7 +
+ Documentation/filesystems/path-lookup.rst | 24 +-
+ Documentation/filesystems/sysfs.txt | 21 +
+ Documentation/hwmon/f71882fg | 2 +-
+ Documentation/index.rst | 1 +
+ Documentation/input/devices/xpad.rst | 2 +-
+ Documentation/laptops/lg-laptop.rst | 4 +-
+ Documentation/misc-devices/ibmvmc.rst | 1 +
+ Documentation/misc-devices/index.rst | 17 +
+ Documentation/networking/checksum-offloads.rst | 143 ++++
+ Documentation/networking/checksum-offloads.txt | 122 ---
+ Documentation/networking/index.rst | 3 +
+ .../networking/{scaling.txt => scaling.rst} | 131 ++--
+ ...tion-offloads.txt => segmentation-offloads.rst} | 48 +-
+ Documentation/process/coding-style.rst | 97 ++-
+ Documentation/process/howto.rst | 12 +-
+ Documentation/process/kernel-docs.rst | 2 +-
+ Documentation/process/license-rules.rst | 66 +-
+ Documentation/process/stable-api-nonsense.rst | 15 +-
+ Documentation/process/stable-kernel-rules.rst | 9 +-
+ Documentation/process/submitting-patches.rst | 6 +-
+ Documentation/security/LSM.rst | 5 +-
+ Documentation/security/{LSM-sctp.rst => SCTP.rst} | 180 ++++-
+ Documentation/security/SELinux-sctp.rst | 158 ----
+ Documentation/security/index.rst | 3 +-
+ Documentation/static-keys.txt | 2 +-
+ Documentation/sysctl/kernel.txt | 50 +-
+ Documentation/sysctl/vm.txt | 2 +-
+ Documentation/timers/highres.txt | 2 +-
+ .../translations/it_IT/doc-guide/sphinx.rst | 2 +
+ .../it_IT/process/applying-patches.rst | 12 +-
+ .../translations/it_IT/process/changes.rst | 487 +++++++++++-
+ .../translations/it_IT/process/coding-style.rst | 103 ++-
+ Documentation/translations/it_IT/process/howto.rst | 13 +-
+ .../it_IT/process/stable-api-nonsense.rst | 202 ++++-
+ .../it_IT/process/submit-checklist.rst | 127 ++-
+ .../it_IT/process/submitting-drivers.rst | 8 +-
+ .../it_IT/process/submitting-patches.rst | 862 ++++++++++++++++++++-
+ Documentation/translations/ja_JP/howto.rst | 12 +-
+ Documentation/translations/ko_KR/howto.rst | 56 +-
+ Documentation/translations/zh_CN/HOWTO | 9 -
+ Documentation/translations/zh_CN/coding-style.rst | 57 +-
+ Documentation/vm/index.rst | 2 +-
+ Documentation/vm/slub.rst | 4 +-
+ LICENSES/exceptions/GCC-exception-2.0 | 18 +
+ include/linux/module.h | 18 +-
+ include/linux/skbuff.h | 2 +-
+ samples/Kconfig | 7 +
+ samples/Makefile | 2 +-
+ samples/binderfs/Makefile | 1 +
+ samples/binderfs/binderfs_example.c | 83 ++
+ scripts/checkpatch.pl | 13 -
+ scripts/kernel-doc | 2 +-
+ scripts/spdxcheck.py | 8 +-
+ security/selinux/hooks.c | 2 +-
+ tools/Makefile | 14 +-
+ tools/debugging/Makefile | 16 +
+ tools/debugging/kernel-chktaint | 202 +++++
+ 74 files changed, 3316 insertions(+), 731 deletions(-)
+ create mode 100644 Documentation/filesystems/binderfs.rst
+ create mode 100644 Documentation/misc-devices/index.rst
+ create mode 100644 Documentation/networking/checksum-offloads.rst
+ delete mode 100644 Documentation/networking/checksum-offloads.txt
+ rename Documentation/networking/{scaling.txt => scaling.rst} (92%)
+ rename Documentation/networking/{segmentation-offloads.txt => segmentation-offloads.rst} (88%)
+ rename Documentation/security/{LSM-sctp.rst => SCTP.rst} (52%)
+ delete mode 100644 Documentation/security/SELinux-sctp.rst
+ create mode 100644 LICENSES/exceptions/GCC-exception-2.0
+ create mode 100644 samples/binderfs/Makefile
+ create mode 100644 samples/binderfs/binderfs_example.c
+ create mode 100644 tools/debugging/Makefile
+ create mode 100755 tools/debugging/kernel-chktaint
+Merging v4l-dvb/master (26b190053ec0 media: a few more typos at staging, pci, platform, radio and usb)
+$ git merge v4l-dvb/master
+Removing include/media/drv-intf/sh_mobile_ceu.h
+Removing include/linux/platform_data/media/soc_camera_platform.h
+Removing drivers/staging/media/imx074/TODO
+Removing drivers/staging/media/imx074/Makefile
+Removing drivers/staging/media/imx074/Kconfig
+Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
+Removing drivers/media/platform/soc_camera/soc_scale_crop.h
+Removing drivers/media/platform/soc_camera/soc_scale_crop.c
+Removing drivers/media/platform/soc_camera/soc_camera_platform.c
+CONFLICT (modify/delete): drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c left in tree.
+Removing drivers/media/platform/soc_camera/Makefile
+Removing drivers/media/platform/soc_camera/Kconfig
+Removing drivers/media/i2c/soc_camera/soc_tw9910.c
+Removing drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c
+Removing drivers/media/i2c/soc_camera/soc_ov772x.c
+Removing drivers/media/i2c/soc_camera/soc_mt9t112.c
+Removing drivers/media/i2c/soc_camera/Makefile
+Auto-merging arch/sh/boards/mach-migor/setup.c
+Auto-merging MAINTAINERS
+Removing Documentation/media/uapi/v4l/dev-teletext.rst
+Removing Documentation/media/uapi/v4l/dev-effect.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c: needs merge
+rm 'drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c'
+$ git commit -v -a
+[master f6194e2f17ed] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/media/i2c/adv748x.txt | 11 +-
+ .../bindings/media/i2c/melexis,mlx90640.txt | 20 +
+ .../devicetree/bindings/media/i2c/mt9m001.txt | 38 +
+ .../devicetree/bindings/media/i2c/ov5645.txt | 6 +-
+ .../devicetree/bindings/media/imx7-csi.txt | 45 +
+ .../devicetree/bindings/media/imx7-mipi-csi2.txt | 90 +
+ .../devicetree/bindings/media/mediatek-vcodec.txt | 13 +
+ .../devicetree/bindings/media/rcar_vin.txt | 9 +-
+ .../devicetree/bindings/media/renesas,fcp.txt | 5 +-
+ .../bindings/media/renesas,rcar-csi2.txt | 3 +-
+ .../devicetree/bindings/media/renesas,vsp1.txt | 6 +-
+ Documentation/devicetree/bindings/media/si470x.txt | 26 +
+ .../devicetree/bindings/media/sun6i-csi.txt | 3 +-
+ Documentation/media/dvb-drivers/dvb-usb.rst | 2 +-
+ Documentation/media/kapi/dtv-core.rst | 2 +-
+ Documentation/media/kapi/dtv-frontend.rst | 2 +-
+ Documentation/media/kapi/mc-core.rst | 2 +-
+ Documentation/media/kapi/v4l2-device.rst | 2 +-
+ Documentation/media/kapi/v4l2-intro.rst | 2 +-
+ Documentation/media/kapi/v4l2-subdev.rst | 4 +-
+ Documentation/media/lirc.h.rst.exceptions | 3 +
+ .../media/uapi/dvb/audio-set-bypass-mode.rst | 2 +-
+ Documentation/media/uapi/dvb/ca-set-descr.rst | 2 +-
+ Documentation/media/uapi/dvb/dmx-qbuf.rst | 2 +-
+ Documentation/media/uapi/dvb/dvbproperty.rst | 2 +-
+ Documentation/media/uapi/dvb/video_types.rst | 2 +-
+ Documentation/media/uapi/fdl-appendix.rst | 2 +-
+ Documentation/media/uapi/mediactl/media-types.rst | 2 +-
+ Documentation/media/uapi/mediactl/request-api.rst | 4 +-
+ Documentation/media/uapi/rc/rc-tables.rst | 4 +-
+ Documentation/media/uapi/v4l/buffer.rst | 11 +-
+ Documentation/media/uapi/v4l/common.rst | 11 +
+ Documentation/media/uapi/v4l/control.rst | 2 +-
+ Documentation/media/uapi/v4l/dev-effect.rst | 28 -
+ .../uapi/v4l/{dev-codec.rst => dev-mem2mem.rst} | 41 +-
+ Documentation/media/uapi/v4l/dev-teletext.rst | 41 -
+ Documentation/media/uapi/v4l/devices.rst | 4 +-
+ Documentation/media/uapi/v4l/ext-ctrls-camera.rst | 508 +++
+ Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 2451 ++++++++++++
+ Documentation/media/uapi/v4l/ext-ctrls-detect.rst | 71 +
+ Documentation/media/uapi/v4l/ext-ctrls-dv.rst | 166 +
+ Documentation/media/uapi/v4l/ext-ctrls-flash.rst | 192 +
+ Documentation/media/uapi/v4l/ext-ctrls-fm-rx.rst | 95 +
+ Documentation/media/uapi/v4l/ext-ctrls-fm-tx.rst | 188 +
+ .../media/uapi/v4l/ext-ctrls-image-process.rst | 63 +
+ .../media/uapi/v4l/ext-ctrls-image-source.rst | 57 +
+ Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst | 113 +
+ .../media/uapi/v4l/ext-ctrls-rf-tuner.rst | 96 +
+ Documentation/media/uapi/v4l/extended-controls.rst | 3905 +-------------------
+ Documentation/media/uapi/v4l/meta-formats.rst | 2 +-
+ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 2 +-
+ .../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 144 +-
+ Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 170 +-
+ Documentation/media/uapi/v4l/subdev-formats.rst | 6 +-
+ Documentation/media/uapi/v4l/vidioc-g-parm.rst | 2 +-
+ .../media/uapi/v4l/vidioc-prepare-buf.rst | 5 +-
+ Documentation/media/uapi/v4l/vidioc-qbuf.rst | 2 +-
+ Documentation/media/v4l-drivers/bttv.rst | 4 +-
+ Documentation/media/v4l-drivers/imx.rst | 107 +-
+ Documentation/media/v4l-drivers/imx7.rst | 162 +
+ Documentation/media/v4l-drivers/index.rst | 1 +
+ Documentation/media/v4l-drivers/ipu3.rst | 151 +-
+ Documentation/media/v4l-drivers/pxa_camera.rst | 2 +-
+ Documentation/media/v4l-drivers/qcom_camss.rst | 2 +-
+ MAINTAINERS | 34 +-
+ arch/sh/boards/mach-migor/setup.c | 1 +
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 26 +-
+ drivers/gpu/ipu-v3/ipu-csi.c | 126 +-
+ drivers/media/cec/cec-api.c | 2 +-
+ drivers/media/common/saa7146/saa7146_fops.c | 2 +-
+ drivers/media/common/saa7146/saa7146_i2c.c | 5 +-
+ drivers/media/common/saa7146/saa7146_video.c | 2 +-
+ drivers/media/common/siano/sms-cards.c | 2 +-
+ drivers/media/common/siano/smscoreapi.h | 2 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 12 +
+ drivers/media/common/videobuf2/videobuf2-core.c | 53 +-
+ drivers/media/common/videobuf2/videobuf2-dma-sg.c | 4 +-
+ drivers/media/common/videobuf2/videobuf2-memops.c | 2 +-
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 30 +-
+ drivers/media/dvb-core/dmxdev.c | 8 +-
+ drivers/media/dvb-core/dvb_ca_en50221.c | 5 +-
+ drivers/media/dvb-core/dvb_frontend.c | 2 +-
+ drivers/media/dvb-core/dvbdev.c | 2 +-
+ drivers/media/dvb-frontends/cxd2841er.c | 2 +-
+ drivers/media/dvb-frontends/dib0090.c | 2 +-
+ drivers/media/dvb-frontends/dib7000m.c | 4 +-
+ drivers/media/dvb-frontends/dib7000p.c | 8 +-
+ drivers/media/dvb-frontends/dib8000.c | 12 +-
+ drivers/media/dvb-frontends/dib9000.c | 4 +-
+ .../media/dvb-frontends/drx39xyj/drx_dap_fasi.h | 8 +-
+ drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 8 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 48 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.h | 12 +-
+ drivers/media/dvb-frontends/drxd_firm.c | 2 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 30 +-
+ drivers/media/dvb-frontends/drxk.h | 2 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 8 +-
+ drivers/media/dvb-frontends/ds3000.c | 4 +-
+ drivers/media/dvb-frontends/isl6421.c | 2 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 5 +-
+ drivers/media/dvb-frontends/lgdt330x.c | 2 +-
+ drivers/media/dvb-frontends/m88rs2000.c | 2 +-
+ drivers/media/dvb-frontends/mt312.c | 4 +-
+ drivers/media/dvb-frontends/nxt200x.c | 4 +-
+ drivers/media/dvb-frontends/or51211.c | 2 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
+ drivers/media/dvb-frontends/s5h1409.c | 2 +-
+ drivers/media/dvb-frontends/sp8870.c | 4 +-
+ drivers/media/dvb-frontends/stb0899_algo.c | 6 +-
+ drivers/media/dvb-frontends/stv0367_defs.h | 2 +-
+ drivers/media/dvb-frontends/stv0900_core.c | 4 +-
+ drivers/media/dvb-frontends/stv0910.c | 4 +-
+ drivers/media/dvb-frontends/stv6110.c | 2 +-
+ drivers/media/dvb-frontends/tda1004x.h | 2 +-
+ drivers/media/dvb-frontends/tda10086.c | 2 +-
+ drivers/media/dvb-frontends/tda18271c2dd.c | 6 +-
+ drivers/media/i2c/Kconfig | 36 +-
+ drivers/media/i2c/Makefile | 4 +-
+ drivers/media/i2c/adv7175.c | 2 +-
+ drivers/media/i2c/adv748x/adv748x-afe.c | 2 +-
+ drivers/media/i2c/adv748x/adv748x-core.c | 335 +-
+ drivers/media/i2c/adv748x/adv748x-csi2.c | 64 +-
+ drivers/media/i2c/adv748x/adv748x-hdmi.c | 2 +-
+ drivers/media/i2c/adv748x/adv748x.h | 28 +-
+ drivers/media/i2c/adv7842.c | 10 +-
+ drivers/media/i2c/bt819.c | 4 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 3 +-
+ drivers/media/i2c/cx25840/cx25840-core.h | 3 +-
+ drivers/media/i2c/cx25840/cx25840-ir.c | 4 +-
+ drivers/media/i2c/dw9714.c | 2 +-
+ drivers/media/i2c/et8ek8/et8ek8_mode.c | 2 +-
+ drivers/media/i2c/imx214.c | 2 +-
+ drivers/media/i2c/imx274.c | 24 +-
+ drivers/media/i2c/lm3560.c | 2 +-
+ drivers/media/i2c/lm3646.c | 2 +-
+ drivers/media/i2c/m5mols/m5mols.h | 2 +-
+ drivers/media/i2c/m5mols/m5mols_core.c | 2 +-
+ drivers/media/i2c/msp3400-driver.c | 2 +-
+ .../i2c/{soc_camera/soc_mt9m001.c => mt9m001.c} | 457 ++-
+ drivers/media/i2c/mt9m111.c | 39 +
+ drivers/media/i2c/mt9t112.c | 2 +-
+ drivers/media/i2c/ov2640.c | 45 +-
+ drivers/media/i2c/ov5640.c | 159 +-
+ drivers/media/i2c/ov6650.c | 4 +-
+ drivers/media/i2c/ov7670.c | 201 +-
+ drivers/media/i2c/ov7740.c | 9 +-
+ drivers/media/i2c/ov8856.c | 1268 +++++++
+ .../i2c/{soc_camera/soc_ov9640.c => ov9640.c} | 123 +-
+ drivers/media/i2c/{soc_camera => }/ov9640.h | 7 +-
+ drivers/media/i2c/ov9650.c | 4 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/i2c/s5k4ecgx.c | 2 -
+ drivers/media/i2c/s5k6aa.c | 2 +-
+ drivers/media/i2c/saa7115.c | 2 +-
+ drivers/media/i2c/saa717x.c | 2 +-
+ drivers/media/i2c/soc_camera/Makefile | 10 -
+ drivers/media/i2c/soc_camera/soc_mt9t112.c | 1157 ------
+ drivers/media/i2c/soc_camera/soc_ov772x.c | 1123 ------
+ drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c | 1415 -------
+ drivers/media/i2c/soc_camera/soc_tw9910.c | 999 -----
+ drivers/media/i2c/tda1997x.c | 4 +
+ drivers/media/i2c/tda1997x_regs.h | 2 +-
+ drivers/media/i2c/tda9840.c | 2 +-
+ drivers/media/i2c/tea6415c.c | 2 +-
+ drivers/media/i2c/tea6420.c | 2 +-
+ drivers/media/i2c/tvaudio.c | 4 +-
+ drivers/media/i2c/tvp514x.c | 2 +-
+ drivers/media/i2c/tw9910.c | 29 +-
+ drivers/media/i2c/video-i2c.c | 110 +-
+ drivers/media/media-request.c | 3 +-
+ drivers/media/pci/bt8xx/bttv-audio-hook.c | 2 +-
+ drivers/media/pci/bt8xx/bttv-audio-hook.h | 2 +-
+ drivers/media/pci/bt8xx/bttv-cards.c | 12 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 12 +-
+ drivers/media/pci/bt8xx/bttv-risc.c | 2 +-
+ drivers/media/pci/bt8xx/bttv.h | 2 +-
+ drivers/media/pci/bt8xx/dst.c | 22 +-
+ drivers/media/pci/cobalt/cobalt-v4l2.c | 2 +-
+ drivers/media/pci/cx18/cx18-cards.h | 2 +-
+ drivers/media/pci/cx18/cx18-dvb.c | 6 +-
+ drivers/media/pci/cx18/cx18-fileops.c | 2 +-
+ drivers/media/pci/cx18/cx18-io.h | 2 +-
+ drivers/media/pci/cx18/cx18-mailbox.c | 2 +-
+ drivers/media/pci/cx18/cx18-vbi.c | 2 +-
+ drivers/media/pci/cx18/cx23418.h | 2 +-
+ drivers/media/pci/cx23885/cx23885-417.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-alsa.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-core.c | 6 +-
+ drivers/media/pci/cx23885/cx23885.h | 2 +-
+ drivers/media/pci/cx23885/cx23888-ir.c | 4 +-
+ drivers/media/pci/cx25821/cx25821-alsa.c | 2 +-
+ drivers/media/pci/cx25821/cx25821-sram.h | 2 +-
+ drivers/media/pci/cx25821/cx25821.h | 2 +-
+ drivers/media/pci/dm1105/dm1105.c | 2 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 7 +-
+ drivers/media/pci/ivtv/Kconfig | 23 +-
+ drivers/media/pci/ivtv/ivtv-yuv.c | 2 +-
+ drivers/media/pci/ivtv/ivtvfb.c | 16 +-
+ drivers/media/pci/meye/meye.c | 8 +-
+ drivers/media/pci/meye/meye.h | 4 +-
+ drivers/media/pci/ngene/ngene-core.c | 2 +-
+ drivers/media/pci/pt3/pt3.h | 2 +-
+ drivers/media/pci/saa7134/saa7134-cards.c | 2 +-
+ drivers/media/pci/saa7146/mxb.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-api.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-cards.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-dvb.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-fw.c | 2 +-
+ drivers/media/pci/smipcie/smipcie-ir.c | 132 +-
+ drivers/media/pci/smipcie/smipcie.h | 1 -
+ drivers/media/pci/solo6x10/solo6x10-disp.c | 4 +-
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
+ drivers/media/pci/ttpci/av7110.c | 6 +-
+ drivers/media/pci/tw68/tw68-video.c | 2 +-
+ drivers/media/platform/Kconfig | 5 +-
+ drivers/media/platform/Makefile | 2 -
+ drivers/media/platform/aspeed-video.c | 1 +
+ drivers/media/platform/atmel/atmel-isi.c | 4 +-
+ drivers/media/platform/coda/coda-bit.c | 24 +-
+ drivers/media/platform/coda/coda-common.c | 13 +-
+ drivers/media/platform/coda/coda-jpeg.c | 2 +-
+ drivers/media/platform/coda/coda.h | 2 +
+ drivers/media/platform/davinci/isif.c | 4 +-
+ drivers/media/platform/davinci/vpbe.c | 2 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 2 +-
+ drivers/media/platform/davinci/vpif.c | 2 +-
+ drivers/media/platform/davinci/vpif_display.c | 4 +-
+ .../media/platform/exynos4-is/fimc-is-command.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-is-param.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-is.c | 16 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 4 +-
+ drivers/media/platform/exynos4-is/media-dev.h | 2 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 4 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/imx-pxp.c | 16 +-
+ drivers/media/platform/marvell-ccic/mmp-driver.c | 4 +-
+ drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 40 +-
+ drivers/media/platform/mtk-mdp/mtk_mdp_core.h | 6 +-
+ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 20 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 64 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 163 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 35 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 74 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 104 +-
+ .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 4 +-
+ .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 2 +-
+ drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 2 +-
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 2 +-
+ drivers/media/platform/mx2_emmaprp.c | 6 +-
+ drivers/media/platform/omap/omap_vout.c | 16 +-
+ drivers/media/platform/omap/omap_voutdef.h | 4 +-
+ drivers/media/platform/omap3isp/isp.c | 2 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 4 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 2 +-
+ drivers/media/platform/pxa_camera.c | 10 +-
+ drivers/media/platform/qcom/venus/core.c | 12 +-
+ drivers/media/platform/qcom/venus/core.h | 3 +-
+ drivers/media/platform/qcom/venus/firmware.c | 53 +-
+ drivers/media/platform/qcom/venus/helpers.c | 3 -
+ drivers/media/platform/rcar-vin/rcar-core.c | 26 +-
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 66 +-
+ drivers/media/platform/rcar-vin/rcar-dma.c | 4 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 +-
+ drivers/media/platform/rockchip/rga/rga-hw.c | 6 +-
+ drivers/media/platform/rockchip/rga/rga.c | 6 +-
+ drivers/media/platform/s3c-camif/camif-core.h | 2 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 6 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 63 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 6 +-
+ drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-regs.h | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 -
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 4 +-
+ drivers/media/platform/seco-cec/seco-cec.h | 2 +-
+ drivers/media/platform/sh_veu.c | 4 +-
+ drivers/media/platform/soc_camera/Kconfig | 26 -
+ drivers/media/platform/soc_camera/Makefile | 9 -
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 1809 ---------
+ .../platform/soc_camera/soc_camera_platform.c | 188 -
+ drivers/media/platform/soc_camera/soc_scale_crop.c | 426 ---
+ drivers/media/platform/soc_camera/soc_scale_crop.h | 47 -
+ drivers/media/platform/sti/bdisp/bdisp-debug.c | 34 +-
+ .../media/platform/sti/c8sectpfe/c8sectpfe-core.h | 2 +-
+ drivers/media/platform/sti/delta/delta.h | 2 +-
+ drivers/media/platform/sti/hva/hva-debugfs.c | 36 +-
+ drivers/media/platform/sti/hva/hva-h264.c | 2 +-
+ drivers/media/platform/stm32/stm32-dcmi.c | 2 +-
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 39 +-
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 5 +-
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 3 +
+ drivers/media/platform/ti-vpe/vpdma.c | 14 +-
+ drivers/media/platform/ti-vpe/vpe.c | 2 +-
+ drivers/media/platform/vicodec/codec-fwht.c | 148 +-
+ drivers/media/platform/vicodec/codec-fwht.h | 30 +-
+ drivers/media/platform/vicodec/codec-v4l2-fwht.c | 394 +-
+ drivers/media/platform/vicodec/codec-v4l2-fwht.h | 15 +-
+ drivers/media/platform/vicodec/vicodec-core.c | 658 +++-
+ drivers/media/platform/video-mux.c | 20 +
+ drivers/media/platform/vim2m.c | 478 ++-
+ drivers/media/platform/vimc/Makefile | 3 +-
+ drivers/media/platform/vimc/vimc-capture.c | 26 +-
+ drivers/media/platform/vimc/vimc-common.c | 35 -
+ drivers/media/platform/vimc/vimc-common.h | 17 +-
+ drivers/media/platform/vimc/vimc-core.c | 5 +-
+ drivers/media/platform/vimc/vimc-debayer.c | 26 +-
+ drivers/media/platform/vimc/vimc-scaler.c | 28 +-
+ drivers/media/platform/vimc/vimc-sensor.c | 51 +-
+ drivers/media/platform/vimc/vimc-streamer.c | 188 +
+ drivers/media/platform/vimc/vimc-streamer.h | 38 +
+ drivers/media/platform/vivid/vivid-core.c | 26 +-
+ drivers/media/platform/vivid/vivid-vid-cap.c | 10 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 30 +
+ drivers/media/platform/vivid/vivid-vid-out.c | 57 +-
+ drivers/media/platform/vsp1/vsp1_brx.c | 4 +-
+ drivers/media/platform/vsp1/vsp1_drm.c | 6 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 2 +-
+ drivers/media/platform/xilinx/xilinx-vip.c | 2 +-
+ drivers/media/radio/radio-si476x.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 52 +-
+ drivers/media/radio/si470x/radio-si470x.h | 1 +
+ drivers/media/radio/wl128x/fmdrv.h | 4 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 4 +-
+ drivers/media/rc/Kconfig | 17 +-
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/ati_remote.c | 2 +-
+ drivers/media/rc/ene_ir.c | 2 +-
+ drivers/media/rc/ene_ir.h | 2 +-
+ drivers/media/rc/fintek-cir.h | 2 +-
+ drivers/media/rc/ir-rc6-decoder.c | 2 +
+ drivers/media/rc/ir-rcmm-decoder.c | 254 ++
+ drivers/media/rc/ir-xmp-decoder.c | 2 +-
+ drivers/media/rc/ite-cir.c | 2 +-
+ drivers/media/rc/keymaps/rc-behold-columbus.c | 4 +-
+ drivers/media/rc/keymaps/rc-behold.c | 2 +-
+ drivers/media/rc/keymaps/rc-manli.c | 2 +-
+ .../media/rc/keymaps/rc-powercolor-real-angel.c | 2 +-
+ drivers/media/rc/mceusb.c | 2 +-
+ drivers/media/rc/rc-core-priv.h | 5 +
+ drivers/media/rc/rc-ir-raw.c | 2 +-
+ drivers/media/rc/rc-main.c | 34 +-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/spi/cxd2880-spi.c | 8 +-
+ drivers/media/tuners/mxl5005s.c | 2 +-
+ drivers/media/tuners/qm1d1b0004.h | 2 +-
+ drivers/media/tuners/r820t.c | 4 +-
+ drivers/media/tuners/tda18271-common.c | 10 +-
+ drivers/media/tuners/tda18271-fe.c | 2 +-
+ drivers/media/tuners/tda18271.h | 4 +-
+ drivers/media/tuners/xc4000.c | 4 +-
+ drivers/media/usb/au0828/au0828-core.c | 2 +-
+ drivers/media/usb/au0828/au0828-dvb.c | 2 +-
+ drivers/media/usb/au0828/au0828.h | 2 +-
+ drivers/media/usb/cpia2/cpia2.h | 2 +-
+ drivers/media/usb/cpia2/cpia2_usb.c | 2 +-
+ drivers/media/usb/cpia2/cpia2_v4l.c | 11 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +-
+ drivers/media/usb/dvb-usb/af9005.c | 2 +-
+ drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-init.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 2 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-reg.h | 2 +-
+ drivers/media/usb/gspca/Kconfig | 2 +-
+ drivers/media/usb/gspca/autogain_functions.c | 2 +-
+ drivers/media/usb/gspca/benq.c | 4 +-
+ drivers/media/usb/gspca/cpia1.c | 14 +-
+ drivers/media/usb/gspca/gspca.c | 18 +-
+ drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 8 +-
+ drivers/media/usb/gspca/m5602/m5602_po1030.c | 8 +-
+ drivers/media/usb/gspca/mr97310a.c | 10 +-
+ drivers/media/usb/gspca/ov519.c | 4 +-
+ drivers/media/usb/gspca/ov534.c | 153 +-
+ drivers/media/usb/gspca/pac_common.h | 2 +-
+ drivers/media/usb/gspca/sn9c20x.c | 2 +-
+ drivers/media/usb/gspca/sonixb.c | 4 +-
+ drivers/media/usb/gspca/sonixj.c | 2 +-
+ drivers/media/usb/gspca/spca501.c | 2 +-
+ drivers/media/usb/gspca/sq905.c | 2 +-
+ drivers/media/usb/gspca/sunplus.c | 4 +-
+ drivers/media/usb/gspca/t613.c | 2 +-
+ drivers/media/usb/gspca/touptek.c | 4 +-
+ drivers/media/usb/gspca/w996Xcf.c | 2 +-
+ drivers/media/usb/gspca/zc3xx-reg.h | 2 +-
+ drivers/media/usb/gspca/zc3xx.c | 8 +-
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 14 +-
+ drivers/media/usb/hdpvr/hdpvr.h | 2 +-
+ drivers/media/usb/pwc/pwc-dec23.c | 4 +-
+ drivers/media/usb/pwc/pwc-if.c | 71 +-
+ drivers/media/usb/pwc/pwc-misc.c | 2 +-
+ drivers/media/usb/siano/smsusb.c | 2 +-
+ drivers/media/usb/stk1160/stk1160-core.c | 4 +-
+ drivers/media/usb/stk1160/stk1160-reg.h | 4 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-alsa.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-core.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-i2c.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-stds.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 4 +-
+ drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 2 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +-
+ drivers/media/usb/usbvision/usbvision-core.c | 10 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 4 +-
+ drivers/media/usb/usbvision/usbvision.h | 10 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 2 +-
+ drivers/media/usb/uvc/uvc_driver.c | 16 +-
+ drivers/media/usb/uvc/uvc_video.c | 10 +-
+ drivers/media/usb/uvc/uvcvideo.h | 6 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 6 +-
+ drivers/media/v4l2-core/v4l2-common.c | 10 -
+ drivers/media/v4l2-core/v4l2-ctrls.c | 16 +-
+ drivers/media/v4l2-core/v4l2-event.c | 19 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 16 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 6 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 52 +-
+ drivers/media/v4l2-core/videobuf-core.c | 12 +-
+ drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +-
+ drivers/media/v4l2-core/videobuf-vmalloc.c | 22 +-
+ drivers/staging/media/Kconfig | 6 +-
+ drivers/staging/media/Makefile | 3 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 2 +-
+ drivers/staging/media/davinci_vpfe/dm365_isif.c | 4 +-
+ drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +-
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +-
+ drivers/staging/media/imx/Kconfig | 9 +-
+ drivers/staging/media/imx/Makefile | 4 +
+ drivers/staging/media/imx/TODO | 9 +
+ drivers/staging/media/imx/imx-ic-common.c | 6 +-
+ drivers/staging/media/imx/imx-ic-prp.c | 25 +-
+ drivers/staging/media/imx/imx-ic-prpencvf.c | 91 +-
+ drivers/staging/media/imx/imx-media-capture.c | 119 +-
+ drivers/staging/media/imx/imx-media-csi.c | 230 +-
+ drivers/staging/media/imx/imx-media-dev-common.c | 90 +
+ drivers/staging/media/imx/imx-media-dev.c | 122 +-
+ drivers/staging/media/imx/imx-media-internal-sd.c | 20 +-
+ drivers/staging/media/imx/imx-media-of.c | 6 +-
+ drivers/staging/media/imx/imx-media-utils.c | 47 +-
+ drivers/staging/media/imx/imx-media-vdic.c | 21 +-
+ drivers/staging/media/imx/imx-media.h | 45 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 1369 +++++++
+ drivers/staging/media/imx/imx7-mipi-csis.c | 1160 ++++++
+ drivers/staging/media/imx074/Kconfig | 5 -
+ drivers/staging/media/imx074/Makefile | 1 -
+ drivers/staging/media/imx074/TODO | 5 -
+ drivers/staging/media/ipu3/Makefile | 6 +
+ drivers/staging/media/ipu3/TODO | 7 +-
+ drivers/staging/media/ipu3/include/intel-ipu3.h | 10 +-
+ drivers/staging/media/ipu3/ipu3-abi.h | 2 +-
+ drivers/staging/media/ipu3/ipu3-css-fw.c | 18 +-
+ drivers/staging/media/ipu3/ipu3-css-fw.h | 8 +-
+ drivers/staging/media/ipu3/ipu3-css-params.c | 271 +-
+ drivers/staging/media/ipu3/ipu3-css-params.h | 8 +-
+ drivers/staging/media/ipu3/ipu3-css-pool.c | 32 +-
+ drivers/staging/media/ipu3/ipu3-css-pool.h | 30 +-
+ drivers/staging/media/ipu3/ipu3-css.c | 460 +--
+ drivers/staging/media/ipu3/ipu3-css.h | 92 +-
+ drivers/staging/media/ipu3/ipu3-dmamap.c | 43 +-
+ drivers/staging/media/ipu3/ipu3-dmamap.h | 14 +-
+ drivers/staging/media/ipu3/ipu3-mmu.c | 125 +-
+ drivers/staging/media/ipu3/ipu3-mmu.h | 18 +-
+ drivers/staging/media/ipu3/ipu3-tables.c | 50 +-
+ drivers/staging/media/ipu3/ipu3-tables.h | 54 +-
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 299 +-
+ drivers/staging/media/ipu3/ipu3.c | 97 +-
+ drivers/staging/media/ipu3/ipu3.h | 20 +-
+ drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
+ .../media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +-
+ .../media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +-
+ .../i2c => staging/media}/soc_camera/Kconfig | 46 +-
+ drivers/staging/media/soc_camera/Makefile | 7 +
+ .../staging/media/{imx074 => soc_camera}/imx074.c | 0
+ .../media/{mt9t031 => soc_camera}/mt9t031.c | 0
+ .../media}/soc_camera/soc_camera.c | 4 +-
+ .../media}/soc_camera/soc_mediabus.c | 0
+ .../i2c => staging/media}/soc_camera/soc_mt9v022.c | 0
+ .../i2c => staging/media}/soc_camera/soc_ov5642.c | 0
+ .../i2c => staging/media}/soc_camera/soc_ov9740.c | 0
+ drivers/staging/media/sunxi/cedrus/TODO | 5 -
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 9 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.h | 6 -
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 28 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 23 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 19 +
+ drivers/staging/media/zoran/zoran.h | 2 +-
+ drivers/staging/media/zoran/zoran_card.c | 2 +-
+ drivers/staging/media/zoran/zoran_device.c | 6 +-
+ drivers/staging/media/zoran/zoran_driver.c | 4 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 8 +-
+ include/linux/platform_data/media/si4713.h | 4 +-
+ .../platform_data/media/soc_camera_platform.h | 83 -
+ include/media/davinci/dm355_ccdc.h | 4 +-
+ include/media/davinci/dm644x_ccdc.h | 2 +-
+ include/media/drv-intf/exynos-fimc.h | 2 +-
+ include/media/drv-intf/saa7146.h | 2 +-
+ include/media/drv-intf/saa7146_vv.h | 4 +-
+ include/media/drv-intf/sh_mobile_ceu.h | 29 -
+ include/media/dvb_frontend.h | 8 +-
+ include/media/i2c/tw9910.h | 2 -
+ include/media/mpeg2-ctrls.h | 14 +-
+ include/media/rc-map.h | 18 +-
+ include/media/v4l2-common.h | 9 -
+ include/media/v4l2-ctrls.h | 2 +-
+ include/media/v4l2-event.h | 2 +
+ include/media/v4l2-fwnode.h | 4 +-
+ include/media/v4l2-mem2mem.h | 44 +-
+ include/media/v4l2-subdev.h | 9 +-
+ include/media/videobuf-core.h | 4 +-
+ include/media/videobuf2-core.h | 15 +-
+ include/media/videobuf2-dma-sg.h | 2 +-
+ include/media/videobuf2-v4l2.h | 16 +
+ include/trace/events/pwc.h | 65 +
+ include/uapi/linux/lirc.h | 6 +
+ include/uapi/linux/v4l2-controls.h | 2 +
+ include/uapi/linux/videodev2.h | 26 +-
+ include/video/imx-ipu-v3.h | 8 +-
+ samples/v4l/v4l2-pci-skeleton.c | 8 +-
+ tools/include/uapi/linux/lirc.h | 12 +
+ tools/testing/selftests/ir/ir_loopback.c | 9 +
+ 535 files changed, 15055 insertions(+), 15345 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/melexis,mlx90640.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m001.txt
+ create mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt
+ create mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
+ create mode 100644 Documentation/devicetree/bindings/media/si470x.txt
+ delete mode 100644 Documentation/media/uapi/v4l/dev-effect.rst
+ rename Documentation/media/uapi/v4l/{dev-codec.rst => dev-mem2mem.rst} (50%)
+ delete mode 100644 Documentation/media/uapi/v4l/dev-teletext.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-camera.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-codec.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-detect.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-dv.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-flash.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-fm-rx.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-fm-tx.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-image-process.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-image-source.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst
+ create mode 100644 Documentation/media/uapi/v4l/ext-ctrls-rf-tuner.rst
+ create mode 100644 Documentation/media/v4l-drivers/imx7.rst
+ rename drivers/media/i2c/{soc_camera/soc_mt9m001.c => mt9m001.c} (66%)
+ create mode 100644 drivers/media/i2c/ov8856.c
+ rename drivers/media/i2c/{soc_camera/soc_ov9640.c => ov9640.c} (90%)
+ rename drivers/media/i2c/{soc_camera => }/ov9640.h (96%)
+ delete mode 100644 drivers/media/i2c/soc_camera/Makefile
+ delete mode 100644 drivers/media/i2c/soc_camera/soc_mt9t112.c
+ delete mode 100644 drivers/media/i2c/soc_camera/soc_ov772x.c
+ delete mode 100644 drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c
+ delete mode 100644 drivers/media/i2c/soc_camera/soc_tw9910.c
+ delete mode 100644 drivers/media/platform/soc_camera/Kconfig
+ delete mode 100644 drivers/media/platform/soc_camera/Makefile
+ delete mode 100644 drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+ delete mode 100644 drivers/media/platform/soc_camera/soc_camera_platform.c
+ delete mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.c
+ delete mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.h
+ create mode 100644 drivers/media/platform/vimc/vimc-streamer.c
+ create mode 100644 drivers/media/platform/vimc/vimc-streamer.h
+ create mode 100644 drivers/media/rc/ir-rcmm-decoder.c
+ create mode 100644 drivers/staging/media/imx/imx-media-dev-common.c
+ create mode 100644 drivers/staging/media/imx/imx7-media-csi.c
+ create mode 100644 drivers/staging/media/imx/imx7-mipi-csis.c
+ delete mode 100644 drivers/staging/media/imx074/Kconfig
+ delete mode 100644 drivers/staging/media/imx074/Makefile
+ delete mode 100644 drivers/staging/media/imx074/TODO
+ rename drivers/{media/i2c => staging/media}/soc_camera/Kconfig (54%)
+ create mode 100644 drivers/staging/media/soc_camera/Makefile
+ rename drivers/staging/media/{imx074 => soc_camera}/imx074.c (100%)
+ rename drivers/staging/media/{mt9t031 => soc_camera}/mt9t031.c (100%)
+ rename drivers/{media/platform => staging/media}/soc_camera/soc_camera.c (99%)
+ rename drivers/{media/platform => staging/media}/soc_camera/soc_mediabus.c (100%)
+ rename drivers/{media/i2c => staging/media}/soc_camera/soc_mt9v022.c (100%)
+ rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov5642.c (100%)
+ rename drivers/{media/i2c => staging/media}/soc_camera/soc_ov9740.c (100%)
+ delete mode 100644 include/linux/platform_data/media/soc_camera_platform.h
+ delete mode 100644 include/media/drv-intf/sh_mobile_ceu.h
+ create mode 100644 include/trace/events/pwc.h
+Merging v4l-dvb-next/master (9fabe1d108ca media: ipu3-mmu: fix some kernel-doc macros)
+$ git merge v4l-dvb-next/master
+Already up to date.
+Merging fbdev/fbdev-for-next (4c83c2f75a8f fbdev: omap2: fix warnings in dss core)
+$ git merge fbdev/fbdev-for-next
+Auto-merging kernel/printk/printk.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/display/ssd1307fb.txt | 2 --
+ arch/arm/boot/dts/imx28-cfa10036.dts | 3 +-
+ drivers/video/fbdev/aty/radeon_pm.c | 6 ++--
+ drivers/video/fbdev/cg14.c | 4 +--
+ drivers/video/fbdev/cg3.c | 2 +-
+ drivers/video/fbdev/chipsfb.c | 3 +-
+ drivers/video/fbdev/core/fb_cmdline.c | 23 ++++++-------
+ drivers/video/fbdev/core/fbcon.c | 14 +++++---
+ drivers/video/fbdev/core/fbmem.c | 3 ++
+ drivers/video/fbdev/core/fbmon.c | 2 ++
+ drivers/video/fbdev/ffb.c | 2 +-
+ drivers/video/fbdev/geode/gxfb_core.c | 13 ++-----
+ drivers/video/fbdev/geode/lxfb_core.c | 13 ++-----
+ drivers/video/fbdev/imsttfb.c | 4 +--
+ drivers/video/fbdev/mbx/mbxdebugfs.c | 40 +++++++---------------
+ drivers/video/fbdev/mbx/mbxfb.c | 2 +-
+ drivers/video/fbdev/offb.c | 4 ++-
+ drivers/video/fbdev/omap2/omapfb/dss/core.c | 34 ++++--------------
+ drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 4 +--
+ drivers/video/fbdev/omap2/omapfb/dss/dss.h | 2 +-
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 2 +-
+ drivers/video/fbdev/ssd1307fb.c | 4 +--
+ drivers/video/fbdev/via/viafbdev.c | 2 +-
+ kernel/printk/printk.c | 1 +
+ 24 files changed, 72 insertions(+), 117 deletions(-)
+Merging pm/linux-next (65787f5965bc Merge branch 'pm-cpufreq' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/linux/pm_opp.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/opp/opp.h
+Auto-merging drivers/opp/of.c
+Auto-merging drivers/opp/core.c
+Auto-merging drivers/gpio/gpiolib-acpi.c
+Auto-merging drivers/cpufreq/tegra124-cpufreq.c
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging arch/arm64/mm/fault.c
+Auto-merging arch/arm64/include/asm/daifflags.h
+Removing arch/arm/mach-davinci/include/mach/cpufreq.h
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging MAINTAINERS
+Removing Documentation/cpuidle/governor.txt
+Removing Documentation/cpuidle/driver.txt
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/initrd_table_override.txt | 4 +
+ Documentation/admin-guide/pm/cpuidle.rst | 104 +++-
+ Documentation/cpuidle/driver.txt | 37 --
+ Documentation/cpuidle/governor.txt | 28 -
+ Documentation/driver-api/pm/cpuidle.rst | 282 +++++++++
+ Documentation/driver-api/pm/index.rst | 7 +-
+ MAINTAINERS | 15 +-
+ arch/arm/include/asm/kvm_ras.h | 14 +
+ arch/arm/include/asm/system_misc.h | 5 -
+ arch/arm/mach-davinci/da850.c | 2 +-
+ arch/arm/mach-davinci/include/mach/cpufreq.h | 26 -
+ arch/arm64/include/asm/acpi.h | 4 +-
+ arch/arm64/include/asm/daifflags.h | 1 +
+ arch/arm64/include/asm/fixmap.h | 6 +-
+ arch/arm64/include/asm/kvm_ras.h | 25 +
+ arch/arm64/include/asm/system_misc.h | 2 -
+ arch/arm64/kernel/acpi.c | 31 +
+ arch/arm64/mm/fault.c | 24 +-
+ drivers/acpi/Kconfig | 10 +
+ drivers/acpi/acpi_dbg.c | 30 +-
+ drivers/acpi/acpi_video.c | 20 +-
+ drivers/acpi/acpica/acapps.h | 4 +-
+ drivers/acpi/acpica/accommon.h | 2 +-
+ drivers/acpi/acpica/acconvert.h | 2 +-
+ drivers/acpi/acpica/acdebug.h | 5 +-
+ drivers/acpi/acpica/acdispat.h | 2 +-
+ drivers/acpi/acpica/acevents.h | 2 +-
+ drivers/acpi/acpica/acglobal.h | 3 +-
+ drivers/acpi/acpica/achware.h | 2 +-
+ drivers/acpi/acpica/acinterp.h | 2 +-
+ drivers/acpi/acpica/aclocal.h | 4 +-
+ drivers/acpi/acpica/acmacros.h | 4 +-
+ drivers/acpi/acpica/acnamesp.h | 2 +-
+ drivers/acpi/acpica/acobject.h | 3 +-
+ drivers/acpi/acpica/acopcode.h | 2 +-
+ drivers/acpi/acpica/acparser.h | 2 +-
+ drivers/acpi/acpica/acpredef.h | 17 +-
+ drivers/acpi/acpica/acresrc.h | 2 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/actables.h | 2 +-
+ drivers/acpi/acpica/acutils.h | 2 +-
+ drivers/acpi/acpica/amlcode.h | 2 +-
+ drivers/acpi/acpica/amlresrc.h | 2 +-
+ drivers/acpi/acpica/dbdisply.c | 4 +-
+ drivers/acpi/acpica/dbexec.c | 4 +-
+ drivers/acpi/acpica/dbhistry.c | 2 +-
+ drivers/acpi/acpica/dbnames.c | 2 +-
+ drivers/acpi/acpica/dbobject.c | 2 +-
+ drivers/acpi/acpica/dbtest.c | 164 +++---
+ drivers/acpi/acpica/dsargs.c | 2 +-
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsdebug.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 9 +-
+ drivers/acpi/acpica/dsinit.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 2 +-
+ drivers/acpi/acpica/dsobject.c | 2 +-
+ drivers/acpi/acpica/dsopcode.c | 28 +-
+ drivers/acpi/acpica/dspkginit.c | 2 +-
+ drivers/acpi/acpica/dswexec.c | 2 +-
+ drivers/acpi/acpica/dswload.c | 2 +-
+ drivers/acpi/acpica/dswload2.c | 4 +-
+ drivers/acpi/acpica/dswscope.c | 2 +-
+ drivers/acpi/acpica/dswstate.c | 2 +-
+ drivers/acpi/acpica/evevent.c | 2 +-
+ drivers/acpi/acpica/evglock.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 4 +-
+ drivers/acpi/acpica/evgpeblk.c | 2 +-
+ drivers/acpi/acpica/evgpeinit.c | 2 +-
+ drivers/acpi/acpica/evgpeutil.c | 2 +-
+ drivers/acpi/acpica/evhandler.c | 2 +-
+ drivers/acpi/acpica/evmisc.c | 2 +-
+ drivers/acpi/acpica/evregion.c | 4 +-
+ drivers/acpi/acpica/evrgnini.c | 21 +-
+ drivers/acpi/acpica/evxface.c | 2 +-
+ drivers/acpi/acpica/evxfevnt.c | 2 +-
+ drivers/acpi/acpica/evxfgpe.c | 6 +-
+ drivers/acpi/acpica/evxfregn.c | 2 +-
+ drivers/acpi/acpica/exconcat.c | 2 +-
+ drivers/acpi/acpica/exconfig.c | 2 +-
+ drivers/acpi/acpica/exconvrt.c | 4 +-
+ drivers/acpi/acpica/excreate.c | 2 +-
+ drivers/acpi/acpica/exdebug.c | 2 +-
+ drivers/acpi/acpica/exdump.c | 2 +-
+ drivers/acpi/acpica/exfield.c | 71 ++-
+ drivers/acpi/acpica/exfldio.c | 2 +-
+ drivers/acpi/acpica/exmisc.c | 2 +-
+ drivers/acpi/acpica/exmutex.c | 2 +-
+ drivers/acpi/acpica/exnames.c | 2 +-
+ drivers/acpi/acpica/exoparg1.c | 2 +-
+ drivers/acpi/acpica/exoparg2.c | 10 +-
+ drivers/acpi/acpica/exoparg3.c | 2 +-
+ drivers/acpi/acpica/exoparg6.c | 2 +-
+ drivers/acpi/acpica/exprep.c | 2 +-
+ drivers/acpi/acpica/exregion.c | 2 +-
+ drivers/acpi/acpica/exresnte.c | 2 +-
+ drivers/acpi/acpica/exresolv.c | 2 +-
+ drivers/acpi/acpica/exresop.c | 2 +-
+ drivers/acpi/acpica/exserial.c | 4 +-
+ drivers/acpi/acpica/exstore.c | 2 +-
+ drivers/acpi/acpica/exstoren.c | 2 +-
+ drivers/acpi/acpica/exstorob.c | 2 +-
+ drivers/acpi/acpica/exsystem.c | 2 +-
+ drivers/acpi/acpica/extrace.c | 2 +-
+ drivers/acpi/acpica/exutils.c | 4 +-
+ drivers/acpi/acpica/hwacpi.c | 2 +-
+ drivers/acpi/acpica/hwesleep.c | 2 +-
+ drivers/acpi/acpica/hwgpe.c | 2 +-
+ drivers/acpi/acpica/hwsleep.c | 2 +-
+ drivers/acpi/acpica/hwtimer.c | 2 +-
+ drivers/acpi/acpica/hwvalid.c | 2 +-
+ drivers/acpi/acpica/hwxface.c | 2 +-
+ drivers/acpi/acpica/hwxfsleep.c | 98 +--
+ drivers/acpi/acpica/nsarguments.c | 2 +-
+ drivers/acpi/acpica/nsconvert.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/nsdumpdv.c | 2 +-
+ drivers/acpi/acpica/nsinit.c | 2 +-
+ drivers/acpi/acpica/nsload.c | 4 +-
+ drivers/acpi/acpica/nsparse.c | 68 +--
+ drivers/acpi/acpica/nspredef.c | 2 +-
+ drivers/acpi/acpica/nsprepkg.c | 2 +-
+ drivers/acpi/acpica/nsrepair.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 2 +-
+ drivers/acpi/acpica/nsutils.c | 4 +-
+ drivers/acpi/acpica/nswalk.c | 2 +-
+ drivers/acpi/acpica/nsxfname.c | 2 +-
+ drivers/acpi/acpica/psargs.c | 2 +-
+ drivers/acpi/acpica/psloop.c | 195 +-----
+ drivers/acpi/acpica/psobject.c | 2 +-
+ drivers/acpi/acpica/psopcode.c | 2 +-
+ drivers/acpi/acpica/psopinfo.c | 2 +-
+ drivers/acpi/acpica/psparse.c | 10 +-
+ drivers/acpi/acpica/psscope.c | 2 +-
+ drivers/acpi/acpica/pstree.c | 2 +-
+ drivers/acpi/acpica/psutils.c | 2 +-
+ drivers/acpi/acpica/pswalk.c | 2 +-
+ drivers/acpi/acpica/psxface.c | 2 +-
+ drivers/acpi/acpica/rsdumpinfo.c | 14 +-
+ drivers/acpi/acpica/rsirq.c | 8 +-
+ drivers/acpi/acpica/rsserial.c | 10 +-
+ drivers/acpi/acpica/tbdata.c | 2 +-
+ drivers/acpi/acpica/tbfadt.c | 4 +-
+ drivers/acpi/acpica/tbfind.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 2 +-
+ drivers/acpi/acpica/tbprint.c | 2 +-
+ drivers/acpi/acpica/tbutils.c | 2 +-
+ drivers/acpi/acpica/tbxface.c | 6 +-
+ drivers/acpi/acpica/tbxfload.c | 27 +-
+ drivers/acpi/acpica/tbxfroot.c | 2 +-
+ drivers/acpi/acpica/utaddress.c | 2 +-
+ drivers/acpi/acpica/utalloc.c | 2 +-
+ drivers/acpi/acpica/utascii.c | 2 +-
+ drivers/acpi/acpica/utbuffer.c | 2 +-
+ drivers/acpi/acpica/utcache.c | 2 +-
+ drivers/acpi/acpica/utcopy.c | 2 +-
+ drivers/acpi/acpica/utdebug.c | 2 +-
+ drivers/acpi/acpica/utdecode.c | 20 +-
+ drivers/acpi/acpica/utdelete.c | 4 +
+ drivers/acpi/acpica/uterror.c | 9 +-
+ drivers/acpi/acpica/uteval.c | 2 +-
+ drivers/acpi/acpica/utglobal.c | 2 +-
+ drivers/acpi/acpica/uthex.c | 2 +-
+ drivers/acpi/acpica/utids.c | 2 +-
+ drivers/acpi/acpica/utinit.c | 2 +-
+ drivers/acpi/acpica/utlock.c | 2 +-
+ drivers/acpi/acpica/utobject.c | 2 +-
+ drivers/acpi/acpica/utosi.c | 2 +-
+ drivers/acpi/acpica/utpredef.c | 2 +-
+ drivers/acpi/acpica/utprint.c | 2 +-
+ drivers/acpi/acpica/uttrack.c | 14 +-
+ drivers/acpi/acpica/utuuid.c | 2 +-
+ drivers/acpi/acpica/utxface.c | 2 +-
+ drivers/acpi/acpica/utxferror.c | 44 ++
+ drivers/acpi/acpica/utxfinit.c | 2 +-
+ drivers/acpi/apei/Kconfig | 12 +-
+ drivers/acpi/apei/bert.c | 23 +-
+ drivers/acpi/apei/einj.c | 93 +--
+ drivers/acpi/apei/erst.c | 27 +-
+ drivers/acpi/apei/ghes.c | 655 ++++++++++++---------
+ drivers/acpi/apei/hest.c | 16 +-
+ drivers/acpi/bus.c | 14 +
+ drivers/acpi/cppc_acpi.c | 42 ++
+ drivers/acpi/custom_method.c | 6 -
+ drivers/acpi/dptf/Makefile | 2 -
+ drivers/acpi/dptf/int340x_thermal.c | 2 +-
+ drivers/acpi/ec.c | 208 ++++---
+ drivers/acpi/ec_sys.c | 36 +-
+ drivers/acpi/internal.h | 4 +-
+ drivers/acpi/irq.c | 4 +-
+ drivers/acpi/pci_link.c | 8 +-
+ drivers/acpi/pptt.c | 13 +-
+ drivers/acpi/processor_idle.c | 7 +
+ drivers/acpi/resource.c | 4 +-
+ drivers/acpi/tables.c | 12 +-
+ drivers/acpi/x86/utils.c | 5 +
+ drivers/base/cpu.c | 1 +
+ drivers/base/power/clock_ops.c | 13 +-
+ drivers/base/power/common.c | 2 +-
+ drivers/base/power/domain.c | 13 +-
+ drivers/base/power/main.c | 11 +-
+ drivers/base/power/runtime.c | 70 ++-
+ drivers/base/power/sysfs.c | 17 +-
+ drivers/base/power/wakeup.c | 2 +-
+ drivers/base/swnode.c | 23 +
+ drivers/cpufreq/Kconfig | 3 -
+ drivers/cpufreq/Kconfig.arm | 16 +-
+ drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/acpi-cpufreq.c | 4 +-
+ drivers/cpufreq/arm_big_little.c | 2 +
+ drivers/cpufreq/armada-8k-cpufreq.c | 206 +++++++
+ drivers/cpufreq/cppc_cpufreq.c | 65 ++
+ drivers/cpufreq/cpufreq-dt.c | 33 +-
+ drivers/cpufreq/cpufreq.c | 134 +++--
+ drivers/cpufreq/cpufreq_stats.c | 16 +-
+ drivers/cpufreq/davinci-cpufreq.c | 5 +-
+ drivers/cpufreq/e_powersaver.c | 5 +-
+ drivers/cpufreq/imx6q-cpufreq.c | 25 +-
+ drivers/cpufreq/intel_pstate.c | 105 ++--
+ drivers/cpufreq/longhaul.c | 2 +-
+ drivers/cpufreq/mediatek-cpufreq.c | 16 +-
+ drivers/cpufreq/omap-cpufreq.c | 4 +-
+ drivers/cpufreq/pcc-cpufreq.c | 2 +-
+ drivers/cpufreq/powernv-cpufreq.c | 10 +-
+ drivers/cpufreq/qcom-cpufreq-hw.c | 53 +-
+ drivers/cpufreq/qcom-cpufreq-kryo.c | 22 +-
+ drivers/cpufreq/qoriq-cpufreq.c | 15 +-
+ drivers/cpufreq/s5pv210-cpufreq.c | 67 ++-
+ drivers/cpufreq/scmi-cpufreq.c | 53 +-
+ drivers/cpufreq/scpi-cpufreq.c | 17 +-
+ drivers/cpufreq/speedstep-ich.c | 3 +-
+ drivers/cpufreq/tegra124-cpufreq.c | 2 +
+ drivers/cpuidle/Kconfig | 11 +-
+ drivers/cpuidle/dt_idle_states.c | 15 +-
+ drivers/cpuidle/governors/Makefile | 1 +
+ drivers/cpuidle/governors/teo.c | 444 ++++++++++++++
+ drivers/firmware/arm_sdei.c | 68 +++
+ drivers/firmware/efi/cper.c | 13 +-
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 16 +-
+ drivers/gpu/drm/i915/i915_pmu.h | 4 +-
+ drivers/idle/intel_idle.c | 1 +
+ drivers/opp/core.c | 22 +-
+ drivers/opp/debugfs.c | 110 +---
+ drivers/opp/of.c | 99 ++++
+ drivers/opp/opp.h | 15 +-
+ drivers/platform/x86/sony-laptop.c | 8 +-
+ drivers/pnp/pnpacpi/rsparser.c | 14 +-
+ drivers/powercap/intel_rapl.c | 2 +
+ drivers/thermal/Kconfig | 1 +
+ include/acpi/acbuffer.h | 2 +-
+ include/acpi/acconfig.h | 4 +-
+ include/acpi/acexcep.h | 5 +-
+ include/acpi/acnames.h | 2 +-
+ include/acpi/acoutput.h | 4 +-
+ include/acpi/acpi.h | 2 +-
+ include/acpi/acpiosxf.h | 2 +-
+ include/acpi/acpixf.h | 18 +-
+ include/acpi/acrestyp.h | 16 +-
+ include/acpi/actbl.h | 2 +-
+ include/acpi/actbl1.h | 19 +-
+ include/acpi/actbl2.h | 17 +-
+ include/acpi/actbl3.h | 21 +-
+ include/acpi/actypes.h | 14 +-
+ include/acpi/acuuid.h | 2 +-
+ include/acpi/cppc_acpi.h | 1 +
+ include/acpi/ghes.h | 4 +-
+ include/acpi/platform/acenv.h | 2 +-
+ include/acpi/platform/acenvex.h | 2 +-
+ include/acpi/platform/acgcc.h | 2 +-
+ include/acpi/platform/acgccex.h | 2 +-
+ include/acpi/platform/acintel.h | 2 +-
+ include/acpi/platform/aclinux.h | 2 +-
+ include/acpi/platform/aclinuxex.h | 2 +-
+ include/linux/arm_sdei.h | 9 +
+ include/linux/cpufreq.h | 48 +-
+ include/linux/cpuidle.h | 8 +-
+ include/linux/device.h | 10 +
+ include/linux/initrd.h | 3 +
+ include/linux/platform_data/davinci-cpufreq.h | 19 +
+ include/linux/pm.h | 7 +-
+ include/linux/pm_domain.h | 8 +-
+ include/linux/pm_opp.h | 6 +
+ include/linux/pm_runtime.h | 2 +
+ include/linux/property.h | 2 +-
+ kernel/power/energy_model.c | 57 ++
+ kernel/power/qos.c | 8 +-
+ tools/power/acpi/common/cmfsize.c | 2 +-
+ tools/power/acpi/common/getopt.c | 2 +-
+ .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixdir.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixmap.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixxf.c | 2 +-
+ tools/power/acpi/tools/acpidump/acpidump.h | 2 +-
+ tools/power/acpi/tools/acpidump/apdump.c | 2 +-
+ tools/power/acpi/tools/acpidump/apfiles.c | 2 +-
+ tools/power/acpi/tools/acpidump/apmain.c | 2 +-
+ virt/kvm/arm/mmu.c | 4 +-
+ 297 files changed, 3382 insertions(+), 1880 deletions(-)
+ delete mode 100644 Documentation/cpuidle/driver.txt
+ delete mode 100644 Documentation/cpuidle/governor.txt
+ create mode 100644 Documentation/driver-api/pm/cpuidle.rst
+ create mode 100644 arch/arm/include/asm/kvm_ras.h
+ delete mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h
+ create mode 100644 arch/arm64/include/asm/kvm_ras.h
+ create mode 100644 drivers/cpufreq/armada-8k-cpufreq.c
+ create mode 100644 drivers/cpuidle/governors/teo.c
+ create mode 100644 include/linux/platform_data/davinci-cpufreq.h
+Merging cpufreq-arm/cpufreq/arm/linux-next (0334906c0696 cpufreq: kryo: Release OPP tables on module removal)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (ae2917093fb6 tools/power/cpupower: Display boost frequency separately)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/lib/cpufreq.c | 19 ++++++++------
+ tools/power/cpupower/lib/cpufreq.h | 16 ++++++------
+ tools/power/cpupower/utils/cpufreq-info.c | 42 +++++++++++++++++++++++--------
+ 3 files changed, 50 insertions(+), 27 deletions(-)
+Merging opp/opp/linux-next (a9a744dd5b82 cpufreq: OMAP: Register an Energy Model)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/next (b537f89a9e4b Merge branches 'fixes' and 'thermal-intel' into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/broadcom/bcm2835_thermal.c | 9 +++--
+ drivers/thermal/cpu_cooling.c | 3 +-
+ .../intel/int340x_thermal/int3400_thermal.c | 21 +++++++++---
+ drivers/thermal/intel/intel_powerclamp.c | 2 +-
+ drivers/thermal/mtk_thermal.c | 7 ++--
+ drivers/thermal/samsung/exynos_tmu.c | 2 +-
+ drivers/thermal/tegra/soctherm.c | 40 ++++++++++++++++++++--
+ 7 files changed, 66 insertions(+), 18 deletions(-)
+Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency)
+$ git merge ieee1394/for-next
+Already up to date.
+Merging dlm/next (8526e331c56f dlm: Fix test for -ERESTARTSYS)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/lockspace.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Merging swiotlb/linux-next (22cb45d7692a swiotlb: drop pointless static qualifier in swiotlb_create_debugfs())
+$ git merge swiotlb/linux-next
+Auto-merging kernel/dma/swiotlb.c
+CONFLICT (content): Merge conflict in kernel/dma/swiotlb.c
+Resolved 'kernel/dma/swiotlb.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 34c48361c29a] Merge remote-tracking branch 'swiotlb/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ kernel/dma/swiotlb.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 49 insertions(+), 1 deletion(-)
+Merging rdma/for-next (bb618451544c RDMA/uverbs: Don't do double free of allocated PD)
+$ git merge rdma/for-next
+Auto-merging net/rds/ib_send.c
+Auto-merging net/rds/ib_recv.c
+Auto-merging net/rds/ib.h
+Auto-merging mm/debug.c
+Auto-merging kernel/events/core.c
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging fs/proc/task_mmu.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2.c
+Auto-merging drivers/infiniband/ulp/srp/ib_srp.c
+Auto-merging drivers/infiniband/hw/mlx5/ib_rep.c
+Auto-merging drivers/infiniband/hw/mlx4/Kconfig
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx4/Kconfig
+Auto-merging drivers/infiniband/hw/cxgb4/device.c
+Auto-merging drivers/infiniband/hw/bnxt_re/Kconfig
+Auto-merging .clang-format
+Resolved 'drivers/infiniband/hw/mlx4/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5f5085fbfee3] Merge remote-tracking branch 'rdma/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .clang-format | 2 +
+ Documentation/infiniband/user_verbs.txt | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 8 +-
+ drivers/infiniband/Kconfig | 15 +-
+ drivers/infiniband/core/Makefile | 4 +-
+ drivers/infiniband/core/cache.c | 118 +-
+ drivers/infiniband/core/cgroup.c | 5 +-
+ drivers/infiniband/core/cm.c | 3 +-
+ drivers/infiniband/core/cma.c | 139 +-
+ drivers/infiniband/core/cma_priv.h | 4 +-
+ drivers/infiniband/core/core_priv.h | 35 +-
+ drivers/infiniband/core/device.c | 1323 +++--
+ drivers/infiniband/core/iwcm.c | 13 +-
+ drivers/infiniband/core/iwpm_msg.c | 232 +-
+ drivers/infiniband/core/iwpm_util.c | 86 +-
+ drivers/infiniband/core/iwpm_util.h | 12 +
+ drivers/infiniband/core/mad.c | 4 +-
+ drivers/infiniband/core/netlink.c | 4 +-
+ drivers/infiniband/core/nldev.c | 492 +-
+ drivers/infiniband/core/rdma_core.c | 42 +-
+ drivers/infiniband/core/restrack.c | 210 +-
+ drivers/infiniband/core/restrack.h | 28 +
+ drivers/infiniband/core/rw.c | 12 +-
+ drivers/infiniband/core/sa_query.c | 4 +-
+ drivers/infiniband/core/security.c | 96 +-
+ drivers/infiniband/core/sysfs.c | 93 +-
+ drivers/infiniband/core/ucma.c | 7 +
+ drivers/infiniband/core/umem.c | 60 +-
+ drivers/infiniband/core/umem_odp.c | 9 +-
+ drivers/infiniband/core/user_mad.c | 52 +-
+ drivers/infiniband/core/uverbs_cmd.c | 69 +-
+ drivers/infiniband/core/uverbs_ioctl.c | 3 +
+ drivers/infiniband/core/uverbs_main.c | 2 +
+ drivers/infiniband/core/uverbs_std_types.c | 2 +-
+ drivers/infiniband/core/uverbs_uapi.c | 15 +-
+ drivers/infiniband/core/verbs.c | 73 +-
+ drivers/infiniband/hw/bnxt_re/Kconfig | 1 +
+ drivers/infiniband/hw/bnxt_re/Makefile | 2 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 +
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 268 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 16 +-
+ drivers/infiniband/hw/bnxt_re/main.c | 134 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 193 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 47 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 40 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 45 +-
+ drivers/infiniband/hw/bnxt_re/qplib_res.c | 22 +-
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 30 +-
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 3 +-
+ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 160 +-
+ drivers/infiniband/hw/cxgb3/Makefile | 2 +-
+ drivers/infiniband/hw/cxgb3/iwch.c | 2 +-
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 95 +-
+ drivers/infiniband/hw/cxgb4/Makefile | 4 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 199 +-
+ drivers/infiniband/hw/cxgb4/device.c | 10 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 16 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 34 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 85 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 33 +-
+ drivers/infiniband/hw/cxgb4/t4.h | 1 +
+ drivers/infiniband/hw/hfi1/Makefile | 1 +
+ drivers/infiniband/hw/hfi1/chip.c | 13 +
+ drivers/infiniband/hw/hfi1/chip.h | 4 +-
+ drivers/infiniband/hw/hfi1/common.h | 4 +
+ drivers/infiniband/hw/hfi1/debugfs.c | 58 +-
+ drivers/infiniband/hw/hfi1/debugfs.h | 12 -
+ drivers/infiniband/hw/hfi1/driver.c | 58 +-
+ drivers/infiniband/hw/hfi1/fault.c | 53 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 22 +-
+ drivers/infiniband/hw/hfi1/init.c | 21 +-
+ drivers/infiniband/hw/hfi1/iowait.c | 34 +-
+ drivers/infiniband/hw/hfi1/iowait.h | 99 +-
+ drivers/infiniband/hw/hfi1/opfn.c | 323 ++
+ drivers/infiniband/hw/hfi1/opfn.h | 85 +
+ drivers/infiniband/hw/hfi1/pio.c | 18 +-
+ drivers/infiniband/hw/hfi1/qp.c | 76 +-
+ drivers/infiniband/hw/hfi1/qp.h | 7 +
+ drivers/infiniband/hw/hfi1/rc.c | 1141 ++++-
+ drivers/infiniband/hw/hfi1/rc.h | 51 +
+ drivers/infiniband/hw/hfi1/ruc.c | 48 +-
+ drivers/infiniband/hw/hfi1/sdma.c | 24 +-
+ drivers/infiniband/hw/hfi1/sdma_txreq.h | 1 +
+ drivers/infiniband/hw/hfi1/sysfs.c | 16 +-
+ drivers/infiniband/hw/hfi1/tid_rdma.c | 5418 +++++++++++++++++++++
+ drivers/infiniband/hw/hfi1/tid_rdma.h | 311 +-
+ drivers/infiniband/hw/hfi1/trace.c | 118 +
+ drivers/infiniband/hw/hfi1/trace.h | 1 +
+ drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 8 +
+ drivers/infiniband/hw/hfi1/trace_rc.h | 48 +
+ drivers/infiniband/hw/hfi1/trace_rx.h | 107 +-
+ drivers/infiniband/hw/hfi1/trace_tid.h | 1610 ++++++
+ drivers/infiniband/hw/hfi1/trace_tx.h | 18 +-
+ drivers/infiniband/hw/hfi1/uc.c | 3 +-
+ drivers/infiniband/hw/hfi1/ud.c | 24 +-
+ drivers/infiniband/hw/hfi1/user_exp_rcv.h | 1 -
+ drivers/infiniband/hw/hfi1/user_pages.c | 12 +-
+ drivers/infiniband/hw/hfi1/user_sdma.c | 9 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 210 +-
+ drivers/infiniband/hw/hfi1/verbs.h | 104 +-
+ drivers/infiniband/hw/hfi1/verbs_txreq.h | 1 +
+ drivers/infiniband/hw/hfi1/vnic_sdma.c | 6 +-
+ drivers/infiniband/hw/hns/Kconfig | 1 -
+ drivers/infiniband/hw/hns/Makefile | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.c | 32 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 12 +
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 9 +-
+ drivers/infiniband/hw/hns/hns_roce_db.c | 6 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 63 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 68 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 3 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 36 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 594 ++-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 92 +-
+ drivers/infiniband/hw/hns/hns_roce_main.c | 88 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 95 +-
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 25 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 92 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 16 +-
+ drivers/infiniband/hw/i40iw/Makefile | 2 +-
+ drivers/infiniband/hw/i40iw/i40iw_utils.c | 1 -
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 137 +-
+ drivers/infiniband/hw/mlx4/Kconfig | 1 -
+ drivers/infiniband/hw/mlx4/cm.c | 2 +-
+ drivers/infiniband/hw/mlx4/cq.c | 19 +-
+ drivers/infiniband/hw/mlx4/doorbell.c | 6 +-
+ drivers/infiniband/hw/mlx4/main.c | 77 +-
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 +-
+ drivers/infiniband/hw/mlx4/mr.c | 13 +-
+ drivers/infiniband/hw/mlx4/qp.c | 84 +-
+ drivers/infiniband/hw/mlx4/srq.c | 12 +-
+ drivers/infiniband/hw/mlx5/Kconfig | 1 -
+ drivers/infiniband/hw/mlx5/cong.c | 15 +-
+ drivers/infiniband/hw/mlx5/cq.c | 15 +-
+ drivers/infiniband/hw/mlx5/devx.c | 463 +-
+ drivers/infiniband/hw/mlx5/doorbell.c | 6 +-
+ drivers/infiniband/hw/mlx5/ib_rep.c | 6 +-
+ drivers/infiniband/hw/mlx5/main.c | 249 +-
+ drivers/infiniband/hw/mlx5/mem.c | 5 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 41 +-
+ drivers/infiniband/hw/mlx5/mr.c | 126 +-
+ drivers/infiniband/hw/mlx5/odp.c | 316 +-
+ drivers/infiniband/hw/mlx5/qp.c | 308 +-
+ drivers/infiniband/hw/mlx5/srq.c | 11 +-
+ drivers/infiniband/hw/mlx5/srq.h | 2 -
+ drivers/infiniband/hw/mlx5/srq_cmd.c | 16 +-
+ drivers/infiniband/hw/mthca/mthca_main.c | 2 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 139 +-
+ drivers/infiniband/hw/mthca/mthca_qp.c | 13 +-
+ drivers/infiniband/hw/mthca/mthca_srq.c | 21 +-
+ drivers/infiniband/hw/nes/Kconfig | 2 +-
+ drivers/infiniband/hw/nes/nes_verbs.c | 313 +-
+ drivers/infiniband/hw/nes/nes_verbs.h | 1 -
+ drivers/infiniband/hw/ocrdma/Makefile | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 12 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 67 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 189 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 11 +-
+ drivers/infiniband/hw/qedr/main.c | 9 +-
+ drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +-
+ drivers/infiniband/hw/qedr/verbs.c | 192 +-
+ drivers/infiniband/hw/qedr/verbs.h | 10 +-
+ drivers/infiniband/hw/qib/qib_debugfs.c | 27 +-
+ drivers/infiniband/hw/qib/qib_rc.c | 7 +-
+ drivers/infiniband/hw/qib/qib_sdma.c | 26 +-
+ drivers/infiniband/hw/qib/qib_sysfs.c | 18 +-
+ drivers/infiniband/hw/qib/qib_ud.c | 6 +-
+ drivers/infiniband/hw/qib/qib_user_pages.c | 75 +-
+ drivers/infiniband/hw/qib/qib_verbs.c | 20 +-
+ drivers/infiniband/hw/usnic/Makefile | 2 +-
+ drivers/infiniband/hw/usnic/usnic_debugfs.c | 26 -
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 57 +-
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 26 +-
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 114 +-
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 28 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.c | 65 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.h | 1 -
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 12 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 21 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 3 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 4 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 98 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 12 +-
+ drivers/infiniband/sw/rdmavt/mr.c | 21 +-
+ drivers/infiniband/sw/rdmavt/pd.c | 29 +-
+ drivers/infiniband/sw/rdmavt/pd.h | 7 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 45 +-
+ drivers/infiniband/sw/rdmavt/rc.c | 13 +
+ drivers/infiniband/sw/rdmavt/srq.c | 5 +-
+ drivers/infiniband/sw/rdmavt/trace_cq.h | 10 +-
+ drivers/infiniband/sw/rdmavt/vt.c | 34 +-
+ drivers/infiniband/sw/rxe/rxe.c | 67 +-
+ drivers/infiniband/sw/rxe/rxe.h | 16 +-
+ drivers/infiniband/sw/rxe/rxe_av.c | 7 +
+ drivers/infiniband/sw/rxe/rxe_comp.c | 6 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 9 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 15 +-
+ drivers/infiniband/sw/rxe/rxe_net.c | 97 +-
+ drivers/infiniband/sw/rxe/rxe_net.h | 2 +-
+ drivers/infiniband/sw/rxe/rxe_param.h | 3 +-
+ drivers/infiniband/sw/rxe/rxe_pool.c | 77 +-
+ drivers/infiniband/sw/rxe/rxe_pool.h | 4 +
+ drivers/infiniband/sw/rxe/rxe_qp.c | 15 +-
+ drivers/infiniband/sw/rxe/rxe_recv.c | 12 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_sysfs.c | 40 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 103 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 9 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_fs.c | 7 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 14 +-
+ drivers/infiniband/ulp/iser/iser_memory.c | 19 +-
+ drivers/infiniband/ulp/isert/Makefile | 1 -
+ drivers/infiniband/ulp/srp/ib_srp.c | 26 +-
+ drivers/infiniband/ulp/srpt/Makefile | 1 -
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 4 +-
+ drivers/misc/mic/scif/scif_rma.c | 38 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 3 -
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 8 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 12 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 46 +-
+ fs/proc/task_mmu.c | 2 +-
+ include/linux/cgroup_rdma.h | 2 +-
+ include/linux/mlx5/driver.h | 5 +-
+ include/linux/mm_types.h | 2 +-
+ include/linux/scatterlist.h | 49 +-
+ include/rdma/ib_hdrs.h | 14 +-
+ include/rdma/ib_mad.h | 5 +-
+ include/rdma/ib_umem.h | 8 +-
+ include/rdma/ib_umem_odp.h | 34 +-
+ include/rdma/ib_verbs.h | 274 +-
+ include/rdma/iw_cm.h | 16 +-
+ include/rdma/iw_portmap.h | 144 +-
+ include/rdma/rdma_cm.h | 1 +
+ include/rdma/rdma_netlink.h | 11 +
+ include/rdma/rdma_vt.h | 30 +-
+ include/rdma/rdmavt_qp.h | 20 +-
+ include/rdma/restrack.h | 58 +-
+ include/rdma/tid_rdma_defs.h | 108 +
+ include/rdma/uverbs_ioctl.h | 18 +
+ include/rdma/uverbs_std_types.h | 18 +-
+ include/rdma/uverbs_types.h | 1 +
+ include/uapi/rdma/bnxt_re-abi.h | 11 +
+ include/uapi/rdma/ib_user_verbs.h | 2 +
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 18 +
+ include/uapi/rdma/mlx5_user_ioctl_verbs.h | 5 +
+ include/uapi/rdma/rdma_netlink.h | 74 +-
+ include/uapi/rdma/rdma_user_cm.h | 4 +
+ include/uapi/rdma/rdma_user_rxe.h | 3 +-
+ kernel/cgroup/rdma.c | 5 +-
+ kernel/events/core.c | 8 +-
+ kernel/fork.c | 2 +-
+ lib/irq_poll.c | 2 +-
+ lib/scatterlist.c | 26 +
+ mm/debug.c | 5 +-
+ net/rds/ib.h | 12 +-
+ net/rds/ib_fmr.c | 8 +-
+ net/rds/ib_frmr.c | 4 +-
+ net/rds/ib_recv.c | 8 +-
+ net/rds/ib_send.c | 15 +-
+ 263 files changed, 16626 insertions(+), 4966 deletions(-)
+ create mode 100644 drivers/infiniband/core/restrack.h
+ create mode 100644 drivers/infiniband/hw/hfi1/opfn.c
+ create mode 100644 drivers/infiniband/hw/hfi1/opfn.h
+ create mode 100644 drivers/infiniband/hw/hfi1/rc.h
+ create mode 100644 drivers/infiniband/hw/hfi1/trace_tid.h
+ create mode 100644 include/rdma/tid_rdma_defs.h
+Merging net-next/master (41bc0ddb80e0 Merge branch 'net-dsa-microchip-add-KSZ9893-switch-support')
+$ git merge net-next/master
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/dsa/ksz.txt | 43 ++++
+ drivers/net/dsa/microchip/ksz9477.c | 242 ++++++++++++++++++++--
+ drivers/net/dsa/microchip/ksz9477_spi.c | 4 +-
+ drivers/net/dsa/microchip/ksz_common.c | 4 +-
+ include/net/dsa.h | 1 +
+ net/dsa/dsa.c | 2 +
+ net/dsa/dsa_priv.h | 1 +
+ net/dsa/tag_ksz.c | 34 +++
+ 8 files changed, 316 insertions(+), 15 deletions(-)
+Merging bpf-next/master (ea5bade929bf Merge branch 'split-test_progs')
+$ git merge bpf-next/master
+Removing samples/bpf/xdpsock_kern.c
+Removing samples/bpf/xdpsock.h
+Removing samples/bpf/load_sock_ops.c
+Auto-merging net/core/filter.c
+Auto-merging net/bpf/test_run.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/syscall.c
+Merge made by the 'recursive' strategy.
+ Documentation/bpf/bpf_design_QA.rst | 24 +-
+ Documentation/bpf/btf.rst | 316 ++--
+ Documentation/networking/af_xdp.rst | 36 +-
+ Documentation/networking/filter.txt | 2 +-
+ include/linux/bpf.h | 9 +
+ include/linux/filter.h | 20 +-
+ include/linux/kernel.h | 14 +-
+ include/uapi/linux/bpf.h | 12 +-
+ kernel/bpf/core.c | 37 +-
+ kernel/bpf/map_in_map.c | 1 +
+ kernel/bpf/syscall.c | 39 +-
+ kernel/bpf/verifier.c | 7 +-
+ kernel/sched/core.c | 28 +
+ kernel/seccomp.c | 2 +
+ kernel/sysctl.c | 37 +
+ lib/test_bpf.c | 2 +
+ net/bpf/test_run.c | 26 +-
+ net/core/filter.c | 44 +-
+ samples/bpf/.gitignore | 1 -
+ samples/bpf/Makefile | 14 +-
+ samples/bpf/do_hbm_test.sh | 436 +++++
+ samples/bpf/fds_example.c | 10 +-
+ samples/bpf/hbm.c | 441 +++++
+ samples/bpf/hbm.h | 31 +
+ samples/bpf/hbm_kern.h | 137 ++
+ samples/bpf/hbm_out_kern.c | 157 ++
+ samples/bpf/load_sock_ops.c | 97 -
+ samples/bpf/sock_example.c | 2 +-
+ samples/bpf/sockex1_user.c | 25 +-
+ samples/bpf/sockex2_user.c | 23 +-
+ samples/bpf/sockex3_user.c | 2 +-
+ samples/bpf/task_fd_query_kern.c | 2 +-
+ samples/bpf/task_fd_query_user.c | 2 +-
+ samples/bpf/tcp_basertt_kern.c | 2 +-
+ samples/bpf/tcp_bpf.readme | 14 +-
+ samples/bpf/tcp_bufs_kern.c | 2 +-
+ samples/bpf/tcp_clamp_kern.c | 2 +-
+ samples/bpf/tcp_cong_kern.c | 2 +-
+ samples/bpf/tcp_iw_kern.c | 2 +-
+ samples/bpf/tcp_rwnd_kern.c | 2 +-
+ samples/bpf/tcp_synrto_kern.c | 2 +-
+ samples/bpf/tcp_tos_reflect_kern.c | 2 +-
+ samples/bpf/tracex2_user.c | 2 +-
+ samples/bpf/tracex3_kern.c | 2 +-
+ samples/bpf/xdp_redirect_map_user.c | 2 +-
+ samples/bpf/xdp_redirect_user.c | 2 +-
+ samples/bpf/xdpsock.h | 11 -
+ samples/bpf/xdpsock_kern.c | 56 -
+ samples/bpf/xdpsock_user.c | 841 +++-----
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 6 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 4 +-
+ tools/bpf/bpftool/prog.c | 13 +-
+ tools/include/uapi/linux/bpf.h | 12 +-
+ tools/include/uapi/linux/ethtool.h | 51 +
+ tools/include/uapi/linux/if_xdp.h | 78 +
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/Makefile | 9 +-
+ tools/lib/bpf/README.rst | 15 +-
+ tools/lib/bpf/btf.c | 76 +-
+ tools/lib/bpf/btf.h | 3 +-
+ tools/lib/bpf/libbpf.c | 8 +-
+ tools/lib/bpf/libbpf.h | 3 +-
+ tools/lib/bpf/libbpf.map | 6 +
+ tools/lib/bpf/xsk.c | 723 +++++++
+ tools/lib/bpf/xsk.h | 203 ++
+ tools/perf/util/bpf-loader.c | 4 +-
+ tools/testing/selftests/bpf/.gitignore | 1 +
+ tools/testing/selftests/bpf/Makefile | 27 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 32 +
+ tools/testing/selftests/bpf/prog_tests/.gitignore | 1 +
+ .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 249 +++
+ .../selftests/bpf/prog_tests/flow_dissector.c | 72 +
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 139 ++
+ tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 90 +
+ tools/testing/selftests/bpf/prog_tests/map_lock.c | 75 +
+ tools/testing/selftests/bpf/prog_tests/obj_name.c | 71 +
+ .../testing/selftests/bpf/prog_tests/pkt_access.c | 29 +
+ .../selftests/bpf/prog_tests/pkt_md_access.c | 24 +
+ .../selftests/bpf/prog_tests/prog_run_xattr.c | 49 +
+ .../selftests/bpf/prog_tests/queue_stack_map.c | 103 +
+ .../selftests/bpf/prog_tests/reference_tracking.c | 48 +
+ .../selftests/bpf/prog_tests/signal_pending.c | 48 +
+ tools/testing/selftests/bpf/prog_tests/spinlock.c | 29 +
+ .../selftests/bpf/prog_tests/stacktrace_build_id.c | 165 ++
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 150 ++
+ .../selftests/bpf/prog_tests/stacktrace_map.c | 103 +
+ .../bpf/prog_tests/stacktrace_map_raw_tp.c | 59 +
+ .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 78 +
+ .../selftests/bpf/prog_tests/task_fd_query_tp.c | 82 +
+ .../testing/selftests/bpf/prog_tests/tcp_estats.c | 19 +
+ .../selftests/bpf/prog_tests/tp_attach_query.c | 132 ++
+ tools/testing/selftests/bpf/prog_tests/xdp.c | 46 +
+ .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 31 +
+ .../selftests/bpf/prog_tests/xdp_noinline.c | 82 +
+ .../testing/selftests/bpf/progs/test_map_in_map.c | 4 +
+ tools/testing/selftests/bpf/test_btf.c | 49 +-
+ tools/testing/selftests/bpf/test_libbpf_open.c | 2 +-
+ tools/testing/selftests/bpf/test_progs.c | 1999 +-------------------
+ tools/testing/selftests/bpf/test_progs.h | 93 +
+ tools/testing/selftests/bpf/test_sock_fields.c | 1 +
+ 100 files changed, 5352 insertions(+), 3028 deletions(-)
+ create mode 100755 samples/bpf/do_hbm_test.sh
+ create mode 100644 samples/bpf/hbm.c
+ create mode 100644 samples/bpf/hbm.h
+ create mode 100644 samples/bpf/hbm_kern.h
+ create mode 100644 samples/bpf/hbm_out_kern.c
+ delete mode 100644 samples/bpf/load_sock_ops.c
+ delete mode 100644 samples/bpf/xdpsock.h
+ delete mode 100644 samples/bpf/xdpsock_kern.c
+ create mode 100644 tools/include/uapi/linux/ethtool.h
+ create mode 100644 tools/include/uapi/linux/if_xdp.h
+ create mode 100644 tools/lib/bpf/xsk.c
+ create mode 100644 tools/lib/bpf/xsk.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/.gitignore
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/l4lb_all.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/map_lock.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/obj_name.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_access.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/queue_stack_map.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/reference_tracking.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/signal_pending.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_estats.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tp_attach_query.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
+ create mode 100644 tools/testing/selftests/bpf/test_progs.h
+Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings)
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (37b6bb77c6fd net/mlx5: Factor out HCA capabilities functions)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (db8ab38880e0 netfilter: nf_tables: merge ipv4 and ipv6 nat chain types)
+$ git merge netfilter-next/master
+Already up to date.
+Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
+$ git merge nfc-next/master
+Auto-merging drivers/nfc/fdp/i2c.c
+Merge made by the 'recursive' strategy.
+ drivers/nfc/fdp/fdp.c | 35 +++++------------------------------
+ drivers/nfc/fdp/i2c.c | 26 +++++++++++++-------------
+ drivers/nfc/st21nfca/dep.c | 3 ++-
+ drivers/nfc/st21nfca/se.c | 5 +++--
+ drivers/nfc/st95hf/core.c | 7 ++-----
+ net/nfc/netlink.c | 6 ++++--
+ 6 files changed, 29 insertions(+), 53 deletions(-)
+Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (501faf710230 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (d5fa9c55e5f3 Merge tag 'mlx5-updates-2019-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
+$ git merge bluetooth/master
+Already up to date.
+Merging mac80211-next/master (be9cefe796f3 selftests: rtnetlink: use internal netns switch for ip commands)
+$ git merge mac80211-next/master
+Already up to date.
+Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of debugfs_create functions)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/glock.c | 70 ++++++++++++--------------------------------------------
+ fs/gfs2/glock.h | 4 ++--
+ fs/gfs2/incore.h | 3 ---
+ fs/gfs2/main.c | 6 +----
+ 4 files changed, 17 insertions(+), 66 deletions(-)
+Merging mtd/mtd/next (9220d7befc9c Merge tag 'nand/for-5.1' of git://git.infradead.org/linux-mtd into mtd/next)
+$ git merge mtd/mtd/next
+Auto-merging drivers/mtd/nand/raw/nand_base.c
+Auto-merging drivers/mtd/nand/raw/fsmc_nand.c
+Auto-merging drivers/mtd/nand/raw/denali.c
+Auto-merging drivers/mtd/mtdcore.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9a522b79d62b] Merge remote-tracking branch 'mtd/mtd/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mtd/amlogic,meson-nand.txt | 60 +
+ .../devicetree/bindings/mtd/cadence-quadspi.txt | 1 +
+ .../devicetree/bindings/mtd/mtk-quadspi.txt | 3 +-
+ .../devicetree/bindings/mtd/stm32-fmc2-nand.txt | 61 +
+ MAINTAINERS | 8 +
+ drivers/mtd/chips/cfi_cmdset_0001.c | 3 +-
+ drivers/mtd/chips/gen_probe.c | 2 +-
+ drivers/mtd/devices/docg3.c | 7 +-
+ drivers/mtd/devices/m25p80.c | 9 +-
+ drivers/mtd/devices/mtdram.c | 2 -
+ drivers/mtd/lpddr/qinfo_probe.c | 4 +-
+ drivers/mtd/mtdcore.c | 83 +-
+ drivers/mtd/nand/raw/Kconfig | 17 +
+ drivers/mtd/nand/raw/Makefile | 2 +
+ drivers/mtd/nand/raw/atmel/pmecc.c | 21 +-
+ drivers/mtd/nand/raw/denali.c | 42 +-
+ drivers/mtd/nand/raw/denali.h | 1 -
+ drivers/mtd/nand/raw/denali_dt.c | 27 +-
+ drivers/mtd/nand/raw/fsmc_nand.c | 16 +
+ drivers/mtd/nand/raw/jz4780_bch.c | 9 +-
+ drivers/mtd/nand/raw/marvell_nand.c | 5 +-
+ drivers/mtd/nand/raw/meson_nand.c | 1464 ++++++++++++++
+ drivers/mtd/nand/raw/mtk_ecc.c | 8 +-
+ drivers/mtd/nand/raw/mtk_nand.c | 3 +-
+ drivers/mtd/nand/raw/nand_base.c | 159 +-
+ drivers/mtd/nand/raw/nand_legacy.c | 3 +-
+ drivers/mtd/nand/raw/omap2.c | 20 +-
+ drivers/mtd/nand/raw/r852.c | 3 +-
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2073 ++++++++++++++++++++
+ drivers/mtd/nand/raw/sunxi_nand.c | 732 +++----
+ drivers/mtd/nand/raw/tmio_nand.c | 21 +-
+ drivers/mtd/nand/spi/gigadevice.c | 83 +
+ drivers/mtd/nand/spi/macronix.c | 8 +-
+ drivers/mtd/nand/spi/toshiba.c | 79 +-
+ drivers/mtd/spi-nor/Kconfig | 16 +-
+ drivers/mtd/spi-nor/Makefile | 2 +-
+ drivers/mtd/spi-nor/cadence-quadspi.c | 74 +-
+ drivers/mtd/spi-nor/mtk-quadspi.c | 3 +-
+ drivers/mtd/spi-nor/spi-nor.c | 35 +-
+ include/linux/mtd/rawnand.h | 26 +-
+ include/linux/mtd/spi-nor.h | 16 +-
+ 41 files changed, 4536 insertions(+), 675 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt
+ create mode 100644 drivers/mtd/nand/raw/meson_nand.c
+ create mode 100644 drivers/mtd/nand/raw/stm32_fmc2_nand.c
+Merging nand/nand/next (53bcbb839438 mtd: rawnand: denali_dt: remove single anonymous clock support)
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (225c0eda36bd mtd: spi-nor: Fix wrong abbreviation HWCPAS)
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (0918f18c7179 crypto: s5p - add AES support for Exynos5433)
+$ git merge crypto/master
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging drivers/crypto/ixp4xx_crypto.c
+Auto-merging drivers/crypto/ccree/cc_driver.c
+Auto-merging drivers/crypto/amcc/crypto4xx_core.c
+Auto-merging crypto/af_alg.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/samsung-slimsss.txt | 19 +
+ MAINTAINERS | 1 -
+ arch/arm/crypto/aes-ce-core.S | 26 +-
+ arch/arm/crypto/crct10dif-ce-core.S | 568 +-
+ arch/arm/crypto/crct10dif-ce-glue.c | 25 +-
+ arch/arm64/crypto/aes-ce-ccm-core.S | 5 +-
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 8 +-
+ arch/arm64/crypto/aes-modes.S | 3 +-
+ arch/arm64/crypto/aes-neonbs-core.S | 8 +-
+ arch/arm64/crypto/crct10dif-ce-core.S | 513 +-
+ arch/arm64/crypto/crct10dif-ce-glue.c | 75 +-
+ arch/arm64/crypto/ghash-ce-glue.c | 118 +-
+ arch/s390/crypto/des_s390.c | 4 +-
+ arch/sparc/crypto/des_glue.c | 4 +-
+ arch/x86/crypto/aegis128-aesni-glue.c | 38 +-
+ arch/x86/crypto/aegis128l-aesni-glue.c | 38 +-
+ arch/x86/crypto/aegis256-aesni-glue.c | 38 +-
+ arch/x86/crypto/aesni-intel_glue.c | 47 +-
+ arch/x86/crypto/crct10dif-pcl-asm_64.S | 782 +-
+ arch/x86/crypto/crct10dif-pclmul_glue.c | 12 +-
+ arch/x86/crypto/morus1280_glue.c | 40 +-
+ arch/x86/crypto/morus640_glue.c | 39 +-
+ arch/x86/crypto/poly1305-sse2-x86_64.S | 4 +
+ crypto/Kconfig | 14 +-
+ crypto/aead.c | 4 +-
+ crypto/aegis.h | 7 +-
+ crypto/aegis128.c | 20 +-
+ crypto/aegis128l.c | 20 +-
+ crypto/aegis256.c | 20 +-
+ crypto/af_alg.c | 36 +-
+ crypto/ahash.c | 42 +-
+ crypto/algapi.c | 63 +-
+ crypto/arc4.c | 87 +-
+ crypto/cbc.c | 131 +-
+ crypto/ccm.c | 78 +-
+ crypto/cfb.c | 139 +-
+ crypto/chacha20poly1305.c | 37 +-
+ crypto/crypto_null.c | 57 +-
+ crypto/crypto_user_stat.c | 4 -
+ crypto/ctr.c | 200 +-
+ crypto/des_generic.c | 4 +-
+ crypto/ecb.c | 151 +-
+ crypto/gcm.c | 75 +-
+ crypto/keywrap.c | 198 +-
+ crypto/morus1280.c | 19 +-
+ crypto/morus640.c | 19 +-
+ crypto/ofb.c | 202 +-
+ crypto/pcbc.c | 143 +-
+ crypto/rsa-pkcs1pad.c | 1 +
+ crypto/seqiv.c | 7 +-
+ crypto/shash.c | 27 +-
+ crypto/skcipher.c | 158 +-
+ crypto/streebog_generic.c | 2 +-
+ crypto/testmgr.c | 2760 ++--
+ crypto/testmgr.h | 15649 ++++++++-----------
+ crypto/tgr192.c | 6 +-
+ drivers/char/hw_random/bcm2835-rng.c | 18 +-
+ drivers/char/hw_random/virtio-rng.c | 2 +-
+ drivers/crypto/amcc/crypto4xx_core.c | 87 +
+ drivers/crypto/amcc/crypto4xx_core.h | 4 +
+ drivers/crypto/amcc/crypto4xx_reg_def.h | 1 +
+ drivers/crypto/amcc/crypto4xx_trng.c | 4 +-
+ drivers/crypto/amcc/crypto4xx_trng.h | 4 +-
+ drivers/crypto/atmel-tdes.c | 2 +-
+ drivers/crypto/axis/artpec6_crypto.c | 326 +-
+ drivers/crypto/bcm/Makefile | 2 -
+ drivers/crypto/bcm/cipher.c | 10 +-
+ drivers/crypto/bcm/cipher.h | 4 +-
+ drivers/crypto/bcm/util.c | 40 -
+ drivers/crypto/bcm/util.h | 6 -
+ drivers/crypto/caam/Kconfig | 1 +
+ drivers/crypto/caam/caamalg.c | 238 +-
+ drivers/crypto/caam/caamalg_desc.c | 18 +-
+ drivers/crypto/caam/caamalg_qi.c | 29 +-
+ drivers/crypto/caam/caamalg_qi2.c | 85 +-
+ drivers/crypto/caam/caamalg_qi2.h | 2 +
+ drivers/crypto/caam/caamhash.c | 429 +-
+ drivers/crypto/caam/caamhash_desc.c | 68 +-
+ drivers/crypto/caam/caamhash_desc.h | 8 +
+ drivers/crypto/caam/compat.h | 1 +
+ drivers/crypto/caam/ctrl.c | 25 +-
+ drivers/crypto/caam/error.c | 6 +
+ drivers/crypto/caam/intern.h | 1 -
+ drivers/crypto/caam/key_gen.c | 30 +-
+ drivers/crypto/caam/qi.c | 4 +-
+ drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 27 +-
+ drivers/crypto/cavium/nitrox/nitrox_debugfs.h | 5 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +-
+ drivers/crypto/cavium/zip/zip_main.c | 58 +-
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 2 +-
+ drivers/crypto/ccp/ccp-crypto-des3.c | 2 +-
+ drivers/crypto/ccp/ccp-crypto-sha.c | 2 +-
+ drivers/crypto/ccp/ccp-debugfs.c | 36 +-
+ drivers/crypto/ccp/ccp-ops.c | 2 +-
+ drivers/crypto/ccp/psp-dev.c | 37 +-
+ drivers/crypto/ccp/psp-dev.h | 2 +-
+ drivers/crypto/ccp/sp-dev.c | 2 +-
+ drivers/crypto/ccp/sp-dev.h | 2 +-
+ drivers/crypto/ccp/sp-pci.c | 6 +-
+ drivers/crypto/ccp/sp-platform.c | 2 +-
+ drivers/crypto/ccree/cc_buffer_mgr.c | 87 +-
+ drivers/crypto/ccree/cc_cipher.c | 10 +-
+ drivers/crypto/ccree/cc_debugfs.c | 22 +-
+ drivers/crypto/ccree/cc_debugfs.h | 8 +-
+ drivers/crypto/ccree/cc_driver.c | 13 +-
+ drivers/crypto/ccree/cc_driver.h | 2 -
+ drivers/crypto/chelsio/Makefile | 2 +-
+ drivers/crypto/chelsio/chcr_algo.c | 12 +-
+ drivers/crypto/chelsio/chcr_core.h | 2 +-
+ drivers/crypto/chelsio/chcr_ipsec.c | 42 +-
+ drivers/crypto/chelsio/chtls/Makefile | 3 +-
+ drivers/crypto/chelsio/chtls/chtls_io.c | 12 +-
+ drivers/crypto/chelsio/chtls/chtls_main.c | 1 -
+ drivers/crypto/hifn_795x.c | 3 +-
+ drivers/crypto/inside-secure/safexcel_cipher.c | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 4 +-
+ drivers/crypto/marvell/cipher.c | 4 +-
+ drivers/crypto/n2_core.c | 2 +-
+ drivers/crypto/omap-des.c | 2 +-
+ drivers/crypto/picoxcell_crypto.c | 3 +-
+ drivers/crypto/qat/qat_c3xxx/Makefile | 2 +-
+ drivers/crypto/qat/qat_c3xxx/adf_drv.c | 5 -
+ drivers/crypto/qat/qat_c3xxxvf/Makefile | 2 +-
+ drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 5 -
+ drivers/crypto/qat/qat_c62x/Makefile | 2 +-
+ drivers/crypto/qat/qat_c62x/adf_drv.c | 5 -
+ drivers/crypto/qat/qat_c62xvf/Makefile | 2 +-
+ drivers/crypto/qat/qat_c62xvf/adf_drv.c | 5 -
+ drivers/crypto/qat/qat_common/adf_cfg.c | 7 -
+ drivers/crypto/qat/qat_common/adf_transport.c | 7 -
+ .../crypto/qat/qat_common/adf_transport_debug.c | 15 -
+ drivers/crypto/qat/qat_dh895xcc/Makefile | 2 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 5 -
+ drivers/crypto/qat/qat_dh895xccvf/Makefile | 2 +-
+ drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 5 -
+ drivers/crypto/qce/ablkcipher.c | 4 +-
+ drivers/crypto/rockchip/rk3288_crypto.c | 2 +-
+ drivers/crypto/rockchip/rk3288_crypto.h | 4 +-
+ drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 41 +-
+ drivers/crypto/rockchip/rk3288_crypto_ahash.c | 2 +-
+ drivers/crypto/s5p-sss.c | 64 +-
+ drivers/crypto/stm32/stm32-hash.c | 2 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 2 +-
+ drivers/crypto/talitos.c | 2 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 26 +-
+ drivers/crypto/virtio/virtio_crypto_algs.c | 2 +-
+ fs/crypto/keyinfo.c | 4 +-
+ fs/ecryptfs/crypto.c | 5 +-
+ include/crypto/algapi.h | 8 +-
+ include/crypto/arc4.h | 13 +
+ include/crypto/if_alg.h | 7 -
+ include/crypto/internal/cryptouser.h | 2 +
+ include/crypto/internal/hash.h | 6 +-
+ include/crypto/internal/skcipher.h | 15 +
+ include/crypto/morus1280_glue.h | 7 +-
+ include/crypto/morus640_glue.h | 7 +-
+ include/crypto/morus_common.h | 7 +-
+ include/crypto/streebog.h | 2 +-
+ include/crypto/xts.h | 4 +-
+ include/linux/crypto.h | 10 +-
+ 160 files changed, 11188 insertions(+), 13806 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
+ create mode 100644 include/crypto/arc4.h
+Merging drm/drm-next (7fbd5d784f75 Merge tag 'imx-drm-next-2019-02-22' of git://git.pengutronix.de/pza/linux into drm-next)
+$ git merge drm/drm-next
+Auto-merging include/video/imx-ipu-v3.h
+Auto-merging include/drm/drm_drv.h
+Auto-merging include/drm/drmP.h
+Removing drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+Removing drivers/gpu/drm/qxl/qxl_fb.c
+Removing drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
+Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/gpu/drm/drm_file.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Removing drivers/gpu/drm/bochs/bochs_fbdev.c
+Auto-merging drivers/gpu/drm/bochs/bochs_drv.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_sw_engine_dce80.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce120/i2caux_dce120.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_sw_engine_dce110.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h
+Removing drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
+Removing drivers/gpu/drm/amd/display/dc/i2caux/Makefile
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+Removing drivers/gpu/drm/amd/amdgpu/ci_smc.c
+Removing drivers/gpu/drm/amd/amdgpu/ci_dpm.h
+Removing drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bc36090a8c78] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/display/arm,komeda.txt | 73 +
+ .../bindings/display/bridge/lvds-transmitter.txt | 12 +-
+ .../bindings/display/bridge/renesas,lvds.txt | 4 +-
+ .../bindings/display/bridge/thine,thc63lvdm83d.txt | 2 +-
+ .../bindings/display/bridge/ti,ds90c185.txt | 55 +
+ .../devicetree/bindings/display/msm/gmu.txt | 59 +
+ .../devicetree/bindings/display/msm/gpu.txt | 42 +-
+ .../panel/{auo,g101evn010 => auo,g101evn010.txt} | 0
+ .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 +
+ .../display/panel/lemaker,bl035-rgb-002.txt | 12 +
+ .../bindings/display/panel/pda,91-00156-a0.txt | 14 +
+ .../bindings/display/panel/sitronix,st7701.txt | 30 +
+ .../devicetree/bindings/display/renesas,du.txt | 2 +
+ .../bindings/display/rockchip/rockchip-vop.txt | 1 +
+ .../bindings/display/sunxi/sun4i-drm.txt | 5 +
+ .../display/tegra/nvidia,tegra20-host1x.txt | 3 +
+ .../devicetree/bindings/gpu/samsung-rotator.txt | 7 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ Documentation/gpu/afbc.rst | 235 +
+ Documentation/gpu/dp-mst/topology-figure-1.dot | 52 +
+ Documentation/gpu/dp-mst/topology-figure-2.dot | 56 +
+ Documentation/gpu/dp-mst/topology-figure-3.dot | 59 +
+ Documentation/gpu/drivers.rst | 2 +
+ Documentation/gpu/drm-internals.rst | 74 +-
+ Documentation/gpu/drm-kms-helpers.rst | 54 +-
+ Documentation/gpu/drm-kms.rst | 96 -
+ Documentation/gpu/drm-uapi.rst | 8 +
+ Documentation/gpu/komeda-kms.rst | 488 ++
+ Documentation/gpu/todo.rst | 110 +-
+ Documentation/gpu/vkms.rst | 11 -
+ MAINTAINERS | 43 +-
+ drivers/acpi/pmic/intel_pmic.c | 61 +
+ drivers/acpi/pmic/intel_pmic.h | 4 +
+ drivers/acpi/pmic/intel_pmic_chtwc.c | 19 +
+ drivers/acpi/pmic/intel_pmic_xpower.c | 1 +
+ drivers/dma-buf/dma-buf.c | 12 +-
+ drivers/dma-buf/dma-fence.c | 2 +-
+ drivers/dma-buf/sw_sync.c | 2 +-
+ drivers/dma-buf/sync_debug.c | 16 +-
+ drivers/dma-buf/sync_file.c | 4 +-
+ drivers/gpu/drm/Kconfig | 4 -
+ drivers/gpu/drm/Makefile | 4 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 121 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 142 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 129 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 88 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 46 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 75 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 354 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 141 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 133 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6844 --------------------
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 349 -
+ drivers/gpu/drm/amd/amdgpu/ci_smc.c | 279 -
+ drivers/gpu/drm/amd/amdgpu/cik.c | 75 +-
+ drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 90 -
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 75 -
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 72 -
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 56 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 167 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 60 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 324 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 69 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 31 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 44 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1510 ++---
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 48 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 49 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 17 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 109 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 59 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 5 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 14 -
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 18 +-
+ .../drm/amd/display/dc/bios/bios_parser_helper.c | 96 +-
+ .../drm/amd/display/dc/bios/bios_parser_helper.h | 4 -
+ .../gpu/drm/amd/display/dc/bios/command_table.c | 135 +-
+ .../gpu/drm/amd/display/dc/bios/command_table.h | 3 -
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 82 +-
+ .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 -
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 10 +-
+ .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 19 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 261 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 147 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 162 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 90 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 82 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 69 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 123 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 21 +-
+ drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 9 -
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 13 +-
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 36 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 69 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 647 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 30 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 123 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.h | 35 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 224 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 129 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 12 +
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 79 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.h | 8 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 4 +-
+ .../drm/amd/display/dc/dce110/dce110_compressor.c | 2 -
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 212 +-
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 16 +-
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 6 +-
+ .../amd/display/dc/dce120/dce120_hw_sequencer.c | 15 +
+ .../amd/display/dc/dce120/dce120_hw_sequencer.h | 1 +
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 84 +-
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +-
+ .../amd/display/dc/dce80/dce80_timing_generator.c | 8 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 107 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 12 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 42 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 203 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 37 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 28 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 7 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 397 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 +
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 15 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 36 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 184 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 23 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 74 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 79 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 10 +-
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dm_services_types.h | 14 +-
+ .../drm/amd/display/dc/dml/display_mode_enums.h | 26 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 28 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 2 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 107 +-
+ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 12 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 28 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h | 10 +
+ drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 99 -
+ drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c | 606 --
+ drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h | 86 -
+ .../amd/display/dc/i2caux/dce100/i2caux_dce100.c | 106 -
+ .../display/dc/i2caux/dce110/aux_engine_dce110.c | 505 --
+ .../display/dc/i2caux/dce110/aux_engine_dce110.h | 78 -
+ .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 574 --
+ .../dc/i2caux/dce110/i2c_hw_engine_dce110.h | 218 -
+ .../dc/i2caux/dce110/i2c_sw_engine_dce110.c | 160 -
+ .../amd/display/dc/i2caux/dce110/i2caux_dce110.c | 329 -
+ .../amd/display/dc/i2caux/dce110/i2caux_dce110.h | 54 -
+ .../amd/display/dc/i2caux/dce112/i2caux_dce112.c | 129 -
+ .../amd/display/dc/i2caux/dce112/i2caux_dce112.h | 32 -
+ .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 120 -
+ .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.c | 875 ---
+ .../display/dc/i2caux/dce80/i2c_hw_engine_dce80.h | 54 -
+ .../display/dc/i2caux/dce80/i2c_sw_engine_dce80.c | 173 -
+ .../drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c | 284 -
+ .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 120 -
+ .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h | 32 -
+ .../display/dc/i2caux/diagnostics/i2caux_diag.c | 97 -
+ .../display/dc/i2caux/diagnostics/i2caux_diag.h | 32 -
+ drivers/gpu/drm/amd/display/dc/i2caux/engine.h | 111 -
+ drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c | 118 -
+ drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h | 115 -
+ .../amd/display/dc/i2caux/i2c_generic_hw_engine.c | 284 -
+ .../amd/display/dc/i2caux/i2c_generic_hw_engine.h | 77 -
+ .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c | 251 -
+ .../gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h | 80 -
+ .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c | 601 --
+ .../gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h | 81 -
+ drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 491 --
+ drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h | 122 -
+ drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 17 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 19 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 16 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 5 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 +-
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 17 +-
+ .../dc/{i2caux/engine_base.c => inc/hw/vmid.h} | 45 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 14 +
+ .../i2c_sw_engine_dce110.h => inc/vm_helper.h} | 39 +-
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 8 +
+ .../drm/amd/display/include/bios_parser_types.h | 4 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 3 +
+ .../gpu/drm/amd/display/include/gpio_interface.h | 8 +
+ .../gpu/drm/amd/display/include/i2caux_interface.h | 33 +-
+ .../drm/amd/display/modules/color/color_gamma.c | 165 +-
+ .../drm/amd/display/modules/freesync/freesync.c | 106 +-
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 +-
+ .../gpu/drm/amd/display/modules/inc/mod_shared.h | 3 +-
+ .../drm/amd/display/modules/power/power_helpers.c | 612 +-
+ .../amd/include/asic_reg/nbio/nbio_6_1_offset.h | 2 +
+ .../amd/include/asic_reg/nbio/nbio_6_1_sh_mask.h | 4 +
+ .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 58 +
+ .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 54 +
+ .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 53 +
+ .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 +
+ .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 3 +
+ .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 3 +
+ drivers/gpu/drm/amd/include/atombios.h | 2 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 72 +-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 8 +
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 96 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c | 101 +
+ .../hwmgr/common_baco.h} | 39 +-
+ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 9 -
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 10 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 14 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +
+ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 8 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 158 +
+ .../hwmgr/vega10_baco.h} | 22 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 196 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 +
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h | 24 +
+ .../amd/powerplay/hwmgr/vega10_processpptables.c | 50 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 37 +
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 1 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 198 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 103 +
+ .../hwmgr/vega20_baco.h} | 18 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 419 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 3 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 1 +
+ .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 -
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 12 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 4 +
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 10 +-
+ drivers/gpu/drm/arc/arcpgu_sim.c | 4 +-
+ drivers/gpu/drm/arm/Kconfig | 12 +-
+ drivers/gpu/drm/arm/Makefile | 1 +
+ drivers/gpu/drm/arm/display/Kbuild | 3 +
+ drivers/gpu/drm/arm/display/Kconfig | 14 +
+ drivers/gpu/drm/arm/display/include/malidp_io.h | 42 +
+ .../gpu/drm/arm/display/include/malidp_product.h | 23 +
+ drivers/gpu/drm/arm/display/include/malidp_utils.h | 16 +
+ drivers/gpu/drm/arm/display/komeda/Makefile | 21 +
+ drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 111 +
+ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 110 +
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 190 +
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 110 +
+ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 144 +
+ .../drm/arm/display/komeda/komeda_format_caps.c | 75 +
+ .../drm/arm/display/komeda/komeda_format_caps.h | 89 +
+ .../drm/arm/display/komeda/komeda_framebuffer.c | 167 +
+ .../drm/arm/display/komeda/komeda_framebuffer.h | 34 +
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 171 +
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 114 +
+ .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 202 +
+ .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 359 +
+ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 109 +
+ .../drm/arm/display/komeda/komeda_private_obj.c | 88 +
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 6 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 2 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 2 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 2 +-
+ drivers/gpu/drm/armada/armada_510.c | 2 +-
+ drivers/gpu/drm/armada/armada_crtc.c | 10 +-
+ drivers/gpu/drm/armada/armada_crtc.h | 2 +
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ drivers/gpu/drm/armada/armada_fb.c | 2 +-
+ drivers/gpu/drm/ast/ast_drv.c | 1 +
+ drivers/gpu/drm/ast/ast_fb.c | 6 +-
+ drivers/gpu/drm/ast/ast_main.c | 6 +-
+ drivers/gpu/drm/ast/ast_mode.c | 1 +
+ drivers/gpu/drm/ati_pcigart.c | 7 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 181 +-
+ drivers/gpu/drm/bochs/Makefile | 2 +-
+ drivers/gpu/drm/bochs/bochs.h | 23 +-
+ drivers/gpu/drm/bochs/bochs_drv.c | 36 +-
+ drivers/gpu/drm/bochs/bochs_fbdev.c | 163 -
+ drivers/gpu/drm/bochs/bochs_hw.c | 26 +-
+ drivers/gpu/drm/bochs/bochs_kms.c | 219 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 69 +-
+ drivers/gpu/drm/bridge/Kconfig | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 8 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 9 +-
+ drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +-
+ drivers/gpu/drm/bridge/analogix-anx78xx.c | 11 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 +-
+ drivers/gpu/drm/bridge/cdns-dsi.c | 542 +-
+ drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
+ drivers/gpu/drm/bridge/lvds-encoder.c | 53 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
+ drivers/gpu/drm/bridge/panel.c | 24 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 2 +-
+ drivers/gpu/drm/bridge/sii902x.c | 9 +-
+ drivers/gpu/drm/bridge/sil-sii8620.c | 3 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 151 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 1 +
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 20 +-
+ drivers/gpu/drm/bridge/tc358764.c | 2 +-
+ drivers/gpu/drm/bridge/tc358767.c | 11 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.c | 1 +
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 +
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 71 +-
+ drivers/gpu/drm/drm_agpsupport.c | 2 +-
+ drivers/gpu/drm/drm_atomic.c | 19 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 19 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 4 +-
+ drivers/gpu/drm/drm_bridge.c | 4 +-
+ drivers/gpu/drm/drm_bufs.c | 15 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 43 +
+ drivers/gpu/drm/drm_connector.c | 95 +-
+ drivers/gpu/drm/drm_context.c | 15 +-
+ drivers/gpu/drm/drm_crtc.c | 41 -
+ drivers/gpu/drm/drm_crtc_helper.c | 58 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 1 +
+ drivers/gpu/drm/drm_damage_helper.c | 42 +
+ drivers/gpu/drm/drm_dp_helper.c | 61 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 1153 +++-
+ drivers/gpu/drm/drm_drv.c | 24 +-
+ drivers/gpu/drm/drm_dsc.c | 30 +-
+ drivers/gpu/drm/drm_edid.c | 101 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 137 +-
+ drivers/gpu/drm/drm_fb_helper.c | 171 +-
+ drivers/gpu/drm/drm_file.c | 2 +-
+ drivers/gpu/drm/drm_flip_work.c | 1 +
+ drivers/gpu/drm/drm_fourcc.c | 9 +
+ drivers/gpu/drm/drm_framebuffer.c | 3 +-
+ drivers/gpu/drm/drm_gem.c | 38 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 50 +-
+ drivers/gpu/drm/drm_internal.h | 2 +
+ drivers/gpu/drm/drm_irq.c | 10 +-
+ drivers/gpu/drm/drm_lease.c | 6 +-
+ drivers/gpu/drm/drm_mm.c | 2 +-
+ drivers/gpu/drm/drm_mode_config.c | 5 +-
+ drivers/gpu/drm/drm_mode_object.c | 9 +-
+ drivers/gpu/drm/drm_modes.c | 11 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 4 +-
+ drivers/gpu/drm/drm_modeset_lock.c | 8 +
+ drivers/gpu/drm/drm_of.c | 4 +-
+ drivers/gpu/drm/drm_panel.c | 3 +
+ drivers/gpu/drm/drm_plane.c | 3 +
+ drivers/gpu/drm/drm_probe_helper.c | 2 +-
+ drivers/gpu/drm/drm_property.c | 2 +-
+ drivers/gpu/drm/drm_rect.c | 108 -
+ drivers/gpu/drm/drm_simple_kms_helper.c | 2 +-
+ drivers/gpu/drm/drm_syncobj.c | 91 +-
+ drivers/gpu/drm/drm_vblank.c | 47 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 11 +-
+ drivers/gpu/drm/exynos/exynos_dp.c | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c | 23 +
+ drivers/gpu/drm/exynos/exynos_drm_scaler.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +-
+ drivers/gpu/drm/exynos/regs-scaler.h | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 1 -
+ drivers/gpu/drm/gma500/psb_drv.c | 3 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 1 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 13 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 44 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 -
+ drivers/gpu/drm/i2c/ch7006_drv.c | 6 +-
+ drivers/gpu/drm/i2c/ch7006_priv.h | 1 +
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 12 +-
+ drivers/gpu/drm/i915/Kconfig.debug | 3 +-
+ drivers/gpu/drm/i915/Makefile | 12 +-
+ drivers/gpu/drm/i915/dvo.h | 1 -
+ drivers/gpu/drm/i915/gvt/Makefile | 1 -
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 8 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 83 +-
+ drivers/gpu/drm/i915/gvt/display.c | 43 +-
+ drivers/gpu/drm/i915/gvt/display.h | 37 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 5 +-
+ drivers/gpu/drm/i915/gvt/edid.c | 32 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 +-
+ drivers/gpu/drm/i915/gvt/gvt.c | 109 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 11 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 29 +-
+ drivers/gpu/drm/i915/gvt/hypercall.h | 10 +-
+ drivers/gpu/drm/i915/gvt/interrupt.c | 4 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 185 +-
+ drivers/gpu/drm/i915/gvt/mmio.c | 6 +-
+ drivers/gpu/drm/i915/gvt/mmio.h | 11 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 18 +-
+ drivers/gpu/drm/i915/gvt/mpt.h | 30 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 4 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 11 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h | 2 +-
+ drivers/gpu/drm/i915/gvt/trace.h | 2 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 10 +-
+ drivers/gpu/drm/i915/i915_active.c | 286 +
+ drivers/gpu/drm/i915/i915_active.h | 425 ++
+ drivers/gpu/drm/i915/i915_active_types.h | 36 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 1064 ++-
+ drivers/gpu/drm/i915/i915_drv.c | 283 +-
+ drivers/gpu/drm/i915/i915_drv.h | 519 +-
+ drivers/gpu/drm/i915/i915_gem.c | 961 +--
+ drivers/gpu/drm/i915/i915_gem_context.c | 388 +-
+ drivers/gpu/drm/i915/i915_gem_context.h | 26 +
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 -
+ drivers/gpu/drm/i915/i915_gem_evict.c | 90 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 89 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 29 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.h | 1 -
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 229 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 57 +-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 1 -
+ drivers/gpu/drm/i915/i915_gem_object.h | 57 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 175 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 13 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 5 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 225 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 296 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 41 +-
+ drivers/gpu/drm/i915/i915_ioc32.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 475 +-
+ drivers/gpu/drm/i915/i915_params.c | 38 +-
+ drivers/gpu/drm/i915/i915_params.h | 13 +-
+ drivers/gpu/drm/i915/i915_pci.c | 33 +-
+ drivers/gpu/drm/i915/i915_perf.c | 33 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 23 +-
+ drivers/gpu/drm/i915/i915_query.c | 2 +-
+ drivers/gpu/drm/i915/i915_reg.h | 300 +-
+ drivers/gpu/drm/i915/i915_request.c | 452 +-
+ drivers/gpu/drm/i915/i915_request.h | 497 +-
+ drivers/gpu/drm/i915/i915_reset.c | 1349 ++++
+ drivers/gpu/drm/i915/i915_reset.h | 59 +
+ drivers/gpu/drm/i915/i915_scheduler.c | 29 +-
+ drivers/gpu/drm/i915/i915_selftest.h | 1 +
+ drivers/gpu/drm/i915/i915_suspend.c | 17 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 27 +-
+ drivers/gpu/drm/i915/i915_timeline.c | 257 +-
+ drivers/gpu/drm/i915/i915_timeline.h | 61 +-
+ drivers/gpu/drm/i915/i915_trace.h | 57 +-
+ drivers/gpu/drm/i915/i915_vma.c | 261 +-
+ drivers/gpu/drm/i915/i915_vma.h | 58 +-
+ drivers/gpu/drm/i915/icl_dsi.c | 45 +-
+ drivers/gpu/drm/i915/intel_acpi.c | 1 -
+ drivers/gpu/drm/i915/intel_atomic.c | 9 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 43 +-
+ drivers/gpu/drm/i915/intel_audio.c | 6 +-
+ drivers/gpu/drm/i915/intel_bios.c | 30 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 911 +--
+ drivers/gpu/drm/i915/intel_cdclk.c | 60 +-
+ drivers/gpu/drm/i915/intel_color.c | 411 +-
+ drivers/gpu/drm/i915/intel_connector.c | 5 +-
+ drivers/gpu/drm/i915/intel_crt.c | 91 +-
+ drivers/gpu/drm/i915/intel_csr.c | 93 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 202 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 107 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 35 +-
+ drivers/gpu/drm/i915/intel_display.c | 876 ++-
+ drivers/gpu/drm/i915/intel_display.h | 6 +-
+ drivers/gpu/drm/i915/intel_dp.c | 643 +-
+ drivers/gpu/drm/i915/intel_dp_link_training.c | 32 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 97 +-
+ drivers/gpu/drm/i915/intel_dpio_phy.c | 18 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 302 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.h | 55 +-
+ drivers/gpu/drm/i915/intel_drv.h | 231 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 6 +-
+ drivers/gpu/drm/i915/intel_dsi_vbt.c | 24 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 12 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 430 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 35 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 12 +-
+ drivers/gpu/drm/i915/intel_fifo_underrun.c | 24 +-
+ drivers/gpu/drm/i915/intel_frontbuffer.c | 1 -
+ drivers/gpu/drm/i915/intel_gpu_commands.h | 1 -
+ drivers/gpu/drm/i915/intel_guc.h | 3 +
+ drivers/gpu/drm/i915/intel_guc_fw.c | 6 +-
+ drivers/gpu/drm/i915/intel_guc_log.c | 32 +-
+ drivers/gpu/drm/i915/intel_guc_submission.c | 25 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 12 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 207 +-
+ drivers/gpu/drm/i915/intel_hdcp.c | 21 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 59 +-
+ drivers/gpu/drm/i915/intel_hotplug.c | 8 +-
+ drivers/gpu/drm/i915/intel_huc.c | 8 +-
+ drivers/gpu/drm/i915/intel_huc_fw.c | 7 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 23 +-
+ drivers/gpu/drm/i915/intel_lpe_audio.c | 1 +
+ drivers/gpu/drm/i915/intel_lrc.c | 703 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 12 +-
+ drivers/gpu/drm/i915/intel_lspcon.c | 36 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 49 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 408 +-
+ drivers/gpu/drm/i915/intel_mocs.h | 1 -
+ drivers/gpu/drm/i915/intel_opregion.c | 1 -
+ drivers/gpu/drm/i915/intel_overlay.c | 48 +-
+ drivers/gpu/drm/i915/intel_panel.c | 102 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 32 +-
+ drivers/gpu/drm/i915/intel_pm.c | 1229 ++--
+ drivers/gpu/drm/i915/intel_psr.c | 83 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 699 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 289 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 594 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 123 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 145 +-
+ drivers/gpu/drm/i915/intel_tv.c | 727 ++-
+ drivers/gpu/drm/i915/intel_uc.c | 15 +-
+ drivers/gpu/drm/i915/intel_uc.h | 6 +-
+ drivers/gpu/drm/i915/intel_uc_fw.c | 11 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 511 +-
+ drivers/gpu/drm/i915/intel_vdsc.c | 5 +-
+ drivers/gpu/drm/i915/intel_wopcm.c | 6 +-
+ drivers/gpu/drm/i915/intel_workarounds.c | 199 +-
+ drivers/gpu/drm/i915/selftests/huge_pages.c | 42 +-
+ drivers/gpu/drm/i915/selftests/i915_active.c | 157 +
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 47 +-
+ .../gpu/drm/i915/selftests/i915_gem_coherency.c | 5 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 607 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 105 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 123 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_object.c | 22 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 3 +-
+ drivers/gpu/drm/i915/selftests/i915_random.c | 33 +-
+ drivers/gpu/drm/i915/selftests/i915_random.h | 3 +
+ drivers/gpu/drm/i915/selftests/i915_request.c | 524 +-
+ drivers/gpu/drm/i915/selftests/i915_selftest.c | 47 +
+ drivers/gpu/drm/i915/selftests/i915_timeline.c | 464 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 81 +-
+ drivers/gpu/drm/i915/selftests/igt_live_test.c | 78 +
+ drivers/gpu/drm/i915/selftests/igt_live_test.h | 35 +
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 91 +-
+ drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 470 --
+ drivers/gpu/drm/i915/selftests/intel_guc.c | 10 +-
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 417 +-
+ drivers/gpu/drm/i915/selftests/intel_lrc.c | 272 +-
+ drivers/gpu/drm/i915/selftests/intel_workarounds.c | 123 +-
+ drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 54 +
+ drivers/gpu/drm/i915/selftests/lib_sw_fence.h | 3 +
+ drivers/gpu/drm/i915/selftests/mock_context.c | 7 +-
+ drivers/gpu/drm/i915/selftests/mock_engine.c | 162 +-
+ drivers/gpu/drm/i915/selftests/mock_engine.h | 6 -
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 26 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 15 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.h | 4 +-
+ drivers/gpu/drm/i915/selftests/mock_timeline.c | 6 +-
+ drivers/gpu/drm/i915/vlv_dsi.c | 55 +-
+ drivers/gpu/drm/i915/vlv_dsi_pll.c | 31 +-
+ drivers/gpu/drm/imx/Kconfig | 3 +-
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 13 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 2 +-
+ drivers/gpu/drm/imx/imx-tve.c | 2 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 42 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 76 +-
+ drivers/gpu/drm/imx/ipuv3-plane.h | 2 +
+ drivers/gpu/drm/imx/parallel-display.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 9 +-
+ drivers/gpu/drm/meson/meson_crtc.c | 2 +-
+ drivers/gpu/drm/meson/meson_drv.c | 30 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 37 +-
+ drivers/gpu/drm/meson/meson_venc.c | 2 +
+ drivers/gpu/drm/meson/meson_venc_cvbs.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 1 +
+ drivers/gpu/drm/mgag200/mgag200_main.c | 8 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 13 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 34 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 13 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 3 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 5 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 37 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 14 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 19 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h | 220 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 44 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 44 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 7 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 65 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 36 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 51 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 27 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 325 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 28 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 28 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 12 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 11 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 +
+ drivers/gpu/drm/msm/dsi/dsi.h | 2 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 13 +-
+ drivers/gpu/drm/msm/edp/edp_bridge.c | 13 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 7 +-
+ drivers/gpu/drm/msm/msm_drv.c | 129 +-
+ drivers/gpu/drm/msm/msm_drv.h | 12 +-
+ drivers/gpu/drm/msm/msm_fb.c | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 31 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.h | 1 -
+ drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +-
+ drivers/gpu/drm/nouveau/Kbuild | 2 +
+ drivers/gpu/drm/nouveau/Kconfig | 12 +
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 214 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.c | 216 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.h | 5 +-
+ drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +
+ drivers/gpu/drm/nouveau/dispnv50/core.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/curs.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 145 +-
+ drivers/gpu/drm/nouveau/dispnv50/head.c | 1 +
+ drivers/gpu/drm/nouveau/dispnv50/wimm.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/class.h | 13 +-
+ drivers/gpu/drm/nouveau/include/nvif/clb069.h | 12 +
+ drivers/gpu/drm/nouveau/include/nvif/if000c.h | 30 +-
+ drivers/gpu/drm/nouveau/include/nvif/ifc00d.h | 21 +
+ drivers/gpu/drm/nouveau/include/nvif/vmm.h | 4 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 3 +
+ drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 3 +
+ .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 2 +
+ drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | 3 +
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | 2 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 2 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/fault.h | 4 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 14 +
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 6 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 1 +
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 12 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 32 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 309 +-
+ drivers/gpu/drm/nouveau/nouveau_display.h | 21 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 887 +++
+ drivers/gpu/drm/nouveau/nouveau_dmem.h | 60 +
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 248 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.h | 2 -
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 46 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 835 +++
+ drivers/gpu/drm/nouveau/nouveau_svm.h | 48 +
+ drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_vmm.h | 1 +
+ drivers/gpu/drm/nouveau/nv84_fence.c | 3 +-
+ drivers/gpu/drm/nouveau/nvif/disp.c | 2 +-
+ drivers/gpu/drm/nouveau/nvif/vmm.c | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 2 +-
+ .../nouveau/nvkm/engine/ce/{tu104.c => tu102.c} | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 86 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 15 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 16 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 7 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 12 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 3 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 2 +-
+ .../nvkm/engine/disp/{roottu104.c => roottu102.c} | 20 +-
+ .../nvkm/engine/disp/{sortu104.c => sortu102.c} | 14 +-
+ .../nouveau/nvkm/engine/disp/{tu104.c => tu102.c} | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 6 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 2 +-
+ .../engine/fifo/{gpfifotu104.c => gpfifotu102.c} | 10 +-
+ .../nouveau/nvkm/engine/fifo/{tu104.c => tu102.c} | 30 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/user.h | 2 +-
+ .../nvkm/engine/fifo/{usertu104.c => usertu102.c} | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 27 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 331 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 16 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 5 +
+ drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 23 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 3 +-
+ .../nvkm/engine/sec2/tu102.c} | 21 +-
+ drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 3 +
+ drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild | 2 +-
+ .../nouveau/nvkm/subdev/bar/{tu104.c => tu102.c} | 30 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 11 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 2 +-
+ .../nvkm/subdev/devinit/{tu104.c => tu102.c} | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 2 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c | 3 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c | 16 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h | 7 +
+ .../nouveau/nvkm/subdev/fault/{tu104.c => tu102.c} | 39 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c | 106 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c | 62 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 2 +-
+ .../nouveau/nvkm/subdev/mc/{tu104.c => tu102.c} | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h | 2 +-
+ .../nouveau/nvkm/subdev/mmu/{tu104.c => tu102.c} | 8 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 83 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 382 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 82 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 56 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk104.c | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk20a.c | 10 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm200.c | 22 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm20b.c | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 210 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c | 12 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgv100.c | 12 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c | 8 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv04.c | 15 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv41.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv44.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 6 +-
+ .../nvkm/subdev/mmu/{vmmtu104.c => vmmtu102.c} | 13 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 +-
+ .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c | 16 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 2 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c | 60 +
+ drivers/gpu/drm/omapdrm/omap_connector.c | 11 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 9 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
+ drivers/gpu/drm/omapdrm/omap_encoder.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 +
+ drivers/gpu/drm/panel/Kconfig | 30 +
+ drivers/gpu/drm/panel/Makefile | 3 +
+ drivers/gpu/drm/panel/panel-innolux-p079zca.c | 11 +-
+ drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 473 ++
+ drivers/gpu/drm/panel/panel-simple.c | 54 +
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 426 ++
+ drivers/gpu/drm/panel/panel-tpo-tpg110.c | 496 ++
+ drivers/gpu/drm/pl111/pl111_drv.c | 8 +-
+ drivers/gpu/drm/qxl/Makefile | 2 +-
+ drivers/gpu/drm/qxl/qxl_cmd.c | 36 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 340 +-
+ drivers/gpu/drm/qxl/qxl_draw.c | 241 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 6 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 64 +-
+ drivers/gpu/drm/qxl/qxl_dumb.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 300 -
+ drivers/gpu/drm/qxl/qxl_kms.c | 83 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 12 +-
+ drivers/gpu/drm/qxl/qxl_prime.c | 25 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 20 +-
+ drivers/gpu/drm/r128/r128_cce.c | 5 +-
+ drivers/gpu/drm/r128/r128_drv.c | 2 +-
+ drivers/gpu/drm/radeon/atom.c | 2 +
+ drivers/gpu/drm/radeon/ci_dpm.c | 2 +
+ drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
+ drivers/gpu/drm/radeon/radeon_acpi.c | 1 +
+ drivers/gpu/drm/radeon/radeon_audio.c | 14 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 1 +
+ drivers/gpu/drm/radeon/radeon_device.c | 1 +
+ drivers/gpu/drm/radeon/radeon_display.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 +
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
+ drivers/gpu/drm/radeon/si_dpm.c | 2 +
+ drivers/gpu/drm/rcar-du/Kconfig | 1 +
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 81 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 8 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 45 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 17 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_group.c | 51 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 79 +-
+ .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts | 93 +-
+ .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts | 53 +-
+ .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts | 53 +-
+ .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts | 53 +-
+ .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts | 53 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.h | 3 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 3 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 3 +-
+ drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 17 +
+ drivers/gpu/drm/rcar-du/rcar_lvds.c | 103 +-
+ drivers/gpu/drm/rcar-du/rcar_lvds.h | 27 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 38 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 39 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 3 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 163 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 15 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 180 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 53 +
+ drivers/gpu/drm/savage/savage_state.c | 4 +
+ drivers/gpu/drm/scheduler/sched_entity.c | 39 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 219 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 1 +
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 +
+ drivers/gpu/drm/sti/sti_crtc.c | 18 +-
+ drivers/gpu/drm/sti/sti_drv.c | 2 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 6 +-
+ drivers/gpu/drm/sti/sti_hda.c | 6 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 9 +-
+ drivers/gpu/drm/sti/sti_tvout.c | 2 +-
+ drivers/gpu/drm/stm/drv.c | 8 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 2 +-
+ drivers/gpu/drm/stm/ltdc.c | 15 +-
+ drivers/gpu/drm/sun4i/Kconfig | 3 +-
+ drivers/gpu/drm/sun4i/Makefile | 5 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 32 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 354 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.h | 52 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 5 +-
+ drivers/gpu/drm/sun4i/sun4i_layer.c | 63 +-
+ drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +-
+ drivers/gpu/drm/sun4i/sun6i_drc.c | 1 +
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 34 +-
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 17 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +-
+ drivers/gpu/drm/tegra/Makefile | 1 +
+ drivers/gpu/drm/tegra/drm.c | 57 +-
+ drivers/gpu/drm/tegra/drm.h | 5 +-
+ drivers/gpu/drm/tegra/fb.c | 2 +-
+ drivers/gpu/drm/tegra/hda.c | 63 +
+ drivers/gpu/drm/tegra/hda.h | 20 +
+ drivers/gpu/drm/tegra/hdmi.c | 222 +-
+ drivers/gpu/drm/tegra/hub.c | 4 +-
+ drivers/gpu/drm/tegra/output.c | 11 +-
+ drivers/gpu/drm/tegra/sor.c | 67 +-
+ drivers/gpu/drm/tegra/vic.c | 75 +-
+ drivers/gpu/drm/tegra/vic.h | 9 +
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 37 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 5 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 +
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 +
+ drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 +
+ drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 26 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 100 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 34 +-
+ drivers/gpu/drm/tinydrm/hx8357d.c | 3 +-
+ drivers/gpu/drm/tinydrm/ili9225.c | 151 +-
+ drivers/gpu/drm/tinydrm/ili9341.c | 3 +-
+ drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c | 97 +-
+ drivers/gpu/drm/tinydrm/repaper.c | 44 +-
+ drivers/gpu/drm/tinydrm/st7586.c | 87 +-
+ drivers/gpu/drm/tinydrm/st7735r.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 20 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 10 +-
+ drivers/gpu/drm/udl/udl_connector.c | 1 +
+ drivers/gpu/drm/udl/udl_drv.c | 1 +
+ drivers/gpu/drm/udl/udl_main.c | 1 +
+ drivers/gpu/drm/v3d/v3d_drv.h | 1 -
+ drivers/gpu/drm/v3d/v3d_gem.c | 60 +-
+ drivers/gpu/drm/v3d/v3d_sched.c | 13 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 45 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 1 -
+ drivers/gpu/drm/vc4/vc4_drv.h | 4 +
+ drivers/gpu/drm/vc4/vc4_dsi.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 34 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 7 +-
+ drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 145 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
+ drivers/gpu/drm/vgem/vgem_fence.c | 4 +-
+ drivers/gpu/drm/via/via_dmablit.c | 4 +
+ drivers/gpu/drm/via/via_drv.c | 3 +-
+ drivers/gpu/drm/virtio/Makefile | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 10 +-
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 103 -
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 84 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 26 +-
+ drivers/gpu/drm/virtio/virtgpu_fb.c | 191 -
+ drivers/gpu/drm/virtio/virtgpu_fence.c | 8 -
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 18 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 13 +
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 17 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 26 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 3 +-
+ drivers/gpu/drm/vkms/vkms_output.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 21 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 6 +-
+ drivers/gpu/drm/xen/xen_drm_front.c | 2 +-
+ drivers/gpu/drm/xen/xen_drm_front_conn.c | 3 +-
+ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +-
+ drivers/gpu/drm/xen/xen_drm_front_kms.c | 4 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 2 +-
+ drivers/gpu/drm/zte/zx_hdmi.c | 6 +-
+ drivers/gpu/drm/zte/zx_tvenc.c | 2 +-
+ drivers/gpu/drm/zte/zx_vga.c | 2 +-
+ drivers/gpu/drm/zte/zx_vou.c | 2 +-
+ drivers/gpu/host1x/bus.c | 35 +
+ drivers/gpu/host1x/cdma.c | 189 +-
+ drivers/gpu/host1x/cdma.h | 8 +-
+ drivers/gpu/host1x/dev.c | 49 +-
+ drivers/gpu/host1x/dev.h | 8 +
+ drivers/gpu/host1x/hw/cdma_hw.c | 46 +-
+ drivers/gpu/host1x/hw/channel_hw.c | 43 +-
+ drivers/gpu/host1x/hw/host1x06_hardware.h | 6 +
+ drivers/gpu/host1x/hw/host1x07_hardware.h | 6 +
+ drivers/gpu/host1x/hw/hw_host1x06_channel.h | 11 +
+ drivers/gpu/host1x/hw/hw_host1x07_channel.h | 11 +
+ drivers/gpu/ipu-v3/ipu-pre.c | 6 +
+ drivers/gpu/ipu-v3/ipu-prg.c | 16 +
+ drivers/gpu/ipu-v3/ipu-prv.h | 1 +
+ drivers/phy/allwinner/Kconfig | 12 +
+ drivers/phy/allwinner/Makefile | 1 +
+ .../allwinner/phy-sun6i-mipi-dphy.c} | 164 +-
+ drivers/staging/vboxvideo/TODO | 3 +
+ drivers/staging/vboxvideo/vbox_drv.c | 10 +-
+ drivers/staging/vboxvideo/vbox_fb.c | 23 +-
+ drivers/staging/vboxvideo/vbox_irq.c | 4 +-
+ drivers/staging/vboxvideo/vbox_mode.c | 9 +-
+ include/drm/bridge/dw_hdmi.h | 7 +-
+ include/drm/bridge/dw_mipi_dsi.h | 3 +-
+ include/drm/drmP.h | 26 +-
+ include/drm/drm_atomic.h | 54 +-
+ include/drm/drm_bridge.h | 8 +-
+ include/drm/drm_cache.h | 18 +
+ include/drm/drm_client.h | 2 +-
+ include/drm/drm_color_mgmt.h | 28 +
+ include/drm/drm_connector.h | 12 +-
+ include/drm/drm_crtc.h | 3 -
+ include/drm/drm_crtc_helper.h | 17 +-
+ include/drm/drm_damage_helper.h | 3 +
+ include/drm/drm_device.h | 288 +-
+ include/drm/drm_dp_helper.h | 37 +-
+ include/drm/drm_dp_mst_helper.h | 153 +-
+ include/drm/drm_drv.h | 135 +-
+ include/drm/drm_dsc.h | 233 +-
+ include/drm/drm_edid.h | 10 +-
+ include/drm/drm_encoder_slave.h | 1 -
+ include/drm/drm_fb_cma_helper.h | 22 -
+ include/drm/drm_file.h | 1 +
+ include/drm/drm_fourcc.h | 117 +
+ include/drm/drm_framebuffer.h | 10 +-
+ include/drm/drm_gem_cma_helper.h | 5 +-
+ include/drm/drm_gem_framebuffer_helper.h | 3 +
+ include/drm/drm_hdcp.h | 2 +
+ include/drm/drm_legacy.h | 14 +-
+ include/drm/drm_mode_config.h | 25 +-
+ include/drm/drm_modes.h | 21 +-
+ include/drm/drm_modeset_helper.h | 6 +-
+ include/drm/drm_modeset_helper_vtables.h | 2 +-
+ include/drm/drm_modeset_lock.h | 2 +-
+ include/drm/drm_probe_helper.h | 27 +
+ include/drm/drm_rect.h | 6 -
+ include/drm/drm_syncobj.h | 23 +-
+ include/drm/drm_util.h | 53 +-
+ include/drm/drm_vblank.h | 22 +
+ include/drm/gpu_scheduler.h | 13 +-
+ include/drm/i915_pciids.h | 8 +
+ include/drm/intel-gtt.h | 3 +
+ include/drm/tinydrm/mipi-dbi.h | 5 +-
+ include/drm/tinydrm/tinydrm-helpers.h | 20 +-
+ include/drm/tinydrm/tinydrm.h | 26 -
+ include/drm/ttm/ttm_bo_api.h | 28 -
+ include/drm/ttm/ttm_bo_driver.h | 11 +-
+ include/linux/dma-fence-array.h | 1 +
+ include/linux/dma-fence.h | 22 +-
+ include/linux/hdmi.h | 15 +
+ include/linux/mfd/intel_soc_pmic.h | 3 +
+ include/trace/events/host1x.h | 26 +
+ include/uapi/drm/amdgpu_drm.h | 9 +-
+ include/uapi/drm/drm_fourcc.h | 63 +
+ include/uapi/drm/i915_drm.h | 64 +
+ include/uapi/drm/nouveau_drm.h | 51 +
+ include/uapi/drm/v3d_drm.h | 8 +
+ include/video/imx-ipu-v3.h | 1 +
+ 1140 files changed, 39511 insertions(+), 37907 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ds90c185.txt
+ create mode 100644 Documentation/devicetree/bindings/display/msm/gmu.txt
+ rename Documentation/devicetree/bindings/display/panel/{auo,g101evn010 => auo,g101evn010.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
+ create mode 100644 Documentation/gpu/afbc.rst
+ create mode 100644 Documentation/gpu/dp-mst/topology-figure-1.dot
+ create mode 100644 Documentation/gpu/dp-mst/topology-figure-2.dot
+ create mode 100644 Documentation/gpu/dp-mst/topology-figure-3.dot
+ create mode 100644 Documentation/gpu/komeda-kms.rst
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.h
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/ci_smc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/Makefile
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce100/i2caux_dce100.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_sw_engine_dce110.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2caux_dce110.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce112/i2caux_dce112.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce120/i2caux_dce120.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_hw_engine_dce80.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2c_sw_engine_dce80.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dce80/i2caux_dce80.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/diagnostics/i2caux_diag.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_generic_hw_engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_hw_engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2c_sw_engine.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.h
+ rename drivers/gpu/drm/amd/display/dc/{i2caux/engine_base.c => inc/hw/vmid.h} (63%)
+ rename drivers/gpu/drm/amd/display/dc/{i2caux/dce110/i2c_sw_engine_dce110.h => inc/vm_helper.h} (64%)
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c
+ rename drivers/gpu/drm/amd/{display/dc/i2caux/dce80/i2c_sw_engine_dce80.h => powerplay/hwmgr/common_baco.h} (65%)
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c
+ rename drivers/gpu/drm/amd/{display/dc/i2caux/dce80/i2caux_dce80.h => powerplay/hwmgr/vega10_baco.h} (74%)
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c
+ rename drivers/gpu/drm/amd/{display/dc/i2caux/dce100/i2caux_dce100.h => powerplay/hwmgr/vega20_baco.h} (73%)
+ create mode 100644 drivers/gpu/drm/arm/display/Kbuild
+ create mode 100644 drivers/gpu/drm/arm/display/Kconfig
+ create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h
+ create mode 100644 drivers/gpu/drm/arm/display/include/malidp_product.h
+ create mode 100644 drivers/gpu/drm/arm/display/include/malidp_utils.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/Makefile
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_plane.c
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
+ delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
+ create mode 100644 drivers/gpu/drm/i915/i915_active.c
+ create mode 100644 drivers/gpu/drm/i915/i915_active.h
+ create mode 100644 drivers/gpu/drm/i915/i915_active_types.h
+ create mode 100644 drivers/gpu/drm/i915/i915_reset.c
+ create mode 100644 drivers/gpu/drm/i915/i915_reset.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_active.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_live_test.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_live_test.h
+ delete mode 100644 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/clb069.h
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_dmem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_dmem.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_svm.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_svm.h
+ rename drivers/gpu/drm/nouveau/nvkm/engine/ce/{tu104.c => tu102.c} (91%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{roottu104.c => roottu102.c} (74%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{sortu104.c => sortu102.c} (90%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{tu104.c => tu102.c} (93%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/fifo/{gpfifotu104.c => gpfifotu102.c} (91%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/fifo/{tu104.c => tu102.c} (82%)
+ rename drivers/gpu/drm/nouveau/nvkm/engine/fifo/{usertu104.c => usertu102.c} (86%)
+ rename drivers/gpu/drm/{amd/display/dc/i2caux/dce120/i2caux_dce120.h => nouveau/nvkm/engine/sec2/tu102.c} (77%)
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/bar/{tu104.c => tu102.c} (84%)
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/devinit/{tu104.c => tu102.c} (87%)
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/fault/{tu104.c => tu102.c} (82%)
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/mc/{tu104.c => tu102.c} (88%)
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/mmu/{tu104.c => tu102.c} (88%)
+ rename drivers/gpu/drm/nouveau/nvkm/subdev/mmu/{vmmtu104.c => vmmtu102.c} (89%)
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c
+ create mode 100644 drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
+ create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7701.c
+ create mode 100644 drivers/gpu/drm/panel/panel-tpo-tpg110.c
+ delete mode 100644 drivers/gpu/drm/qxl/qxl_fb.c
+ create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds.h
+ create mode 100644 drivers/gpu/drm/tegra/hda.c
+ create mode 100644 drivers/gpu/drm/tegra/hda.h
+ delete mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x06_channel.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x07_channel.h
+ rename drivers/{gpu/drm/sun4i/sun6i_mipi_dphy.c => phy/allwinner/phy-sun6i-mipi-dphy.c} (70%)
+ create mode 100644 include/drm/drm_probe_helper.h
+Merging drm-intel/for-linux-next (96e0adb4af42 drm/i915/opregion: rvda is relative from opregion base in opregion 2.1+)
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_active.c | 36 ++++++++----
+ drivers/gpu/drm/i915/i915_scheduler.c | 27 +++++----
+ drivers/gpu/drm/i915/intel_ddi.c | 7 +++
+ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 69 +++++++++++------------
+ 4 files changed, 83 insertions(+), 56 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (ca52507efc03 drm/tegra: vic: Fix implicit function declaration warning)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/hub.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/hub.c | 4 +++-
+ drivers/gpu/drm/tegra/vic.c | 2 ++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+Merging drm-misc/for-linux-next (37406a60fac7 drm: Merge __drm_atomic_helper_disable_all() into drm_atomic_helper_disable_all())
+$ git merge drm-misc/for-linux-next
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_atomic_helper.c | 59 ++++++++++++++++---------------------
+ 1 file changed, 26 insertions(+), 33 deletions(-)
+Merging drm-msm/msm-next (f1a427d9d238 drm/msm: Remove pm_runtime calls from msm_iommu.c)
+$ git merge drm-msm/msm-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/msm_gem.c | 7 +++++++
+ drivers/gpu/drm/msm/msm_iommu.c | 13 +------------
+ 2 files changed, 8 insertions(+), 12 deletions(-)
+Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up to date.
+Merging mali-dp/for-upstream/mali-dp (dcc9d76b6d83 drm/komeda: Off by one in komeda_fb_get_pixel_addr())
+$ git merge mali-dp/for-upstream/mali-dp
+Already up to date.
+Merging imx-drm/imx-drm/next (a0ea4ffff266 drm/imx: only send commit done event when all state has been applied)
+$ git merge imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (9e05352340d3 drm/etnaviv: potential NULL dereference)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_sched.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/gpu/drm/etnaviv/Kconfig | 1 -
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 2 --
+ drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 +
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 4 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 6 +++---
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +-
+ 10 files changed, 11 insertions(+), 13 deletions(-)
+Merging kconfig/for-next (bebc6082da0a Linux 4.14)
+$ git merge kconfig/for-next
+Already up to date.
+Merging regmap/for-next (66fb181d6f82 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regcache-rbtree.c | 2 +-
+ drivers/base/regmap/regmap-irq.c | 99 +++++++++++++++++++++++++++++++++--
+ include/linux/regmap.h | 31 +++++++++++
+ 3 files changed, 127 insertions(+), 5 deletions(-)
+Merging sound/for-next (a634090a0f24 ALSA: usb-audio: Add quirk for MOTU MicroBook II)
+$ git merge sound/for-next
+Already up to date.
+Merging sound-asoc/for-next (8f3d4afab208 Merge branch 'asoc-5.1' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ sound/soc/codecs/ab8500-codec.c | 1 +
+ sound/soc/codecs/hdmi-codec.c | 118 ++++++++++++++++-----------------
+ sound/soc/codecs/tlv320aic3x.c | 4 +-
+ sound/soc/mediatek/common/mtk-btcvsd.c | 69 ++++++++++++++++++-
+ sound/soc/stm/stm32_sai.c | 8 ++-
+ sound/soc/stm/stm32_sai_sub.c | 48 +++++++++++---
+ 6 files changed, 174 insertions(+), 74 deletions(-)
+Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2)
+$ git merge modules/modules-next
+Already up to date.
+Merging input/next (44466306ebec Input: ti_am335x_tsc - remove set but not used variable 'tscadc_dev')
+$ git merge input/next
+Removing include/linux/input/ili210x.h
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/keyboard/qt2160.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/cypress,tm2-touchkey.txt | 9 +-
+ .../devicetree/bindings/input/ilitek,ili2xxx.txt | 25 ++
+ .../devicetree/bindings/input/msm-vibrator.txt | 36 +++
+ .../bindings/input/touchscreen/edt-ft5x06.txt | 13 +-
+ .../bindings/input/touchscreen/goodix.txt | 14 +-
+ .../bindings/input/touchscreen/sitronix-st1232.txt | 8 +-
+ .../bindings/input/touchscreen/sx8654.txt | 10 +-
+ drivers/input/joystick/db9.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 10 +
+ drivers/input/keyboard/mcs_touchkey.c | 5 +-
+ drivers/input/keyboard/mtk-pmic-keys.c | 13 +-
+ drivers/input/keyboard/qt2160.c | 9 -
+ drivers/input/keyboard/tca6416-keypad.c | 4 +-
+ drivers/input/keyboard/tm2-touchkey.c | 136 ++++++---
+ drivers/input/misc/Kconfig | 10 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/ims-pcu.c | 27 +-
+ drivers/input/misc/msm-vibrator.c | 281 ++++++++++++++++++
+ drivers/input/misc/soc_button_array.c | 6 +-
+ drivers/input/mouse/synaptics_i2c.c | 22 +-
+ drivers/input/serio/i8042-sparcio.h | 21 +-
+ drivers/input/touchscreen/Kconfig | 6 +-
+ drivers/input/touchscreen/ad7879.c | 11 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 110 ++++++-
+ drivers/input/touchscreen/goodix.c | 6 +-
+ drivers/input/touchscreen/ili210x.c | 321 +++++++++++++--------
+ drivers/input/touchscreen/st1232.c | 154 ++++++----
+ drivers/input/touchscreen/stmfts.c | 30 +-
+ drivers/input/touchscreen/sx8654.c | 255 ++++++++++++++--
+ drivers/input/touchscreen/ti_am335x_tsc.c | 4 -
+ include/linux/input/ili210x.h | 11 -
+ 31 files changed, 1203 insertions(+), 367 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt
+ create mode 100644 Documentation/devicetree/bindings/input/msm-vibrator.txt
+ create mode 100644 drivers/input/misc/msm-vibrator.c
+ delete mode 100644 include/linux/input/ili210x.h
+Merging block/for-next (c6b7e26ecf51 Merge branch 'io_uring' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/sys_ni.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/readpage.c
+Auto-merging fs/ext4/page-io.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/compression.c
+Auto-merging fs/Makefile
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/mmc/core/queue.c
+Auto-merging drivers/block/rbd.c
+Resolved 'fs/btrfs/extent_io.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eec5ba3d4740] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biovecs.txt | 25 +
+ Documentation/filesystems/vfs.txt | 3 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 3 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 3 +
+ block/bfq-iosched.c | 705 ++++----
+ block/bfq-iosched.h | 11 +-
+ block/bfq-wf2q.c | 18 +-
+ block/bio.c | 111 +-
+ block/blk-cgroup.c | 2 +-
+ block/blk-merge.c | 231 ++-
+ block/blk-mq-debugfs.c | 3 -
+ block/blk-mq-sched.c | 2 +-
+ block/blk-mq-tag.c | 2 +-
+ block/blk-mq.c | 33 +-
+ block/blk-mq.h | 20 +-
+ block/blk-settings.c | 9 -
+ block/blk-sysfs.c | 22 +-
+ block/blk.h | 2 +-
+ block/bounce.c | 10 +-
+ block/elevator.c | 5 +-
+ block/genhd.c | 18 +-
+ drivers/ata/Kconfig | 12 +
+ drivers/ata/Makefile | 1 +
+ drivers/ata/libahci.c | 3 +-
+ drivers/ata/libata-scsi.c | 4 +-
+ drivers/ata/pata_buddha.c | 257 +++
+ drivers/ata/pata_macio.c | 2 +-
+ drivers/ata/pata_of_platform.c | 6 +-
+ drivers/ata/pata_platform.c | 24 +-
+ drivers/ata/pata_samsung_cf.c | 8 +-
+ drivers/block/floppy.c | 3 -
+ drivers/block/loop.c | 48 +-
+ drivers/block/mtip32xx/mtip32xx.c | 37 +-
+ drivers/block/nbd.c | 5 +-
+ drivers/block/null_blk_main.c | 3 +-
+ drivers/block/rbd.c | 2 +-
+ drivers/block/skd_main.c | 1 -
+ drivers/block/xen-blkfront.c | 2 +-
+ drivers/cdrom/cdrom.c | 7 +-
+ drivers/lightnvm/pblk-core.c | 8 +-
+ drivers/lightnvm/pblk-gc.c | 20 +-
+ drivers/lightnvm/pblk-init.c | 4 +-
+ drivers/lightnvm/pblk-map.c | 1 +
+ drivers/lightnvm/pblk-rb.c | 26 +-
+ drivers/lightnvm/pblk-recovery.c | 64 +-
+ drivers/lightnvm/pblk-rl.c | 5 +-
+ drivers/lightnvm/pblk-trace.h | 2 +-
+ drivers/lightnvm/pblk-write.c | 1 +
+ drivers/lightnvm/pblk.h | 17 +-
+ drivers/md/bcache/btree.c | 3 +-
+ drivers/md/bcache/extents.c | 13 +-
+ drivers/md/bcache/request.c | 7 +-
+ drivers/md/bcache/stats.c | 2 +-
+ drivers/md/bcache/super.c | 30 +-
+ drivers/md/bcache/sysfs.c | 81 +-
+ drivers/md/bcache/sysfs.h | 23 +-
+ drivers/md/bcache/util.c | 6 +-
+ drivers/md/bcache/writeback.h | 3 +
+ drivers/md/dm-crypt.c | 3 +-
+ drivers/md/dm-rq.c | 2 +-
+ drivers/md/dm-table.c | 13 -
+ drivers/md/md-linear.c | 3 +-
+ drivers/md/raid1.c | 9 +-
+ drivers/mmc/core/queue.c | 3 +-
+ drivers/nvme/host/core.c | 122 +-
+ drivers/nvme/host/fabrics.c | 11 +-
+ drivers/nvme/host/fabrics.h | 10 +-
+ drivers/nvme/host/fault_inject.c | 2 +-
+ drivers/nvme/host/fc.c | 14 +-
+ drivers/nvme/host/lightnvm.c | 16 +-
+ drivers/nvme/host/multipath.c | 96 +-
+ drivers/nvme/host/nvme.h | 21 +-
+ drivers/nvme/host/pci.c | 12 +-
+ drivers/nvme/host/rdma.c | 26 +-
+ drivers/nvme/host/tcp.c | 10 +-
+ drivers/nvme/host/trace.c | 10 +-
+ drivers/nvme/host/trace.h | 10 +-
+ drivers/nvme/target/admin-cmd.c | 10 +-
+ drivers/nvme/target/configfs.c | 10 +-
+ drivers/nvme/target/core.c | 10 +-
+ drivers/nvme/target/discovery.c | 12 +-
+ drivers/nvme/target/fabrics-cmd.c | 10 +-
+ drivers/nvme/target/fc.c | 14 +-
+ drivers/nvme/target/fcloop.c | 13 +-
+ drivers/nvme/target/io-cmd-bdev.c | 10 +-
+ drivers/nvme/target/loop.c | 10 +-
+ drivers/nvme/target/nvmet.h | 10 +-
+ drivers/nvme/target/rdma.c | 10 +-
+ drivers/scsi/scsi_lib.c | 2 +-
+ drivers/staging/erofs/data.c | 3 +-
+ drivers/staging/erofs/unzip_vle.c | 3 +-
+ fs/Makefile | 1 +
+ fs/block_dev.c | 28 +-
+ fs/btrfs/compression.c | 3 +-
+ fs/btrfs/disk-io.c | 3 +-
+ fs/btrfs/extent_io.c | 16 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/btrfs/raid56.c | 3 +-
+ fs/buffer.c | 12 +-
+ fs/crypto/bio.c | 3 +-
+ fs/direct-io.c | 4 +-
+ fs/exofs/ore.c | 3 +-
+ fs/exofs/ore_raid.c | 3 +-
+ fs/ext4/page-io.c | 3 +-
+ fs/ext4/readpage.c | 3 +-
+ fs/f2fs/data.c | 9 +-
+ fs/file.c | 15 +-
+ fs/file_table.c | 9 +-
+ fs/gfs2/file.c | 2 +
+ fs/gfs2/lops.c | 6 +-
+ fs/gfs2/meta_io.c | 3 +-
+ fs/io_uring.c | 2969 ++++++++++++++++++++++++++++++++
+ fs/iomap.c | 53 +-
+ fs/mpage.c | 3 +-
+ fs/xfs/xfs_aops.c | 9 +-
+ fs/xfs/xfs_file.c | 1 +
+ include/linux/ata_platform.h | 3 +-
+ include/linux/bio.h | 51 +-
+ include/linux/blk-mq.h | 1 -
+ include/linux/blkdev.h | 68 +-
+ include/linux/bvec.h | 123 +-
+ include/linux/file.h | 2 +
+ include/linux/fs.h | 15 +-
+ include/linux/iomap.h | 1 +
+ include/linux/nvme-fc-driver.h | 10 +-
+ include/linux/nvme-fc.h | 14 +-
+ include/linux/nvme-rdma.h | 10 +-
+ include/linux/nvme-tcp.h | 2 +-
+ include/linux/nvme.h | 10 +-
+ include/linux/sched/user.h | 2 +-
+ include/linux/syscalls.h | 8 +
+ include/net/af_unix.h | 1 +
+ include/uapi/asm-generic/unistd.h | 8 +-
+ include/uapi/linux/io_uring.h | 137 ++
+ include/uapi/linux/nvme_ioctl.h | 9 -
+ init/Kconfig | 9 +
+ kernel/sys_ni.c | 3 +
+ net/Makefile | 2 +-
+ net/unix/Kconfig | 5 +
+ net/unix/Makefile | 2 +
+ net/unix/af_unix.c | 63 +-
+ net/unix/garbage.c | 68 +-
+ net/unix/scm.c | 151 ++
+ net/unix/scm.h | 10 +
+ 144 files changed, 5167 insertions(+), 1290 deletions(-)
+ create mode 100644 drivers/ata/pata_buddha.c
+ create mode 100644 fs/io_uring.c
+ create mode 100644 include/uapi/linux/io_uring.h
+ create mode 100644 net/unix/scm.c
+ create mode 100644 net/unix/scm.h
+Merging device-mapper/for-next (cf603f07ca7d dm snapshot: don't define direct_access if we don't support it)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm-table.c
+Auto-merging drivers/md/dm-rq.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/cache.txt | 3 +
+ Documentation/device-mapper/dm-init.txt | 114 +++++++
+ drivers/md/Kconfig | 12 +
+ drivers/md/Makefile | 4 +
+ drivers/md/dm-cache-target.c | 127 ++++++--
+ drivers/md/dm-init.c | 303 +++++++++++++++++++
+ drivers/md/dm-integrity.c | 2 +-
+ drivers/md/dm-ioctl.c | 103 +++++++
+ drivers/md/dm-linear.c | 3 +-
+ drivers/md/dm-mpath.c | 13 +-
+ drivers/md/dm-raid.c | 14 +-
+ drivers/md/dm-rq.c | 16 +
+ drivers/md/dm-rq.h | 16 -
+ drivers/md/dm-snap.c | 8 -
+ drivers/md/dm-stripe.c | 3 +-
+ drivers/md/dm-switch.c | 3 +-
+ drivers/md/dm-table.c | 11 +
+ drivers/md/dm-thin.c | 14 +-
+ drivers/md/dm-verity-fec.c | 6 +-
+ drivers/md/dm-writecache.c | 2 +-
+ drivers/md/dm-zero.c | 1 +
+ drivers/md/dm-zoned-target.c | 1 -
+ drivers/md/dm.c | 412 ++++++++++++++++++--------
+ drivers/md/dm.h | 1 +
+ drivers/md/persistent-data/dm-block-manager.c | 8 +-
+ include/linux/device-mapper.h | 20 +-
+ include/uapi/linux/dm-ioctl.h | 4 +-
+ 27 files changed, 1013 insertions(+), 211 deletions(-)
+ create mode 100644 Documentation/device-mapper/dm-init.txt
+ create mode 100644 drivers/md/dm-init.c
+Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (d4721339dcca mmc:fix a bug when max_discard is 0)
+$ git merge mmc/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 +
+ Documentation/devicetree/bindings/mmc/mmc.txt | 2 +
+ .../bindings/mmc/nvidia,tegra20-sdhci.txt | 6 +-
+ Documentation/devicetree/bindings/mmc/ti-omap.txt | 28 --
+ MAINTAINERS | 9 +-
+ drivers/mmc/core/Makefile | 2 +-
+ drivers/mmc/core/block.c | 21 +-
+ drivers/mmc/core/core.c | 336 +--------------------
+ drivers/mmc/core/core.h | 1 +
+ drivers/mmc/core/host.c | 48 ++-
+ drivers/mmc/core/mmc.c | 10 +
+ drivers/mmc/core/mmc_ops.c | 2 +-
+ drivers/mmc/core/regulator.c | 260 ++++++++++++++++
+ drivers/mmc/core/sd.c | 20 +-
+ drivers/mmc/core/sd_ops.c | 33 +-
+ drivers/mmc/core/sd_ops.h | 3 -
+ drivers/mmc/core/sdio.c | 9 +-
+ drivers/mmc/core/sdio_bus.c | 3 +-
+ drivers/mmc/core/sdio_io.c | 29 +-
+ drivers/mmc/core/sdio_ops.h | 1 -
+ drivers/mmc/core/slot-gpio.c | 9 +-
+ drivers/mmc/host/Kconfig | 2 +
+ drivers/mmc/host/atmel-mci.c | 8 +-
+ drivers/mmc/host/bcm2835.c | 23 +-
+ drivers/mmc/host/cb710-mmc.c | 42 +--
+ drivers/mmc/host/davinci_mmc.c | 2 +-
+ drivers/mmc/host/jz4740_mmc.c | 73 +----
+ drivers/mmc/host/mmc_spi.c | 2 +-
+ drivers/mmc/host/mmci.c | 27 +-
+ drivers/mmc/host/mmci.h | 1 +
+ drivers/mmc/host/mxcmmc.c | 2 -
+ drivers/mmc/host/mxs-mmc.c | 2 -
+ drivers/mmc/host/of_mmc_spi.c | 22 +-
+ drivers/mmc/host/omap.c | 2 +-
+ drivers/mmc/host/pxamci.c | 2 +-
+ drivers/mmc/host/renesas_sdhi.h | 2 +
+ drivers/mmc/host/renesas_sdhi_core.c | 19 +-
+ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 +
+ drivers/mmc/host/s3cmci.c | 2 +-
+ drivers/mmc/host/sdhci-bcm-kona.c | 2 -
+ drivers/mmc/host/sdhci-brcmstb.c | 4 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 301 +++++++++++++++---
+ drivers/mmc/host/sdhci-omap.c | 1 -
+ drivers/mmc/host/sdhci-pci-core.c | 10 -
+ drivers/mmc/host/sdhci-pci-o2micro.c | 140 ++++++++-
+ drivers/mmc/host/sdhci-pci.h | 6 +-
+ drivers/mmc/host/sdhci-pxav2.c | 1 -
+ drivers/mmc/host/sdhci-tegra.c | 286 ++++++++++++++----
+ drivers/mmc/host/sdhci-xenon-phy.c | 2 +-
+ drivers/mmc/host/sdhci.c | 27 +-
+ drivers/mmc/host/sdhci.h | 6 +
+ drivers/mmc/host/sdhci_am654.c | 2 +-
+ drivers/mmc/host/sunxi-mmc.c | 2 -
+ drivers/mmc/host/tmio_mmc_core.c | 3 +-
+ drivers/mmc/host/wmt-sdmmc.c | 1 -
+ include/linux/mmc/card.h | 3 +
+ include/linux/mmc/host.h | 12 +-
+ include/linux/mmc/sd.h | 6 +
+ include/linux/mmc/slot-gpio.h | 2 +-
+ 59 files changed, 1198 insertions(+), 686 deletions(-)
+ create mode 100644 drivers/mmc/core/regulator.c
+Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/kdb/kdb_support.c
+Auto-merging kernel/debug/kdb/kdb_main.c
+Auto-merging kernel/debug/kdb/kdb_bt.c
+CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
+Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a7ed0995b3d6] Merge remote-tracking branch 'kgdb/kgdb-next'
+$ git diff -M --stat --summary HEAD^..
+Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
+$ git merge md/for-next
+Already up to date.
+Merging mfd/for-mfd-next (d2d833e0bf2b mfd: mxs-lradc: Mark expected switch fall-through)
+$ git merge mfd/for-mfd-next
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
+Auto-merging drivers/input/misc/Makefile
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging MAINTAINERS
+Resolved 'drivers/mfd/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b871bd9866b8] Merge remote-tracking branch 'mfd/for-mfd-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-chromeos | 32 ++
+ .../sysfs-class-chromeos-driver-cros-ec-lightbar | 74 ++++
+ .../sysfs-class-chromeos-driver-cros-ec-vbc | 6 +
+ .../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 ++
+ .../devicetree/bindings/input/st,stpmic1-onkey.txt | 28 ++
+ .../bindings/input/touchscreen/stmpe.txt | 116 ++++--
+ .../devicetree/bindings/mfd/aspeed-lpc.txt | 2 +
+ .../devicetree/bindings/mfd/cirrus,lochnagar.txt | 68 ++++
+ .../devicetree/bindings/mfd/st,stpmic1.txt | 61 ++++
+ Documentation/devicetree/bindings/mfd/stmpe.txt | 28 +-
+ .../bindings/watchdog/st,stpmic1-wdt.txt | 11 +
+ MAINTAINERS | 17 +
+ drivers/iio/adc/Kconfig | 7 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/stmpe-adc.c | 363 +++++++++++++++++++
+ drivers/input/misc/Kconfig | 11 +
+ drivers/input/misc/Makefile | 2 +
+ drivers/input/misc/stpmic1_onkey.c | 198 ++++++++++
+ drivers/input/touchscreen/stmpe-ts.c | 66 +---
+ drivers/mfd/Kconfig | 42 ++-
+ drivers/mfd/Makefile | 4 +
+ drivers/mfd/aat2870-core.c | 40 +--
+ drivers/mfd/adp5520.c | 30 +-
+ drivers/mfd/as3711.c | 14 -
+ drivers/mfd/at91-usart.c | 24 +-
+ drivers/mfd/cros_ec.c | 14 +-
+ drivers/mfd/cros_ec_dev.c | 91 ++---
+ drivers/mfd/cros_ec_dev.h | 6 -
+ drivers/mfd/db8500-prcmu.c | 10 +-
+ drivers/mfd/htc-i2cpld.c | 18 +-
+ drivers/mfd/intel-lpss-acpi.c | 1 -
+ drivers/mfd/intel-lpss-pci.c | 1 -
+ drivers/mfd/intel-lpss.h | 2 +
+ drivers/mfd/lochnagar-i2c.c | 398 +++++++++++++++++++++
+ drivers/mfd/max8925-core.c | 7 +-
+ drivers/mfd/mxs-lradc.c | 2 +-
+ drivers/mfd/rc5t583.c | 14 -
+ drivers/mfd/sec-core.c | 16 +-
+ drivers/mfd/sm501.c | 6 +-
+ drivers/mfd/sta2x11-mfd.c | 10 +-
+ drivers/mfd/stmpe.c | 68 ++++
+ drivers/mfd/stpmic1.c | 213 +++++++++++
+ drivers/mfd/syscon.c | 12 +-
+ drivers/mfd/tps65090.c | 30 +-
+ drivers/mfd/tps65218.c | 89 +++++
+ drivers/mfd/tps65910.c | 18 +-
+ drivers/mfd/tps68470.c | 1 -
+ drivers/mfd/tps80031.c | 37 +-
+ drivers/mfd/tqmx86.c | 281 +++++++++++++++
+ drivers/mfd/wm831x-core.c | 15 +-
+ drivers/mfd/wm831x-i2c.c | 20 +-
+ drivers/mfd/wm831x-spi.c | 24 +-
+ drivers/mfd/wm8350-core.c | 30 +-
+ drivers/mfd/wm8350-i2c.c | 24 +-
+ drivers/mfd/wm8400-core.c | 18 +-
+ drivers/platform/chrome/Kconfig | 47 ++-
+ drivers/platform/chrome/Makefile | 7 +-
+ drivers/platform/chrome/cros_ec_debugfs.c | 62 ++--
+ drivers/platform/chrome/cros_ec_i2c.c | 10 -
+ drivers/platform/chrome/cros_ec_lightbar.c | 126 ++++---
+ drivers/platform/chrome/cros_ec_lpc.c | 4 -
+ drivers/platform/chrome/cros_ec_spi.c | 11 -
+ drivers/platform/chrome/cros_ec_sysfs.c | 36 +-
+ drivers/platform/chrome/cros_ec_vbc.c | 59 ++-
+ drivers/watchdog/Kconfig | 12 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/stpmic1_wdt.c | 139 +++++++
+ include/dt-bindings/clk/lochnagar.h | 26 ++
+ include/dt-bindings/mfd/st,stpmic1.h | 50 +++
+ include/dt-bindings/pinctrl/lochnagar.h | 132 +++++++
+ include/linux/mfd/cros_ec.h | 21 --
+ include/linux/mfd/lochnagar.h | 55 +++
+ include/linux/mfd/lochnagar1_regs.h | 157 ++++++++
+ include/linux/mfd/lochnagar2_regs.h | 291 +++++++++++++++
+ include/linux/mfd/stmpe.h | 21 ++
+ include/linux/mfd/stpmic1.h | 212 +++++++++++
+ include/linux/mfd/tps65218.h | 4 +
+ include/linux/mfd/wm831x/core.h | 1 -
+ include/linux/mfd/wm8350/core.h | 1 -
+ 79 files changed, 3571 insertions(+), 656 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos
+ create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-lightbar
+ create mode 100644 Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-vbc
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
+ create mode 100644 Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/st,stpmic1.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt
+ create mode 100644 drivers/iio/adc/stmpe-adc.c
+ create mode 100644 drivers/input/misc/stpmic1_onkey.c
+ create mode 100644 drivers/mfd/lochnagar-i2c.c
+ create mode 100644 drivers/mfd/stpmic1.c
+ create mode 100644 drivers/mfd/tqmx86.c
+ create mode 100644 drivers/watchdog/stpmic1_wdt.c
+ create mode 100644 include/dt-bindings/clk/lochnagar.h
+ create mode 100644 include/dt-bindings/mfd/st,stpmic1.h
+ create mode 100644 include/dt-bindings/pinctrl/lochnagar.h
+ create mode 100644 include/linux/mfd/lochnagar.h
+ create mode 100644 include/linux/mfd/lochnagar1_regs.h
+ create mode 100644 include/linux/mfd/lochnagar2_regs.h
+ create mode 100644 include/linux/mfd/stpmic1.h
+Merging backlight/for-backlight-next (cec2b18832e2 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/pwm_bl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging battery/for-next (655ab0bc462d power: reset: at91-reset: add support for sam9x60 SoC)
+$ git merge battery/for-next
+Removing include/linux/power/isp1704_charger.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/atmel-sysregs.txt | 3 +-
+ .../devicetree/bindings/power/supply/battery.txt | 2 +
+ .../devicetree/bindings/power/supply/sc27xx-fg.txt | 8 +-
+ drivers/power/reset/at91-reset.c | 13 +++
+ drivers/power/supply/axp288_fuel_gauge.c | 14 +---
+ drivers/power/supply/bq25890_charger.c | 4 +-
+ drivers/power/supply/bq27xxx_battery.c | 20 +----
+ drivers/power/supply/charger-manager.c | 18 ++--
+ drivers/power/supply/cpcap-charger.c | 1 +
+ drivers/power/supply/ds2782_battery.c | 8 +-
+ drivers/power/supply/goldfish_battery.c | 88 +++++++++++++-------
+ drivers/power/supply/isp1704_charger.c | 60 +++-----------
+ drivers/power/supply/max17042_battery.c | 10 +++
+ drivers/power/supply/power_supply_core.c | 5 +-
+ drivers/power/supply/sc27xx_fuel_gauge.c | 95 ++++++++++++++++++++--
+ drivers/power/supply/twl4030_charger.c | 4 +-
+ include/linux/power/isp1704_charger.h | 30 -------
+ include/linux/power_supply.h | 1 +
+ 18 files changed, 221 insertions(+), 163 deletions(-)
+ delete mode 100644 include/linux/power/isp1704_charger.h
+Merging regulator/for-next (218965f160f6 Merge branch 'regulator-5.1' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging include/linux/mfd/tps65218.h
+Auto-merging arch/sh/boards/mach-ecovec24/setup.c
+CONFLICT (modify/delete): arch/arm/mach-pxa/raumfeld.c deleted in HEAD and modified in regulator/for-next. Version regulator/for-next of arch/arm/mach-pxa/raumfeld.c left in tree.
+Removing Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-pxa/raumfeld.c
+arch/arm/mach-pxa/raumfeld.c: needs merge
+rm 'arch/arm/mach-pxa/raumfeld.c'
+$ git commit -v -a
+[master e30b0d6d2673] Merge remote-tracking branch 'regulator/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 1 +
+ .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 17 +
+ .../devicetree/bindings/regulator/fan53555.txt | 3 +-
+ .../bindings/regulator/fixed-regulator.txt | 35 --
+ .../bindings/regulator/fixed-regulator.yaml | 67 +++
+ .../bindings/regulator/max77650-regulator.txt | 41 ++
+ .../devicetree/bindings/regulator/pfuze100.txt | 2 +-
+ .../bindings/regulator/rohm,bd70528-regulator.txt | 68 +++
+ .../bindings/regulator/rohm,bd71837-regulator.txt | 38 ++
+ .../bindings/regulator/st,stpmic1-regulator.txt | 6 +-
+ .../devicetree/bindings/regulator/tps65218.txt | 9 +-
+ arch/arm/mach-imx/mach-mx21ads.c | 1 -
+ arch/arm/mach-imx/mach-mx27ads.c | 2 +-
+ arch/arm/mach-mmp/brownstone.c | 1 -
+ arch/arm/mach-omap1/board-ams-delta.c | 2 -
+ arch/arm/mach-omap2/pdata-quirks.c | 1 -
+ arch/arm/mach-pxa/em-x270.c | 1 -
+ arch/arm/mach-pxa/ezx.c | 3 +-
+ arch/arm/mach-pxa/hx4700.c | 23 +-
+ arch/arm/mach-pxa/magician.c | 23 +-
+ arch/arm/mach-pxa/zeus.c | 3 +-
+ arch/arm/mach-sa1100/assabet.c | 1 -
+ arch/sh/boards/mach-ecovec24/setup.c | 2 -
+ .../intel-mid/device_libs/platform_bcm43xx.c | 1 -
+ drivers/regulator/88pm8607.c | 38 +-
+ drivers/regulator/Kconfig | 27 +-
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/act8865-regulator.c | 5 +-
+ drivers/regulator/act8945a-regulator.c | 11 +-
+ drivers/regulator/arizona-ldo1.c | 56 +--
+ drivers/regulator/as3722-regulator.c | 2 +-
+ drivers/regulator/axp20x-regulator.c | 9 +-
+ drivers/regulator/bd70528-regulator.c | 289 ++++++++++++
+ drivers/regulator/bd718x7-regulator.c | 215 +++++++--
+ drivers/regulator/bd9571mwv-regulator.c | 8 +-
+ drivers/regulator/core.c | 76 ++--
+ drivers/regulator/cpcap-regulator.c | 106 +++--
+ drivers/regulator/da9055-regulator.c | 46 +-
+ drivers/regulator/da9062-regulator.c | 37 +-
+ drivers/regulator/da9063-regulator.c | 37 +-
+ drivers/regulator/da9210-regulator.c | 53 +--
+ drivers/regulator/fan53555.c | 109 ++++-
+ drivers/regulator/fixed.c | 35 +-
+ drivers/regulator/gpio-regulator.c | 194 +++-----
+ drivers/regulator/helpers.c | 125 +++++-
+ drivers/regulator/hi655x-regulator.c | 1 -
+ drivers/regulator/isl6271a-regulator.c | 13 +-
+ drivers/regulator/lm363x-regulator.c | 6 +-
+ drivers/regulator/lochnagar-regulator.c | 3 +-
+ drivers/regulator/lp3971.c | 4 +-
+ drivers/regulator/lp3972.c | 4 +-
+ drivers/regulator/lp872x.c | 82 +---
+ drivers/regulator/lp873x-regulator.c | 51 +--
+ drivers/regulator/lp8755.c | 6 +-
+ drivers/regulator/lp87565-regulator.c | 4 +-
+ drivers/regulator/lp8788-buck.c | 40 +-
+ drivers/regulator/lp8788-ldo.c | 4 +-
+ drivers/regulator/ltc3676.c | 65 +--
+ drivers/regulator/max14577-regulator.c | 1 -
+ drivers/regulator/max77620-regulator.c | 2 +
+ drivers/regulator/max77650-regulator.c | 498 +++++++++++++++++++++
+ drivers/regulator/max77802-regulator.c | 6 +-
+ drivers/regulator/mc13783-regulator.c | 4 +-
+ drivers/regulator/mc13892-regulator.c | 8 +-
+ drivers/regulator/mc13xxx-regulator-core.c | 4 +-
+ drivers/regulator/mc13xxx.h | 4 +-
+ drivers/regulator/mcp16502.c | 2 +-
+ drivers/regulator/mt6311-regulator.c | 10 +-
+ drivers/regulator/of_regulator.c | 4 +-
+ drivers/regulator/palmas-regulator.c | 2 +-
+ drivers/regulator/pv88060-regulator.c | 62 +--
+ drivers/regulator/pv88080-regulator.c | 55 +--
+ drivers/regulator/pv88090-regulator.c | 53 +--
+ drivers/regulator/pwm-regulator.c | 17 +-
+ drivers/regulator/qcom_smd-regulator.c | 104 +++--
+ drivers/regulator/rk808-regulator.c | 64 +--
+ drivers/regulator/rt5033-regulator.c | 4 +-
+ drivers/regulator/s5m8767.c | 8 +-
+ drivers/regulator/stm32-vrefbuf.c | 121 ++++-
+ drivers/regulator/stpmic1_regulator.c | 293 ++++++------
+ drivers/regulator/tps65218-regulator.c | 18 +-
+ drivers/regulator/twl-regulator.c | 7 +-
+ drivers/regulator/twl6030-regulator.c | 88 ++--
+ drivers/regulator/wm831x-dcdc.c | 81 +---
+ include/linux/mfd/tps65218.h | 3 +-
+ include/linux/regulator/driver.h | 30 +-
+ include/linux/regulator/fixed.h | 10 -
+ include/linux/regulator/gpio-regulator.h | 18 +-
+ 88 files changed, 2327 insertions(+), 1368 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
+ create mode 100644 drivers/regulator/bd70528-regulator.c
+ create mode 100644 drivers/regulator/max77650-regulator.c
+Merging security/next-testing (0d556c66dadd Merge branch 'next-general' into next-testing)
+$ git merge security/next-testing
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging security/smack/smack_lsm.c
+Auto-merging security/smack/smack.h
+Auto-merging security/selinux/hooks.c
+Removing security/selinux/exports.c
+Auto-merging security/security.c
+Auto-merging security/keys/request_key.c
+Auto-merging security/keys/process_keys.c
+Auto-merging security/keys/keyring.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/domain.c
+Auto-merging kernel/seccomp.c
+Removing include/linux/selinux.h
+Auto-merging include/linux/security.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging fs/proc/internal.h
+Auto-merging fs/proc/base.c
+Auto-merging fs/namei.c
+Auto-merging arch/x86/kernel/kexec-bzimage64.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/LSM/SafeSetID.rst | 107 ++++
+ Documentation/admin-guide/LSM/index.rst | 14 +-
+ Documentation/admin-guide/kernel-parameters.txt | 12 +-
+ MAINTAINERS | 11 +-
+ arch/x86/kernel/kexec-bzimage64.c | 14 +-
+ certs/system_keyring.c | 23 +-
+ drivers/char/tpm/eventlog/tpm1.c | 41 +-
+ drivers/char/tpm/eventlog/tpm2.c | 12 +-
+ drivers/char/tpm/st33zp24/i2c.c | 2 +-
+ drivers/char/tpm/st33zp24/spi.c | 2 +-
+ drivers/char/tpm/st33zp24/st33zp24.c | 2 +-
+ drivers/char/tpm/st33zp24/st33zp24.h | 4 +-
+ drivers/char/tpm/tpm-chip.c | 124 +++-
+ drivers/char/tpm/tpm-dev-common.c | 44 +-
+ drivers/char/tpm/tpm-interface.c | 327 +++-------
+ drivers/char/tpm/tpm-sysfs.c | 138 ++--
+ drivers/char/tpm/tpm.h | 180 +-----
+ drivers/char/tpm/tpm1-cmd.c | 43 +-
+ drivers/char/tpm/tpm2-cmd.c | 208 +++---
+ drivers/char/tpm/tpm2-space.c | 90 ++-
+ drivers/char/tpm/tpm_atmel.c | 2 +-
+ drivers/char/tpm/tpm_crb.c | 22 +-
+ drivers/char/tpm/tpm_i2c_atmel.c | 15 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 17 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 18 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 8 +-
+ drivers/char/tpm/tpm_infineon.c | 2 +-
+ drivers/char/tpm/tpm_nsc.c | 2 +-
+ drivers/char/tpm/tpm_ppi.c | 78 ++-
+ drivers/char/tpm/tpm_tis_core.c | 21 +-
+ drivers/char/tpm/tpm_vtpm_proxy.c | 15 +-
+ drivers/char/tpm/xen-tpmfront.c | 4 +-
+ fs/namei.c | 1 +
+ fs/proc/base.c | 64 +-
+ fs/proc/internal.h | 1 +
+ include/keys/system_keyring.h | 8 +
+ include/linux/capability.h | 5 +
+ include/linux/cred.h | 1 -
+ include/linux/ima.h | 5 +
+ include/linux/lsm_hooks.h | 45 +-
+ include/linux/security.h | 43 +-
+ include/linux/selinux.h | 35 --
+ include/linux/tpm.h | 129 +++-
+ include/linux/tpm_eventlog.h | 19 +-
+ include/linux/verification.h | 1 +
+ kernel/capability.c | 45 +-
+ kernel/cred.c | 13 -
+ kernel/seccomp.c | 4 +-
+ kernel/sys.c | 10 +-
+ security/Kconfig | 45 +-
+ security/Makefile | 2 +
+ security/apparmor/Kconfig | 16 -
+ security/apparmor/capability.c | 14 +-
+ security/apparmor/domain.c | 4 +-
+ security/apparmor/include/capability.h | 2 +-
+ security/apparmor/include/cred.h | 16 +-
+ security/apparmor/include/file.h | 5 +-
+ security/apparmor/include/lib.h | 4 +
+ security/apparmor/include/task.h | 18 +-
+ security/apparmor/ipc.c | 3 +-
+ security/apparmor/lsm.c | 67 +-
+ security/apparmor/resource.c | 2 +-
+ security/apparmor/task.c | 6 +-
+ security/commoncap.c | 28 +-
+ security/integrity/digsig.c | 3 +
+ security/integrity/evm/evm_crypto.c | 3 +-
+ security/integrity/evm/evm_main.c | 6 +-
+ security/integrity/ima/ima.h | 1 +
+ security/integrity/ima/ima_appraise.c | 1 +
+ security/integrity/ima/ima_crypto.c | 10 +-
+ security/integrity/ima/ima_init.c | 4 +
+ security/integrity/ima/ima_main.c | 35 +-
+ security/integrity/ima/ima_policy.c | 4 +
+ security/integrity/ima/ima_queue.c | 27 +-
+ security/integrity/ima/ima_template_lib.c | 1 +
+ security/keys/encrypted-keys/encrypted.c | 4 +-
+ security/keys/keyring.c | 1 +
+ security/keys/process_keys.c | 3 +
+ security/keys/request_key.c | 4 +
+ security/keys/trusted.c | 73 ++-
+ security/loadpin/loadpin.c | 8 +-
+ security/safesetid/Kconfig | 14 +
+ security/safesetid/Makefile | 7 +
+ security/safesetid/lsm.c | 277 ++++++++
+ security/safesetid/lsm.h | 33 +
+ security/safesetid/securityfs.c | 193 ++++++
+ security/security.c | 648 +++++++++++++++++--
+ security/selinux/Kconfig | 15 -
+ security/selinux/Makefile | 2 +-
+ security/selinux/exports.c | 23 -
+ security/selinux/hooks.c | 362 +++--------
+ security/selinux/include/audit.h | 3 -
+ security/selinux/include/objsec.h | 38 +-
+ security/selinux/selinuxfs.c | 4 +-
+ security/selinux/ss/services.c | 1 -
+ security/selinux/xfrm.c | 4 +-
+ security/smack/smack.h | 44 +-
+ security/smack/smack_access.c | 6 +-
+ security/smack/smack_lsm.c | 317 ++++------
+ security/smack/smackfs.c | 18 +-
+ security/tomoyo/audit.c | 31 +-
+ security/tomoyo/common.c | 199 ++++--
+ security/tomoyo/common.h | 51 +-
+ security/tomoyo/condition.c | 59 +-
+ security/tomoyo/domain.c | 76 ++-
+ security/tomoyo/file.c | 20 +
+ security/tomoyo/gc.c | 19 +
+ security/tomoyo/group.c | 5 +
+ security/tomoyo/load_policy.c | 8 +-
+ security/tomoyo/memory.c | 9 +-
+ security/tomoyo/mount.c | 2 +
+ security/tomoyo/realpath.c | 18 +-
+ security/tomoyo/securityfs_if.c | 30 +-
+ security/tomoyo/tomoyo.c | 160 +++--
+ security/tomoyo/util.c | 23 +-
+ security/yama/yama_lsm.c | 8 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/safesetid/.gitignore | 1 +
+ tools/testing/selftests/safesetid/Makefile | 8 +
+ tools/testing/selftests/safesetid/config | 2 +
+ tools/testing/selftests/safesetid/safesetid-test.c | 334 ++++++++++
+ .../testing/selftests/safesetid/safesetid-test.sh | 26 +
+ tools/testing/selftests/tpm2/Makefile | 4 +
+ tools/testing/selftests/tpm2/test_smoke.sh | 4 +
+ tools/testing/selftests/tpm2/test_space.sh | 4 +
+ tools/testing/selftests/tpm2/tpm2.py | 696 +++++++++++++++++++++
+ tools/testing/selftests/tpm2/tpm2_tests.py | 227 +++++++
+ 127 files changed, 4637 insertions(+), 1848 deletions(-)
+ create mode 100644 Documentation/admin-guide/LSM/SafeSetID.rst
+ delete mode 100644 include/linux/selinux.h
+ create mode 100644 security/safesetid/Kconfig
+ create mode 100644 security/safesetid/Makefile
+ create mode 100644 security/safesetid/lsm.c
+ create mode 100644 security/safesetid/lsm.h
+ create mode 100644 security/safesetid/securityfs.c
+ delete mode 100644 security/selinux/exports.c
+ create mode 100644 tools/testing/selftests/safesetid/.gitignore
+ create mode 100644 tools/testing/selftests/safesetid/Makefile
+ create mode 100644 tools/testing/selftests/safesetid/config
+ create mode 100644 tools/testing/selftests/safesetid/safesetid-test.c
+ create mode 100755 tools/testing/selftests/safesetid/safesetid-test.sh
+ create mode 100644 tools/testing/selftests/tpm2/Makefile
+ create mode 100755 tools/testing/selftests/tpm2/test_smoke.sh
+ create mode 100755 tools/testing/selftests/tpm2/test_space.sh
+ create mode 100644 tools/testing/selftests/tpm2/tpm2.py
+ create mode 100644 tools/testing/selftests/tpm2/tpm2_tests.py
+Merging apparmor/apparmor-next (df4d55f2e1b8 apparmor: fix double free when unpack of secmark rules fails)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/apparmorfs.c
+Auto-merging security/apparmor/Kconfig
+Merge made by the 'recursive' strategy.
+ security/apparmor/Kconfig | 2 +
+ security/apparmor/apparmorfs.c | 131 ++++++++++++++++++++++++++++--
+ security/apparmor/include/apparmor.h | 1 +
+ security/apparmor/include/policy_unpack.h | 8 +-
+ security/apparmor/lsm.c | 47 +++++++++++
+ security/apparmor/policy_unpack.c | 104 +++++++++++++++++++++++-
+ 6 files changed, 285 insertions(+), 8 deletions(-)
+Merging integrity/next-integrity (e7fde070f39b evm: Use defined constant for UUID representation)
+$ git merge integrity/next-integrity
+Already up to date.
+Merging selinux/next (45189a1998e0 selinux: fix avc audit messages)
+$ git merge selinux/next
+Auto-merging security/selinux/ss/services.c
+Auto-merging security/selinux/include/security.h
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/avc.c | 199 +++++++++++++++++-------------------
+ security/selinux/hooks.c | 58 ++++++++---
+ security/selinux/include/avc.h | 6 +-
+ security/selinux/include/security.h | 3 +
+ security/selinux/ss/services.c | 37 ++++++-
+ 5 files changed, 176 insertions(+), 127 deletions(-)
+Merging tpmdd/next (5812f97c0a22 tpm: Fix the type of the return value in calc_tpm2_event_size())
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/eventlog/tpm2.c | 4 +-
+ include/keys/trusted.h | 2 +-
+ security/keys/trusted.c | 4 +-
+ tools/testing/selftests/tpm2/tpm2.py | 5 ++-
+ tools/testing/selftests/tpm2/tpm2_tests.py | 63 ++++++++++++++++++++++++++++++
+ 5 files changed, 71 insertions(+), 7 deletions(-)
+Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through)
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-watchdog | 23 ++
+ .../devicetree/bindings/watchdog/renesas-wdt.txt | 1 +
+ Documentation/watchdog/mlx-wdt.txt | 52 ++++
+ drivers/watchdog/Kconfig | 25 +-
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/dw_wdt.c | 2 -
+ drivers/watchdog/mlx_wdt.c | 290 +++++++++++++++++++++
+ drivers/watchdog/pc87413_wdt.c | 2 +-
+ drivers/watchdog/pika_wdt.c | 2 +-
+ drivers/watchdog/qcom-wdt.c | 23 ++
+ drivers/watchdog/sbc60xxwdt.c | 2 +-
+ drivers/watchdog/sc1200wdt.c | 2 +-
+ drivers/watchdog/sc520_wdt.c | 2 +-
+ drivers/watchdog/smsc37b787_wdt.c | 2 +-
+ drivers/watchdog/w83877f_wdt.c | 2 +-
+ include/linux/platform_data/mlxreg.h | 19 ++
+ 16 files changed, 437 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/watchdog/mlx-wdt.txt
+ create mode 100644 drivers/watchdog/mlx_wdt.c
+Merging iommu/next (d05e4c8600c3 Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'arm/mediatek', 'x86/vt-d', 'x86/amd', 'hyper-v' and 'core' into next)
+$ git merge iommu/next
+Auto-merging include/linux/pci.h
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/iommu/nvidia,tegra20-gart.txt | 14 -
+ .../memory-controllers/nvidia,tegra20-mc.txt | 27 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/tegra20.dtsi | 15 +-
+ arch/x86/kernel/cpu/mshyperv.c | 12 +
+ drivers/Makefile | 2 +-
+ drivers/iommu/Kconfig | 17 +-
+ drivers/iommu/Makefile | 1 +
+ drivers/iommu/amd_iommu.c | 28 +-
+ drivers/iommu/amd_iommu_init.c | 20 +-
+ drivers/iommu/amd_iommu_v2.c | 24 --
+ drivers/iommu/arm-smmu-v3.c | 3 +-
+ drivers/iommu/arm-smmu.c | 2 +-
+ drivers/iommu/dma-iommu.c | 3 +-
+ drivers/iommu/hyperv-iommu.c | 196 +++++++++
+ drivers/iommu/intel-iommu.c | 158 +++----
+ drivers/iommu/intel-pasid.c | 2 +-
+ drivers/iommu/intel-svm.c | 88 ++--
+ drivers/iommu/intel_irq_remapping.c | 32 +-
+ drivers/iommu/io-pgtable-arm-v7s.c | 6 +-
+ drivers/iommu/io-pgtable-arm.c | 3 +-
+ drivers/iommu/io-pgtable.c | 5 +-
+ drivers/iommu/iommu-debugfs.c | 23 +-
+ drivers/iommu/iommu.c | 16 +-
+ drivers/iommu/ipmmu-vmsa.c | 3 +-
+ drivers/iommu/irq_remapping.c | 3 +
+ drivers/iommu/irq_remapping.h | 1 +
+ drivers/iommu/msm_iommu.c | 10 +-
+ drivers/iommu/mtk_iommu.h | 3 +-
+ drivers/iommu/mtk_iommu_v1.c | 2 +-
+ drivers/iommu/qcom_iommu.c | 2 +-
+ drivers/iommu/tegra-gart.c | 473 ++++++++-------------
+ drivers/iommu/tegra-smmu.c | 4 -
+ drivers/memory/tegra/mc.c | 118 +++--
+ drivers/memory/tegra/mc.h | 10 +-
+ drivers/pci/ats.c | 57 +++
+ include/linux/intel-iommu.h | 21 +-
+ include/linux/intel-svm.h | 2 +-
+ {drivers/iommu => include/linux}/io-pgtable.h | 0
+ include/linux/iommu.h | 6 +-
+ include/linux/pci-ats.h | 5 +
+ include/linux/pci.h | 2 +
+ include/soc/tegra/mc.h | 27 +-
+ include/uapi/linux/pci_regs.h | 2 +
+ 44 files changed, 838 insertions(+), 611 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt
+ create mode 100644 drivers/iommu/hyperv-iommu.c
+ rename {drivers/iommu => include/linux}/io-pgtable.h (100%)
+Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
+$ git merge dwmw2-iommu/master
+Already up to date.
+Merging vfio/next (0cfd027be1d6 vfio_pci: Enable memory accesses before calling pci_map_rom)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/mdev/mdev_core.c | 16 ++--
+ drivers/vfio/mdev/mdev_private.h | 5 +-
+ drivers/vfio/mdev/mdev_sysfs.c | 6 +-
+ drivers/vfio/pci/vfio_pci.c | 90 ++++++++++++++++++----
+ drivers/vfio/pci/vfio_pci_config.c | 2 +-
+ drivers/vfio/pci/vfio_pci_private.h | 6 ++
+ drivers/vfio/platform/reset/Makefile | 2 -
+ .../vfio/platform/reset/vfio_platform_amdxgbe.c | 2 +-
+ .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 2 +-
+ .../platform/reset/vfio_platform_calxedaxgmac.c | 2 +-
+ drivers/vfio/vfio.c | 8 +-
+ drivers/vfio/vfio_iommu_spapr_tce.c | 3 +-
+ include/linux/mdev.h | 2 +-
+ samples/vfio-mdev/mbochs.c | 8 +-
+ samples/vfio-mdev/mdpy.c | 8 +-
+ samples/vfio-mdev/mtty.c | 17 ++--
+ 16 files changed, 125 insertions(+), 54 deletions(-)
+Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
+$ git merge trivial/for-next
+Already up to date.
+Merging audit/next (131d34cb0795 audit: mark expected switch fall-through)
+$ git merge audit/next
+Auto-merging security/smack/smack_lsm.c
+Auto-merging security/selinux/ss/services.c
+Auto-merging security/selinux/include/audit.h
+Auto-merging security/security.c
+Auto-merging security/integrity/ima/ima_policy.c
+Auto-merging security/integrity/ima/ima.h
+Auto-merging security/commoncap.c
+Auto-merging include/linux/security.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/capability.h
+Auto-merging fs/proc/base.c
+Auto-merging fs/namespace.c
+Auto-merging fs/namei.c
+Merge made by the 'recursive' strategy.
+ drivers/tty/tty_audit.c | 2 +-
+ fs/namei.c | 2 +-
+ fs/namespace.c | 2 +
+ fs/proc/base.c | 6 +-
+ include/linux/audit.h | 66 ++++----
+ include/linux/capability.h | 5 +-
+ include/linux/lsm_hooks.h | 4 +-
+ include/linux/namei.h | 3 +
+ include/linux/sched.h | 4 +-
+ include/linux/security.h | 5 +-
+ init/init_task.c | 2 +-
+ kernel/audit.c | 267 ++++++++++++------------------
+ kernel/audit.h | 81 +++++----
+ kernel/audit_fsnotify.c | 2 +-
+ kernel/audit_tree.c | 19 ++-
+ kernel/audit_watch.c | 2 +-
+ kernel/auditfilter.c | 6 +-
+ kernel/auditsc.c | 320 +++++++++++++++++++++++-------------
+ security/apparmor/audit.c | 3 +-
+ security/apparmor/include/audit.h | 3 +-
+ security/commoncap.c | 2 +
+ security/integrity/ima/ima.h | 3 +-
+ security/integrity/ima/ima_policy.c | 6 +-
+ security/security.c | 6 +-
+ security/selinux/include/audit.h | 4 +-
+ security/selinux/ss/services.c | 3 +-
+ security/smack/smack_lsm.c | 4 +-
+ 27 files changed, 440 insertions(+), 392 deletions(-)
+Merging devicetree/for-next (935665c1a117 of: unittest: unflatten device tree on UML when testing)
+$ git merge devicetree/for-next
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
+CONFLICT (modify/delete): Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt left in tree.
+Removing Documentation/devicetree/bindings/arm/l2c2x0.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
+Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt: needs merge
+rm 'Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt'
+$ git commit -v -a
+[master d888cba31c36] Merge remote-tracking branch 'devicetree/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/l2c2x0.txt | 114 ---------
+ Documentation/devicetree/bindings/arm/l2c2x0.yaml | 248 ++++++++++++++++++
+ .../bindings/display/sitronix,st7735r.txt | 2 +-
+ .../bindings/interrupt-controller/arm,gic-v3.txt | 175 -------------
+ .../bindings/interrupt-controller/arm,gic-v3.yaml | 279 +++++++++++++++++++++
+ .../bindings/interrupt-controller/arm,gic.txt | 171 -------------
+ .../bindings/interrupt-controller/arm,gic.yaml | 223 ++++++++++++++++
+ .../bindings/serial/renesas,sci-serial.txt | 2 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 7 +
+ drivers/of/of_reserved_mem.c | 6 +-
+ drivers/of/unittest.c | 15 +-
+ include/linux/of_reserved_mem.h | 7 -
+ scripts/dtc/dtx_diff | 13 +-
+ 14 files changed, 788 insertions(+), 476 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/l2c2x0.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/l2c2x0.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
+Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (e6a9a55b2cb4 Merge branch 'spi-5.1' into spi-next)
+$ git merge spi/for-next
+Removing drivers/mtd/spi-nor/fsl-quadspi.c
+Auto-merging drivers/mtd/spi-nor/Makefile
+Auto-merging drivers/mtd/spi-nor/Kconfig
+CONFLICT (modify/delete): arch/mips/ath79/dev-spi.h deleted in HEAD and modified in spi/for-next. Version spi/for-next of arch/mips/ath79/dev-spi.h left in tree.
+Auto-merging arch/arm/mach-pxa/zeus.c
+Auto-merging arch/arm/mach-pxa/magician.c
+Auto-merging arch/arm/mach-pxa/hx4700.c
+Auto-merging arch/arm/mach-pxa/em-x270.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/mips/ath79/dev-spi.h
+arch/mips/ath79/dev-spi.h: needs merge
+rm 'arch/mips/ath79/dev-spi.h'
+$ git commit -v -a
+[master ef4424a38377] Merge remote-tracking branch 'spi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/spi/atmel-quadspi.txt | 12 +-
+ .../devicetree/bindings/spi/fsl-imx-cspi.txt | 1 +
+ .../{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} | 18 +-
+ .../devicetree/bindings/spi/spi-nxp-fspi.txt | 39 +
+ .../devicetree/bindings/spi/spi-sifive.txt | 37 +
+ Documentation/devicetree/bindings/spi/spi-sprd.txt | 7 +
+ .../devicetree/bindings/spi/spi-stm32.txt | 9 +-
+ Documentation/spi/pxa2xx | 10 +-
+ MAINTAINERS | 12 +-
+ arch/arm/mach-pxa/cm-x255.c | 2 +-
+ arch/arm/mach-pxa/cm-x270.c | 2 +-
+ arch/arm/mach-pxa/corgi.c | 2 +-
+ arch/arm/mach-pxa/devices.c | 2 +-
+ arch/arm/mach-pxa/em-x270.c | 4 +-
+ arch/arm/mach-pxa/hx4700.c | 2 +-
+ arch/arm/mach-pxa/icontrol.c | 4 +-
+ arch/arm/mach-pxa/littleton.c | 2 +-
+ arch/arm/mach-pxa/lubbock.c | 2 +-
+ arch/arm/mach-pxa/magician.c | 2 +-
+ arch/arm/mach-pxa/pcm027.c | 2 +-
+ arch/arm/mach-pxa/poodle.c | 2 +-
+ arch/arm/mach-pxa/spitz.c | 2 +-
+ arch/arm/mach-pxa/stargate2.c | 6 +-
+ arch/arm/mach-pxa/tosa.c | 2 +-
+ arch/arm/mach-pxa/z2.c | 4 +-
+ arch/arm/mach-pxa/zeus.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/mtd/spi-nor/Kconfig | 9 -
+ drivers/mtd/spi-nor/Makefile | 1 -
+ drivers/mtd/spi-nor/fsl-quadspi.c | 1224 -----------------
+ drivers/spi/Kconfig | 36 +-
+ drivers/spi/Makefile | 3 +
+ drivers/spi/atmel-quadspi.c | 270 ++--
+ drivers/spi/spi-ath79.c | 114 +-
+ drivers/spi/spi-atmel.c | 102 +-
+ drivers/spi/spi-bcm2835aux.c | 2 +-
+ drivers/spi/spi-bitbang.c | 13 -
+ drivers/spi/spi-cadence.c | 84 +-
+ drivers/spi/spi-clps711x.c | 23 +-
+ drivers/spi/spi-davinci.c | 54 +-
+ drivers/spi/spi-dw-mmio.c | 22 -
+ drivers/spi/spi-dw.c | 18 +-
+ drivers/spi/spi-fsl-dspi.c | 40 +-
+ drivers/spi/spi-fsl-qspi.c | 966 ++++++++++++++
+ drivers/spi/spi-geni-qcom.c | 56 +-
+ drivers/spi/spi-mem.c | 69 +
+ drivers/spi/spi-mxs.c | 5 +
+ drivers/spi/spi-nxp-fspi.c | 1106 +++++++++++++++
+ drivers/spi/spi-pl022.c | 30 +-
+ drivers/spi/spi-pxa2xx-dma.c | 58 +-
+ drivers/spi/spi-pxa2xx-pci.c | 4 +-
+ drivers/spi/spi-pxa2xx.c | 158 +--
+ drivers/spi/spi-pxa2xx.h | 4 +-
+ drivers/spi/spi-rspi.c | 170 +--
+ drivers/spi/spi-sh-hspi.c | 39 +-
+ drivers/spi/spi-sh-msiof.c | 184 +--
+ drivers/spi/spi-sifive.c | 448 +++++++
+ drivers/spi/spi-sprd.c | 344 ++++-
+ drivers/spi/spi-stm32.c | 1403 +++++++++++++++-----
+ drivers/spi/spi.c | 115 +-
+ .../linux/platform_data/spi-ath79.h | 0
+ include/linux/spi/pxa2xx_spi.h | 4 +-
+ include/linux/spi/spi-mem.h | 5 +
+ include/linux/spi/spi.h | 29 +-
+ include/trace/events/spi.h | 31 +-
+ 65 files changed, 5003 insertions(+), 2431 deletions(-)
+ rename Documentation/devicetree/bindings/{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} (73%)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.txt
+ delete mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c
+ create mode 100644 drivers/spi/spi-fsl-qspi.c
+ create mode 100644 drivers/spi/spi-nxp-fspi.c
+ create mode 100644 drivers/spi/spi-sifive.c
+ rename arch/mips/include/asm/mach-ath79/ath79_spi_platform.h => include/linux/platform_data/spi-ath79.h (100%)
+Merging tip/auto-latest (371f210ec2a3 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging virt/kvm/kvm_main.c
+Removing tools/perf/util/drv_configs.h
+Removing tools/perf/util/drv_configs.c
+Auto-merging tools/perf/util/bpf-loader.c
+Auto-merging net/compat.c
+Auto-merging kernel/time/timer.c
+CONFLICT (content): Merge conflict in kernel/time/timer.c
+Auto-merging kernel/time/hrtimer.c
+CONFLICT (content): Merge conflict in kernel/time/hrtimer.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sys_ni.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/bpf/syscall.c
+Auto-merging kernel/bpf/core.c
+Auto-merging ipc/mqueue.c
+Auto-merging init/init_task.c
+Auto-merging include/uapi/linux/time.h
+CONFLICT (content): Merge conflict in include/uapi/linux/time.h
+Auto-merging include/uapi/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/filter.h
+Auto-merging include/linux/efi.h
+Auto-merging fs/locks.c
+Auto-merging fs/exec.c
+Auto-merging fs/aio.c
+Auto-merging drivers/scsi/be2iscsi/be_main.c
+Auto-merging drivers/perf/xgene_pmu.c
+Auto-merging drivers/nvme/host/pci.c
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/hwtracing/coresight/coresight-priv.h
+Auto-merging drivers/firmware/efi/runtime-wrappers.c
+Auto-merging drivers/firmware/efi/cper.c
+Auto-merging drivers/firmware/efi/arm-runtime.c
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/x86/realmode/rm/Makefile
+Removing arch/x86/platform/efi/early_printk.c
+Auto-merging arch/x86/kernel/kexec-bzimage64.c
+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/x86/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Removing arch/sh/include/uapi/asm/unistd_32.h
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/nios2/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/csky/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Kbuild
+CONFLICT (content): Merge conflict in Kbuild
+Auto-merging Documentation/sysctl/kernel.txt
+Auto-merging Documentation/arm64/silicon-errata.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'Kbuild' 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 'include/uapi/asm-generic/unistd.h' using previous resolution.
+Resolved 'include/uapi/linux/time.h' using previous resolution.
+Resolved 'kernel/time/hrtimer.c' using previous resolution.
+Resolved 'kernel/time/timer.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1939e404df53] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../Expedited-Grace-Periods/ExpSchedFlow.svg | 18 +-
+ .../Expedited-Grace-Periods.html | 26 +-
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 6 +-
+ .../TreeRCU-callback-invocation.svg | 2 +-
+ .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 8 +-
+ .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 6 +-
+ .../RCU/Design/Requirements/Requirements.html | 20 +-
+ Documentation/RCU/stallwarn.txt | 15 +-
+ Documentation/RCU/torture.txt | 169 +-
+ Documentation/RCU/whatisRCU.txt | 4 +-
+ Documentation/admin-guide/kernel-parameters.txt | 48 +-
+ Documentation/arm64/silicon-errata.txt | 2 +
+ Documentation/core-api/refcount-vs-atomic.rst | 24 +-
+ .../bindings/interrupt-controller/fsl,irqsteer.txt | 11 +-
+ .../interrupt-controller/loongson,ls1x-intc.txt | 24 +
+ .../devicetree/bindings/timer/fsl,imxgpt.txt | 39 +-
+ .../bindings/timer/mediatek,mtk-timer.txt | 11 +-
+ .../bindings/timer/nvidia,tegra210-timer.txt | 36 +
+ .../devicetree/bindings/timer/renesas,cmt.txt | 2 +
+ .../devicetree/bindings/timer/renesas,tmu.txt | 1 +
+ Documentation/kdump/vmcoreinfo.txt | 495 +++++
+ Documentation/power/energy-model.txt | 144 ++
+ Documentation/scheduler/sched-energy.txt | 425 ++++
+ Documentation/sysctl/kernel.txt | 12 +
+ Documentation/userspace-api/spec_ctrl.rst | 27 +-
+ Kbuild | 13 +
+ MAINTAINERS | 26 +-
+ arch/Kconfig | 15 +-
+ arch/alpha/include/asm/unistd.h | 21 -
+ arch/alpha/include/uapi/asm/unistd.h | 10 +
+ arch/alpha/kernel/osf_sys.c | 5 +-
+ arch/alpha/kernel/perf_event.c | 7 +-
+ arch/alpha/kernel/syscalls/syscall.tbl | 22 +-
+ arch/arc/Kconfig | 1 +
+ arch/arc/include/uapi/asm/unistd.h | 2 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/unistd.h | 5 +-
+ arch/arm/kernel/sys_oabi-compat.c | 8 +-
+ arch/arm/mach-imx/mmdc.c | 9 +-
+ arch/arm/mm/cache-l2x0-pmu.c | 9 +-
+ arch/arm/tools/syscall.tbl | 85 +-
+ arch/arm64/include/asm/atomic.h | 237 +-
+ arch/arm64/include/asm/atomic_ll_sc.h | 28 +-
+ arch/arm64/include/asm/atomic_lse.h | 38 +-
+ arch/arm64/include/asm/cmpxchg.h | 60 +-
+ arch/arm64/include/asm/sync_bitops.h | 16 +-
+ arch/arm64/include/asm/unistd.h | 2 +-
+ arch/arm64/include/asm/unistd32.h | 99 +-
+ arch/arm64/include/uapi/asm/unistd.h | 2 +
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/uapi/asm/unistd.h | 2 +
+ arch/csky/Kconfig | 1 +
+ arch/csky/include/uapi/asm/unistd.h | 2 +
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/uapi/asm/unistd.h | 2 +
+ arch/hexagon/Kconfig | 1 +
+ arch/hexagon/include/uapi/asm/unistd.h | 2 +
+ arch/ia64/include/asm/unistd.h | 14 -
+ arch/ia64/include/uapi/asm/unistd.h | 2 +
+ arch/ia64/kernel/syscalls/syscall.tbl | 11 +-
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/unistd.h | 4 +-
+ arch/m68k/kernel/syscalls/syscall.tbl | 88 +-
+ arch/microblaze/Kconfig | 1 +
+ arch/microblaze/include/asm/unistd.h | 4 +-
+ arch/microblaze/kernel/syscalls/syscall.tbl | 83 +-
+ arch/mips/Kconfig | 1 +
+ arch/mips/include/asm/unistd.h | 17 +-
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 77 +-
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 7 +-
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 85 +-
+ arch/nds32/Kconfig | 1 +
+ arch/nds32/include/uapi/asm/unistd.h | 2 +
+ arch/nios2/Kconfig | 1 +
+ arch/nios2/include/uapi/asm/unistd.h | 2 +
+ arch/openrisc/Kconfig | 1 +
+ arch/openrisc/include/uapi/asm/unistd.h | 2 +
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/include/asm/unistd.h | 13 +-
+ arch/parisc/kernel/syscalls/syscall.tbl | 109 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/unistd.h | 8 +-
+ arch/powerpc/kernel/syscalls/syscall.tbl | 134 +-
+ arch/powerpc/perf/hv-24x7.c | 10 +-
+ arch/powerpc/perf/hv-gpci.c | 10 +-
+ arch/powerpc/perf/imc-pmu.c | 19 +-
+ arch/riscv/include/uapi/asm/unistd.h | 1 +
+ arch/riscv/kernel/vdso/Makefile | 2 +
+ arch/s390/include/asm/unistd.h | 7 +-
+ arch/s390/kernel/perf_cpum_sf.c | 6 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 87 +-
+ arch/sh/Kconfig | 1 +
+ arch/sh/include/asm/unistd.h | 4 +-
+ arch/sh/include/uapi/asm/unistd_32.h | 403 ----
+ arch/sh/kernel/syscalls/syscall.tbl | 88 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/unistd.h | 13 +-
+ arch/sparc/kernel/sys_sparc_64.c | 61 +-
+ arch/sparc/kernel/syscalls/syscall.tbl | 116 +-
+ arch/unicore32/Kconfig | 1 +
+ arch/unicore32/include/uapi/asm/unistd.h | 4 +-
+ arch/x86/Kconfig | 6 +-
+ arch/x86/Kconfig.debug | 10 -
+ arch/x86/Makefile | 6 +-
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/compressed/Makefile | 2 +
+ arch/x86/boot/compressed/acpi.c | 338 +++
+ arch/x86/boot/compressed/cmdline.c | 4 -
+ arch/x86/boot/compressed/head_64.S | 11 +-
+ arch/x86/boot/compressed/kaslr.c | 75 +-
+ arch/x86/boot/compressed/misc.c | 3 +
+ arch/x86/boot/compressed/misc.h | 23 +-
+ arch/x86/boot/compressed/pgtable_64.c | 19 +-
+ arch/x86/boot/compressed/vmlinux.lds.S | 2 +-
+ arch/x86/boot/setup.ld | 2 +-
+ arch/x86/boot/string.c | 141 ++
+ arch/x86/boot/string.h | 1 +
+ arch/x86/configs/i386_defconfig | 2 +
+ arch/x86/configs/x86_64_defconfig | 3 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 85 +-
+ arch/x86/entry/syscalls/syscall_64.tbl | 6 +-
+ arch/x86/events/amd/ibs.c | 13 +-
+ arch/x86/events/amd/iommu.c | 6 +-
+ arch/x86/events/amd/power.c | 10 +-
+ arch/x86/events/amd/uncore.c | 7 +-
+ arch/x86/events/intel/bts.c | 4 +-
+ arch/x86/events/intel/core.c | 137 +-
+ arch/x86/events/intel/cstate.c | 12 +-
+ arch/x86/events/intel/ds.c | 2 +
+ arch/x86/events/intel/lbr.c | 1 +
+ arch/x86/events/intel/pt.c | 14 +-
+ arch/x86/events/intel/rapl.c | 9 +-
+ arch/x86/events/intel/uncore.c | 9 +-
+ arch/x86/events/intel/uncore_snb.c | 9 +-
+ arch/x86/events/msr.c | 10 +-
+ arch/x86/events/perf_event.h | 15 +-
+ arch/x86/include/asm/alternative.h | 39 +-
+ arch/x86/include/asm/asm-prototypes.h | 1 -
+ arch/x86/include/asm/bitops.h | 6 -
+ arch/x86/include/asm/cpu_device_id.h | 33 +-
+ arch/x86/include/asm/efi.h | 1 -
+ arch/x86/include/asm/fpu/internal.h | 57 +-
+ arch/x86/include/asm/fpu/types.h | 7 +
+ arch/x86/include/asm/mce.h | 7 +
+ arch/x86/include/asm/msr.h | 16 +-
+ arch/x86/include/asm/pgtable_64.h | 3 +-
+ arch/x86/include/asm/processor.h | 1 -
+ arch/x86/include/asm/refcount.h | 22 +-
+ arch/x86/include/asm/special_insns.h | 13 +
+ arch/x86/include/asm/string_32.h | 104 -
+ arch/x86/include/asm/string_64.h | 15 -
+ arch/x86/include/asm/uaccess.h | 3 -
+ arch/x86/include/asm/unistd.h | 8 +-
+ arch/x86/include/asm/uv/bios.h | 5 -
+ arch/x86/kernel/acpi/wakeup_32.S | 2 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 12 +-
+ arch/x86/kernel/alternative.c | 7 +-
+ arch/x86/kernel/apic/io_apic.c | 2 +
+ arch/x86/kernel/cpu/amd.c | 8 +-
+ arch/x86/kernel/cpu/bugs.c | 12 +
+ arch/x86/kernel/cpu/cacheinfo.c | 1 +
+ arch/x86/kernel/cpu/common.c | 12 +-
+ arch/x86/kernel/cpu/match.c | 31 +
+ arch/x86/kernel/cpu/mce/amd.c | 62 +-
+ arch/x86/kernel/cpu/mce/apei.c | 10 +-
+ arch/x86/kernel/cpu/mce/core.c | 30 -
+ arch/x86/kernel/cpu/mce/severity.c | 5 +
+ arch/x86/kernel/cpu/mtrr/cleanup.c | 3 +-
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 7 -
+ arch/x86/kernel/e820.c | 9 +-
+ arch/x86/kernel/early_printk.c | 4 -
+ arch/x86/kernel/fpu/xstate.c | 2 +-
+ arch/x86/kernel/ftrace.c | 3 +-
+ arch/x86/kernel/hw_breakpoint.c | 5 +-
+ arch/x86/kernel/kexec-bzimage64.c | 4 +-
+ arch/x86/kernel/kgdb.c | 1 +
+ arch/x86/kernel/kprobes/core.c | 7 +
+ arch/x86/kernel/kprobes/opt.c | 4 +-
+ arch/x86/kernel/machine_kexec_64.c | 3 +
+ arch/x86/kernel/process.c | 12 +
+ arch/x86/kernel/smpboot.c | 7 +-
+ arch/x86/kernel/traps.c | 6 +-
+ arch/x86/kernel/uprobes.c | 1 +
+ arch/x86/kernel/vmlinux.lds.S | 4 +-
+ arch/x86/lib/insn-eval.c | 2 +
+ arch/x86/mm/cpu_entry_area.c | 2 +-
+ arch/x86/mm/dump_pagetables.c | 2 -
+ arch/x86/mm/ioremap.c | 4 +-
+ arch/x86/mm/tlb.c | 3 -
+ arch/x86/platform/efi/Makefile | 1 -
+ arch/x86/platform/efi/early_printk.c | 240 --
+ arch/x86/platform/efi/quirks.c | 6 +-
+ arch/x86/platform/uv/bios_uv.c | 16 +-
+ arch/x86/platform/uv/tlb_uv.c | 8 +-
+ arch/x86/realmode/rm/Makefile | 2 +-
+ arch/x86/realmode/rm/realmode.lds.S | 2 +-
+ arch/x86/um/Kconfig | 1 +
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/include/asm/unistd.h | 14 +-
+ arch/xtensa/kernel/syscalls/syscall.tbl | 78 +-
+ drivers/clocksource/Kconfig | 13 +-
+ drivers/clocksource/Makefile | 6 +-
+ drivers/clocksource/arm_arch_timer.c | 55 +
+ drivers/clocksource/exynos_mct.c | 48 +-
+ .../{cs5535-clockevt.c => timer-cs5535.c} | 0
+ drivers/clocksource/{pxa_timer.c => timer-pxa.c} | 0
+ drivers/clocksource/timer-riscv.c | 23 +-
+ drivers/clocksource/timer-sun5i.c | 10 +
+ .../{tango_xtal.c => timer-tango-xtal.c} | 0
+ drivers/clocksource/timer-tegra20.c | 370 +++-
+ drivers/edac/mce_amd.c | 291 ++-
+ drivers/firmware/efi/Kconfig | 6 +
+ drivers/firmware/efi/Makefile | 1 +
+ drivers/firmware/efi/apple-properties.c | 13 +-
+ drivers/firmware/efi/arm-init.c | 6 +-
+ drivers/firmware/efi/arm-runtime.c | 6 +-
+ drivers/firmware/efi/capsule-loader.c | 4 +-
+ drivers/firmware/efi/capsule.c | 4 +-
+ drivers/firmware/efi/cper-arm.c | 14 +-
+ drivers/firmware/efi/cper.c | 14 +-
+ drivers/firmware/efi/dev-path-parser.c | 9 +-
+ drivers/firmware/efi/earlycon.c | 206 ++
+ drivers/firmware/efi/efi-bgrt.c | 5 +-
+ drivers/firmware/efi/efi-pstore.c | 2 +
+ drivers/firmware/efi/efibc.c | 10 +-
+ drivers/firmware/efi/efivars.c | 58 +-
+ drivers/firmware/efi/esrt.c | 1 +
+ drivers/firmware/efi/fake_mem.c | 16 +-
+ drivers/firmware/efi/libstub/Makefile | 4 +-
+ drivers/firmware/efi/libstub/arm-stub.c | 5 +
+ drivers/firmware/efi/libstub/arm32-stub.c | 6 +-
+ drivers/firmware/efi/libstub/arm64-stub.c | 6 +-
+ drivers/firmware/efi/libstub/efi-stub-helper.c | 15 +-
+ drivers/firmware/efi/libstub/efistub.h | 12 +
+ drivers/firmware/efi/libstub/fdt.c | 115 +-
+ drivers/firmware/efi/libstub/gop.c | 4 +-
+ drivers/firmware/efi/libstub/random.c | 6 +-
+ drivers/firmware/efi/libstub/secureboot.c | 4 +-
+ drivers/firmware/efi/libstub/tpm.c | 4 +-
+ drivers/firmware/efi/memattr.c | 7 +-
+ drivers/firmware/efi/runtime-map.c | 3 +-
+ drivers/firmware/efi/runtime-wrappers.c | 48 +-
+ drivers/firmware/efi/test/efi_test.c | 1 +
+ drivers/firmware/efi/test/efi_test.h | 2 +-
+ drivers/firmware/efi/tpm.c | 5 +-
+ drivers/firmware/efi/vars.c | 15 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 119 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.h | 6 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 1 +
+ drivers/hwtracing/coresight/coresight.c | 60 +
+ drivers/irqchip/Kconfig | 9 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-brcmstb-l2.c | 10 +-
+ drivers/irqchip/irq-gic-v3-its.c | 28 +-
+ drivers/irqchip/irq-i8259.c | 9 +-
+ drivers/irqchip/irq-imx-irqsteer.c | 115 +-
+ drivers/irqchip/irq-ls1x.c | 192 ++
+ drivers/irqchip/irq-sifive-plic.c | 116 +-
+ drivers/nvme/host/pci.c | 117 +-
+ drivers/pci/msi.c | 39 +-
+ drivers/perf/arm-cci.c | 10 +-
+ drivers/perf/arm-ccn.c | 6 +-
+ drivers/perf/arm_dsu_pmu.c | 9 +-
+ drivers/perf/arm_pmu.c | 15 +-
+ drivers/perf/arm_spe_pmu.c | 6 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 1 +
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 1 +
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 1 +
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 9 -
+ drivers/perf/qcom_l2_pmu.c | 9 +-
+ drivers/perf/qcom_l3_pmu.c | 8 +-
+ drivers/perf/thunderx2_pmu.c | 10 +-
+ drivers/perf/xgene_pmu.c | 6 +-
+ drivers/ptp/ptp_clock.c | 2 +-
+ drivers/ras/ras.c | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 2 +-
+ drivers/soc/tegra/Kconfig | 1 +
+ fs/aio.c | 10 +-
+ fs/exec.c | 4 +-
+ fs/locks.c | 32 +-
+ fs/proc/stat.c | 29 +-
+ fs/proc/task_nommu.c | 2 +-
+ fs/select.c | 4 +-
+ fs/timerfd.c | 4 +-
+ fs/utimes.c | 10 +-
+ include/asm-generic/atomic-instrumented.h | 1689 ++++++++++++--
+ include/asm-generic/atomic-long.h | 1174 ++++++++--
+ include/asm-generic/bug.h | 3 -
+ include/linux/atomic-fallback.h | 2295 ++++++++++++++++++++
+ include/linux/atomic.h | 1241 +----------
+ include/linux/compat.h | 104 +-
+ include/linux/coresight.h | 7 +-
+ include/linux/cpuhotplug.h | 1 +
+ include/linux/efi.h | 41 +-
+ include/linux/fcntl.h | 2 +-
+ include/linux/filter.h | 7 +
+ include/linux/init_task.h | 1 +
+ include/linux/interrupt.h | 33 +-
+ include/linux/irqdesc.h | 2 +
+ include/linux/irqdomain.h | 1 +
+ include/linux/kprobes.h | 5 +
+ include/linux/kthread.h | 10 +-
+ include/linux/lockdep.h | 54 +-
+ include/linux/pci.h | 4 +-
+ include/linux/percpu-rwsem.h | 24 +-
+ include/linux/perf_event.h | 43 +-
+ include/linux/posix-clock.h | 2 +-
+ include/linux/posix-timers.h | 2 +-
+ include/linux/rcu_node_tree.h | 17 +-
+ include/linux/rcu_segcblist.h | 17 +-
+ include/linux/rcu_sync.h | 15 +-
+ include/linux/rcupdate.h | 91 +-
+ include/linux/rcutiny.h | 17 +-
+ include/linux/rcutree.h | 19 +-
+ include/linux/sched.h | 38 +-
+ include/linux/sched/signal.h | 5 +-
+ include/linux/sched/sysctl.h | 7 +
+ include/linux/sched/task.h | 4 +-
+ include/linux/sched/task_stack.h | 2 +-
+ include/linux/sched/topology.h | 8 +-
+ include/linux/sched/wake_q.h | 4 +-
+ include/linux/srcu.h | 18 +-
+ include/linux/srcutiny.h | 17 +-
+ include/linux/srcutree.h | 20 +-
+ include/linux/syscalls.h | 68 +-
+ include/linux/time32.h | 32 +-
+ include/linux/time64.h | 8 -
+ include/linux/timex.h | 4 +-
+ include/linux/torture.h | 20 +-
+ include/linux/wait.h | 6 +-
+ include/linux/workqueue.h | 28 +-
+ include/ras/ras_event.h | 8 +-
+ include/uapi/asm-generic/unistd.h | 147 +-
+ include/uapi/linux/perf_event.h | 55 +-
+ include/uapi/linux/prctl.h | 1 +
+ include/uapi/linux/timex.h | 39 +
+ init/init_task.c | 6 +-
+ ipc/mqueue.c | 16 +-
+ ipc/msg.c | 39 +-
+ ipc/sem.c | 41 +-
+ ipc/shm.c | 40 +-
+ ipc/syscall.c | 12 +-
+ ipc/util.h | 21 +-
+ kernel/bpf/core.c | 2 +-
+ kernel/bpf/syscall.c | 2 +
+ kernel/compat.c | 64 -
+ kernel/cpu.c | 9 +
+ kernel/events/callchain.c | 3 +-
+ kernel/events/core.c | 344 ++-
+ kernel/events/hw_breakpoint.c | 15 +-
+ kernel/events/internal.h | 5 +-
+ kernel/events/ring_buffer.c | 13 +-
+ kernel/events/uprobes.c | 15 +-
+ kernel/fork.c | 24 +-
+ kernel/futex.c | 28 +-
+ kernel/irq/affinity.c | 121 +-
+ kernel/irq/chip.c | 12 +-
+ kernel/irq/debugfs.c | 2 -
+ kernel/irq/handle.c | 2 +-
+ kernel/irq/internals.h | 8 +-
+ kernel/irq/irqdesc.c | 7 +-
+ kernel/irq/irqdomain.c | 16 +-
+ kernel/irq/manage.c | 5 +-
+ kernel/kallsyms.c | 2 +-
+ kernel/kprobes.c | 21 +-
+ kernel/kthread.c | 51 +-
+ kernel/locking/lockdep.c | 973 +++++++--
+ kernel/locking/lockdep_internals.h | 7 +-
+ kernel/locking/lockdep_proc.c | 12 +-
+ kernel/locking/locktorture.c | 21 +-
+ kernel/locking/qspinlock.c | 21 +-
+ kernel/locking/qspinlock_stat.h | 21 +-
+ kernel/locking/rwsem-xadd.c | 4 +-
+ kernel/rcu/Kconfig | 30 -
+ kernel/rcu/rcu.h | 21 +-
+ kernel/rcu/rcu_segcblist.c | 17 +-
+ kernel/rcu/rcu_segcblist.h | 17 +-
+ kernel/rcu/rcuperf.c | 27 +-
+ kernel/rcu/rcutorture.c | 59 +-
+ kernel/rcu/srcutiny.c | 17 +-
+ kernel/rcu/srcutree.c | 72 +-
+ kernel/rcu/sync.c | 15 +-
+ kernel/rcu/tiny.c | 19 +-
+ kernel/rcu/tree.c | 269 ++-
+ kernel/rcu/tree.h | 53 +-
+ kernel/rcu/tree_exp.h | 201 +-
+ kernel/rcu/tree_plugin.h | 238 +-
+ kernel/rcu/update.c | 19 +-
+ kernel/sched/core.c | 84 +-
+ kernel/sched/cpufreq.c | 4 +-
+ kernel/sched/cpufreq_schedutil.c | 2 +-
+ kernel/sched/deadline.c | 6 +-
+ kernel/sched/debug.c | 4 +
+ kernel/sched/fair.c | 458 ++--
+ kernel/sched/isolation.c | 2 +-
+ kernel/sched/pelt.c | 45 +-
+ kernel/sched/pelt.h | 114 +-
+ kernel/sched/rt.c | 6 +-
+ kernel/sched/sched.h | 56 +-
+ kernel/sched/topology.c | 37 +-
+ kernel/signal.c | 2 +-
+ kernel/softirq.c | 3 +-
+ kernel/sys_ni.c | 21 +-
+ kernel/sysctl.c | 11 +
+ kernel/time/Kconfig | 29 +
+ kernel/time/hrtimer.c | 3 +-
+ kernel/time/ntp.c | 18 +-
+ kernel/time/ntp_internal.h | 2 +-
+ kernel/time/posix-clock.c | 2 +-
+ kernel/time/posix-cpu-timers.c | 13 +-
+ kernel/time/posix-stubs.c | 25 +-
+ kernel/time/posix-timers.c | 72 +-
+ kernel/time/posix-timers.h | 2 +-
+ kernel/time/time.c | 92 +-
+ kernel/time/timekeeping.c | 4 +-
+ kernel/time/timekeeping_debug.c | 11 +-
+ kernel/time/timer.c | 3 +-
+ kernel/torture.c | 25 +-
+ kernel/trace/bpf_trace.c | 3 +-
+ kernel/trace/trace_irqsoff.c | 9 +-
+ kernel/trace/trace_preemptirq.c | 5 +
+ kernel/watchdog.c | 7 +
+ kernel/workqueue.c | 59 +-
+ lib/bsearch.c | 2 +
+ lib/locking-selftest.c | 2 +
+ lib/refcount.c | 18 +-
+ lib/smp_processor_id.c | 7 +-
+ mm/gup.c | 6 +-
+ net/compat.c | 2 +-
+ scripts/atomic/atomic-tbl.sh | 186 ++
+ scripts/atomic/atomics.tbl | 41 +
+ scripts/atomic/check-atomics.sh | 33 +
+ scripts/atomic/fallbacks/acquire | 9 +
+ scripts/atomic/fallbacks/add_negative | 16 +
+ scripts/atomic/fallbacks/add_unless | 16 +
+ scripts/atomic/fallbacks/andnot | 7 +
+ scripts/atomic/fallbacks/dec | 7 +
+ scripts/atomic/fallbacks/dec_and_test | 15 +
+ scripts/atomic/fallbacks/dec_if_positive | 15 +
+ scripts/atomic/fallbacks/dec_unless_positive | 14 +
+ scripts/atomic/fallbacks/fence | 11 +
+ scripts/atomic/fallbacks/fetch_add_unless | 23 +
+ scripts/atomic/fallbacks/inc | 7 +
+ scripts/atomic/fallbacks/inc_and_test | 15 +
+ scripts/atomic/fallbacks/inc_not_zero | 14 +
+ scripts/atomic/fallbacks/inc_unless_negative | 14 +
+ scripts/atomic/fallbacks/read_acquire | 7 +
+ scripts/atomic/fallbacks/release | 8 +
+ scripts/atomic/fallbacks/set_release | 7 +
+ scripts/atomic/fallbacks/sub_and_test | 16 +
+ scripts/atomic/fallbacks/try_cmpxchg | 11 +
+ scripts/atomic/gen-atomic-fallback.sh | 181 ++
+ scripts/atomic/gen-atomic-instrumented.sh | 182 ++
+ scripts/atomic/gen-atomic-long.sh | 101 +
+ scripts/atomic/gen-atomics.sh | 20 +
+ scripts/checksyscalls.sh | 53 +-
+ tools/build/Makefile.feature | 10 +-
+ tools/build/feature/test-all.c | 10 +-
+ tools/build/feature/test-get_current_dir_name.c | 1 +
+ tools/build/feature/test-libpython.c | 1 +
+ tools/build/feature/test-reallocarray.c | 2 +
+ tools/build/feature/test-sched_getcpu.c | 2 +
+ tools/build/feature/test-setns.c | 1 +
+ tools/include/linux/rbtree.h | 52 +-
+ tools/include/linux/rbtree_augmented.h | 60 +-
+ .../rcutorture/bin => include/nolibc}/nolibc.h | 118 +-
+ tools/include/uapi/linux/perf_event.h | 55 +-
+ tools/include/uapi/linux/prctl.h | 1 +
+ tools/lib/lockdep/include/liblockdep/common.h | 2 +
+ tools/lib/lockdep/include/liblockdep/mutex.h | 11 +-
+ tools/lib/lockdep/run_tests.sh | 6 +-
+ tools/lib/lockdep/tests/ABBA.c | 9 +
+ tools/lib/rbtree.c | 178 +-
+ tools/memory-model/.gitignore | 1 +
+ tools/memory-model/README | 2 +
+ tools/memory-model/linux-kernel.bell | 3 +-
+ tools/memory-model/linux-kernel.cat | 4 +-
+ tools/memory-model/linux-kernel.def | 1 +
+ tools/memory-model/scripts/README | 70 +
+ tools/memory-model/scripts/checkalllitmus.sh | 53 +-
+ tools/memory-model/scripts/checkghlitmus.sh | 65 +
+ tools/memory-model/scripts/checklitmus.sh | 74 +-
+ tools/memory-model/scripts/checklitmushist.sh | 60 +
+ tools/memory-model/scripts/cmplitmushist.sh | 87 +
+ tools/memory-model/scripts/initlitmushist.sh | 68 +
+ tools/memory-model/scripts/judgelitmus.sh | 78 +
+ tools/memory-model/scripts/newlitmushist.sh | 61 +
+ tools/memory-model/scripts/parseargs.sh | 136 ++
+ tools/memory-model/scripts/runlitmushist.sh | 87 +
+ tools/perf/Build | 10 +-
+ tools/perf/Documentation/perf-config.txt | 31 +
+ tools/perf/Documentation/perf-record.txt | 19 +
+ tools/perf/Documentation/perf-script.txt | 6 +
+ tools/perf/Documentation/perf-trace.txt | 8 +
+ tools/perf/Documentation/perf.data-file-format.txt | 11 +-
+ tools/perf/Makefile.config | 14 +-
+ tools/perf/Makefile.perf | 28 +-
+ tools/perf/arch/Build | 4 +-
+ tools/perf/arch/arm/Build | 4 +-
+ tools/perf/arch/arm/tests/Build | 8 +-
+ tools/perf/arch/arm/tests/dwarf-unwind.c | 1 +
+ tools/perf/arch/arm/util/Build | 8 +-
+ tools/perf/arch/arm/util/cs-etm.c | 98 +-
+ tools/perf/arch/arm/util/cs-etm.h | 3 -
+ tools/perf/arch/arm/util/pmu.c | 3 +-
+ tools/perf/arch/arm64/Build | 4 +-
+ tools/perf/arch/arm64/tests/Build | 6 +-
+ tools/perf/arch/arm64/tests/dwarf-unwind.c | 1 +
+ tools/perf/arch/arm64/util/Build | 12 +-
+ tools/perf/arch/nds32/Build | 2 +-
+ tools/perf/arch/nds32/util/Build | 2 +-
+ tools/perf/arch/powerpc/Build | 4 +-
+ tools/perf/arch/powerpc/tests/Build | 6 +-
+ tools/perf/arch/powerpc/tests/dwarf-unwind.c | 1 +
+ tools/perf/arch/powerpc/util/Build | 18 +-
+ tools/perf/arch/powerpc/util/kvm-stat.c | 2 +
+ tools/perf/arch/powerpc/util/skip-callchain-idx.c | 3 +
+ tools/perf/arch/s390/Build | 2 +-
+ tools/perf/arch/s390/util/Build | 12 +-
+ tools/perf/arch/s390/util/kvm-stat.c | 1 +
+ tools/perf/arch/sh/Build | 2 +-
+ tools/perf/arch/sh/util/Build | 2 +-
+ tools/perf/arch/sparc/Build | 2 +-
+ tools/perf/arch/sparc/util/Build | 2 +-
+ tools/perf/arch/x86/Build | 4 +-
+ tools/perf/arch/x86/tests/Build | 14 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 1 +
+ tools/perf/arch/x86/util/Build | 30 +-
+ tools/perf/arch/x86/util/kvm-stat.c | 1 +
+ tools/perf/arch/xtensa/Build | 2 +-
+ tools/perf/arch/xtensa/util/Build | 2 +-
+ tools/perf/builtin-annotate.c | 9 +-
+ tools/perf/builtin-buildid-cache.c | 4 +-
+ tools/perf/builtin-buildid-list.c | 8 +-
+ tools/perf/builtin-c2c.c | 23 +-
+ tools/perf/builtin-diff.c | 22 +-
+ tools/perf/builtin-evlist.c | 4 +-
+ tools/perf/builtin-inject.c | 12 +-
+ tools/perf/builtin-kallsyms.c | 1 +
+ tools/perf/builtin-kmem.c | 7 +-
+ tools/perf/builtin-kvm.c | 8 +-
+ tools/perf/builtin-list.c | 8 +-
+ tools/perf/builtin-lock.c | 8 +-
+ tools/perf/builtin-mem.c | 9 +-
+ tools/perf/builtin-probe.c | 1 +
+ tools/perf/builtin-record.c | 74 +-
+ tools/perf/builtin-report.c | 37 +-
+ tools/perf/builtin-sched.c | 63 +-
+ tools/perf/builtin-script.c | 31 +-
+ tools/perf/builtin-stat.c | 16 +-
+ tools/perf/builtin-timechart.c | 8 +-
+ tools/perf/builtin-top.c | 23 +-
+ tools/perf/builtin-trace.c | 38 +-
+ tools/perf/design.txt | 4 +
+ tools/perf/examples/bpf/augmented_raw_syscalls.c | 18 +-
+ tools/perf/examples/bpf/augmented_syscalls.c | 22 +-
+ tools/perf/examples/bpf/etcsnoop.c | 18 +-
+ tools/perf/include/bpf/bpf.h | 16 +-
+ tools/perf/perf.h | 9 +
+ .../pmu-events/arch/powerpc/power8/metrics.json | 2245 +++++++++++++++++++
+ .../pmu-events/arch/powerpc/power9/metrics.json | 1982 +++++++++++++++++
+ .../arch/x86/cascadelakex/clx-metrics.json | 2 +-
+ tools/perf/scripts/Build | 4 +-
+ tools/perf/scripts/perl/Perf-Trace-Util/Build | 2 +-
+ tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +-
+ tools/perf/scripts/python/export-to-postgresql.py | 2 +-
+ tools/perf/scripts/python/export-to-sqlite.py | 2 +-
+ tools/perf/scripts/python/exported-sql-viewer.py | 511 +++--
+ .../perf/scripts/python/failed-syscalls-by-pid.py | 21 +-
+ tools/perf/scripts/python/mem-phys-addr.py | 24 +-
+ tools/perf/scripts/python/net_dropmonitor.py | 10 +-
+ tools/perf/scripts/python/netdev-times.py | 82 +-
+ tools/perf/scripts/python/powerpc-hcalls.py | 18 +-
+ tools/perf/scripts/python/sched-migration.py | 2 -
+ tools/perf/scripts/python/sctop.py | 24 +-
+ tools/perf/scripts/python/stackcollapse.py | 7 +-
+ tools/perf/scripts/python/stat-cpi.py | 11 +-
+ tools/perf/scripts/python/syscall-counts-by-pid.py | 22 +-
+ tools/perf/scripts/python/syscall-counts.py | 18 +-
+ tools/perf/tests/attr.py | 1 -
+ tools/perf/tests/bp_account.c | 1 -
+ tools/perf/tests/code-reading.c | 2 +
+ tools/perf/tests/dwarf-unwind.c | 1 +
+ tools/perf/tests/evsel-tp-sched.c | 6 +-
+ tools/perf/tests/hists_common.c | 9 +-
+ tools/perf/tests/hists_cumulate.c | 15 +-
+ tools/perf/tests/hists_filter.c | 1 +
+ tools/perf/tests/hists_link.c | 8 +-
+ tools/perf/tests/hists_output.c | 33 +-
+ tools/perf/tests/mmap-thread-lookup.c | 1 +
+ tools/perf/tests/parse-events.c | 30 +
+ tools/perf/tests/pmu.c | 2 +
+ tools/perf/tests/sample-parsing.c | 2 +
+ tools/perf/tests/sdt.c | 1 +
+ tools/perf/tests/shell/lib/probe.sh | 5 +
+ tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 +
+ tools/perf/trace/beauty/Build | 26 +-
+ tools/perf/trace/beauty/ioctl.c | 2 +-
+ tools/perf/trace/beauty/waitid_options.c | 2 +-
+ tools/perf/ui/Build | 18 +-
+ tools/perf/ui/browsers/Build | 10 +-
+ tools/perf/ui/browsers/annotate.c | 1 +
+ tools/perf/ui/browsers/header.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 23 +-
+ tools/perf/ui/browsers/map.c | 1 +
+ tools/perf/ui/gtk/annotate.c | 3 +
+ tools/perf/ui/gtk/hists.c | 7 +-
+ tools/perf/ui/hist.c | 1 +
+ tools/perf/ui/stdio/hist.c | 7 +-
+ tools/perf/ui/tui/Build | 8 +-
+ tools/perf/util/Build | 276 +--
+ tools/perf/util/annotate.c | 6 +-
+ tools/perf/util/annotate.h | 14 +-
+ tools/perf/util/auxtrace.c | 27 +-
+ tools/perf/util/auxtrace.h | 5 +-
+ tools/perf/util/block-range.c | 2 +
+ tools/perf/util/block-range.h | 6 +-
+ tools/perf/util/bpf-event.c | 263 +++
+ tools/perf/util/bpf-event.h | 38 +
+ tools/perf/util/bpf-loader.c | 1 +
+ tools/perf/util/bpf-loader.h | 7 +-
+ tools/perf/util/bpf_map.c | 72 +
+ tools/perf/util/bpf_map.h | 22 +
+ tools/perf/util/branch.h | 27 +-
+ tools/perf/util/build-id.c | 14 +-
+ tools/perf/util/build-id.h | 3 +-
+ tools/perf/util/c++/Build | 4 +-
+ tools/perf/util/callchain.c | 17 +
+ tools/perf/util/callchain.h | 21 +-
+ tools/perf/util/color.c | 39 -
+ tools/perf/util/color.h | 1 +
+ tools/perf/util/color_config.c | 47 +
+ tools/perf/util/comm.c | 1 +
+ tools/perf/util/comm.h | 4 +-
+ tools/perf/util/config.c | 1 +
+ tools/perf/util/cpu-set-sched.h | 50 +
+ tools/perf/util/cpumap.c | 12 +-
+ tools/perf/util/cpumap.h | 1 +
+ tools/perf/util/cputopo.c | 277 +++
+ tools/perf/util/cputopo.h | 33 +
+ tools/perf/util/cs-etm-decoder/Build | 2 +-
+ tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 41 +-
+ tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 16 +-
+ tools/perf/util/cs-etm.c | 832 +++++--
+ tools/perf/util/cs-etm.h | 57 +-
+ tools/perf/util/data-convert-bt.c | 4 +-
+ tools/perf/util/data.c | 175 +-
+ tools/perf/util/data.h | 16 +-
+ tools/perf/util/db-export.c | 1 +
+ tools/perf/util/drv_configs.c | 78 -
+ tools/perf/util/drv_configs.h | 26 -
+ tools/perf/util/dso.c | 11 +-
+ tools/perf/util/dso.h | 17 +-
+ tools/perf/util/event.c | 43 +
+ tools/perf/util/event.h | 60 +-
+ tools/perf/util/evlist.c | 6 +-
+ tools/perf/util/evlist.h | 6 +-
+ tools/perf/util/evsel.c | 27 +-
+ tools/perf/util/evsel.h | 4 +-
+ tools/perf/util/header.c | 289 +--
+ tools/perf/util/hist.c | 220 +-
+ tools/perf/util/hist.h | 19 +-
+ tools/perf/util/intel-bts.c | 6 +-
+ tools/perf/util/intel-pt-decoder/Build | 2 +-
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 39 +-
+ tools/perf/util/intel-pt.c | 23 +-
+ tools/perf/util/intlist.h | 2 +-
+ tools/perf/util/jitdump.c | 1 +
+ tools/perf/util/kvm-stat.h | 7 +-
+ tools/perf/util/machine.c | 112 +-
+ tools/perf/util/machine.h | 17 +-
+ tools/perf/util/map.c | 14 +-
+ tools/perf/util/map.h | 100 +-
+ tools/perf/util/map_groups.h | 91 +
+ tools/perf/util/map_symbol.h | 22 +
+ tools/perf/util/metricgroup.c | 10 +-
+ tools/perf/util/metricgroup.h | 3 +-
+ tools/perf/util/mmap.c | 105 +-
+ tools/perf/util/mmap.h | 3 +-
+ tools/perf/util/parse-events.c | 2 +-
+ tools/perf/util/parse-events.y | 4 +-
+ tools/perf/util/pmu.c | 2 -
+ tools/perf/util/pmu.h | 5 +-
+ tools/perf/util/probe-event.c | 6 +-
+ tools/perf/util/probe-event.h | 5 +-
+ tools/perf/util/probe-file.c | 1 +
+ tools/perf/util/rb_resort.h | 8 +-
+ tools/perf/util/rblist.c | 28 +-
+ tools/perf/util/rblist.h | 2 +-
+ tools/perf/util/s390-cpumcf-kernel.h | 62 +
+ tools/perf/util/s390-cpumsf.c | 89 +-
+ tools/perf/util/s390-sample-raw.c | 222 ++
+ tools/perf/util/sample-raw.c | 18 +
+ tools/perf/util/sample-raw.h | 14 +
+ tools/perf/util/scripting-engines/Build | 4 +-
+ .../perf/util/scripting-engines/trace-event-perl.c | 2 +
+ .../util/scripting-engines/trace-event-python.c | 17 +-
+ tools/perf/util/session.c | 110 +-
+ tools/perf/util/setup.py | 7 +-
+ tools/perf/util/sort.c | 18 +-
+ tools/perf/util/sort.h | 7 +-
+ tools/perf/util/srccode.h | 13 +
+ tools/perf/util/srcline.c | 45 +-
+ tools/perf/util/srcline.h | 13 +-
+ tools/perf/util/stat-display.c | 1 +
+ tools/perf/util/stat-shadow.c | 2 +-
+ tools/perf/util/strlist.h | 2 +-
+ tools/perf/util/symbol-elf.c | 2 +
+ tools/perf/util/symbol-minimal.c | 1 +
+ tools/perf/util/symbol.c | 90 +-
+ tools/perf/util/symbol.h | 102 +-
+ tools/perf/util/symbol_conf.h | 73 +
+ tools/perf/util/symbol_fprintf.c | 3 +-
+ tools/perf/util/thread-stack.c | 235 +-
+ tools/perf/util/thread-stack.h | 3 +
+ tools/perf/util/thread.c | 1 +
+ tools/perf/util/thread.h | 8 +-
+ tools/perf/util/tool.h | 5 +-
+ tools/perf/util/unwind-libdw.c | 2 +
+ tools/perf/util/unwind-libunwind-local.c | 1 +
+ tools/perf/util/unwind-libunwind.c | 1 +
+ tools/perf/util/util.c | 82 +-
+ tools/perf/util/util.h | 3 +
+ tools/perf/util/vdso.c | 1 +
+ tools/perf/util/zlib.c | 1 -
+ tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 27 +-
+ virt/kvm/kvm_main.c | 2 +-
+ 727 files changed, 24659 insertions(+), 9098 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/loongson,ls1x-intc.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra210-timer.txt
+ create mode 100644 Documentation/kdump/vmcoreinfo.txt
+ create mode 100644 Documentation/power/energy-model.txt
+ create mode 100644 Documentation/scheduler/sched-energy.txt
+ delete mode 100644 arch/sh/include/uapi/asm/unistd_32.h
+ create mode 100644 arch/x86/boot/compressed/acpi.c
+ delete mode 100644 arch/x86/platform/efi/early_printk.c
+ rename drivers/clocksource/{cs5535-clockevt.c => timer-cs5535.c} (100%)
+ rename drivers/clocksource/{pxa_timer.c => timer-pxa.c} (100%)
+ rename drivers/clocksource/{tango_xtal.c => timer-tango-xtal.c} (100%)
+ create mode 100644 drivers/firmware/efi/earlycon.c
+ create mode 100644 drivers/irqchip/irq-ls1x.c
+ create mode 100644 include/linux/atomic-fallback.h
+ create mode 100755 scripts/atomic/atomic-tbl.sh
+ create mode 100755 scripts/atomic/atomics.tbl
+ create mode 100755 scripts/atomic/check-atomics.sh
+ create mode 100755 scripts/atomic/fallbacks/acquire
+ create mode 100755 scripts/atomic/fallbacks/add_negative
+ create mode 100755 scripts/atomic/fallbacks/add_unless
+ create mode 100755 scripts/atomic/fallbacks/andnot
+ create mode 100755 scripts/atomic/fallbacks/dec
+ create mode 100755 scripts/atomic/fallbacks/dec_and_test
+ create mode 100755 scripts/atomic/fallbacks/dec_if_positive
+ create mode 100755 scripts/atomic/fallbacks/dec_unless_positive
+ create mode 100755 scripts/atomic/fallbacks/fence
+ create mode 100755 scripts/atomic/fallbacks/fetch_add_unless
+ create mode 100755 scripts/atomic/fallbacks/inc
+ create mode 100755 scripts/atomic/fallbacks/inc_and_test
+ create mode 100755 scripts/atomic/fallbacks/inc_not_zero
+ create mode 100755 scripts/atomic/fallbacks/inc_unless_negative
+ create mode 100755 scripts/atomic/fallbacks/read_acquire
+ create mode 100755 scripts/atomic/fallbacks/release
+ create mode 100755 scripts/atomic/fallbacks/set_release
+ create mode 100755 scripts/atomic/fallbacks/sub_and_test
+ create mode 100755 scripts/atomic/fallbacks/try_cmpxchg
+ create mode 100755 scripts/atomic/gen-atomic-fallback.sh
+ create mode 100755 scripts/atomic/gen-atomic-instrumented.sh
+ create mode 100755 scripts/atomic/gen-atomic-long.sh
+ create mode 100644 scripts/atomic/gen-atomics.sh
+ rename tools/{testing/selftests/rcutorture/bin => include/nolibc}/nolibc.h (94%)
+ create mode 100644 tools/memory-model/.gitignore
+ create mode 100644 tools/memory-model/scripts/README
+ create mode 100644 tools/memory-model/scripts/checkghlitmus.sh
+ create mode 100644 tools/memory-model/scripts/checklitmushist.sh
+ create mode 100644 tools/memory-model/scripts/cmplitmushist.sh
+ create mode 100644 tools/memory-model/scripts/initlitmushist.sh
+ create mode 100644 tools/memory-model/scripts/judgelitmus.sh
+ create mode 100644 tools/memory-model/scripts/newlitmushist.sh
+ create mode 100644 tools/memory-model/scripts/parseargs.sh
+ create mode 100644 tools/memory-model/scripts/runlitmushist.sh
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/metrics.json
+ create mode 100644 tools/perf/util/bpf-event.c
+ create mode 100644 tools/perf/util/bpf-event.h
+ create mode 100644 tools/perf/util/bpf_map.c
+ create mode 100644 tools/perf/util/bpf_map.h
+ create mode 100644 tools/perf/util/color_config.c
+ create mode 100644 tools/perf/util/cpu-set-sched.h
+ create mode 100644 tools/perf/util/cputopo.c
+ create mode 100644 tools/perf/util/cputopo.h
+ delete mode 100644 tools/perf/util/drv_configs.c
+ delete mode 100644 tools/perf/util/drv_configs.h
+ create mode 100644 tools/perf/util/map_groups.h
+ create mode 100644 tools/perf/util/map_symbol.h
+ create mode 100644 tools/perf/util/s390-cpumcf-kernel.h
+ create mode 100644 tools/perf/util/s390-sample-raw.c
+ create mode 100644 tools/perf/util/sample-raw.c
+ create mode 100644 tools/perf/util/sample-raw.h
+ create mode 100644 tools/perf/util/symbol_conf.h
+$ git am -3 ../patches/0001-time-fix-up-for-y2038-remove-struct-definition-redir.patch
+Applying: time: fix up for "y2038: remove struct definition redirects"
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/uapi/linux/time_types.h
+$ git add -A .
+$ git commit -v -a --amend
+[master c7d88c039c32] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Mon Mar 4 13:28:22 2019 +1100
+Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210)
+$ git merge clockevents/clockevents/next
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging Documentation/arm64/silicon-errata.txt
+Merge made by the 'recursive' strategy.
+Merging edac-amd/for-next (580b5cf50ca8 EDAC/altera: Add separate SDRAM EDAC config)
+$ git merge edac-amd/for-next
+Removing drivers/edac/skx_edac.c
+Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/edac/aspeed-sdram-edac.txt | 25 +
+ MAINTAINERS | 7 +
+ arch/arm/boot/dts/aspeed-g5.dtsi | 7 +
+ drivers/edac/Kconfig | 35 +-
+ drivers/edac/Makefile | 8 +-
+ drivers/edac/altera_edac.c | 72 +-
+ drivers/edac/aspeed_edac.c | 421 ++++++
+ drivers/edac/debugfs.c | 48 +-
+ drivers/edac/edac_module.h | 8 +-
+ drivers/edac/i10nm_base.c | 275 ++++
+ drivers/edac/skx_base.c | 650 ++++++++++
+ drivers/edac/skx_common.c | 691 ++++++++++
+ drivers/edac/skx_common.h | 152 +++
+ drivers/edac/skx_edac.c | 1358 --------------------
+ 14 files changed, 2323 insertions(+), 1434 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
+ create mode 100644 drivers/edac/aspeed_edac.c
+ create mode 100644 drivers/edac/i10nm_base.c
+ create mode 100644 drivers/edac/skx_base.c
+ create mode 100644 drivers/edac/skx_common.c
+ create mode 100644 drivers/edac/skx_common.h
+ delete mode 100644 drivers/edac/skx_edac.c
+Merging irqchip/irq/irqchip-next (28528fca4908 irqchip/imx-irqsteer: Add multi output interrupts support)
+$ git merge irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (1c347a94ca79 tracing: Comment why cond_snapshot is checked outside of max_lock protection)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/trace_irqsoff.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/events/uprobes.c
+Merge made by the 'recursive' strategy.
+ Documentation/trace/ftrace.rst | 89 ++
+ Documentation/trace/histogram.rst | 316 +++++-
+ include/linux/ring_buffer.h | 2 -
+ kernel/events/uprobes.c | 8 +-
+ kernel/trace/ftrace.c | 30 +
+ kernel/trace/ring_buffer.c | 14 -
+ kernel/trace/trace.c | 217 +++-
+ kernel/trace/trace.h | 66 +-
+ kernel/trace/trace_entries.h | 41 +-
+ kernel/trace/trace_events_filter.c | 7 +
+ kernel/trace/trace_events_hist.c | 1048 ++++++++++++++------
+ kernel/trace/trace_functions_graph.c | 30 +-
+ kernel/trace/trace_irqsoff.c | 2 +-
+ kernel/trace/trace_probe.c | 1 +
+ kernel/trace/trace_sched_wakeup.c | 11 +-
+ .../inter-event/trigger-action-hist-xfail.tc | 30 +
+ .../inter-event/trigger-extended-error-support.tc | 1 +
+ .../inter-event/trigger-field-variable-support.tc | 1 +
+ .../trigger-inter-event-combined-hist.tc | 1 +
+ .../inter-event/trigger-multi-actions-accept.tc | 1 +
+ .../inter-event/trigger-onchange-action-hist.tc | 28 +
+ .../inter-event/trigger-onmatch-action-hist.tc | 1 +
+ .../trigger-onmatch-onmax-action-hist.tc | 1 +
+ .../inter-event/trigger-onmax-action-hist.tc | 1 +
+ .../inter-event/trigger-snapshot-action-hist.tc | 43 +
+ .../trigger-synthetic-event-createremove.tc | 1 +
+ .../inter-event/trigger-trace-action-hist.tc | 42 +
+ 27 files changed, 1659 insertions(+), 374 deletions(-)
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
+Merging rcu/rcu/next (e880edadc149 Merge LKMM and RCU)
+$ git merge rcu/rcu/next
+Merge made by the 'recursive' strategy.
+ tools/memory-model/Documentation/explanation.txt | 289 ++++++++++++-----------
+ tools/memory-model/README | 33 ++-
+ tools/memory-model/linux-kernel.bell | 35 ++-
+ tools/memory-model/linux-kernel.cat | 39 ++-
+ tools/memory-model/linux-kernel.def | 5 +
+ tools/memory-model/lock.cat | 3 -
+ 6 files changed, 243 insertions(+), 161 deletions(-)
+Merging kvm/linux-next (71783e09b487 Merge tag 'kvmarm-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/kvm_main.c
+CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
+Auto-merging virt/kvm/arm/vgic/vgic-v3.c
+Auto-merging virt/kvm/arm/mmu.c
+Auto-merging virt/kvm/arm/arm.c
+Auto-merging drivers/clocksource/arm_arch_timer.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx/vmx.h
+CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.h
+Auto-merging arch/x86/kvm/vmx/vmx.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/vmx/nested.c
+Auto-merging arch/x86/kvm/mmu.c
+Auto-merging arch/x86/kvm/cpuid.c
+Auto-merging arch/x86/include/asm/kvm_host.h
+Auto-merging arch/arm64/kvm/sys_regs.c
+Auto-merging arch/arm64/kvm/hyp/sysreg-sr.c
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm/kvm/coproc.c
+Auto-merging arch/arm/include/asm/kvm_host.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h
+Auto-merging arch/arm/include/asm/arch_gicv3.h
+Auto-merging MAINTAINERS
+Resolved 'arch/arm/include/asm/kvm_host.h' using previous resolution.
+Resolved 'arch/x86/kvm/vmx/vmx.c' using previous resolution.
+Resolved 'arch/x86/kvm/vmx/vmx.h' using previous resolution.
+Recorded preimage for 'virt/kvm/kvm_main.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'virt/kvm/kvm_main.c'.
+[master 5f8baceea549] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/halt-polling.txt | 37 +-
+ Documentation/virtual/kvm/mmu.txt | 41 +-
+ MAINTAINERS | 18 +-
+ arch/arm/include/asm/arch_gicv3.h | 4 +-
+ arch/arm/include/asm/kvm_emulate.h | 8 +
+ arch/arm/include/asm/kvm_host.h | 53 +-
+ arch/arm/include/asm/kvm_hyp.h | 4 +
+ arch/arm/include/asm/kvm_mmu.h | 9 +-
+ arch/arm/kvm/Makefile | 5 +-
+ arch/arm/kvm/coproc.c | 23 +-
+ arch/arm/kvm/hyp/cp15-sr.c | 1 -
+ arch/arm/kvm/hyp/hyp-entry.S | 2 +-
+ arch/arm/kvm/hyp/switch.c | 2 +-
+ arch/arm/kvm/hyp/tlb.c | 4 +-
+ arch/arm/kvm/interrupts.S | 4 +-
+ arch/arm64/include/asm/kvm_emulate.h | 12 +
+ arch/arm64/include/asm/kvm_host.h | 48 +-
+ arch/arm64/include/asm/kvm_hyp.h | 3 +-
+ arch/arm64/include/asm/kvm_mmu.h | 13 +-
+ arch/arm64/include/asm/sysreg.h | 7 +-
+ arch/arm64/kvm/Makefile | 4 +-
+ arch/arm64/kvm/debug.c | 2 +-
+ arch/arm64/kvm/hyp.S | 3 -
+ arch/arm64/kvm/hyp/hyp-entry.S | 12 -
+ arch/arm64/kvm/hyp/sysreg-sr.c | 1 -
+ arch/arm64/kvm/sys_regs.c | 168 ++++--
+ arch/mips/include/asm/kvm_host.h | 2 +-
+ arch/powerpc/include/asm/kvm_host.h | 5 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 14 +
+ arch/powerpc/kvm/book3s.c | 13 +-
+ arch/powerpc/kvm/book3s_32_mmu.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu.c | 14 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 18 +
+ arch/powerpc/kvm/book3s_64_mmu_radix.c | 15 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 8 +-
+ arch/powerpc/kvm/book3s_emulate.c | 18 +
+ arch/powerpc/kvm/book3s_hv.c | 33 +-
+ arch/powerpc/kvm/book3s_hv_builtin.c | 14 +-
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 7 +
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 10 +
+ arch/powerpc/kvm/book3s_rtas.c | 8 +-
+ arch/powerpc/kvm/powerpc.c | 4 +-
+ arch/s390/include/asm/cio.h | 1 +
+ arch/s390/include/asm/irq.h | 1 +
+ arch/s390/include/asm/isc.h | 1 +
+ arch/s390/include/asm/kvm_host.h | 39 +-
+ arch/s390/kernel/irq.c | 1 +
+ arch/s390/kvm/interrupt.c | 431 +++++++++++++--
+ arch/s390/kvm/kvm-s390.c | 190 ++++++-
+ arch/s390/kvm/kvm-s390.h | 4 +-
+ arch/x86/include/asm/kvm_host.h | 42 +-
+ arch/x86/include/asm/kvm_vcpu_regs.h | 25 +
+ arch/x86/kernel/kvmclock.c | 20 +-
+ arch/x86/kvm/cpuid.c | 2 +-
+ arch/x86/kvm/hyperv.c | 2 +-
+ arch/x86/kvm/i8254.c | 2 +-
+ arch/x86/kvm/i8259.c | 2 +-
+ arch/x86/kvm/ioapic.c | 2 +-
+ arch/x86/kvm/lapic.c | 7 +-
+ arch/x86/kvm/mmu.c | 450 ++++++++-------
+ arch/x86/kvm/mmu.h | 1 -
+ arch/x86/kvm/mmutrace.h | 42 +-
+ arch/x86/kvm/page_track.c | 2 +-
+ arch/x86/kvm/svm.c | 120 ++--
+ arch/x86/kvm/vmx/nested.c | 129 +++--
+ arch/x86/kvm/vmx/vmcs.h | 1 +
+ arch/x86/kvm/vmx/vmenter.S | 167 ++++++
+ arch/x86/kvm/vmx/vmx.c | 198 ++-----
+ arch/x86/kvm/vmx/vmx.h | 20 +-
+ arch/x86/kvm/x86.c | 32 +-
+ arch/x86/kvm/x86.h | 7 +-
+ drivers/clocksource/arm_arch_timer.c | 11 +-
+ drivers/s390/cio/chsc.c | 37 ++
+ drivers/s390/cio/chsc.h | 1 +
+ include/clocksource/arm_arch_timer.h | 1 +
+ include/kvm/arm_arch_timer.h | 68 ++-
+ include/linux/kvm_host.h | 24 +-
+ tools/testing/selftests/kvm/.gitignore | 1 +
+ tools/testing/selftests/kvm/Makefile | 1 +
+ .../kvm/x86_64/vmx_close_while_nested_test.c | 95 ++++
+ virt/kvm/arm/arch_timer.c | 608 +++++++++++++++------
+ virt/kvm/arm/arm.c | 64 +--
+ virt/kvm/arm/hyp/vgic-v3-sr.c | 2 +-
+ virt/kvm/arm/mmu.c | 20 +-
+ virt/kvm/arm/trace.h | 107 +++-
+ virt/kvm/arm/vgic/vgic-v3.c | 4 +-
+ virt/kvm/coalesced_mmio.c | 3 +-
+ virt/kvm/eventfd.c | 7 +-
+ virt/kvm/irqchip.c | 4 +-
+ virt/kvm/kvm_main.c | 103 ++--
+ virt/kvm/vfio.c | 4 +-
+ 91 files changed, 2591 insertions(+), 1187 deletions(-)
+ create mode 100644 arch/x86/include/asm/kvm_vcpu_regs.h
+ create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c
+Merging kvm-arm/next (c88b093693cc arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2)
+$ git merge kvm-arm/next
+Already up to date.
+Merging kvm-ppc/kvm-ppc-next (2b57ecd0208f KVM: PPC: Book3S: Add count cache flush parameters to kvmppc_get_cpu_char())
+$ git merge kvm-ppc/kvm-ppc-next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/kvm_ppc.h | 2 +-
+ arch/powerpc/include/uapi/asm/kvm.h | 2 ++
+ arch/powerpc/kvm/powerpc.c | 18 ++++++++++++++----
+ 3 files changed, 17 insertions(+), 5 deletions(-)
+Merging kvms390/next (11ba5961a215 KVM: s390: add debug logging for cpu model subfunctions)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (1d988ed46543 x86/xen: dont add memory above max allowed allocation)
+$ git merge xen-tip/linux-next
+Auto-merging mm/memory_hotplug.c
+Auto-merging arch/x86/kernel/e820.c
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/e820.c | 5 +++++
+ arch/x86/xen/setup.c | 13 +++++++++++++
+ drivers/xen/gntdev-dmabuf.c | 21 ++++++++++++++++++++-
+ drivers/xen/gntdev-dmabuf.h | 2 +-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/xen-balloon.c | 11 +++++++++++
+ drivers/xen/xen-pciback/pciback_ops.c | 2 --
+ drivers/xen/xen-pciback/xenbus.c | 2 +-
+ drivers/xen/xen-scsiback.c | 2 +-
+ include/linux/memory_hotplug.h | 2 ++
+ include/xen/xen.h | 4 ++++
+ mm/memory_hotplug.c | 6 ++++++
+ 12 files changed, 65 insertions(+), 7 deletions(-)
+Merging percpu/for-next (1b046b445c0f percpu: km: no need to consider pcpu_group_offsets[0])
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ mm/percpu-km.c | 2 +-
+ mm/percpu.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging workqueues/for-next (8bdc6201785d workqueue: fix typo in comment)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging drivers-x86/for-next (238f9c11351f platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown)
+$ git merge drivers-x86/for-next
+Auto-merging include/linux/platform_data/mlxreg.h
+CONFLICT (content): Merge conflict in include/linux/platform_data/mlxreg.h
+Auto-merging arch/x86/include/asm/intel-family.h
+Auto-merging Documentation/ABI/stable/sysfs-driver-mlxreg-io
+Recorded preimage for 'include/linux/platform_data/mlxreg.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/platform_data/mlxreg.h'.
+[master 96d9a5c6c63a] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-driver-mlxreg-io | 14 ++-
+ drivers/acpi/scan.c | 1 +
+ drivers/leds/leds-mlxreg.c | 19 +++
+ drivers/platform/mellanox/mlxreg-hotplug.c | 28 ++++-
+ drivers/platform/x86/asus-wmi.c | 9 +-
+ drivers/platform/x86/dell-wmi.c | 3 +
+ drivers/platform/x86/dell_rbu.c | 50 +++-----
+ drivers/platform/x86/i2c-multi-instantiate.c | 9 ++
+ drivers/platform/x86/ideapad-laptop.c | 16 ++-
+ drivers/platform/x86/intel-hid.c | 7 +-
+ drivers/platform/x86/intel_int0002_vgpio.c | 32 ++++-
+ drivers/platform/x86/intel_pmc_core.c | 159 ++++++++++++++++++++----
+ drivers/platform/x86/intel_pmc_core.h | 14 ++-
+ drivers/platform/x86/mlx-platform.c | 91 ++++++++++++++
+ drivers/platform/x86/touchscreen_dmi.c | 52 ++++++++
+ drivers/platform/x86/wmi.c | 3 +
+ include/linux/platform_data/mlxreg.h | 6 +-
+ 17 files changed, 427 insertions(+), 86 deletions(-)
+Merging chrome-platform/for-next (0d2f2a3da1f2 platform/chrome: wilco_ec: Add RTC driver)
+$ git merge chrome-platform/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/debugfs-wilco-ec | 23 +++
+ MAINTAINERS | 2 +-
+ drivers/platform/chrome/Kconfig | 2 +
+ drivers/platform/chrome/Makefile | 2 +
+ drivers/platform/chrome/chromeos_pstore.c | 17 +-
+ drivers/platform/chrome/cros_ec_debugfs.c | 22 +--
+ drivers/platform/chrome/cros_ec_i2c.c | 22 +--
+ drivers/platform/chrome/cros_ec_lightbar.c | 24 +--
+ drivers/platform/chrome/cros_ec_lpc.c | 34 ++--
+ drivers/platform/chrome/cros_ec_lpc_mec.c | 78 +++++---
+ drivers/platform/chrome/cros_ec_lpc_mec.h | 63 +++---
+ drivers/platform/chrome/cros_ec_lpc_reg.c | 73 ++-----
+ drivers/platform/chrome/cros_ec_lpc_reg.h | 20 +-
+ drivers/platform/chrome/cros_ec_proto.c | 19 +-
+ drivers/platform/chrome/cros_ec_spi.c | 20 +-
+ drivers/platform/chrome/cros_ec_sysfs.c | 26 +--
+ drivers/platform/chrome/cros_ec_vbc.c | 24 +--
+ drivers/platform/chrome/cros_kbd_led_backlight.c | 19 +-
+ drivers/platform/chrome/wilco_ec/Kconfig | 20 ++
+ drivers/platform/chrome/wilco_ec/Makefile | 6 +
+ drivers/platform/chrome/wilco_ec/core.c | 136 +++++++++++++
+ drivers/platform/chrome/wilco_ec/debugfs.c | 238 +++++++++++++++++++++++
+ drivers/platform/chrome/wilco_ec/mailbox.c | 237 ++++++++++++++++++++++
+ drivers/rtc/Kconfig | 11 ++
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-wilco-ec.c | 177 +++++++++++++++++
+ include/linux/platform_data/wilco-ec.h | 144 ++++++++++++++
+ 27 files changed, 1148 insertions(+), 312 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-wilco-ec
+ create mode 100644 drivers/platform/chrome/wilco_ec/Kconfig
+ create mode 100644 drivers/platform/chrome/wilco_ec/Makefile
+ create mode 100644 drivers/platform/chrome/wilco_ec/core.c
+ create mode 100644 drivers/platform/chrome/wilco_ec/debugfs.c
+ create mode 100644 drivers/platform/chrome/wilco_ec/mailbox.c
+ create mode 100644 drivers/rtc/rtc-wilco-ec.c
+ create mode 100644 include/linux/platform_data/wilco-ec.h
+Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/controllers/omap_ssi_port.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging leds/for-next (5ddb0869bfc1 leds: lp55xx: fix null deref on firmware load failure)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-led-trigger-pattern | 51 +----------
+ Documentation/devicetree/bindings/leds/common.txt | 12 +++
+ .../bindings/leds/leds-trigger-pattern.txt | 49 +++++++++++
+ drivers/leds/led-core.c | 30 +++++++
+ drivers/leds/leds-lp55xx-common.c | 4 +-
+ drivers/leds/trigger/ledtrig-oneshot.c | 38 ++++++++-
+ drivers/leds/trigger/ledtrig-pattern.c | 99 +++++++++++++++++-----
+ drivers/leds/trigger/ledtrig-timer.c | 34 ++++++++
+ include/linux/leds.h | 13 +++
+ 9 files changed, 259 insertions(+), 71 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-trigger-pattern.txt
+Merging ipmi/for-next (038903593317 ipmi_si: Potential array underflow in hotmod_handler())
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/Kconfig | 5 +
+ drivers/char/ipmi/Makefile | 1 +
+ drivers/char/ipmi/ipmi_devintf.c | 6 +-
+ drivers/char/ipmi/ipmi_dmi.c | 139 ++++++----------------
+ drivers/char/ipmi/ipmi_dmi.h | 2 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 159 +++++++++++++++++--------
+ drivers/char/ipmi/ipmi_plat_data.c | 121 +++++++++++++++++++
+ drivers/char/ipmi/ipmi_plat_data.h | 22 ++++
+ drivers/char/ipmi/ipmi_si.h | 14 ++-
+ drivers/char/ipmi/ipmi_si_hardcode.c | 149 +++++++++++++----------
+ drivers/char/ipmi/ipmi_si_hotmod.c | 222 ++++++++++++++++++-----------------
+ drivers/char/ipmi/ipmi_si_intf.c | 102 +++++++---------
+ drivers/char/ipmi/ipmi_si_mem_io.c | 5 +-
+ drivers/char/ipmi/ipmi_si_parisc.c | 2 +-
+ drivers/char/ipmi/ipmi_si_pci.c | 4 +-
+ drivers/char/ipmi/ipmi_si_platform.c | 73 ++++++++----
+ drivers/char/ipmi/ipmi_si_port_io.c | 5 +-
+ drivers/char/ipmi/ipmi_si_sm.h | 14 ++-
+ drivers/char/ipmi/ipmi_ssif.c | 188 ++++++++++++++++++++---------
+ drivers/char/ipmi/kcs_bmc.c | 5 +-
+ include/linux/ipmi_smi.h | 27 +++--
+ 21 files changed, 776 insertions(+), 489 deletions(-)
+ create mode 100644 drivers/char/ipmi/ipmi_plat_data.c
+ create mode 100644 drivers/char/ipmi/ipmi_plat_data.h
+Merging driver-core/driver-core-next (36cf3b1363f4 driver core: platform: remove misleading err_alloc label)
+$ git merge driver-core/driver-core-next
+Auto-merging sound/hda/hdac_i915.c
+Auto-merging kernel/workqueue.c
+Auto-merging include/linux/workqueue.h
+Auto-merging include/linux/device.h
+Auto-merging fs/kernfs/mount.c
+Auto-merging fs/kernfs/kernfs-internal.h
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/debug.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/gpu/drm/i915/intel_audio.c
+Auto-merging drivers/block/rbd.c
+Auto-merging drivers/base/power/runtime.c
+Auto-merging drivers/base/power/main.c
+Auto-merging drivers/base/cpu.c
+Auto-merging Makefile
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 4 +
+ Documentation/driver-api/component.rst | 17 ++
+ Documentation/driver-api/device_link.rst | 87 +++++--
+ Documentation/driver-api/index.rst | 1 +
+ Makefile | 2 +-
+ arch/powerpc/platforms/pseries/ibmebus.c | 10 +-
+ drivers/base/base.h | 12 +
+ drivers/base/bus.c | 66 ++----
+ drivers/base/class.c | 14 +-
+ drivers/base/component.c | 206 +++++++++++++++-
+ drivers/base/core.c | 246 +++++++++++++++----
+ drivers/base/cpu.c | 1 +
+ drivers/base/dd.c | 188 ++++++++++++---
+ drivers/base/firmware_loader/Makefile | 4 +-
+ .../base/firmware_loader/builtin}/.gitignore | 0
+ .../base/firmware_loader/builtin}/Makefile | 0
+ drivers/base/firmware_loader/fallback_table.c | 5 -
+ drivers/base/firmware_loader/main.c | 8 +-
+ drivers/base/platform.c | 21 +-
+ drivers/base/power/main.c | 12 +-
+ drivers/base/power/runtime.c | 101 +++++---
+ drivers/base/test/test_async_driver_probe.c | 261 ++++++++++++++++-----
+ drivers/block/rbd.c | 45 ++--
+ drivers/firmware/Kconfig | 2 +-
+ drivers/gpu/drm/i915/intel_audio.c | 4 +-
+ drivers/iommu/exynos-iommu.c | 1 +
+ drivers/iommu/rockchip-iommu.c | 3 +-
+ drivers/nvdimm/bus.c | 11 +-
+ drivers/pci/pci-sysfs.c | 5 +-
+ drivers/pci/pci.c | 7 +-
+ drivers/rapidio/rio-sysfs.c | 5 +-
+ fs/debugfs/inode.c | 4 +-
+ fs/kernfs/dir.c | 2 +-
+ fs/kernfs/inode.c | 2 +-
+ fs/kernfs/kernfs-internal.h | 2 +-
+ fs/kernfs/mount.c | 7 +-
+ fs/sysfs/file.c | 2 +-
+ include/drm/i915_component.h | 4 +
+ include/linux/async.h | 82 ++++++-
+ include/linux/component.h | 76 ++++++
+ include/linux/device.h | 30 ++-
+ include/linux/ihex.h | 29 ++-
+ include/linux/platform_device.h | 1 +
+ include/linux/workqueue.h | 2 +
+ include/sound/hda_component.h | 5 +-
+ kernel/async.c | 53 +++--
+ kernel/workqueue.c | 84 +++++++
+ lib/devres.c | 4 +-
+ lib/kobject.c | 2 +-
+ lib/kobject_uevent.c | 9 +-
+ sound/hda/hdac_component.c | 4 +-
+ sound/hda/hdac_i915.c | 6 +-
+ tools/firmware/ihex2fw.c | 17 +-
+ tools/testing/selftests/firmware/config | 1 -
+ tools/testing/selftests/firmware/fw_filesystem.sh | 9 +-
+ tools/testing/selftests/firmware/fw_lib.sh | 2 +-
+ 56 files changed, 1389 insertions(+), 399 deletions(-)
+ create mode 100644 Documentation/driver-api/component.rst
+ rename {firmware => drivers/base/firmware_loader/builtin}/.gitignore (100%)
+ rename {firmware => drivers/base/firmware_loader/builtin}/Makefile (100%)
+Merging usb/usb-next (1c7cf3d5e1c1 wusb: Remove unnecessary static function ckhdid_printf)
+$ git merge usb/usb-next
+Auto-merging include/linux/device.h
+Removing drivers/usb/typec/ucsi/debug.h
+Removing drivers/usb/README
+Auto-merging drivers/phy/marvell/Makefile
+CONFLICT (content): Merge conflict in drivers/phy/marvell/Makefile
+Auto-merging drivers/phy/marvell/Kconfig
+CONFLICT (content): Merge conflict in drivers/phy/marvell/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'drivers/phy/marvell/Kconfig' using previous resolution.
+Resolved 'drivers/phy/marvell/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1d69d0c3d905] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-usb | 2 +-
+ Documentation/admin-guide/kernel-parameters.txt | 3 +-
+ .../devicetree/bindings/arm/atmel-sysregs.txt | 1 +
+ .../bindings/display/bridge/cdns,dsi.txt | 21 --
+ .../devicetree/bindings/phy/cdns,dphy.txt | 20 ++
+ .../devicetree/bindings/phy/phy-mvebu-comphy.txt | 65 +++-
+ .../devicetree/bindings/phy/phy-mvebu-utmi.txt | 38 ++
+ .../bindings/phy/phy-rockchip-inno-usb2.txt | 2 +
+ .../devicetree/bindings/phy/qcom-qmp-phy.txt | 9 +
+ .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 1 +
+ .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 2 +
+ Documentation/devicetree/bindings/phy/ti-phy.txt | 1 +
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 +
+ .../bindings/usb/ingenic,jz4740-musb.txt | 24 ++
+ .../devicetree/bindings/usb/keystone-usb.txt | 6 +-
+ .../devicetree/bindings/usb/qcom,dwc3.txt | 1 +
+ .../devicetree/bindings/usb/renesas_usb3.txt | 1 +
+ .../devicetree/bindings/usb/renesas_usbhs.txt | 1 +
+ Documentation/devicetree/bindings/usb/usb251xb.txt | 4 +
+ Documentation/usb/authorization.txt | 4 +-
+ MAINTAINERS | 8 +
+ drivers/base/devcon.c | 62 +++-
+ drivers/phy/broadcom/phy-bcm-sr-pcie.c | 4 +-
+ drivers/phy/cadence/Kconfig | 13 +-
+ drivers/phy/cadence/Makefile | 1 +
+ drivers/phy/cadence/cdns-dphy.c | 391 +++++++++++++++++++++
+ drivers/phy/freescale/Kconfig | 2 +-
+ drivers/phy/marvell/Kconfig | 21 ++
+ drivers/phy/marvell/Makefile | 2 +
+ drivers/phy/marvell/phy-armada375-usb2.c | 13 +-
+ drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 318 +++++++++++++++++
+ drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 278 +++++++++++++++
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 2 -
+ drivers/phy/marvell/phy-mvebu-sata.c | 9 +-
+ drivers/phy/phy-core-mipi-dphy.c | 8 +-
+ drivers/phy/phy-core.c | 12 +-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 143 ++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 4 +
+ drivers/phy/qualcomm/phy-qcom-qusb2.c | 40 +++
+ drivers/phy/qualcomm/phy-qcom-ufs-i.h | 19 +-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 48 ++-
+ drivers/phy/ti/Kconfig | 6 +-
+ drivers/phy/ti/phy-omap-usb2.c | 105 +++---
+ drivers/platform/x86/intel_cht_int33fe.c | 15 +-
+ drivers/usb/Kconfig | 1 +
+ drivers/usb/README | 54 ---
+ drivers/usb/atm/Kconfig | 1 +
+ drivers/usb/chipidea/Kconfig | 2 +
+ drivers/usb/chipidea/ci_hdrc_imx.c | 6 +-
+ drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
+ drivers/usb/chipidea/ci_hdrc_tegra.c | 1 +
+ drivers/usb/chipidea/core.c | 46 ++-
+ drivers/usb/chipidea/usbmisc_imx.c | 7 +
+ drivers/usb/class/Kconfig | 1 +
+ drivers/usb/class/cdc-wdm.c | 2 +-
+ drivers/usb/core/Kconfig | 13 +
+ drivers/usb/core/config.c | 14 +-
+ drivers/usb/core/devio.c | 10 +-
+ drivers/usb/core/driver.c | 23 +-
+ drivers/usb/core/generic.c | 44 ++-
+ drivers/usb/core/hcd.c | 56 +--
+ drivers/usb/core/hub.c | 66 +++-
+ drivers/usb/core/hub.h | 2 +
+ drivers/usb/core/message.c | 10 +-
+ drivers/usb/core/phy.c | 28 ++
+ drivers/usb/core/phy.h | 2 +
+ drivers/usb/core/sysfs.c | 5 +-
+ drivers/usb/core/urb.c | 5 +-
+ drivers/usb/core/usb.c | 37 +-
+ drivers/usb/core/usb.h | 10 +-
+ drivers/usb/dwc2/Kconfig | 2 +
+ drivers/usb/dwc2/gadget.c | 114 ++++--
+ drivers/usb/dwc2/hcd.c | 4 +-
+ drivers/usb/dwc3/Kconfig | 8 +-
+ drivers/usb/dwc3/core.h | 12 +-
+ drivers/usb/dwc3/debug.h | 156 ++++----
+ drivers/usb/dwc3/drd.c | 9 +-
+ drivers/usb/dwc3/dwc3-haps.c | 9 +
+ drivers/usb/dwc3/dwc3-keystone.c | 11 +-
+ drivers/usb/dwc3/dwc3-qcom.c | 1 +
+ drivers/usb/dwc3/gadget.c | 65 ++--
+ drivers/usb/dwc3/gadget.h | 4 +-
+ drivers/usb/dwc3/trace.h | 10 +-
+ drivers/usb/gadget/Kconfig | 1 +
+ drivers/usb/gadget/epautoconf.c | 41 ++-
+ drivers/usb/gadget/function/f_fs.c | 12 +
+ drivers/usb/gadget/function/f_uac1.c | 10 +-
+ drivers/usb/gadget/function/u_ecm.h | 2 +-
+ drivers/usb/gadget/function/u_eem.h | 2 +-
+ drivers/usb/gadget/function/u_ether_configfs.h | 2 +-
+ drivers/usb/gadget/function/u_fs.h | 2 +-
+ drivers/usb/gadget/function/u_gether.h | 2 +-
+ drivers/usb/gadget/function/u_hid.h | 2 +-
+ drivers/usb/gadget/function/u_midi.h | 2 +-
+ drivers/usb/gadget/function/u_ncm.h | 2 +-
+ drivers/usb/gadget/function/u_printer.h | 2 +-
+ drivers/usb/gadget/function/u_rndis.h | 2 +-
+ drivers/usb/gadget/function/u_serial.c | 35 +-
+ drivers/usb/gadget/function/u_uac2.h | 2 +-
+ drivers/usb/gadget/function/u_uvc.h | 2 +-
+ drivers/usb/gadget/function/uvc.h | 2 +
+ drivers/usb/gadget/function/uvc_configfs.c | 10 +-
+ drivers/usb/gadget/function/uvc_configfs.h | 2 +-
+ drivers/usb/gadget/function/uvc_v4l2.h | 2 +-
+ drivers/usb/gadget/function/uvc_video.h | 2 +-
+ drivers/usb/gadget/legacy/Kconfig | 1 +
+ drivers/usb/gadget/legacy/inode.c | 40 +--
+ drivers/usb/gadget/u_f.c | 2 +-
+ drivers/usb/gadget/u_f.h | 2 +-
+ drivers/usb/gadget/u_os_desc.h | 2 +-
+ drivers/usb/gadget/udc/Kconfig | 1 +
+ drivers/usb/gadget/udc/aspeed-vhub/epn.c | 2 +-
+ drivers/usb/gadget/udc/aspeed-vhub/hub.c | 2 +-
+ drivers/usb/gadget/udc/bdc/Kconfig | 2 +
+ drivers/usb/gadget/udc/bdc/bdc_cmd.c | 4 +-
+ drivers/usb/gadget/udc/core.c | 8 +-
+ drivers/usb/gadget/udc/fotg210-udc.c | 11 +-
+ drivers/usb/gadget/udc/net2280.c | 6 +-
+ drivers/usb/gadget/udc/renesas_usb3.c | 4 +
+ drivers/usb/gadget/udc/snps_udc_core.c | 17 +-
+ drivers/usb/host/Kconfig | 8 +-
+ drivers/usb/host/ehci-fsl.c | 69 ++--
+ drivers/usb/host/ehci-orion.c | 44 ++-
+ drivers/usb/host/fsl-mph-dr-of.c | 6 +
+ drivers/usb/host/ohci-at91.c | 7 +-
+ drivers/usb/host/oxu210hp-hcd.c | 10 +-
+ drivers/usb/host/u132-hcd.c | 6 +-
+ drivers/usb/host/whci/{Kbuild => Makefile} | 2 +
+ drivers/usb/host/xhci-dbgcap.c | 6 +-
+ drivers/usb/host/xhci-debugfs.h | 1 -
+ drivers/usb/host/xhci-mem.c | 2 +-
+ drivers/usb/host/xhci-mvebu.c | 11 +
+ drivers/usb/host/xhci-mvebu.h | 6 +
+ drivers/usb/host/xhci-pci.c | 1 +
+ drivers/usb/host/xhci-plat.c | 7 +
+ drivers/usb/host/xhci-tegra.c | 4 +-
+ drivers/usb/host/xhci.c | 3 +-
+ drivers/usb/image/Kconfig | 1 +
+ drivers/usb/isp1760/Kconfig | 2 +
+ drivers/usb/misc/Kconfig | 1 +
+ drivers/usb/misc/ftdi-elan.c | 26 --
+ drivers/usb/misc/sisusbvga/Kconfig | 1 +
+ drivers/usb/misc/sisusbvga/Makefile | 3 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 32 +-
+ drivers/usb/misc/sisusbvga/sisusb.h | 15 +-
+ drivers/usb/misc/sisusbvga/sisusb_con.c | 127 +++----
+ drivers/usb/misc/sisusbvga/sisusb_init.c | 5 -
+ drivers/usb/misc/usb251xb.c | 15 +-
+ drivers/usb/misc/usb3503.c | 38 +-
+ drivers/usb/misc/usbtest.c | 28 +-
+ drivers/usb/mon/Kconfig | 1 +
+ drivers/usb/mtu3/Kconfig | 2 +
+ drivers/usb/musb/Kconfig | 5 +-
+ drivers/usb/musb/jz4740.c | 10 +
+ drivers/usb/musb/musb_host.c | 4 +-
+ drivers/usb/phy/Kconfig | 1 +
+ drivers/usb/phy/phy-twl6030-usb.c | 2 +-
+ drivers/usb/renesas_usbhs/mod_host.c | 2 +-
+ drivers/usb/renesas_usbhs/rcar3.c | 2 +-
+ drivers/usb/renesas_usbhs/rza.c | 2 +-
+ drivers/usb/roles/Kconfig | 2 +
+ drivers/usb/roles/Makefile | 2 +
+ drivers/usb/roles/class.c | 21 +-
+ drivers/usb/serial/Kconfig | 1 +
+ drivers/usb/serial/cp210x.c | 129 ++++++-
+ drivers/usb/serial/option.c | 2 +
+ drivers/usb/storage/Kconfig | 1 +
+ drivers/usb/storage/karma.c | 2 +
+ drivers/usb/typec/Kconfig | 1 +
+ drivers/usb/typec/altmodes/Kconfig | 1 +
+ drivers/usb/typec/altmodes/Makefile | 2 +
+ drivers/usb/typec/altmodes/displayport.c | 4 -
+ drivers/usb/typec/class.c | 33 +-
+ drivers/usb/typec/mux.c | 94 ++++-
+ drivers/usb/typec/mux/Kconfig | 2 +
+ drivers/usb/typec/tcpm/Kconfig | 2 +
+ drivers/usb/typec/tcpm/tcpm.c | 68 +---
+ drivers/usb/typec/tps6598x.c | 79 ++++-
+ drivers/usb/typec/ucsi/Kconfig | 2 +
+ drivers/usb/typec/ucsi/debug.h | 65 ----
+ drivers/usb/typec/ucsi/trace.c | 59 ++++
+ drivers/usb/typec/ucsi/trace.h | 7 +-
+ drivers/usb/usbip/Kconfig | 2 +
+ drivers/usb/usbip/vhci_hcd.c | 6 +-
+ drivers/usb/usbip/vudc_dev.c | 3 +-
+ drivers/usb/wusbcore/Kconfig | 1 +
+ drivers/usb/wusbcore/cbaf.c | 15 +-
+ drivers/usb/wusbcore/dev-sysfs.c | 5 +-
+ drivers/usb/wusbcore/devconnect.c | 2 +-
+ drivers/usb/wusbcore/wa-xfer.c | 15 +-
+ drivers/usb/wusbcore/wusbhc.c | 6 +-
+ drivers/uwb/drp-ie.c | 5 +-
+ include/linux/device.h | 6 +
+ include/linux/fsl_devices.h | 7 +-
+ include/linux/phy/phy-mipi-dphy.h | 13 +-
+ include/linux/usb/hcd.h | 10 +-
+ include/linux/usb/role.h | 2 +
+ include/linux/usb/tcpm.h | 6 -
+ include/linux/usb/typec_dp.h | 4 +
+ include/linux/usb/typec_mux.h | 3 +-
+ include/linux/usb/wusb.h | 16 -
+ 201 files changed, 2942 insertions(+), 1110 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/ingenic,jz4740-musb.txt
+ create mode 100644 drivers/phy/cadence/cdns-dphy.c
+ create mode 100644 drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+ create mode 100644 drivers/phy/marvell/phy-mvebu-a3700-utmi.c
+ delete mode 100644 drivers/usb/README
+ rename drivers/usb/host/whci/{Kbuild => Makefile} (79%)
+ delete mode 100644 drivers/usb/typec/ucsi/debug.h
+Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (6431866b6707 USB: serial: option: add Telit ME910 ECM composition)
+$ git merge usb-serial/usb-next
+Already up to date.
+Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
+Merge made by the 'recursive' strategy.
+Merging phy-next/next (203d9b11928c phy: qcom-qmp: Add QMP UFS PHY support for msm8998)
+$ git merge phy-next/next
+Already up to date.
+Merging tty/tty-next (f694936c3b5a tty: xilinx_uartps: Correct return value in probe)
+$ git merge tty/tty-next
+Removing Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt
+Removing Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt
+Removing Documentation/devicetree/bindings/serial/pl011.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/serial/8250.txt | 1 +
+ .../devicetree/bindings/serial/ingenic,uart.txt | 3 +-
+ .../devicetree/bindings/serial/milbeaut-uart.txt | 21 ++
+ .../bindings/serial/nvidia,tegra194-tcu.txt | 35 +++
+ .../devicetree/bindings/serial/omap_serial.txt | 2 +
+ Documentation/devicetree/bindings/serial/pl011.txt | 51 ----
+ .../devicetree/bindings/serial/pl011.yaml | 126 +++++++++
+ .../bindings/serial/renesas,rzn1-uart.txt | 10 -
+ .../bindings/serial/snps-dw-apb-uart.txt | 76 ------
+ .../bindings/serial/snps-dw-apb-uart.yaml | 140 ++++++++++
+ drivers/tty/Kconfig | 24 ++
+ drivers/tty/hvc/hvc_xen.c | 2 +-
+ drivers/tty/ipwireless/hardware.c | 2 +
+ drivers/tty/n_gsm.c | 246 ++++++++---------
+ drivers/tty/n_hdlc.c | 2 +-
+ drivers/tty/n_tty.c | 6 +-
+ drivers/tty/nozomi.c | 10 +-
+ drivers/tty/serdev/serdev-ttyport.c | 4 +-
+ drivers/tty/serial/8250/8250_ingenic.c | 13 +-
+ drivers/tty/serial/8250/8250_of.c | 5 +
+ drivers/tty/serial/8250/8250_omap.c | 75 +++---
+ drivers/tty/serial/8250/8250_pci.c | 170 +++++++++---
+ drivers/tty/serial/8250/8250_pxa.c | 4 +
+ drivers/tty/serial/Kconfig | 22 ++
+ drivers/tty/serial/Makefile | 1 +
+ drivers/tty/serial/clps711x.c | 23 +-
+ drivers/tty/serial/fsl_lpuart.c | 208 +++++++++++---
+ drivers/tty/serial/lpc32xx_hs.c | 4 +
+ drivers/tty/serial/max310x.c | 21 +-
+ drivers/tty/serial/meson_uart.c | 13 +-
+ drivers/tty/serial/mps2-uart.c | 138 +++++++---
+ drivers/tty/serial/msm_serial.c | 2 +-
+ drivers/tty/serial/qcom_geni_serial.c | 279 ++++++++-----------
+ drivers/tty/serial/samsung.c | 42 +++
+ drivers/tty/serial/sc16is7xx.c | 4 +-
+ drivers/tty/serial/serial_core.c | 2 +-
+ drivers/tty/serial/sh-sci.c | 71 +++--
+ drivers/tty/serial/sprd_serial.c | 2 +-
+ drivers/tty/serial/tegra-tcu.c | 298 +++++++++++++++++++++
+ drivers/tty/serial/xilinx_uartps.c | 40 ++-
+ drivers/tty/synclink.c | 54 ----
+ drivers/tty/sysrq.c | 8 +-
+ drivers/tty/tty_buffer.c | 2 +-
+ drivers/tty/tty_io.c | 3 +
+ drivers/tty/tty_ldisc.c | 47 ++++
+ drivers/tty/vt/vc_screen.c | 48 +++-
+ drivers/tty/vt/vt.c | 77 ++++--
+ include/linux/console_struct.h | 2 +-
+ include/uapi/linux/serial_core.h | 3 +
+ 49 files changed, 1670 insertions(+), 772 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/milbeaut-uart.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.txt
+ delete mode 100644 Documentation/devicetree/bindings/serial/pl011.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/pl011.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/renesas,rzn1-uart.txt
+ delete mode 100644 Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
+ create mode 100644 drivers/tty/serial/tegra-tcu.c
+Merging char-misc/char-misc-next (142a0f83b216 habanalabs: adjust Kconfig to fix build errors)
+$ git merge char-misc/char-misc-next
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/events/ring_buffer.c
+Auto-merging include/linux/perf_event.h
+Auto-merging include/drm/drm_hdcp.h
+Auto-merging drivers/video/fbdev/imsttfb.c
+Auto-merging drivers/nvmem/Kconfig
+Auto-merging drivers/misc/mic/scif/scif_rma.c
+Auto-merging drivers/hwtracing/coresight/coresight-stm.c
+Auto-merging drivers/hwtracing/coresight/coresight-priv.h
+Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c
+Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c
+Auto-merging drivers/gpu/drm/i915/intel_display.h
+Removing drivers/char/generic_nvram.c
+Auto-merging drivers/Makefile
+Auto-merging arch/x86/events/intel/pt.c
+Auto-merging arch/powerpc/kernel/setup_32.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/m68k/mac/misc.c
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging CREDITS
+Merge made by the 'recursive' strategy.
+ CREDITS | 2 +-
+ Documentation/ABI/stable/sysfs-bus-vmbus | 33 +
+ .../ABI/testing/debugfs-driver-habanalabs | 126 +
+ .../ABI/testing/sysfs-bus-intel_th-output-devices | 6 +-
+ Documentation/ABI/testing/sysfs-driver-habanalabs | 190 +
+ .../devicetree/bindings/extcon/extcon-ptn5150.txt | 27 +
+ Documentation/devicetree/bindings/gnss/gnss.txt | 1 +
+ .../devicetree/bindings/gnss/mediatek.txt | 35 +
+ .../devicetree/bindings/gnss/sirfstar.txt | 1 +
+ .../bindings/interconnect/interconnect.txt | 60 +
+ .../bindings/interconnect/qcom,sdm845.txt | 24 +
+ .../devicetree/bindings/misc/qcom,fastrpc.txt | 78 +
+ .../devicetree/bindings/nvmem/imx-ocotp.txt | 4 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/interconnect/interconnect.rst | 94 +
+ MAINTAINERS | 21 +-
+ arch/Kconfig | 3 +
+ arch/m68k/Kconfig.machine | 2 +
+ arch/m68k/atari/Makefile | 2 +
+ arch/m68k/atari/nvram.c | 272 +
+ arch/m68k/include/asm/atarihw.h | 6 +
+ arch/m68k/include/asm/macintosh.h | 4 +
+ arch/m68k/kernel/setup_mm.c | 82 +-
+ arch/m68k/mac/misc.c | 174 +-
+ arch/parisc/include/asm/io.h | 9 +
+ arch/parisc/lib/iomap.c | 64 +
+ arch/powerpc/Kconfig | 6 +-
+ arch/powerpc/include/asm/io.h | 2 +
+ arch/powerpc/include/asm/nvram.h | 9 -
+ arch/powerpc/kernel/nvram_64.c | 158 +-
+ arch/powerpc/kernel/setup_32.c | 36 +-
+ arch/powerpc/platforms/chrp/Makefile | 2 +-
+ arch/powerpc/platforms/chrp/nvram.c | 14 +-
+ arch/powerpc/platforms/chrp/setup.c | 2 +-
+ arch/powerpc/platforms/powermac/Makefile | 2 -
+ arch/powerpc/platforms/powermac/nvram.c | 9 +
+ arch/powerpc/platforms/powermac/setup.c | 3 +-
+ arch/powerpc/platforms/powermac/time.c | 2 +-
+ arch/powerpc/platforms/pseries/nvram.c | 2 -
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/android/Kconfig | 2 +-
+ drivers/android/binder.c | 556 +-
+ drivers/android/binder_alloc.c | 303 +-
+ drivers/android/binder_alloc.h | 47 +-
+ drivers/android/binder_alloc_selftest.c | 7 +-
+ drivers/android/binder_trace.h | 2 +-
+ drivers/char/Kconfig | 19 +-
+ drivers/char/Makefile | 6 +-
+ drivers/char/applicom.c | 35 +-
+ drivers/char/efirtc.c | 23 -
+ drivers/char/generic_nvram.c | 159 -
+ drivers/char/hpet.c | 9 +-
+ drivers/char/lp.c | 4 +-
+ drivers/char/mbcs.c | 1 +
+ drivers/char/nvram.c | 673 +--
+ drivers/extcon/Kconfig | 8 +
+ drivers/extcon/Makefile | 1 +
+ drivers/extcon/extcon-ptn5150.c | 339 ++
+ drivers/fpga/Kconfig | 2 +-
+ drivers/fpga/altera-ps-spi.c | 2 +-
+ drivers/gnss/Kconfig | 13 +
+ drivers/gnss/Makefile | 3 +
+ drivers/gnss/core.c | 1 +
+ drivers/gnss/mtk.c | 152 +
+ drivers/gnss/sirf.c | 256 +-
+ drivers/gpu/drm/i915/intel_display.h | 16 +-
+ drivers/gpu/drm/msm/Kconfig | 1 +
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 20 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 9 +
+ drivers/gpu/drm/msm/msm_gpu.h | 3 +
+ drivers/hv/channel.c | 4 +-
+ drivers/hv/channel_mgmt.c | 18 +-
+ drivers/hv/hyperv_vmbus.h | 4 +-
+ drivers/hv/ring_buffer.c | 14 +-
+ drivers/hv/vmbus_drv.c | 86 +-
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +
+ drivers/hwtracing/coresight/coresight-etm4x.c | 3 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 12 +-
+ drivers/hwtracing/coresight/of_coresight.c | 4 +-
+ drivers/hwtracing/intel_th/core.c | 6 +-
+ drivers/hwtracing/intel_th/gth.c | 4 +
+ drivers/hwtracing/intel_th/pti.c | 16 +-
+ drivers/hwtracing/intel_th/sth.c | 4 +
+ drivers/hwtracing/stm/core.c | 11 +-
+ drivers/interconnect/Kconfig | 15 +
+ drivers/interconnect/Makefile | 6 +
+ drivers/interconnect/core.c | 799 +++
+ drivers/interconnect/qcom/Kconfig | 13 +
+ drivers/interconnect/qcom/Makefile | 5 +
+ drivers/interconnect/qcom/sdm845.c | 838 +++
+ drivers/macintosh/via-cuda.c | 8 +-
+ drivers/misc/Kconfig | 12 +
+ drivers/misc/Makefile | 2 +
+ drivers/misc/ad525x_dpot.c | 24 +-
+ drivers/misc/cardreader/rts5227.c | 64 +-
+ drivers/misc/cardreader/rts5249.c | 32 +-
+ drivers/misc/cardreader/rts5260.c | 136 +-
+ drivers/misc/cardreader/rtsx_pcr.c | 40 +-
+ drivers/misc/cardreader/rtsx_pcr.h | 5 +
+ drivers/misc/enclosure.c | 4 +-
+ drivers/misc/fastrpc.c | 1401 +++++
+ drivers/misc/habanalabs/Kconfig | 25 +
+ drivers/misc/habanalabs/Makefile | 14 +
+ drivers/misc/habanalabs/asid.c | 57 +
+ drivers/misc/habanalabs/command_buffer.c | 445 ++
+ drivers/misc/habanalabs/command_submission.c | 780 +++
+ drivers/misc/habanalabs/context.c | 215 +
+ drivers/misc/habanalabs/debugfs.c | 1077 ++++
+ drivers/misc/habanalabs/device.c | 1140 +++++
+ drivers/misc/habanalabs/goya/Makefile | 3 +
+ drivers/misc/habanalabs/goya/goya.c | 5391 ++++++++++++++++++++
+ drivers/misc/habanalabs/goya/goyaP.h | 211 +
+ drivers/misc/habanalabs/goya/goya_hwmgr.c | 254 +
+ drivers/misc/habanalabs/goya/goya_security.c | 2999 +++++++++++
+ drivers/misc/habanalabs/habanalabs.h | 1464 ++++++
+ drivers/misc/habanalabs/habanalabs_drv.c | 461 ++
+ drivers/misc/habanalabs/habanalabs_ioctl.c | 234 +
+ drivers/misc/habanalabs/hw_queue.c | 635 +++
+ drivers/misc/habanalabs/hwmon.c | 458 ++
+ drivers/misc/habanalabs/include/armcp_if.h | 335 ++
+ .../include/goya/asic_reg/cpu_ca53_cfg_masks.h | 191 +
+ .../include/goya/asic_reg/cpu_ca53_cfg_regs.h | 61 +
+ .../habanalabs/include/goya/asic_reg/cpu_if_regs.h | 49 +
+ .../include/goya/asic_reg/cpu_pll_regs.h | 105 +
+ .../include/goya/asic_reg/dma_ch_0_regs.h | 209 +
+ .../include/goya/asic_reg/dma_ch_1_regs.h | 209 +
+ .../include/goya/asic_reg/dma_ch_2_regs.h | 209 +
+ .../include/goya/asic_reg/dma_ch_3_regs.h | 209 +
+ .../include/goya/asic_reg/dma_ch_4_regs.h | 209 +
+ .../include/goya/asic_reg/dma_macro_masks.h | 105 +
+ .../include/goya/asic_reg/dma_macro_regs.h | 181 +
+ .../include/goya/asic_reg/dma_nrtr_masks.h | 209 +
+ .../include/goya/asic_reg/dma_nrtr_regs.h | 227 +
+ .../include/goya/asic_reg/dma_qm_0_masks.h | 465 ++
+ .../include/goya/asic_reg/dma_qm_0_regs.h | 179 +
+ .../include/goya/asic_reg/dma_qm_1_regs.h | 179 +
+ .../include/goya/asic_reg/dma_qm_2_regs.h | 179 +
+ .../include/goya/asic_reg/dma_qm_3_regs.h | 179 +
+ .../include/goya/asic_reg/dma_qm_4_regs.h | 179 +
+ .../habanalabs/include/goya/asic_reg/goya_blocks.h | 1372 +++++
+ .../habanalabs/include/goya/asic_reg/goya_masks.h | 275 +
+ .../habanalabs/include/goya/asic_reg/goya_regs.h | 118 +
+ .../habanalabs/include/goya/asic_reg/ic_pll_regs.h | 105 +
+ .../habanalabs/include/goya/asic_reg/mc_pll_regs.h | 105 +
+ .../include/goya/asic_reg/mme1_rtr_masks.h | 653 +++
+ .../include/goya/asic_reg/mme1_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme2_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme3_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme4_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme5_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme6_rtr_regs.h | 331 ++
+ .../include/goya/asic_reg/mme_cmdq_masks.h | 373 ++
+ .../include/goya/asic_reg/mme_cmdq_regs.h | 139 +
+ .../habanalabs/include/goya/asic_reg/mme_masks.h | 1537 ++++++
+ .../include/goya/asic_reg/mme_qm_masks.h | 465 ++
+ .../habanalabs/include/goya/asic_reg/mme_qm_regs.h | 179 +
+ .../habanalabs/include/goya/asic_reg/mme_regs.h | 1153 +++++
+ .../habanalabs/include/goya/asic_reg/mmu_masks.h | 143 +
+ .../habanalabs/include/goya/asic_reg/mmu_regs.h | 53 +
+ .../include/goya/asic_reg/pci_nrtr_masks.h | 209 +
+ .../include/goya/asic_reg/pci_nrtr_regs.h | 227 +
+ .../include/goya/asic_reg/pcie_aux_regs.h | 243 +
+ .../include/goya/asic_reg/psoc_emmc_pll_regs.h | 105 +
+ .../include/goya/asic_reg/psoc_global_conf_masks.h | 447 ++
+ .../include/goya/asic_reg/psoc_global_conf_regs.h | 745 +++
+ .../include/goya/asic_reg/psoc_mme_pll_regs.h | 105 +
+ .../include/goya/asic_reg/psoc_pci_pll_regs.h | 105 +
+ .../include/goya/asic_reg/psoc_spi_regs.h | 143 +
+ .../include/goya/asic_reg/sram_y0_x0_rtr_regs.h | 83 +
+ .../include/goya/asic_reg/sram_y0_x1_rtr_regs.h | 83 +
+ .../include/goya/asic_reg/sram_y0_x2_rtr_regs.h | 83 +
+ .../include/goya/asic_reg/sram_y0_x3_rtr_regs.h | 83 +
+ .../include/goya/asic_reg/sram_y0_x4_rtr_regs.h | 83 +
+ .../habanalabs/include/goya/asic_reg/stlb_masks.h | 117 +
+ .../habanalabs/include/goya/asic_reg/stlb_regs.h | 55 +
+ .../include/goya/asic_reg/tpc0_cfg_masks.h | 1607 ++++++
+ .../include/goya/asic_reg/tpc0_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc0_cmdq_masks.h | 373 ++
+ .../include/goya/asic_reg/tpc0_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc0_eml_cfg_masks.h | 347 ++
+ .../include/goya/asic_reg/tpc0_eml_cfg_regs.h | 313 ++
+ .../include/goya/asic_reg/tpc0_nrtr_masks.h | 209 +
+ .../include/goya/asic_reg/tpc0_nrtr_regs.h | 227 +
+ .../include/goya/asic_reg/tpc0_qm_masks.h | 465 ++
+ .../include/goya/asic_reg/tpc0_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc1_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc1_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc1_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc1_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc2_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc2_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc2_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc2_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc3_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc3_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc3_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc3_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc4_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc4_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc4_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc4_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc5_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc5_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc5_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc5_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc6_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc6_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc6_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc6_rtr_regs.h | 323 ++
+ .../include/goya/asic_reg/tpc7_cfg_regs.h | 887 ++++
+ .../include/goya/asic_reg/tpc7_cmdq_regs.h | 139 +
+ .../include/goya/asic_reg/tpc7_nrtr_regs.h | 227 +
+ .../include/goya/asic_reg/tpc7_qm_regs.h | 179 +
+ .../include/goya/asic_reg/tpc_pll_regs.h | 105 +
+ drivers/misc/habanalabs/include/goya/goya.h | 45 +
+ .../habanalabs/include/goya/goya_async_events.h | 186 +
+ drivers/misc/habanalabs/include/goya/goya_fw_if.h | 28 +
+ .../misc/habanalabs/include/goya/goya_packets.h | 129 +
+ drivers/misc/habanalabs/include/hl_boot_if.h | 30 +
+ .../habanalabs/include/hw_ip/mmu/mmu_general.h | 47 +
+ .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 15 +
+ drivers/misc/habanalabs/include/qman_if.h | 56 +
+ drivers/misc/habanalabs/irq.c | 327 ++
+ drivers/misc/habanalabs/memory.c | 1723 +++++++
+ drivers/misc/habanalabs/mmu.c | 906 ++++
+ drivers/misc/habanalabs/sysfs.c | 539 ++
+ drivers/misc/hpilo.c | 14 +-
+ drivers/misc/ics932s401.c | 2 +
+ drivers/misc/lkdtm/core.c | 15 +-
+ drivers/misc/lkdtm/lkdtm.h | 2 +
+ drivers/misc/lkdtm/perms.c | 36 +-
+ drivers/misc/mei/Kconfig | 10 +
+ drivers/misc/mei/Makefile | 2 +
+ drivers/misc/mei/bus-fixup.c | 16 +
+ drivers/misc/mei/bus.c | 22 +-
+ drivers/misc/mei/hbm.c | 7 +
+ drivers/misc/mei/hdcp/Makefile | 7 +
+ drivers/misc/mei/hdcp/mei_hdcp.c | 849 +++
+ drivers/misc/mei/hdcp/mei_hdcp.h | 377 ++
+ drivers/misc/mei/hw.h | 3 +-
+ drivers/misc/mic/Kconfig | 3 +-
+ drivers/misc/mic/bus/scif_bus.h | 8 +-
+ drivers/misc/mic/bus/vop_bus.h | 8 +-
+ drivers/misc/mic/card/mic_device.c | 8 +-
+ drivers/misc/mic/host/mic_boot.c | 8 +-
+ drivers/misc/mic/scif/scif_map.h | 4 +-
+ drivers/misc/mic/scif/scif_rma.c | 2 +-
+ drivers/misc/mic/vop/vop_main.c | 29 +-
+ drivers/misc/mic/vop/vop_vringh.c | 51 +-
+ drivers/misc/sgi-gru/grufault.c | 4 +-
+ drivers/misc/vmw_balloon.c | 24 +-
+ drivers/misc/vmw_vmci/vmci_doorbell.c | 9 +-
+ drivers/misc/vmw_vmci/vmci_doorbell.h | 2 +-
+ drivers/misc/vmw_vmci/vmci_driver.h | 2 +
+ drivers/misc/vmw_vmci/vmci_guest.c | 39 +-
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 63 +-
+ drivers/misc/vmw_vmci/vmci_queue_pair.h | 4 +-
+ drivers/ntb/hw/intel/ntb_hw_intel.h | 30 +-
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 36 +-
+ drivers/nvmem/Kconfig | 2 +-
+ drivers/nvmem/bcm-ocotp.c | 37 +-
+ drivers/nvmem/core.c | 42 +-
+ drivers/nvmem/imx-ocotp.c | 13 +
+ drivers/nvmem/sc27xx-efuse.c | 12 +-
+ drivers/parport/daisy.c | 32 +-
+ drivers/parport/parport_pc.c | 2 +-
+ drivers/parport/probe.c | 2 +-
+ drivers/parport/share.c | 10 +-
+ drivers/platform/goldfish/Kconfig | 4 +-
+ drivers/scsi/Kconfig | 6 +-
+ drivers/scsi/atari_scsi.c | 10 +-
+ drivers/slimbus/core.c | 45 +-
+ drivers/uio/uio.c | 16 +-
+ drivers/uio/uio_pci_generic.c | 17 +
+ drivers/video/fbdev/Kconfig | 2 +-
+ drivers/video/fbdev/controlfb.c | 42 +-
+ drivers/video/fbdev/imsttfb.c | 23 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 7 +-
+ drivers/video/fbdev/platinumfb.c | 21 +-
+ drivers/video/fbdev/valkyriefb.c | 30 +-
+ drivers/virt/vboxguest/vboxguest_core.c | 2 +-
+ include/asm-generic/iomap.h | 22 +
+ include/drm/drm_audio_component.h | 1 +
+ include/drm/drm_hdcp.h | 18 +
+ include/drm/i915_component.h | 1 +
+ include/drm/i915_drm.h | 15 +
+ include/drm/i915_mei_hdcp_interface.h | 149 +
+ include/dt-bindings/interconnect/qcom,sdm845.h | 143 +
+ include/linux/gnss.h | 1 +
+ include/linux/hyperv.h | 144 +-
+ include/linux/interconnect-provider.h | 142 +
+ include/linux/interconnect.h | 59 +
+ include/linux/io-64-nonatomic-hi-lo.h | 64 +
+ include/linux/io-64-nonatomic-lo-hi.h | 64 +
+ include/linux/mei_cl_bus.h | 2 +
+ include/linux/nvram.h | 133 +-
+ include/linux/parport.h | 13 +
+ include/linux/vmw_vmci_defs.h | 7 +-
+ include/uapi/linux/android/binder.h | 19 +
+ include/uapi/linux/pmu.h | 2 +
+ include/uapi/misc/fastrpc.h | 41 +
+ include/uapi/misc/habanalabs.h | 450 ++
+ lib/Kconfig.debug | 1 -
+ lib/iomap.c | 140 +-
+ scripts/ver_linux | 6 +-
+ 306 files changed, 60424 insertions(+), 1908 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-driver-habanalabs
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-habanalabs
+ create mode 100644 Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt
+ create mode 100644 Documentation/devicetree/bindings/gnss/mediatek.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
+ create mode 100644 Documentation/interconnect/interconnect.rst
+ create mode 100644 arch/m68k/atari/nvram.c
+ delete mode 100644 drivers/char/generic_nvram.c
+ create mode 100644 drivers/extcon/extcon-ptn5150.c
+ create mode 100644 drivers/gnss/mtk.c
+ create mode 100644 drivers/interconnect/Kconfig
+ create mode 100644 drivers/interconnect/Makefile
+ create mode 100644 drivers/interconnect/core.c
+ create mode 100644 drivers/interconnect/qcom/Kconfig
+ create mode 100644 drivers/interconnect/qcom/Makefile
+ create mode 100644 drivers/interconnect/qcom/sdm845.c
+ create mode 100644 drivers/misc/fastrpc.c
+ create mode 100644 drivers/misc/habanalabs/Kconfig
+ create mode 100644 drivers/misc/habanalabs/Makefile
+ create mode 100644 drivers/misc/habanalabs/asid.c
+ create mode 100644 drivers/misc/habanalabs/command_buffer.c
+ create mode 100644 drivers/misc/habanalabs/command_submission.c
+ create mode 100644 drivers/misc/habanalabs/context.c
+ create mode 100644 drivers/misc/habanalabs/debugfs.c
+ create mode 100644 drivers/misc/habanalabs/device.c
+ create mode 100644 drivers/misc/habanalabs/goya/Makefile
+ create mode 100644 drivers/misc/habanalabs/goya/goya.c
+ create mode 100644 drivers/misc/habanalabs/goya/goyaP.h
+ create mode 100644 drivers/misc/habanalabs/goya/goya_hwmgr.c
+ create mode 100644 drivers/misc/habanalabs/goya/goya_security.c
+ create mode 100644 drivers/misc/habanalabs/habanalabs.h
+ create mode 100644 drivers/misc/habanalabs/habanalabs_drv.c
+ create mode 100644 drivers/misc/habanalabs/habanalabs_ioctl.c
+ create mode 100644 drivers/misc/habanalabs/hw_queue.c
+ create mode 100644 drivers/misc/habanalabs/hwmon.c
+ create mode 100644 drivers/misc/habanalabs/include/armcp_if.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/cpu_if_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/cpu_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_macro_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/goya_blocks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/ic_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mc_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mme_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mmu_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/mmu_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/pcie_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_spi_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/stlb_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/stlb_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/tpc_pll_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/goya.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/goya_async_events.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/goya_fw_if.h
+ create mode 100644 drivers/misc/habanalabs/include/goya/goya_packets.h
+ create mode 100644 drivers/misc/habanalabs/include/hl_boot_if.h
+ create mode 100644 drivers/misc/habanalabs/include/hw_ip/mmu/mmu_general.h
+ create mode 100644 drivers/misc/habanalabs/include/hw_ip/mmu/mmu_v1_0.h
+ create mode 100644 drivers/misc/habanalabs/include/qman_if.h
+ create mode 100644 drivers/misc/habanalabs/irq.c
+ create mode 100644 drivers/misc/habanalabs/memory.c
+ create mode 100644 drivers/misc/habanalabs/mmu.c
+ create mode 100644 drivers/misc/habanalabs/sysfs.c
+ create mode 100644 drivers/misc/mei/hdcp/Makefile
+ create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c
+ create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h
+ create mode 100644 include/drm/i915_mei_hdcp_interface.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sdm845.h
+ create mode 100644 include/linux/interconnect-provider.h
+ create mode 100644 include/linux/interconnect.h
+ create mode 100644 include/uapi/misc/fastrpc.h
+ create mode 100644 include/uapi/misc/habanalabs.h
+Merging extcon/extcon-next (3dfed89512d3 extcon: ptn5150: Fix return value check in ptn5150_i2c_probe())
+$ git merge extcon/extcon-next
+Already up to date.
+Merging soundwire/next (bfeffd155283 Linux 5.0-rc1)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (5908e6b738e3 Linux 5.0-rc8)
+$ git merge thunderbolt/next
+Already up to date.
+Merging staging/staging-next (1f08c4a54b7c staging: mt7621-dma: remove license boilerplate text)
+$ git merge staging/staging-next
+Removing drivers/staging/xgifb/vgatypes.h
+Removing drivers/staging/xgifb/vb_util.h
+Removing drivers/staging/xgifb/vb_table.h
+Removing drivers/staging/xgifb/vb_struct.h
+Removing drivers/staging/xgifb/vb_setmode.h
+Removing drivers/staging/xgifb/vb_setmode.c
+Removing drivers/staging/xgifb/vb_init.h
+Removing drivers/staging/xgifb/vb_init.c
+Removing drivers/staging/xgifb/vb_def.h
+Removing drivers/staging/xgifb/XGIfb.h
+Removing drivers/staging/xgifb/XGI_main_26.c
+Removing drivers/staging/xgifb/XGI_main.h
+Removing drivers/staging/xgifb/TODO
+Removing drivers/staging/xgifb/Makefile
+Removing drivers/staging/xgifb/Kconfig
+Removing drivers/staging/ks7010/michael_mic.h
+Removing drivers/staging/ks7010/michael_mic.c
+Removing drivers/staging/iio/cdc/ad7152.c
+Auto-merging drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+CONFLICT (content): Merge conflict in drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+Auto-merging drivers/staging/erofs/unzip_vle.c
+Auto-merging drivers/staging/erofs/data.c
+Removing drivers/staging/android/ion/ion-ioctl.c
+Auto-merging drivers/iio/adc/Makefile
+Auto-merging drivers/iio/adc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Resolved 'drivers/staging/fsl-dpaa2/ethsw/ethsw.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ff20998589e7] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 21 +-
+ Documentation/ABI/testing/sysfs-bus-iio-sps30 | 28 +
+ .../devicetree/bindings/iio/accel/mma8452.txt | 4 +
+ .../devicetree/bindings/iio/adc/adi,ad7606.txt | 65 +
+ .../devicetree/bindings/iio/adc/adi,ad7768-1.txt | 41 +
+ .../bindings/iio/adc/amlogic,meson-saradc.txt | 4 +
+ .../devicetree/bindings/iio/adc/ingenic,adc.txt | 48 +
+ .../bindings/{staging => }/iio/adc/lpc32xx-adc.txt | 0
+ .../bindings/iio/adc/nuvoton,npcm-adc.txt | 24 +
+ .../bindings/iio/adc/samsung,exynos-adc.txt | 4 +-
+ .../devicetree/bindings/iio/adc/ti-ads124s08.txt | 25 +
+ .../devicetree/bindings/iio/chemical/bme680.txt | 11 +
+ .../bindings/iio/chemical/plantower,pms7003.txt | 20 +
+ .../bindings/iio/chemical/sensirion,sgp30.txt | 15 +
+ .../bindings/iio/chemical/sensirion,sps30.txt | 12 +
+ .../devicetree/bindings/iio/dac/ti,dac7612.txt | 28 +
+ .../bindings/iio/impedance-analyzer/ad5933.txt | 26 +
+ .../devicetree/bindings/iio/imu/bmi160.txt | 6 +-
+ .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 1 +
+ .../devicetree/bindings/iio/light/max44009.txt | 24 +
+ .../devicetree/bindings/iio/st-sensors.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 28 +-
+ drivers/iio/accel/adxl345_core.c | 4 +-
+ drivers/iio/accel/mma8452.c | 105 +-
+ drivers/iio/accel/st_accel_core.c | 171 +-
+ drivers/iio/adc/Kconfig | 80 +-
+ drivers/iio/adc/Makefile | 7 +
+ drivers/iio/adc/ad7476.c | 20 +
+ drivers/{staging => }/iio/adc/ad7606.c | 272 +-
+ drivers/{staging => }/iio/adc/ad7606.h | 17 +-
+ drivers/{staging => }/iio/adc/ad7606_par.c | 46 +-
+ drivers/{staging => }/iio/adc/ad7606_spi.c | 35 +-
+ drivers/iio/adc/ad7768-1.c | 655 +++
+ drivers/iio/adc/exynos_adc.c | 19 +-
+ drivers/iio/adc/ingenic-adc.c | 364 ++
+ drivers/iio/adc/lpc32xx_adc.c | 15 +-
+ drivers/iio/adc/meson_saradc.c | 33 +
+ drivers/iio/adc/npcm_adc.c | 335 ++
+ drivers/iio/adc/ti-ads124s08.c | 376 ++
+ drivers/iio/adc/xilinx-xadc-core.c | 4 +-
+ drivers/iio/chemical/Kconfig | 21 +
+ drivers/iio/chemical/Makefile | 3 +
+ drivers/iio/chemical/bme680_i2c.c | 7 +
+ drivers/iio/chemical/bme680_spi.c | 8 +
+ drivers/iio/chemical/pms7003.c | 340 ++
+ drivers/iio/chemical/sgp30.c | 591 +++
+ drivers/iio/chemical/sps30.c | 548 ++
+ drivers/iio/dac/Kconfig | 16 +-
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/ad5686-spi.c | 9 +-
+ drivers/iio/dac/ad5686.c | 44 +-
+ drivers/iio/dac/ad5686.h | 4 +-
+ drivers/iio/dac/ad5696-i2c.c | 2 +-
+ drivers/iio/dac/ad5758.c | 2 +-
+ drivers/iio/dac/ti-dac7612.c | 184 +
+ drivers/iio/frequency/ad9523.c | 7 +-
+ drivers/iio/imu/bmi160/bmi160.h | 11 +
+ drivers/iio/imu/bmi160/bmi160_core.c | 317 +-
+ drivers/iio/imu/bmi160/bmi160_i2c.c | 5 +-
+ drivers/iio/imu/bmi160/bmi160_spi.c | 4 +-
+ drivers/iio/imu/inv_mpu6050/Kconfig | 8 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 31 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 8 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 12 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 2 -
+ drivers/iio/industrialio-core.c | 5 +
+ drivers/iio/light/Kconfig | 10 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/isl29018.c | 46 +-
+ drivers/iio/light/max44009.c | 555 ++
+ drivers/iio/magnetometer/mag3110.c | 94 +-
+ drivers/iio/pressure/Kconfig | 2 +-
+ drivers/iio/pressure/st_pressure.h | 2 +
+ drivers/iio/pressure/st_pressure_core.c | 69 +
+ drivers/iio/pressure/st_pressure_i2c.c | 5 +
+ drivers/iio/pressure/st_pressure_spi.c | 5 +
+ drivers/staging/Kconfig | 6 +-
+ drivers/staging/Makefile | 13 +-
+ drivers/staging/android/ashmem.c | 70 +-
+ drivers/staging/android/ion/Makefile | 2 +-
+ drivers/staging/android/ion/ion-ioctl.c | 98 -
+ drivers/staging/android/ion/ion.c | 84 +-
+ drivers/staging/android/ion/ion.h | 42 +-
+ drivers/staging/android/ion/ion_carveout_heap.c | 19 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 25 +-
+ drivers/staging/android/ion/ion_cma_heap.c | 6 +-
+ drivers/staging/android/ion/ion_heap.c | 8 +-
+ drivers/staging/android/ion/ion_page_pool.c | 2 +-
+ drivers/staging/android/ion/ion_system_heap.c | 10 +-
+ drivers/staging/android/uapi/ion.h | 2 +-
+ drivers/staging/android/vsoc.c | 1 -
+ drivers/staging/comedi/comedi_fops.c | 3 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 1 +
+ drivers/staging/comedi/drivers/ni_pcidio.c | 444 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 71 +-
+ drivers/staging/comedi/drivers/ni_tio.h | 4 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 2 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 31 +-
+ drivers/staging/emxx_udc/emxx_udc.h | 2 +
+ .../erofs/Documentation/filesystems/erofs.txt | 208 +
+ drivers/staging/erofs/Makefile | 2 +-
+ drivers/staging/erofs/data.c | 37 +-
+ drivers/staging/erofs/dir.c | 12 +-
+ drivers/staging/erofs/inode.c | 41 +-
+ drivers/staging/erofs/internal.h | 147 +-
+ drivers/staging/erofs/namei.c | 194 +-
+ drivers/staging/erofs/super.c | 29 +-
+ drivers/staging/erofs/unzip_vle.c | 165 +-
+ drivers/staging/erofs/unzip_vle.h | 23 +-
+ drivers/staging/erofs/unzip_vle_lz4.c | 21 +-
+ drivers/staging/erofs/utils.c | 58 +-
+ drivers/staging/erofs/xattr.c | 115 +-
+ drivers/staging/erofs/xattr.h | 10 +-
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 52 +-
+ drivers/staging/fbtft/fb_bd663474.c | 6 +-
+ drivers/staging/fbtft/fb_ili9163.c | 6 +-
+ drivers/staging/fbtft/fb_ili9320.c | 2 +-
+ drivers/staging/fbtft/fb_ili9325.c | 6 +-
+ drivers/staging/fbtft/fb_ili9340.c | 2 +-
+ drivers/staging/fbtft/fb_pcd8544.c | 4 +-
+ drivers/staging/fbtft/fb_ra8875.c | 4 +-
+ drivers/staging/fbtft/fb_s6d1121.c | 6 +-
+ drivers/staging/fbtft/fb_sh1106.c | 2 +-
+ drivers/staging/fbtft/fb_ssd1289.c | 6 +-
+ drivers/staging/fbtft/fb_ssd1305.c | 4 +-
+ drivers/staging/fbtft/fb_ssd1306.c | 4 +-
+ drivers/staging/fbtft/fb_ssd1325.c | 6 +-
+ drivers/staging/fbtft/fb_ssd1331.c | 10 +-
+ drivers/staging/fbtft/fb_ssd1351.c | 4 +-
+ drivers/staging/fbtft/fb_tinylcd.c | 2 +-
+ drivers/staging/fbtft/fb_tls8204.c | 6 +-
+ drivers/staging/fbtft/fb_uc1611.c | 4 +-
+ drivers/staging/fbtft/fb_uc1701.c | 6 +-
+ drivers/staging/fbtft/fb_upd161704.c | 6 +-
+ drivers/staging/fbtft/fb_watterott.c | 4 +-
+ drivers/staging/fbtft/fbtft-bus.c | 6 +-
+ drivers/staging/fbtft/fbtft-core.c | 178 +-
+ drivers/staging/fbtft/fbtft-io.c | 26 +-
+ drivers/staging/fbtft/fbtft.h | 21 +-
+ drivers/staging/fbtft/fbtft_device.c | 344 +-
+ drivers/staging/fbtft/flexfb.c | 12 +-
+ drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 2 +-
+ drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 2 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 2 +-
+ drivers/staging/fwserial/fwserial.c | 1 +
+ drivers/staging/gasket/gasket_interrupt.c | 1 -
+ drivers/staging/goldfish/goldfish_audio.c | 10 -
+ drivers/staging/greybus/Kconfig | 1 +
+ drivers/staging/greybus/TODO | 2 -
+ drivers/staging/greybus/arche-apb-ctrl.c | 152 +-
+ drivers/staging/greybus/arche-platform.c | 124 +-
+ drivers/staging/greybus/audio_topology.c | 1 -
+ drivers/staging/greybus/bundle.c | 2 +-
+ drivers/staging/greybus/connection.h | 2 +-
+ drivers/staging/greybus/control.c | 1 -
+ drivers/staging/greybus/core.c | 2 +-
+ drivers/staging/greybus/gpio.c | 156 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 12 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 12 +-
+ drivers/staging/gs_fpgaboot/io.c | 16 +-
+ drivers/staging/gs_fpgaboot/io.h | 12 +-
+ drivers/staging/iio/adc/Kconfig | 34 -
+ drivers/staging/iio/adc/Makefile | 4 -
+ drivers/staging/iio/adc/ad7280a.c | 243 +-
+ drivers/staging/iio/adc/ad7816.c | 7 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 6 +-
+ drivers/staging/iio/addac/adt7316-spi.c | 4 +-
+ drivers/staging/iio/addac/adt7316.c | 143 +-
+ drivers/staging/iio/cdc/Kconfig | 10 -
+ drivers/staging/iio/cdc/Makefile | 1 -
+ drivers/staging/iio/cdc/ad7152.c | 552 --
+ drivers/staging/iio/frequency/ad9834.c | 54 +-
+ drivers/staging/iio/frequency/ad9834.h | 28 -
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 57 +-
+ drivers/staging/ks7010/Makefile | 2 +-
+ drivers/staging/ks7010/TODO | 2 -
+ drivers/staging/ks7010/ks_hostif.c | 119 +-
+ drivers/staging/ks7010/ks_wlan_net.c | 2 +-
+ drivers/staging/ks7010/michael_mic.c | 127 -
+ drivers/staging/ks7010/michael_mic.h | 21 -
+ drivers/staging/media/davinci_vpfe/Makefile | 2 +-
+ drivers/staging/most/Makefile | 2 +-
+ drivers/staging/most/cdev/Makefile | 2 +-
+ drivers/staging/most/cdev/cdev.c | 5 +-
+ drivers/staging/most/dim2/Makefile | 2 +-
+ drivers/staging/most/i2c/Makefile | 2 +-
+ drivers/staging/most/net/Makefile | 2 +-
+ drivers/staging/most/sound/Makefile | 2 +-
+ drivers/staging/most/usb/Makefile | 2 +-
+ drivers/staging/most/video/Makefile | 2 +-
+ drivers/staging/mt7621-dma/Kconfig | 6 -
+ drivers/staging/mt7621-dma/Makefile | 1 -
+ drivers/staging/mt7621-dma/mtk-hsdma.c | 11 +-
+ drivers/staging/mt7621-dts/gbpc1.dts | 4 +-
+ drivers/staging/mt7621-dts/mt7621.dtsi | 59 +-
+ drivers/staging/mt7621-eth/ethtool.c | 1 +
+ drivers/staging/mt7621-eth/ethtool.h | 11 +-
+ drivers/staging/mt7621-mmc/Kconfig | 2 +-
+ drivers/staging/mt7621-mmc/dbg.c | 1 -
+ drivers/staging/mt7621-mmc/mt6575_sd.h | 2 +-
+ drivers/staging/mt7621-pci-phy/Kconfig | 7 +
+ drivers/staging/mt7621-pci-phy/Makefile | 1 +
+ drivers/staging/mt7621-pci-phy/TODO | 4 +
+ .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt | 54 +
+ drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c | 387 ++
+ drivers/staging/mt7621-pci/Makefile | 2 +-
+ drivers/staging/mt7621-pci/TODO | 8 -
+ drivers/staging/mt7621-pci/pci-mt7621.c | 300 +-
+ drivers/staging/mt7621-pinctrl/Kconfig | 1 +
+ drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 49 +-
+ drivers/staging/mt7621-spi/spi-mt7621.c | 72 +-
+ drivers/staging/netlogic/Kconfig | 2 +-
+ drivers/staging/netlogic/platform_net.c | 51 +-
+ drivers/staging/netlogic/platform_net.h | 32 +-
+ drivers/staging/netlogic/xlr_net.c | 31 +-
+ drivers/staging/netlogic/xlr_net.h | 33 +-
+ drivers/staging/octeon-usb/octeon-hcd.h | 2 +-
+ drivers/staging/ralink-gdma/Kconfig | 6 +
+ drivers/staging/ralink-gdma/Makefile | 3 +
+ .../{mt7621-dma => ralink-gdma}/ralink-gdma.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 44 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 38 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
+ drivers/staging/rtl8188eu/hal/odm.c | 11 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 67 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 +-
+ drivers/staging/rtl8188eu/include/odm.h | 1 -
+ drivers/staging/rtl8188eu/include/odm_hwconfig.h | 9 -
+ drivers/staging/rtl8188eu/include/wifi.h | 12 -
+ drivers/staging/rtl8188eu/include/wlan_bssdef.h | 6 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +-
+ drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 72 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 26 +-
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +-
+ drivers/staging/rtl8192e/dot11d.c | 120 +-
+ drivers/staging/rtl8192e/dot11d.h | 77 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 23 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 +-
+ drivers/staging/rtl8192e/rtllib.h | 6 +-
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 22 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 4 +-
+ drivers/staging/rtl8192u/Makefile | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 24 +-
+ drivers/staging/rtl8712/ieee80211.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_efuse.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_led.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 8 +-
+ drivers/staging/rtl8712/usb_intf.c | 16 -
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 -
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +-
+ drivers/staging/rtl8723bs/include/drv_types.h | 1 -
+ drivers/staging/rtlwifi/Kconfig | 2 +-
+ drivers/staging/rtlwifi/efuse.c | 6 +-
+ .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 5 +-
+ drivers/staging/rtlwifi/pci.h | 3 +-
+ drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 2 +-
+ drivers/staging/rtlwifi/rtl8822be/fw.c | 2 +
+ drivers/staging/rts5208/ms.c | 5 +-
+ drivers/staging/rts5208/sd.c | 7 +-
+ drivers/staging/sm750fb/ddk750_display.c | 6 +-
+ drivers/staging/speakup/Kconfig | 32 +-
+ drivers/staging/speakup/kobjects.c | 2 +
+ drivers/staging/speakup/main.c | 14 +-
+ drivers/staging/speakup/speakup_decext.c | 3 +-
+ drivers/staging/speakup/speakup_dectlk.c | 3 +-
+ drivers/staging/speakup/speakup_soft.c | 4 +-
+ drivers/staging/speakup/spk_priv_keyinfo.h | 9 +-
+ drivers/staging/speakup/spk_ttyio.c | 20 +-
+ drivers/staging/speakup/varhandlers.c | 4 +-
+ drivers/staging/unisys/visorhba/Makefile | 3 +-
+ drivers/staging/unisys/visornic/Makefile | 3 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 4 +-
+ .../staging/vc04_services/bcm2835-audio/Makefile | 3 +-
+ .../staging/vc04_services/bcm2835-camera/Makefile | 2 +-
+ drivers/staging/vt6655/baseband.c | 10 +-
+ drivers/staging/vt6655/baseband.h | 2 +-
+ drivers/staging/vt6655/card.c | 16 +-
+ drivers/staging/vt6655/card.h | 2 +-
+ drivers/staging/vt6655/device_main.c | 4 +-
+ drivers/staging/vt6656/key.c | 4 +-
+ drivers/staging/vt6656/mac.h | 2 +-
+ drivers/staging/wilc1000/Makefile | 2 +-
+ drivers/staging/wilc1000/host_interface.c | 1164 ++---
+ drivers/staging/wilc1000/host_interface.h | 165 +-
+ .../staging/wilc1000/{linux_mon.c => wilc_mon.c} | 77 +-
+ .../wilc1000/{linux_wlan.c => wilc_netdev.c} | 430 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 187 +-
+ drivers/staging/wilc1000/wilc_spi.c | 4 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 644 +--
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 7 +-
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 14 +-
+ drivers/staging/wilc1000/wilc_wlan.c | 52 +-
+ drivers/staging/wilc1000/wilc_wlan.h | 38 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.c | 39 +-
+ drivers/staging/wilc1000/wilc_wlan_if.h | 40 -
+ drivers/staging/wlan-ng/Kconfig | 2 +-
+ drivers/staging/wlan-ng/cfg80211.c | 3 +-
+ drivers/staging/wlan-ng/prism2fw.c | 5 +-
+ drivers/staging/xgifb/Kconfig | 11 -
+ drivers/staging/xgifb/Makefile | 4 -
+ drivers/staging/xgifb/TODO | 13 -
+ drivers/staging/xgifb/XGI_main.h | 365 --
+ drivers/staging/xgifb/XGI_main_26.c | 2084 --------
+ drivers/staging/xgifb/XGIfb.h | 109 -
+ drivers/staging/xgifb/vb_def.h | 257 -
+ drivers/staging/xgifb/vb_init.c | 1367 -----
+ drivers/staging/xgifb/vb_init.h | 6 -
+ drivers/staging/xgifb/vb_setmode.c | 5528 --------------------
+ drivers/staging/xgifb/vb_setmode.h | 24 -
+ drivers/staging/xgifb/vb_struct.h | 165 -
+ drivers/staging/xgifb/vb_table.h | 2513 ---------
+ drivers/staging/xgifb/vb_util.h | 46 -
+ drivers/staging/xgifb/vgatypes.h | 51 -
+ include/dt-bindings/iio/adc/ingenic,adc.h | 10 +
+ include/linux/iio/common/st_sensors.h | 1 +
+ include/uapi/linux/iio/types.h | 7 +
+ tools/iio/iio_event_monitor.c | 14 +
+ 335 files changed, 9603 insertions(+), 18624 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-sps30
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt
+ rename Documentation/devicetree/bindings/{staging => }/iio/adc/lpc32xx-adc.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/nuvoton,npcm-adc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads124s08.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/bme680.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/sensirion,sgp30.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/sensirion,sps30.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/impedance-analyzer/ad5933.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/max44009.txt
+ rename drivers/{staging => }/iio/adc/ad7606.c (73%)
+ rename drivers/{staging => }/iio/adc/ad7606.h (88%)
+ rename drivers/{staging => }/iio/adc/ad7606_par.c (75%)
+ rename drivers/{staging => }/iio/adc/ad7606_spi.c (67%)
+ create mode 100644 drivers/iio/adc/ad7768-1.c
+ create mode 100644 drivers/iio/adc/ingenic-adc.c
+ create mode 100644 drivers/iio/adc/npcm_adc.c
+ create mode 100644 drivers/iio/adc/ti-ads124s08.c
+ create mode 100644 drivers/iio/chemical/pms7003.c
+ create mode 100644 drivers/iio/chemical/sgp30.c
+ create mode 100644 drivers/iio/chemical/sps30.c
+ create mode 100644 drivers/iio/dac/ti-dac7612.c
+ create mode 100644 drivers/iio/light/max44009.c
+ delete mode 100644 drivers/staging/android/ion/ion-ioctl.c
+ create mode 100644 drivers/staging/erofs/Documentation/filesystems/erofs.txt
+ delete mode 100644 drivers/staging/iio/cdc/ad7152.c
+ delete mode 100644 drivers/staging/ks7010/michael_mic.c
+ delete mode 100644 drivers/staging/ks7010/michael_mic.h
+ create mode 100644 drivers/staging/mt7621-pci-phy/Kconfig
+ create mode 100644 drivers/staging/mt7621-pci-phy/Makefile
+ create mode 100644 drivers/staging/mt7621-pci-phy/TODO
+ create mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt
+ create mode 100644 drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c
+ create mode 100644 drivers/staging/ralink-gdma/Kconfig
+ create mode 100644 drivers/staging/ralink-gdma/Makefile
+ rename drivers/staging/{mt7621-dma => ralink-gdma}/ralink-gdma.c (99%)
+ rename drivers/staging/wilc1000/{linux_mon.c => wilc_mon.c} (78%)
+ rename drivers/staging/wilc1000/{linux_wlan.c => wilc_netdev.c} (74%)
+ delete mode 100644 drivers/staging/xgifb/Kconfig
+ delete mode 100644 drivers/staging/xgifb/Makefile
+ delete mode 100644 drivers/staging/xgifb/TODO
+ delete mode 100644 drivers/staging/xgifb/XGI_main.h
+ delete mode 100644 drivers/staging/xgifb/XGI_main_26.c
+ delete mode 100644 drivers/staging/xgifb/XGIfb.h
+ delete mode 100644 drivers/staging/xgifb/vb_def.h
+ delete mode 100644 drivers/staging/xgifb/vb_init.c
+ delete mode 100644 drivers/staging/xgifb/vb_init.h
+ delete mode 100644 drivers/staging/xgifb/vb_setmode.c
+ delete mode 100644 drivers/staging/xgifb/vb_setmode.h
+ delete mode 100644 drivers/staging/xgifb/vb_struct.h
+ delete mode 100644 drivers/staging/xgifb/vb_table.h
+ delete mode 100644 drivers/staging/xgifb/vb_util.h
+ delete mode 100644 drivers/staging/xgifb/vgatypes.h
+ create mode 100644 include/dt-bindings/iio/adc/ingenic,adc.h
+Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
+$ git merge mux/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+Merging icc/icc-next (fcf9d0b7d2f5 drm/msm/a6xx: Add support for an interconnect path)
+$ git merge icc/icc-next
+Already up to date.
+Merging slave-dma/next (58810c58b9e7 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Auto-merging drivers/dma/xilinx/xilinx_dma.c
+Auto-merging drivers/dma/imx-sdma.c
+CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/imx-dma.c
+Auto-merging drivers/dma/dmatest.c
+CONFLICT (content): Merge conflict in drivers/dma/dmatest.c
+Auto-merging Documentation/driver-api/dmaengine/client.rst
+CONFLICT (content): Merge conflict in Documentation/driver-api/dmaengine/client.rst
+Resolved 'Documentation/driver-api/dmaengine/client.rst' using previous resolution.
+Resolved 'drivers/dma/dmatest.c' using previous resolution.
+Resolved 'drivers/dma/imx-sdma.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master afc7837d247c] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/dma/dma.txt | 4 +
+ Documentation/devicetree/bindings/dma/fsl-qdma.txt | 57 +
+ Documentation/devicetree/bindings/dma/k3dma.txt | 4 +-
+ Documentation/devicetree/bindings/dma/snps-dma.txt | 2 -
+ Documentation/devicetree/bindings/dma/sprd-dma.txt | 2 +-
+ .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 7 +-
+ Documentation/driver-api/dmaengine/client.rst | 2 +-
+ Documentation/driver-api/dmaengine/dmatest.rst | 1 +
+ drivers/dma/Kconfig | 14 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/at_hdmac.c | 5 -
+ drivers/dma/bcm2835-dma.c | 27 +-
+ drivers/dma/dma-axi-dmac.c | 3 +-
+ drivers/dma/dma-jz4780.c | 5 +-
+ drivers/dma/dmatest.c | 269 +++--
+ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 +-
+ drivers/dma/dw/Kconfig | 2 +
+ drivers/dma/dw/Makefile | 2 +-
+ drivers/dma/dw/core.c | 245 +---
+ drivers/dma/dw/dw.c | 138 +++
+ drivers/dma/dw/idma32.c | 160 +++
+ drivers/dma/dw/internal.h | 15 +-
+ drivers/dma/dw/pci.c | 53 +-
+ drivers/dma/dw/platform.c | 22 +-
+ drivers/dma/dw/regs.h | 30 +-
+ drivers/dma/fsl-edma-common.c | 70 +-
+ drivers/dma/fsl-edma-common.h | 4 +
+ drivers/dma/fsl-edma.c | 1 +
+ drivers/dma/fsl-qdma.c | 1259 ++++++++++++++++++++
+ drivers/dma/fsldma.c | 16 +-
+ drivers/dma/fsldma.h | 68 +-
+ drivers/dma/imx-dma.c | 8 +-
+ drivers/dma/imx-sdma.c | 47 +-
+ drivers/dma/ioat/dma.c | 12 +
+ drivers/dma/ioat/dma.h | 2 +-
+ drivers/dma/ioat/hw.h | 3 +
+ drivers/dma/ioat/init.c | 40 +-
+ drivers/dma/ioat/registers.h | 24 +
+ drivers/dma/k3dma.c | 61 +-
+ drivers/dma/mcf-edma.c | 1 +
+ drivers/dma/mv_xor.c | 7 +-
+ drivers/dma/pl330.c | 1 -
+ drivers/dma/qcom/bam_dma.c | 4 +-
+ drivers/dma/qcom/hidma.c | 19 +-
+ drivers/dma/qcom/hidma_mgmt.c | 3 +-
+ drivers/dma/sa11x0-dma.c | 2 -
+ drivers/dma/sh/usb-dmac.c | 2 +
+ drivers/dma/sprd-dma.c | 19 +-
+ drivers/dma/st_fdma.c | 6 +-
+ drivers/dma/stm32-dma.c | 71 +-
+ drivers/dma/stm32-dmamux.c | 58 +-
+ drivers/dma/stm32-mdma.c | 56 +-
+ drivers/dma/tegra20-apb-dma.c | 45 +-
+ drivers/dma/tegra210-adma.c | 5 +-
+ drivers/dma/timb_dma.c | 4 +-
+ drivers/dma/xilinx/xilinx_dma.c | 170 +--
+ drivers/tty/serial/8250/8250_lpss.c | 1 -
+ include/linux/dma/dw.h | 9 +-
+ include/linux/platform_data/dma-dw.h | 12 +-
+ include/linux/platform_data/dma-imx.h | 1 +
+ include/trace/events/tegra_apb_dma.h | 61 +
+ 61 files changed, 2591 insertions(+), 653 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl-qdma.txt
+ create mode 100644 drivers/dma/dw/dw.c
+ create mode 100644 drivers/dma/dw/idma32.c
+ create mode 100644 drivers/dma/fsl-qdma.c
+ create mode 100644 include/trace/events/tegra_apb_dma.h
+Merging cgroup/for-next (6a613d24effc cpuset: remove unused task_has_mempolicy())
+$ git merge cgroup/for-next
+Auto-merging kernel/exit.c
+Auto-merging kernel/cgroup/cpuset.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 2 +-
+ Documentation/cgroup-v1/pids.txt | 3 +++
+ MAINTAINERS | 5 +++--
+ include/linux/cgroup-defs.h | 2 +-
+ include/linux/cgroup.h | 2 ++
+ kernel/cgroup/cgroup.c | 15 +++++++++------
+ kernel/cgroup/cpuset.c | 13 -------------
+ kernel/cgroup/pids.c | 4 ++--
+ kernel/cgroup/rstat.c | 10 ++++++----
+ kernel/exit.c | 1 +
+ 10 files changed, 28 insertions(+), 29 deletions(-)
+Merging scsi/for-next (8c1ceb38e449 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Removing include/scsi/osd_ore.h
+Removing include/scsi/osd_initiator.h
+Auto-merging include/linux/blkdev.h
+CONFLICT (content): Merge conflict in include/linux/blkdev.h
+Removing fs/exofs/sys.c
+Removing fs/exofs/super.c
+Removing fs/exofs/ore_raid.h
+CONFLICT (modify/delete): fs/exofs/ore_raid.c deleted in scsi/for-next and modified in HEAD. Version HEAD of fs/exofs/ore_raid.c left in tree.
+CONFLICT (modify/delete): fs/exofs/ore.c deleted in scsi/for-next and modified in HEAD. Version HEAD of fs/exofs/ore.c left in tree.
+Removing fs/exofs/namei.c
+Removing fs/exofs/inode.c
+Removing fs/exofs/file.c
+Removing fs/exofs/exofs.h
+Removing fs/exofs/dir.c
+Removing fs/exofs/common.h
+Removing fs/exofs/Kconfig.ore
+Removing fs/exofs/Kconfig
+Removing fs/exofs/Kbuild
+Removing fs/exofs/BUGS
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Auto-merging drivers/xen/xen-scsiback.c
+Auto-merging drivers/vhost/scsi.c
+Auto-merging drivers/scsi/st.c
+Auto-merging drivers/scsi/smartpqi/smartpqi_init.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/qla4xxx/ql4_os.c
+Auto-merging drivers/scsi/qla2xxx/qla_init.c
+Auto-merging drivers/scsi/qla2xxx/qla_gs.c
+Auto-merging drivers/scsi/qla2xxx/qla_attr.c
+Auto-merging drivers/scsi/qedf/qedf_main.c
+Auto-merging drivers/scsi/osst.c
+Removing drivers/scsi/osd/osd_uld.c
+Removing drivers/scsi/osd/osd_initiator.c
+Removing drivers/scsi/osd/osd_debug.h
+Removing drivers/scsi/osd/Kconfig
+Removing drivers/scsi/osd/Kbuild
+Auto-merging drivers/scsi/mvumi.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/lpfc/lpfc_nvme.c
+Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c
+Auto-merging drivers/scsi/lpfc/lpfc_mbox.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c
+Auto-merging drivers/scsi/lpfc/lpfc_els.c
+Auto-merging drivers/scsi/lpfc/lpfc_ct.c
+Auto-merging drivers/scsi/lpfc/lpfc_bsg.c
+Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
+CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/ata/libata-scsi.c
+Auto-merging block/blk-mq.c
+Auto-merging block/blk-mq-debugfs.c
+Auto-merging MAINTAINERS
+Removing Documentation/scsi/osd.txt
+Removing Documentation/filesystems/exofs.txt
+Resolved 'drivers/scsi/arcmsr/arcmsr_hba.c' using previous resolution.
+Resolved 'include/linux/blkdev.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/exofs/ore.c fs/exofs/ore_raid.c
+fs/exofs/ore.c: needs merge
+fs/exofs/ore_raid.c: needs merge
+rm 'fs/exofs/ore.c'
+rm 'fs/exofs/ore_raid.c'
+$ git commit -v -a
+[master 3e1042f2b9fd] Merge remote-tracking branch 'scsi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/ufs/ufs-hisi.txt | 5 +-
+ .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 13 +-
+ Documentation/filesystems/exofs.txt | 185 --
+ Documentation/scsi/osd.txt | 197 --
+ Documentation/scsi/ufs.txt | 11 +
+ Documentation/target/tcm_mod_builder.py | 8 -
+ MAINTAINERS | 40 +-
+ block/blk-mq-debugfs.c | 1 -
+ block/blk-mq.c | 4 -
+ block/bsg-lib.c | 44 +-
+ block/bsg.c | 190 +-
+ drivers/ata/libata-scsi.c | 5 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 2 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 80 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 4 -
+ drivers/scsi/Kconfig | 6 +-
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aacraid/Makefile | 2 -
+ drivers/scsi/aacraid/aachba.c | 2 +-
+ drivers/scsi/aacraid/aacraid.h | 4 +-
+ drivers/scsi/aacraid/commctrl.c | 2 +-
+ drivers/scsi/aacraid/commsup.c | 30 +-
+ drivers/scsi/aacraid/linit.c | 9 +-
+ drivers/scsi/aacraid/src.c | 2 +-
+ drivers/scsi/aic7xxx/Makefile | 1 -
+ drivers/scsi/arcmsr/arcmsr.h | 13 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 348 ++-
+ drivers/scsi/bfa/bfad_debugfs.c | 18 -
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +-
+ drivers/scsi/csiostor/csio_attr.c | 3 -
+ drivers/scsi/csiostor/csio_init.c | 6 +-
+ drivers/scsi/csiostor/csio_scsi.c | 8 +-
+ drivers/scsi/cxgbi/Makefile | 2 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 6 +-
+ drivers/scsi/cxgbi/libcxgbi.c | 13 +-
+ drivers/scsi/cxlflash/common.h | 3 +-
+ drivers/scsi/cxlflash/main.c | 2 +-
+ drivers/scsi/cxlflash/superpipe.c | 12 +-
+ drivers/scsi/dpt_i2o.c | 73 +-
+ drivers/scsi/esas2r/esas2r.h | 4 +-
+ drivers/scsi/esas2r/esas2r_ioctl.c | 16 +-
+ drivers/scsi/esas2r/esas2r_main.c | 2 +-
+ drivers/scsi/fcoe/fcoe.c | 2 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 7 +-
+ drivers/scsi/fcoe/fcoe_sysfs.c | 15 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 3 +-
+ drivers/scsi/fnic/fnic.h | 6 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 88 +-
+ drivers/scsi/fnic/fnic_fcs.c | 10 +
+ drivers/scsi/fnic/fnic_io.h | 3 +-
+ drivers/scsi/fnic/fnic_isr.c | 6 +-
+ drivers/scsi/fnic/fnic_main.c | 37 +-
+ drivers/scsi/fnic/fnic_scsi.c | 40 +-
+ drivers/scsi/fnic/fnic_stats.h | 6 +-
+ drivers/scsi/fnic/fnic_trace.c | 28 +-
+ drivers/scsi/fnic/fnic_trace.h | 4 +-
+ drivers/scsi/fnic/vnic_dev.c | 270 ++-
+ drivers/scsi/fnic/vnic_dev.h | 2 +
+ drivers/scsi/fnic/vnic_devcmd.h | 160 +-
+ drivers/scsi/fnic/vnic_resource.h | 7 +
+ drivers/scsi/fnic/vnic_rq.c | 5 +-
+ drivers/scsi/fnic/vnic_wq.c | 69 +-
+ drivers/scsi/fnic/vnic_wq.h | 8 +
+ drivers/scsi/gdth.c | 1286 ++---------
+ drivers/scsi/gdth.h | 30 -
+ drivers/scsi/gdth_ioctl.h | 89 -
+ drivers/scsi/gdth_proc.c | 113 +-
+ drivers/scsi/gdth_proc.h | 3 -
+ drivers/scsi/hisi_sas/hisi_sas.h | 110 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 838 ++++++-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 6 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 25 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 379 +++-
+ drivers/scsi/hpsa.c | 19 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 6 -
+ drivers/scsi/ipr.c | 3 +-
+ drivers/scsi/iscsi_tcp.c | 9 +-
+ drivers/scsi/libiscsi.c | 64 +-
+ drivers/scsi/libiscsi_tcp.c | 8 +-
+ drivers/scsi/libsas/sas_expander.c | 38 +-
+ drivers/scsi/libsas/sas_scsi_host.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 97 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 469 ++--
+ drivers/scsi/lpfc/lpfc_bsg.c | 4 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 36 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 18 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 1227 ++++++----
+ drivers/scsi/lpfc/lpfc_debugfs.h | 73 +-
+ drivers/scsi/lpfc/lpfc_els.c | 6 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 40 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 16 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2274 ++++++++++---------
+ drivers/scsi/lpfc/lpfc_mbox.c | 4 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 10 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 746 ++----
+ drivers/scsi/lpfc/lpfc_nvme.h | 66 +-
+ drivers/scsi/lpfc/lpfc_nvmet.c | 448 ++--
+ drivers/scsi/lpfc/lpfc_nvmet.h | 4 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 894 +++-----
+ drivers/scsi/lpfc/lpfc_scsi.h | 63 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 2379 +++++++++++++-------
+ drivers/scsi/lpfc/lpfc_sli.h | 89 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 304 ++-
+ drivers/scsi/lpfc/lpfc_version.h | 4 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 27 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 54 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 404 +++-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 27 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 1 +
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 3 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 7 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 16 +-
+ drivers/scsi/mvumi.c | 5 +-
+ drivers/scsi/nsp32.c | 1 -
+ drivers/scsi/osd/Kbuild | 20 -
+ drivers/scsi/osd/Kconfig | 49 -
+ drivers/scsi/osd/osd_debug.h | 30 -
+ drivers/scsi/osd/osd_initiator.c | 2076 -----------------
+ drivers/scsi/osd/osd_uld.c | 571 -----
+ drivers/scsi/osst.c | 2 +-
+ drivers/scsi/pcmcia/Makefile | 2 +-
+ drivers/scsi/pcmcia/nsp_cs.c | 3 +-
+ drivers/scsi/qedf/qedf_debugfs.c | 18 +-
+ drivers/scsi/qedf/qedf_io.c | 6 -
+ drivers/scsi/qedf/qedf_main.c | 2 +-
+ drivers/scsi/qedi/qedi_debugfs.c | 17 +-
+ drivers/scsi/qedi/qedi_fw.c | 7 -
+ drivers/scsi/qla2xxx/qla_attr.c | 113 +-
+ drivers/scsi/qla2xxx/qla_def.h | 43 +-
+ drivers/scsi/qla2xxx/qla_dfs.c | 43 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 8 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 77 +-
+ drivers/scsi/qla2xxx/qla_init.c | 198 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 395 +++-
+ drivers/scsi/qla2xxx/qla_isr.c | 25 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 96 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 47 +-
+ drivers/scsi/qla2xxx/qla_nvme.h | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 277 ++-
+ drivers/scsi/qla2xxx/qla_target.c | 28 +-
+ drivers/scsi/qla2xxx/qla_target.h | 2 +
+ drivers/scsi/qla2xxx/qla_tmpl.c | 237 +-
+ drivers/scsi/qla2xxx/qla_tmpl.h | 26 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 31 -
+ drivers/scsi/qlogicpti.c | 3 +-
+ drivers/scsi/qlogicpti.h | 3 +-
+ drivers/scsi/scsi.c | 16 -
+ drivers/scsi/scsi_debug.c | 186 +-
+ drivers/scsi/scsi_error.c | 3 -
+ drivers/scsi/scsi_lib.c | 67 +-
+ drivers/scsi/scsi_scan.c | 6 +-
+ drivers/scsi/scsi_transport_sas.c | 1 -
+ drivers/scsi/sd.c | 526 +++--
+ drivers/scsi/sd.h | 64 +-
+ drivers/scsi/smartpqi/Makefile | 1 -
+ drivers/scsi/smartpqi/smartpqi_init.c | 3 +-
+ drivers/scsi/snic/snic_debugfs.c | 133 +-
+ drivers/scsi/snic/snic_main.c | 14 +-
+ drivers/scsi/snic/snic_stats.h | 2 +-
+ drivers/scsi/snic/snic_trc.c | 12 +-
+ drivers/scsi/snic/snic_trc.h | 4 +-
+ drivers/scsi/sr.c | 1 -
+ drivers/scsi/st.c | 2 +-
+ drivers/scsi/ufs/Kconfig | 1 -
+ drivers/scsi/ufs/ufs-hisi.c | 127 +-
+ drivers/scsi/ufs/ufs-hisi.h | 4 +
+ drivers/scsi/ufs/ufs.h | 1 -
+ drivers/scsi/ufs/ufs_bsg.c | 63 +-
+ drivers/scsi/ufs/ufs_quirks.h | 29 -
+ drivers/scsi/ufs/ufshcd-dwc.c | 4 +-
+ drivers/scsi/ufs/ufshcd.c | 90 +-
+ drivers/scsi/virtio_scsi.c | 14 +-
+ drivers/target/iscsi/cxgbit/cxgbit.h | 2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 2 +-
+ drivers/target/iscsi/iscsi_target.c | 47 +-
+ drivers/target/iscsi/iscsi_target.h | 2 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 13 -
+ drivers/target/iscsi/iscsi_target_erl0.c | 5 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 59 +-
+ drivers/target/iscsi/iscsi_target_util.c | 23 +-
+ drivers/target/loopback/tcm_loop.c | 21 -
+ drivers/target/sbp/sbp_target.c | 6 -
+ drivers/target/target_core_alua.c | 5 +-
+ drivers/target/target_core_configfs.c | 4 -
+ drivers/target/target_core_device.c | 6 +-
+ drivers/target/target_core_pr.c | 15 +-
+ drivers/target/target_core_tmr.c | 39 +-
+ drivers/target/target_core_transport.c | 49 +-
+ drivers/target/target_core_xcopy.c | 6 -
+ drivers/target/tcm_fc/tcm_fc.h | 1 -
+ drivers/target/tcm_fc/tfc_cmd.c | 7 -
+ drivers/target/tcm_fc/tfc_conf.c | 1 -
+ drivers/usb/gadget/function/f_tcm.c | 9 -
+ drivers/usb/storage/uas.c | 15 +-
+ drivers/vhost/scsi.c | 6 -
+ drivers/xen/xen-scsiback.c | 6 -
+ fs/Kconfig | 3 -
+ fs/Makefile | 1 -
+ fs/exofs/BUGS | 3 -
+ fs/exofs/Kbuild | 20 -
+ fs/exofs/Kconfig | 13 -
+ fs/exofs/Kconfig.ore | 14 -
+ fs/exofs/common.h | 262 ---
+ fs/exofs/dir.c | 661 ------
+ fs/exofs/exofs.h | 240 --
+ fs/exofs/file.c | 83 -
+ fs/exofs/inode.c | 1514 -------------
+ fs/exofs/namei.c | 323 ---
+ fs/exofs/ore.c | 1179 ----------
+ fs/exofs/ore_raid.c | 757 -------
+ fs/exofs/ore_raid.h | 62 -
+ fs/exofs/super.c | 1071 ---------
+ fs/exofs/sys.c | 205 --
+ include/linux/blkdev.h | 8 -
+ include/linux/bsg-lib.h | 4 +
+ include/linux/libata.h | 5 +-
+ include/scsi/libfcoe.h | 4 +-
+ include/scsi/libsas.h | 59 +-
+ include/scsi/osd_initiator.h | 511 -----
+ include/scsi/osd_ore.h | 201 --
+ include/scsi/scsi.h | 6 -
+ include/scsi/scsi_cmnd.h | 34 +-
+ include/scsi/scsi_eh.h | 1 -
+ include/scsi/scsi_host.h | 20 +-
+ include/target/iscsi/iscsi_transport.h | 4 +-
+ include/target/target_core_base.h | 1 -
+ include/target/target_core_fabric.h | 2 +-
+ 232 files changed, 10062 insertions(+), 18400 deletions(-)
+ delete mode 100644 Documentation/filesystems/exofs.txt
+ delete mode 100644 Documentation/scsi/osd.txt
+ delete mode 100644 drivers/scsi/osd/Kbuild
+ delete mode 100644 drivers/scsi/osd/Kconfig
+ delete mode 100644 drivers/scsi/osd/osd_debug.h
+ delete mode 100644 drivers/scsi/osd/osd_initiator.c
+ delete mode 100644 drivers/scsi/osd/osd_uld.c
+ delete mode 100644 fs/exofs/BUGS
+ delete mode 100644 fs/exofs/Kbuild
+ delete mode 100644 fs/exofs/Kconfig
+ delete mode 100644 fs/exofs/Kconfig.ore
+ delete mode 100644 fs/exofs/common.h
+ delete mode 100644 fs/exofs/dir.c
+ delete mode 100644 fs/exofs/exofs.h
+ delete mode 100644 fs/exofs/file.c
+ delete mode 100644 fs/exofs/inode.c
+ delete mode 100644 fs/exofs/namei.c
+ delete mode 100644 fs/exofs/ore.c
+ delete mode 100644 fs/exofs/ore_raid.c
+ delete mode 100644 fs/exofs/ore_raid.h
+ delete mode 100644 fs/exofs/super.c
+ delete mode 100644 fs/exofs/sys.c
+ delete mode 100644 include/scsi/osd_initiator.h
+ delete mode 100644 include/scsi/osd_ore.h
+Merging scsi-mkp/for-next (26af1a368e40 scsi: cxgb4i: validate tcp sequence number only if chip version <= T5)
+$ git merge scsi-mkp/for-next
+Already up to date.
+Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
+$ git merge target-updates/for-next
+Already up to date.
+Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
+$ git merge target-bva/for-next
+Already up to date.
+Merging vhost/linux-next (e7afa2912187 arch: move common mmap flags to linux/mman.h)
+$ git merge vhost/linux-next
+Auto-merging kernel/dma/swiotlb.c
+CONFLICT (content): Merge conflict in kernel/dma/swiotlb.c
+Auto-merging kernel/dma/mapping.c
+Auto-merging kernel/dma/direct.c
+Auto-merging include/linux/swiotlb.h
+Auto-merging include/linux/dma-mapping.h
+Auto-merging include/drm/drmP.h
+Auto-merging drivers/pci/of.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/iommu/Makefile
+CONFLICT (content): Merge conflict in drivers/iommu/Makefile
+Auto-merging drivers/iommu/Kconfig
+CONFLICT (content): Merge conflict in drivers/iommu/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/DMA-API.txt
+Resolved 'drivers/iommu/Kconfig' using previous resolution.
+Resolved 'drivers/iommu/Makefile' using previous resolution.
+Resolved 'kernel/dma/swiotlb.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 161e75609e35] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DMA-API.txt | 8 +
+ Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++
+ Documentation/devicetree/bindings/virtio/mmio.txt | 30 +
+ Documentation/memory-barriers.txt | 20 +
+ Documentation/virtual/kvm/s390-diag.txt | 3 +-
+ MAINTAINERS | 7 +
+ arch/alpha/include/asm/barrier.h | 1 +
+ drivers/block/virtio_blk.c | 10 +-
+ drivers/iommu/Kconfig | 11 +
+ drivers/iommu/Makefile | 1 +
+ drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++
+ drivers/net/virtio_net.c | 27 +-
+ drivers/of/base.c | 10 +-
+ drivers/pci/of.c | 7 +
+ drivers/s390/virtio/virtio_ccw.c | 12 +-
+ drivers/virtio/virtio.c | 2 +
+ drivers/virtio/virtio_balloon.c | 6 +-
+ drivers/virtio/virtio_ring.c | 24 +-
+ include/asm-generic/barrier.h | 18 +
+ include/linux/compiler.h | 6 +-
+ include/linux/dma-mapping.h | 8 +
+ include/linux/swiotlb.h | 11 +
+ include/linux/virtio.h | 2 +
+ include/linux/virtio_config.h | 13 +
+ include/uapi/linux/virtio_ids.h | 1 +
+ include/uapi/linux/virtio_iommu.h | 161 +++
+ kernel/dma/direct.c | 11 +
+ kernel/dma/mapping.c | 14 +
+ kernel/dma/swiotlb.c | 15 +-
+ 29 files changed, 1638 insertions(+), 25 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt
+ create mode 100644 drivers/iommu/virtio-iommu.c
+ create mode 100644 include/uapi/linux/virtio_iommu.h
+Merging rpmsg/for-next (6a4ac1cc9997 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Auto-merging drivers/remoteproc/remoteproc_virtio.c
+Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/remoteproc/qcom,adsp-pil.txt | 5 +-
+ .../devicetree/bindings/remoteproc/qcom,adsp.txt | 23 ++-
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 79 +++++++-
+ .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 +
+ drivers/remoteproc/qcom_q6v5_adsp.c | 6 +-
+ drivers/remoteproc/qcom_q6v5_mss.c | 209 +++++++++++++++++++--
+ drivers/remoteproc/qcom_q6v5_pas.c | 13 +-
+ drivers/remoteproc/qcom_sysmon.c | 82 +++++++-
+ drivers/remoteproc/qcom_wcnss.c | 6 +-
+ drivers/remoteproc/remoteproc_core.c | 160 +++++++++++-----
+ drivers/remoteproc/remoteproc_debugfs.c | 47 ++++-
+ drivers/remoteproc/remoteproc_internal.h | 12 +-
+ drivers/remoteproc/remoteproc_virtio.c | 62 +++++-
+ drivers/remoteproc/st_remoteproc.c | 91 +++++++--
+ drivers/rpmsg/rpmsg_core.c | 3 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 24 +--
+ include/linux/remoteproc.h | 8 +-
+ 17 files changed, 714 insertions(+), 121 deletions(-)
+$ git am -3 ../patches/0001-remoteproc-fix-for-dma-mapping-remove-the-DMA_MEMORY.patch
+Applying: remoteproc: fix for "dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/remoteproc/remoteproc_virtio.c
+$ git add -A .
+$ git commit -v -a --amend
+[master df725301996d] Merge remote-tracking branch 'rpmsg/for-next'
+ Date: Mon Mar 4 15:50:50 2019 +1100
+Merging gpio/for-next (c378b3aa0159 gpio: pca953x: Fix dereference of irq data in shutdown)
+$ git merge gpio/for-next
+Auto-merging kernel/irq/irqdomain.c
+Auto-merging kernel/irq/chip.c
+Auto-merging include/linux/platform_device.h
+Auto-merging include/linux/irqdomain.h
+Auto-merging include/linux/irq.h
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/gpio/gpiolib-of.c
+Auto-merging drivers/gpio/gpiolib-acpi.c
+Auto-merging drivers/base/platform.c
+Auto-merging arch/arm/boot/dts/qcom-pm8941.dtsi
+Auto-merging arch/arm/boot/dts/qcom-msm8660.dtsi
+Auto-merging arch/arm/boot/dts/qcom-mdm9615.dtsi
+Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/gpio/gateworks,pld-gpio.txt | 20 ++
+ .../devicetree/bindings/gpio/gpio-eic-sprd.txt | 4 +-
+ .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 +
+ Documentation/devicetree/bindings/gpio/gpio.txt | 12 +
+ .../devicetree/bindings/gpio/intel,ixp4xx-gpio.txt | 38 +++
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/driver-api/gpio/board.rst | 1 +
+ Documentation/driver-api/gpio/driver.rst | 2 +-
+ Documentation/driver-api/gpio/legacy.rst | 9 +-
+ MAINTAINERS | 12 +
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 21 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 46 +--
+ arch/arm/boot/dts/qcom-mdm9615.dtsi | 9 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 47 +--
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 38 +--
+ arch/arm/boot/dts/qcom-pma8084.dtsi | 24 +-
+ arch/arm/mach-sa1100/simpad.c | 1 -
+ arch/arm64/boot/dts/qcom/pm8005.dtsi | 6 +-
+ arch/arm64/boot/dts/qcom/pm8998.dtsi | 28 +-
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/pmi8998.dtsi | 16 +-
+ drivers/base/platform.c | 20 ++
+ drivers/gpio/Kconfig | 24 ++
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/gpio-adp5588.c | 234 ++++++---------
+ drivers/gpio/gpio-altera-a10sr.c | 17 +-
+ drivers/gpio/gpio-altera.c | 4 +-
+ drivers/gpio/gpio-amd-fch.c | 185 ++++++++++++
+ drivers/gpio/gpio-crystalcove.c | 30 +-
+ drivers/gpio/gpio-davinci.c | 4 +-
+ drivers/gpio/gpio-eic-sprd.c | 1 +
+ drivers/gpio/gpio-f7188x.c | 24 +-
+ drivers/gpio/gpio-ftgpio010.c | 20 +-
+ drivers/gpio/gpio-gw-pld.c | 137 +++++++++
+ drivers/gpio/gpio-hlwd.c | 192 +++++++++++-
+ drivers/gpio/gpio-madera.c | 2 +-
+ drivers/gpio/gpio-mockup.c | 189 ++++++++++--
+ drivers/gpio/gpio-msic.c | 34 +--
+ drivers/gpio/gpio-mvebu.c | 11 +
+ drivers/gpio/gpio-mxc.c | 5 +-
+ drivers/gpio/gpio-pca953x.c | 182 +++++++----
+ drivers/gpio/gpio-pcf857x.c | 15 +-
+ drivers/gpio/gpio-pmic-eic-sprd.c | 3 +-
+ drivers/gpio/gpio-rcar.c | 12 +-
+ drivers/gpio/gpio-sama5d2-piobu.c | 20 +-
+ drivers/gpio/gpio-tegra.c | 25 +-
+ drivers/gpio/gpio-tegra186.c | 70 ++---
+ drivers/gpio/gpio-tqmx86.c | 332 +++++++++++++++++++++
+ drivers/gpio/gpio-wcove.c | 29 +-
+ drivers/gpio/gpio-zynq.c | 24 ++
+ drivers/gpio/gpiolib-acpi.c | 7 +-
+ drivers/gpio/gpiolib-of.c | 9 +-
+ drivers/gpio/gpiolib.c | 87 +++++-
+ drivers/gpio/gpiolib.h | 2 +
+ drivers/mfd/Kconfig | 2 +-
+ drivers/mfd/qcom-pm8xxx.c | 75 ++---
+ drivers/pinctrl/qcom/Kconfig | 2 +
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 141 +++++++--
+ drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 157 ++++++++--
+ drivers/platform/x86/Kconfig | 12 +
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/pcengines-apuv2.c | 261 ++++++++++++++++
+ drivers/spmi/Kconfig | 2 +-
+ drivers/spmi/spmi-pmic-arb.c | 67 +++--
+ include/dt-bindings/gpio/gpio.h | 6 +
+ include/linux/gpio/driver.h | 5 +
+ include/linux/gpio/machine.h | 2 +
+ include/linux/irq.h | 1 +
+ include/linux/irqdomain.h | 5 +
+ include/linux/of_gpio.h | 2 +
+ include/linux/platform_data/gpio/gpio-amd-fch.h | 46 +++
+ include/linux/platform_device.h | 3 +
+ kernel/irq/chip.c | 12 +
+ kernel/irq/irq_sim.c | 12 +
+ kernel/irq/irqdomain.c | 45 ++-
+ 76 files changed, 2416 insertions(+), 745 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gateworks,pld-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
+ create mode 100644 drivers/gpio/gpio-amd-fch.c
+ create mode 100644 drivers/gpio/gpio-gw-pld.c
+ create mode 100644 drivers/gpio/gpio-tqmx86.c
+ create mode 100644 drivers/platform/x86/pcengines-apuv2.c
+ create mode 100644 include/linux/platform_data/gpio/gpio-amd-fch.h
+Merging gpio-brgl/gpio/for-next (2a9e27408e12 gpio: mockup: rework debugfs interface)
+$ git merge gpio-brgl/gpio/for-next
+Already up to date.
+Merging pinctrl/for-next (dcab77888da9 dt-bindings: pinctrl: Document the i.MX50 IOMUXC binding)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+Auto-merging drivers/pinctrl/qcom/pinctrl-qcs404.c
+Auto-merging drivers/pinctrl/meson/pinctrl-meson8b.c
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt | 27 +-
+ .../bindings/pinctrl/fsl,imx50-pinctrl.txt | 32 ++
+ .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt | 36 ++
+ .../pinctrl/marvell,armada-37xx-pinctrl.txt | 24 +-
+ .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 10 +-
+ Documentation/driver-api/pinctl.rst | 9 -
+ arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 629 +++++++++++++++++++++
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +-
+ drivers/pinctrl/berlin/pinctrl-as370.c | 58 +-
+ drivers/pinctrl/cirrus/pinctrl-madera-core.c | 1 +
+ drivers/pinctrl/freescale/Kconfig | 14 +
+ drivers/pinctrl/freescale/Makefile | 2 +
+ drivers/pinctrl/freescale/pinctrl-imx8mm.c | 348 ++++++++++++
+ drivers/pinctrl/freescale/pinctrl-imx8qm.c | 326 +++++++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 8 +-
+ drivers/pinctrl/meson/pinctrl-meson.c | 24 +-
+ drivers/pinctrl/meson/pinctrl-meson.h | 1 +
+ drivers/pinctrl/meson/pinctrl-meson8b.c | 6 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 15 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 17 +-
+ drivers/pinctrl/pinconf.c | 222 --------
+ drivers/pinctrl/pinctrl-amd.c | 2 +-
+ drivers/pinctrl/pinctrl-at91.c | 134 ++++-
+ drivers/pinctrl/pinctrl-at91.h | 3 +
+ drivers/pinctrl/pinctrl-ingenic.c | 367 +++++++++---
+ drivers/pinctrl/pinctrl-mcp23s08.c | 31 +-
+ drivers/pinctrl/qcom/pinctrl-qcs404.c | 25 -
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +-
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 12 +-
+ drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 6 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 17 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 70 +--
+ drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 1 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 16 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 90 +--
+ drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 90 +--
+ drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 404 ++++++++++++-
+ drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 128 ++---
+ drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 64 +--
+ drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 388 +++++++++++--
+ drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 11 +-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 +-
+ drivers/pinctrl/sh-pfc/pinctrl.c | 2 +
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 3 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 70 ++-
+ drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 41 ++
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 12 +
+ drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 7 +-
+ include/dt-bindings/pinctrl/at91.h | 4 +
+ include/linux/pinctrl/pinconf.h | 6 -
+ 55 files changed, 3023 insertions(+), 827 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx50-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8mm.c
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qm.c
+Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_state())
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pwm/Kconfig | 17 ++-
+ drivers/pwm/Makefile | 3 +-
+ drivers/pwm/core.c | 10 +-
+ drivers/pwm/pwm-imx1.c | 199 ++++++++++++++++++++++++++++++
+ drivers/pwm/{pwm-imx.c => pwm-imx27.c} | 217 +++++++++------------------------
+ include/linux/pwm.h | 37 +++---
+ 6 files changed, 293 insertions(+), 190 deletions(-)
+ create mode 100644 drivers/pwm/pwm-imx1.c
+ rename drivers/pwm/{pwm-imx.c => pwm-imx27.c} (59%)
+Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
+$ git merge userns/for-next
+Already up to date.
+Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
+$ git merge ktest/for-next
+Already up to date.
+Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
+$ git merge random/dev
+Auto-merging drivers/char/random.c
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging kselftest/next (0e27ded1159f selftests/ftrace: Handle the absence of tput)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/ir/ir_loopback.c
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/ftrace/ftracetest | 21 +++++++-----
+ tools/testing/selftests/ir/ir_loopback.c | 6 ++--
+ tools/testing/selftests/ir/ir_loopback.sh | 5 +++
+ tools/testing/selftests/kselftest.h | 1 +
+ tools/testing/selftests/kselftest_harness.h | 10 +++---
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 47 +++++++++++++++++++++++----
+ 6 files changed, 68 insertions(+), 22 deletions(-)
+Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
+$ git merge y2038/y2038
+Auto-merging arch/riscv/Kconfig
+Merge made by the 'recursive' strategy.
+Merging livepatching/for-next (b420648f103d Merge branch 'for-5.1-atomic-replace' into for-next)
+$ git merge livepatching/for-next
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-kernel-livepatch | 12 -
+ Documentation/livepatch/callbacks.txt | 489 +-----------
+ Documentation/livepatch/cumulative-patches.txt | 102 +++
+ Documentation/livepatch/livepatch.txt | 182 +++--
+ MAINTAINERS | 7 +-
+ include/linux/livepatch.h | 50 +-
+ kernel/livepatch/core.c | 854 +++++++++++++--------
+ kernel/livepatch/core.h | 11 +
+ kernel/livepatch/patch.c | 57 +-
+ kernel/livepatch/patch.h | 5 +-
+ kernel/livepatch/transition.c | 124 +--
+ kernel/livepatch/transition.h | 1 -
+ lib/Kconfig.debug | 23 +-
+ lib/Makefile | 2 +
+ lib/livepatch/Makefile | 15 +
+ lib/livepatch/test_klp_atomic_replace.c | 57 ++
+ lib/livepatch/test_klp_callbacks_busy.c | 43 ++
+ lib/livepatch/test_klp_callbacks_demo.c | 121 +++
+ lib/livepatch/test_klp_callbacks_demo2.c | 93 +++
+ lib/livepatch/test_klp_callbacks_mod.c | 24 +
+ lib/livepatch/test_klp_livepatch.c | 51 ++
+ lib/livepatch/test_klp_shadow_vars.c | 258 +++++++
+ samples/livepatch/livepatch-callbacks-demo.c | 13 +-
+ samples/livepatch/livepatch-sample.c | 13 +-
+ samples/livepatch/livepatch-shadow-fix1.c | 18 +-
+ samples/livepatch/livepatch-shadow-fix2.c | 18 +-
+ samples/livepatch/livepatch-shadow-mod.c | 11 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/livepatch/Makefile | 8 +
+ tools/testing/selftests/livepatch/README | 43 ++
+ tools/testing/selftests/livepatch/config | 1 +
+ tools/testing/selftests/livepatch/functions.sh | 198 +++++
+ .../testing/selftests/livepatch/test-callbacks.sh | 587 ++++++++++++++
+ .../testing/selftests/livepatch/test-livepatch.sh | 168 ++++
+ .../selftests/livepatch/test-shadow-vars.sh | 60 ++
+ 35 files changed, 2649 insertions(+), 1071 deletions(-)
+ create mode 100644 Documentation/livepatch/cumulative-patches.txt
+ create mode 100644 lib/livepatch/Makefile
+ create mode 100644 lib/livepatch/test_klp_atomic_replace.c
+ create mode 100644 lib/livepatch/test_klp_callbacks_busy.c
+ create mode 100644 lib/livepatch/test_klp_callbacks_demo.c
+ create mode 100644 lib/livepatch/test_klp_callbacks_demo2.c
+ create mode 100644 lib/livepatch/test_klp_callbacks_mod.c
+ create mode 100644 lib/livepatch/test_klp_livepatch.c
+ create mode 100644 lib/livepatch/test_klp_shadow_vars.c
+ create mode 100644 tools/testing/selftests/livepatch/Makefile
+ create mode 100644 tools/testing/selftests/livepatch/README
+ create mode 100644 tools/testing/selftests/livepatch/config
+ create mode 100644 tools/testing/selftests/livepatch/functions.sh
+ create mode 100755 tools/testing/selftests/livepatch/test-callbacks.sh
+ create mode 100755 tools/testing/selftests/livepatch/test-livepatch.sh
+ create mode 100755 tools/testing/selftests/livepatch/test-shadow-vars.sh
+Merging coresight/next (37af13cc74d1 perf record: implement --affinity=node|cpu option)
+$ git merge coresight/next
+Auto-merging tools/perf/builtin-record.c
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (51f896ffd1a5 rtc: rx8581: Add support for Epson rx8571 RTC)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Removing Documentation/devicetree/bindings/rtc/isil,isl1219.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/property-units.txt | 1 +
+ .../devicetree/bindings/rtc/abracon,abx80x.txt | 1 +
+ Documentation/devicetree/bindings/rtc/cdns,rtc.txt | 25 +
+ .../devicetree/bindings/rtc/isil,isl1208.txt | 38 +
+ .../devicetree/bindings/rtc/isil,isl1219.txt | 29 -
+ .../devicetree/bindings/rtc/nxp,pcf85063.txt | 18 +
+ .../devicetree/bindings/rtc/nxp,pcf8523.txt | 18 +
+ .../devicetree/bindings/rtc/rtc-meson.txt | 35 +
+ Documentation/devicetree/bindings/rtc/rtc.txt | 23 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 6 +
+ drivers/rtc/Kconfig | 58 +-
+ drivers/rtc/Makefile | 5 +
+ drivers/rtc/dev.c | 5 -
+ drivers/rtc/lib.c | 6 +-
+ drivers/rtc/rtc-88pm80x.c | 21 +-
+ drivers/rtc/rtc-88pm860x.c | 21 +-
+ drivers/rtc/rtc-ab-eoz9.c | 465 +++++++++
+ drivers/rtc/rtc-abx80x.c | 67 +-
+ drivers/rtc/rtc-cadence.c | 423 ++++++++
+ drivers/rtc/rtc-coh901331.c | 6 +-
+ drivers/rtc/rtc-ds1307.c | 1095 ++++++++++----------
+ drivers/rtc/rtc-ds1672.c | 3 +-
+ drivers/rtc/rtc-hym8563.c | 2 +
+ drivers/rtc/rtc-imx-sc.c | 19 +
+ drivers/rtc/rtc-isl1208.c | 167 ++-
+ drivers/rtc/rtc-mc146818-lib.c | 2 +-
+ drivers/rtc/rtc-meson.c | 407 ++++++++
+ drivers/rtc/rtc-pcf85063.c | 46 +-
+ drivers/rtc/rtc-pcf8523.c | 29 +-
+ drivers/rtc/rtc-pm8xxx.c | 6 +-
+ drivers/rtc/rtc-rs5c372.c | 76 +-
+ drivers/rtc/rtc-rv3028.c | 732 +++++++++++++
+ drivers/rtc/rtc-rx8581.c | 114 +-
+ drivers/rtc/rtc-s3c.c | 87 +-
+ drivers/rtc/rtc-sd3078.c | 231 +++++
+ drivers/rtc/rtc-snvs.c | 6 +
+ include/linux/rtc.h | 3 +-
+ 38 files changed, 3548 insertions(+), 749 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/cdns,rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl1208.txt
+ delete mode 100644 Documentation/devicetree/bindings/rtc/isil,isl1219.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8523.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson.txt
+ create mode 100644 drivers/rtc/rtc-ab-eoz9.c
+ create mode 100644 drivers/rtc/rtc-cadence.c
+ create mode 100644 drivers/rtc/rtc-meson.c
+ create mode 100644 drivers/rtc/rtc-rv3028.c
+ create mode 100644 drivers/rtc/rtc-sd3078.c
+Merging nvdimm/libnvdimm-for-next (c610002ab34f Merge branch 'for-5.1/dax' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Auto-merging mm/memory_hotplug.c
+CONFLICT (content): Merge conflict in mm/memory_hotplug.c
+Auto-merging kernel/resource.c
+Auto-merging include/linux/acpi.h
+Removing drivers/dax/pmem.c
+Removing drivers/dax/device-dax.h
+Removing drivers/dax/dax.h
+Auto-merging MAINTAINERS
+Resolved 'mm/memory_hotplug.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6b587507b6eb] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-class-dax | 22 ++
+ MAINTAINERS | 17 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 1 +
+ drivers/acpi/nfit/core.c | 193 +++++++----
+ drivers/acpi/nfit/nfit.h | 17 +-
+ drivers/acpi/numa.c | 1 +
+ drivers/base/memory.c | 1 +
+ drivers/dax/Kconfig | 28 +-
+ drivers/dax/Makefile | 6 +-
+ drivers/dax/bus.c | 503 +++++++++++++++++++++++++++++
+ drivers/dax/bus.h | 61 ++++
+ drivers/dax/dax-private.h | 34 +-
+ drivers/dax/dax.h | 18 --
+ drivers/dax/device-dax.h | 25 --
+ drivers/dax/device.c | 363 +++++----------------
+ drivers/dax/kmem.c | 108 +++++++
+ drivers/dax/pmem.c | 153 ---------
+ drivers/dax/pmem/Makefile | 7 +
+ drivers/dax/pmem/compat.c | 73 +++++
+ drivers/dax/pmem/core.c | 71 ++++
+ drivers/dax/pmem/pmem.c | 40 +++
+ drivers/dax/super.c | 79 +++--
+ drivers/nvdimm/btt.c | 33 +-
+ drivers/nvdimm/btt.h | 2 +
+ drivers/nvdimm/btt_devs.c | 8 +
+ drivers/nvdimm/dimm_devs.c | 7 +
+ drivers/nvdimm/e820.c | 1 +
+ drivers/nvdimm/label.c | 26 +-
+ drivers/nvdimm/namespace_devs.c | 10 +
+ drivers/nvdimm/nd.h | 2 +-
+ drivers/nvdimm/of_pmem.c | 2 +-
+ drivers/nvdimm/pfn_devs.c | 24 +-
+ drivers/nvdimm/region_devs.c | 8 +
+ fs/dax.c | 6 +-
+ include/linux/acpi.h | 5 +
+ include/linux/libnvdimm.h | 3 +
+ include/uapi/linux/ndctl.h | 1 +
+ kernel/resource.c | 18 +-
+ mm/memory_hotplug.c | 32 +-
+ tools/testing/nvdimm/Kbuild | 7 +-
+ tools/testing/nvdimm/dax-dev.c | 16 +-
+ 41 files changed, 1382 insertions(+), 650 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-class-dax
+ create mode 100644 drivers/dax/bus.c
+ create mode 100644 drivers/dax/bus.h
+ delete mode 100644 drivers/dax/dax.h
+ delete mode 100644 drivers/dax/device-dax.h
+ create mode 100644 drivers/dax/kmem.c
+ delete mode 100644 drivers/dax/pmem.c
+ create mode 100644 drivers/dax/pmem/Makefile
+ create mode 100644 drivers/dax/pmem/compat.c
+ create mode 100644 drivers/dax/pmem/core.c
+ create mode 100644 drivers/dax/pmem/pmem.c
+Merging at24/at24/for-next (950bcbbe3154 eeprom: at24: implement support for 'num-addresses' property)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (8af642c76ef5 NTB: ntb_test: Fix bug when counting remote files)
+$ git merge ntb/ntb-next
+Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+Merge made by the 'recursive' strategy.
+ drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ----
+ drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ------
+ drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 ----
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 11 ++++++++---
+ drivers/ntb/ntb.c | 9 ++-------
+ drivers/ntb/ntb_transport.c | 31 +++++++++++++++++++++++++++++--
+ drivers/ntb/test/ntb_perf.c | 29 ++++++++++++++++++++++-------
+ drivers/ntb/test/ntb_pingpong.c | 14 ++++++--------
+ drivers/ntb/test/ntb_tool.c | 9 ++++-----
+ include/linux/switchtec.h | 10 +++++++---
+ tools/testing/selftests/ntb/ntb_test.sh | 2 +-
+ 11 files changed, 79 insertions(+), 50 deletions(-)
+Merging kspp/for-next/kspp (ddf89e25fad8 lib: Introduce test_stackinit module)
+$ git merge kspp/for-next/kspp
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Merge made by the 'recursive' strategy.
+ lib/Kconfig.debug | 10 +
+ lib/Makefile | 1 +
+ lib/test_stackinit.c | 378 ++++++++++++++++++++++++++++++++
+ scripts/Makefile.gcc-plugins | 2 +
+ scripts/gcc-plugins/Kconfig | 58 ++++-
+ scripts/gcc-plugins/structleak_plugin.c | 36 ++-
+ 6 files changed, 463 insertions(+), 22 deletions(-)
+ create mode 100644 lib/test_stackinit.c
+Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
+$ git merge init_task/init_task
+Already up to date.
+Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next)
+$ git merge cisco/for-next
+Auto-merging init/Kconfig
+Auto-merging arch/x86/kernel/setup.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/kernel/prom.c
+Auto-merging arch/powerpc/Kconfig
+Resolved 'arch/x86/kernel/setup.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 793292ba1630] Merge remote-tracking branch 'cisco/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/Kconfig | 23 +--------
+ arch/powerpc/configs/44x/fsp2_defconfig | 29 ++++++-----
+ arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++-----
+ arch/powerpc/configs/44x/warp_defconfig | 12 ++---
+ arch/powerpc/configs/holly_defconfig | 12 ++---
+ arch/powerpc/configs/mvme5100_defconfig | 25 +++++-----
+ arch/powerpc/configs/skiroot_defconfig | 48 +++++++++---------
+ arch/powerpc/configs/storcenter_defconfig | 15 +++---
+ arch/powerpc/kernel/prom.c | 4 ++
+ arch/powerpc/kernel/prom_init.c | 8 +--
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/x86/Kconfig | 44 +---------------
+ arch/x86/kernel/setup.c | 19 ++-----
+ include/linux/cmdline.h | 72 +++++++++++++++++++++++++++
+ init/Kconfig | 69 +++++++++++++++++++++++++
+ 15 files changed, 235 insertions(+), 171 deletions(-)
+ create mode 100644 include/linux/cmdline.h
+Merging gnss/gnss-next (d4584bbfcf2a gnss: add driver for mediatek receivers)
+$ git merge gnss/gnss-next
+Already up to date.
+Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
+$ git merge fsi/master
+Already up to date.
+Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
+$ git merge siox/siox/next
+Already up to date.
+Merging slimbus/for-next (81648d8bc222 slimbus: core: add missing spin_lock_init on txn_lock)
+$ git merge slimbus/for-next
+Merge made by the 'recursive' strategy.
+Merging nvmem/for-next (c86d78c459db nvmem: allow to select i.MX nvmem driver for i.MX 7D)
+$ git merge nvmem/for-next
+Auto-merging drivers/nvmem/core.c
+Auto-merging drivers/nvmem/Kconfig
+Merge made by the 'recursive' strategy.
+Merging xarray/xarray (4a5c8d898948 XArray: Fix xa_reserve for 2-byte aligned entries)
+$ git merge xarray/xarray
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/xarray.rst | 15 +-
+ fs/nilfs2/btnode.c | 2 +-
+ include/linux/xarray.h | 296 +++++++++++++++++++++++++++-----------
+ lib/test_xarray.c | 288 +++++++++++++++++++++++++++++--------
+ lib/xarray.c | 163 ++++++++++++---------
+ 5 files changed, 547 insertions(+), 217 deletions(-)
+$ git am -3 ../patches/0001-RDMA-devices-fix-up-for-xa_alloc-API-change.patch
+Applying: RDMA/devices: fix up for xa_alloc API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/infiniband/core/device.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c3ca18718157] Merge remote-tracking branch 'xarray/xarray'
+ Date: Mon Mar 4 16:20:26 2019 +1100
+$ git am -3 ../patches/0001-RDMA-restrack-fix-for-__xa_alloc-API-change.patch
+Applying: RDMA/restrack: fix for __xa_alloc() API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/infiniband/core/restrack.c
+$ git add -A .
+$ git commit -v -a --amend
+[master efcc42ad59ff] Merge remote-tracking branch 'xarray/xarray'
+ Date: Mon Mar 4 16:20:26 2019 +1100
+Merging hyperv/hyperv-next (396ae57ef1ef Drivers: hv: vmbus: Expose counters for interrupts and full conditions)
+$ git merge hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/auxdisplay (a3b22b9f11d9 Linux 5.0-rc7)
+$ git merge auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
+$ git merge kgdb-dt/kgdb/for-next
+Auto-merging arch/x86/kernel/kgdb.c
+Auto-merging arch/sh/kernel/kgdb.c
+Auto-merging arch/powerpc/kernel/kgdb.c
+Auto-merging arch/arm64/kernel/kgdb.c
+Merge made by the 'recursive' strategy.
+Merging pidfd/for-next (f67dcc84eb36 selftests: add tests for pidfd_send_signal())
+$ git merge pidfd/for-next
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging kernel/sys_ni.c
+Auto-merging kernel/signal.c
+Auto-merging include/uapi/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
+Auto-merging include/linux/syscalls.h
+Auto-merging fs/proc/base.c
+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
+Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution.
+Resolved 'arch/x86/entry/syscalls/syscall_64.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 -v -a
+[master b481c9acbf3e] Merge remote-tracking branch 'pidfd/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ fs/proc/base.c | 9 +
+ include/linux/proc_fs.h | 6 +
+ include/linux/syscalls.h | 3 +
+ include/uapi/asm-generic/unistd.h | 2 +
+ kernel/signal.c | 133 +++++++++-
+ kernel/sys_ni.c | 1 +
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/pidfd/Makefile | 6 +
+ tools/testing/selftests/pidfd/pidfd_test.c | 381 +++++++++++++++++++++++++++++
+ 11 files changed, 538 insertions(+), 6 deletions(-)
+ create mode 100644 tools/testing/selftests/pidfd/Makefile
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_test.c
+Merging devfreq/for-next (08cacec421f6 PM / devfreq: tegra: remove unneeded variable)
+$ git merge devfreq/for-next
+Merge made by the 'recursive' strategy.
+ drivers/devfreq/devfreq-event.c | 2 +-
+ drivers/devfreq/devfreq.c | 65 +++++++++++++++++++++---------------
+ drivers/devfreq/event/exynos-ppmu.c | 2 +-
+ drivers/devfreq/event/rockchip-dfi.c | 2 +-
+ drivers/devfreq/rk3399_dmc.c | 2 +-
+ drivers/devfreq/tegra-devfreq.c | 7 ++--
+ 6 files changed, 44 insertions(+), 36 deletions(-)
+Merging akpm-current/current (d24bf9977ff5 zram: default to lzo-rle instead of lzo)
+$ git merge --no-ff akpm-current/current
+Auto-merging tools/testing/selftests/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
+Auto-merging scripts/gcc-plugins/Kconfig
+CONFLICT (content): Merge conflict in scripts/gcc-plugins/Kconfig
+Auto-merging scripts/checkpatch.pl
+Auto-merging mm/mmap.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/gup.c
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/workqueue.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/kthread.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging ipc/util.h
+Auto-merging ipc/sem.c
+Auto-merging init/init_task.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched/signal.h
+Auto-merging include/linux/sched.h
+CONFLICT (content): Merge conflict in include/linux/sched.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/memory_hotplug.h
+Auto-merging include/linux/kernfs.h
+CONFLICT (content): Merge conflict in include/linux/kernfs.h
+Auto-merging include/linux/kernel.h
+Auto-merging include/linux/fs.h
+CONFLICT (content): Merge conflict in include/linux/fs.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/cgroup-defs.h
+Auto-merging include/linux/acpi.h
+Auto-merging fs/proc/task_nommu.c
+Auto-merging fs/proc/task_mmu.c
+Auto-merging fs/proc/stat.c
+Auto-merging fs/proc/root.c
+Auto-merging fs/proc/internal.h
+Auto-merging fs/proc/base.c
+Auto-merging fs/pipe.c
+Auto-merging fs/namei.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/file.c
+Auto-merging fs/exec.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging fs/Kconfig
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/misc/vmw_balloon.c
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/dmar.c
+Auto-merging drivers/infiniband/hw/hfi1/init.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+Auto-merging arch/x86/kernel/smpboot.c
+Auto-merging arch/x86/include/asm/uaccess.h
+Auto-merging arch/x86/configs/x86_64_defconfig
+Auto-merging arch/x86/configs/i386_defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/mm/pgtable.c
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/sysdev/fsl_pci.c
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging arch/powerpc/mm/hugetlbpage-radix.c
+Auto-merging arch/powerpc/mm/hugetlbpage-hash64.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging arch/powerpc/include/asm/pci-bridge.h
+Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h
+Auto-merging arch/m68k/configs/amcore_defconfig
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/configs/lpc18xx_defconfig
+Auto-merging arch/arm/configs/bcm2835_defconfig
+Auto-merging arch/arc/configs/hsdk_defconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/vm/slub.rst
+Auto-merging Documentation/cgroup-v1/memory.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Resolved 'include/linux/fs.h' using previous resolution.
+Resolved 'include/linux/kernfs.h' using previous resolution.
+Resolved 'include/linux/sched.h' using previous resolution.
+Resolved 'scripts/gcc-plugins/Kconfig' using previous resolution.
+Resolved 'tools/testing/selftests/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 564c038285da] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accounting/psi.txt | 107 ++
+ Documentation/admin-guide/cgroup-v2.rst | 36 +-
+ Documentation/admin-guide/kernel-parameters.txt | 16 +
+ Documentation/admin-guide/mm/pagemap.rst | 9 +-
+ Documentation/cgroup-v1/memcg_test.txt | 4 +-
+ Documentation/cgroup-v1/memory.txt | 4 +-
+ Documentation/core-api/genalloc.rst | 2 +-
+ Documentation/dontdiff | 1 -
+ Documentation/lzo.txt | 39 +-
+ Documentation/process/4.Coding.rst | 2 +-
+ .../translations/it_IT/process/4.Coding.rst | 2 +-
+ Documentation/vm/slub.rst | 3 +-
+ MAINTAINERS | 8 +
+ arch/alpha/include/asm/topology.h | 3 +-
+ arch/arc/configs/axs101_defconfig | 1 -
+ arch/arc/configs/axs103_defconfig | 1 -
+ arch/arc/configs/axs103_smp_defconfig | 1 -
+ arch/arc/configs/haps_hs_defconfig | 1 -
+ arch/arc/configs/haps_hs_smp_defconfig | 1 -
+ arch/arc/configs/hsdk_defconfig | 1 -
+ arch/arc/configs/nps_defconfig | 1 -
+ arch/arc/configs/nsim_700_defconfig | 1 -
+ arch/arc/configs/nsim_hs_defconfig | 1 -
+ arch/arc/configs/nsim_hs_smp_defconfig | 1 -
+ arch/arc/configs/nsimosci_defconfig | 1 -
+ arch/arc/configs/nsimosci_hs_defconfig | 1 -
+ arch/arc/configs/nsimosci_hs_smp_defconfig | 1 -
+ arch/arc/configs/tb10x_defconfig | 1 -
+ arch/arc/configs/vdk_hs38_defconfig | 1 -
+ arch/arc/configs/vdk_hs38_smp_defconfig | 1 -
+ arch/arm/configs/bcm2835_defconfig | 1 -
+ arch/arm/configs/cns3420vb_defconfig | 1 -
+ arch/arm/configs/efm32_defconfig | 1 -
+ arch/arm/configs/eseries_pxa_defconfig | 1 -
+ arch/arm/configs/gemini_defconfig | 1 -
+ arch/arm/configs/mini2440_defconfig | 1 -
+ arch/arm/configs/moxart_defconfig | 1 -
+ arch/arm/configs/mps2_defconfig | 1 -
+ arch/arm/configs/nuc910_defconfig | 1 -
+ arch/arm/configs/nuc950_defconfig | 1 -
+ arch/arm/configs/nuc960_defconfig | 1 -
+ arch/arm/configs/stm32_defconfig | 1 -
+ arch/arm/mm/dma-mapping.c | 2 +-
+ arch/arm64/Kconfig | 6 +-
+ arch/arm64/include/asm/hugetlb.h | 12 +-
+ arch/arm64/include/asm/memory.h | 4 -
+ arch/arm64/kernel/machine_kexec.c | 3 +-
+ arch/arm64/mm/hugetlbpage.c | 20 +
+ arch/arm64/mm/init.c | 27 -
+ arch/arm64/mm/numa.c | 2 +-
+ arch/h8300/configs/edosk2674_defconfig | 1 -
+ arch/h8300/configs/h8300h-sim_defconfig | 1 -
+ arch/h8300/configs/h8s-sim_defconfig | 1 -
+ arch/ia64/kernel/numa.c | 2 +-
+ arch/ia64/kernel/perfmon.c | 59 +-
+ arch/ia64/mm/discontig.c | 6 +-
+ arch/m68k/configs/amcore_defconfig | 1 -
+ arch/m68k/configs/stmark2_defconfig | 1 -
+ arch/m68k/mm/memory.c | 2 +-
+ arch/nios2/configs/10m50_defconfig | 1 -
+ arch/nios2/configs/3c120_defconfig | 1 -
+ arch/openrisc/configs/or1ksim_defconfig | 1 -
+ arch/openrisc/configs/simple_smp_defconfig | 1 -
+ arch/powerpc/configs/mpc512x_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/powerpc/include/asm/book3s/64/hugetlb.h | 16 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 18 +
+ arch/powerpc/include/asm/book3s/64/radix.h | 4 +
+ arch/powerpc/include/asm/pci-bridge.h | 3 +-
+ arch/powerpc/kernel/paca.c | 3 +-
+ arch/powerpc/kernel/pci-common.c | 3 +-
+ arch/powerpc/kernel/process.c | 12 +-
+ arch/powerpc/kernel/vdso.c | 2 -
+ arch/powerpc/mm/fault.c | 6 +-
+ arch/powerpc/mm/hugetlbpage-hash64.c | 25 +
+ arch/powerpc/mm/hugetlbpage-radix.c | 17 +
+ arch/powerpc/mm/mmu_context_iommu.c | 145 +--
+ arch/powerpc/mm/numa.c | 16 +-
+ arch/powerpc/mm/pgtable-book3s64.c | 25 +
+ arch/powerpc/mm/pgtable-radix.c | 18 +
+ arch/powerpc/perf/callchain.c | 20 +-
+ arch/powerpc/perf/core-book3s.c | 8 +-
+ arch/powerpc/platforms/Kconfig.cputype | 2 +-
+ arch/powerpc/platforms/powernv/memtrace.c | 5 +-
+ arch/powerpc/sysdev/fsl_pci.c | 10 +-
+ arch/riscv/kernel/vdso.c | 1 -
+ arch/s390/Kconfig | 2 +-
+ arch/s390/include/asm/hugetlb.h | 7 +-
+ arch/s390/include/asm/pgtable.h | 5 +-
+ arch/s390/kernel/vdso.c | 2 -
+ arch/s390/mm/pgtable.c | 8 +-
+ arch/sh/configs/apsh4a3a_defconfig | 1 -
+ arch/sh/configs/edosk7705_defconfig | 1 -
+ arch/sh/configs/espt_defconfig | 1 -
+ arch/sh/configs/sdk7786_defconfig | 1 -
+ arch/sh/configs/sh2007_defconfig | 1 -
+ arch/sh/configs/sh7724_generic_defconfig | 1 -
+ arch/sh/configs/sh7763rdp_defconfig | 1 -
+ arch/sh/configs/sh7770_generic_defconfig | 1 -
+ arch/sh/configs/sh7785lcr_defconfig | 1 -
+ arch/sh/configs/ul2_defconfig | 1 -
+ arch/sh/configs/urquell_defconfig | 1 -
+ arch/sh/kernel/syscalls/syscalltbl.sh | 4 +-
+ arch/sh/kernel/syscalls_32.S | 2 +-
+ arch/sparc/configs/sparc32_defconfig | 1 -
+ arch/sparc/configs/sparc64_defconfig | 1 -
+ arch/sparc/include/asm/pgtable_64.h | 30 -
+ arch/sparc/kernel/pci_fire.c | 3 +-
+ arch/sparc/kernel/pci_schizo.c | 3 +-
+ arch/sparc/kernel/psycho_common.c | 3 +-
+ arch/sparc/kernel/sbus.c | 3 +-
+ arch/sparc/mm/init_64.c | 6 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/configs/i386_defconfig | 1 -
+ arch/x86/configs/x86_64_defconfig | 1 -
+ arch/x86/include/asm/hugetlb.h | 7 +-
+ arch/x86/include/asm/paravirt.h | 13 +-
+ arch/x86/include/asm/paravirt_types.h | 5 +-
+ arch/x86/include/asm/pci.h | 3 +-
+ arch/x86/include/asm/uaccess.h | 24 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 7 +-
+ arch/x86/kernel/setup_percpu.c | 2 +-
+ arch/x86/kernel/smpboot.c | 3 +-
+ arch/x86/lib/usercopy_32.c | 8 +-
+ arch/x86/mm/numa.c | 4 +-
+ arch/x86/xen/mmu.h | 4 +-
+ arch/x86/xen/mmu_pv.c | 8 +-
+ crypto/Makefile | 2 +-
+ crypto/lzo-rle.c | 175 ++++
+ crypto/tcrypt.c | 4 +-
+ drivers/block/mtip32xx/mtip32xx.c | 5 +-
+ drivers/block/zram/zcomp.c | 1 +
+ drivers/block/zram/zram_drv.c | 2 +-
+ drivers/char/agp/efficeon-agp.c | 2 -
+ drivers/dma/dmaengine.c | 4 +-
+ drivers/gpu/drm/i915/i915_utils.h | 6 -
+ drivers/hv/hv_balloon.c | 21 +-
+ drivers/infiniband/hw/hfi1/affinity.c | 3 +-
+ drivers/infiniband/hw/hfi1/init.c | 3 +-
+ drivers/iommu/dmar.c | 5 +-
+ drivers/iommu/intel-iommu.c | 3 +-
+ drivers/misc/sgi-xp/xpc_uv.c | 3 +-
+ drivers/misc/sram-exec.c | 2 +-
+ drivers/misc/vmw_balloon.c | 32 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +-
+ drivers/rapidio/devices/rio_mport_cdev.c | 1 +
+ drivers/rapidio/rio_cm.c | 4 +-
+ drivers/xen/balloon.c | 18 +-
+ fs/Kconfig | 2 +-
+ fs/autofs/autofs_i.h | 3 +
+ fs/autofs/inode.c | 19 +-
+ fs/binfmt_elf.c | 32 +-
+ fs/btrfs/ctree.h | 34 +-
+ fs/buffer.c | 56 +-
+ fs/eventpoll.c | 173 +++-
+ fs/exec.c | 9 +-
+ fs/fat/file.c | 1 +
+ fs/file.c | 1 +
+ fs/hugetlbfs/inode.c | 2 +-
+ fs/inode.c | 8 +-
+ fs/kernfs/file.c | 31 +-
+ fs/namei.c | 2 -
+ fs/ocfs2/alloc.c | 174 ++--
+ fs/ocfs2/aops.c | 22 +-
+ fs/ocfs2/cluster/nodemanager.c | 14 +-
+ fs/ocfs2/dlm/dlmunlock.c | 23 +-
+ fs/ocfs2/dlmglue.c | 5 +
+ fs/ocfs2/ocfs2.h | 1 +
+ fs/ocfs2/ocfs2_trace.h | 2 +
+ fs/ocfs2/slot_map.c | 8 +-
+ fs/ocfs2/super.c | 2 +
+ fs/pipe.c | 3 +-
+ fs/proc/array.c | 16 +-
+ fs/proc/base.c | 4 +-
+ fs/proc/internal.h | 2 +-
+ fs/proc/page.c | 4 +-
+ fs/proc/root.c | 2 +-
+ fs/proc/self.c | 16 +-
+ fs/proc/stat.c | 60 +-
+ fs/proc/task_mmu.c | 8 +-
+ fs/proc/task_nommu.c | 2 +-
+ fs/proc/thread_self.c | 16 +-
+ fs/ramfs/inode.c | 12 +
+ include/asm-generic/pgtable.h | 18 +-
+ include/linux/acpi.h | 11 +-
+ include/linux/balloon_compaction.h | 34 +-
+ include/linux/bitops.h | 2 +-
+ include/linux/build_bug.h | 19 +
+ include/linux/cgroup-defs.h | 4 +
+ include/linux/compaction.h | 7 +-
+ include/linux/delay.h | 1 +
+ include/linux/device.h | 4 +-
+ include/linux/dynamic_debug.h | 102 +-
+ include/linux/frontswap.h | 7 +
+ include/linux/fs.h | 5 +-
+ include/linux/genalloc.h | 2 +-
+ include/linux/gfp.h | 32 +-
+ include/linux/hmm.h | 290 +++++-
+ include/linux/hugetlb.h | 70 +-
+ include/linux/ipc_namespace.h | 1 +
+ include/linux/kasan-checks.h | 2 +-
+ include/linux/kernel.h | 35 +-
+ include/linux/kernfs.h | 8 +-
+ include/linux/ksm.h | 7 +
+ include/linux/limits.h | 36 +
+ include/linux/list.h | 28 +
+ include/linux/lzo.h | 6 +-
+ include/linux/memblock.h | 41 +
+ include/linux/memcontrol.h | 74 +-
+ include/linux/memory_hotplug.h | 2 +-
+ include/linux/mm.h | 56 +-
+ include/linux/mm_types.h | 5 +-
+ include/linux/mmzone.h | 67 +-
+ include/linux/net.h | 2 +-
+ include/linux/nodemask.h | 8 +-
+ include/linux/page-flags.h | 44 +-
+ include/linux/pagemap.h | 32 +-
+ include/linux/pid.h | 1 -
+ include/linux/poison.h | 2 +-
+ include/linux/printk.h | 2 +-
+ include/linux/psi.h | 8 +
+ include/linux/psi_types.h | 83 +-
+ include/linux/sched.h | 15 +
+ include/linux/sched/mm.h | 48 +-
+ include/linux/sched/signal.h | 18 +
+ include/linux/shmem_fs.h | 3 +-
+ include/linux/slab.h | 3 +
+ include/linux/slub_def.h | 12 +-
+ include/linux/swap.h | 4 +-
+ include/linux/types.h | 6 +-
+ include/linux/uaccess.h | 34 +
+ include/uapi/linux/auto_fs.h | 2 +-
+ include/uapi/linux/binfmts.h | 2 +-
+ include/uapi/linux/fcntl.h | 1 +
+ include/uapi/linux/kernel-page-flags.h | 2 +-
+ include/uapi/linux/limits.h | 4 +-
+ init/Kconfig | 23 +
+ init/init_task.c | 3 +-
+ init/initramfs.c | 6 +-
+ ipc/ipc_sysctl.c | 14 +-
+ ipc/sem.c | 7 +-
+ ipc/util.c | 27 +-
+ ipc/util.h | 46 +-
+ kernel/.gitignore | 2 -
+ kernel/Makefile | 11 +-
+ kernel/cgroup/cgroup.c | 107 +-
+ kernel/configs.c | 42 +-
+ kernel/crash_core.c | 2 +
+ kernel/dma/remap.c | 2 +-
+ kernel/fork.c | 1 +
+ kernel/gcov/gcc_3_4.c | 6 +-
+ kernel/hung_task.c | 3 +-
+ kernel/kcov.c | 15 +-
+ kernel/kthread.c | 3 +-
+ kernel/module.c | 6 +-
+ kernel/panic.c | 10 +-
+ kernel/power/snapshot.c | 17 +-
+ kernel/ptrace.c | 15 +-
+ kernel/sched/core.c | 3 +
+ kernel/sched/fair.c | 15 +-
+ kernel/sched/psi.c | 607 ++++++++++-
+ kernel/signal.c | 2 +-
+ kernel/sys.c | 1 +
+ kernel/sysctl.c | 101 +-
+ kernel/workqueue.c | 10 +
+ lib/Kconfig.debug | 37 +-
+ lib/Kconfig.kasan | 10 -
+ lib/Kconfig.ubsan | 14 +-
+ lib/Makefile | 1 +
+ lib/assoc_array.c | 1 +
+ lib/cpumask.c | 3 +-
+ lib/debugobjects.c | 66 +-
+ lib/div64.c | 4 +-
+ lib/dynamic_debug.c | 22 +-
+ lib/genalloc.c | 5 +-
+ lib/lzo/lzo1x_compress.c | 130 ++-
+ lib/lzo/lzo1x_decompress_safe.c | 75 +-
+ lib/lzo/lzodefs.h | 21 +-
+ lib/test_firmware.c | 9 -
+ lib/test_kasan.c | 24 -
+ lib/test_ubsan.c | 11 +-
+ lib/test_vmalloc.c | 551 ++++++++++
+ lib/vsprintf.c | 5 +-
+ mm/Kconfig | 1 +
+ mm/Kconfig.debug | 17 +
+ mm/Makefile | 7 +-
+ mm/cma.c | 4 +-
+ mm/cma_debug.c | 11 +-
+ mm/compaction.c | 1043 ++++++++++++++-----
+ mm/dmapool.c | 13 +-
+ mm/failslab.c | 14 +-
+ mm/filemap.c | 304 ++++--
+ mm/gup.c | 200 +++-
+ mm/gup_benchmark.c | 8 +-
+ mm/hmm.c | 1061 +++++++++++++-------
+ mm/huge_memory.c | 29 +-
+ mm/hugetlb.c | 90 +-
+ mm/internal.h | 24 +-
+ mm/kasan/common.c | 2 +
+ mm/kasan/generic.c | 19 -
+ mm/kasan/generic_report.c | 3 -
+ mm/kasan/kasan.h | 3 -
+ mm/khugepaged.c | 2 +
+ mm/ksm.c | 77 +-
+ mm/list_lru.c | 3 +-
+ mm/memblock.c | 67 +-
+ mm/memcontrol.c | 175 ++--
+ mm/memfd.c | 3 +-
+ mm/memory.c | 69 +-
+ mm/memory_hotplug.c | 57 +-
+ mm/mempolicy.c | 4 +-
+ mm/mempool.c | 8 +
+ mm/migrate.c | 14 +-
+ mm/mlock.c | 14 +-
+ mm/mmap.c | 15 +-
+ mm/mprotect.c | 6 +-
+ mm/mremap.c | 17 +
+ mm/oom_kill.c | 81 +-
+ mm/page-writeback.c | 24 +-
+ mm/page_alloc.c | 865 +++++++++-------
+ mm/page_ext.c | 3 +-
+ mm/page_idle.c | 8 +-
+ mm/page_owner.c | 8 +-
+ mm/page_poison.c | 4 +
+ mm/readahead.c | 2 +
+ mm/rmap.c | 2 +-
+ mm/shmem.c | 741 ++++++++------
+ mm/shuffle.c | 207 ++++
+ mm/shuffle.h | 64 ++
+ mm/slab.c | 34 +-
+ mm/slab.h | 4 -
+ mm/slab_common.c | 12 +-
+ mm/slub.c | 50 +-
+ mm/sparse.c | 2 +-
+ mm/swap.c | 16 +-
+ mm/swap_state.c | 23 +-
+ mm/swapfile.c | 491 ++++-----
+ mm/truncate.c | 6 +-
+ mm/util.c | 37 +-
+ mm/vmalloc.c | 491 ++++-----
+ mm/vmscan.c | 196 ++--
+ mm/vmstat.c | 15 +-
+ mm/workingset.c | 5 +-
+ net/core/pktgen.c | 3 +-
+ net/qrtr/qrtr.c | 3 +-
+ scripts/Makefile.kasan | 5 -
+ scripts/checkpatch.pl | 60 +-
+ scripts/decode_stacktrace.sh | 9 +-
+ scripts/gcc-plugins/Kconfig | 4 -
+ scripts/spelling.txt | 69 ++
+ tools/include/linux/numa.h | 16 +
+ tools/perf/bench/numa.c | 7 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/memfd/memfd_test.c | 74 ++
+ tools/testing/selftests/proc/.gitignore | 1 +
+ tools/testing/selftests/proc/Makefile | 1 +
+ tools/testing/selftests/proc/proc-loadavg-001.c | 2 +-
+ tools/testing/selftests/proc/proc-pid-vm.c | 406 ++++++++
+ .../selftests/proc/proc-self-map-files-002.c | 2 +-
+ tools/testing/selftests/proc/proc-self-syscall.c | 2 +-
+ tools/testing/selftests/proc/proc-self-wchan.c | 2 +-
+ tools/testing/selftests/proc/read.c | 14 +
+ tools/testing/selftests/sysctl/sysctl.sh | 55 +
+ tools/testing/selftests/tmpfs/.gitignore | 1 +
+ tools/testing/selftests/tmpfs/Makefile | 7 +
+ tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 67 ++
+ tools/testing/selftests/vm/run_vmtests | 16 +
+ tools/testing/selftests/vm/test_vmalloc.sh | 176 ++++
+ tools/vm/page-types.c | 2 +-
+ tools/vm/slabinfo.c | 35 +-
+ 370 files changed, 9460 insertions(+), 3795 deletions(-)
+ create mode 100644 crypto/lzo-rle.c
+ create mode 100644 include/linux/limits.h
+ create mode 100644 lib/test_vmalloc.c
+ create mode 100644 mm/shuffle.c
+ create mode 100644 mm/shuffle.h
+ create mode 100644 tools/include/linux/numa.h
+ create mode 100644 tools/testing/selftests/proc/proc-pid-vm.c
+ create mode 100644 tools/testing/selftests/tmpfs/.gitignore
+ create mode 100644 tools/testing/selftests/tmpfs/Makefile
+ create mode 100644 tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c
+ create mode 100644 tools/testing/selftests/vm/test_vmalloc.sh
+$ 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
+First, rewinding head to replay your work on top of it...
+Applying: pinctrl: fix pxa2xx.c build warnings
+Applying: scripts/atomic/gen-atomics.sh: don't assume that scripts are executable
+Applying: powerpc: prefer memblock APIs returning virtual address
+Applying: microblaze: prefer memblock API returning virtual address
+Applying: sh: prefer memblock APIs returning virtual address
+Applying: openrisc: simplify pte_alloc_one_kernel()
+Applying: arch: simplify several early memory allocations
+Applying: arm, s390, unicore32: remove oneliner wrappers for memblock_alloc()
+Applying: mm: create the new vm_fault_t type
+Applying: x86/mm/fault.c: Convert to use vm_fault_t
+Applying: mm/hmm: convert to use vm_fault_t
+Applying: drm/nouveau/dmem: update for struct hmm_devmem_ops member change
+Applying: MAINTAINERS: fix GTA02 entry and mark as orphan
+Applying: fs: fs_parser: fix printk format warning
+Applying: mm: refactor readahead defines in mm.h
+Applying: mm-refactor-readahead-defines-in-mmh-fix
+Applying: proc: calculate end pointer for /proc/*/* lookup at compile time
+Applying: proc: merge fix for proc_pident_lookup() API change
+Applying: unicore32: stop printing the virtual memory layout
+Applying: arch/nios2/mm/fault.c: remove duplicate include
+Applying: include/linux/sched/signal.h: replace `tsk' with `task'
+Applying: openrisc: prefer memblock APIs returning virtual address
+Applying: powerpc: use memblock functions returning virtual address
+Applying: powerpc: remove duplicated alloc_stack() function
+Applying: memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc
+Applying: memblock: drop memblock_alloc_base_nid()
+Applying: memblock: emphasize that memblock_alloc_range() returns a physical address
+Applying: memblock: memblock_phys_alloc_try_nid(): don't panic
+Applying: memblock: memblock_phys_alloc(): don't panic
+Applying: memblock: drop __memblock_alloc_base()
+Applying: memblock: drop memblock_alloc_base()
+Applying: memblock: refactor internal allocation functions
+Applying: memblock: fix parameter order in memblock_phys_alloc_try_nid()
+Applying: memblock: make memblock_find_in_range_node() and choose_memblock_flags() static
+Applying: arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0)
+Applying: arch: don't memset(0) memory returned by memblock_alloc()
+Applying: ia64: add checks for the return value of memblock_alloc*()
+Applying: sparc: add checks for the return value of memblock_alloc*()
+Applying: mm/percpu: add checks for the return value of memblock_alloc*()
+Applying: init/main: add checks for the return value of memblock_alloc*()
+Applying: swiotlb: add checks for the return value of memblock_alloc*()
+Applying: treewide: add checks for the return value of memblock_alloc*()
+Applying: mm: sparse: Use '%pa' with 'phys_addr_t' type
+Applying: memblock: fix format strings for panics after memblock_alloc
+Applying: mm/sparse: don't panic if the allocation in sparse_buffer_init fails
+Applying: treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3-fix
+Applying: memblock: memblock_alloc_try_nid: don't panic
+Applying: memblock: drop memblock_alloc_*_nopanic() variants
+Applying: memblock: remove memblock_{set,clear}_region_flags
+Applying: memblock: split checks whether a region should be skipped to a helper function
+Applying: mm: memblock: update comments and kernel-doc
+Applying: memblock-update-comments-and-kernel-doc-fix
+Applying: of: fix kmemleak crash caused by imbalance in early memory reservation
+Applying: of: fix parameters order for call to memblock_find_in_range()
+Applying: mm, memcg: rename ambiguously named memory.stat counters and functions
+Applying: mm, memcg: consider subtrees in memory.events
+Applying: openvswitch: convert to kvmalloc
+Applying: md: convert to kvmalloc
+Applying: selinux: convert to kvmalloc
+Applying: Generic radix trees
+Applying: proc: commit to genradix
+Applying: sctp: convert to genradix
+Applying: Drop flex_arrays
+Applying: include/linux/relay.h: fix percpu annotation in struct rchan
+Applying: kernel/fork.c: remove duplicated include
+Applying: samples/mic/mpssd/mpssd.h: remove duplicate header
+Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 55837b987535...67f7dd3a2da4 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (67f7dd3a2da4 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
+$ git merge --no-ff akpm/master
+Removing lib/flex_array.c
+Removing include/linux/flex_array.h
+Removing Documentation/flexible-arrays.txt
+Removing Documentation/core-api/flexible-arrays.rst
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 9 +
+ Documentation/core-api/flexible-arrays.rst | 130 ---------
+ Documentation/core-api/generic-radix-tree.rst | 12 +
+ Documentation/core-api/index.rst | 1 +
+ Documentation/flexible-arrays.txt | 123 --------
+ MAINTAINERS | 5 +-
+ arch/alpha/kernel/core_cia.c | 5 +-
+ arch/alpha/kernel/core_marvel.c | 6 +
+ arch/alpha/kernel/pci-noop.c | 13 +-
+ arch/alpha/kernel/pci.c | 11 +-
+ arch/alpha/kernel/pci_iommu.c | 16 +-
+ arch/alpha/kernel/setup.c | 2 +-
+ arch/arc/kernel/unwind.c | 3 +-
+ arch/arc/mm/highmem.c | 4 +
+ arch/arm/kernel/setup.c | 6 +
+ arch/arm/mm/init.c | 6 +-
+ arch/arm/mm/mmu.c | 25 +-
+ arch/arm64/kernel/setup.c | 8 +-
+ arch/arm64/mm/kasan_init.c | 10 +
+ arch/arm64/mm/mmu.c | 2 +
+ arch/arm64/mm/numa.c | 4 +
+ arch/c6x/mm/dma-coherent.c | 13 +-
+ arch/c6x/mm/init.c | 4 +-
+ arch/csky/mm/highmem.c | 5 +
+ arch/h8300/mm/init.c | 4 +-
+ arch/ia64/kernel/mca.c | 25 +-
+ arch/ia64/mm/contig.c | 8 +-
+ arch/ia64/mm/discontig.c | 4 +
+ arch/ia64/mm/init.c | 38 ++-
+ arch/ia64/mm/tlb.c | 6 +
+ arch/ia64/sn/kernel/io_common.c | 3 +
+ arch/ia64/sn/kernel/setup.c | 12 +-
+ arch/m68k/atari/stram.c | 4 +
+ arch/m68k/mm/init.c | 3 +
+ arch/m68k/mm/mcfmmu.c | 7 +-
+ arch/m68k/mm/motorola.c | 9 +
+ arch/m68k/mm/sun3mmu.c | 6 +
+ arch/m68k/sun3/sun3dvma.c | 3 +
+ arch/microblaze/mm/init.c | 15 +-
+ arch/mips/cavium-octeon/dma-octeon.c | 3 +
+ arch/mips/kernel/setup.c | 3 +
+ arch/mips/kernel/traps.c | 5 +-
+ arch/mips/mm/init.c | 5 +
+ arch/nds32/mm/init.c | 24 +-
+ arch/nios2/mm/fault.c | 1 -
+ arch/openrisc/mm/init.c | 5 +-
+ arch/openrisc/mm/ioremap.c | 9 +-
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 8 +-
+ arch/powerpc/kernel/paca.c | 22 +-
+ arch/powerpc/kernel/pci_32.c | 3 +
+ arch/powerpc/kernel/prom.c | 5 +-
+ arch/powerpc/kernel/rtas.c | 6 +-
+ arch/powerpc/kernel/setup-common.c | 7 +-
+ arch/powerpc/kernel/setup_64.c | 9 +-
+ arch/powerpc/lib/alloc.c | 3 +
+ arch/powerpc/mm/hash_utils_64.c | 17 +-
+ arch/powerpc/mm/mmu_context_nohash.c | 9 +
+ arch/powerpc/mm/numa.c | 4 +
+ arch/powerpc/mm/pgtable-book3e.c | 12 +-
+ arch/powerpc/mm/pgtable-book3s64.c | 8 +-
+ arch/powerpc/mm/pgtable-radix.c | 28 +-
+ arch/powerpc/mm/ppc_mmu_32.c | 6 +-
+ arch/powerpc/platforms/pasemi/iommu.c | 8 +-
+ arch/powerpc/platforms/powermac/nvram.c | 3 +
+ arch/powerpc/platforms/powernv/opal.c | 6 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 8 +
+ arch/powerpc/platforms/ps3/setup.c | 3 +
+ arch/powerpc/platforms/pseries/setup.c | 18 +-
+ arch/powerpc/sysdev/dart_iommu.c | 10 +-
+ arch/powerpc/sysdev/msi_bitmap.c | 3 +
+ arch/s390/kernel/crash_dump.c | 3 +
+ arch/s390/kernel/setup.c | 16 ++
+ arch/s390/kernel/smp.c | 9 +-
+ arch/s390/kernel/topology.c | 6 +
+ arch/s390/numa/mode_emu.c | 3 +
+ arch/s390/numa/numa.c | 20 +-
+ arch/sh/boards/mach-ap325rxa/setup.c | 5 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 10 +-
+ arch/sh/boards/mach-kfr2r09/setup.c | 5 +-
+ arch/sh/boards/mach-migor/setup.c | 5 +-
+ arch/sh/boards/mach-se/7724/setup.c | 10 +-
+ arch/sh/kernel/machine_kexec.c | 3 +-
+ arch/sh/mm/init.c | 24 +-
+ arch/sh/mm/numa.c | 9 +-
+ arch/sparc/kernel/prom_32.c | 6 +-
+ arch/sparc/kernel/prom_64.c | 7 +-
+ arch/sparc/kernel/setup_64.c | 6 +
+ arch/sparc/kernel/smp_64.c | 12 +
+ arch/sparc/mm/init_32.c | 2 +-
+ arch/sparc/mm/init_64.c | 20 +-
+ arch/sparc/mm/srmmu.c | 18 +-
+ arch/um/drivers/net_kern.c | 3 +
+ arch/um/drivers/vector_kern.c | 3 +
+ arch/um/kernel/initrd.c | 2 +
+ arch/um/kernel/mem.c | 16 ++
+ arch/unicore32/kernel/setup.c | 4 +
+ arch/unicore32/mm/init.c | 24 --
+ arch/unicore32/mm/mmu.c | 25 +-
+ arch/x86/kernel/acpi/boot.c | 3 +
+ arch/x86/kernel/apic/io_apic.c | 5 +
+ arch/x86/kernel/e820.c | 5 +-
+ arch/x86/kernel/setup_percpu.c | 10 +-
+ arch/x86/mm/fault.c | 2 +-
+ arch/x86/mm/kasan_init_64.c | 14 +-
+ arch/x86/mm/numa.c | 12 +-
+ arch/x86/platform/olpc/olpc_dt.c | 3 +
+ arch/x86/xen/p2m.c | 11 +-
+ arch/xtensa/mm/kasan_init.c | 10 +-
+ arch/xtensa/mm/mmu.c | 3 +
+ block/blk-core.c | 3 +-
+ drivers/clk/ti/clk.c | 3 +
+ drivers/firmware/memmap.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +-
+ drivers/macintosh/smu.c | 5 +-
+ drivers/md/raid5-ppl.c | 6 +-
+ drivers/md/raid5.c | 87 +++---
+ drivers/md/raid5.h | 9 +-
+ drivers/media/platform/sti/delta/delta-ipc.c | 4 +-
+ drivers/of/fdt.c | 8 +-
+ drivers/of/of_reserved_mem.c | 18 +-
+ drivers/of/unittest.c | 8 +-
+ drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 +
+ drivers/usb/early/xhci-dbc.c | 2 +-
+ drivers/xen/swiotlb-xen.c | 7 +-
+ fs/9p/vfs_super.c | 2 +-
+ fs/afs/super.c | 2 +-
+ fs/btrfs/disk-io.c | 2 +-
+ fs/fs_parser.c | 2 +-
+ fs/fuse/inode.c | 2 +-
+ fs/io_uring.c | 2 +-
+ fs/proc/base.c | 62 ++--
+ include/linux/cgroup-defs.h | 5 +
+ include/linux/flex_array.h | 149 ----------
+ include/linux/generic-radix-tree.h | 231 +++++++++++++++
+ include/linux/hmm.h | 4 +-
+ include/linux/memblock.h | 71 +----
+ include/linux/memcontrol.h | 34 ++-
+ include/linux/mm.h | 50 +---
+ include/linux/mm_types.h | 73 ++++-
+ include/linux/poison.h | 3 -
+ include/linux/relay.h | 2 +-
+ include/linux/sched/signal.h | 51 ++--
+ include/net/sctp/structs.h | 15 +-
+ init/main.c | 26 +-
+ kernel/cgroup/cgroup.c | 16 +-
+ kernel/dma/swiotlb.c | 21 +-
+ kernel/fork.c | 1 -
+ kernel/power/snapshot.c | 3 +
+ kernel/printk/printk.c | 9 +-
+ lib/Makefile | 5 +-
+ lib/cpumask.c | 3 +
+ lib/flex_array.c | 398 --------------------------
+ lib/generic-radix-tree.c | 217 ++++++++++++++
+ mm/cma.c | 10 +-
+ mm/hmm.c | 2 +-
+ mm/kasan/init.c | 10 +-
+ mm/memblock.c | 371 ++++++++++--------------
+ mm/memcontrol.c | 144 +++++-----
+ mm/page_alloc.c | 10 +-
+ mm/page_ext.c | 2 +-
+ mm/percpu.c | 84 ++++--
+ mm/sparse.c | 27 +-
+ net/openvswitch/flow.h | 1 -
+ net/openvswitch/flow_netlink.h | 1 -
+ net/openvswitch/flow_table.c | 51 +---
+ net/openvswitch/flow_table.h | 3 +-
+ net/sctp/stream.c | 125 ++------
+ net/sctp/stream_interleave.c | 2 +-
+ samples/mic/mpssd/mpssd.h | 3 -
+ scripts/atomic/gen-atomics.sh | 2 +-
+ security/selinux/ss/avtab.c | 40 ++-
+ security/selinux/ss/avtab.h | 4 +-
+ security/selinux/ss/conditional.c | 6 +-
+ security/selinux/ss/policydb.c | 122 ++------
+ security/selinux/ss/policydb.h | 12 +-
+ security/selinux/ss/services.c | 22 +-
+ tools/include/linux/poison.h | 3 -
+ 177 files changed, 1865 insertions(+), 2003 deletions(-)
+ delete mode 100644 Documentation/core-api/flexible-arrays.rst
+ create mode 100644 Documentation/core-api/generic-radix-tree.rst
+ delete mode 100644 Documentation/flexible-arrays.txt
+ delete mode 100644 include/linux/flex_array.h
+ create mode 100644 include/linux/generic-radix-tree.h
+ delete mode 100644 lib/flex_array.c
+ create mode 100644 lib/generic-radix-tree.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000000000000000000000000000000000000..ebc034a1a1b4216bdbed88839abcfd5f4564fc7a
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,2 @@
+Importing dmi based on 4.19-rc2
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000000000000000000000000000000..9633e216077957545ebeda3ab670d723d6e806b7
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20190304