aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-11-25 18:00:41 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2019-11-25 18:00:41 +1100
commitc165016bac2719e05794c216f9b6da730d68d1e3 (patch)
tree9f0fd91a7450d8bc7073684b91d92786bc47758f
parent16acdeaca058fc64efbb36ec10179d13b0225f4d (diff)
download96b-common-c165016bac2719e05794c216f9b6da730d68d1e3.tar.gz
Add linux-next specific files for 20191125
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s314
-rw-r--r--Next/Trees316
-rw-r--r--Next/merge.log15832
-rw-r--r--Next/quilt-import.log2
-rw-r--r--localversion-next1
5 files changed, 16465 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..8e32243f0b41
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,314 @@
+Name SHA1
+---- ----
+origin 6b8a794678763130b7e7d049985008641dc494e8
+fixes 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c
+kbuild-current 80591e61a0f7e88deaada69844e4a31280c4a38f
+arc-current 5effc09c4907901f0e71e68e5f2e14211d9a203f
+arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86
+arm-soc-fixes db6efda85437d783dd921da5d67ec818826adb12
+arm64-fixes e50be648aaa3da196d4f4ed49d1c5d4ec105fa4a
+m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655
+powerpc-fixes 7d6475051fb3d9339c5c760ed9883bc0a9048b21
+s390-fixes a99d8080aaf358d5d23581244e5da23b35e340b9
+sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2
+fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215
+net 312434617cb16be5166316cf9d08ba760b1042a1
+bpf 34e59836565e36fade1464e054a3551c1a0364be
+ipsec a56dcc6b455830776899ce3686735f1172e12243
+netfilter 064a18998b0b0149c1733266bc0ed9f49074365e
+ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef
+wireless-drivers cb1a4badf59275eb7221dcec621e8154917eabd1
+mac80211 285531f9e6774e3be71da6673d475ff1a088d675
+rdma-fixes 411c1e6774e2e1f96b1ccce4f119376b94ade3e4
+sound-current 976a68f06b2ea49e2ab67a5f84919a8b105db8be
+sound-asoc-fixes 3701d2cb87671c227f1aa59226c9a01e9f01c2ea
+regmap-fixes af42d3466bdc8f39806b26f593604fdc54140bcb
+regulator-fixes c642e87086847d7f61b7b7d8744ac23e44cac91e
+spi-fixes 8f3ed6d0b0db04db8297d951c26c809dd7b4778d
+pci-current 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+driver-core.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02
+tty.current d6d5df1db6e9d7f8f76d2911707f7d5877251b02
+usb.current a99d8080aaf358d5d23581244e5da23b35e340b9
+usb-gadget-fixes f3fb802efaef3662744a2215a51294d52a7cfc0e
+usb-serial-fixes a99d8080aaf358d5d23581244e5da23b35e340b9
+usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f
+phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+staging.current 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c
+char-misc.current 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c
+soundwire-fixes 7b47ad3322d114736e08cc244a84fe7af9b861f6
+thunderbolt-fixes af42d3466bdc8f39806b26f593604fdc54140bcb
+input-current 8791663435e7fea896d8ca0f56fd64976d2089ff
+crypto-current 08e97aec700aeff54c4847f170e566cbd7e14e81
+ide baf6722aa0cbc5381f11520eb661be71b3ac379e
+vfio-fixes 95f89e090618efca63918b658c2002e57d393036
+kselftest-fixes ed2d8fa734e7759ac3788a19f308d3243d0eb164
+modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de
+slave-dma-fixes bacdcb6675e170bb2e8d3824da220e10274f42a7
+backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd
+mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05
+mfd-fixes 603d9299da32955d49995738541f750f2ae74839
+v4l-dvb-fixes 3e84a18a259e1df35e5b549ab92ec3baf82ff010
+reset-fixes cc67d61e31ec928602eaa40043a7a1a40854b5bc
+mips-fixes f6929c92e283a35b183c293574adcbca409bf144
+at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+omap-fixes 6aed5a0e0f56213cc5e4bff674fb42e997f30df7
+kvm-fixes 9cb09e7c1c9af2968d5186ef9085f05641ab65d9
+kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da
+hwmon-fixes 92b39ad440968bab38eb6577d63c12994601ed94
+nvdimm-fixes 6370740e5f8ef12de7f9a9bf48a0393d202cd827
+btrfs-fixes bfbbf8cb43a7c7d201c659f2f608d747149082cb
+vfs-fixes 3e5aeec0e267d4422a4e740ce723549a3098a4d1
+dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3
+i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes 7d194c2100ad2a6dded545887d02754948ca5241
+samsung-krzk-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+devicetree-fixes 5dba51754b04a941a1064f584e7a7f607df3f9bc
+scsi-fixes 9393c8de628cf0968d81a17cc11841e42191e041
+drm-fixes 51658c04c338d7ef98d6c2c19009e4814632db50
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 71d122629c04707eb7f65447fb2f5bd092d98ce3
+mmc-fixes fed23c5829ecab4ddc712d7b0046e59610ca3ba4
+rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+gnss-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb
+soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27
+risc-v-fixes 1d9b0b66c3ef03e42db63068e1a4e7250992e2b1
+pidfd-fixes 9e77716a75bc6cf54965e5ec069ba7c02b32251c
+fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3
+spdx bf49d9dd6fef688733e2ddbd55f7bcb57df194e4
+gpio-intel-fixes 7d194c2100ad2a6dded545887d02754948ca5241
+pinctrl-intel-fixes af42d3466bdc8f39806b26f593604fdc54140bcb
+erofs-fixes da0c9ea146cbe92b832f1b0f694840ea8eb33cce
+drm-misc-fixes c131280c03bd1c225c2e64e9ef75873ffca3d96e
+kspp-gustavo da0c9ea146cbe92b832f1b0f694840ea8eb33cce
+kbuild b1fbfcb4a20949df08dd995927cdc5ad220c128d
+compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping a7ba70f1787f977f970cd116076c6fce4b9e01cc
+asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba
+arc 9fbea0b7e842890a76acffce9be9e430b9e11194
+arm 1a70cf0e7ee6e73aa29c2dd4dd8d3d38c48d5946
+arm64 d8e85e144bbe12e8d82c6b05d690a34da62cc991
+arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b
+arm-soc e1351090dd4a172fb26317ae6fa846ab13c50199
+amlogic 1e1693ee7764c28bfa433039bc33e485c59f742d
+aspeed 2aee80727dca69ee225c376f2987c5dbf3fbb416
+at91 571c4b1fe42bc96eb3360e68fd3ba1a3b3787d8c
+bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d
+imx-mxs 71918b15d58f657ad35e20530b051c9a70999083
+keystone 2af8e1f26c6596540d95965fd45fca2692696e1e
+mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599
+mvebu 3aa22be2d6b161b744398e60902014893e6898d8
+omap 369f4ddb51bb111a9fbd9688670039c779bde70a
+qcom 6a363f34a300bb810160674d50b431e134512d18
+realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82
+renesas 9c45f53abb9772802044007717e769eafd9b9ce3
+reset b3f1d036f26d024a8ae2e307477ab6b7ba416c02
+rockchip f0d0e0810786eb35d7175b0c1b9ddc61ac10107f
+samsung-krzk 6780daf4858878895bcba2f7fd5b5e53b9e72309
+scmi af42d3466bdc8f39806b26f593604fdc54140bcb
+sunxi 2ddd531f8c8035eef280bd79ae907ce4487e1627
+tegra e0fd54137bf5a65d2523ffeec69e5a15935cb4e5
+clk cd89054e321a893073de7bb50f48b524a4ff675b
+clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky 044cf5e153578583ef570b0a502ccdd74bdaf295
+h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e
+ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13
+m68k 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55
+m68knommu 3ad3cbe305b5a23d829d3723b60be59c36713992
+microblaze 22648c989cb8305f51b96b5962df8674697bb2ab
+mips b02efeb056998076163083a2be3df4a60830335a
+nds32 a7f96fce201c4969178c8709a49e005d9792186b
+nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e
+openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf
+parisc-hd e9c837c6ab07127b02357efcfe1a23d030db1aca
+powerpc bf9c95e23324cbaf2e58fc3f0cbdc73137f2d1ca
+fsl a76bea0287ce13d28494b19649d80d8ee5e7b757
+soc-fsl 3b8db0348c503823fb09b5f304b196c3362754ea
+risc-v 070389ef0f4bff37053abd7e0f2f80c098b4798c
+sifive 467e050e9760fc31dcf854ec88401e18419f5f78
+s390 6a82e23f45fe0aa821e7a935e39d0acb20c275c0
+sh baf58858e8b6d853a7a8308901fcdd438e92a522
+sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e
+uml 73625ed66389d4c620520058d828f43a93ab4d0c
+xtensa e86e4bdfc0cb17ec18ca3306a58f217556719144
+fscrypt 0eee17e3322625b87ce5fa631bda16562a8dc494
+afs 297c6f6378a6c0d34bf7f0c7eabdb20767325a8d
+btrfs 897636c94003639000939fc1720dd3ae1eea5142
+ceph 633739b2fedb6617d782ca252797b7a8ad754347
+cifs 0966aa813a7f11b09dd566e888208761e2120953
+configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308
+ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8
+erofs 3dcb5fa23e16ef50b09e7a56b47d8e4c04ca09c0
+ext3 15d8f21beaaecc7a1163a336537e6e6abd22dd8e
+ext4 dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d
+f2fs 7c15ed5f37a318ae57791bbb78ceba4e3f73297c
+fsverity 73f0ec02d670a61afcef49bc0a74d42e324276ea
+fuse 00929447f5758c4f64c74d0a4b40a6eb3d9df0e3
+jfs a5fdd713d256887b5f012608701149fa939e5645
+nfs e8d70b321ecc9b23d09b8df63e38a2f73160c209
+nfs-anna 79cc55422ce99be5964bde208ba8557174720893
+nfsd 8729aaba74626c4ebce3abf1b9e96bb62d2958ca
+orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2
+overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640
+ubifs f9c34bb529975fe9f85b870a80c53a83a3c5a182
+v9fs aafee43b72863f1f70aeaf1332d049916e8df239
+xfs 22858d0ab9b3afb67166b963e479ea80ece26ced
+iomap 419e9c38aa075ed0cd3c13d47e15954b686bcdb6
+djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73
+file-locks b41dae061bbd722b9d7fa828f35d22035b218e18
+vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef
+printk 7c88431552f3f720cb1991067ad8545a26a82a0b
+pci d3d7b62ffff983eb2819e34e4fe2859ed03d39a6
+pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b
+hid 4b8c2dffbb85857fbbeb25516ccec51eb3a9e44b
+i2c 3274d632cb1a2ec1676f8bb1c59784c4bdb81cea
+i3c ae24f2b6f828f4ae37d0f0fd3be4e7744b6aab13
+dmi 9a85ac3936add8611c5d7efb67a040a656fc9433
+hwmon-staging 4a1288f1c1cf5829f90c30f9d1af67f526ba4d85
+jc_docs 51e46c7a4007d271b2d42dbc2df953ab968577a7
+v4l-dvb dca6b3733a4a46e63603496f544ece8ace541fde
+v4l-dvb-next d45331b00ddb179e291766617259261c112db872
+fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm 16512c3e4523bbe84a2b60d16d986b638bff257c
+cpufreq-arm c23734487fb44ee16c1b007ba72d793c085e4ec4
+cpupower 4611a4fb0cce3973dce8c9d74e5d6261ffa4210f
+opp 25cb20a212a1f989385dfe23230817e69c62bee5
+thermal def0aa8690502572c5d6d828bb35459c2725271d
+thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67
+ieee1394 7807759e4ad8d46347a5d52a0910269320b81e65
+dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78
+swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c
+rdma 9067f2f0b41d7e817fc8c5259bab1f17512b0147
+net-next c392bccf2c1075b5d2cc9022d0116a516acb721d
+bpf-next b633b4ea8a9634e7f8307f0dceaef9c01a3daad9
+ipsec-next 72c996099dc6fd83947a79cdac05625c6a52ffa6
+mlx5-next 9c0015ef092879f61129cdffbbe22fd30201d39b
+netfilter-next f3c9a666b28572b1a0ae691a47d9a7de4d9cefb3
+nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382
+ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0
+wireless-drivers-next 05d6c8cfdbd6cefac6b373bad72775fcc4193c80
+bluetooth a4f95f31a9f38d9bb1fd313fcc2d0c0d48116ee3
+mac80211-next 7a89233ac50468a3a9636803a85d06c8f907f8ee
+gfs2 ade48088937f53fe0467162177726176813b9564
+mtd 589e1b6c47ce72fcae103c2e45d899610c92c11e
+nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf
+spi-nor 83cba933a6db1dd4d7ac85170f99461fbc339eff
+crypto 4ee812f6143d78d8ba1399671d78c8d78bf2817c
+drm 17eee668b3cad423a47c090fe2275733c55db910
+amdgpu ba77517eba6d63cfb06f43caddff309ad1604901
+drm-intel 15b9cbb2c5e1cf22c13fe38bf513bab821b47630
+drm-tegra 84db889e6d827eefc3dde130fec8382d2dcb23ac
+drm-misc 9786b65bc61acec63f923978c75e707afbb74bc7
+drm-msm e20c9284c8f212081afc28471daaac9b0d54252f
+mali-dp f634c6a8028789b05a9277a3d51303829ae29547
+imx-drm 4d24376370fbfc87231d54434a683f2913abcce4
+etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8
+regmap 0c4b6e03b8ad372157a5e8005ce775dccea917b3
+sound c6b6fc206586cc07a18595d2a3d815a806a057d0
+sound-asoc 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b
+modules 5d603311615f612320bb77bd2a82553ef1ced5b7
+input bcf1e034d3aae39d27371b51916359ea7501db01
+block 832ef66806015d4b8be74f19405dd967872f813a
+device-mapper f612b2132db529feac4f965f28a1b9258ea7c22b
+pcmcia bd9d6e0371d147b710f549b55d7b44008264aa06
+mmc def7bd940f8cceb41ec3d1383acd8ab937056dcb
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd de98a43eb76b8442c02a2fe31c2a50d72cf6ded3
+backlight 9afa302473f3ed925acd2499b624fdc0c527e0d0
+battery 9480029fe5c24d482efad38dc631bd555fc7afe2
+regulator a21da94f617bce0771144ea8093b6987184b38d0
+security 45893a0abee6b5fd52994a3a1095735aeaec472b
+apparmor 341c1fda5e17156619fb71acfc7082b2669b4b72
+integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5
+keys 48274e1e5d24407bb2acb768c093add00bf92823
+selinux 42345b68c2e3e2b6549fc34b937ff44240dfc3b6
+smack 92604e825304ce170955df44b00973843054dcd5
+tomoyo 79c8ca578dbf776e86f452524c9bad0eae3b6f15
+tpmdd 0b40dbcbba923b5379bd1d601edd6d51e23fe72c
+watchdog 33c26ab4d6beec44bd5f525ffba1c23bf962d4a7
+iommu 9b3a713feef8db41d4bcccb3b97e86ee906690c8
+vfio 026948f01eac4dda130aa623b7414375633fe7c1
+audit c34c78dfc1fc68a1f5403f996de8ca62f298d7b2
+devicetree 10378fadadef4bdd0f2381350bd9c75a66bf042e
+mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5
+spi e2ce328b282d0c7660576c25af6b9be34a6d2614
+tip e16a444976e9dbfdcedd8e56ebefbd1f9b90c146
+clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad
+edac 5781823fd0d39082bfe2bbc20408aaa85a6e06ad
+irqchip 585d1183ffeea5cbe2cd24863bbc90196d827257
+ftrace 16c0f03f629a89e6a1249497202b2c154ff46206
+rcu e100e2f047de34725181d990cba57fb1ba5666e2
+kvm c50d8ae3a1274f32c9033bbb0e1c5b3115da2112
+kvm-arm cd7056ae34af0e9424da97bbc7d2b38246ba8a2c
+kvm-ppc 30486e72093ea2e594f44876b7a445c219449bce
+kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0
+xen-tip 23c1cce9f3174db9cdc91346cb4320fa6b97e35d
+percpu 91998940dc4b3fdef3015ee5aeb313882ca8a114
+workqueues 49e9d1a9faf2f71fdfd80a30697ee9a15070626d
+drivers-x86 20183ccd3e4d01d23b0a01fe9f3ee73fbae312fa
+chrome-platform 99bfcd3993d35e79690544ce4ec17906dc3b2c7d
+hsi c1030cd456198a2c58f718c3c4b215698d635553
+leds 5f820ed52371b4f5d8c43c93f03408d0dbc01e5b
+ipmi 8e6a5c833333e14a5023a5dcabb64b7d9e046bc6
+driver-core 0e4a459f56c32d3e52ae69a4b447db2f48a65f44
+usb 91a9f2d3f9762e59cca251d2c6cef8cda1a4e62b
+usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8
+usb-serial c1a1f273d0825774c80896b8deb1c9ea1d0b91e3
+usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d
+phy-next 4569e64ab6a590dec418f2cd98fbe907a08fd452
+tty b2b2dd71e0859436d4e05b2f61f86140250ed3f8
+char-misc b78cda795ac83333293f1bfa3165572a47e550c2
+extcon ddd1bbbae486ff5913c8fc72c853dcea60713236
+soundwire 2e8c4ad1f04413a4a67ef10746a7566007d2ed55
+thunderbolt b001da2905e70014b15e98dddf62d0c61b132527
+staging 0f6f8749872e7be6c083dc845bf4d45a7018b79c
+mux 05fb8284a41719d5f827af2f383dd7592d8dcfda
+icc a99d8080aaf358d5d23581244e5da23b35e340b9
+slave-dma 67805a4b3c924927d9e064bca235461941f89e4a
+cgroup 078cb46c8a524c8f163ba526a3916fd031940541
+scsi 4220129431adbbd5405ee303847c0faf72126778
+scsi-mkp 65309ef6b258f5a7b57c1033a82ba2aba5c434cc
+vhost 88d3c7697f254a57e9056b7a8c8e028b790f1bdb
+rpmsg 070a8e805ff53c921a38c71e0c2c9409f54c1ecf
+gpio ac72719b626fa213950e2f2248d5256b4218af49
+gpio-brgl 0f67f16a6e88749fc3bf88da7515d3fff472a1cc
+gpio-intel 4a5e0f9e73511595c68f907a15772e5d1ba4aac6
+pinctrl f130d5fd1fa0c3e6b2a40f8ac152ad8ac690b7b8
+pinctrl-intel 8ae93b5ed9bec003b77c1ffaca852388b8ca490e
+pinctrl-samsung a322b3377f4bac32aa25fb1acb9e7afbbbbd0137
+pwm 9e1b4999a1693d67cc87a887057d8012c28fb12b
+userns 318759b4737c3b3789e2fd64d539f437d52386f5
+ktest 9b5f852ae20d998a534eea46d54e68584868ae8c
+random 58be0106c5306b939b07b4b8bf00669a20593f4b
+kselftest 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+y2038 6d5b3a41ae0413f7bd752f1775a8531da92b0d0d
+livepatching 7f436b3066e330f78a626b3af72ff549137cf114
+coresight 9a5d847c0bdadb67892b7d176a028578aaed0c3a
+rtc 32c4d9e8a4eb286674dc1a3b93d51d791c7f645e
+nvdimm e23d1c2d10fd282503ed990fc748a3e0403f5e8c
+at24 285be87c79e173f08af5e1a6417a106fb14934b7
+ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5
+kspp ec2f877856e0af3889940e00b160f7f20f8d774f
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13
+slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+nvmem 6bd17868c99260458c70dd364b06ba5c28cfe814
+xarray 6b81141deb7358dbd64ce3e793cd1e3f5939f807
+hyperv 7a1323b5dfe44a9013a2cc56ef2973034a00bf88
+auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+kgdb c58ff643763c78bef12874ee39995c9f7f987bc2
+pidfd 04882c321b26fef30d8eaa7af63fa62c06e45c76
+devfreq a258d17d511c952368dfa3cb1a92bd7d081e65fa
+hmm 67815bec3ae98e669fc06bbd815bc5b94e6557c7
+fpga fddc9fcbe69a502d84adf0bad5e2c6c80823838c
+kunit ea2dd7c0875ed31955cda7b1b20612c8337192e5
+cel a99d8080aaf358d5d23581244e5da23b35e340b9
+kasan-bitops 5bece3d66153d78f1fd62108a1553c3f15e71412
+generic-ioremap eafee59440623e06b0ce4a0e49f814a8cf31d8ca
+akpm-current a4cee976e9661c1b5ef148d43450ae1631cedabf
+akpm 2a3cf7b6ac179edcb706a54fbb9ee5a87d082fa7
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..2eb9fe5c31d8
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,316 @@
+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
+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
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/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
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/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.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master
+drivers-x86-fixes git git://git.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
+amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+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/soc/soc.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-next
+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
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
+renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+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
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+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
+sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+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
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/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/thermal/linux.git#thermal/linux-next
+thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/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.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp
+imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+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
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack git git://github.com/cschaufler/smack-next#for-next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+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
+vfio git git://github.com/awilliam/linux-vfio.git#next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.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/pavel/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/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
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+coresight git git://git.linaro.org/kernel/coresight.git#next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+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/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/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 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/chanwoo/linux.git#devfreq-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next
+kasan-bitops git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kasan-bitops
+generic-ioremap git git://git.infradead.org/users/hch/ioremap.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 000000000000..6fa13852e7df
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,15832 @@
+$ date -R
+Mon, 25 Nov 2019 07:03:21 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 69% (7530/10809) Updating files: 70% (7567/10809) Updating files: 71% (7675/10809) Updating files: 72% (7783/10809) Updating files: 73% (7891/10809) Updating files: 74% (7999/10809) Updating files: 75% (8107/10809) Updating files: 76% (8215/10809) Updating files: 77% (8323/10809) Updating files: 78% (8432/10809) Updating files: 79% (8540/10809) Updating files: 80% (8648/10809) Updating files: 81% (8756/10809) Updating files: 82% (8864/10809) Updating files: 83% (8972/10809) Updating files: 84% (9080/10809) Updating files: 85% (9188/10809) Updating files: 86% (9296/10809) Updating files: 87% (9404/10809) Updating files: 88% (9512/10809) Updating files: 89% (9621/10809) Updating files: 90% (9729/10809) Updating files: 91% (9837/10809) Updating files: 92% (9945/10809) Updating files: 93% (10053/10809) Updating files: 94% (10161/10809) Updating files: 95% (10269/10809) Updating files: 96% (10377/10809) Updating files: 97% (10485/10809) Updating files: 98% (10593/10809) Updating files: 99% (10701/10809) Updating files: 100% (10809/10809) Updating files: 100% (10809/10809), done.
+HEAD is now at c74386d50fba afs: Fix missing timeout reset
+Merging origin/master (6b8a79467876 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge origin/master
+Updating c74386d50fba..6b8a79467876
+Fast-forward
+ MAINTAINERS | 3 +-
+ arch/arm64/include/asm/asm-uaccess.h | 17 ------
+ arch/arm64/include/asm/uaccess.h | 27 ++++++++--
+ arch/arm64/lib/clear_user.S | 2 -
+ arch/arm64/lib/copy_from_user.S | 2 -
+ arch/arm64/lib/copy_in_user.S | 2 -
+ arch/arm64/lib/copy_to_user.S | 2 -
+ arch/arm64/lib/uaccess_flushcache.c | 6 ++-
+ drivers/block/nbd.c | 1 +
+ drivers/char/virtio_console.c | 28 +++++-----
+ drivers/gpio/gpio-bd70528.c | 6 +--
+ drivers/gpio/gpio-max77620.c | 6 +--
+ drivers/gpio/gpiolib-acpi.c | 17 ++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 ++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 +++-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 23 ++++++--
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 6 +++
+ drivers/gpu/drm/i915/display/intel_atomic.c | 1 +
+ drivers/gpu/drm/i915/display/intel_color.c | 61 ++++++++++++++++++++++
+ drivers/gpu/drm/i915/display/intel_display.c | 9 ++++
+ drivers/gpu/drm/i915/display/intel_display_types.h | 1 +
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 9 ++--
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 22 +++++++-
+ drivers/gpu/drm/i915/gt/intel_engine_pool.c | 2 +
+ drivers/gpu/drm/i915/i915_pmu.c | 4 +-
+ drivers/gpu/drm/i915/i915_scheduler.c | 50 ++++++++++++++----
+ drivers/input/mouse/synaptics.c | 1 -
+ drivers/net/can/m_can/m_can_platform.c | 4 +-
+ drivers/net/ethernet/freescale/fec_main.c | 15 ++++--
+ drivers/net/ethernet/google/gve/gve_tx.c | 9 ++--
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 11 ++--
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 9 ++--
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 9 ++++
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 18 ++++---
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 ++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 31 ++++++-----
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 +
+ .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 15 ++++++
+ .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 4 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 22 +-------
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 2 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 19 +------
+ drivers/net/ethernet/qualcomm/qca_spi.c | 11 ++--
+ drivers/net/ethernet/qualcomm/qca_spi.h | 1 +
+ drivers/net/ethernet/realtek/r8169_main.c | 7 ++-
+ drivers/net/ethernet/sfc/ptp.c | 3 +-
+ drivers/net/hyperv/hyperv_net.h | 3 +-
+ drivers/net/hyperv/netvsc.c | 38 +++++++++++---
+ drivers/net/phy/mdio-sun4i.c | 3 ++
+ drivers/net/phy/phylink.c | 29 ++++++----
+ drivers/net/usb/r8152.c | 30 +++++++----
+ drivers/nfc/port100.c | 2 +-
+ drivers/s390/net/qeth_core.h | 1 +
+ drivers/s390/net/qeth_core_main.c | 10 ++--
+ drivers/s390/net/qeth_l2_main.c | 21 +++++---
+ drivers/s390/net/qeth_l2_sys.c | 14 ++++-
+ drivers/virtio/virtio_balloon.c | 20 ++++---
+ drivers/virtio/virtio_ring.c | 4 +-
+ fs/afs/callback.c | 1 -
+ fs/afs/super.c | 1 +
+ fs/ocfs2/xattr.c | 56 ++++++++++++--------
+ include/linux/skbuff.h | 6 +++
+ include/net/tls.h | 2 +
+ kernel/bpf/offload.c | 4 +-
+ kernel/fork.c | 6 +--
+ kernel/power/qos.c | 8 ++-
+ mm/ksm.c | 14 ++---
+ mm/memory_hotplug.c | 16 ++++--
+ net/atm/clip.c | 6 +--
+ net/core/net-sysfs.c | 25 +++++----
+ net/core/rtnetlink.c | 23 +++++++-
+ net/ipv4/sysctl_net_ipv4.c | 2 +-
+ net/ipv4/udp.c | 27 ++++++++--
+ net/ipv6/ipv6_sockglue.c | 4 +-
+ net/ipv6/route.c | 2 +-
+ net/sched/act_pedit.c | 12 ++---
+ net/sched/act_tunnel_key.c | 4 ++
+ net/sched/sch_taprio.c | 28 +++++++++-
+ net/tls/tls_main.c | 1 +
+ net/tls/tls_sw.c | 11 ++++
+ tools/gpio/Build | 1 +
+ tools/gpio/Makefile | 10 ++--
+ 90 files changed, 690 insertions(+), 313 deletions(-)
+Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7)
+$ git merge fixes/master
+Already up to date.
+Merging kbuild-current/fixes (80591e61a0f7 kbuild: tell sparse about the $ARCH)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (5effc09c4907 ARC: perf: Accommodate big-endian CPU)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (db6efda85437 Merge tag 'tee-fixes-for-v5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes)
+$ git merge arm-soc-fixes/arm/fixes
+Merge made by the 'recursive' strategy.
+ drivers/tee/optee/call.c | 7 +++++++
+ drivers/tee/optee/core.c | 20 ++++++++++++--------
+ drivers/tee/optee/shm_pool.c | 12 +++++++++++-
+ 3 files changed, 30 insertions(+), 9 deletions(-)
+Merging arm64-fixes/for-next/fixes (e50be648aaa3 arm64: uaccess: Remove uaccess_*_not_uao asm macros)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache())
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (7d6475051fb3 powerpc/powernv: Fix CPU idle to be called with IRQs disabled)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (a99d8080aaf3 Linux 5.4-rc6)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
+$ git merge sparc/master
+Removing arch/sparc/include/uapi/asm/statfs.h
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/uapi/asm/statfs.h | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 arch/sparc/include/uapi/asm/statfs.h
+Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (312434617cb1 sctp: cache netns in sctp_ep_common)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ include/net/sctp/structs.h | 3 +++
+ net/sctp/associola.c | 1 +
+ net/sctp/endpointola.c | 1 +
+ net/sctp/input.c | 4 ++--
+ net/sctp/sm_statefuns.c | 4 +++-
+ 5 files changed, 10 insertions(+), 3 deletions(-)
+Merging bpf/master (34e59836565e net/mlx4_en: fix mlx4 ethtool -N insertion)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (a56dcc6b4558 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size())
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (064a18998b0b Merge tag 'mlx5-fixes-2019-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (cb1a4badf592 iwlwifi: pcie: don't consider IV len in A-MSDU)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (285531f9e677 mac80211: fix station inactive_time shortly after boot)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (411c1e6774e2 RDMA/hns: Correct the value of srq_desc_size)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (976a68f06b2e ALSA: usb-audio: Fix incorrect size check for processing/extension units)
+$ git merge sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (3701d2cb8767 Merge branch 'asoc-5.4' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/codecs/rt5645.c | 6 +++++-
+ sound/soc/codecs/rt5682.c | 28 ++++------------------------
+ sound/soc/codecs/wm8904.c | 1 +
+ sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++----
+ sound/soc/sh/rcar/core.c | 20 ++++++++++++++++++--
+ sound/soc/soc-jack.c | 3 +--
+ 6 files changed, 35 insertions(+), 33 deletions(-)
+Merging regmap-fixes/for-linus (af42d3466bdc Linux 5.4-rc8)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (c642e8708684 Merge branch 'regulator-5.4' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/bd70528-regulator.c | 1 +
+ drivers/regulator/core.c | 9 +++++++--
+ drivers/regulator/internal.h | 1 +
+ drivers/regulator/rn5t618-regulator.c | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+Merging spi-fixes/for-linus (8f3ed6d0b0db Merge branch 'spi-5.4' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-atmel.c | 10 +++-------
+ drivers/spi/spi-bcm2835.c | 2 +-
+ drivers/spi/spi-dw-mmio.c | 5 +++++
+ drivers/spi/spi-dw.c | 3 ++-
+ drivers/spi/spi-fsl-cpm.c | 3 ++-
+ drivers/spi/spi-fsl-dspi.c | 5 ++++-
+ drivers/spi/spi-fsl-lpspi.c | 2 +-
+ drivers/spi/spi-fsl-qspi.c | 38 +++++++++++++++++++++++++++++++++-----
+ drivers/spi/spi-gpio.c | 4 +++-
+ drivers/spi/spi-mxic.c | 6 +++---
+ drivers/spi/spi-orion.c | 3 ---
+ drivers/spi/spi-pxa2xx.c | 19 ++++++++++++++-----
+ drivers/spi/spi-rspi.c | 8 ++------
+ drivers/spi/spi-sifive.c | 11 +++++++----
+ drivers/spi/spi-stm32-qspi.c | 3 ++-
+ drivers/spi/spi.c | 19 ++++++++++---------
+ drivers/spi/spidev.c | 3 +++
+ 17 files changed, 95 insertions(+), 49 deletions(-)
+Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (d6d5df1db6e9 Linux 5.4-rc5)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (d6d5df1db6e9 Linux 5.4-rc5)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (a99d8080aaf3 Linux 5.4-rc6)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (f3fb802efaef usb: cdns3: gadget: Don't manage pullups)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (a99d8080aaf3 Linux 5.4-rc6)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Auto-merging drivers/usb/chipidea/udc.c
+Merge made by the 'recursive' strategy.
+Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (31f4f5b495a6 Linux 5.4-rc7)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (31f4f5b495a6 Linux 5.4-rc7)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (7b47ad3322d1 soundwire: slave: fix scanf format)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (af42d3466bdc Linux 5.4-rc8)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (8791663435e7 Revert "Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation")
+$ git merge input-current/for-linus
+Already up to date.
+Merging crypto-current/master (08e97aec700a Revert "hwrng: core - Freeze khwrng thread during suspend")
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/siimage.c | 3 +--
+ drivers/ide/via82cxxx.c | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (ed2d8fa734e7 selftests: sync: Fix cast warnings on arm)
+$ git merge kselftest-fixes/fixes
+Auto-merging tools/testing/selftests/net/udpgso.c
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/Makefile | 8 +++++---
+ .../selftests/breakpoints/breakpoint_test_arm64.c | 2 +-
+ tools/testing/selftests/gen_kselftest_tar.sh | 21 +++++++++++--------
+ .../{kselftest_module.sh => kselftest/module.sh} | 0
+ tools/testing/selftests/kselftest_install.sh | 24 +++++++++++-----------
+ tools/testing/selftests/lib/bitmap.sh | 2 +-
+ tools/testing/selftests/lib/prime_numbers.sh | 2 +-
+ tools/testing/selftests/lib/printf.sh | 2 +-
+ tools/testing/selftests/lib/strscpy.sh | 2 +-
+ tools/testing/selftests/net/so_txtime.c | 4 ++--
+ tools/testing/selftests/net/tcp_mmap.c | 8 ++++----
+ tools/testing/selftests/net/udpgso.c | 3 ++-
+ tools/testing/selftests/net/udpgso_bench_tx.c | 3 ++-
+ .../selftests/proc/proc-self-map-files-002.c | 6 +++++-
+ tools/testing/selftests/sync/sync.c | 6 +++---
+ tools/testing/selftests/vm/Makefile | 5 +++++
+ tools/testing/selftests/vm/run_vmtests | 10 +++++++++
+ 17 files changed, 68 insertions(+), 40 deletions(-)
+ rename tools/testing/selftests/{kselftest_module.sh => kselftest/module.sh} (100%)
+Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging slave-dma-fixes/fixes (bacdcb6675e1 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle)
+$ git merge slave-dma-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (3e84a18a259e media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/media/platform/meson/ao-cec-g12a.c | 36 +++++++++++++++---------------
+ drivers/media/platform/meson/ao-cec.c | 30 ++++++++++++-------------
+ 2 files changed, 33 insertions(+), 33 deletions(-)
+Merging reset-fixes/reset/fixes (cc67d61e31ec reset: Do not register resource data for missing resets)
+$ git merge reset-fixes/reset/fixes
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt | 2 +-
+ drivers/reset/core.c | 10 ++++------
+ drivers/reset/reset-brcmstb.c | 6 ------
+ 3 files changed, 5 insertions(+), 13 deletions(-)
+Merging mips-fixes/mips-fixes (f6929c92e283 MAINTAINERS: Remove Kevin as maintainer of BMIPS generic platforms)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (6aed5a0e0f56 Merge branch 'watchdog-fix' into fixes)
+$ git merge omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (9cb09e7c1c9a KVM: Add a comment describing the /dev/kvm no_compat handling)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (92b39ad44096 hwmon: (pmbus/ibm-cffps) Fix LED blink behavior)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/pmbus/ibm-cffps.c | 37 +++++++++++++++++++++++++------------
+ 1 file changed, 25 insertions(+), 12 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (6370740e5f8e fs/dax: Fix pmd vs pte conflict detection)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (bfbbf8cb43a7 Merge branch 'misc-5.4' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging vfs-fixes/fixes (3e5aeec0e267 cramfs: fix usage on non-MTD device)
+$ git merge vfs-fixes/fixes
+Merge made by the 'recursive' strategy.
+ fs/cramfs/inode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (7d194c2100ad Linux 5.4-rc4)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (5dba51754b04 of: reserved_mem: add missing of_node_put() for proper ref-counting)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (9393c8de628c scsi: core: Handle drivers which set sg_tablesize to zero)
+$ git merge scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (51658c04c338 Merge tag 'drm-intel-fixes-2019-11-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (71d122629c04 drm/i915/fbdev: Restore physical addresses for fb_mmap())
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (fed23c5829ec mmc: sdhci-of-at91: fix quirk2 overwrite)
+$ git merge mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (54ecb8f7028c Linux 5.4-rc1)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (1d9b0b66c3ef MAINTAINERS: Change to my personal email address)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (9e77716a75bc fork: fix pidfd_poll()'s return type)
+$ git merge pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (bf49d9dd6fef export,module: add SPDX GPL-2.0 license identifier to headers with no license)
+$ git merge spdx/spdx-linus
+Merge made by the 'recursive' strategy.
+ include/asm-generic/export.h | 1 +
+ include/linux/export.h | 1 +
+ include/linux/license.h | 1 +
+ include/linux/module.h | 7 +++++--
+ 4 files changed, 8 insertions(+), 2 deletions(-)
+Merging gpio-intel-fixes/fixes (7d194c2100ad Linux 5.4-rc4)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (af42d3466bdc Linux 5.4-rc8)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (da0c9ea146cb Linux 5.4-rc2)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (c131280c03bd drm/mcde: dsi: Fix invalid pointer dereference if panel cannot be found)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/mcde/mcde_dsi.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2)
+$ git merge kspp-gustavo/for-next/kspp
+Already up to date.
+Merging kbuild/for-next (b1fbfcb4a209 kbuild: make single target builds even faster)
+$ git merge kbuild/for-next
+Auto-merging include/asm-generic/export.h
+Removing include/Kbuild
+Removing arch/ia64/include/uapi/asm/ioctls.h
+Removing arch/ia64/include/uapi/asm/ioctl.h
+Removing arch/ia64/include/uapi/asm/errno.h
+Removing arch/hexagon/include/uapi/asm/bitsperlong.h
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 2 +-
+ Documentation/Makefile | 6 +-
+ Documentation/core-api/symbol-namespaces.rst | 3 +
+ Documentation/dontdiff | 1 +
+ Documentation/kbuild/makefiles.rst | 17 -
+ Documentation/kbuild/modules.rst | 13 +-
+ Makefile | 121 ++-
+ arch/hexagon/include/uapi/asm/bitsperlong.h | 27 -
+ arch/ia64/include/uapi/asm/errno.h | 2 -
+ arch/ia64/include/uapi/asm/ioctl.h | 2 -
+ arch/ia64/include/uapi/asm/ioctls.h | 7 -
+ drivers/gpu/drm/i915/Kconfig.debug | 1 -
+ drivers/video/logo/.gitignore | 1 +
+ drivers/video/logo/Makefile | 15 +-
+ {scripts => drivers/video/logo}/pnmtologo.c | 0
+ include/Kbuild | 1185 --------------------------
+ include/asm-generic/export.h | 2 -
+ init/Kconfig | 22 +-
+ kernel/Makefile | 2 +-
+ kernel/gen_kheaders.sh | 64 +-
+ lib/Kconfig.debug | 11 -
+ scripts/.gitignore | 1 -
+ scripts/Kbuild.include | 15 +-
+ scripts/Makefile | 2 -
+ scripts/Makefile.build | 20 +-
+ scripts/Makefile.headersinst | 18 -
+ scripts/Makefile.lib | 14 -
+ scripts/Makefile.modpost | 18 +-
+ scripts/Makefile.package | 6 +-
+ scripts/kconfig/Makefile | 10 +-
+ scripts/kconfig/conf.c | 13 +-
+ scripts/kconfig/mconf-cfg.sh | 3 +
+ scripts/kconfig/nconf-cfg.sh | 3 +
+ scripts/kconfig/parser.y | 1 -
+ scripts/mod/modpost.c | 188 ++--
+ scripts/mod/modpost.h | 5 +-
+ scripts/nsdeps | 29 +-
+ scripts/package/buildtar | 8 +-
+ scripts/setlocalversion | 22 +-
+ scripts/ver_linux | 2 +
+ usr/include/Makefile | 19 +-
+ 41 files changed, 308 insertions(+), 1593 deletions(-)
+ delete mode 100644 arch/hexagon/include/uapi/asm/bitsperlong.h
+ delete mode 100644 arch/ia64/include/uapi/asm/errno.h
+ delete mode 100644 arch/ia64/include/uapi/asm/ioctl.h
+ delete mode 100644 arch/ia64/include/uapi/asm/ioctls.h
+ rename {scripts => drivers/video/logo}/pnmtologo.c (100%)
+ delete mode 100644 include/Kbuild
+Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge leaks/leaks-next
+Already up to date.
+Merging dma-mapping/for-next (a7ba70f1787f dma-mapping: treat dev->bus_dma_mask as a DMA limit)
+$ git merge dma-mapping/for-next
+Removing arch/x86/include/asm/dma-direct.h
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 1 -
+ arch/arc/mm/dma.c | 8 +-
+ arch/arm/Kconfig | 1 -
+ arch/arm/include/asm/dma-direct.h | 19 ----
+ arch/arm/mm/dma-mapping-nommu.c | 2 +-
+ arch/arm/mm/dma-mapping.c | 14 +--
+ arch/arm/xen/mm.c | 12 +--
+ arch/arm64/Kconfig | 5 +-
+ arch/arm64/mm/dma-mapping.c | 8 +-
+ arch/arm64/mm/init.c | 77 +++++++++-----
+ arch/c6x/mm/dma-coherent.c | 14 +--
+ arch/csky/mm/dma-mapping.c | 8 +-
+ arch/hexagon/kernel/dma.c | 4 +-
+ arch/ia64/Kconfig | 2 +-
+ arch/ia64/kernel/dma-mapping.c | 6 --
+ arch/ia64/mm/init.c | 4 +-
+ arch/m68k/kernel/dma.c | 4 +-
+ arch/microblaze/Kconfig | 1 -
+ arch/microblaze/kernel/dma.c | 14 +--
+ arch/mips/Kconfig | 4 +-
+ arch/mips/bmips/dma.c | 2 +-
+ arch/mips/include/asm/dma-direct.h | 8 --
+ arch/mips/jazz/jazzdma.c | 17 ++-
+ arch/mips/mm/dma-noncoherent.c | 18 ++--
+ arch/mips/pci/fixup-sb1250.c | 16 +--
+ arch/nds32/kernel/dma.c | 8 +-
+ arch/nios2/mm/dma-mapping.c | 8 +-
+ arch/openrisc/kernel/dma.c | 2 +-
+ arch/parisc/kernel/pci-dma.c | 8 +-
+ arch/powerpc/include/asm/dma-direct.h | 13 ---
+ arch/powerpc/include/asm/page.h | 9 --
+ arch/powerpc/mm/dma-noncoherent.c | 8 +-
+ arch/powerpc/mm/mem.c | 20 +++-
+ arch/powerpc/platforms/Kconfig.cputype | 1 -
+ arch/powerpc/sysdev/fsl_pci.c | 6 +-
+ arch/s390/include/asm/page.h | 2 -
+ arch/s390/mm/init.c | 1 +
+ arch/sh/kernel/dma-coherent.c | 6 +-
+ arch/sparc/kernel/ioport.c | 4 +-
+ arch/x86/Kconfig | 1 -
+ arch/x86/include/asm/device.h | 3 -
+ arch/x86/include/asm/dma-direct.h | 9 --
+ arch/x86/kernel/amd_gart_64.c | 4 +-
+ arch/x86/kernel/pci-dma.c | 2 +-
+ arch/x86/mm/mem_encrypt.c | 2 +-
+ arch/x86/pci/sta2x11-fixup.c | 135 +++++------------------
+ arch/xtensa/Kconfig | 6 +-
+ arch/xtensa/include/asm/platform.h | 27 -----
+ arch/xtensa/kernel/Makefile | 3 +-
+ arch/xtensa/kernel/pci-dma.c | 129 +++-------------------
+ drivers/acpi/arm64/iort.c | 20 ++--
+ drivers/ata/ahci.c | 2 +-
+ drivers/iommu/dma-iommu.c | 13 ++-
+ drivers/of/device.c | 9 +-
+ drivers/usb/core/hcd.c | 8 +-
+ drivers/xen/swiotlb-xen.c | 12 +--
+ include/linux/device.h | 6 +-
+ include/linux/dma-direct.h | 37 +++++--
+ include/linux/dma-mapping.h | 10 +-
+ include/linux/dma-noncoherent.h | 22 ++--
+ include/linux/mmzone.h | 45 ++++----
+ include/xen/swiotlb-xen.h | 8 +-
+ kernel/dma/Kconfig | 12 ++-
+ kernel/dma/coherent.c | 16 +--
+ kernel/dma/contiguous.c | 9 +-
+ kernel/dma/debug.c | 39 ++++---
+ kernel/dma/direct.c | 188 ++++++++++++++++++++++++---------
+ kernel/dma/mapping.c | 45 ++------
+ kernel/dma/remap.c | 55 ----------
+ kernel/dma/swiotlb.c | 2 +-
+ 70 files changed, 509 insertions(+), 735 deletions(-)
+ delete mode 100644 arch/x86/include/asm/dma-direct.h
+Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x))
+$ git merge asm-generic/master
+Already up to date.
+Merging arc/for-next (9fbea0b7e842 ARC: add kmemleak support)
+$ git merge arc/for-next
+Removing arch/arc/configs/nsim_hs_smp_defconfig
+Removing arch/arc/configs/nsim_hs_defconfig
+Removing arch/arc/boot/dts/nsim_hs_idu.dts
+Removing arch/arc/boot/dts/nsim_hs.dts
+Auto-merging arch/arc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 9 ++
+ arch/arc/Makefile | 2 +-
+ arch/arc/boot/dts/axc001.dtsi | 6 ++
+ arch/arc/boot/dts/axs101.dts | 2 +-
+ arch/arc/boot/dts/axs103_idu.dts | 2 +-
+ arch/arc/boot/dts/axs10x_mb.dtsi | 11 ++-
+ arch/arc/boot/dts/haps_hs.dts | 15 +--
+ arch/arc/boot/dts/haps_hs_idu.dts | 1 -
+ arch/arc/boot/dts/nsim_700.dts | 36 +++----
+ arch/arc/boot/dts/nsim_hs.dts | 67 -------------
+ arch/arc/boot/dts/nsim_hs_idu.dts | 65 -------------
+ arch/arc/configs/haps_hs_defconfig | 30 ++----
+ arch/arc/configs/haps_hs_smp_defconfig | 32 ++-----
+ arch/arc/configs/nsim_700_defconfig | 19 ++--
+ arch/arc/configs/nsim_hs_defconfig | 60 ------------
+ arch/arc/configs/nsim_hs_smp_defconfig | 58 -----------
+ arch/arc/include/asm/cache.h | 2 +
+ arch/arc/include/asm/entry-compact.h | 4 +-
+ arch/arc/include/asm/jump_label.h | 72 ++++++++++++++
+ arch/arc/include/asm/mmu.h | 6 ++
+ arch/arc/include/asm/mmu_context.h | 2 +-
+ arch/arc/include/asm/pgtable.h | 2 +-
+ arch/arc/kernel/Makefile | 1 +
+ arch/arc/kernel/jump_label.c | 170 +++++++++++++++++++++++++++++++++
+ arch/arc/mm/tlb.c | 81 ++++++----------
+ arch/arc/mm/tlbex.S | 18 ++--
+ arch/arc/plat-sim/platform.c | 1 -
+ 27 files changed, 363 insertions(+), 411 deletions(-)
+ delete mode 100644 arch/arc/boot/dts/nsim_hs.dts
+ delete mode 100644 arch/arc/boot/dts/nsim_hs_idu.dts
+ delete mode 100644 arch/arc/configs/nsim_hs_defconfig
+ delete mode 100644 arch/arc/configs/nsim_hs_smp_defconfig
+ create mode 100644 arch/arc/include/asm/jump_label.h
+ create mode 100644 arch/arc/kernel/jump_label.c
+Merging arm/for-next (1a70cf0e7ee6 ARM: 8940/1: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old())
+$ git merge arm/for-next
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/bootp/init.S | 2 +-
+ arch/arm/boot/compressed/Makefile | 4 +-
+ arch/arm/boot/compressed/atags_to_fdt.c | 12 +-
+ arch/arm/boot/compressed/big-endian.S | 2 +-
+ arch/arm/boot/compressed/head.S | 4 +-
+ arch/arm/boot/compressed/piggy.S | 2 +-
+ arch/arm/include/asm/ftrace.h | 4 -
+ arch/arm/include/asm/hw_breakpoint.h | 3 +
+ arch/arm/include/asm/pci.h | 2 +
+ arch/arm/include/asm/vdso/gettimeofday.h | 94 ++++++++++++
+ arch/arm/include/asm/vdso/vsyscall.h | 71 +++++++++
+ arch/arm/include/asm/vdso_datapage.h | 29 +---
+ arch/arm/kernel/Makefile | 6 +-
+ arch/arm/kernel/arch_timer.c | 1 +
+ arch/arm/kernel/hw_breakpoint.c | 3 +
+ arch/arm/kernel/module-plts.c | 1 +
+ arch/arm/kernel/process.c | 2 +
+ arch/arm/kernel/psci_smp.c | 6 +-
+ arch/arm/kernel/return_address.c | 4 -
+ arch/arm/kernel/signal.h | 2 +
+ arch/arm/kernel/tcm.c | 5 +-
+ arch/arm/kernel/time.c | 2 +
+ arch/arm/kernel/topology.c | 2 +-
+ arch/arm/kernel/vdso.c | 87 +----------
+ arch/arm/mach-footbridge/dc21285.c | 1 -
+ arch/arm/mm/Kconfig | 3 +
+ arch/arm/mm/dma-mapping.c | 34 +++--
+ arch/arm/mm/init.c | 7 +-
+ arch/arm/mm/iomap.c | 2 +
+ arch/arm/mm/proc-arm1020.S | 2 +-
+ arch/arm/mm/proc-arm1020e.S | 2 +-
+ arch/arm/mm/proc-arm1022.S | 2 +-
+ arch/arm/mm/proc-arm1026.S | 6 +-
+ arch/arm/mm/proc-arm720.S | 2 +-
+ arch/arm/mm/proc-arm740.S | 2 +-
+ arch/arm/mm/proc-arm7tdmi.S | 2 +-
+ arch/arm/mm/proc-arm920.S | 2 +-
+ arch/arm/mm/proc-arm922.S | 2 +-
+ arch/arm/mm/proc-arm925.S | 2 +-
+ arch/arm/mm/proc-arm926.S | 6 +-
+ arch/arm/mm/proc-arm940.S | 2 +-
+ arch/arm/mm/proc-arm946.S | 2 +-
+ arch/arm/mm/proc-arm9tdmi.S | 2 +-
+ arch/arm/mm/proc-fa526.S | 2 +-
+ arch/arm/mm/proc-feroceon.S | 2 +-
+ arch/arm/mm/proc-mohawk.S | 2 +-
+ arch/arm/mm/proc-sa110.S | 2 +-
+ arch/arm/mm/proc-sa1100.S | 2 +-
+ arch/arm/mm/proc-v6.S | 2 +-
+ arch/arm/mm/proc-v7-bugs.c | 3 +
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/mm/proc-v7m.S | 4 +-
+ arch/arm/mm/proc-xsc3.S | 2 +-
+ arch/arm/mm/proc-xscale.S | 2 +-
+ arch/arm/vdso/Makefile | 18 ++-
+ arch/arm/vdso/note.c | 15 ++
+ arch/arm/vdso/vdso.lds.S | 2 +
+ arch/arm/vdso/vgettimeofday.c | 255 ++-----------------------------
+ 59 files changed, 322 insertions(+), 428 deletions(-)
+ create mode 100644 arch/arm/include/asm/vdso/gettimeofday.h
+ create mode 100644 arch/arm/include/asm/vdso/vsyscall.h
+ create mode 100644 arch/arm/vdso/note.c
+Merging arm64/for-next/core (d8e85e144bbe arm64: Kconfig: add a choice for endianness)
+$ git merge arm64/for-next/core
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging drivers/irqchip/irq-gic-v3.c
+Removing arch/parisc/kernel/module.lds
+Auto-merging arch/arm64/kernel/cpu_errata.c
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/asm-uaccess.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/asm-uaccess.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mm/proc-v7-bugs.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/arm64/silicon-errata.rst
+Resolved 'arch/arm64/include/asm/asm-uaccess.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a2754397b56d] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/perf/imx-ddr.rst | 15 +-
+ Documentation/admin-guide/perf/thunderx2-pmu.rst | 20 +-
+ Documentation/arm64/booting.rst | 3 +
+ Documentation/arm64/cpu-feature-registers.rst | 19 +-
+ Documentation/arm64/elf_hwcaps.rst | 67 +++--
+ Documentation/arm64/silicon-errata.rst | 6 +
+ Documentation/devicetree/bindings/perf/arm-ccn.txt | 1 +
+ .../devicetree/bindings/perf/fsl-imx-ddr.txt | 1 +
+ MAINTAINERS | 1 +
+ arch/arm/mm/proc-v7-bugs.c | 10 +-
+ arch/arm64/Kconfig | 47 ++-
+ arch/arm64/Makefile | 5 +
+ arch/arm64/include/asm/asm-uaccess.h | 9 -
+ arch/arm64/include/asm/barrier.h | 12 +
+ arch/arm64/include/asm/cache.h | 3 +-
+ arch/arm64/include/asm/cpucaps.h | 4 +-
+ arch/arm64/include/asm/cpufeature.h | 14 +
+ arch/arm64/include/asm/daifflags.h | 19 +-
+ arch/arm64/include/asm/exception.h | 22 +-
+ arch/arm64/include/asm/ftrace.h | 23 ++
+ arch/arm64/include/asm/insn.h | 3 +
+ arch/arm64/include/asm/irqflags.h | 19 +-
+ arch/arm64/include/asm/kvm_host.h | 3 +-
+ arch/arm64/include/asm/memory.h | 6 -
+ arch/arm64/include/asm/module.h | 2 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +-
+ arch/arm64/include/asm/pgtable.h | 16 +-
+ arch/arm64/include/asm/processor.h | 16 +-
+ arch/arm64/include/asm/syscall_wrapper.h | 6 -
+ arch/arm64/include/asm/traps.h | 10 -
+ arch/arm64/kernel/Makefile | 6 +-
+ arch/arm64/kernel/asm-offsets.c | 1 +
+ arch/arm64/kernel/cpu_errata.c | 82 +++--
+ arch/arm64/kernel/cpufeature.c | 1 +
+ arch/arm64/kernel/cpuinfo.c | 2 +-
+ arch/arm64/kernel/entry-common.c | 332 +++++++++++++++++++++
+ arch/arm64/kernel/entry-ftrace.S | 140 ++++++++-
+ arch/arm64/kernel/entry.S | 281 +----------------
+ arch/arm64/kernel/fpsimd.c | 6 +-
+ arch/arm64/kernel/ftrace.c | 123 +++++---
+ arch/arm64/kernel/insn.c | 13 +
+ arch/arm64/kernel/kaslr.c | 44 ++-
+ arch/arm64/kernel/module-plts.c | 3 +-
+ arch/arm64/kernel/module.c | 57 +++-
+ arch/arm64/kernel/perf_event.c | 191 ++++--------
+ arch/arm64/kernel/probes/kprobes.c | 4 -
+ arch/arm64/kernel/psci.c | 15 +-
+ arch/arm64/kernel/sdei.c | 3 +-
+ arch/arm64/kernel/sys_compat.c | 11 +
+ arch/arm64/kernel/syscall.c | 4 +-
+ arch/arm64/kernel/traps.c | 21 +-
+ arch/arm64/kernel/vmlinux.lds.S | 3 -
+ arch/arm64/kvm/hyp/switch.c | 52 +++-
+ arch/arm64/kvm/hyp/sysreg-sr.c | 35 ++-
+ arch/arm64/kvm/hyp/tlb.c | 23 ++
+ arch/arm64/mm/fault.c | 64 +---
+ arch/arm64/mm/init.c | 14 +-
+ arch/arm64/mm/mmu.c | 5 +-
+ arch/parisc/Makefile | 1 -
+ arch/parisc/kernel/module.c | 10 +-
+ arch/parisc/kernel/module.lds | 7 -
+ arch/x86/include/asm/pgtable.h | 6 +
+ drivers/firmware/arm_sdei.c | 12 +-
+ drivers/firmware/psci/psci.c | 24 +-
+ drivers/irqchip/irq-gic-v3.c | 20 ++
+ drivers/perf/arm-cci.c | 4 +-
+ drivers/perf/arm-ccn.c | 4 +-
+ drivers/perf/arm_smmuv3_pmu.c | 5 +-
+ drivers/perf/fsl_imx8_ddr_perf.c | 124 ++++++--
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 4 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 26 +-
+ drivers/perf/thunderx2_pmu.c | 267 +++++++++++++++--
+ drivers/perf/xgene_pmu.c | 14 +-
+ include/asm-generic/vmlinux.lds.h | 14 +-
+ include/linux/arm-smccc.h | 16 +
+ include/linux/arm_sdei.h | 6 -
+ include/linux/ftrace.h | 40 ++-
+ include/linux/irqchip/arm-gic-v3.h | 2 +
+ include/linux/psci.h | 9 +-
+ init/initramfs.c | 8 +
+ kernel/module.c | 2 +-
+ kernel/trace/ftrace.c | 6 +-
+ mm/memory.c | 104 ++++++-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/arm64/Makefile | 64 +++-
+ tools/testing/selftests/arm64/README | 25 ++
+ tools/testing/selftests/arm64/signal/.gitignore | 3 +
+ tools/testing/selftests/arm64/signal/Makefile | 32 ++
+ tools/testing/selftests/arm64/signal/README | 59 ++++
+ tools/testing/selftests/arm64/signal/signals.S | 64 ++++
+ .../testing/selftests/arm64/signal/test_signals.c | 29 ++
+ .../testing/selftests/arm64/signal/test_signals.h | 100 +++++++
+ .../selftests/arm64/signal/test_signals_utils.c | 328 ++++++++++++++++++++
+ .../selftests/arm64/signal/test_signals_utils.h | 120 ++++++++
+ .../signal/testcases/fake_sigreturn_bad_magic.c | 52 ++++
+ .../signal/testcases/fake_sigreturn_bad_size.c | 77 +++++
+ .../testcases/fake_sigreturn_bad_size_for_magic0.c | 46 +++
+ .../testcases/fake_sigreturn_duplicated_fpsimd.c | 50 ++++
+ .../testcases/fake_sigreturn_misaligned_sp.c | 37 +++
+ .../testcases/fake_sigreturn_missing_fpsimd.c | 50 ++++
+ .../mangle_pstate_invalid_compat_toggle.c | 31 ++
+ .../testcases/mangle_pstate_invalid_daif_bits.c | 35 +++
+ .../testcases/mangle_pstate_invalid_mode_el1h.c | 15 +
+ .../testcases/mangle_pstate_invalid_mode_el1t.c | 15 +
+ .../testcases/mangle_pstate_invalid_mode_el2h.c | 15 +
+ .../testcases/mangle_pstate_invalid_mode_el2t.c | 15 +
+ .../testcases/mangle_pstate_invalid_mode_el3h.c | 15 +
+ .../testcases/mangle_pstate_invalid_mode_el3t.c | 15 +
+ .../mangle_pstate_invalid_mode_template.h | 28 ++
+ .../selftests/arm64/signal/testcases/testcases.c | 196 ++++++++++++
+ .../selftests/arm64/signal/testcases/testcases.h | 104 +++++++
+ .../testing/selftests/arm64/{ => tags}/.gitignore | 0
+ tools/testing/selftests/arm64/tags/Makefile | 7 +
+ .../selftests/arm64/{ => tags}/run_tags_test.sh | 0
+ .../testing/selftests/arm64/{ => tags}/tags_test.c | 0
+ 117 files changed, 3428 insertions(+), 864 deletions(-)
+ create mode 100644 arch/arm64/kernel/entry-common.c
+ delete mode 100644 arch/parisc/kernel/module.lds
+ create mode 100644 tools/testing/selftests/arm64/README
+ create mode 100644 tools/testing/selftests/arm64/signal/.gitignore
+ create mode 100644 tools/testing/selftests/arm64/signal/Makefile
+ create mode 100644 tools/testing/selftests/arm64/signal/README
+ create mode 100644 tools/testing/selftests/arm64/signal/signals.S
+ create mode 100644 tools/testing/selftests/arm64/signal/test_signals.c
+ create mode 100644 tools/testing/selftests/arm64/signal/test_signals.h
+ create mode 100644 tools/testing/selftests/arm64/signal/test_signals_utils.c
+ create mode 100644 tools/testing/selftests/arm64/signal/test_signals_utils.h
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_magic.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_size.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_size_for_magic0.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_duplicated_fpsimd.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_misaligned_sp.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_missing_fpsimd.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_compat_toggle.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_daif_bits.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/testcases.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/testcases.h
+ rename tools/testing/selftests/arm64/{ => tags}/.gitignore (100%)
+ create mode 100644 tools/testing/selftests/arm64/tags/Makefile
+ rename tools/testing/selftests/arm64/{ => tags}/run_tags_test.sh (100%)
+ rename tools/testing/selftests/arm64/{ => tags}/tags_test.c (100%)
+Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (e1351090dd4a ARM: Document merges)
+$ git merge arm-soc/for-next
+CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of include/Kbuild left in tree.
+Removing drivers/soc/qcom/llcc-sdm845.c
+Auto-merging drivers/reset/core.c
+Auto-merging drivers/opp/core.c
+Auto-merging arch/arm/mm/Kconfig
+Removing arch/arm/boot/dts/at91-kizbox2.dts
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt
+Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt
+Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt
+Removing Documentation/devicetree/bindings/arm/renesas,prr.txt
+Removing Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
+Removing Documentation/devicetree/bindings/arm/mrvl/mrvl.txt
+Removing Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f include/Kbuild
+rm 'include/Kbuild'
+$ git commit --no-edit -v -a
+[master 36fc41ddd7a9] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/microchip.rst | 4 +-
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 9 +-
+ .../devicetree/bindings/arm/atmel-at91.yaml | 14 +
+ .../devicetree/bindings/arm/bcm/bcm2835.yaml | 54 +
+ .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 67 -
+ Documentation/devicetree/bindings/arm/cpus.yaml | 1 +
+ Documentation/devicetree/bindings/arm/fsl.yaml | 58 +-
+ ...-controller.txt => ap80x-system-controller.txt} | 14 +-
+ .../bindings/arm/marvell/armada-7k-8k.txt | 24 -
+ .../bindings/arm/marvell/armada-7k-8k.yaml | 61 +
+ .../devicetree/bindings/arm/mrvl/mrvl.txt | 14 -
+ .../devicetree/bindings/arm/mrvl/mrvl.yaml | 35 +
+ .../devicetree/bindings/arm/msm/qcom,llcc.txt | 41 -
+ .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 55 +
+ .../devicetree/bindings/arm/omap/prm-inst.txt | 29 +
+ Documentation/devicetree/bindings/arm/realtek.yaml | 27 +-
+ .../devicetree/bindings/arm/renesas,prr.txt | 20 -
+ .../devicetree/bindings/arm/renesas,prr.yaml | 35 +
+ Documentation/devicetree/bindings/arm/renesas.yaml | 20 +
+ .../devicetree/bindings/arm/rockchip.yaml | 19 +-
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +
+ .../devicetree/bindings/arm/sunxi/sunxi-mbus.txt | 1 +
+ .../bindings/clock/amlogic,axg-audio-clkc.txt | 3 +-
+ .../bindings/clock/rockchip,px30-cru.txt | 5 +
+ .../bindings/crypto/allwinner,sun8i-ce.yaml | 88 +
+ .../bindings/{lpddr2 => ddr}/lpddr2-timings.txt | 0
+ .../devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt | 2 +-
+ .../devicetree/bindings/ddr/lpddr3-timings.txt | 58 +
+ Documentation/devicetree/bindings/ddr/lpddr3.txt | 101 +
+ .../bindings/display/bridge/anx6345.yaml | 102 +
+ .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 16 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 5 +-
+ .../bindings/interrupt-controller/mrvl,intc.txt | 14 +-
+ .../bindings/memory-controllers/exynos5422-dmc.txt | 84 +
+ .../memory-controllers/nvidia,tegra124-mc.yaml | 152 +
+ .../memory-controllers/nvidia,tegra30-emc.yaml | 336 +
+ .../memory-controllers/nvidia,tegra30-mc.txt | 123 -
+ .../memory-controllers/nvidia,tegra30-mc.yaml | 167 +
+ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 6 +
+ .../devicetree/bindings/phy/phy-mmp3-usb.txt | 13 +
+ .../devicetree/bindings/power/qcom,rpmpd.txt | 1 +
+ .../bindings/power/renesas,rcar-sysc.txt | 2 +
+ .../regulator/nvidia,tegra-regulators-coupling.txt | 65 +
+ .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +-
+ .../bindings/reset/amlogic,meson-reset.yaml | 1 +
+ .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 -
+ .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +
+ .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 -
+ .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +
+ .../devicetree/bindings/reset/renesas,rst.txt | 2 +
+ .../devicetree/bindings/reset/uniphier-reset.txt | 5 +-
+ Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 14 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 +
+ .../devicetree/bindings/soc/rockchip/grf.txt | 18 +-
+ .../bindings/timer/mediatek,mtk-timer.txt | 1 +
+ .../devicetree/bindings/timer/renesas,tmu.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ MAINTAINERS | 25 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/arm-soc-for-next-contents.txt | 225 +
+ arch/arm/boot/dts/Makefile | 19 +-
+ arch/arm/boot/dts/am335x-baltos.dtsi | 12 -
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 22 -
+ arch/arm/boot/dts/am335x-boneblue.dts | 22 -
+ arch/arm/boot/dts/am335x-chiliboard.dts | 18 -
+ arch/arm/boot/dts/am335x-cm-t335.dts | 20 -
+ arch/arm/boot/dts/am335x-evm.dts | 25 -
+ arch/arm/boot/dts/am335x-evmsk.dts | 25 -
+ arch/arm/boot/dts/am335x-guardian.dts | 22 -
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 25 -
+ arch/arm/boot/dts/am335x-lxm.dts | 22 -
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 17 -
+ arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 22 -
+ arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 87 +
+ arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 95 +
+ arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 115 +
+ arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 22 -
+ arch/arm/boot/dts/am335x-pcm-953.dtsi | 25 -
+ arch/arm/boot/dts/am335x-pdu001.dts | 28 -
+ arch/arm/boot/dts/am335x-pepper.dts | 20 -
+ arch/arm/boot/dts/am335x-pocketbeagle.dts | 22 -
+ arch/arm/boot/dts/am335x-regor.dtsi | 21 -
+ arch/arm/boot/dts/am335x-shc.dts | 17 -
+ arch/arm/boot/dts/am335x-sl50.dts | 22 -
+ arch/arm/boot/dts/am335x-wega.dtsi | 26 -
+ arch/arm/boot/dts/am33xx-l4.dtsi | 27 +-
+ arch/arm/boot/dts/am33xx.dtsi | 99 +-
+ arch/arm/boot/dts/am3517.dtsi | 6 +
+ arch/arm/boot/dts/am4372.dtsi | 33 +-
+ arch/arm/boot/dts/am437x-l4.dtsi | 23 -
+ arch/arm/boot/dts/armada-38x.dtsi | 5 +
+ arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 2 +-
+ arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 5 +
+ arch/arm/boot/dts/armada-xp.dtsi | 2 +-
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts | 137 +-
+ .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 66 +-
+ arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 59 +-
+ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 65 +-
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 972 +++
+ arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 58 +-
+ arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 5 +
+ arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 3 +
+ arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 1195 +++
+ arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 4 +
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 7 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 5 +
+ arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 6 +
+ arch/arm/boot/dts/aspeed-g4.dtsi | 4 +-
+ arch/arm/boot/dts/aspeed-g5.dtsi | 26 +-
+ arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 9 +-
+ arch/arm/boot/dts/aspeed-g6.dtsi | 587 +-
+ .../boot/dts/ast2500-facebook-netbmc-common.dtsi | 96 +
+ arch/arm/boot/dts/at91-kizbox2-2.dts | 26 +
+ arch/arm/boot/dts/at91-kizbox2-common.dtsi | 258 +
+ arch/arm/boot/dts/at91-kizbox2.dts | 244 -
+ arch/arm/boot/dts/at91-kizbox3-hs.dts | 309 +
+ arch/arm/boot/dts/at91-kizbox3_common.dtsi | 412 +
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 +
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 +
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 1 +
+ arch/arm/boot/dts/atlas7-evb.dts | 2 +-
+ arch/arm/boot/dts/bcm-hr2.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 123 +
+ arch/arm/boot/dts/bcm2711.dtsi | 844 +++
+ arch/arm/boot/dts/bcm2835-common.dtsi | 194 +
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 -
+ arch/arm/boot/dts/bcm2835.dtsi | 1 +
+ arch/arm/boot/dts/bcm2836.dtsi | 1 +
+ arch/arm/boot/dts/bcm2837.dtsi | 1 +
+ arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 7 +
+ arch/arm/boot/dts/bcm283x.dtsi | 190 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 53 +
+ arch/arm/boot/dts/dove.dtsi | 2 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 16 -
+ arch/arm/boot/dts/dra7.dtsi | 51 +
+ arch/arm/boot/dts/e60k02.dtsi | 306 +
+ arch/arm/boot/dts/emev2.dtsi | 4 +
+ arch/arm/boot/dts/exynos3250.dtsi | 13 +-
+ arch/arm/boot/dts/exynos4.dtsi | 14 +-
+ arch/arm/boot/dts/exynos4210.dtsi | 27 +-
+ arch/arm/boot/dts/exynos4412.dtsi | 25 +-
+ arch/arm/boot/dts/exynos5.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 27 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 41 +-
+ arch/arm/boot/dts/exynos5260.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5410.dtsi | 6 +-
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +
+ arch/arm/boot/dts/exynos5420.dtsi | 90 +-
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 117 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 4 +
+ arch/arm/boot/dts/exynos54xx.dtsi | 46 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +
+ arch/arm/boot/dts/exynos5800.dtsi | 2 +-
+ arch/arm/boot/dts/imx27.dtsi | 2 +-
+ arch/arm/boot/dts/imx31.dtsi | 2 +-
+ arch/arm/boot/dts/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 44 +-
+ arch/arm/boot/dts/imx53-usbarmory.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-apf6dev.dts | 49 +-
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 39 +
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 28 +-
+ arch/arm/boot/dts/imx6dl-yapp4-hydra.dts | 8 +-
+ arch/arm/boot/dts/imx6dl.dtsi | 1 +
+ arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 +
+ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 +
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 +
+ arch/arm/boot/dts/imx6q-apf6dev.dts | 49 +-
+ arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 8 +
+ arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 -
+ arch/arm/boot/dts/imx6q-gw54xx.dts | 19 +-
+ arch/arm/boot/dts/imx6q.dtsi | 3 +
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 57 +-
+ arch/arm/boot/dts/imx6qdl-apf6.dtsi | 200 +-
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 424 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 35 +-
+ arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 19 +-
+ arch/arm/boot/dts/imx6qdl-rex.dtsi | 19 +
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 14 +
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 10 +
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 7 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 324 +
+ arch/arm/boot/dts/imx6sll.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 28 +-
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi | 148 +
+ arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 338 +
+ arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts | 405 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 95 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts | 16 +
+ arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 +
+ arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 418 ++
+ .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 109 +
+ arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 195 +-
+ arch/arm/boot/dts/imx6ul-opos6uldev.dts | 382 +-
+ arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul.dtsi | 3 +-
+ arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 +
+ arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ull-colibri.dtsi | 64 +-
+ arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 +
+ arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 +
+ arch/arm/boot/dts/imx6ull-opos6ul.dtsi | 6 +
+ arch/arm/boot/dts/imx6ull-opos6uldev.dts | 42 +
+ arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 38 +
+ arch/arm/boot/dts/imx7-colibri.dtsi | 30 +-
+ arch/arm/boot/dts/imx7d.dtsi | 6 +-
+ arch/arm/boot/dts/imx7s.dtsi | 2 +-
+ arch/arm/boot/dts/imx7ulp-evk.dts | 2 +
+ arch/arm/boot/dts/imx7ulp.dtsi | 31 +-
+ arch/arm/boot/dts/keystone-clocks.dtsi | 27 +
+ arch/arm/boot/dts/keystone-k2e-clocks.dtsi | 20 +
+ arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 21 +-
+ arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 20 +-
+ arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 20 +-
+ arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +-
+ .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 20 +-
+ arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 14 +
+ arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 1 +
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 5 +
+ arch/arm/boot/dts/mmp3-dell-ariel.dts | 94 +
+ arch/arm/boot/dts/mmp3.dtsi | 527 ++
+ arch/arm/boot/dts/motorola-mapphone-common.dtsi | 786 ++
+ arch/arm/boot/dts/mt6323.dtsi | 27 +
+ arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 8 +
+ arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 8 +
+ arch/arm/boot/dts/omap3-n900.dts | 5 +
+ arch/arm/boot/dts/omap3.dtsi | 25 +
+ arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-droid-bionic-xt875.dts | 9 +
+ arch/arm/boot/dts/omap4-droid4-xt894.dts | 777 +-
+ arch/arm/boot/dts/omap4-l4-abe.dtsi | 4 -
+ arch/arm/boot/dts/omap4-l4.dtsi | 16 +-
+ arch/arm/boot/dts/omap4.dtsi | 28 +-
+ arch/arm/boot/dts/omap5-l4-abe.dtsi | 3 -
+ arch/arm/boot/dts/omap5-l4.dtsi | 30 -
+ arch/arm/boot/dts/omap5.dtsi | 28 +-
+ arch/arm/boot/dts/openbmc-flash-layout-128.dtsi | 32 +
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 12 +
+ arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 22 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 103 +
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 10 +
+ arch/arm/boot/dts/r8a7790-lager.dts | 8 +-
+ arch/arm/boot/dts/r8a7793-gose.dts | 110 +-
+ arch/arm/boot/dts/rda8810pl.dtsi | 48 +
+ arch/arm/boot/dts/rk3036.dtsi | 4 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 8 +-
+ arch/arm/boot/dts/rk3288-tinker.dtsi | 14 +-
+ arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 1 +
+ arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 35 +-
+ arch/arm/boot/dts/rk3288-veyron-jaq.dts | 35 +-
+ arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 +
+ arch/arm/boot/dts/rk3288-veyron-minnie.dts | 35 +-
+ arch/arm/boot/dts/rk3288-veyron-tiger.dts | 35 +-
+ arch/arm/boot/dts/rk3288.dtsi | 7 +-
+ arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +
+ arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 +
+ arch/arm/boot/dts/sama5d2.dtsi | 2 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts | 2 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 3 +-
+ arch/arm/boot/dts/stm32746g-eval.dts | 3 +-
+ arch/arm/boot/dts/stm32f429-disco.dts | 2 +-
+ arch/arm/boot/dts/stm32f469-disco.dts | 3 +-
+ arch/arm/boot/dts/stm32f469.dtsi | 1 -
+ arch/arm/boot/dts/stm32f746-disco.dts | 2 +-
+ arch/arm/boot/dts/stm32f769-disco.dts | 2 +-
+ arch/arm/boot/dts/stm32h743i-disco.dts | 2 +-
+ arch/arm/boot/dts/stm32h743i-eval.dts | 2 +-
+ arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 28 +
+ arch/arm/boot/dts/stm32mp157a-avenger96.dts | 8 +-
+ arch/arm/boot/dts/stm32mp157a-dk1.dts | 77 +-
+ arch/arm/boot/dts/stm32mp157c-dk2.dts | 21 +-
+ arch/arm/boot/dts/stm32mp157c-ed1.dts | 41 +-
+ arch/arm/boot/dts/stm32mp157c-ev1.dts | 3 -
+ arch/arm/boot/dts/stm32mp157c.dtsi | 23 +
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi | 1 -
+ arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 16 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 9 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 174 +
+ arch/arm/boot/dts/sun8i-h3.dtsi | 22 +
+ arch/arm/boot/dts/sun8i-r40.dtsi | 9 +
+ arch/arm/boot/dts/sun9i-a80.dtsi | 11 +
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 14 +
+ arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 7917 ++++++++++++++++----
+ arch/arm/boot/dts/tegra124-venice2.dts | 3 +
+ arch/arm/boot/dts/tegra124.dtsi | 3 +-
+ arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 201 +
+ arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 302 +
+ arch/arm/boot/dts/tegra20-paz00.dts | 41 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 11 +
+ arch/arm/boot/dts/tegra20.dtsi | 2 +
+ arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 22 +-
+ arch/arm/boot/dts/tegra30-apalis.dtsi | 22 +-
+ arch/arm/boot/dts/tegra30-cardhu-a04.dts | 48 +
+ arch/arm/boot/dts/tegra30-colibri.dtsi | 22 +-
+ arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 801 ++
+ arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 1202 +++
+ arch/arm/boot/dts/tegra30.dtsi | 14 +
+ arch/arm/boot/dts/vf-colibri.dtsi | 12 +-
+ arch/arm/boot/dts/vf500-colibri.dtsi | 2 +-
+ arch/arm/boot/dts/vf610-bk4.dts | 4 +
+ arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 12 -
+ arch/arm/configs/aspeed_g4_defconfig | 18 +-
+ arch/arm/configs/aspeed_g5_defconfig | 4 +
+ arch/arm/configs/at91_dt_defconfig | 1 +
+ arch/arm/configs/exynos_defconfig | 2 +
+ arch/arm/configs/imx_v6_v7_defconfig | 4 +-
+ arch/arm/configs/keystone_defconfig | 1 +
+ arch/arm/configs/multi_v5_defconfig | 4 +
+ arch/arm/configs/multi_v7_defconfig | 45 +-
+ arch/arm/configs/omap2plus_defconfig | 10 +-
+ arch/arm/configs/qcom_defconfig | 1 +
+ arch/arm/configs/sama5_defconfig | 1 +
+ arch/arm/configs/shmobile_defconfig | 3 -
+ arch/arm/configs/sunxi_defconfig | 3 +
+ arch/arm/configs/tegra_defconfig | 2 +
+ arch/arm/include/asm/hardware/cache-l2x0.h | 2 +
+ arch/arm/mach-bcm/Kconfig | 4 +-
+ arch/arm/mach-bcm/Makefile | 3 +-
+ arch/arm/mach-bcm/bcm2711.c | 24 +
+ arch/arm/mach-bcm/bcm_kona_smc.c | 2 +-
+ arch/arm/mach-bcm/platsmp.c | 2 +
+ arch/arm/mach-exynos/Kconfig | 1 +
+ arch/arm/mach-hisi/Kconfig | 16 +-
+ arch/arm/mach-imx/anatop.c | 20 +-
+ arch/arm/mach-imx/cpu.c | 38 +-
+ arch/arm/mach-imx/hotplug.c | 24 +-
+ arch/arm/mach-mmp/Kconfig | 22 +-
+ arch/arm/mach-mmp/Makefile | 4 +
+ arch/arm/mach-mmp/addr-map.h | 7 +
+ arch/arm/mach-mmp/common.c | 19 +-
+ arch/arm/mach-mmp/common.h | 1 +
+ arch/arm/mach-mmp/devices.c | 2 +-
+ arch/arm/mach-mmp/mmp-dt.c | 5 +-
+ arch/arm/mach-mmp/mmp2-dt.c | 7 +-
+ arch/arm/mach-mmp/mmp2.c | 2 +-
+ arch/arm/mach-mmp/mmp3.c | 29 +
+ arch/arm/mach-mmp/platsmp.c | 32 +
+ arch/arm/mach-mmp/pm-mmp2.c | 2 +-
+ arch/arm/mach-mmp/pm-pxa910.c | 2 +-
+ arch/arm/mach-mmp/pxa168.c | 2 +-
+ arch/arm/mach-mmp/pxa910.c | 2 +-
+ arch/arm/mach-mmp/regs-usb.h | 94 -
+ arch/arm/mach-mmp/time.c | 43 +-
+ arch/arm/mach-omap1/Kconfig | 33 +-
+ arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/Makefile | 5 +
+ arch/arm/mach-omap2/clockdomain.c | 78 +-
+ arch/arm/mach-omap2/control.c | 4 +-
+ arch/arm/mach-omap2/control.h | 1 +
+ arch/arm/mach-omap2/display.c | 1 +
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 -
+ arch/arm/mach-omap2/omap_device.c | 19 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 97 -
+ arch/arm/mach-omap2/omap_hwmod.h | 3 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 9 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 32 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 231 -
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 58 -
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 48 -
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 347 +-
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 317 -
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 433 +-
+ arch/arm/mach-omap2/omap_twl.c | 8 +-
+ arch/arm/mach-omap2/opp4xxx_data.c | 16 +-
+ arch/arm/mach-omap2/pdata-quirks.c | 52 -
+ arch/arm/mach-omap2/pm.c | 1 +
+ arch/arm/mach-omap2/pm.h | 14 +
+ arch/arm/mach-omap2/pm44xx.c | 13 +-
+ arch/arm/mach-omap2/pmic-cpcap.c | 271 +
+ arch/arm/mach-omap2/prm44xx.c | 4 +-
+ arch/arm/mach-omap2/vc.c | 57 +-
+ arch/arm/mach-omap2/vc.h | 2 +-
+ arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
+ arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
+ arch/arm/mach-s3c24xx/spi-core.h | 2 +-
+ arch/arm/mach-s3c64xx/setup-usb-phy.c | 4 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 -
+ arch/arm/mach-tegra/reset-handler.S | 6 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 4 +-
+ arch/arm/mm/Kconfig | 2 +-
+ arch/arm/plat-samsung/devs.c | 4 +-
+ arch/arm/plat-samsung/include/plat/usb-phy.h | 4 +-
+ arch/arm64/Kconfig.platforms | 11 +-
+ arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 62 +
+ arch/arm64/boot/dts/actions/s900.dtsi | 45 +
+ .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 29 +
+ .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 25 +
+ .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 45 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 +
+ .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 13 +
+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 9 +
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 6 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 33 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 6 +
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 6 +
+ .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 4 +
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 66 +-
+ .../boot/dts/altera/socfpga_stratix10_socdk.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/Makefile | 2 +
+ arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts | 30 +
+ arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 130 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +-
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 455 +-
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 392 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 3 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 3 +
+ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 33 +-
+ .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 25 +
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +-
+ .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 25 +
+ .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 557 ++
+ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 26 +-
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 3 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 +
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 +
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 73 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 +
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 3 +
+ .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 3 +
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 7 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 +
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 6 +
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 +
+ arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 6 +-
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 7 +
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 25 +
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 208 +
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 344 +
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 27 +
+ arch/arm64/boot/dts/broadcom/Makefile | 3 +-
+ arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 2 +
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 168 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 28 +-
+ arch/arm64/boot/dts/freescale/Makefile | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 -
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 83 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 1 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 110 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 151 +-
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 15 +-
+ arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 231 +-
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 30 +
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 249 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 40 +-
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 65 +-
+ .../dts/freescale/imx8mq-hummingboard-pulse.dts | 2 +
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +
+ arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 2 +
+ arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 4 +
+ arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 2 +
+ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 40 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 17 +-
+ arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 4 +
+ .../boot/dts/freescale/imx8qxp-colibri-eval-v3.dts | 15 +
+ .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 62 +
+ arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 598 ++
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 8 +
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 13 +-
+ arch/arm64/boot/dts/freescale/s32v234-evb.dts | 25 +
+ arch/arm64/boot/dts/freescale/s32v234.dtsi | 139 +
+ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 38 +
+ arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 32 +
+ arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 58 +
+ arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +-
+ arch/arm64/boot/dts/lg/lg1313.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/Makefile | 3 +
+ .../dts/marvell/armada-3720-espressobin-emmc.dts | 42 +
+ .../marvell/armada-3720-espressobin-v7-emmc.dts | 59 +
+ .../dts/marvell/armada-3720-espressobin-v7.dts | 36 +
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 184 +-
+ .../boot/dts/marvell/armada-3720-espressobin.dtsi | 177 +
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 8 +
+ arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 28 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +-
+ arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 56 +-
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 23 +
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 42 +
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 456 +-
+ arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 93 +
+ arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 29 +
+ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 444 ++
+ arch/arm64/boot/dts/marvell/armada-common.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 575 +-
+ arch/arm64/boot/dts/marvell/armada-cp115.dtsi | 12 +
+ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 568 ++
+ arch/arm64/boot/dts/marvell/cn9130-db.dts | 403 +
+ arch/arm64/boot/dts/marvell/cn9130.dtsi | 37 +
+ arch/arm64/boot/dts/marvell/cn9131-db.dts | 202 +
+ arch/arm64/boot/dts/marvell/cn9132-db.dts | 221 +
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 +
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 12 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 36 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 33 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 171 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 7 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 35 +
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 25 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 +
+ .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 55 +
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 80 +
+ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 +
+ arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 54 +
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 82 +
+ arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 84 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 41 +
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 53 +-
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 12 +
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 12 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 14 +
+ arch/arm64/boot/dts/realtek/Makefile | 5 +
+ arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 30 +
+ arch/arm64/boot/dts/realtek/rtd1293.dtsi | 51 +
+ arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 3 +-
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +-
+ arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 30 +
+ arch/arm64/boot/dts/realtek/rtd1296.dtsi | 65 +
+ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 50 +-
+ arch/arm64/boot/dts/renesas/Makefile | 6 +
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 28 +-
+ arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 51 +-
+ .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 4 +
+ .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 11 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 13 +-
+ .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 15 +
+ .../boot/dts/renesas/r8a774b1-hihope-rzg2n.dts | 41 +
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2627 +++++++
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 20 +-
+ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 73 +
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 65 +-
+ .../boot/dts/renesas/r8a77961-salvator-xs.dts | 31 +
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 723 ++
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 35 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 5 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 22 +
+ .../renesas/rzg2-advantech-idk-1110wr-panel.dtsi | 41 +
+ arch/arm64/boot/dts/rockchip/Makefile | 4 +
+ arch/arm64/boot/dts/rockchip/px30-evb.dts | 321 +-
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 157 +-
+ arch/arm64/boot/dts/rockchip/rk3308-evb.dts | 230 +
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 188 +
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1739 +++++
+ arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 359 +
+ arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 32 +
+ arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 10 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 10 +
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 14 +-
+ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 5 +
+ .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 72 +
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 670 +-
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 767 ++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 18 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 28 +
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 +
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 108 +
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 59 +
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 162 +
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 218 +
+ arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 29 +
+ arch/arm64/configs/defconfig | 16 +-
+ drivers/base/power/wakeup.c | 54 +
+ drivers/bus/Kconfig | 5 +-
+ drivers/bus/hisi_lpc.c | 9 +-
+ drivers/bus/ti-sysc.c | 87 +-
+ drivers/clk/Kconfig | 5 +
+ drivers/clk/mmp/Makefile | 2 +-
+ drivers/clk/tegra/Makefile | 2 +
+ drivers/clk/tegra/clk-tegra20-emc.c | 293 +
+ drivers/clk/tegra/clk-tegra20.c | 55 +-
+ drivers/clk/tegra/clk-tegra30.c | 38 +-
+ drivers/clk/tegra/clk.h | 3 +
+ drivers/firmware/arm_scmi/perf.c | 2 +-
+ drivers/firmware/imx/imx-dsp.c | 2 +-
+ drivers/firmware/imx/imx-scu-irq.c | 1 +
+ drivers/firmware/imx/imx-scu.c | 24 +-
+ drivers/firmware/meson/meson_sm.c | 110 +-
+ drivers/firmware/tegra/bpmp.c | 2 +-
+ drivers/firmware/xilinx/zynqmp.c | 8 +-
+ drivers/memory/atmel-ebi.c | 11 +-
+ drivers/memory/brcmstb_dpfe.c | 164 +-
+ drivers/memory/emif.c | 5 +-
+ drivers/memory/jedec_ddr.h | 61 +
+ drivers/memory/of_memory.c | 149 +
+ drivers/memory/of_memory.h | 18 +
+ drivers/memory/samsung/Kconfig | 13 +
+ drivers/memory/samsung/Makefile | 1 +
+ drivers/memory/samsung/exynos5422-dmc.c | 1550 ++++
+ drivers/memory/tegra/Kconfig | 10 +
+ drivers/memory/tegra/Makefile | 1 +
+ drivers/memory/tegra/mc.c | 52 +-
+ drivers/memory/tegra/mc.h | 74 +-
+ drivers/memory/tegra/tegra114.c | 10 +-
+ drivers/memory/tegra/tegra124.c | 30 +-
+ drivers/memory/tegra/tegra20-emc.c | 134 +-
+ drivers/memory/tegra/tegra30-emc.c | 1232 +++
+ drivers/memory/tegra/tegra30.c | 34 +-
+ drivers/nvmem/meson-efuse.c | 24 +-
+ drivers/opp/core.c | 69 +
+ drivers/phy/marvell/Kconfig | 11 +
+ drivers/phy/marvell/Makefile | 1 +
+ drivers/phy/marvell/phy-mmp3-usb.c | 291 +
+ drivers/reset/Kconfig | 5 +-
+ drivers/reset/core.c | 8 +-
+ drivers/reset/hisilicon/reset-hi3660.c | 2 +-
+ drivers/reset/reset-meson-audio-arb.c | 43 +-
+ drivers/reset/reset-meson.c | 35 +-
+ drivers/reset/reset-uniphier-glue.c | 4 +
+ drivers/reset/reset-zynqmp.c | 2 +-
+ drivers/soc/amlogic/meson-gx-socinfo.c | 3 +
+ drivers/soc/atmel/Kconfig | 11 +
+ drivers/soc/atmel/Makefile | 1 +
+ drivers/soc/atmel/sfr.c | 99 +
+ drivers/soc/fsl/Kconfig | 10 +
+ drivers/soc/fsl/Makefile | 1 +
+ drivers/soc/fsl/rcpm.c | 151 +
+ drivers/soc/imx/soc-imx-scu.c | 34 +-
+ drivers/soc/imx/soc-imx8.c | 49 +-
+ drivers/soc/mediatek/mtk-scpsys.c | 214 +-
+ drivers/soc/qcom/Kconfig | 14 +-
+ drivers/soc/qcom/Makefile | 3 +-
+ drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} | 130 +-
+ drivers/soc/qcom/llcc-sdm845.c | 100 -
+ drivers/soc/qcom/qcom_aoss.c | 8 +-
+ drivers/soc/qcom/rpmpd.c | 23 +
+ drivers/soc/qcom/smd-rpm.c | 18 +-
+ drivers/soc/qcom/socinfo.c | 2 +
+ drivers/soc/renesas/Kconfig | 32 +-
+ drivers/soc/renesas/Makefile | 4 +-
+ drivers/soc/renesas/r8a7743-sysc.c | 1 -
+ drivers/soc/renesas/r8a7745-sysc.c | 1 -
+ drivers/soc/renesas/r8a77470-sysc.c | 1 -
+ drivers/soc/renesas/r8a774a1-sysc.c | 1 -
+ drivers/soc/renesas/r8a774b1-sysc.c | 37 +
+ drivers/soc/renesas/r8a774c0-sysc.c | 4 +-
+ drivers/soc/renesas/r8a7779-sysc.c | 1 -
+ drivers/soc/renesas/r8a7790-sysc.c | 1 -
+ drivers/soc/renesas/r8a7791-sysc.c | 1 -
+ drivers/soc/renesas/r8a7792-sysc.c | 1 -
+ drivers/soc/renesas/r8a7794-sysc.c | 1 -
+ drivers/soc/renesas/r8a7795-sysc.c | 33 +-
+ drivers/soc/renesas/r8a7796-sysc.c | 30 +-
+ drivers/soc/renesas/r8a77965-sysc.c | 4 +-
+ drivers/soc/renesas/r8a77970-sysc.c | 4 +-
+ drivers/soc/renesas/r8a77980-sysc.c | 4 +-
+ drivers/soc/renesas/r8a77990-sysc.c | 4 +-
+ drivers/soc/renesas/r8a77995-sysc.c | 1 -
+ drivers/soc/renesas/rcar-rst.c | 2 +
+ drivers/soc/renesas/rcar-sysc.c | 26 +-
+ drivers/soc/renesas/rcar-sysc.h | 9 +-
+ drivers/soc/renesas/renesas-soc.c | 15 +-
+ drivers/soc/samsung/Kconfig | 10 +
+ drivers/soc/samsung/Makefile | 3 +
+ drivers/soc/samsung/exynos-asv.c | 177 +
+ drivers/soc/samsung/exynos-asv.h | 71 +
+ drivers/soc/samsung/exynos-chipid.c | 12 +-
+ drivers/soc/samsung/exynos5422-asv.c | 505 ++
+ drivers/soc/samsung/exynos5422-asv.h | 31 +
+ drivers/soc/tegra/Kconfig | 10 +
+ drivers/soc/tegra/Makefile | 2 +
+ drivers/soc/tegra/flowctrl.c | 19 +-
+ drivers/soc/tegra/fuse/fuse-tegra.c | 198 +-
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 154 +
+ drivers/soc/tegra/fuse/fuse.h | 8 +
+ drivers/soc/tegra/pmc.c | 232 +-
+ drivers/soc/tegra/regulators-tegra20.c | 365 +
+ drivers/soc/tegra/regulators-tegra30.c | 317 +
+ drivers/soc/ti/Makefile | 1 +
+ drivers/soc/ti/omap_prm.c | 391 +
+ drivers/soc/xilinx/zynqmp_pm_domains.c | 10 +-
+ include/dt-bindings/clock/aspeed-clock.h | 2 +
+ include/dt-bindings/clock/ast2600-clock.h | 4 +
+ include/dt-bindings/clock/axg-audio-clkc.h | 10 +
+ include/dt-bindings/clock/r8a774b1-cpg-mssr.h | 57 +
+ include/dt-bindings/clock/r8a77961-cpg-mssr.h | 65 +
+ include/dt-bindings/clock/tegra124-car-common.h | 3 +-
+ include/dt-bindings/clock/tegra210-car.h | 3 +-
+ include/dt-bindings/pinctrl/rockchip.h | 8 +-
+ include/dt-bindings/power/qcom-rpmpd.h | 9 +
+ include/dt-bindings/power/r8a774b1-sysc.h | 26 +
+ include/dt-bindings/power/r8a77961-sysc.h | 32 +
+ include/dt-bindings/reset/amlogic,meson-a1-reset.h | 74 +
+ .../reset/amlogic,meson-axg-audio-arb.h | 2 +
+ .../reset/amlogic,meson-g12a-audio-reset.h | 15 +
+ include/dt-bindings/reset/realtek,rtd1295.h | 111 +
+ include/linux/clk/tegra.h | 11 +
+ include/linux/firmware/meson/meson_sm.h | 15 +-
+ include/linux/firmware/xlnx-zynqmp.h | 3 +-
+ include/linux/logic_pio.h | 4 +-
+ include/linux/mfd/syscon/atmel-matrix.h | 1 -
+ include/linux/platform_data/ti-prm.h | 21 +
+ include/linux/pm_opp.h | 13 +
+ include/linux/pm_wakeup.h | 9 +
+ include/linux/reset-controller.h | 3 +-
+ include/linux/reset.h | 46 +
+ .../mach-mmp => include/linux/soc/mmp}/cputype.h | 29 +
+ include/linux/soc/qcom/llcc-qcom.h | 94 +-
+ include/soc/tegra/mc.h | 2 +-
+ lib/Makefile | 2 +-
+ lib/logic_pio.c | 14 +-
+ 731 files changed, 46997 insertions(+), 12004 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
+ rename Documentation/devicetree/bindings/arm/marvell/{ap806-system-controller.txt => ap80x-system-controller.txt} (91%)
+ delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/mrvl/mrvl.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/omap/prm-inst.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/renesas,prr.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/renesas,prr.yaml
+ create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml
+ rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2-timings.txt (100%)
+ rename Documentation/devicetree/bindings/{lpddr2 => ddr}/lpddr2.txt (96%)
+ create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3-timings.txt
+ create mode 100644 Documentation/devicetree/bindings/ddr/lpddr3.txt
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/anx6345.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos5422-dmc.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-emc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-mmp3-usb.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/nvidia,tegra-regulators-coupling.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
+ create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
+ create mode 100644 arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
+ create mode 100644 arch/arm/boot/dts/ast2500-facebook-netbmc-common.dtsi
+ create mode 100644 arch/arm/boot/dts/at91-kizbox2-2.dts
+ create mode 100644 arch/arm/boot/dts/at91-kizbox2-common.dtsi
+ delete mode 100644 arch/arm/boot/dts/at91-kizbox2.dts
+ create mode 100644 arch/arm/boot/dts/at91-kizbox3-hs.dts
+ create mode 100644 arch/arm/boot/dts/at91-kizbox3_common.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+ create mode 100644 arch/arm/boot/dts/bcm2711.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm2835-common.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+ create mode 100644 arch/arm/boot/dts/e60k02.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6sll-kobo-clarahd.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6ul.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-opos6ul.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-opos6uldev.dts
+ create mode 100644 arch/arm/boot/dts/mmp3-dell-ariel.dts
+ create mode 100644 arch/arm/boot/dts/mmp3.dtsi
+ create mode 100644 arch/arm/boot/dts/motorola-mapphone-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap4-droid-bionic-xt875.dts
+ create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-128.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts
+ create mode 100644 arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi
+ create mode 100644 arch/arm/boot/dts/tegra20-cpu-opp.dtsi
+ create mode 100644 arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi
+ create mode 100644 arch/arm/boot/dts/tegra30-cpu-opp.dtsi
+ create mode 100644 arch/arm/mach-bcm/bcm2711.c
+ create mode 100644 arch/arm/mach-mmp/mmp3.c
+ create mode 100644 arch/arm/mach-mmp/platsmp.c
+ create mode 100644 arch/arm/mach-omap2/pmic-cpcap.c
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-evk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/s32v234-evb.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/s32v234.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-cp115.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/cn9130.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1293.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1296-ds418.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1296.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77961.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2-advantech-idk-1110wr-panel.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-evb.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3308.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-a1.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+ create mode 100644 drivers/clk/tegra/clk-tegra20-emc.c
+ create mode 100644 drivers/memory/samsung/exynos5422-dmc.c
+ create mode 100644 drivers/memory/tegra/tegra30-emc.c
+ create mode 100644 drivers/phy/marvell/phy-mmp3-usb.c
+ create mode 100644 drivers/soc/atmel/sfr.c
+ create mode 100644 drivers/soc/fsl/rcpm.c
+ rename drivers/soc/qcom/{llcc-slice.c => llcc-qcom.c} (68%)
+ delete mode 100644 drivers/soc/qcom/llcc-sdm845.c
+ create mode 100644 drivers/soc/renesas/r8a774b1-sysc.c
+ create mode 100644 drivers/soc/samsung/exynos-asv.c
+ create mode 100644 drivers/soc/samsung/exynos-asv.h
+ create mode 100644 drivers/soc/samsung/exynos5422-asv.c
+ create mode 100644 drivers/soc/samsung/exynos5422-asv.h
+ create mode 100644 drivers/soc/tegra/regulators-tegra20.c
+ create mode 100644 drivers/soc/tegra/regulators-tegra30.c
+ create mode 100644 drivers/soc/ti/omap_prm.c
+ create mode 100644 include/dt-bindings/clock/r8a774b1-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r8a77961-cpg-mssr.h
+ create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h
+ create mode 100644 include/dt-bindings/power/r8a77961-sysc.h
+ create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h
+ create mode 100644 include/dt-bindings/reset/realtek,rtd1295.h
+ create mode 100644 include/linux/platform_data/ti-prm.h
+ rename {arch/arm/mach-mmp => include/linux/soc/mmp}/cputype.h (70%)
+Merging amlogic/for-next (1e1693ee7764 Merge branch 'v5.5/fixes' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/meson8.dtsi | 2 +-
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 26 ++++++++++++++++++++--
+ 3 files changed, 29 insertions(+), 3 deletions(-)
+Merging aspeed/for-next (2aee80727dca Merge branch 'defconfig-for-v5.5' into for-next)
+$ git merge aspeed/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (571c4b1fe42b Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next)
+$ git merge at91/at91-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next)
+$ git merge bcm2835/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (71918b15d58f Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging drivers/clk/imx/clk-imx8mn.c
+Auto-merging drivers/clk/imx/clk-imx8mm.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx7ulp-clock.txt | 1 -
+ drivers/clk/imx/clk-imx6sll.c | 8 +-
+ drivers/clk/imx/clk-imx6sx.c | 12 +-
+ drivers/clk/imx/clk-imx6ul.c | 8 +-
+ drivers/clk/imx/clk-imx7d.c | 4 +-
+ drivers/clk/imx/clk-imx7ulp.c | 9 +-
+ drivers/clk/imx/clk-imx8mm.c | 150 +++++++-------------
+ drivers/clk/imx/clk-imx8mn.c | 152 +++++++--------------
+ drivers/clk/imx/clk-imx8mq.c | 77 +++++++----
+ drivers/clk/imx/clk-pll14xx.c | 72 +++++-----
+ drivers/clk/imx/clk.h | 3 +
+ include/dt-bindings/clock/imx7ulp-clock.h | 1 +
+ include/dt-bindings/clock/imx8mm-clock.h | 19 ++-
+ include/dt-bindings/clock/imx8mn-clock.h | 19 ++-
+ include/dt-bindings/clock/imx8mq-clock.h | 24 +++-
+ 15 files changed, 268 insertions(+), 291 deletions(-)
+Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
+$ git merge mediatek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (3aa22be2d6b1 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 (369f4ddb51bb Merge branch 'omap-for-v5.5/dt-v2' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +-
+ arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 2 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 2 +-
+ .../arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 1 -
+ arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 13 ++++++++++++-
+ arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 ++--
+ arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
+ arch/arm/mach-omap2/timer.c | 4 ++--
+ drivers/bus/ti-sysc.c | 21 ++++++++++++++++-----
+ include/linux/platform_data/ti-sysc.h | 1 +
+ 10 files changed, 37 insertions(+), 15 deletions(-)
+Merging qcom/for-next (6a363f34a300 Merge remote-tracking branches 'origin/arm64-defconfig-for-5.5', 'origin/arm64-for-5.5', 'origin/defconfig-for-5.5', 'origin/drivers-for-5.5' and 'origin/dts-for-5.5' into for-next)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
+Resolved 'arch/arm64/configs/defconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ead3c9e1ea83] Merge remote-tracking branch 'qcom/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/configs/defconfig | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+Merging realtek/for-next (6a41c7019bca Merge branch 'v5.5/dt64' into next)
+$ git merge realtek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (9c45f53abb97 Merge branches 'renesas-arm-defconfig-for-v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'renesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-next)
+$ git merge renesas/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging reset/reset/next (b3f1d036f26d reset: npcm: add NPCM reset controller driver)
+$ git merge reset/reset/next
+Merge made by the 'recursive' strategy.
+ .../bindings/reset/nuvoton,npcm-reset.txt | 32 +++
+ drivers/reset/Kconfig | 7 +
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-npcm.c | 291 +++++++++++++++++++++
+ include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++
+ 5 files changed, 422 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt
+ create mode 100644 drivers/reset/reset-npcm.c
+ create mode 100644 include/dt-bindings/reset/nuvoton,npcm7xx-reset.h
+Merging rockchip/for-next (f0d0e0810786 Merge branch 'v5.5-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/rockchip/px30-evb.dts | 6 ++
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 71 ++++++++++++++++++++--
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 28 +--------
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +++++++-
+ .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 2 +
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 62 ++++++++++++++++---
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 14 +++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 ++++
+ drivers/clk/rockchip/clk-half-divider.c | 3 +-
+ drivers/clk/rockchip/clk-px30.c | 70 ++++++++++++++++-----
+ include/dt-bindings/clock/px30-cru.h | 2 +
+ 12 files changed, 240 insertions(+), 58 deletions(-)
+Merging samsung-krzk/for-next (6780daf48588 Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos3250.dtsi | 4 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 +--
+ arch/arm/boot/dts/exynos4210.dtsi | 4 +-
+ arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 5 +++
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 29 ++++++++++++++
+ arch/arm/boot/dts/exynos4412-n710x.dts | 5 +++
+ arch/arm/boot/dts/exynos4412.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5420.dtsi | 50 +++++++++++++++++++++++++
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 6 ++-
+ arch/arm/boot/dts/exynos54xx.dtsi | 4 +-
+ 11 files changed, 107 insertions(+), 14 deletions(-)
+Merging scmi/for-linux-next (af42d3466bdc Linux 5.4-rc8)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (2ddd531f8c80 Merge branches 'sunxi/clk-for-5.5' and 'sunxi/dt-for-5.5' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 23 ++++++++++++++++-------
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 4 ----
+ include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +-
+ 3 files changed, 17 insertions(+), 12 deletions(-)
+Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/clk.c | 18 +++
+ drivers/clk/tegra/clk-dfll.c | 56 +++++++++
+ drivers/clk/tegra/clk-dfll.h | 2 +
+ drivers/clk/tegra/clk-divider.c | 11 ++
+ drivers/clk/tegra/clk-id.h | 4 +-
+ drivers/clk/tegra/clk-periph.c | 21 ++++
+ drivers/clk/tegra/clk-pll-out.c | 9 ++
+ drivers/clk/tegra/clk-pll.c | 86 +++++++++-----
+ drivers/clk/tegra/clk-sdmmc-mux.c | 16 +++
+ drivers/clk/tegra/clk-super.c | 41 +++++++
+ drivers/clk/tegra/clk-tegra-fixed.c | 15 +++
+ drivers/clk/tegra/clk-tegra-periph.c | 8 --
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 7 +-
+ drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 1 +
+ drivers/clk/tegra/clk-tegra124.c | 55 ++++++++-
+ drivers/clk/tegra/clk-tegra20.c | 25 ++--
+ drivers/clk/tegra/clk-tegra210.c | 181 ++++++++++++++++++++++++-----
+ drivers/clk/tegra/clk-tegra30.c | 25 ++--
+ drivers/clk/tegra/clk.c | 112 +++++++++++-------
+ drivers/clk/tegra/clk.h | 67 +++++++++++
+ drivers/cpufreq/tegra124-cpufreq.c | 59 ++++++++++
+ drivers/memory/tegra/tegra30-emc.c | 2 +-
+ drivers/soc/tegra/pmc.c | 47 +++++++-
+ include/dt-bindings/clock/tegra210-car.h | 7 +-
+ include/linux/clk-provider.h | 1 +
+ include/linux/clk/tegra.h | 13 +++
+ 26 files changed, 750 insertions(+), 139 deletions(-)
+Merging clk/clk-next (cd89054e321a Merge branch 'clk-init-leak' into clk-next)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/ti/clk-7xx.c
+Removing drivers/clk/renesas/clk-rcar-gen2.c
+Removing Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+Removing Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt
+Removing Documentation/devicetree/bindings/clock/qcom,gcc.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/armada3700-periph-clock.txt | 5 +-
+ .../devicetree/bindings/clock/ingenic,cgu.txt | 1 +
+ .../devicetree/bindings/clock/qcom,gcc.txt | 94 -
+ .../devicetree/bindings/clock/qcom,gcc.yaml | 188 ++
+ .../devicetree/bindings/clock/qcom,q6sstopcc.yaml | 43 +
+ .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 27 -
+ .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 49 +
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 13 +-
+ .../clock/renesas,rcar-gen2-cpg-clocks.txt | 60 -
+ .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 2 +-
+ arch/arm/boot/dts/omap36xx-clocks.dtsi | 4 +
+ arch/arm/boot/dts/omap3xxx-clocks.dtsi | 2 +-
+ drivers/clk/at91/sckc.c | 3 +-
+ drivers/clk/axs10x/i2s_pll_clock.c | 4 +-
+ drivers/clk/axs10x/pll_clock.c | 7 +-
+ drivers/clk/bcm/clk-bcm2835-aux.c | 4 +-
+ drivers/clk/bcm/clk-bcm2835.c | 4 +-
+ drivers/clk/clk-ast2600.c | 49 +-
+ drivers/clk/clk-bd718x7.c | 1 +
+ drivers/clk/clk-gpio.c | 2 +-
+ drivers/clk/clk.c | 9 +-
+ drivers/clk/davinci/pll.c | 4 +-
+ drivers/clk/davinci/psc.c | 4 +-
+ drivers/clk/hisilicon/clk-hi3660.c | 60 +-
+ drivers/clk/hisilicon/clk-hi3670.c | 152 +-
+ drivers/clk/hisilicon/clk-hi6220.c | 3 +-
+ drivers/clk/hisilicon/reset.c | 4 +-
+ drivers/clk/imgtec/clk-boston.c | 3 +-
+ drivers/clk/imx/clk-imx8mn.c | 14 -
+ drivers/clk/ingenic/Kconfig | 10 +
+ drivers/clk/ingenic/Makefile | 1 +
+ drivers/clk/ingenic/tcu.c | 3 +-
+ drivers/clk/ingenic/x1000-cgu.c | 274 +++
+ drivers/clk/mediatek/clk-mt2712.c | 6 +-
+ drivers/clk/mediatek/clk-mt6779.c | 3 +-
+ drivers/clk/mediatek/clk-mt6797.c | 3 +-
+ drivers/clk/mediatek/clk-mt7622.c | 6 +-
+ drivers/clk/mediatek/clk-mt7629.c | 6 +-
+ drivers/clk/mediatek/clk-mt8183.c | 6 +-
+ drivers/clk/meson/axg-audio.c | 2025 ++++++++++------
+ drivers/clk/meson/axg-audio.h | 21 +-
+ drivers/clk/mvebu/ap-cpu-clk.c | 4 +-
+ drivers/clk/mvebu/armada-37xx-periph.c | 6 +-
+ drivers/clk/mvebu/armada-xp.c | 26 -
+ drivers/clk/mvebu/cp110-system-controller.c | 4 +-
+ drivers/clk/pxa/clk-pxa27x.c | 1 +
+ drivers/clk/qcom/Kconfig | 26 +
+ drivers/clk/qcom/Makefile | 3 +
+ drivers/clk/qcom/clk-rcg.h | 2 +-
+ drivers/clk/qcom/clk-rcg2.c | 6 +-
+ drivers/clk/qcom/clk-rpmh.c | 53 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 3 +
+ drivers/clk/qcom/common.c | 5 +-
+ drivers/clk/qcom/gcc-msm8998.c | 72 +
+ drivers/clk/qcom/gcc-sc7180.c | 2450 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-sdm845.c | 96 +-
+ drivers/clk/qcom/gpucc-msm8998.c | 338 +++
+ drivers/clk/qcom/q6sstop-qcs404.c | 223 ++
+ drivers/clk/renesas/Kconfig | 34 +-
+ drivers/clk/renesas/Makefile | 5 +-
+ drivers/clk/renesas/clk-mstp.c | 4 +-
+ drivers/clk/renesas/clk-rcar-gen2.c | 457 ----
+ drivers/clk/renesas/r8a774b1-cpg-mssr.c | 327 +++
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 24 +-
+ drivers/clk/renesas/r8a77965-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/rcar-gen2-cpg.c | 25 +-
+ drivers/clk/renesas/rcar-gen3-cpg.c | 64 +-
+ drivers/clk/renesas/renesas-cpg-mssr.c | 14 +-
+ drivers/clk/renesas/renesas-cpg-mssr.h | 1 +
+ drivers/clk/samsung/clk-exynos5420.c | 34 +-
+ drivers/clk/samsung/clk-s3c2410-dclk.c | 4 +-
+ drivers/clk/samsung/clk.c | 3 +-
+ drivers/clk/sprd/common.c | 6 +-
+ drivers/clk/tegra/clk-emc.c | 12 +-
+ drivers/clk/ti/adpll.c | 11 +-
+ drivers/clk/ti/clk-33xx.c | 4 +-
+ drivers/clk/ti/clk-43xx.c | 4 +-
+ drivers/clk/ti/clk-44xx.c | 4 +-
+ drivers/clk/ti/clk-54xx.c | 11 +-
+ drivers/clk/ti/clk-7xx.c | 8 +-
+ drivers/clk/ti/clkctrl.c | 45 +-
+ drivers/clk/ti/clock.h | 7 +-
+ drivers/clk/ti/divider.c | 282 +--
+ drivers/clk/uniphier/clk-uniphier-core.c | 3 +-
+ include/dt-bindings/clock/omap5.h | 4 +
+ include/dt-bindings/clock/qcom,gcc-msm8998.h | 6 +
+ include/dt-bindings/clock/qcom,gcc-sc7180.h | 155 ++
+ include/dt-bindings/clock/qcom,q6sstopcc-qcs404.h | 18 +
+ include/dt-bindings/clock/x1000-cgu.h | 44 +
+ include/linux/clk/ti.h | 3 +-
+ 90 files changed, 6195 insertions(+), 1927 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,q6sstopcc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+ create mode 100644 drivers/clk/ingenic/x1000-cgu.c
+ create mode 100644 drivers/clk/qcom/gcc-sc7180.c
+ create mode 100644 drivers/clk/qcom/gpucc-msm8998.c
+ create mode 100644 drivers/clk/qcom/q6sstop-qcs404.c
+ delete mode 100644 drivers/clk/renesas/clk-rcar-gen2.c
+ create mode 100644 drivers/clk/renesas/r8a774b1-cpg-mssr.c
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-sc7180.h
+ create mode 100644 include/dt-bindings/clock/qcom,q6sstopcc-qcs404.h
+ create mode 100644 include/dt-bindings/clock/x1000-cgu.h
+Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1)
+$ 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 (044cf5e15357 csky: Initial stack protector support)
+$ git merge csky/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ arch/csky/Kconfig | 1 +
+ arch/csky/include/asm/stackprotector.h | 29 +++++++++++++++++++++++++++++
+ arch/csky/kernel/process.c | 6 ++++++
+ 4 files changed, 37 insertions(+)
+ create mode 100644 arch/csky/include/asm/stackprotector.h
+Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
+$ git merge h8300/h8300-next
+Removing arch/h8300/include/uapi/asm/bitsperlong.h
+Auto-merging arch/h8300/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig | 3 +++
+ arch/h8300/include/uapi/asm/bitsperlong.h | 15 ---------------
+ arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++
+ arch/h8300/lib/memset.S | 17 ++++++++++-------
+ 4 files changed, 26 insertions(+), 22 deletions(-)
+ delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h
+ create mode 100644 arch/h8300/include/uapi/asm/posix_types.h
+Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
+$ git merge ia64/next
+Already up to date.
+Merging m68k/for-next (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/atari/config.c | 27 ++++++++++++++++
+ arch/m68k/configs/amiga_defconfig | 14 ++++-----
+ arch/m68k/configs/apollo_defconfig | 8 ++---
+ arch/m68k/configs/atari_defconfig | 8 ++---
+ arch/m68k/configs/bvme6000_defconfig | 8 ++---
+ arch/m68k/configs/hp300_defconfig | 8 ++---
+ arch/m68k/configs/mac_defconfig | 8 ++---
+ arch/m68k/configs/multi_defconfig | 14 ++++-----
+ arch/m68k/configs/mvme147_defconfig | 8 ++---
+ arch/m68k/configs/mvme16x_defconfig | 8 ++---
+ arch/m68k/configs/q40_defconfig | 8 ++---
+ arch/m68k/configs/sun3_defconfig | 8 ++---
+ arch/m68k/configs/sun3x_defconfig | 8 ++---
+ arch/m68k/q40/config.c | 1 +
+ drivers/ata/pata_falcon.c | 42 ++++++++++++++++---------
+ drivers/ide/falconide.c | 60 ++++++++++++++++++++++++------------
+ drivers/nubus/nubus.c | 2 +-
+ 17 files changed, 131 insertions(+), 109 deletions(-)
+Merging m68knommu/for-next (3ad3cbe305b5 m68k/coldfire: Use CONFIG_PREEMPTION)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/entry.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K)
+$ git merge microblaze/next
+Auto-merging arch/microblaze/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Kconfig | 1 +
+ arch/microblaze/configs/mmu_defconfig | 3 +++
+ arch/microblaze/include/asm/irq.h | 1 -
+ arch/microblaze/kernel/entry.S | 5 -----
+ arch/microblaze/kernel/head.S | 2 +-
+ arch/microblaze/kernel/vmlinux.lds.S | 2 +-
+ 6 files changed, 6 insertions(+), 8 deletions(-)
+Merging mips/mips-next (b02efeb05699 MIPS: Ingenic: Disable abandoned HPTLB function.)
+$ git merge mips/mips-next
+Auto-merging arch/mips/sgi-ip27/ip27-memory.c
+Auto-merging arch/mips/sgi-ip27/ip27-init.c
+CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-init.c
+Removing arch/mips/loongson64/loongson-3/Makefile
+Removing arch/mips/loongson64/common/serial.c
+Removing arch/mips/loongson64/common/mem.c
+Removing arch/mips/loongson64/common/early_printk.c
+Removing arch/mips/loongson64/common/cmdline.c
+Removing arch/mips/include/asm/sgi/sgi.h
+Removing arch/mips/include/asm/pmon.h
+Removing arch/mips/include/asm/mach-loongson32/prom.h
+Removing arch/mips/fw/arc/tree.c
+Removing arch/mips/fw/arc/time.c
+Removing arch/mips/fw/arc/salone.c
+Auto-merging arch/mips/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Resolved 'arch/mips/sgi-ip27/ip27-init.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ba129aca30e7] Merge remote-tracking branch 'mips/mips-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mips/ralink.txt | 14 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/driver-api/nvmem.rst | 2 +
+ MAINTAINERS | 10 +-
+ arch/mips/Kbuild.platforms | 2 +
+ arch/mips/Kconfig | 185 ++++---
+ arch/mips/Kconfig.debug | 3 -
+ arch/mips/Makefile | 3 +
+ arch/mips/Makefile.postlink | 10 +-
+ arch/mips/boot/dts/ingenic/ci20.dts | 214 ++++++++
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 86 ++++
+ .../dts/ralink/gardena_smart_gateway_mt7688.dts | 197 +++++++
+ arch/mips/boot/dts/ralink/mt7628a.dtsi | 16 +
+ arch/mips/cavium-octeon/setup.c | 2 +-
+ arch/mips/configs/fuloong2e_defconfig | 2 +-
+ arch/mips/configs/lemote2f_defconfig | 2 +-
+ arch/mips/configs/loongson3_defconfig | 2 -
+ arch/mips/fw/arc/Makefile | 6 +-
+ arch/mips/fw/arc/cmdline.c | 16 +-
+ arch/mips/fw/arc/env.c | 6 -
+ arch/mips/fw/arc/file.c | 49 --
+ arch/mips/fw/arc/identify.c | 15 +-
+ arch/mips/fw/arc/init.c | 20 +-
+ arch/mips/fw/arc/memory.c | 9 +
+ arch/mips/fw/arc/misc.c | 59 ---
+ arch/mips/fw/arc/promlib.c | 25 +-
+ arch/mips/fw/arc/salone.c | 25 -
+ arch/mips/fw/arc/time.c | 25 -
+ arch/mips/fw/arc/tree.c | 127 -----
+ arch/mips/generic/init.c | 6 +-
+ arch/mips/include/asm/atomic.h | 571 +++++++--------------
+ arch/mips/include/asm/barrier.h | 228 ++------
+ arch/mips/include/asm/bitops.h | 443 +++++-----------
+ arch/mips/include/asm/bootinfo.h | 4 +-
+ arch/mips/include/asm/bugs.h | 18 +-
+ arch/mips/include/asm/cmpxchg.h | 59 ++-
+ arch/mips/include/asm/cop2.h | 2 +-
+ arch/mips/include/asm/cpu-type.h | 11 +-
+ arch/mips/include/asm/cpu.h | 10 +-
+ arch/mips/include/asm/fixmap.h | 2 +-
+ arch/mips/include/asm/futex.h | 15 +-
+ arch/mips/include/asm/hazards.h | 2 +-
+ arch/mips/include/asm/io.h | 2 +-
+ arch/mips/include/asm/irqflags.h | 2 +-
+ arch/mips/include/asm/llsc.h | 19 +-
+ arch/mips/include/asm/mach-ip22/spaces.h | 12 +-
+ arch/mips/include/asm/mach-ip27/mmzone.h | 2 +-
+ arch/mips/include/asm/mach-ip27/topology.h | 5 +-
+ .../include/asm/mach-ip30/cpu-feature-overrides.h | 83 +++
+ arch/mips/include/asm/mach-ip30/irq.h | 87 ++++
+ .../mips/include/asm/mach-ip30/kernel-entry-init.h | 13 +
+ arch/mips/include/asm/mach-ip30/mangle-port.h | 22 +
+ arch/mips/include/asm/mach-ip30/spaces.h | 20 +
+ arch/mips/include/asm/mach-ip30/war.h | 26 +
+ .../asm/mach-loongson2ef/cpu-feature-overrides.h | 44 ++
+ .../cs5536/cs5536.h | 0
+ .../cs5536/cs5536_mfgpt.h | 0
+ .../cs5536/cs5536_pci.h | 0
+ .../cs5536/cs5536_vsm.h | 0
+ arch/mips/include/asm/mach-loongson2ef/loongson.h | 326 ++++++++++++
+ .../machine.h | 12 +-
+ .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ++
+ .../{mach-loongson64 => mach-loongson2ef}/mem.h | 6 +-
+ arch/mips/include/asm/mach-loongson2ef/pci.h | 46 ++
+ arch/mips/include/asm/mach-loongson2ef/spaces.h | 10 +
+ arch/mips/include/asm/mach-loongson32/prom.h | 20 -
+ .../asm/mach-loongson64/cpu-feature-overrides.h | 3 -
+ arch/mips/include/asm/mach-loongson64/irq.h | 4 -
+ .../asm/mach-loongson64/kernel-entry-init.h | 32 +-
+ arch/mips/include/asm/mach-loongson64/loongson.h | 115 -----
+ .../include/asm/mach-loongson64/loongson_regs.h | 227 ++++++++
+ arch/mips/include/asm/mach-loongson64/mmzone.h | 29 +-
+ arch/mips/include/asm/mach-loongson64/pci.h | 31 --
+ arch/mips/include/asm/mach-loongson64/topology.h | 4 +-
+ arch/mips/include/asm/mipsregs.h | 6 +
+ arch/mips/include/asm/module.h | 12 +-
+ arch/mips/include/asm/pci/bridge.h | 1 +
+ arch/mips/include/asm/pgalloc.h | 4 +-
+ arch/mips/include/asm/pgtable-32.h | 6 +-
+ arch/mips/include/asm/pgtable-64.h | 44 +-
+ arch/mips/include/asm/pgtable.h | 11 -
+ arch/mips/include/asm/pmon.h | 46 --
+ arch/mips/include/asm/processor.h | 2 +-
+ arch/mips/include/asm/r4kcache.h | 362 +------------
+ arch/mips/include/asm/sgi/heart.h | 272 ++++++++++
+ arch/mips/include/asm/sgi/sgi.h | 48 --
+ arch/mips/include/asm/sgialib.h | 22 +-
+ arch/mips/include/asm/sgiarcs.h | 103 ++--
+ arch/mips/include/asm/sn/agent.h | 2 +-
+ arch/mips/include/asm/sn/arch.h | 31 --
+ arch/mips/include/asm/sn/gda.h | 4 +-
+ arch/mips/include/asm/sn/hub.h | 4 +-
+ arch/mips/include/asm/sn/ioc3.h | 9 +
+ arch/mips/include/asm/sn/mapped_kernel.h | 4 +-
+ arch/mips/include/asm/sn/sn0/arch.h | 18 +-
+ arch/mips/include/asm/sn/sn_private.h | 5 +-
+ arch/mips/include/asm/sn/types.h | 4 -
+ arch/mips/include/asm/string.h | 121 -----
+ arch/mips/include/asm/sync.h | 207 ++++++++
+ arch/mips/include/asm/unroll.h | 77 +++
+ arch/mips/kernel/Makefile | 2 +-
+ arch/mips/kernel/cpu-probe.c | 53 +-
+ arch/mips/kernel/genex.S | 8 +-
+ arch/mips/kernel/idle.c | 7 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 6 +-
+ arch/mips/kernel/pm-cps.c | 20 +-
+ arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} | 11 +-
+ arch/mips/kernel/setup.c | 137 +++--
+ arch/mips/kernel/smp-bmips.c | 1 -
+ arch/mips/kernel/syscall.c | 3 +-
+ arch/mips/kernel/traps.c | 4 +-
+ arch/mips/kvm/mmu.c | 40 +-
+ arch/mips/kvm/trap_emul.c | 4 +-
+ arch/mips/lib/bitops.c | 57 +-
+ arch/mips/lib/csum_partial.S | 4 +-
+ arch/mips/loongson2ef/Kconfig | 95 ++++
+ arch/mips/loongson2ef/Makefile | 18 +
+ arch/mips/loongson2ef/Platform | 32 ++
+ .../{loongson64 => loongson2ef}/common/Makefile | 3 +-
+ .../common/bonito-irq.c | 0
+ .../common/cs5536/Makefile | 0
+ .../common/cs5536/cs5536_acc.c | 0
+ .../common/cs5536/cs5536_ehci.c | 0
+ .../common/cs5536/cs5536_ide.c | 0
+ .../common/cs5536/cs5536_isa.c | 0
+ .../common/cs5536/cs5536_mfgpt.c | 0
+ .../common/cs5536/cs5536_ohci.c | 0
+ .../common/cs5536/cs5536_pci.c | 0
+ arch/mips/loongson2ef/common/env.c | 53 ++
+ .../mips/{loongson64 => loongson2ef}/common/init.c | 10 +-
+ arch/mips/{loongson64 => loongson2ef}/common/irq.c | 0
+ .../{loongson64 => loongson2ef}/common/machtype.c | 1 -
+ arch/mips/loongson2ef/common/mem.c | 62 +++
+ arch/mips/{loongson64 => loongson2ef}/common/pci.c | 8 -
+ .../{loongson64 => loongson2ef}/common/platform.c | 0
+ arch/mips/{loongson64 => loongson2ef}/common/pm.c | 9 +-
+ .../{loongson64 => loongson2ef}/common/reset.c | 21 -
+ arch/mips/{loongson64 => loongson2ef}/common/rtc.c | 0
+ arch/mips/loongson2ef/common/serial.c | 86 ++++
+ .../{loongson64 => loongson2ef}/common/setup.c | 21 -
+ .../mips/{loongson64 => loongson2ef}/common/time.c | 4 -
+ .../{loongson64 => loongson2ef}/common/uart_base.c | 19 +-
+ .../fuloong-2e/Makefile | 0
+ .../{loongson64 => loongson2ef}/fuloong-2e/dma.c | 0
+ .../{loongson64 => loongson2ef}/fuloong-2e/irq.c | 0
+ .../{loongson64 => loongson2ef}/fuloong-2e/reset.c | 0
+ .../{loongson64 => loongson2ef}/lemote-2f/Makefile | 0
+ .../{loongson64 => loongson2ef}/lemote-2f/clock.c | 6 +-
+ .../{loongson64 => loongson2ef}/lemote-2f/dma.c | 0
+ .../lemote-2f/ec_kb3310b.c | 0
+ .../lemote-2f/ec_kb3310b.h | 0
+ .../{loongson64 => loongson2ef}/lemote-2f/irq.c | 0
+ .../lemote-2f/machtype.c | 0
+ .../{loongson64 => loongson2ef}/lemote-2f/pm.c | 0
+ .../{loongson64 => loongson2ef}/lemote-2f/reset.c | 2 +-
+ arch/mips/loongson32/Kconfig | 2 +-
+ arch/mips/loongson32/Platform | 4 +-
+ arch/mips/loongson32/common/prom.c | 59 +--
+ arch/mips/loongson32/common/setup.c | 11 +-
+ arch/mips/loongson64/Kconfig | 119 +----
+ arch/mips/loongson64/Makefile | 29 +-
+ arch/mips/loongson64/Platform | 35 +-
+ arch/mips/loongson64/{loongson-3 => }/acpi_init.c | 0
+ arch/mips/loongson64/common/cmdline.c | 44 --
+ arch/mips/loongson64/common/early_printk.c | 38 --
+ arch/mips/loongson64/common/mem.c | 157 ------
+ arch/mips/loongson64/common/serial.c | 117 -----
+ arch/mips/loongson64/{loongson-3 => }/cop2-ex.c | 0
+ arch/mips/loongson64/{loongson-3 => }/dma.c | 0
+ arch/mips/loongson64/{common => }/env.c | 62 +--
+ arch/mips/loongson64/{loongson-3 => }/hpet.c | 0
+ arch/mips/loongson64/init.c | 46 ++
+ arch/mips/loongson64/{loongson-3 => }/irq.c | 8 +-
+ arch/mips/loongson64/loongson-3/Makefile | 11 -
+ arch/mips/loongson64/{loongson-3 => }/numa.c | 11 +-
+ arch/mips/loongson64/pci.c | 51 ++
+ arch/mips/loongson64/{loongson-3 => }/platform.c | 0
+ arch/mips/loongson64/pm.c | 104 ++++
+ arch/mips/loongson64/reset.c | 64 +++
+ arch/mips/loongson64/rtc.c | 39 ++
+ arch/mips/loongson64/setup.c | 30 ++
+ arch/mips/loongson64/{loongson-3 => }/smp.c | 160 ++++--
+ arch/mips/loongson64/{loongson-3 => }/smp.h | 0
+ arch/mips/loongson64/time.c | 29 ++
+ arch/mips/math-emu/me-debugfs.c | 3 +-
+ arch/mips/mm/c-r3k.c | 4 +-
+ arch/mips/mm/c-r4k.c | 51 +-
+ arch/mips/mm/c-tx39.c | 4 +-
+ arch/mips/mm/fault.c | 12 +-
+ arch/mips/mm/hugetlbpage.c | 14 +-
+ arch/mips/mm/init.c | 6 +-
+ arch/mips/mm/ioremap.c | 6 +-
+ arch/mips/mm/page.c | 2 +-
+ arch/mips/mm/pgtable-32.c | 6 +-
+ arch/mips/mm/tlb-r4k.c | 8 +-
+ arch/mips/mm/tlbex.c | 6 +-
+ arch/mips/oprofile/Makefile | 4 +-
+ arch/mips/oprofile/common.c | 6 +-
+ arch/mips/oprofile/op_model_mipsxx.c | 2 +-
+ arch/mips/pci/Makefile | 2 +-
+ arch/mips/pci/pci-ip27.c | 13 -
+ arch/mips/pci/pci-xtalk-bridge.c | 156 +++++-
+ arch/mips/power/cpu.c | 8 +-
+ arch/mips/sgi-ip22/ip22-mc.c | 74 +--
+ arch/mips/sgi-ip27/ip27-common.h | 10 +
+ arch/mips/sgi-ip27/ip27-hubio.c | 10 +-
+ arch/mips/sgi-ip27/ip27-init.c | 53 +-
+ arch/mips/sgi-ip27/ip27-irq.c | 8 +-
+ arch/mips/sgi-ip27/ip27-klconfig.c | 14 +-
+ arch/mips/sgi-ip27/ip27-klnuma.c | 21 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 73 +--
+ arch/mips/sgi-ip27/ip27-nmi.c | 16 +-
+ arch/mips/sgi-ip27/ip27-reset.c | 8 +-
+ arch/mips/sgi-ip27/ip27-smp.c | 82 +--
+ arch/mips/sgi-ip27/ip27-timer.c | 6 +-
+ arch/mips/sgi-ip27/ip27-xtalk.c | 48 +-
+ arch/mips/sgi-ip30/Makefile | 9 +
+ arch/mips/sgi-ip30/Platform | 8 +
+ arch/mips/sgi-ip30/ip30-common.h | 9 +
+ arch/mips/sgi-ip30/ip30-console.c | 23 +
+ arch/mips/sgi-ip30/ip30-irq.c | 328 ++++++++++++
+ arch/mips/sgi-ip30/ip30-power.c | 41 ++
+ arch/mips/sgi-ip30/ip30-setup.c | 138 +++++
+ arch/mips/sgi-ip30/ip30-smp.c | 149 ++++++
+ arch/mips/sgi-ip30/ip30-timer.c | 63 +++
+ arch/mips/sgi-ip30/ip30-xtalk.c | 152 ++++++
+ arch/mips/tools/.gitignore | 1 +
+ arch/mips/tools/Makefile | 5 +
+ arch/mips/tools/loongson3-llsc-check.c | 307 +++++++++++
+ arch/mips/vdso/Makefile | 1 +
+ drivers/cpufreq/loongson2_cpufreq.c | 2 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-loongson.c | 2 +-
+ drivers/nvmem/core.c | 61 +--
+ drivers/platform/mips/Kconfig | 4 +-
+ drivers/platform/mips/cpu_hwmon.c | 17 +-
+ include/drm/drm_cache.h | 2 +-
+ include/linux/nvmem-consumer.h | 9 +
+ 238 files changed, 5626 insertions(+), 3648 deletions(-)
+ create mode 100644 arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts
+ delete mode 100644 arch/mips/fw/arc/salone.c
+ delete mode 100644 arch/mips/fw/arc/time.c
+ delete mode 100644 arch/mips/fw/arc/tree.c
+ create mode 100644 arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
+ create mode 100644 arch/mips/include/asm/mach-ip30/irq.h
+ create mode 100644 arch/mips/include/asm/mach-ip30/kernel-entry-init.h
+ create mode 100644 arch/mips/include/asm/mach-ip30/mangle-port.h
+ create mode 100644 arch/mips/include/asm/mach-ip30/spaces.h
+ create mode 100644 arch/mips/include/asm/mach-ip30/war.h
+ create mode 100644 arch/mips/include/asm/mach-loongson2ef/cpu-feature-overrides.h
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536.h (100%)
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_mfgpt.h (100%)
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_pci.h (100%)
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/cs5536/cs5536_vsm.h (100%)
+ create mode 100644 arch/mips/include/asm/mach-loongson2ef/loongson.h
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/machine.h (60%)
+ create mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h
+ rename arch/mips/include/asm/{mach-loongson64 => mach-loongson2ef}/mem.h (86%)
+ create mode 100644 arch/mips/include/asm/mach-loongson2ef/pci.h
+ create mode 100644 arch/mips/include/asm/mach-loongson2ef/spaces.h
+ delete mode 100644 arch/mips/include/asm/mach-loongson32/prom.h
+ create mode 100644 arch/mips/include/asm/mach-loongson64/loongson_regs.h
+ delete mode 100644 arch/mips/include/asm/pmon.h
+ create mode 100644 arch/mips/include/asm/sgi/heart.h
+ delete mode 100644 arch/mips/include/asm/sgi/sgi.h
+ create mode 100644 arch/mips/include/asm/sync.h
+ create mode 100644 arch/mips/include/asm/unroll.h
+ rename arch/mips/kernel/{cpu-bugs64.c => r4k-bugs64.c} (97%)
+ create mode 100644 arch/mips/loongson2ef/Kconfig
+ create mode 100644 arch/mips/loongson2ef/Makefile
+ create mode 100644 arch/mips/loongson2ef/Platform
+ rename arch/mips/{loongson64 => loongson2ef}/common/Makefile (80%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/bonito-irq.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/Makefile (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_acc.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ehci.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ide.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_isa.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_mfgpt.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_ohci.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/cs5536/cs5536_pci.c (100%)
+ create mode 100644 arch/mips/loongson2ef/common/env.c
+ rename arch/mips/{loongson64 => loongson2ef}/common/init.c (90%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/irq.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/machtype.c (96%)
+ create mode 100644 arch/mips/loongson2ef/common/mem.c
+ rename arch/mips/{loongson64 => loongson2ef}/common/pci.c (90%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/platform.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/pm.c (93%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/reset.c (79%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/rtc.c (100%)
+ create mode 100644 arch/mips/loongson2ef/common/serial.c
+ rename arch/mips/{loongson64 => loongson2ef}/common/setup.c (57%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/time.c (91%)
+ rename arch/mips/{loongson64 => loongson2ef}/common/uart_base.c (56%)
+ rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/Makefile (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/dma.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/irq.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/fuloong-2e/reset.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/Makefile (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/clock.c (96%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/dma.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/ec_kb3310b.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/ec_kb3310b.h (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/irq.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/machtype.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/pm.c (100%)
+ rename arch/mips/{loongson64 => loongson2ef}/lemote-2f/reset.c (98%)
+ rename arch/mips/loongson64/{loongson-3 => }/acpi_init.c (100%)
+ delete mode 100644 arch/mips/loongson64/common/cmdline.c
+ delete mode 100644 arch/mips/loongson64/common/early_printk.c
+ delete mode 100644 arch/mips/loongson64/common/mem.c
+ delete mode 100644 arch/mips/loongson64/common/serial.c
+ rename arch/mips/loongson64/{loongson-3 => }/cop2-ex.c (100%)
+ rename arch/mips/loongson64/{loongson-3 => }/dma.c (100%)
+ rename arch/mips/loongson64/{common => }/env.c (79%)
+ rename arch/mips/loongson64/{loongson-3 => }/hpet.c (100%)
+ create mode 100644 arch/mips/loongson64/init.c
+ rename arch/mips/loongson64/{loongson-3 => }/irq.c (96%)
+ delete mode 100644 arch/mips/loongson64/loongson-3/Makefile
+ rename arch/mips/loongson64/{loongson-3 => }/numa.c (96%)
+ create mode 100644 arch/mips/loongson64/pci.c
+ rename arch/mips/loongson64/{loongson-3 => }/platform.c (100%)
+ create mode 100644 arch/mips/loongson64/pm.c
+ create mode 100644 arch/mips/loongson64/reset.c
+ create mode 100644 arch/mips/loongson64/rtc.c
+ create mode 100644 arch/mips/loongson64/setup.c
+ rename arch/mips/loongson64/{loongson-3 => }/smp.c (92%)
+ rename arch/mips/loongson64/{loongson-3 => }/smp.h (100%)
+ create mode 100644 arch/mips/loongson64/time.c
+ create mode 100644 arch/mips/sgi-ip27/ip27-common.h
+ create mode 100644 arch/mips/sgi-ip30/Makefile
+ create mode 100644 arch/mips/sgi-ip30/Platform
+ create mode 100644 arch/mips/sgi-ip30/ip30-common.h
+ create mode 100644 arch/mips/sgi-ip30/ip30-console.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-irq.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-power.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-setup.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-smp.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-timer.c
+ create mode 100644 arch/mips/sgi-ip30/ip30-xtalk.c
+ create mode 100644 arch/mips/tools/loongson3-llsc-check.c
+Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer)
+$ git merge nds32/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ arch/nds32/Kconfig.cpu | 8 ++++----
+ arch/nds32/boot/dts/Makefile | 2 --
+ arch/nds32/kernel/perf_event_cpu.c | 2 +-
+ 4 files changed, 6 insertions(+), 7 deletions(-)
+Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation)
+$ git merge openrisc/for-next
+Merge made by the 'recursive' strategy.
+ arch/openrisc/Kconfig | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+Merging parisc-hd/for-next (e9c837c6ab07 parisc: Avoid spurious inequivalent alias kernel error messages)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/checksum.h | 101 +++++++++++++++++++------------------
+ arch/parisc/kernel/cache.c | 2 +-
+ kernel/kexec_file.c | 4 +-
+ 3 files changed, 55 insertions(+), 52 deletions(-)
+Merging powerpc/next (bf9c95e23324 selftests/powerpc: spectre_v2 test must be built 64-bit)
+$ git merge powerpc/next
+Auto-merging security/lockdown/lockdown.c
+Auto-merging include/linux/security.h
+Removing arch/powerpc/sysdev/simple_gpio.h
+Removing arch/powerpc/sysdev/simple_gpio.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/include/asm/page.h
+Removing arch/powerpc/include/asm/dma-mapping.h
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy | 4 +
+ Documentation/ABI/testing/sysfs-secvar | 46 ++
+ .../devicetree/bindings/board/fsl-board.txt | 30 -
+ Documentation/powerpc/index.rst | 1 +
+ Documentation/powerpc/kaslr-booke32.rst | 42 ++
+ arch/powerpc/Kbuild | 1 +
+ arch/powerpc/Kconfig | 54 +-
+ arch/powerpc/Makefile | 12 +-
+ arch/powerpc/boot/dts/fsl/kmcent2.dts | 52 +-
+ arch/powerpc/configs/40x/acadia_defconfig | 3 -
+ arch/powerpc/configs/40x/ep405_defconfig | 3 -
+ arch/powerpc/configs/40x/kilauea_defconfig | 3 -
+ arch/powerpc/configs/40x/makalu_defconfig | 3 -
+ arch/powerpc/configs/40x/obs600_defconfig | 3 -
+ arch/powerpc/configs/40x/walnut_defconfig | 3 -
+ arch/powerpc/configs/44x/akebono_defconfig | 3 -
+ arch/powerpc/configs/44x/arches_defconfig | 3 -
+ arch/powerpc/configs/44x/bamboo_defconfig | 3 -
+ arch/powerpc/configs/44x/canyonlands_defconfig | 3 -
+ arch/powerpc/configs/44x/currituck_defconfig | 3 -
+ arch/powerpc/configs/44x/ebony_defconfig | 3 -
+ arch/powerpc/configs/44x/eiger_defconfig | 3 -
+ arch/powerpc/configs/44x/fsp2_defconfig | 3 -
+ arch/powerpc/configs/44x/icon_defconfig | 3 -
+ arch/powerpc/configs/44x/iss476-smp_defconfig | 3 -
+ arch/powerpc/configs/44x/katmai_defconfig | 3 -
+ arch/powerpc/configs/44x/rainier_defconfig | 3 -
+ arch/powerpc/configs/44x/redwood_defconfig | 3 -
+ arch/powerpc/configs/44x/sam440ep_defconfig | 3 -
+ arch/powerpc/configs/44x/sequoia_defconfig | 3 -
+ arch/powerpc/configs/44x/taishan_defconfig | 3 -
+ arch/powerpc/configs/52xx/pcm030_defconfig | 3 -
+ arch/powerpc/configs/83xx/kmeter1_defconfig | 3 -
+ arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 3 -
+ arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 -
+ arch/powerpc/configs/adder875_defconfig | 3 -
+ arch/powerpc/configs/amigaone_defconfig | 3 -
+ arch/powerpc/configs/cell_defconfig | 2 -
+ arch/powerpc/configs/chrp32_defconfig | 3 -
+ ...corenet_basic_defconfig => corenet_base.config} | 0
+ arch/powerpc/configs/debug.config | 1 +
+ arch/powerpc/configs/ep88xc_defconfig | 3 -
+ arch/powerpc/configs/gamecube_defconfig | 3 -
+ arch/powerpc/configs/mpc512x_defconfig | 3 -
+ arch/powerpc/configs/mpc5200_defconfig | 1 -
+ ...mpc85xx_basic_defconfig => mpc85xx_base.config} | 0
+ ...mpc86xx_basic_defconfig => mpc86xx_base.config} | 0
+ arch/powerpc/configs/mpc885_ads_defconfig | 3 -
+ arch/powerpc/configs/pmac32_defconfig | 2 -
+ arch/powerpc/configs/powernv_defconfig | 3 -
+ arch/powerpc/configs/ppc44x_defconfig | 3 -
+ arch/powerpc/configs/ppc6xx_defconfig | 4 -
+ arch/powerpc/configs/ps3_defconfig | 3 -
+ arch/powerpc/configs/skiroot_defconfig | 4 +-
+ arch/powerpc/configs/storcenter_defconfig | 3 -
+ arch/powerpc/configs/tqm8xx_defconfig | 3 -
+ arch/powerpc/configs/wii_defconfig | 3 -
+ arch/powerpc/crypto/crc-vpmsum_test.c | 1 +
+ arch/powerpc/include/asm/Kbuild | 2 +
+ arch/powerpc/include/asm/book3s/64/pgalloc.h | 15 -
+ arch/powerpc/include/asm/book3s/64/tlbflush.h | 16 -
+ arch/powerpc/include/asm/bug.h | 41 +-
+ arch/powerpc/include/asm/cache.h | 55 +-
+ arch/powerpc/include/asm/cacheflush.h | 36 +-
+ arch/powerpc/include/asm/dma-mapping.h | 18 -
+ arch/powerpc/include/asm/fixmap.h | 26 +-
+ arch/powerpc/include/asm/hw_breakpoint.h | 9 +-
+ arch/powerpc/include/asm/hw_irq.h | 57 +-
+ arch/powerpc/include/asm/nohash/32/kup-8xx.h | 1 +
+ arch/powerpc/include/asm/nohash/mmu-book3e.h | 11 +-
+ arch/powerpc/include/asm/opal-api.h | 5 +-
+ arch/powerpc/include/asm/opal.h | 7 +
+ arch/powerpc/include/asm/page.h | 7 +
+ arch/powerpc/include/asm/pgtable.h | 4 -
+ arch/powerpc/include/asm/reg.h | 26 +-
+ arch/powerpc/include/asm/reg_8xx.h | 4 +-
+ arch/powerpc/include/asm/secure_boot.h | 29 +
+ arch/powerpc/include/asm/security_features.h | 8 +-
+ arch/powerpc/include/asm/secvar.h | 35 ++
+ arch/powerpc/include/uapi/asm/spu_info.h | 14 -
+ arch/powerpc/kernel/Makefile | 27 +-
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
+ arch/powerpc/kernel/dawr.c | 6 +-
+ arch/powerpc/kernel/early_32.c | 9 +-
+ arch/powerpc/kernel/eeh_driver.c | 22 +-
+ arch/powerpc/kernel/eeh_sysfs.c | 18 +-
+ arch/powerpc/kernel/exceptions-64e.S | 12 +-
+ arch/powerpc/kernel/exceptions-64s.S | 6 +-
+ arch/powerpc/kernel/fadump.c | 15 +-
+ arch/powerpc/kernel/fsl_booke_entry_mapping.S | 25 +-
+ arch/powerpc/kernel/head_fsl_booke.S | 61 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 119 ++--
+ arch/powerpc/kernel/ima_arch.c | 78 +++
+ arch/powerpc/kernel/misc_32.S | 611 ---------------------
+ arch/powerpc/kernel/misc_64.S | 109 +---
+ arch/powerpc/kernel/process.c | 3 +
+ arch/powerpc/kernel/prom_init.c | 38 +-
+ arch/powerpc/kernel/ptrace.c | 85 ++-
+ arch/powerpc/kernel/secure_boot.c | 50 ++
+ arch/powerpc/kernel/security.c | 49 +-
+ arch/powerpc/kernel/secvar-ops.c | 17 +
+ arch/powerpc/kernel/secvar-sysfs.c | 248 +++++++++
+ arch/powerpc/kernel/setup-common.c | 20 +
+ arch/powerpc/kernel/setup_32.c | 3 +
+ arch/powerpc/kernel/setup_64.c | 29 +-
+ arch/powerpc/kernel/time.c | 2 +-
+ arch/powerpc/kernel/traps.c | 15 +-
+ arch/powerpc/kernel/udbg.c | 14 +-
+ arch/powerpc/kernel/vdso64/cacheflush.S | 4 +-
+ arch/powerpc/kexec/Makefile | 25 +
+ .../{kernel/machine_kexec.c => kexec/core.c} | 1 +
+ .../{kernel/machine_kexec_32.c => kexec/core_32.c} | 0
+ .../{kernel/machine_kexec_64.c => kexec/core_64.c} | 0
+ arch/powerpc/{kernel => kexec}/crash.c | 0
+ .../{kernel/kexec_elf_64.c => kexec/elf_64.c} | 0
+ .../machine_kexec_file_64.c => kexec/file_load.c} | 0
+ arch/powerpc/{kernel/ima_kexec.c => kexec/ima.c} | 0
+ arch/powerpc/kexec/relocate_32.S | 500 +++++++++++++++++
+ arch/powerpc/mm/book3s32/mmu.c | 11 +-
+ arch/powerpc/mm/book3s64/hash_native.c | 38 +-
+ arch/powerpc/mm/book3s64/hash_utils.c | 19 +
+ arch/powerpc/mm/book3s64/pkeys.c | 10 -
+ arch/powerpc/mm/book3s64/radix_tlb.c | 80 +--
+ arch/powerpc/mm/fault.c | 6 +-
+ arch/powerpc/mm/init-common.c | 7 +
+ arch/powerpc/mm/init_32.c | 5 -
+ arch/powerpc/mm/init_64.c | 59 +-
+ arch/powerpc/mm/ioremap_32.c | 1 +
+ arch/powerpc/mm/ioremap_64.c | 2 +
+ arch/powerpc/mm/mem.c | 175 +++++-
+ arch/powerpc/mm/mmu_decl.h | 11 +
+ arch/powerpc/mm/nohash/8xx.c | 52 +-
+ arch/powerpc/mm/nohash/Makefile | 1 +
+ arch/powerpc/mm/nohash/fsl_booke.c | 8 +-
+ arch/powerpc/mm/nohash/kaslr_booke.c | 401 ++++++++++++++
+ arch/powerpc/mm/pgtable_32.c | 5 +-
+ arch/powerpc/perf/callchain.c | 17 +-
+ arch/powerpc/platforms/83xx/misc.c | 11 +
+ arch/powerpc/platforms/83xx/mpc836x_mds.c | 7 -
+ arch/powerpc/platforms/85xx/common.c | 23 -
+ arch/powerpc/platforms/85xx/corenet_generic.c | 2 -
+ arch/powerpc/platforms/85xx/mpc85xx.h | 2 -
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 7 -
+ arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 1 -
+ arch/powerpc/platforms/85xx/twr_p102x.c | 1 -
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 -
+ arch/powerpc/platforms/8xx/cpm1.c | 18 +-
+ arch/powerpc/platforms/8xx/pic.c | 2 +-
+ arch/powerpc/platforms/Kconfig | 10 -
+ arch/powerpc/platforms/cell/spufs/inode.c | 2 -
+ arch/powerpc/platforms/powernv/Makefile | 1 +
+ arch/powerpc/platforms/powernv/opal-call.c | 3 +
+ arch/powerpc/platforms/powernv/opal-powercap.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-psr.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-secvar.c | 140 +++++
+ .../powerpc/platforms/powernv/opal-sensor-groups.c | 2 +-
+ arch/powerpc/platforms/powernv/opal.c | 89 ++-
+ arch/powerpc/platforms/powernv/pci-ioda-tce.c | 10 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 8 +-
+ arch/powerpc/platforms/powernv/pci.c | 17 +
+ arch/powerpc/platforms/pseries/Kconfig | 1 +
+ arch/powerpc/platforms/pseries/cmm.c | 431 +++++++--------
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 244 +++++---
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 6 +-
+ arch/powerpc/platforms/pseries/lpar.c | 18 +-
+ arch/powerpc/platforms/pseries/of_helpers.c | 8 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 5 +-
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 18 +-
+ arch/powerpc/platforms/pseries/pseries_energy.c | 23 +-
+ arch/powerpc/platforms/pseries/ras.c | 2 +-
+ arch/powerpc/sysdev/Makefile | 1 -
+ arch/powerpc/sysdev/simple_gpio.c | 143 -----
+ arch/powerpc/sysdev/simple_gpio.h | 13 -
+ arch/powerpc/sysdev/xive/common.c | 9 +
+ arch/powerpc/tools/relocs_check.sh | 2 +-
+ arch/powerpc/tools/unrel_branch_check.sh | 4 +-
+ arch/powerpc/xmon/xmon.c | 121 +++-
+ certs/blacklist.c | 9 +
+ drivers/macintosh/ans-lcd.c | 3 +-
+ drivers/pci/hotplug/rpaphp_core.c | 127 +++--
+ include/asm-generic/tlb.h | 2 +-
+ include/keys/system_keyring.h | 6 +
+ include/linux/ima.h | 3 +-
+ include/linux/security.h | 2 +
+ include/uapi/linux/magic.h | 1 +
+ security/integrity/Kconfig | 9 +
+ security/integrity/Makefile | 7 +-
+ security/integrity/ima/ima.h | 11 +
+ security/integrity/ima/ima_appraise.c | 33 ++
+ security/integrity/ima/ima_main.c | 70 ++-
+ security/integrity/ima/ima_policy.c | 12 +-
+ security/integrity/integrity.h | 1 +
+ .../integrity/platform_certs/keyring_handler.c | 80 +++
+ .../integrity/platform_certs/keyring_handler.h | 32 ++
+ security/integrity/platform_certs/load_powerpc.c | 96 ++++
+ security/integrity/platform_certs/load_uefi.c | 67 +--
+ security/lockdown/lockdown.c | 2 +
+ tools/testing/selftests/powerpc/include/utils.h | 1 +
+ tools/testing/selftests/powerpc/pmu/ebb/Makefile | 7 +-
+ .../selftests/powerpc/ptrace/perf-hwbreak.c | 119 +++-
+ .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 581 +++++++++++++-------
+ .../selftests/powerpc/ptrace/ptrace-tm-spd-tar.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 4 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-tar.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 4 +-
+ tools/testing/selftests/powerpc/security/Makefile | 5 +-
+ .../selftests/powerpc/security/branch_loops.S | 82 +++
+ .../selftests/powerpc/security/spectre_v2.c | 218 ++++++++
+ tools/testing/selftests/powerpc/signal/sigfuz.c | 2 +-
+ .../selftests/powerpc/tm/tm-signal-sigreturn-nt.c | 4 +
+ tools/testing/selftests/powerpc/utils.c | 20 +
+ 211 files changed, 4531 insertions(+), 2437 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-secvar
+ create mode 100644 Documentation/powerpc/kaslr-booke32.rst
+ rename arch/powerpc/configs/{corenet_basic_defconfig => corenet_base.config} (100%)
+ create mode 100644 arch/powerpc/configs/debug.config
+ rename arch/powerpc/configs/{mpc85xx_basic_defconfig => mpc85xx_base.config} (100%)
+ rename arch/powerpc/configs/{mpc86xx_basic_defconfig => mpc86xx_base.config} (100%)
+ delete mode 100644 arch/powerpc/include/asm/dma-mapping.h
+ create mode 100644 arch/powerpc/include/asm/secure_boot.h
+ create mode 100644 arch/powerpc/include/asm/secvar.h
+ create mode 100644 arch/powerpc/kernel/ima_arch.c
+ create mode 100644 arch/powerpc/kernel/secure_boot.c
+ create mode 100644 arch/powerpc/kernel/secvar-ops.c
+ create mode 100644 arch/powerpc/kernel/secvar-sysfs.c
+ create mode 100644 arch/powerpc/kexec/Makefile
+ rename arch/powerpc/{kernel/machine_kexec.c => kexec/core.c} (99%)
+ rename arch/powerpc/{kernel/machine_kexec_32.c => kexec/core_32.c} (100%)
+ rename arch/powerpc/{kernel/machine_kexec_64.c => kexec/core_64.c} (100%)
+ rename arch/powerpc/{kernel => kexec}/crash.c (100%)
+ rename arch/powerpc/{kernel/kexec_elf_64.c => kexec/elf_64.c} (100%)
+ rename arch/powerpc/{kernel/machine_kexec_file_64.c => kexec/file_load.c} (100%)
+ rename arch/powerpc/{kernel/ima_kexec.c => kexec/ima.c} (100%)
+ create mode 100644 arch/powerpc/kexec/relocate_32.S
+ create mode 100644 arch/powerpc/mm/nohash/kaslr_booke.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-secvar.c
+ delete mode 100644 arch/powerpc/sysdev/simple_gpio.c
+ delete mode 100644 arch/powerpc/sysdev/simple_gpio.h
+ create mode 100644 security/integrity/platform_certs/keyring_handler.c
+ create mode 100644 security/integrity/platform_certs/keyring_handler.h
+ create mode 100644 security/integrity/platform_certs/load_powerpc.c
+ create mode 100644 tools/testing/selftests/powerpc/security/branch_loops.S
+ create mode 100644 tools/testing/selftests/powerpc/security/spectre_v2.c
+Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
+$ git merge fsl/next
+Already up to date.
+Merging soc-fsl/next (3b8db0348c50 soc: fsl: add RCPM driver)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (070389ef0f4b Merge branch 'next/add-nonstable-guidance' into for-next)
+$ git merge risc-v/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/riscv/patch-acceptance.rst | 32 +++++
+ arch/riscv/Kconfig | 50 ++++++--
+ arch/riscv/Kconfig.socs | 16 +--
+ arch/riscv/Makefile | 13 +-
+ arch/riscv/boot/Makefile | 19 ++-
+ arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 7 ++
+ arch/riscv/boot/loader.S | 8 ++
+ arch/riscv/boot/loader.lds.S | 16 +++
+ arch/riscv/configs/defconfig | 24 ++++
+ arch/riscv/configs/nommu_virt_defconfig | 78 ++++++++++++
+ arch/riscv/configs/rv32_defconfig | 24 ++++
+ arch/riscv/include/asm/asm-prototypes.h | 1 +
+ arch/riscv/include/asm/cache.h | 8 ++
+ arch/riscv/include/asm/clint.h | 39 ++++++
+ arch/riscv/include/asm/csr.h | 74 ++++++++++--
+ arch/riscv/include/asm/current.h | 6 +-
+ arch/riscv/include/asm/elf.h | 4 +-
+ arch/riscv/include/asm/fixmap.h | 2 +
+ arch/riscv/include/asm/ftrace.h | 5 +
+ arch/riscv/include/asm/futex.h | 12 +-
+ arch/riscv/include/asm/hwcap.h | 7 +-
+ arch/riscv/include/asm/image.h | 6 +-
+ arch/riscv/include/asm/io.h | 149 +----------------------
+ arch/riscv/include/asm/irqflags.h | 12 +-
+ arch/riscv/include/asm/kprobes.h | 6 +-
+ arch/riscv/include/asm/mmio.h | 168 ++++++++++++++++++++++++++
+ arch/riscv/include/asm/mmiowb.h | 2 +-
+ arch/riscv/include/asm/mmu.h | 3 +
+ arch/riscv/include/asm/page.h | 10 +-
+ arch/riscv/include/asm/pci.h | 6 +-
+ arch/riscv/include/asm/pgalloc.h | 2 +
+ arch/riscv/include/asm/pgtable.h | 94 +++++++-------
+ arch/riscv/include/asm/processor.h | 2 +-
+ arch/riscv/include/asm/ptrace.h | 16 +--
+ arch/riscv/include/asm/sbi.h | 11 +-
+ arch/riscv/include/asm/seccomp.h | 10 ++
+ arch/riscv/include/asm/sparsemem.h | 6 +-
+ arch/riscv/include/asm/spinlock_types.h | 2 +-
+ arch/riscv/include/asm/switch_to.h | 10 +-
+ arch/riscv/include/asm/thread_info.h | 5 +-
+ arch/riscv/include/asm/timex.h | 19 ++-
+ arch/riscv/include/asm/tlbflush.h | 12 +-
+ arch/riscv/include/asm/uaccess.h | 4 +
+ arch/riscv/include/uapi/asm/elf.h | 6 +-
+ arch/riscv/include/uapi/asm/hwcap.h | 6 +-
+ arch/riscv/include/uapi/asm/ucontext.h | 6 +-
+ arch/riscv/kernel/Makefile | 5 +-
+ arch/riscv/kernel/asm-offsets.c | 8 +-
+ arch/riscv/kernel/clint.c | 44 +++++++
+ arch/riscv/kernel/cpu.c | 45 +------
+ arch/riscv/kernel/entry.S | 112 ++++++++++++-----
+ arch/riscv/kernel/fpu.S | 8 +-
+ arch/riscv/kernel/head.S | 112 ++++++++++++++++-
+ arch/riscv/kernel/irq.c | 17 +--
+ arch/riscv/kernel/perf_callchain.c | 2 +-
+ arch/riscv/kernel/process.c | 17 +--
+ arch/riscv/kernel/ptrace.c | 10 ++
+ arch/riscv/kernel/reset.c | 5 +-
+ arch/riscv/kernel/sbi.c | 17 +++
+ arch/riscv/kernel/setup.c | 2 +
+ arch/riscv/kernel/signal.c | 38 ++++--
+ arch/riscv/kernel/smp.c | 16 ++-
+ arch/riscv/kernel/smpboot.c | 4 +
+ arch/riscv/kernel/traps.c | 16 +--
+ arch/riscv/lib/Makefile | 11 +-
+ arch/riscv/lib/uaccess.S | 12 +-
+ arch/riscv/mm/Makefile | 3 +-
+ arch/riscv/mm/cacheflush.c | 26 +++-
+ arch/riscv/mm/context.c | 2 +
+ arch/riscv/mm/extable.c | 4 +-
+ arch/riscv/mm/fault.c | 6 +-
+ arch/riscv/mm/init.c | 60 +++++++--
+ arch/riscv/mm/tlbflush.c | 25 +++-
+ drivers/clocksource/timer-riscv.c | 31 +++--
+ drivers/irqchip/irq-sifive-plic.c | 11 +-
+ drivers/tty/hvc/Kconfig | 2 +-
+ drivers/tty/serial/Kconfig | 2 +-
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +-
+ 78 files changed, 1226 insertions(+), 473 deletions(-)
+ create mode 100644 Documentation/riscv/patch-acceptance.rst
+ create mode 100644 arch/riscv/boot/loader.S
+ create mode 100644 arch/riscv/boot/loader.lds.S
+ create mode 100644 arch/riscv/configs/nommu_virt_defconfig
+ create mode 100644 arch/riscv/include/asm/clint.h
+ create mode 100644 arch/riscv/include/asm/mmio.h
+ create mode 100644 arch/riscv/include/asm/seccomp.h
+ create mode 100644 arch/riscv/kernel/clint.c
+ create mode 100644 arch/riscv/kernel/sbi.c
+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 (6a82e23f45fe s390/cpumf: Adjust registration of s390 PMU device drivers)
+$ git merge s390/features
+Auto-merging arch/s390/kernel/unwind_bc.c
+Auto-merging arch/s390/boot/startup.c
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 28 +++++++---
+ arch/s390/boot/startup.c | 2 +-
+ arch/s390/crypto/sha_common.c | 7 ++-
+ arch/s390/include/asm/alternative.h | 4 +-
+ arch/s390/include/asm/bug.h | 4 +-
+ arch/s390/include/asm/ctl_reg.h | 1 +
+ arch/s390/include/asm/pgalloc.h | 16 +++++-
+ arch/s390/include/asm/pgtable.h | 97 +++++++++++---------------------
+ arch/s390/include/asm/processor.h | 2 +-
+ arch/s390/include/asm/qdio.h | 1 +
+ arch/s390/include/asm/spinlock.h | 2 +-
+ arch/s390/include/asm/stacktrace.h | 2 +-
+ arch/s390/include/asm/timex.h | 17 +++---
+ arch/s390/kernel/dis.c | 13 +++--
+ arch/s390/kernel/early.c | 38 +++++++------
+ arch/s390/kernel/head64.S | 18 +-----
+ arch/s390/kernel/perf_cpum_cf.c | 21 ++++---
+ arch/s390/kernel/perf_cpum_cf_diag.c | 10 ++--
+ arch/s390/kernel/perf_cpum_sf.c | 104 +++++++++++++++++------------------
+ arch/s390/kernel/perf_event.c | 8 ++-
+ arch/s390/kernel/process.c | 36 ++++++------
+ arch/s390/kernel/smp.c | 80 ++++++++++++++++++---------
+ arch/s390/kernel/time.c | 9 ---
+ arch/s390/kernel/unwind_bc.c | 14 +----
+ arch/s390/lib/spinlock.c | 4 +-
+ arch/s390/mm/maccess.c | 12 ++--
+ drivers/s390/cio/Makefile | 4 +-
+ drivers/s390/cio/qdio.h | 26 ++++-----
+ drivers/s390/cio/qdio_main.c | 26 ++++-----
+ drivers/s390/cio/qdio_setup.c | 2 -
+ drivers/s390/cio/qdio_thinint.c | 41 +++++---------
+ drivers/s390/cio/vfio_ccw_cp.h | 1 +
+ drivers/s390/cio/vfio_ccw_fsm.c | 11 ++--
+ drivers/s390/cio/vfio_ccw_private.h | 1 +
+ drivers/s390/cio/vfio_ccw_trace.c | 14 +++++
+ drivers/s390/cio/vfio_ccw_trace.h | 76 ++++++++++++++++++++++---
+ drivers/s390/crypto/pkey_api.c | 26 ++-------
+ drivers/s390/net/qeth_l3.h | 2 -
+ drivers/s390/net/qeth_l3_sys.c | 2 +-
+ 39 files changed, 410 insertions(+), 372 deletions(-)
+ create mode 100644 drivers/s390/cio/vfio_ccw_trace.c
+Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h)
+$ git merge sh/sh-next
+Auto-merging arch/sh/kernel/hw_breakpoint.c
+CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
+CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
+rm 'arch/sh/include/uapi/asm/setup.h'
+rm 'arch/sh/include/uapi/asm/types.h'
+$ git commit --no-edit -v -a
+[master 94b5445355c1] Merge remote-tracking branch 'sh/sh-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/sh/include/asm/bitops-op32.h | 8 +++-----
+ arch/sh/include/asm/cache.h | 2 +-
+ arch/sh/include/uapi/asm/setup.h | 2 --
+ arch/sh/include/uapi/asm/types.h | 2 --
+ arch/sh/kernel/Makefile | 2 --
+ 5 files changed, 4 insertions(+), 12 deletions(-)
+ delete mode 100644 arch/sh/include/uapi/asm/setup.h
+ delete mode 100644 arch/sh/include/uapi/asm/types.h
+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 uml/linux-next (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ())
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (e86e4bdfc0cb Merge branch 'xtensa-5.5' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Removing arch/xtensa/include/asm/user.h
+Removing arch/xtensa/include/asm/hw_irq.h
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ .../features/core/tracehook/arch-support.txt | 2 +-
+ arch/xtensa/Kconfig | 396 ++++++++++++---------
+ arch/xtensa/Kconfig.debug | 7 +
+ arch/xtensa/Makefile | 3 +-
+ arch/xtensa/boot/Makefile | 5 +
+ arch/xtensa/configs/xip_kc705_defconfig | 120 +++++++
+ arch/xtensa/include/asm/Kbuild | 2 +
+ arch/xtensa/include/asm/atomic.h | 124 +++----
+ arch/xtensa/include/asm/bitops.h | 323 +++++------------
+ arch/xtensa/include/asm/cache.h | 6 +
+ arch/xtensa/include/asm/cmpxchg.h | 71 ++--
+ arch/xtensa/include/asm/fixmap.h | 8 +-
+ arch/xtensa/include/asm/futex.h | 10 +-
+ arch/xtensa/include/asm/hw_irq.h | 14 -
+ arch/xtensa/include/asm/initialize_mmu.h | 3 +-
+ arch/xtensa/include/asm/kmem_layout.h | 29 ++
+ arch/xtensa/include/asm/page.h | 11 +
+ arch/xtensa/include/asm/pgtable.h | 4 -
+ arch/xtensa/include/asm/uaccess.h | 16 +-
+ arch/xtensa/include/asm/user.h | 20 --
+ arch/xtensa/include/asm/vectors.h | 44 +--
+ arch/xtensa/kernel/entry.S | 2 +-
+ arch/xtensa/kernel/head.S | 13 +-
+ arch/xtensa/kernel/setup.c | 7 +
+ arch/xtensa/kernel/traps.c | 27 +-
+ arch/xtensa/kernel/vmlinux.lds.S | 58 ++-
+ arch/xtensa/mm/fault.c | 16 +-
+ arch/xtensa/mm/init.c | 4 +-
+ arch/xtensa/mm/kasan_init.c | 12 +-
+ arch/xtensa/mm/mmu.c | 4 +-
+ arch/xtensa/mm/tlb.c | 14 +-
+ 31 files changed, 743 insertions(+), 632 deletions(-)
+ create mode 100644 arch/xtensa/configs/xip_kc705_defconfig
+ delete mode 100644 arch/xtensa/include/asm/hw_irq.h
+ delete mode 100644 arch/xtensa/include/asm/user.h
+Merging fscrypt/master (0eee17e33226 f2fs: add support for IV_INO_LBLK_64 encryption policies)
+$ git merge fscrypt/master
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fscrypt.rst | 68 +++++++++------
+ Documentation/ioctl/ioctl-number.rst | 1 +
+ fs/crypto/bio.c | 29 +------
+ fs/crypto/crypto.c | 124 ++++----------------------
+ fs/crypto/fscrypt_private.h | 25 +++---
+ fs/crypto/keyring.c | 6 +-
+ fs/crypto/keysetup.c | 158 ++++++++++------------------------
+ fs/crypto/keysetup_v1.c | 4 -
+ fs/crypto/policy.c | 41 ++++++++-
+ fs/ext4/ext4.h | 2 +
+ fs/ext4/super.c | 14 +++
+ fs/f2fs/super.c | 26 ++++--
+ include/linux/fscrypt.h | 35 +-------
+ include/uapi/linux/fscrypt.h | 3 +-
+ 14 files changed, 208 insertions(+), 328 deletions(-)
+Merging afs/afs-next (297c6f6378a6 afs: Remove set but not used variable 'ret')
+$ git merge afs/afs-next
+Auto-merging fs/afs/rxrpc.c
+Merge made by the 'recursive' strategy.
+ fs/afs/cmservice.c | 6 +++---
+ fs/afs/dir_edit.c | 12 ++----------
+ fs/afs/file.c | 6 +++---
+ fs/afs/fsclient.c | 16 +++++++---------
+ fs/afs/internal.h | 16 +++++++++++-----
+ fs/afs/rxrpc.c | 12 ++++++------
+ fs/afs/server.c | 3 +--
+ fs/afs/vlclient.c | 6 +++---
+ fs/afs/xattr.c | 16 +++++++++-------
+ fs/afs/yfsclient.c | 11 +++++------
+ 10 files changed, 50 insertions(+), 54 deletions(-)
+Merging btrfs/for-next (897636c94003 Merge branch 'misc-5.5' into for-next-20191119)
+$ git merge btrfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/Kconfig | 2 +
+ fs/btrfs/async-thread.c | 113 +++----
+ fs/btrfs/async-thread.h | 37 +--
+ fs/btrfs/block-group.c | 589 +++++++++++++++++----------------
+ fs/btrfs/block-group.h | 51 +--
+ fs/btrfs/btrfs_inode.h | 3 -
+ fs/btrfs/compression.c | 269 +++++++++++----
+ fs/btrfs/compression.h | 46 +--
+ fs/btrfs/ctree.c | 287 +++++++---------
+ fs/btrfs/ctree.h | 51 +--
+ fs/btrfs/delalloc-space.c | 21 +-
+ fs/btrfs/delayed-inode.c | 18 +-
+ fs/btrfs/dev-replace.c | 2 +-
+ fs/btrfs/dev-replace.h | 2 +-
+ fs/btrfs/disk-io.c | 365 ++++++++++----------
+ fs/btrfs/disk-io.h | 4 +-
+ fs/btrfs/export.c | 4 +-
+ fs/btrfs/extent-io-tree.h | 248 ++++++++++++++
+ fs/btrfs/extent-tree.c | 146 ++++----
+ fs/btrfs/extent_io.c | 120 ++++---
+ fs/btrfs/extent_io.h | 231 +------------
+ fs/btrfs/extent_map.c | 6 +-
+ fs/btrfs/extent_map.h | 11 +-
+ fs/btrfs/file-item.c | 1 -
+ fs/btrfs/file.c | 74 ++---
+ fs/btrfs/free-space-cache.c | 118 +++----
+ fs/btrfs/free-space-cache.h | 39 +--
+ fs/btrfs/free-space-tree.c | 133 ++++----
+ fs/btrfs/free-space-tree.h | 18 +-
+ fs/btrfs/inode.c | 170 ++++++----
+ fs/btrfs/ioctl.c | 49 ++-
+ fs/btrfs/locking.c | 309 ++++++++++++++---
+ fs/btrfs/locking.h | 13 +-
+ fs/btrfs/lzo.c | 53 +--
+ fs/btrfs/misc.h | 11 +
+ fs/btrfs/ordered-data.c | 7 +-
+ fs/btrfs/ordered-data.h | 2 +-
+ fs/btrfs/print-tree.c | 6 +-
+ fs/btrfs/props.c | 6 +-
+ fs/btrfs/qgroup.c | 11 +-
+ fs/btrfs/qgroup.h | 2 +-
+ fs/btrfs/raid56.c | 101 +++---
+ fs/btrfs/reada.c | 19 +-
+ fs/btrfs/relocation.c | 43 ++-
+ fs/btrfs/scrub.c | 100 +++---
+ fs/btrfs/send.c | 45 ++-
+ fs/btrfs/space-info.c | 8 +-
+ fs/btrfs/space-info.h | 3 +-
+ fs/btrfs/super.c | 26 +-
+ fs/btrfs/sysfs.c | 47 ++-
+ fs/btrfs/sysfs.h | 2 +-
+ fs/btrfs/tests/btrfs-tests.c | 11 +-
+ fs/btrfs/tests/btrfs-tests.h | 4 +-
+ fs/btrfs/tests/free-space-tests.c | 15 +-
+ fs/btrfs/tests/free-space-tree-tests.c | 101 +++---
+ fs/btrfs/transaction.c | 98 +++++-
+ fs/btrfs/transaction.h | 5 +-
+ fs/btrfs/tree-checker.c | 211 +++++++++---
+ fs/btrfs/tree-log.c | 136 ++++----
+ fs/btrfs/volumes.c | 494 ++++++++-------------------
+ fs/btrfs/volumes.h | 24 +-
+ fs/btrfs/zlib.c | 52 +--
+ fs/btrfs/zstd.c | 47 +--
+ include/trace/events/btrfs.h | 131 ++++----
+ include/uapi/linux/btrfs.h | 5 +-
+ include/uapi/linux/btrfs_tree.h | 23 +-
+ 66 files changed, 2780 insertions(+), 2619 deletions(-)
+ create mode 100644 fs/btrfs/extent-io-tree.h
+Merging ceph/master (633739b2fedb rbd: silence bogus uninitialized warning in rbd_object_map_update_finish())
+$ git merge ceph/master
+Already up to date.
+Merging cifs/for-next (0966aa813a7f cifs: dump channel info in DebugData)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_debug.c | 43 ++++++-
+ fs/cifs/cifs_spnego.c | 2 +-
+ fs/cifs/cifsacl.c | 2 -
+ fs/cifs/cifsfs.c | 44 +++++--
+ fs/cifs/cifsfs.h | 1 +
+ fs/cifs/cifsglob.h | 90 +++++++++----
+ fs/cifs/cifsproto.h | 8 ++
+ fs/cifs/connect.c | 113 ++++++++++++----
+ fs/cifs/dir.c | 6 +-
+ fs/cifs/file.c | 159 ++++++++++++++++++-----
+ fs/cifs/inode.c | 336 ++++++++++++++++++++++++++++--------------------
+ fs/cifs/misc.c | 17 +--
+ fs/cifs/sess.c | 230 ++++++++++++++++++++++++++++++++-
+ fs/cifs/smb1ops.c | 8 +-
+ fs/cifs/smb2misc.c | 175 +++++++++++++++----------
+ fs/cifs/smb2ops.c | 141 +++++++++++---------
+ fs/cifs/smb2pdu.c | 127 +++++++++++-------
+ fs/cifs/smb2pdu.h | 2 +-
+ fs/cifs/smb2proto.h | 6 +-
+ fs/cifs/smb2transport.c | 163 +++++++++++++++++------
+ fs/cifs/smbdirect.c | 36 +++---
+ fs/cifs/transport.c | 37 ++++--
+ 22 files changed, 1250 insertions(+), 496 deletions(-)
+Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/keystore.c | 2 +-
+ fs/ecryptfs/messaging.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging erofs/dev (3dcb5fa23e16 erofs: remove unnecessary output in erofs_show_options())
+$ git merge erofs/dev
+Merge made by the 'recursive' strategy.
+ fs/erofs/Kconfig | 1 +
+ fs/erofs/decompressor.c | 2 +-
+ fs/erofs/erofs_fs.h | 3 +-
+ fs/erofs/internal.h | 7 +-
+ fs/erofs/super.c | 39 ++++++-
+ fs/erofs/utils.c | 17 ++-
+ fs/erofs/zdata.c | 288 +++++++++++++++++++++---------------------------
+ fs/erofs/zdata.h | 8 +-
+ fs/erofs/zmap.c | 28 ++---
+ 9 files changed, 190 insertions(+), 203 deletions(-)
+Merging ext3/for_next (15d8f21beaae Pull ext2 cleanup and quota stats fixes.)
+$ git merge ext3/for_next
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/ext4/super.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ fs/ext2/balloc.c | 75 +++++-------
+ fs/ext2/ext2.h | 12 ++
+ fs/ext2/inode.c | 7 +-
+ fs/ext2/ioctl.c | 5 +-
+ fs/ext2/super.c | 13 +--
+ fs/ext4/super.c | 2 +-
+ fs/f2fs/super.c | 2 +-
+ fs/notify/fdinfo.c | 2 +-
+ fs/notify/fsnotify.c | 2 -
+ fs/notify/fsnotify.h | 2 +
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/ocfs2/super.c | 4 +-
+ fs/quota/dquot.c | 289 +++++++++++++++++++++++------------------------
+ fs/quota/quota.c | 7 +-
+ fs/quota/quota_v1.c | 1 -
+ fs/reiserfs/file.c | 10 +-
+ fs/reiserfs/inode.c | 12 +-
+ fs/reiserfs/namei.c | 7 +-
+ fs/reiserfs/reiserfs.h | 2 +
+ fs/reiserfs/super.c | 2 +
+ fs/reiserfs/xattr.c | 19 ++--
+ fs/reiserfs/xattr_acl.c | 4 +-
+ include/linux/quota.h | 2 +-
+ include/linux/quotaops.h | 14 ++-
+ 25 files changed, 252 insertions(+), 246 deletions(-)
+Merging ext4/dev (dfdeeb41fb08 Merge branch 'tt/misc' into dev)
+$ git merge ext4/dev
+Auto-merging fs/ocfs2/journal.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/dax.c
+Auto-merging Documentation/filesystems/fscrypt.rst
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fscrypt.rst | 4 +-
+ fs/buffer.c | 48 +-
+ fs/dax.c | 13 +-
+ fs/ext2/inode.c | 2 +-
+ fs/ext4/ext4.h | 22 +-
+ fs/ext4/ext4_jbd2.c | 32 +-
+ fs/ext4/ext4_jbd2.h | 106 +++-
+ fs/ext4/extents.c | 149 ++++--
+ fs/ext4/file.c | 412 ++++++++++++---
+ fs/ext4/fsync.c | 72 ++-
+ fs/ext4/ialloc.c | 7 +-
+ fs/ext4/indirect.c | 125 +++--
+ fs/ext4/inode.c | 926 +++++++++++-----------------------
+ fs/ext4/migrate.c | 103 ++--
+ fs/ext4/namei.c | 50 +-
+ fs/ext4/page-io.c | 167 +++---
+ fs/ext4/readpage.c | 6 +-
+ fs/ext4/resize.c | 46 +-
+ fs/ext4/super.c | 57 +--
+ fs/ext4/xattr.c | 94 ++--
+ fs/gfs2/bmap.c | 3 +-
+ fs/gfs2/file.c | 6 +-
+ fs/iomap/Makefile | 16 +-
+ fs/iomap/apply.c | 25 +-
+ fs/iomap/buffered-io.c | 749 +++++++++++++++++++++++----
+ fs/iomap/direct-io.c | 11 +-
+ fs/iomap/fiemap.c | 4 +-
+ fs/iomap/seek.c | 4 +-
+ fs/iomap/swapfile.c | 3 +-
+ fs/iomap/trace.c | 12 +
+ fs/iomap/trace.h | 88 ++++
+ fs/jbd2/checkpoint.c | 2 +-
+ fs/jbd2/commit.c | 26 +-
+ fs/jbd2/journal.c | 65 ++-
+ fs/jbd2/revoke.c | 6 +
+ fs/jbd2/transaction.c | 400 ++++++++-------
+ fs/ocfs2/alloc.c | 32 +-
+ fs/ocfs2/journal.c | 8 +-
+ fs/ocfs2/suballoc.c | 19 +-
+ fs/xfs/libxfs/xfs_bmap.c | 14 +-
+ fs/xfs/libxfs/xfs_bmap.h | 3 +-
+ fs/xfs/xfs_aops.c | 754 +++++----------------------
+ fs/xfs/xfs_aops.h | 17 -
+ fs/xfs/xfs_file.c | 13 +-
+ fs/xfs/xfs_iomap.c | 51 +-
+ fs/xfs/xfs_iomap.h | 2 +-
+ fs/xfs/xfs_pnfs.c | 2 +-
+ fs/xfs/xfs_reflink.c | 2 +-
+ fs/xfs/xfs_super.c | 11 +-
+ fs/xfs/xfs_trace.h | 65 ---
+ include/linux/iomap.h | 129 +++--
+ include/linux/jbd2.h | 118 +++--
+ include/linux/journal-head.h | 21 +-
+ include/trace/events/ext4.h | 13 +-
+ include/trace/events/jbd2.h | 16 +-
+ 55 files changed, 2776 insertions(+), 2375 deletions(-)
+ create mode 100644 fs/iomap/trace.c
+ create mode 100644 fs/iomap/trace.h
+Merging f2fs/dev (7c15ed5f37a3 f2fs: avoid kernel panic on corruption test)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 2 +-
+ fs/f2fs/data.c | 179 ++++++++++++++++++++++++++++++-------
+ fs/f2fs/f2fs.h | 38 ++++++--
+ fs/f2fs/file.c | 39 ++++++--
+ fs/f2fs/gc.c | 34 ++++++-
+ fs/f2fs/inode.c | 6 +-
+ fs/f2fs/node.c | 1 -
+ fs/f2fs/recovery.c | 2 +-
+ fs/f2fs/segment.c | 32 ++++++-
+ fs/f2fs/segment.h | 2 +
+ fs/f2fs/super.c | 30 ++++++-
+ fs/f2fs/sysfs.c | 2 +
+ fs/f2fs/xattr.c | 14 ++-
+ 13 files changed, 320 insertions(+), 61 deletions(-)
+Merging fsverity/fsverity (73f0ec02d670 docs: fs-verity: mention statx() support)
+$ git merge fsverity/fsverity
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/ext4/inode.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fsverity.rst | 12 ++++++++++--
+ fs/ext4/inode.c | 5 ++++-
+ fs/f2fs/file.c | 5 ++++-
+ include/linux/stat.h | 3 ++-
+ include/uapi/linux/stat.h | 2 +-
+ 5 files changed, 21 insertions(+), 6 deletions(-)
+Merging fuse/for-next (00929447f575 virtiofs: Fix old-style declaration)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/dir.c | 25 ++++++++++++++++++-------
+ fs/fuse/file.c | 2 ++
+ fs/fuse/fuse_i.h | 2 ++
+ fs/fuse/readdir.c | 2 +-
+ fs/fuse/virtio_fs.c | 6 +++---
+ 5 files changed, 26 insertions(+), 11 deletions(-)
+Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
+$ git merge jfs/jfs-next
+Already up to date.
+Merging nfs/linux-next (e8d70b321ecc SUNRPC: Fix another issue with MIC buffer space)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/host.c | 3 +-
+ fs/nfs/callback.h | 4 +-
+ fs/nfs/callback_proc.c | 8 +-
+ fs/nfs/callback_xdr.c | 6 +-
+ fs/nfs/client.c | 11 +
+ fs/nfs/delegation.c | 158 ++++++++++-----
+ fs/nfs/delegation.h | 3 +-
+ fs/nfs/export.c | 1 +
+ fs/nfs/file.c | 2 +-
+ fs/nfs/inode.c | 54 ++---
+ fs/nfs/internal.h | 2 +-
+ fs/nfs/namespace.c | 3 +
+ fs/nfs/nfs2xdr.c | 21 +-
+ fs/nfs/nfs3client.c | 5 +-
+ fs/nfs/nfs3xdr.c | 14 +-
+ fs/nfs/nfs42.h | 15 +-
+ fs/nfs/nfs42proc.c | 201 ++++++++++++++++---
+ fs/nfs/nfs42xdr.c | 190 +++++++++++++++++-
+ fs/nfs/nfs4_fs.h | 21 +-
+ fs/nfs/nfs4client.c | 13 +-
+ fs/nfs/nfs4file.c | 141 ++++++++++++-
+ fs/nfs/nfs4proc.c | 69 ++++---
+ fs/nfs/nfs4state.c | 51 ++++-
+ fs/nfs/nfs4super.c | 4 +-
+ fs/nfs/nfs4trace.h | 175 ++++++++++++++++
+ fs/nfs/nfs4xdr.c | 24 +--
+ fs/nfs/nfstrace.h | 33 +++
+ fs/nfs/pnfs.c | 2 -
+ fs/nfs/super.c | 6 +-
+ fs/nfs/sysfs.c | 3 +-
+ include/linux/nfs4.h | 26 +++
+ include/linux/nfs_fs.h | 4 +-
+ include/linux/nfs_fs_sb.h | 6 +-
+ include/linux/nfs_xdr.h | 31 ++-
+ include/linux/sunrpc/clnt.h | 1 +
+ include/linux/sunrpc/xprt.h | 3 +-
+ include/trace/events/rpcrdma.h | 198 ++++++++++++------
+ include/trace/events/sunrpc.h | 93 +++++++++
+ net/sunrpc/clnt.c | 21 +-
+ net/sunrpc/sched.c | 2 +-
+ net/sunrpc/xdr.c | 11 +-
+ net/sunrpc/xprt.c | 22 +-
+ net/sunrpc/xprtrdma/backchannel.c | 2 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 53 +----
+ net/sunrpc/xprtrdma/rpc_rdma.c | 413 +++++++++++++++++++++++++-------------
+ net/sunrpc/xprtrdma/transport.c | 33 +--
+ net/sunrpc/xprtrdma/verbs.c | 194 ++++++++++--------
+ net/sunrpc/xprtrdma/xprt_rdma.h | 18 +-
+ net/sunrpc/xprtsock.c | 2 +-
+ 49 files changed, 1754 insertions(+), 622 deletions(-)
+Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid())
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (8729aaba7462 SUNRPC: Fix backchannel latency metrics)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging include/trace/events/sunrpc.h
+Auto-merging include/trace/events/rpcrdma.h
+Auto-merging include/linux/sunrpc/xprtsock.h
+Auto-merging include/linux/sunrpc/xprt.h
+Auto-merging include/linux/sunrpc/clnt.h
+Merge made by the 'recursive' strategy.
+ fs/nfsd/Kconfig | 2 +-
+ fs/nfsd/filecache.c | 2 -
+ fs/nfsd/nfs4callback.c | 104 +++++++++++++++++++++++------
+ fs/nfsd/nfs4recover.c | 23 +++----
+ fs/nfsd/nfs4state.c | 19 ++++--
+ fs/nfsd/nfs4xdr.c | 2 -
+ fs/nfsd/nfssvc.c | 3 +-
+ fs/nfsd/state.h | 1 +
+ include/linux/lockd/debug.h | 4 --
+ include/linux/lockd/lockd.h | 4 --
+ include/linux/sunrpc/auth.h | 3 -
+ include/linux/sunrpc/auth_gss.h | 2 -
+ include/linux/sunrpc/clnt.h | 3 -
+ include/linux/sunrpc/gss_api.h | 2 -
+ include/linux/sunrpc/gss_err.h | 3 -
+ include/linux/sunrpc/msg_prot.h | 3 -
+ include/linux/sunrpc/rpc_pipe_fs.h | 3 -
+ include/linux/sunrpc/svcauth.h | 4 --
+ include/linux/sunrpc/svcauth_gss.h | 2 -
+ include/linux/sunrpc/xdr.h | 3 -
+ include/linux/sunrpc/xprt.h | 4 --
+ include/linux/sunrpc/xprtsock.h | 4 --
+ include/trace/events/rpcgss.h | 45 +++++++++++++
+ include/trace/events/rpcrdma.h | 30 +++++++--
+ include/trace/events/sunrpc.h | 55 +++++++++++++++
+ net/sunrpc/auth_gss/gss_mech_switch.c | 4 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 92 ++++++++++++++++++-------
+ net/sunrpc/cache.c | 6 --
+ net/sunrpc/svc.c | 2 +
+ net/sunrpc/svcauth.c | 2 +
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 +
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 ++-
+ net/sunrpc/xprtsock.c | 3 +-
+ 33 files changed, 317 insertions(+), 131 deletions(-)
+Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit)
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/linux-next (f9c34bb52997 ubi: Fix producing anchor PEBs)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/debug.c | 1 +
+ drivers/mtd/ubi/fastmap-wl.c | 31 ++++++++++++++++++-------------
+ drivers/mtd/ubi/fastmap.c | 14 +++++---------
+ drivers/mtd/ubi/ubi.h | 8 +++++---
+ drivers/mtd/ubi/wl.c | 32 ++++++++++++++------------------
+ drivers/mtd/ubi/wl.h | 1 -
+ fs/ubifs/debug.c | 12 ------------
+ fs/ubifs/journal.c | 4 ++--
+ fs/ubifs/orphan.c | 17 ++++++++++-------
+ fs/ubifs/sb.c | 2 +-
+ fs/ubifs/super.c | 4 +---
+ fs/ubifs/tnc_commit.c | 34 +++++++++++++++++++++++++++-------
+ 12 files changed, 84 insertions(+), 76 deletions(-)
+Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super)
+$ git merge v9fs/9p-next
+Already up to date.
+Merging xfs/for-next (22858d0ab9b3 xfs: Convert kmem_alloc() users)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/libxfs/xfs_fs.h
+Removing fs/xfs/libxfs/xfs_da_format.c
+Merge made by the 'recursive' strategy.
+ fs/compat_ioctl.c | 31 +-
+ fs/ioctl.c | 12 +-
+ fs/xfs/Makefile | 1 -
+ fs/xfs/kmem.c | 53 +-
+ fs/xfs/kmem.h | 51 --
+ fs/xfs/libxfs/xfs_ag_resv.c | 2 +
+ fs/xfs/libxfs/xfs_alloc.c | 1239 ++++++++++++++++++------------
+ fs/xfs/libxfs/xfs_alloc.h | 16 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 3 +-
+ fs/xfs/libxfs/xfs_attr.c | 26 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 151 +++-
+ fs/xfs/libxfs/xfs_attr_leaf.h | 30 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 1 +
+ fs/xfs/libxfs/xfs_bit.c | 1 +
+ fs/xfs/libxfs/xfs_bmap.c | 694 +++++++++--------
+ fs/xfs/libxfs/xfs_bmap_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_btree.c | 97 ++-
+ fs/xfs/libxfs/xfs_btree.h | 37 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 683 ++++++++---------
+ fs/xfs/libxfs/xfs_da_btree.h | 73 +-
+ fs/xfs/libxfs/xfs_da_format.c | 888 ----------------------
+ fs/xfs/libxfs/xfs_da_format.h | 59 +-
+ fs/xfs/libxfs/xfs_defer.c | 8 +-
+ fs/xfs/libxfs/xfs_dir2.c | 119 +--
+ fs/xfs/libxfs/xfs_dir2.h | 90 +--
+ fs/xfs/libxfs/xfs_dir2_block.c | 137 ++--
+ fs/xfs/libxfs/xfs_dir2_data.c | 282 +++----
+ fs/xfs/libxfs/xfs_dir2_leaf.c | 307 ++++----
+ fs/xfs/libxfs/xfs_dir2_node.c | 431 ++++++-----
+ fs/xfs/libxfs/xfs_dir2_priv.h | 114 ++-
+ fs/xfs/libxfs/xfs_dir2_sf.c | 436 ++++++-----
+ fs/xfs/libxfs/xfs_dquot_buf.c | 8 +-
+ fs/xfs/libxfs/xfs_format.h | 14 +-
+ fs/xfs/libxfs/xfs_fs.h | 4 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 117 ++-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_iext_tree.c | 24 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 21 +-
+ fs/xfs/libxfs/xfs_inode_buf.h | 5 +-
+ fs/xfs/libxfs/xfs_inode_fork.c | 56 +-
+ fs/xfs/libxfs/xfs_inode_fork.h | 18 +-
+ fs/xfs/libxfs/xfs_log_format.h | 4 +-
+ fs/xfs/libxfs/xfs_log_recover.h | 4 +-
+ fs/xfs/libxfs/xfs_refcount.c | 185 +++--
+ fs/xfs/libxfs/xfs_refcount_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_rmap.c | 379 +++++++---
+ fs/xfs/libxfs/xfs_rmap_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 4 +-
+ fs/xfs/libxfs/xfs_sb.c | 1 +
+ fs/xfs/libxfs/xfs_trans_inode.c | 8 +-
+ fs/xfs/libxfs/xfs_trans_resv.c | 6 +-
+ fs/xfs/libxfs/xfs_types.h | 2 -
+ fs/xfs/scrub/agheader.c | 6 +-
+ fs/xfs/scrub/agheader_repair.c | 2 +-
+ fs/xfs/scrub/attr.c | 13 +-
+ fs/xfs/scrub/bitmap.c | 14 +-
+ fs/xfs/scrub/btree.c | 6 +-
+ fs/xfs/scrub/common.h | 9 +-
+ fs/xfs/scrub/dabtree.c | 62 +-
+ fs/xfs/scrub/dabtree.h | 3 +-
+ fs/xfs/scrub/dir.c | 132 ++--
+ fs/xfs/scrub/fscounters.c | 11 +-
+ fs/xfs/scrub/health.c | 1 +
+ fs/xfs/scrub/parent.c | 2 +-
+ fs/xfs/scrub/quota.c | 7 +
+ fs/xfs/scrub/refcount.c | 12 +-
+ fs/xfs/scrub/scrub.c | 3 +-
+ fs/xfs/xfs_acl.c | 22 +-
+ fs/xfs/xfs_aops.c | 43 +-
+ fs/xfs/xfs_aops.h | 3 -
+ fs/xfs/xfs_attr_inactive.c | 80 +-
+ fs/xfs/xfs_attr_list.c | 81 +-
+ fs/xfs/xfs_bmap_item.c | 19 +-
+ fs/xfs/xfs_bmap_util.c | 255 +------
+ fs/xfs/xfs_bmap_util.h | 4 -
+ fs/xfs/xfs_buf.c | 57 +-
+ fs/xfs/xfs_buf.h | 1 -
+ fs/xfs/xfs_buf_item.c | 16 +-
+ fs/xfs/xfs_dir2_readdir.c | 137 ++--
+ fs/xfs/xfs_discard.c | 6 +-
+ fs/xfs/xfs_dquot.c | 50 +-
+ fs/xfs/xfs_dquot.h | 98 +--
+ fs/xfs/xfs_dquot_item.c | 11 +-
+ fs/xfs/xfs_dquot_item.h | 34 +-
+ fs/xfs/xfs_error.c | 37 +-
+ fs/xfs/xfs_error.h | 33 +-
+ fs/xfs/xfs_extent_busy.c | 7 +-
+ fs/xfs/xfs_extfree_item.c | 35 +-
+ fs/xfs/xfs_file.c | 104 ++-
+ fs/xfs/xfs_filestream.c | 9 +-
+ fs/xfs/xfs_fsmap.c | 1 +
+ fs/xfs/xfs_icache.c | 10 +-
+ fs/xfs/xfs_icreate_item.c | 4 +-
+ fs/xfs/xfs_inode.c | 64 +-
+ fs/xfs/xfs_inode.h | 31 +-
+ fs/xfs/xfs_inode_item.c | 20 +-
+ fs/xfs/xfs_ioctl.c | 209 +----
+ fs/xfs/xfs_ioctl.h | 7 -
+ fs/xfs/xfs_ioctl32.c | 51 +-
+ fs/xfs/xfs_ioctl32.h | 13 +-
+ fs/xfs/xfs_iomap.c | 862 +++++++++++----------
+ fs/xfs/xfs_iomap.h | 11 +-
+ fs/xfs/xfs_iops.c | 72 +-
+ fs/xfs/xfs_itable.c | 18 +-
+ fs/xfs/xfs_iwalk.c | 12 +-
+ fs/xfs/xfs_linux.h | 14 +-
+ fs/xfs/xfs_log.c | 458 +++++------
+ fs/xfs/xfs_log_cil.c | 30 +-
+ fs/xfs/xfs_log_priv.h | 35 +-
+ fs/xfs/xfs_log_recover.c | 217 +++---
+ fs/xfs/xfs_message.c | 22 +-
+ fs/xfs/xfs_message.h | 6 +-
+ fs/xfs/xfs_mount.c | 73 +-
+ fs/xfs/xfs_mount.h | 57 +-
+ fs/xfs/xfs_mru_cache.c | 13 +-
+ fs/xfs/xfs_pnfs.c | 56 +-
+ fs/xfs/xfs_qm.c | 77 +-
+ fs/xfs/xfs_qm.h | 6 +-
+ fs/xfs/xfs_qm_bhv.c | 8 +-
+ fs/xfs/xfs_qm_syscalls.c | 139 ++--
+ fs/xfs/xfs_quotaops.c | 3 +
+ fs/xfs/xfs_refcount_item.c | 24 +-
+ fs/xfs/xfs_reflink.c | 138 +---
+ fs/xfs/xfs_reflink.h | 4 +-
+ fs/xfs/xfs_rmap_item.c | 27 +-
+ fs/xfs/xfs_rtalloc.c | 13 +-
+ fs/xfs/xfs_super.c | 1464 ++++++++++++++++++------------------
+ fs/xfs/xfs_super.h | 10 +
+ fs/xfs/xfs_symlink.c | 1 +
+ fs/xfs/xfs_symlink.h | 2 +-
+ fs/xfs/xfs_trace.h | 36 +-
+ fs/xfs/xfs_trans.c | 6 +-
+ fs/xfs/xfs_trans_ail.c | 17 +-
+ fs/xfs/xfs_trans_dquot.c | 59 +-
+ fs/xfs/xfs_xattr.c | 1 +
+ include/linux/falloc.h | 3 +
+ include/linux/fs.h | 2 +-
+ 137 files changed, 6144 insertions(+), 6627 deletions(-)
+ delete mode 100644 fs/xfs/libxfs/xfs_da_format.c
+Merging iomap/iomap-for-next (419e9c38aa07 iomap: Fix pipe page leakage during splicing)
+$ git merge iomap/iomap-for-next
+Merge made by the 'recursive' strategy.
+ fs/iomap/apply.c | 7 ++++
+ fs/iomap/buffered-io.c | 7 ++--
+ fs/iomap/direct-io.c | 13 ++++++-
+ fs/iomap/fiemap.c | 6 ++-
+ fs/iomap/trace.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 129 insertions(+), 7 deletions(-)
+Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space)
+$ git merge djw-vfs/vfs-for-next
+Merge made by the 'recursive' strategy.
+ fs/splice.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next)
+$ git merge vfs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging printk/for-next (7c88431552f3 Merge branch 'for-5.5' into for-next)
+$ git merge printk/for-next
+Auto-merging scripts/checkpatch.pl
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/dma/debug.c
+Auto-merging fs/afs/yfsclient.c
+Auto-merging fs/afs/inode.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/isdn/hardware/mISDN/w6692.c
+Auto-merging drivers/isdn/hardware/mISDN/netjet.c
+Auto-merging drivers/isdn/hardware/mISDN/mISDNisar.c
+Auto-merging drivers/isdn/hardware/mISDN/mISDNipac.c
+Auto-merging drivers/isdn/hardware/mISDN/hfcsusb.c
+Auto-merging drivers/isdn/hardware/mISDN/hfcpci.c
+Auto-merging drivers/isdn/hardware/mISDN/avmfritz.c
+Auto-merging drivers/crypto/n2_core.c
+Auto-merging drivers/acpi/apei/ghes.c
+Auto-merging arch/x86/mm/testmmiotrace.c
+Auto-merging arch/x86/kernel/umip.c
+Auto-merging arch/x86/kernel/apic/apic.c
+Auto-merging arch/x86/kernel/amd_gart_64.c
+Auto-merging arch/ia64/kernel/setup.c
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging arch/arm64/kernel/hw_breakpoint.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/core-api/printk-formats.rst
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/printk-formats.rst | 12 ++
+ MAINTAINERS | 12 ++
+ arch/alpha/kernel/perf_event.c | 4 +-
+ arch/arm64/kernel/hw_breakpoint.c | 8 +-
+ arch/arm64/kernel/smp.c | 11 +-
+ arch/ia64/kernel/setup.c | 2 +-
+ arch/riscv/kernel/module.c | 4 +-
+ arch/sh/boards/mach-sdk7786/nmi.c | 2 +-
+ arch/sh/drivers/pci/fixups-sdk7786.c | 2 +-
+ arch/sh/kernel/io_trapped.c | 2 +-
+ arch/sh/kernel/setup.c | 2 +-
+ arch/sh/mm/consistent.c | 5 +-
+ arch/sparc/kernel/smp_64.c | 6 +-
+ arch/x86/kernel/amd_gart_64.c | 12 +-
+ arch/x86/kernel/apic/apic.c | 41 +++---
+ arch/x86/kernel/setup_percpu.c | 4 +-
+ arch/x86/kernel/tboot.c | 15 +-
+ arch/x86/kernel/tsc_sync.c | 8 +-
+ arch/x86/kernel/umip.c | 6 +-
+ arch/x86/mm/kmmio.c | 7 +-
+ arch/x86/mm/mmio-mod.c | 6 +-
+ arch/x86/mm/numa_emulation.c | 4 +-
+ arch/x86/mm/testmmiotrace.c | 6 +-
+ arch/x86/oprofile/op_x86_model.h | 6 +-
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +-
+ arch/x86/platform/sfi/sfi.c | 3 +-
+ arch/x86/xen/setup.c | 2 +-
+ drivers/acpi/apei/apei-base.c | 44 +++---
+ drivers/acpi/apei/einj.c | 4 +-
+ drivers/acpi/apei/erst-dbg.c | 5 +-
+ drivers/acpi/apei/ghes.c | 25 ++--
+ drivers/acpi/apei/hest.c | 14 +-
+ drivers/acpi/battery.c | 2 +-
+ drivers/acpi/resource.c | 4 +-
+ drivers/block/drbd/drbd_nl.c | 13 +-
+ drivers/cdrom/gdrom.c | 4 +-
+ drivers/clocksource/samsung_pwm_timer.c | 3 +-
+ drivers/crypto/n2_core.c | 12 +-
+ drivers/ide/tx4938ide.c | 2 +-
+ drivers/ide/tx4939ide.c | 6 +-
+ drivers/isdn/hardware/mISDN/avmfritz.c | 16 +--
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 8 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 3 +-
+ drivers/isdn/hardware/mISDN/hfcsusb.c | 4 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 4 +-
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +-
+ drivers/isdn/hardware/mISDN/netjet.c | 8 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 12 +-
+ drivers/isdn/mISDN/hwchannel.c | 7 +-
+ drivers/macintosh/windfarm_fcu_controls.c | 4 +-
+ drivers/macintosh/windfarm_lm87_sensor.c | 4 +-
+ drivers/macintosh/windfarm_pm72.c | 22 +--
+ drivers/macintosh/windfarm_rm31.c | 6 +-
+ drivers/of/fdt.c | 20 +--
+ drivers/oprofile/oprofile_perf.c | 8 +-
+ drivers/platform/x86/asus-laptop.c | 2 +-
+ drivers/platform/x86/eeepc-laptop.c | 2 +-
+ drivers/platform/x86/intel_oaktrail.c | 10 +-
+ drivers/scsi/a3000.c | 2 +-
+ drivers/sh/intc/core.c | 4 +-
+ drivers/video/console/vgacon.c | 6 +-
+ fs/afs/flock.c | 4 +-
+ fs/afs/inode.c | 13 +-
+ fs/afs/yfsclient.c | 4 +-
+ include/linux/errname.h | 16 +++
+ kernel/dma/debug.c | 2 +-
+ kernel/trace/trace_benchmark.c | 4 +-
+ lib/Kconfig.debug | 9 ++
+ lib/Makefile | 1 +
+ lib/cpu_rmap.c | 2 +-
+ lib/errname.c | 223 ++++++++++++++++++++++++++++++
+ lib/test_printf.c | 21 +++
+ lib/vsprintf.c | 27 ++++
+ scripts/checkpatch.pl | 2 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 6 +-
+ tools/lib/api/debug-internal.h | 4 +-
+ tools/lib/api/debug.c | 4 +-
+ tools/lib/api/fs/fs.c | 4 +-
+ 78 files changed, 571 insertions(+), 269 deletions(-)
+ create mode 100644 include/linux/errname.h
+ create mode 100644 lib/errname.c
+Merging pci/next (d3d7b62ffff9 Merge branch 'pci/trivial')
+$ git merge pci/next
+Auto-merging drivers/pci/hotplug/rpaphp_core.c
+Auto-merging arch/powerpc/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
+Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+Auto-merging arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi' using previous resolution.
+Resolved 'arch/arm64/boot/dts/amlogic/meson-sm1.dtsi' using previous resolution.
+Recorded preimage for 'arch/powerpc/include/asm/Kbuild'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/powerpc/include/asm/Kbuild'.
+[master 05a5019557f1] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-pci | 13 +
+ Documentation/admin-guide/kernel-parameters.txt | 11 +-
+ .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 12 +-
+ .../devicetree/bindings/pci/layerscape-pci.txt | 1 +
+ Documentation/power/pci.rst | 50 +--
+ MAINTAINERS | 3 +-
+ arch/alpha/kernel/pci-sysfs.c | 8 +-
+ arch/arc/include/asm/Kbuild | 1 -
+ arch/arm/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/mips/include/asm/Kbuild | 1 -
+ arch/powerpc/include/asm/Kbuild | 1 -
+ arch/riscv/include/asm/Kbuild | 1 -
+ arch/s390/include/asm/pci.h | 5 +-
+ arch/s390/include/asm/pci_clp.h | 6 +-
+ arch/s390/pci/pci.c | 16 +-
+ arch/s390/pci/pci_clp.c | 6 +-
+ arch/sparc/include/asm/Kbuild | 1 -
+ arch/x86/pci/Makefile | 4 +-
+ arch/x86/pci/common.c | 2 +-
+ arch/x86/pci/fixup.c | 11 +
+ arch/x86/pci/intel_mid_pci.c | 2 +-
+ arch/x86/pci/numachip.c | 5 +-
+ drivers/ata/pata_atp867x.c | 2 +-
+ drivers/ata/sata_nv.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 95 ++++--
+ drivers/gpu/drm/amd/amdgpu/si.c | 97 ++++--
+ drivers/gpu/drm/radeon/cik.c | 94 +++--
+ drivers/gpu/drm/radeon/si.c | 97 ++++--
+ drivers/iommu/Kconfig | 1 +
+ drivers/iommu/of_iommu.c | 2 +
+ drivers/irqchip/irq-gic-v2m.c | 1 +
+ drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 +
+ drivers/memstick/host/jmb38x_ms.c | 2 +-
+ drivers/misc/pci_endpoint_test.c | 8 +-
+ drivers/net/ethernet/intel/e1000/e1000.h | 1 -
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
+ drivers/net/ethernet/intel/ixgb/ixgb.h | 1 -
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 2 +-
+ drivers/pci/Kconfig | 26 +-
+ drivers/pci/Makefile | 3 +-
+ drivers/pci/access.c | 2 +-
+ drivers/pci/ats.c | 207 +++++------
+ drivers/pci/controller/Kconfig | 31 +-
+ drivers/pci/controller/Makefile | 4 +-
+ drivers/pci/controller/cadence/Kconfig | 45 +++
+ drivers/pci/controller/cadence/Makefile | 5 +
+ .../pci/controller/{ => cadence}/pcie-cadence-ep.c | 96 +-----
+ .../controller/{ => cadence}/pcie-cadence-host.c | 97 +-----
+ drivers/pci/controller/cadence/pcie-cadence-plat.c | 174 ++++++++++
+ .../pci/controller/{ => cadence}/pcie-cadence.c | 0
+ .../pci/controller/{ => cadence}/pcie-cadence.h | 79 ++++-
+ drivers/pci/controller/dwc/Kconfig | 6 +-
+ drivers/pci/controller/dwc/pci-dra7xx.c | 2 +-
+ drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +-
+ drivers/pci/controller/dwc/pci-layerscape.c | 1 +
+ drivers/pci/controller/dwc/pci-meson.c | 136 ++++++--
+ drivers/pci/controller/dwc/pcie-artpec6.c | 2 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 41 +--
+ drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 2 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 6 +-
+ drivers/pci/controller/dwc/pcie-uniphier.c | 10 +
+ drivers/pci/controller/pci-aardvark.c | 133 ++++----
+ drivers/pci/controller/pci-ftpci100.c | 79 ++---
+ drivers/pci/controller/pci-host-common.c | 2 +-
+ drivers/pci/controller/pci-hyperv.c | 10 +-
+ drivers/pci/controller/pci-mvebu.c | 4 +-
+ drivers/pci/controller/pci-thunder-pem.c | 1 +
+ drivers/pci/controller/pci-v3-semi.c | 74 ++--
+ drivers/pci/controller/pci-versatile.c | 71 +---
+ drivers/pci/controller/pci-xgene.c | 73 ++--
+ drivers/pci/controller/pcie-altera.c | 41 +--
+ drivers/pci/controller/pcie-iproc-msi.c | 5 +-
+ drivers/pci/controller/pcie-iproc-platform.c | 9 +-
+ drivers/pci/controller/pcie-iproc.c | 106 +++---
+ drivers/pci/controller/pcie-mediatek.c | 43 +--
+ drivers/pci/controller/pcie-mobiveil.c | 146 ++++----
+ drivers/pci/controller/pcie-rcar.c | 92 +++--
+ drivers/pci/controller/pcie-rockchip-host.c | 158 +++------
+ drivers/pci/controller/pcie-rockchip.h | 7 +-
+ drivers/pci/controller/pcie-xilinx-nwl.c | 21 +-
+ drivers/pci/controller/pcie-xilinx.c | 18 +-
+ drivers/pci/controller/vmd.c | 34 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c | 10 +-
+ drivers/pci/endpoint/pci-epc-mem.c | 2 +-
+ drivers/pci/hotplug/Kconfig | 2 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 12 +-
+ drivers/pci/hotplug/pciehp.h | 8 +-
+ drivers/pci/hotplug/pciehp_core.c | 36 +-
+ drivers/pci/hotplug/pciehp_ctrl.c | 10 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 67 +++-
+ drivers/pci/hotplug/rpaphp_core.c | 4 +-
+ drivers/pci/iov.c | 9 +-
+ drivers/pci/msi.c | 25 +-
+ drivers/pci/of.c | 67 +++-
+ drivers/pci/pci-bridge-emul.c | 25 +-
+ drivers/pci/pci-bridge-emul.h | 78 ++---
+ drivers/pci/pci-driver.c | 198 +++++------
+ drivers/pci/pci-sysfs.c | 28 +-
+ drivers/pci/pci.c | 379 ++++++++++++++-------
+ drivers/pci/pci.h | 48 +--
+ drivers/pci/pcie/Kconfig | 10 -
+ drivers/pci/pcie/aer.c | 88 ++++-
+ drivers/pci/pcie/aspm.c | 245 ++++++++-----
+ drivers/pci/pcie/dpc.c | 2 +-
+ drivers/pci/pcie/portdrv.h | 2 +
+ drivers/pci/pcie/portdrv_core.c | 7 +-
+ drivers/pci/pcie/portdrv_pci.c | 8 +
+ drivers/pci/pcie/ptm.c | 2 +-
+ drivers/pci/probe.c | 60 ++--
+ drivers/pci/proc.c | 4 +-
+ drivers/pci/quirks.c | 157 ++++++---
+ drivers/pci/setup-bus.c | 70 ++--
+ drivers/pci/switch/switchtec.c | 2 +-
+ drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 70 +++-
+ drivers/rapidio/devices/tsi721.c | 2 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 2 +-
+ drivers/scsi/pm8001/pm8001_init.c | 2 +-
+ drivers/staging/gasket/gasket_constants.h | 3 -
+ drivers/staging/gasket/gasket_core.c | 12 +-
+ drivers/staging/gasket/gasket_core.h | 4 +-
+ drivers/tty/serial/8250/8250_pci.c | 8 +-
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/host/pci-quirks.c | 2 +-
+ drivers/vfio/pci/vfio_pci.c | 11 +-
+ drivers/vfio/pci/vfio_pci_config.c | 32 +-
+ drivers/vfio/pci/vfio_pci_private.h | 4 +-
+ drivers/video/fbdev/aty/radeon_pm.c | 2 +-
+ drivers/video/fbdev/core/fbmem.c | 4 +-
+ drivers/video/fbdev/efifb.c | 2 +-
+ drivers/xen/platform-pci.c | 14 +-
+ include/asm-generic/Kbuild | 1 +
+ include/linux/aer.h | 4 +
+ include/linux/of_pci.h | 5 +-
+ include/linux/pci-ats.h | 77 ++---
+ include/linux/pci-epc.h | 2 +-
+ include/linux/pci.h | 59 ++--
+ include/linux/pci_ids.h | 1 +
+ include/linux/resource_ext.h | 12 +
+ include/uapi/linux/pci_regs.h | 3 +
+ lib/devres.c | 2 +-
+ tools/pci/pcitest.c | 1 +
+ 145 files changed, 2587 insertions(+), 2103 deletions(-)
+ create mode 100644 drivers/pci/controller/cadence/Kconfig
+ create mode 100644 drivers/pci/controller/cadence/Makefile
+ rename drivers/pci/controller/{ => cadence}/pcie-cadence-ep.c (83%)
+ rename drivers/pci/controller/{ => cadence}/pcie-cadence-host.c (75%)
+ create mode 100644 drivers/pci/controller/cadence/pcie-cadence-plat.c
+ rename drivers/pci/controller/{ => cadence}/pcie-cadence.c (100%)
+ rename drivers/pci/controller/{ => cadence}/pcie-cadence.h (82%)
+Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static)
+$ git merge pstore/for-next/pstore
+Merge made by the 'recursive' strategy.
+ fs/pstore/platform.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging hid/for-next (4b8c2dffbb85 Merge branch 'for-5.5/core' into for-next)
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +
+ drivers/hid/Kconfig | 1 +
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-core.c | 55 +-
+ drivers/hid/hid-google-hammer.c | 146 ++++--
+ drivers/hid/hid-ids.h | 6 +
+ drivers/hid/hid-lg-g15.c | 899 +++++++++++++++++++++++++++++++++
+ drivers/hid/hid-logitech-hidpp.c | 3 +
+ drivers/hid/hid-quirks.c | 8 +-
+ drivers/hid/hid-rmi.c | 3 +-
+ drivers/hid/hidraw.c | 10 +-
+ drivers/hid/i2c-hid/i2c-hid-core.c | 16 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 2 +-
+ include/uapi/linux/input-event-codes.h | 75 +++
+ 14 files changed, 1166 insertions(+), 66 deletions(-)
+ create mode 100644 drivers/hid/hid-lg-g15.c
+Merging i2c/i2c/for-next (3274d632cb1a Merge branch 'i2c/for-current' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Removing include/linux/i2c-pxa.h
+Removing Documentation/devicetree/bindings/i2c/i2c-meson.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/i2c/amlogic,meson6-i2c.yaml | 53 +++++++++++++++
+ .../devicetree/bindings/i2c/i2c-aspeed.txt | 3 +-
+ Documentation/devicetree/bindings/i2c/i2c-at91.txt | 3 +-
+ .../devicetree/bindings/i2c/i2c-meson.txt | 30 ---------
+ Documentation/devicetree/bindings/i2c/i2c.txt | 18 ++++++
+ .../devicetree/bindings/i2c/renesas,i2c.txt | 1 +
+ .../devicetree/bindings/i2c/renesas,iic.txt | 1 +
+ Documentation/i2c/busses/i2c-i801.rst | 1 +
+ drivers/i2c/busses/Kconfig | 2 +
+ drivers/i2c/busses/i2c-aspeed.c | 4 ++
+ drivers/i2c/busses/i2c-at91-core.c | 38 +++++++++++
+ drivers/i2c/busses/i2c-at91-master.c | 53 +++++++++++++--
+ drivers/i2c/busses/i2c-at91.h | 13 ++++
+ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 15 +++--
+ drivers/i2c/busses/i2c-i801.c | 8 +++
+ drivers/i2c/busses/i2c-icy.c | 1 -
+ drivers/i2c/busses/i2c-pxa.c | 75 +++++++++++++++++-----
+ drivers/i2c/busses/i2c-qup.c | 4 +-
+ drivers/i2c/busses/i2c-rcar.c | 2 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 2 +-
+ drivers/i2c/busses/i2c-stm32.c | 16 ++---
+ drivers/i2c/busses/i2c-stm32f7.c | 30 ++++++---
+ drivers/i2c/busses/i2c-tegra.c | 4 +-
+ drivers/i2c/busses/i2c-xiic.c | 2 +
+ drivers/i2c/i2c-core-base.c | 38 ++---------
+ drivers/misc/eeprom/at24.c | 9 ++-
+ include/linux/i2c-pxa.h | 18 ------
+ include/linux/i2c.h | 9 ++-
+ include/linux/platform_data/i2c-pxa.h | 4 --
+ 29 files changed, 317 insertions(+), 140 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-meson.txt
+ delete mode 100644 include/linux/i2c-pxa.h
+Merging i3c/i3c/next (ae24f2b6f828 MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver)
+$ git merge i3c/i3c/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 +++++++-
+ drivers/i3c/master.c | 4 ++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+Merging dmi/master (9a85ac3936ad firmware: dmi: Add dmi_memdev_handle)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi_scan.c | 41 ++++++++++++++++++++++++++++++++++++++++-
+ include/linux/dmi.h | 4 ++++
+ 2 files changed, 44 insertions(+), 1 deletion(-)
+Merging hwmon-staging/hwmon-next (4a1288f1c1cf dell-smm-hwmon: Add documentation)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 104 ++
+ .../devicetree/bindings/hwmon/ibm,cffps1.txt | 3 +
+ .../devicetree/bindings/hwmon/ti,tmp513.yaml | 93 ++
+ Documentation/hwmon/bel-pfe.rst | 112 ++
+ Documentation/hwmon/dell-smm-hwmon.rst | 164 +++
+ Documentation/hwmon/ina3221.rst | 12 +
+ Documentation/hwmon/index.rst | 4 +
+ Documentation/hwmon/ltc2947.rst | 100 ++
+ Documentation/hwmon/tmp513.rst | 103 ++
+ MAINTAINERS | 18 +
+ drivers/hwmon/Kconfig | 38 +-
+ drivers/hwmon/Makefile | 4 +
+ drivers/hwmon/abituguru.c | 2 +-
+ drivers/hwmon/applesmc.c | 38 +-
+ drivers/hwmon/aspeed-pwm-tacho.c | 7 +-
+ drivers/hwmon/dell-smm-hwmon.c | 115 +-
+ drivers/hwmon/ina3221.c | 163 ++-
+ drivers/hwmon/ltc2947-core.c | 1183 ++++++++++++++++++++
+ drivers/hwmon/ltc2947-i2c.c | 49 +
+ drivers/hwmon/ltc2947-spi.c | 50 +
+ drivers/hwmon/ltc2947.h | 12 +
+ drivers/hwmon/pmbus/Kconfig | 9 +
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/bel-pfe.c | 131 +++
+ drivers/hwmon/pmbus/ibm-cffps.c | 37 +-
+ drivers/hwmon/tmp421.c | 3 +-
+ drivers/hwmon/tmp513.c | 772 +++++++++++++
+ drivers/hwmon/w83793.c | 2 +-
+ 28 files changed, 3263 insertions(+), 66 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
+ create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
+ create mode 100644 Documentation/hwmon/bel-pfe.rst
+ create mode 100644 Documentation/hwmon/dell-smm-hwmon.rst
+ create mode 100644 Documentation/hwmon/ltc2947.rst
+ create mode 100644 Documentation/hwmon/tmp513.rst
+ create mode 100644 drivers/hwmon/ltc2947-core.c
+ create mode 100644 drivers/hwmon/ltc2947-i2c.c
+ create mode 100644 drivers/hwmon/ltc2947-spi.c
+ create mode 100644 drivers/hwmon/ltc2947.h
+ create mode 100644 drivers/hwmon/pmbus/bel-pfe.c
+ create mode 100644 drivers/hwmon/tmp513.c
+Merging jc_docs/docs-next (51e46c7a4007 docs, parallelism: Rearrange how jobserver reservations are made)
+$ git merge jc_docs/docs-next
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging drivers/net/ethernet/faraday/ftgmac100.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/networking/device_drivers/pensando/ionic.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/pensando/ionic.rst
+Auto-merging Documentation/networking/device_drivers/intel/ixgbevf.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbevf.rst
+Auto-merging Documentation/networking/device_drivers/intel/ixgbe.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbe.rst
+Auto-merging Documentation/networking/device_drivers/intel/igbvf.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igbvf.rst
+Auto-merging Documentation/networking/device_drivers/intel/igb.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igb.rst
+Auto-merging Documentation/networking/device_drivers/intel/ice.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ice.rst
+Auto-merging Documentation/networking/device_drivers/intel/iavf.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/iavf.rst
+Auto-merging Documentation/networking/device_drivers/intel/i40e.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/i40e.rst
+Auto-merging Documentation/networking/device_drivers/intel/fm10k.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/fm10k.rst
+Auto-merging Documentation/networking/device_drivers/intel/e1000e.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000e.rst
+Auto-merging Documentation/networking/device_drivers/intel/e1000.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000.rst
+Auto-merging Documentation/networking/device_drivers/intel/e100.rst
+CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e100.rst
+Auto-merging Documentation/core-api/printk-formats.rst
+Auto-merging Documentation/admin-guide/perf/imx-ddr.rst
+CONFLICT (content): Merge conflict in Documentation/admin-guide/perf/imx-ddr.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/Makefile
+Auto-merging .mailmap
+Resolved 'Documentation/admin-guide/perf/imx-ddr.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/e100.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/e1000.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/e1000e.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/fm10k.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/i40e.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/iavf.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/ice.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/igb.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/igbvf.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/ixgbe.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/intel/ixgbevf.rst' using previous resolution.
+Resolved 'Documentation/networking/device_drivers/pensando/ionic.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4559b1d6da49] Merge remote-tracking branch 'jc_docs/docs-next'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 1 +
+ CREDITS | 3 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 183 +++--
+ Documentation/Makefile | 6 +-
+ Documentation/admin-guide/LSM/SafeSetID.rst | 4 +-
+ Documentation/admin-guide/cgroup-v2.rst | 7 +-
+ .../{driver-api => admin-guide}/dell_rbu.rst | 14 +-
+ .../device-mapper/{dm-dust.txt => dm-dust.rst} | 243 ++++---
+ Documentation/admin-guide/device-mapper/index.rst | 1 +
+ Documentation/admin-guide/index.rst | 65 +-
+ Documentation/admin-guide/iostats.rst | 47 +-
+ Documentation/admin-guide/kernel-parameters.txt | 12 +-
+ Documentation/admin-guide/perf/imx-ddr.rst | 35 +-
+ Documentation/admin-guide/perf/index.rst | 1 +
+ Documentation/admin-guide/sysctl/kernel.rst | 12 +-
+ Documentation/conf.py | 3 +-
+ Documentation/core-api/genalloc.rst | 26 +-
+ Documentation/core-api/genericirq.rst | 52 +-
+ Documentation/core-api/memory-allocation.rst | 50 +-
+ Documentation/core-api/mm-api.rst | 2 +-
+ Documentation/core-api/printk-formats.rst | 14 +
+ Documentation/core-api/refcount-vs-atomic.rst | 36 +-
+ Documentation/dev-tools/kmemleak.rst | 2 +-
+ .../devicetree/bindings/cpu/cpu-topology.txt | 2 +-
+ .../devicetree/bindings/timer/ingenic,tcu.txt | 2 +-
+ Documentation/doc-guide/kernel-doc.rst | 29 +-
+ Documentation/driver-api/devfreq.rst | 30 +
+ Documentation/driver-api/dma-buf.rst | 6 +-
+ Documentation/driver-api/gpio/driver.rst | 2 +-
+ Documentation/driver-api/index.rst | 3 +-
+ Documentation/driver-api/infrastructure.rst | 3 -
+ Documentation/driver-api/interconnect.rst | 2 +-
+ Documentation/driver-api/pti_intel_mid.rst | 4 +-
+ .../filesystems/{autofs.txt => autofs.rst} | 263 +++----
+ Documentation/filesystems/debugfs.txt | 10 +-
+ Documentation/filesystems/index.rst | 1 +
+ Documentation/filesystems/locking.rst | 2 +-
+ Documentation/hwmon/inspur-ipsps1.rst | 2 +-
+ Documentation/i2c/busses/index.rst | 2 +-
+ Documentation/i2c/index.rst | 2 +-
+ Documentation/index.rst | 1 -
+ Documentation/maintainer/configure-git.rst | 30 +
+ Documentation/memory-barriers.txt | 11 +-
+ Documentation/mips/ingenic-tcu.rst | 2 +-
+ Documentation/misc-devices/xilinx_sdfec.rst | 291 ++++++++
+ .../networking/device_drivers/intel/e100.rst | 14 +-
+ .../networking/device_drivers/intel/e1000.rst | 12 +-
+ .../networking/device_drivers/intel/e1000e.rst | 14 +-
+ .../networking/device_drivers/intel/fm10k.rst | 10 +-
+ .../networking/device_drivers/intel/i40e.rst | 8 +-
+ .../networking/device_drivers/intel/iavf.rst | 8 +-
+ .../networking/device_drivers/intel/ice.rst | 6 +-
+ .../networking/device_drivers/intel/igb.rst | 12 +-
+ .../networking/device_drivers/intel/igbvf.rst | 6 +-
+ .../networking/device_drivers/intel/ixgbe.rst | 10 +-
+ .../networking/device_drivers/intel/ixgbevf.rst | 6 +-
+ .../networking/device_drivers/mellanox/mlx5.rst | 2 +-
+ .../networking/device_drivers/pensando/ionic.rst | 6 +-
+ Documentation/networking/devlink-trap.rst | 2 +-
+ Documentation/networking/phy.rst | 2 +-
+ .../{ioctl => process}/botching-up-ioctls.rst | 2 +-
+ .../process/embargoed-hardware-issues.rst | 2 +-
+ Documentation/process/index.rst | 2 +
+ Documentation/process/maintainers.rst | 1 +
+ Documentation/process/submitting-patches.rst | 53 +-
+ Documentation/riscv/boot-image-header.rst | 2 +-
+ Documentation/scheduler/sched-stats.rst | 4 +-
+ Documentation/security/keys/core.rst | 2 +-
+ Documentation/security/lsm.rst | 2 +-
+ Documentation/sphinx-static/theme_overrides.css | 10 +
+ Documentation/sphinx/kerneldoc.py | 17 +-
+ Documentation/sphinx/maintainers_include.py | 197 +++++
+ Documentation/sphinx/parallel-wrapper.sh | 33 +
+ .../trace/{ => coresight}/coresight-cpu-debug.rst | 0
+ .../trace/coresight/coresight-etm4x-reference.rst | 798 +++++++++++++++++++++
+ Documentation/trace/{ => coresight}/coresight.rst | 2 +-
+ Documentation/trace/coresight/index.rst | 9 +
+ Documentation/trace/index.rst | 3 +-
+ .../it_IT/process/maintainer-pgp-guide.rst | 2 +-
+ Documentation/translations/ko_KR/howto.rst | 56 +-
+ Documentation/translations/ko_KR/index.rst | 4 +-
+ .../translations/ko_KR/memory-barriers.txt | 227 +++---
+ Documentation/userspace-api/index.rst | 1 +
+ Documentation/{ => userspace-api}/ioctl/cdrom.rst | 0
+ Documentation/{ => userspace-api}/ioctl/hdio.rst | 0
+ Documentation/{ => userspace-api}/ioctl/index.rst | 1 -
+ .../{ => userspace-api}/ioctl/ioctl-decoding.rst | 0
+ .../{ => userspace-api}/ioctl/ioctl-number.rst | 0
+ Documentation/w1/index.rst | 2 +-
+ MAINTAINERS | 69 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic_if.h | 4 +-
+ drivers/platform/x86/Kconfig | 2 +-
+ drivers/platform/x86/dell_rbu.c | 2 +-
+ fs/cifs/cifsfs.c | 2 +-
+ include/linux/interrupt.h | 13 +
+ lib/genalloc.c | 2 +-
+ scripts/jobserver-exec | 66 ++
+ scripts/kernel-doc | 27 +-
+ scripts/sphinx-pre-install | 30 +-
+ 100 files changed, 2454 insertions(+), 834 deletions(-)
+ rename Documentation/{driver-api => admin-guide}/dell_rbu.rst (94%)
+ rename Documentation/admin-guide/device-mapper/{dm-dust.txt => dm-dust.rst} (51%)
+ create mode 100644 Documentation/driver-api/devfreq.rst
+ rename Documentation/filesystems/{autofs.txt => autofs.rst} (77%)
+ create mode 100644 Documentation/misc-devices/xilinx_sdfec.rst
+ rename Documentation/{ioctl => process}/botching-up-ioctls.rst (99%)
+ create mode 100644 Documentation/process/maintainers.rst
+ create mode 100755 Documentation/sphinx/maintainers_include.py
+ create mode 100644 Documentation/sphinx/parallel-wrapper.sh
+ rename Documentation/trace/{ => coresight}/coresight-cpu-debug.rst (100%)
+ create mode 100644 Documentation/trace/coresight/coresight-etm4x-reference.rst
+ rename Documentation/trace/{ => coresight}/coresight.rst (99%)
+ create mode 100644 Documentation/trace/coresight/index.rst
+ rename Documentation/{ => userspace-api}/ioctl/cdrom.rst (100%)
+ rename Documentation/{ => userspace-api}/ioctl/hdio.rst (100%)
+ rename Documentation/{ => userspace-api}/ioctl/index.rst (86%)
+ rename Documentation/{ => userspace-api}/ioctl/ioctl-decoding.rst (100%)
+ rename Documentation/{ => userspace-api}/ioctl/ioctl-number.rst (100%)
+ create mode 100755 scripts/jobserver-exec
+Merging v4l-dvb/master (dca6b3733a4a media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding")
+$ git merge v4l-dvb/master
+Removing drivers/media/usb/dvb-usb-v2/gl861.h
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
+Auto-merging Documentation/devicetree/bindings/media/rc.yaml
+Auto-merging Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+Merge made by the 'recursive' strategy.
+ .../media/allwinner,sun8i-h3-deinterlace.yaml | 76 ++
+ .../devicetree/bindings/media/i2c/ad5820.txt | 11 +-
+ .../devicetree/bindings/media/i2c/imx290.txt | 57 +
+ .../devicetree/bindings/media/i2c/nokia,smia.txt | 2 -
+ .../devicetree/bindings/media/i2c/ov2659.txt | 9 +
+ Documentation/devicetree/bindings/media/rc.yaml | 1 +
+ .../devicetree/bindings/media/renesas,csi2.txt | 1 +
+ .../devicetree/bindings/media/renesas,vin.txt | 5 +-
+ .../devicetree/bindings/media/sh_mobile_ceu.txt | 17 -
+ .../devicetree/bindings/media/ti,vpe.yaml | 64 ++
+ Documentation/media/cec.h.rst.exceptions | 89 ++
+ Documentation/media/kapi/v4l2-controls.rst | 9 +
+ Documentation/media/uapi/cec/cec-funcs.rst | 1 +
+ .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 +-
+ .../media/uapi/cec/cec-ioc-adap-g-conn-info.rst | 105 ++
+ Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 8 +
+ Documentation/media/uapi/mediactl/request-api.rst | 4 +-
+ Documentation/media/uapi/v4l/biblio.rst | 9 +
+ Documentation/media/uapi/v4l/buffer.rst | 13 +
+ Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
+ .../media/uapi/v4l/dev-stateless-decoder.rst | 424 +++++++
+ Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 569 +++++++++-
+ Documentation/media/uapi/v4l/ext-ctrls-flash.rst | 2 +-
+ .../media/uapi/v4l/ext-ctrls-image-source.rst | 10 +
+ Documentation/media/uapi/v4l/meta-formats.rst | 1 +
+ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 35 +-
+ Documentation/media/uapi/v4l/pixfmt-meta-vivid.rst | 60 +
+ .../media/uapi/v4l/v4l2-selection-targets.rst | 4 +-
+ .../media/uapi/v4l/vidioc-decoder-cmd.rst | 10 +-
+ .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 5 +
+ Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 2 +-
+ Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 24 +
+ Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 6 +
+ Documentation/media/v4l-drivers/imx.rst | 75 +-
+ Documentation/media/v4l-drivers/ipu3.rst | 53 +-
+ Documentation/media/v4l-drivers/ipu3_rcb.svg | 331 ++++++
+ Documentation/media/v4l-drivers/vimc.rst | 16 +-
+ Documentation/media/videodev2.h.rst.exceptions | 5 +
+ MAINTAINERS | 32 +-
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
+ drivers/media/cec/cec-adap.c | 12 +-
+ drivers/media/cec/cec-api.c | 20 +
+ drivers/media/cec/cec-core.c | 5 -
+ drivers/media/cec/cec-pin.c | 10 +
+ drivers/media/common/siano/smscoreapi.c | 4 +-
+ drivers/media/common/siano/smscoreapi.h | 4 +-
+ drivers/media/common/siano/smsir.h | 2 +-
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 12 +-
+ drivers/media/dvb-frontends/cxd2820r_c.c | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_t.c | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +-
+ drivers/media/dvb-frontends/cxd2841er.c | 12 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 54 +-
+ drivers/media/dvb-frontends/mt312.c | 13 +-
+ drivers/media/dvb-frontends/si2168.h | 47 +-
+ drivers/media/dvb-frontends/si2168_priv.h | 10 +-
+ drivers/media/dvb-frontends/tc90522.c | 27 +-
+ drivers/media/dvb-frontends/tc90522.h | 3 +
+ drivers/media/i2c/Kconfig | 80 +-
+ drivers/media/i2c/Makefile | 2 +
+ drivers/media/i2c/ad5820.c | 35 +-
+ drivers/media/i2c/adv7180.c | 6 +-
+ drivers/media/i2c/adv7842.c | 4 +-
+ drivers/media/i2c/bt819.c | 2 +-
+ drivers/media/i2c/hi556.c | 1200 ++++++++++++++++++++
+ drivers/media/i2c/imx214.c | 9 +
+ drivers/media/i2c/imx290.c | 884 ++++++++++++++
+ drivers/media/i2c/lm3646.c | 2 +-
+ drivers/media/i2c/max2175.c | 4 +-
+ drivers/media/i2c/max2175.h | 4 +-
+ drivers/media/i2c/mt9m001.c | 2 +-
+ drivers/media/i2c/ov2659.c | 139 ++-
+ drivers/media/i2c/ov5640.c | 33 +-
+ drivers/media/i2c/ov5695.c | 2 +-
+ drivers/media/i2c/ov6650.c | 266 +++--
+ drivers/media/i2c/saa711x_regs.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 326 +++---
+ drivers/media/i2c/smiapp/smiapp-reg.h | 36 +-
+ drivers/media/i2c/smiapp/smiapp.h | 3 -
+ drivers/media/i2c/st-mipid02.c | 5 +
+ drivers/media/i2c/tda1997x_regs.h | 2 +-
+ drivers/media/i2c/tvp5150_reg.h | 2 +-
+ drivers/media/i2c/vpx3220.c | 2 +-
+ drivers/media/mc/mc-device.c | 65 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 2 +-
+ drivers/media/pci/cx23885/cx23888-ir.c | 5 +-
+ drivers/media/pci/cx88/cx88-cards.c | 43 +
+ drivers/media/pci/cx88/cx88-dvb.c | 1 +
+ drivers/media/pci/cx88/cx88-video.c | 11 +-
+ drivers/media/pci/cx88/cx88.h | 1 +
+ drivers/media/pci/dm1105/dm1105.c | 1 -
+ drivers/media/pci/ivtv/ivtv-vbi.c | 2 +-
+ drivers/media/pci/mantis/hopper_cards.c | 4 +-
+ drivers/media/pci/mantis/mantis_cards.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 166 ++-
+ drivers/media/pci/smipcie/smipcie.h | 1 -
+ drivers/media/platform/Kconfig | 17 +-
+ drivers/media/platform/Makefile | 4 +-
+ drivers/media/platform/am437x/am437x-vpfe.c | 861 ++++++--------
+ drivers/media/platform/am437x/am437x-vpfe.h | 43 +-
+ drivers/media/platform/am437x/am437x-vpfe_regs.h | 10 +-
+ drivers/media/platform/aspeed-video.c | 58 +-
+ drivers/media/platform/cadence/cdns-csi2rx.c | 2 +-
+ drivers/media/platform/cec-gpio/cec-gpio.c | 41 +-
+ drivers/media/platform/coda/coda-common.c | 13 +-
+ drivers/media/platform/coda/coda.h | 1 -
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 7 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 20 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 +-
+ .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 -
+ .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 -
+ .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 1 -
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 9 +-
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 9 -
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +-
+ drivers/media/platform/qcom/venus/core.c | 56 +-
+ drivers/media/platform/qcom/venus/core.h | 30 +
+ drivers/media/platform/qcom/venus/helpers.c | 247 +++-
+ drivers/media/platform/qcom/venus/helpers.h | 3 +-
+ drivers/media/platform/qcom/venus/hfi_venus.c | 6 +
+ drivers/media/platform/qcom/venus/vdec.c | 11 +-
+ drivers/media/platform/qcom/venus/venc.c | 7 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 17 +-
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 4 +
+ drivers/media/platform/rcar-vin/rcar-dma.c | 63 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 156 ++-
+ drivers/media/platform/rcar-vin/rcar-vin.h | 6 +-
+ drivers/media/platform/rcar_drif.c | 1 +
+ drivers/media/platform/rcar_fdp1.c | 2 +-
+ drivers/media/platform/s3c-camif/camif-regs.c | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 1 -
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 -
+ drivers/media/platform/seco-cec/seco-cec.c | 1 +
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-
+ drivers/media/platform/sunxi/Makefile | 1 +
+ drivers/media/platform/sunxi/sun8i-di/Makefile | 2 +
+ drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 1028 +++++++++++++++++
+ drivers/media/platform/sunxi/sun8i-di/sun8i-di.h | 237 ++++
+ drivers/media/platform/ti-vpe/csc.c | 254 +++--
+ drivers/media/platform/ti-vpe/csc.h | 4 +-
+ drivers/media/platform/ti-vpe/vpdma.c | 13 +-
+ drivers/media/platform/ti-vpe/vpdma.h | 2 +
+ drivers/media/platform/ti-vpe/vpdma_priv.h | 5 +-
+ drivers/media/platform/ti-vpe/vpe.c | 396 ++++---
+ drivers/media/platform/vicodec/vicodec-core.c | 4 +-
+ drivers/media/platform/vim2m.c | 8 +-
+ drivers/media/platform/vimc/Makefile | 7 +-
+ drivers/media/platform/vimc/vimc-capture.c | 107 +-
+ drivers/media/platform/vimc/vimc-common.c | 171 +--
+ drivers/media/platform/vimc/vimc-common.h | 120 +-
+ drivers/media/platform/vimc/vimc-core.c | 215 ++--
+ drivers/media/platform/vimc/vimc-debayer.c | 182 +--
+ drivers/media/platform/vimc/vimc-scaler.c | 102 +-
+ drivers/media/platform/vimc/vimc-sensor.c | 109 +-
+ drivers/media/platform/vimc/vimc-streamer.c | 19 +-
+ drivers/media/platform/vivid/Makefile | 2 +-
+ drivers/media/platform/vivid/vivid-cec.c | 7 +-
+ drivers/media/platform/vivid/vivid-core.c | 368 ++++--
+ drivers/media/platform/vivid/vivid-core.h | 25 +
+ drivers/media/platform/vivid/vivid-ctrls.c | 89 ++
+ drivers/media/platform/vivid/vivid-kthread-cap.c | 62 +-
+ drivers/media/platform/vivid/vivid-kthread-out.c | 57 +-
+ drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++
+ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +
+ drivers/media/platform/vivid/vivid-meta-out.c | 174 +++
+ drivers/media/platform/vivid/vivid-meta-out.h | 25 +
+ drivers/media/platform/vivid/vivid-sdr-cap.c | 8 +-
+ drivers/media/platform/vivid/vivid-vid-cap.c | 8 +-
+ drivers/media/platform/vivid/vivid-vid-out.c | 8 +-
+ drivers/media/platform/xilinx/xilinx-dma.h | 2 +-
+ drivers/media/platform/xilinx/xilinx-vip.h | 2 +-
+ drivers/media/platform/xilinx/xilinx-vipp.h | 2 +-
+ drivers/media/platform/xilinx/xilinx-vtc.h | 2 +-
+ drivers/media/radio/radio-wl1273.c | 3 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +
+ drivers/media/rc/imon.c | 64 +-
+ drivers/media/rc/imon_raw.c | 22 +-
+ drivers/media/rc/ir-rcmm-decoder.c | 6 +-
+ drivers/media/rc/ite-cir.c | 2 +-
+ drivers/media/rc/keymaps/Makefile | 2 +
+ drivers/media/rc/keymaps/rc-beelink-gs1.c | 84 ++
+ drivers/media/rc/keymaps/rc-vega-s9x.c | 54 +
+ drivers/media/rc/mceusb.c | 141 ++-
+ drivers/media/rc/rc-core-priv.h | 2 +-
+ drivers/media/rc/rc-main.c | 1 +
+ drivers/media/rc/tango-ir.c | 14 +-
+ drivers/media/tuners/qm1d1c0042.c | 2 +-
+ drivers/media/tuners/si2157.c | 6 +
+ drivers/media/tuners/si2157.h | 33 +-
+ drivers/media/tuners/si2157_priv.h | 5 +-
+ drivers/media/tuners/tuner-xc2028-types.h | 2 +-
+ drivers/media/tuners/tuner-xc2028.h | 2 +-
+ drivers/media/usb/b2c2/flexcop-usb.c | 13 +-
+ drivers/media/usb/cx231xx/Kconfig | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 508 +++------
+ drivers/media/usb/cx231xx/cx231xx-audio.c | 1 -
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 6 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 172 ++-
+ drivers/media/usb/cx231xx/cx231xx-vbi.h | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 795 +++----------
+ drivers/media/usb/cx231xx/cx231xx.h | 30 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 37 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 +
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 28 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 391 +++----
+ drivers/media/usb/dvb-usb-v2/gl861.h | 14 -
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +-
+ drivers/media/usb/dvb-usb/af9005.c | 5 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 3 +-
+ drivers/media/usb/em28xx/em28xx-audio.c | 1 -
+ drivers/media/usb/em28xx/em28xx-cards.c | 20 +
+ drivers/media/usb/em28xx/em28xx-dvb.c | 30 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 4 +-
+ drivers/media/usb/em28xx/em28xx.h | 1 +
+ drivers/media/usb/gspca/sq905.c | 3 +
+ drivers/media/usb/gspca/sq905c.c | 3 +
+ drivers/media/usb/gspca/stv0680.c | 2 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 9 +-
+ drivers/media/usb/tm6000/tm6000-regs.h | 2 +-
+ drivers/media/usb/tm6000/tm6000-usb-isoc.h | 2 +-
+ drivers/media/usb/tm6000/tm6000.h | 2 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 29 +-
+ drivers/media/usb/uvc/uvc_driver.c | 28 +-
+ drivers/media/usb/uvc/uvc_metadata.c | 4 +-
+ drivers/media/usb/uvc/uvc_queue.c | 2 +-
+ drivers/media/usb/uvc/uvcvideo.h | 2 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 7 +-
+ drivers/media/v4l2-core/v4l2-common.c | 128 ++-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 199 +++-
+ drivers/media/v4l2-core/v4l2-dev.c | 112 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 1 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 77 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 190 +++-
+ drivers/media/v4l2-core/v4l2-subdev.c | 6 +-
+ drivers/staging/media/allegro-dvt/nal-h264.c | 2 +-
+ drivers/staging/media/hantro/hantro.h | 20 +-
+ drivers/staging/media/hantro/hantro_drv.c | 16 +-
+ drivers/staging/media/hantro/hantro_g1_h264_dec.c | 52 +-
+ drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 11 +-
+ drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 11 +-
+ drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +-
+ drivers/staging/media/hantro/hantro_h264.c | 120 +-
+ drivers/staging/media/hantro/hantro_hw.h | 7 +-
+ drivers/staging/media/hantro/hantro_v4l2.c | 48 +-
+ drivers/staging/media/hantro/rk3288_vpu_hw.c | 20 +-
+ drivers/staging/media/hantro/rk3399_vpu_hw.c | 12 +-
+ .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +-
+ .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 11 +-
+ .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 12 +-
+ drivers/staging/media/imx/imx-ic-prp.c | 25 +-
+ drivers/staging/media/imx/imx-ic-prpencvf.c | 51 +-
+ drivers/staging/media/imx/imx-media-capture.c | 21 +-
+ drivers/staging/media/imx/imx-media-csi.c | 41 +-
+ drivers/staging/media/imx/imx-media-utils.c | 10 +-
+ drivers/staging/media/imx/imx-media-vdic.c | 27 +-
+ drivers/staging/media/imx/imx6-mipi-csi2.c | 27 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 38 +-
+ drivers/staging/media/imx/imx7-mipi-csis.c | 36 +-
+ drivers/staging/media/ipu3/Makefile | 6 -
+ drivers/staging/media/ipu3/TODO | 5 -
+ drivers/staging/media/ipu3/include/intel-ipu3.h | 5 +
+ drivers/staging/media/omap4iss/iss.c | 6 +-
+ drivers/staging/media/omap4iss/iss_video.c | 4 +-
+ drivers/staging/media/sunxi/cedrus/Makefile | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 64 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 33 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 9 +
+ drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 147 ++-
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 616 ++++++++++
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 33 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.h | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 318 +++++-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 102 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.h | 1 +
+ include/media/cec-pin.h | 10 +-
+ include/media/cec.h | 31 -
+ include/media/dvb-usb-ids.h | 1 +
+ include/media/hevc-ctrls.h | 212 ++++
+ include/media/i2c/smiapp.h | 1 -
+ include/media/rc-map.h | 24 +-
+ include/media/v4l2-common.h | 33 +-
+ include/media/v4l2-ctrls.h | 87 ++
+ include/media/v4l2-device.h | 2 +-
+ include/media/v4l2-mem2mem.h | 44 +-
+ include/media/videobuf2-core.h | 3 +
+ include/media/videobuf2-v4l2.h | 5 +
+ include/uapi/linux/cec-funcs.h | 34 +-
+ include/uapi/linux/cec.h | 133 ++-
+ include/uapi/linux/v4l2-controls.h | 1 +
+ include/uapi/linux/videodev2.h | 22 +-
+ 297 files changed, 12813 insertions(+), 4687 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/imx290.txt
+ delete mode 100644 Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
+ create mode 100644 Documentation/devicetree/bindings/media/ti,vpe.yaml
+ create mode 100644 Documentation/media/uapi/cec/cec-ioc-adap-g-conn-info.rst
+ create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vivid.rst
+ create mode 100644 Documentation/media/v4l-drivers/ipu3_rcb.svg
+ create mode 100644 drivers/media/i2c/hi556.c
+ create mode 100644 drivers/media/i2c/imx290.c
+ create mode 100644 drivers/media/platform/sunxi/sun8i-di/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
+ create mode 100644 drivers/media/platform/sunxi/sun8i-di/sun8i-di.h
+ create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c
+ create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
+ create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c
+ create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h
+ create mode 100644 drivers/media/rc/keymaps/rc-beelink-gs1.c
+ create mode 100644 drivers/media/rc/keymaps/rc-vega-s9x.c
+ delete mode 100644 drivers/media/usb/dvb-usb-v2/gl861.h
+ create mode 100644 drivers/staging/media/sunxi/cedrus/cedrus_h265.c
+ create mode 100644 include/media/hevc-ctrls.h
+Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4)
+$ git merge v4l-dvb-next/master
+Already up to date.
+Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
+$ git merge fbdev/fbdev-for-next
+Already up to date.
+Merging pm/linux-next (16512c3e4523 Merge branches 'pm-cpuidle' and 'pm-docs' into linux-next)
+$ git merge pm/linux-next
+Auto-merging scripts/checkpatch.pl
+CONFLICT (content): Merge conflict in scripts/checkpatch.pl
+Auto-merging lib/vsprintf.c
+Auto-merging lib/test_printf.c
+CONFLICT (content): Merge conflict in lib/test_printf.c
+Auto-merging lib/Makefile
+Removing drivers/cpufreq/arm_big_little.h
+Removing drivers/cpufreq/arm_big_little.c
+Removing drivers/acpi/hmat/Makefile
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging arch/arm/boot/dts/omap3-igep0030-rev-g.dts
+Auto-merging arch/arm/boot/dts/omap3-igep0020-rev-f.dts
+Auto-merging arch/arm/boot/dts/am3517.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/power/pci.rst
+CONFLICT (content): Merge conflict in Documentation/power/pci.rst
+Auto-merging Documentation/core-api/printk-formats.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Recorded preimage for 'Documentation/power/pci.rst'
+Resolved 'lib/test_printf.c' using previous resolution.
+Resolved 'scripts/checkpatch.pl' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'Documentation/power/pci.rst'.
+[master dcf25d486bd2] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 19 +-
+ Documentation/core-api/printk-formats.rst | 34 +-
+ .../devicetree/bindings/arm/omap/omap.txt | 30 +-
+ .../devicetree/bindings/cpufreq/ti-cpufreq.txt | 6 +-
+ .../bindings/devfreq/event/exynos-ppmu.txt | 26 +-
+ .../devicetree/bindings/devfreq/exynos-bus.txt | 2 -
+ Documentation/firmware-guide/acpi/namespace.rst | 2 +-
+ Documentation/power/drivers-testing.rst | 7 +-
+ Documentation/power/freezing-of-tasks.rst | 37 +-
+ Documentation/power/opp.rst | 32 +-
+ Documentation/power/pci.rst | 10 +-
+ Documentation/power/pm_qos_interface.rst | 26 +-
+ Documentation/power/runtime_pm.rst | 4 +-
+ Documentation/power/suspend-and-cpuhotplug.rst | 7 +-
+ Documentation/power/swsusp.rst | 14 +-
+ MAINTAINERS | 23 +-
+ arch/arm/boot/dts/am3517.dtsi | 31 +
+ arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +-
+ arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 2 +-
+ arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 2 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
+ arch/arm/boot/dts/omap3-beagle.dts | 2 +-
+ arch/arm/boot/dts/omap3-cm-t3530.dts | 2 +-
+ arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +-
+ arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 2 +-
+ arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 2 +-
+ arch/arm/boot/dts/omap3-devkit8000.dts | 2 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +-
+ arch/arm/boot/dts/omap3-ha.dts | 2 +-
+ arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +-
+ arch/arm/boot/dts/omap3-igep0020.dts | 2 +-
+ arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +-
+ arch/arm/boot/dts/omap3-igep0030.dts | 2 +-
+ arch/arm/boot/dts/omap3-ldp.dts | 2 +-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-lilly-dbb056.dts | 2 +-
+ arch/arm/boot/dts/omap3-n9.dts | 2 +-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 7 -
+ arch/arm/boot/dts/omap3-n950.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-alto35.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-gallop43.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-palo43.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-summit.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 2 +-
+ arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 2 +-
+ arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +-
+ arch/arm/boot/dts/omap3-sbc-t3530.dts | 2 +-
+ arch/arm/boot/dts/omap3-sbc-t3730.dts | 2 +-
+ arch/arm/boot/dts/omap3-sniper.dts | 2 +-
+ arch/arm/boot/dts/omap3-thunder.dts | 2 +-
+ arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
+ arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
+ arch/arm/boot/dts/omap34xx.dtsi | 66 ++-
+ arch/arm/boot/dts/omap36xx.dtsi | 65 +-
+ arch/arm/mach-imx/cpuidle-imx6q.c | 4 +-
+ arch/arm/mach-tegra/cpuidle-tegra20.c | 2 +-
+ arch/arm64/mm/mmu.c | 2 +
+ arch/x86/boot/compressed/eboot.c | 6 +-
+ arch/x86/boot/compressed/kaslr.c | 46 +-
+ arch/x86/include/asm/e820/types.h | 8 +
+ arch/x86/include/asm/efi.h | 17 +-
+ arch/x86/kernel/e820.c | 12 +-
+ arch/x86/kernel/setup.c | 18 +-
+ arch/x86/platform/efi/efi.c | 54 +-
+ arch/x86/platform/efi/quirks.c | 3 +
+ drivers/acpi/Kconfig | 23 +-
+ drivers/acpi/Makefile | 8 +-
+ drivers/acpi/acpi_configfs.c | 4 +-
+ drivers/acpi/acpi_lpss.c | 48 +-
+ drivers/acpi/acpi_platform.c | 43 ++
+ drivers/acpi/acpi_video.c | 8 +-
+ drivers/acpi/acpica/acdebug.h | 2 +
+ drivers/acpi/acpica/acstruct.h | 10 +
+ drivers/acpi/acpica/acutils.h | 9 +-
+ drivers/acpi/acpica/dbconvert.c | 4 +
+ drivers/acpi/acpica/dbdisply.c | 2 -
+ drivers/acpi/acpica/dbfileio.c | 2 +-
+ drivers/acpi/acpica/dbinput.c | 36 +-
+ drivers/acpi/acpica/dbmethod.c | 4 +
+ drivers/acpi/acpica/dbnames.c | 114 ++++
+ drivers/acpi/acpica/dbobject.c | 1 -
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 12 +-
+ drivers/acpi/acpica/evgpeblk.c | 11 +-
+ drivers/acpi/acpica/evgpeinit.c | 3 -
+ drivers/acpi/acpica/evmisc.c | 12 +-
+ drivers/acpi/acpica/evregion.c | 4 +-
+ drivers/acpi/acpica/evrgnini.c | 1 -
+ drivers/acpi/acpica/hwxfsleep.c | 3 +
+ drivers/acpi/acpica/nsconvert.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 6 +-
+ drivers/acpi/acpica/nsxfname.c | 4 +-
+ drivers/acpi/acpica/psobject.c | 7 +-
+ drivers/acpi/acpica/rscreate.c | 3 +
+ drivers/acpi/acpica/tbdata.c | 3 +
+ drivers/acpi/acpica/tbxfload.c | 40 +-
+ drivers/acpi/acpica/utbuffer.c | 52 +-
+ drivers/acpi/acpica/utids.c | 2 -
+ drivers/acpi/acpica/uttrack.c | 2 +-
+ drivers/acpi/button.c | 139 +++--
+ drivers/acpi/ec.c | 195 ++++--
+ drivers/acpi/hmat/Makefile | 2 -
+ drivers/acpi/internal.h | 3 +-
+ drivers/acpi/{hmat => numa}/Kconfig | 7 +
+ drivers/acpi/numa/Makefile | 3 +
+ drivers/acpi/{hmat => numa}/hmat.c | 158 ++++-
+ drivers/acpi/{numa.c => numa/srat.c} | 0
+ drivers/acpi/osi.c | 6 +-
+ drivers/acpi/pmic/intel_pmic.c | 20 +-
+ .../pmic/{intel_pmic_crc.c => intel_pmic_bytcrc.c} | 4 +-
+ drivers/acpi/pmic/intel_pmic_chtcrc.c | 44 ++
+ drivers/acpi/processor_idle.c | 21 +-
+ drivers/acpi/property.c | 48 ++
+ drivers/acpi/scan.c | 1 +
+ drivers/acpi/utils.c | 32 +
+ drivers/base/power/common.c | 20 +
+ drivers/base/power/domain.c | 40 +-
+ drivers/base/power/power.h | 30 +-
+ drivers/base/power/wakeirq.c | 4 +-
+ drivers/base/property.c | 83 ++-
+ drivers/base/swnode.c | 258 +++-----
+ drivers/cpufreq/Kconfig.arm | 12 +-
+ drivers/cpufreq/Makefile | 2 -
+ drivers/cpufreq/arm_big_little.c | 658 ---------------------
+ drivers/cpufreq/arm_big_little.h | 43 --
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +-
+ drivers/cpufreq/cpufreq.c | 18 +-
+ drivers/cpufreq/imx-cpufreq-dt.c | 20 +-
+ drivers/cpufreq/intel_pstate.c | 30 +-
+ drivers/cpufreq/powernv-cpufreq.c | 17 +-
+ drivers/cpufreq/s3c64xx-cpufreq.c | 7 -
+ drivers/cpufreq/scpi-cpufreq.c | 2 -
+ drivers/cpufreq/sun50i-cpufreq-nvmem.c | 25 +-
+ drivers/cpufreq/ti-cpufreq.c | 119 +++-
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 584 +++++++++++++++++-
+ drivers/cpuidle/cpuidle-powernv.c | 7 +-
+ drivers/cpuidle/cpuidle.c | 72 +--
+ drivers/cpuidle/driver.c | 72 ++-
+ drivers/cpuidle/governor.c | 7 +-
+ drivers/cpuidle/governors/haltpoll.c | 7 +-
+ drivers/cpuidle/governors/ladder.c | 29 +-
+ drivers/cpuidle/governors/menu.c | 131 ++--
+ drivers/cpuidle/governors/teo.c | 182 ++++--
+ drivers/cpuidle/poll_state.c | 2 +
+ drivers/cpuidle/sysfs.c | 71 ++-
+ drivers/dax/Kconfig | 27 +-
+ drivers/dax/Makefile | 2 +
+ drivers/dax/bus.c | 2 +-
+ drivers/dax/bus.h | 2 +-
+ drivers/dax/dax-private.h | 2 +-
+ drivers/dax/hmem.c | 56 ++
+ drivers/devfreq/devfreq.c | 33 +-
+ drivers/devfreq/event/exynos-ppmu.c | 1 -
+ drivers/devfreq/governor.h | 3 +
+ drivers/devfreq/tegra30-devfreq.c | 417 +++++++++----
+ drivers/firmware/efi/Kconfig | 21 +
+ drivers/firmware/efi/Makefile | 5 +-
+ drivers/firmware/efi/apple-properties.c | 18 +-
+ drivers/firmware/efi/arm-init.c | 9 +
+ drivers/firmware/efi/arm-runtime.c | 24 +
+ drivers/firmware/efi/efi.c | 15 +-
+ drivers/firmware/efi/esrt.c | 3 +
+ drivers/firmware/efi/fake_mem.c | 26 +-
+ drivers/firmware/efi/fake_mem.h | 10 +
+ drivers/firmware/efi/libstub/arm32-stub.c | 5 +
+ drivers/firmware/efi/libstub/efi-stub-helper.c | 19 +
+ drivers/firmware/efi/libstub/random.c | 4 +
+ drivers/firmware/efi/x86_fake_mem.c | 69 +++
+ drivers/iommu/amd_iommu.c | 30 +-
+ drivers/mfd/intel_soc_pmic_crc.c | 2 +-
+ drivers/mmc/host/sdhci-acpi.c | 49 +-
+ drivers/mmc/host/tmio_mmc.h | 1 -
+ drivers/mmc/host/tmio_mmc_core.c | 10 +-
+ drivers/nvdimm/Kconfig | 1 +
+ drivers/nvdimm/core.c | 1 -
+ drivers/nvdimm/nd-core.h | 1 -
+ drivers/nvdimm/region_devs.c | 13 +-
+ drivers/of/property.c | 16 +
+ drivers/power/avs/smartreflex.c | 2 +-
+ drivers/powercap/intel_rapl_common.c | 2 +
+ include/acpi/acpi_bus.h | 8 +-
+ include/acpi/acpixf.h | 8 +-
+ include/acpi/button.h | 12 -
+ include/dt-bindings/pmu/exynos_ppmu.h | 25 +
+ include/linux/acpi.h | 8 +
+ include/linux/cpu.h | 7 +-
+ include/linux/cpuidle.h | 27 +-
+ include/linux/efi.h | 16 +-
+ include/linux/fwnode.h | 10 +-
+ include/linux/ioport.h | 1 +
+ include/linux/memregion.h | 23 +
+ include/linux/pm.h | 2 +
+ include/linux/pm_domain.h | 5 +
+ include/linux/power/smartreflex.h | 3 +
+ include/linux/property.h | 106 ++--
+ kernel/power/snapshot.c | 9 +-
+ kernel/sched/idle.c | 24 +-
+ lib/Kconfig | 3 +
+ lib/Makefile | 1 +
+ lib/memregion.c | 18 +
+ lib/test_printf.c | 32 +
+ lib/vsprintf.c | 93 +--
+ scripts/checkpatch.pl | 9 +-
+ tools/power/cpupower/ToDo | 14 +
+ tools/power/cpupower/utils/cpupower-info.c | 9 +
+ tools/power/cpupower/utils/cpupower-set.c | 9 +
+ tools/power/cpupower/utils/helpers/cpuid.c | 4 +
+ tools/power/cpupower/utils/helpers/helpers.h | 1 +
+ .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +-
+ .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +-
+ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 2 +-
+ .../cpupower/utils/idle_monitor/cpupower-monitor.h | 5 +-
+ .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 3 +-
+ .../cpupower/utils/idle_monitor/mperf_monitor.c | 64 +-
+ tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 2 +-
+ 219 files changed, 3788 insertions(+), 2100 deletions(-)
+ delete mode 100644 drivers/acpi/hmat/Makefile
+ rename drivers/acpi/{hmat => numa}/Kconfig (75%)
+ create mode 100644 drivers/acpi/numa/Makefile
+ rename drivers/acpi/{hmat => numa}/hmat.c (82%)
+ rename drivers/acpi/{numa.c => numa/srat.c} (100%)
+ rename drivers/acpi/pmic/{intel_pmic_crc.c => intel_pmic_bytcrc.c} (98%)
+ create mode 100644 drivers/acpi/pmic/intel_pmic_chtcrc.c
+ delete mode 100644 drivers/cpufreq/arm_big_little.c
+ delete mode 100644 drivers/cpufreq/arm_big_little.h
+ create mode 100644 drivers/dax/hmem.c
+ create mode 100644 drivers/firmware/efi/fake_mem.h
+ create mode 100644 drivers/firmware/efi/x86_fake_mem.c
+ create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h
+ create mode 100644 include/linux/memregion.h
+ create mode 100644 lib/memregion.c
+Merging cpufreq-arm/cpufreq/arm/linux-next (c23734487fb4 cpufreq: sun50i: Fix CPU speed bin detection)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (4611a4fb0cce cpupower: ToDo: Update ToDo with ideas for per_cpu_schedule handling)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging opp/opp/linux-next (25cb20a212a1 PM / OPP: Support adjusting OPP voltages at runtime)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (def0aa869050 thermal: Fix deadlock in thermal thermal_zone_device_check)
+$ git merge thermal/thermal/linux-next
+Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c
+Auto-merging drivers/clk/qcom/gcc-sdm845.c
+Auto-merging drivers/clk/qcom/clk-rpmh.c
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/amlogic,thermal.yaml | 54 +++
+ .../devicetree/bindings/thermal/qcom-tsens.txt | 55 ---
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 170 +++++++
+ .../bindings/thermal/rcar-gen3-thermal.txt | 1 +
+ Documentation/driver-api/thermal/sysfs-api.rst | 26 +-
+ MAINTAINERS | 10 +
+ arch/arm64/configs/defconfig | 1 +
+ drivers/clk/qcom/clk-rpmh.c | 2 +-
+ drivers/clk/qcom/gcc-qcs404.c | 2 +-
+ drivers/clk/qcom/gcc-sdm845.c | 2 +-
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +-
+ drivers/cpufreq/cpufreq_conservative.c | 2 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 2 +-
+ drivers/cpufreq/cpufreq_performance.c | 2 +-
+ drivers/cpufreq/cpufreq_powersave.c | 2 +-
+ drivers/cpufreq/cpufreq_userspace.c | 2 +-
+ drivers/cpufreq/qcom-cpufreq-hw.c | 2 +-
+ drivers/thermal/Kconfig | 12 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/amlogic_thermal.c | 333 +++++++++++++
+ drivers/thermal/cpu_cooling.c | 404 +++++++---------
+ drivers/thermal/qcom/tsens-8960.c | 4 +-
+ drivers/thermal/qcom/tsens-common.c | 529 +++++++++++++++++++--
+ drivers/thermal/qcom/tsens-v0_1.c | 11 +
+ drivers/thermal/qcom/tsens-v1.c | 198 +++++++-
+ drivers/thermal/qcom/tsens-v2.c | 13 +
+ drivers/thermal/qcom/tsens.c | 62 ++-
+ drivers/thermal/qcom/tsens.h | 288 +++++++++--
+ drivers/thermal/qoriq_thermal.c | 120 ++++-
+ drivers/thermal/rcar_gen3_thermal.c | 4 +
+ drivers/thermal/thermal-generic-adc.c | 9 +-
+ drivers/thermal/thermal_core.c | 107 +----
+ drivers/thermal/thermal_mmio.c | 1 -
+ include/linux/cpu_cooling.h | 18 +-
+ include/linux/energy_model.h | 3 +-
+ include/linux/thermal.h | 11 -
+ kernel/sched/cpufreq_schedutil.c | 2 +-
+ 37 files changed, 1878 insertions(+), 589 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+ create mode 100644 drivers/thermal/amlogic_thermal.c
+Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge thermal-rzhang/next
+Already up to date.
+Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (7807759e4ad8 firewire: core: code cleanup after vm_map_pages_zero introduction)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/core-cdev.c | 3 ++-
+ drivers/firewire/core-iso.c | 7 -------
+ drivers/firewire/core.h | 2 --
+ drivers/firewire/ohci.c | 2 +-
+ 4 files changed, 3 insertions(+), 11 deletions(-)
+Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
+$ git merge swiotlb/linux-next
+Auto-merging include/linux/page-flags.h
+Auto-merging drivers/xen/swiotlb-xen.c
+Merge made by the 'recursive' strategy.
+Merging rdma/for-next (9067f2f0b41d RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()')
+$ git merge rdma/for-next
+Removing include/uapi/rdma/nes-abi.h
+Removing include/uapi/rdma/cxgb3-abi.h
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/dma-mapping.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/infiniband/sw/siw/siw_verbs.c
+Auto-merging drivers/infiniband/hw/qedr/main.c
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/infiniband/hw/mlx5/mr.c
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_srq.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+Auto-merging drivers/infiniband/hw/cxgb4/cm.c
+Removing drivers/infiniband/hw/cxgb3/tcb.h
+Removing drivers/infiniband/hw/cxgb3/iwch_qp.c
+Removing drivers/infiniband/hw/cxgb3/iwch_provider.h
+Removing drivers/infiniband/hw/cxgb3/iwch_provider.c
+Removing drivers/infiniband/hw/cxgb3/iwch_mem.c
+Removing drivers/infiniband/hw/cxgb3/iwch_ev.c
+Removing drivers/infiniband/hw/cxgb3/iwch_cq.c
+Removing drivers/infiniband/hw/cxgb3/iwch_cm.h
+Removing drivers/infiniband/hw/cxgb3/iwch_cm.c
+Removing drivers/infiniband/hw/cxgb3/iwch.h
+Removing drivers/infiniband/hw/cxgb3/iwch.c
+Removing drivers/infiniband/hw/cxgb3/cxio_wr.h
+Removing drivers/infiniband/hw/cxgb3/cxio_resource.h
+Removing drivers/infiniband/hw/cxgb3/cxio_resource.c
+Removing drivers/infiniband/hw/cxgb3/cxio_hal.h
+Removing drivers/infiniband/hw/cxgb3/cxio_hal.c
+Removing drivers/infiniband/hw/cxgb3/Makefile
+Removing drivers/infiniband/hw/cxgb3/Kconfig
+Auto-merging drivers/infiniband/core/verbs.c
+Auto-merging drivers/infiniband/core/nldev.c
+Auto-merging drivers/infiniband/core/device.c
+Auto-merging drivers/infiniband/core/core_priv.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-api/index.rst
+Resolved 'drivers/infiniband/hw/mlx5/mr.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ead6b4c7e707] Merge remote-tracking branch 'rdma/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-class-infiniband | 19 -
+ Documentation/ABI/stable/sysfs-driver-ib_srp | 2 +
+ Documentation/DMA-attributes.txt | 18 -
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/driver-api/infiniband.rst | 127 ++
+ MAINTAINERS | 8 -
+ drivers/infiniband/Kconfig | 1 -
+ drivers/infiniband/core/Makefile | 2 +-
+ drivers/infiniband/core/cache.c | 8 +-
+ drivers/infiniband/core/cm.c | 42 +-
+ drivers/infiniband/core/cm_msgs.h | 32 +-
+ drivers/infiniband/core/cma.c | 107 +-
+ drivers/infiniband/core/core_priv.h | 11 +
+ drivers/infiniband/core/counters.c | 40 +-
+ drivers/infiniband/core/device.c | 49 +-
+ drivers/infiniband/core/ib_core_uverbs.c | 335 +++
+ drivers/infiniband/core/iwpm_util.h | 5 +-
+ drivers/infiniband/core/mad.c | 31 +-
+ drivers/infiniband/core/nldev.c | 141 +-
+ drivers/infiniband/core/rdma_core.c | 1 +
+ drivers/infiniband/core/restrack.c | 20 +-
+ drivers/infiniband/core/restrack.h | 1 -
+ drivers/infiniband/core/rw.c | 25 +-
+ drivers/infiniband/core/sa_query.c | 2 +-
+ drivers/infiniband/core/sysfs.c | 12 +-
+ drivers/infiniband/core/umem.c | 12 +-
+ drivers/infiniband/core/umem_odp.c | 38 +-
+ drivers/infiniband/core/uverbs_cmd.c | 2 +
+ drivers/infiniband/core/uverbs_ioctl.c | 3 +
+ drivers/infiniband/core/uverbs_main.c | 84 +-
+ drivers/infiniband/core/verbs.c | 2 +
+ drivers/infiniband/hw/Makefile | 1 -
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 +
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 28 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 -
+ drivers/infiniband/hw/bnxt_re/main.c | 134 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 5 +-
+ drivers/infiniband/hw/cxgb3/Kconfig | 19 -
+ drivers/infiniband/hw/cxgb3/Makefile | 7 -
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 1312 ------------
+ drivers/infiniband/hw/cxgb3/cxio_hal.h | 204 --
+ drivers/infiniband/hw/cxgb3/cxio_resource.c | 344 ---
+ drivers/infiniband/hw/cxgb3/cxio_resource.h | 69 -
+ drivers/infiniband/hw/cxgb3/cxio_wr.h | 802 -------
+ drivers/infiniband/hw/cxgb3/iwch.c | 282 ---
+ drivers/infiniband/hw/cxgb3/iwch.h | 155 --
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 2258 --------------------
+ drivers/infiniband/hw/cxgb3/iwch_cm.h | 233 --
+ drivers/infiniband/hw/cxgb3/iwch_cq.c | 230 --
+ drivers/infiniband/hw/cxgb3/iwch_ev.c | 232 --
+ drivers/infiniband/hw/cxgb3/iwch_mem.c | 101 -
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 1321 ------------
+ drivers/infiniband/hw/cxgb3/iwch_provider.h | 347 ---
+ drivers/infiniband/hw/cxgb3/iwch_qp.c | 1082 ----------
+ drivers/infiniband/hw/cxgb3/tcb.h | 632 ------
+ drivers/infiniband/hw/cxgb4/cm.c | 4 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 2 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 7 +-
+ drivers/infiniband/hw/efa/efa.h | 11 +-
+ drivers/infiniband/hw/efa/efa_com.c | 5 +-
+ drivers/infiniband/hw/efa/efa_main.c | 1 +
+ drivers/infiniband/hw/efa/efa_verbs.c | 339 ++-
+ drivers/infiniband/hw/hfi1/mad.c | 17 +-
+ drivers/infiniband/hw/hfi1/verbs.h | 5 +-
+ drivers/infiniband/hw/hns/Kconfig | 17 +-
+ drivers/infiniband/hw/hns/Makefile | 8 +-
+ drivers/infiniband/hw/hns/hns_roce_ah.c | 14 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 4 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 14 +-
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 53 +-
+ drivers/infiniband/hw/hns/hns_roce_db.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 28 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 12 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 63 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 4 +-
+ drivers/infiniband/hw/hns/hns_roce_main.c | 17 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 69 +-
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 54 +-
+ drivers/infiniband/hw/hns/hns_roce_restrack.c | 10 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 86 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +-
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 +-
+ drivers/infiniband/hw/mlx4/cq.c | 2 +-
+ drivers/infiniband/hw/mlx4/doorbell.c | 2 +-
+ drivers/infiniband/hw/mlx4/mad.c | 30 +-
+ drivers/infiniband/hw/mlx4/main.c | 9 +-
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 7 +-
+ drivers/infiniband/hw/mlx4/mr.c | 2 +-
+ drivers/infiniband/hw/mlx4/qp.c | 5 +-
+ drivers/infiniband/hw/mlx4/srq.c | 2 +-
+ drivers/infiniband/hw/mlx5/Makefile | 2 +-
+ drivers/infiniband/hw/mlx5/cq.c | 37 +-
+ drivers/infiniband/hw/mlx5/devx.c | 25 +-
+ drivers/infiniband/hw/mlx5/doorbell.c | 2 +-
+ drivers/infiniband/hw/mlx5/flow.c | 29 +-
+ drivers/infiniband/hw/mlx5/gsi.c | 2 +-
+ drivers/infiniband/hw/mlx5/mad.c | 124 +-
+ drivers/infiniband/hw/mlx5/main.c | 64 +-
+ drivers/infiniband/hw/mlx5/mem.c | 199 ++
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 60 +-
+ drivers/infiniband/hw/mlx5/mr.c | 177 +-
+ drivers/infiniband/hw/mlx5/odp.c | 989 +++++----
+ drivers/infiniband/hw/mlx5/qp.c | 16 +-
+ drivers/infiniband/hw/mlx5/restrack.c | 90 +
+ drivers/infiniband/hw/mlx5/srq.c | 2 +-
+ drivers/infiniband/hw/mthca/mthca_dev.h | 12 +-
+ drivers/infiniband/hw/mthca/mthca_mad.c | 74 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 4 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 33 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 11 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 -
+ drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 9 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.h | 3 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 8 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 -
+ drivers/infiniband/hw/qedr/main.c | 5 +-
+ drivers/infiniband/hw/qedr/qedr.h | 72 +-
+ drivers/infiniband/hw/qedr/qedr_iw_cm.c | 150 +-
+ drivers/infiniband/hw/qedr/verbs.c | 638 ++++--
+ drivers/infiniband/hw/qedr/verbs.h | 12 +-
+ drivers/infiniband/hw/qib/qib_iba6120.c | 1 -
+ drivers/infiniband/hw/qib/qib_mad.c | 38 +-
+ drivers/infiniband/hw/qib/qib_sysfs.c | 6 +
+ drivers/infiniband/hw/qib/qib_verbs.h | 5 +-
+ 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_mr.c | 2 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 119 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 +-
+ drivers/infiniband/sw/rdmavt/ah.c | 1 -
+ drivers/infiniband/sw/rdmavt/cq.c | 2 -
+ drivers/infiniband/sw/rdmavt/mr.c | 2 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 30 +-
+ drivers/infiniband/sw/rdmavt/vt.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe.c | 13 -
+ drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_param.h | 13 -
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 7 +
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 1 +
+ drivers/infiniband/sw/siw/siw.h | 31 +-
+ drivers/infiniband/sw/siw/siw_cm.c | 45 +-
+ drivers/infiniband/sw/siw/siw_main.c | 35 +-
+ drivers/infiniband/sw/siw/siw_verbs.c | 338 +--
+ drivers/infiniband/sw/siw/siw_verbs.h | 1 +
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 5 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 34 +-
+ drivers/infiniband/ulp/iser/iser_initiator.c | 5 +
+ drivers/infiniband/ulp/iser/iser_memory.c | 6 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 72 +-
+ .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 8 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 47 +-
+ drivers/infiniband/ulp/srp/ib_srp.h | 4 +
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 247 ++-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 58 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 -
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 28 +-
+ include/linux/dma-mapping.h | 5 +-
+ include/linux/mlx5/driver.h | 4 -
+ include/linux/mlx5/mlx5_ifc.h | 2 +-
+ include/rdma/ib_cm.h | 32 +-
+ include/rdma/ib_mad.h | 40 -
+ include/rdma/ib_umem.h | 4 +-
+ include/rdma/ib_umem_odp.h | 18 -
+ include/rdma/ib_verbs.h | 73 +-
+ include/rdma/restrack.h | 5 +
+ include/uapi/rdma/cxgb3-abi.h | 82 -
+ include/uapi/rdma/ib_user_ioctl_verbs.h | 22 +
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 +
+ include/uapi/rdma/nes-abi.h | 115 -
+ include/uapi/rdma/qedr-abi.h | 25 +
+ include/uapi/rdma/rdma_user_ioctl_cmds.h | 22 -
+ include/uapi/rdma/vmw_pvrdma-abi.h | 5 +
+ 174 files changed, 3852 insertions(+), 12583 deletions(-)
+ create mode 100644 Documentation/driver-api/infiniband.rst
+ create mode 100644 drivers/infiniband/core/ib_core_uverbs.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/Kconfig
+ delete mode 100644 drivers/infiniband/hw/cxgb3/Makefile
+ delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_hal.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_resource.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/cxio_wr.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cm.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_cq.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_ev.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_mem.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_provider.h
+ delete mode 100644 drivers/infiniband/hw/cxgb3/iwch_qp.c
+ delete mode 100644 drivers/infiniband/hw/cxgb3/tcb.h
+ create mode 100644 drivers/infiniband/hw/mlx5/restrack.c
+ delete mode 100644 include/uapi/rdma/cxgb3-abi.h
+ delete mode 100644 include/uapi/rdma/nes-abi.h
+Merging net-next/master (c392bccf2c10 powerpc: Add const qual to local_read() parameter)
+$ git merge net-next/master
+Auto-merging tools/testing/selftests/net/tcp_mmap.c
+Removing tools/testing/selftests/bpf/test_libbpf_open.c
+Removing tools/testing/selftests/bpf/test_libbpf.sh
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c
+Removing tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c
+Removing tools/testing/selftests/bpf/bpf_helpers.h
+Auto-merging net/sctp/endpointola.c
+Auto-merging net/sctp/associola.c
+Auto-merging include/net/sctp/structs.h
+Removing include/linux/vm_sockets.h
+Auto-merging include/linux/mlx5/driver.h
+Removing include/linux/can/platform/mcp251x.h
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/s390/net/qeth_l3_sys.c
+Auto-merging drivers/s390/net/qeth_l3.h
+Auto-merging drivers/s390/cio/qdio_main.c
+Auto-merging drivers/s390/cio/qdio.h
+Auto-merging drivers/net/ethernet/pensando/ionic/ionic_if.h
+Removing drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
+Auto-merging drivers/net/ethernet/faraday/ftgmac100.c
+Auto-merging drivers/isdn/hardware/mISDN/mISDNisar.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Removing drivers/bluetooth/btwilink.c
+Auto-merging arch/arm/configs/omap2plus_defconfig
+Auto-merging arch/arm/boot/dts/dra7-l4.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/networking/phy.rst
+Auto-merging Documentation/networking/devlink-trap.rst
+Auto-merging Documentation/networking/device_drivers/mellanox/mlx5.rst
+Removing Documentation/devicetree/bindings/net/sh_eth.txt
+Removing Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-net-statistics | 16 +
+ Documentation/bpf/index.rst | 9 +
+ Documentation/bpf/prog_flow_dissector.rst | 3 +
+ Documentation/bpf/s390.rst | 205 +
+ .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 6 +
+ .../devicetree/bindings/net/brcm,bcmgenet.txt | 2 +-
+ .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 +
+ .../bindings/net/ethernet-controller.yaml | 5 +
+ .../devicetree/bindings/net/ethernet-phy.yaml | 5 +
+ .../devicetree/bindings/net/ftgmac100.txt | 8 +
+ Documentation/devicetree/bindings/net/lpc-eth.txt | 5 +
+ .../devicetree/bindings/net/nfc/pn532.txt | 46 +
+ .../devicetree/bindings/net/nfc/pn533-i2c.txt | 29 -
+ .../devicetree/bindings/net/qca,ar803x.yaml | 111 +
+ .../devicetree/bindings/net/renesas,ether.yaml | 114 +
+ Documentation/devicetree/bindings/net/sh_eth.txt | 69 -
+ .../devicetree/bindings/net/ti,cpsw-switch.yaml | 240 +
+ .../devicetree/bindings/net/ti,dp83869.yaml | 84 +
+ .../bindings/net/wireless/qcom,ath10k.txt | 6 +
+ .../devicetree/bindings/ptp/ptp-idtcm.yaml | 69 +
+ Documentation/networking/af_xdp.rst | 277 +-
+ .../device_drivers/aquantia/atlantic.txt | 46 +-
+ .../networking/device_drivers/freescale/dpaa.txt | 12 +-
+ .../device_drivers/freescale/dpaa2/index.rst | 1 +
+ .../freescale/dpaa2/mac-phy-support.rst | 191 +
+ .../networking/device_drivers/mellanox/mlx5.rst | 21 +
+ .../device_drivers/ti/cpsw_switchdev.txt | 209 +
+ Documentation/networking/devlink-params-mlx5.txt | 17 +
+ .../networking/devlink-params-mv88e6xxx.txt | 7 +
+ .../networking/devlink-params-ti-cpsw-switch.txt | 10 +
+ Documentation/networking/devlink-params.txt | 4 +
+ Documentation/networking/devlink-trap.rst | 61 +
+ Documentation/networking/filter.txt | 8 +-
+ Documentation/networking/index.rst | 1 +
+ Documentation/networking/ip-sysctl.txt | 34 +
+ Documentation/networking/{nfc.txt => nfc.rst} | 74 +-
+ Documentation/networking/phy.rst | 3 +-
+ Documentation/networking/tls.rst | 26 +
+ MAINTAINERS | 33 +-
+ arch/arm/boot/dts/am571x-idk.dts | 27 +
+ arch/arm/boot/dts/am572x-idk.dts | 5 +
+ arch/arm/boot/dts/am574x-idk.dts | 5 +
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 5 -
+ arch/arm/boot/dts/dra7-l4.dtsi | 52 +
+ arch/arm/configs/omap2plus_defconfig | 1 +
+ arch/arm/mach-pxa/icontrol.c | 9 +-
+ arch/arm/mach-pxa/zeus.c | 9 +-
+ arch/powerpc/include/asm/local.h | 2 +-
+ arch/s390/net/bpf_jit_comp.c | 502 +-
+ arch/x86/include/asm/text-patching.h | 24 +-
+ arch/x86/kernel/alternative.c | 132 +-
+ arch/x86/kernel/jump_label.c | 9 +-
+ arch/x86/kernel/kprobes/opt.c | 11 +-
+ arch/x86/mm/Makefile | 2 +-
+ arch/x86/mm/maccess.c | 43 +
+ arch/x86/net/bpf_jit_comp.c | 531 +-
+ drivers/atm/firestream.c | 2 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 24 +-
+ drivers/bluetooth/Kconfig | 11 -
+ drivers/bluetooth/Makefile | 1 -
+ drivers/bluetooth/btintel.c | 45 +
+ drivers/bluetooth/btintel.h | 5 +
+ drivers/bluetooth/btmtksdio.c | 1 +
+ drivers/bluetooth/btqca.c | 92 +-
+ drivers/bluetooth/btqca.h | 32 +-
+ drivers/bluetooth/btrtl.c | 4 +-
+ drivers/bluetooth/btusb.c | 54 +-
+ drivers/bluetooth/btwilink.c | 337 -
+ drivers/bluetooth/hci_bcm.c | 3 +
+ drivers/bluetooth/hci_bcsp.c | 3 +
+ drivers/bluetooth/hci_ll.c | 39 +-
+ drivers/bluetooth/hci_nokia.c | 2 +-
+ drivers/bluetooth/hci_qca.c | 278 +-
+ drivers/bus/fsl-mc/dprc-driver.c | 6 +-
+ drivers/bus/fsl-mc/dprc.c | 53 +
+ drivers/bus/fsl-mc/fsl-mc-bus.c | 43 +
+ drivers/bus/fsl-mc/fsl-mc-private.h | 42 +
+ drivers/crypto/chelsio/Kconfig | 2 +-
+ drivers/crypto/chelsio/chcr_ipsec.c | 27 +-
+ drivers/crypto/chelsio/chtls/chtls.h | 5 +-
+ drivers/crypto/chelsio/chtls/chtls_io.c | 10 +-
+ drivers/crypto/chelsio/chtls/chtls_main.c | 20 +-
+ drivers/firewire/net.c | 6 +-
+ drivers/firmware/broadcom/Kconfig | 8 +
+ drivers/firmware/broadcom/Makefile | 1 +
+ drivers/firmware/broadcom/tee_bnxt_fw.c | 279 +
+ drivers/infiniband/hw/hfi1/sdma.c | 4 +-
+ drivers/infiniband/hw/mlx5/ib_rep.c | 2 +-
+ drivers/infiniband/hw/mlx5/ib_rep.h | 2 +-
+ drivers/infiniband/hw/mlx5/main.c | 41 +-
+ drivers/isdn/hardware/mISDN/Kconfig | 2 +-
+ drivers/isdn/hardware/mISDN/hfcsusb.h | 4 +-
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 1 -
+ drivers/misc/vmw_vmci/vmci_driver.c | 67 +
+ drivers/misc/vmw_vmci/vmci_driver.h | 2 +
+ drivers/misc/vmw_vmci/vmci_guest.c | 2 +
+ drivers/misc/vmw_vmci/vmci_host.c | 7 +
+ drivers/net/Kconfig | 64 +-
+ drivers/net/bonding/bond_main.c | 138 +-
+ drivers/net/caif/Kconfig | 46 +-
+ drivers/net/can/c_can/c_can_platform.c | 21 +-
+ drivers/net/can/dev.c | 5 +-
+ drivers/net/can/flexcan.c | 131 +-
+ drivers/net/can/grcan.c | 4 +-
+ drivers/net/can/ifi_canfd/ifi_canfd.c | 4 +-
+ drivers/net/can/m_can/m_can.c | 54 +-
+ drivers/net/can/peak_canfd/peak_canfd.c | 25 +-
+ drivers/net/can/peak_canfd/peak_canfd_user.h | 3 +-
+ drivers/net/can/peak_canfd/peak_pciefd_main.c | 6 +-
+ drivers/net/can/rcar/rcar_can.c | 4 +-
+ drivers/net/can/rcar/rcar_canfd.c | 4 +-
+ drivers/net/can/rx-offload.c | 122 +-
+ drivers/net/can/spi/mcp251x.c | 75 +-
+ drivers/net/can/sun4i_can.c | 4 +-
+ drivers/net/can/ti_hecc.c | 26 +-
+ drivers/net/can/xilinx_can.c | 102 +-
+ drivers/net/dsa/Kconfig | 3 +
+ drivers/net/dsa/Makefile | 1 +
+ drivers/net/dsa/b53/b53_common.c | 73 +-
+ drivers/net/dsa/b53/b53_priv.h | 8 +-
+ drivers/net/dsa/bcm_sf2.c | 37 +-
+ drivers/net/dsa/bcm_sf2.h | 3 +
+ drivers/net/dsa/bcm_sf2_cfp.c | 6 +-
+ drivers/net/dsa/dsa_loop.c | 5 +-
+ drivers/net/dsa/lan9303-core.c | 4 +-
+ drivers/net/dsa/lantiq_gswip.c | 4 +-
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 1 -
+ drivers/net/dsa/microchip/ksz_common.c | 12 +-
+ drivers/net/dsa/mt7530.c | 23 +-
+ drivers/net/dsa/mv88e6060.c | 4 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 519 +-
+ drivers/net/dsa/mv88e6xxx/chip.h | 25 +-
+ drivers/net/dsa/mv88e6xxx/global1.c | 60 +-
+ drivers/net/dsa/mv88e6xxx/global1.h | 12 +-
+ drivers/net/dsa/mv88e6xxx/global1_atu.c | 37 +
+ drivers/net/dsa/mv88e6xxx/global2.c | 13 +
+ drivers/net/dsa/mv88e6xxx/global2.h | 25 +-
+ drivers/net/dsa/mv88e6xxx/port.c | 37 +
+ drivers/net/dsa/mv88e6xxx/port.h | 3 +
+ drivers/net/dsa/ocelot/Kconfig | 11 +
+ drivers/net/dsa/ocelot/Makefile | 6 +
+ drivers/net/dsa/ocelot/felix.c | 530 +
+ drivers/net/dsa/ocelot/felix.h | 37 +
+ drivers/net/dsa/ocelot/felix_vsc9959.c | 583 +
+ drivers/net/dsa/qca8k.c | 14 +-
+ drivers/net/dsa/realtek-smi-core.c | 5 +-
+ drivers/net/dsa/sja1105/Kconfig | 1 +
+ drivers/net/dsa/sja1105/sja1105.h | 61 +-
+ drivers/net/dsa/sja1105/sja1105_clocking.c | 65 +-
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 12 +-
+ drivers/net/dsa/sja1105/sja1105_ethtool.c | 16 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 408 +-
+ drivers/net/dsa/sja1105/sja1105_ptp.c | 630 +-
+ drivers/net/dsa/sja1105/sja1105_ptp.h | 113 +-
+ drivers/net/dsa/sja1105/sja1105_spi.c | 409 +-
+ drivers/net/dsa/sja1105/sja1105_tas.c | 432 +-
+ drivers/net/dsa/sja1105/sja1105_tas.h | 27 +
+ drivers/net/dsa/vitesse-vsc73xx-core.c | 5 +-
+ drivers/net/dummy.c | 36 +-
+ drivers/net/ethernet/Kconfig | 1 -
+ drivers/net/ethernet/Makefile | 1 -
+ drivers/net/ethernet/altera/altera_tse_main.c | 6 +-
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 35 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 158 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h | 14 +-
+ drivers/net/ethernet/aquantia/atlantic/Makefile | 10 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 13 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 270 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.h | 1 +
+ .../net/ethernet/aquantia/atlantic/aq_filters.c | 17 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 72 +-
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 1 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 120 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 328 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 44 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 100 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_phy.c | 147 +
+ drivers/net/ethernet/aquantia/atlantic/aq_phy.h | 32 +
+ drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 1392 ++
+ drivers/net/ethernet/aquantia/atlantic/aq_ptp.h | 140 +
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 63 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 14 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 6 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 43 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 439 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 9 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 122 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 69 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 277 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 212 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 396 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 322 +-
+ drivers/net/ethernet/arc/emac_arc.c | 15 +-
+ drivers/net/ethernet/arc/emac_rockchip.c | 7 +-
+ drivers/net/ethernet/atheros/ag71xx.c | 5 +-
+ drivers/net/ethernet/aurora/nb8800.c | 4 +-
+ drivers/net/ethernet/aurora/nb8800.h | 2 +-
+ drivers/net/ethernet/broadcom/b44.c | 3 -
+ drivers/net/ethernet/broadcom/bcmsysport.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 132 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 351 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 16 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 328 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 48 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 59 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 66 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 4 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 95 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 416 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 20 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 14 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 3 +-
+ drivers/net/ethernet/broadcom/cnic.c | 2 +
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 97 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 +
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 55 +-
+ drivers/net/ethernet/cadence/Kconfig | 2 +-
+ drivers/net/ethernet/cadence/macb.h | 9 +-
+ drivers/net/ethernet/cadence/macb_main.c | 491 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 9 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4/Makefile | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 38 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 129 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 55 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 16 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 120 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 796 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 52 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 6 +
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 354 +
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h | 49 +
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 650 +
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h | 43 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 36 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 131 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 39 +
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 265 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.h | 11 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 1036 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 11 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 5 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 50 +
+ drivers/net/ethernet/faraday/ftgmac100.c | 56 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 370 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 12 +-
+ .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 6 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 68 +-
+ drivers/net/ethernet/freescale/dpaa2/Kconfig | 1 +
+ drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 172 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 11 +
+ .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 40 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 375 +
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 38 +
+ drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h | 73 +
+ drivers/net/ethernet/freescale/dpaa2/dpmac.c | 183 +
+ drivers/net/ethernet/freescale/dpaa2/dpmac.h | 226 +
+ drivers/net/ethernet/freescale/enetc/Kconfig | 10 +
+ drivers/net/ethernet/freescale/enetc/Makefile | 2 +
+ drivers/net/ethernet/freescale/enetc/enetc.c | 37 +-
+ drivers/net/ethernet/freescale/enetc/enetc.h | 15 +
+ drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 5 +-
+ .../net/ethernet/freescale/enetc/enetc_ethtool.c | 27 +
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 89 +-
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 7 +-
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 172 +
+ drivers/net/ethernet/freescale/fec_main.c | 8 +-
+ drivers/net/ethernet/freescale/fman/fman.c | 6 +-
+ drivers/net/ethernet/freescale/fman/fman_port.c | 17 +-
+ drivers/net/ethernet/freescale/fman/fman_port.h | 2 +
+ drivers/net/ethernet/freescale/fman/mac.c | 6 +-
+ drivers/net/ethernet/freescale/fs_enet/Kconfig | 8 +-
+ drivers/net/ethernet/freescale/gianfar.c | 7 +-
+ drivers/net/ethernet/freescale/gianfar.h | 8 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 7 +-
+ drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 5 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 5 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 27 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 93 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 588 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 36 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 45 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 7 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 39 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 188 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 547 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 22 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 100 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 47 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 8 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 10 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 114 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 3 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 30 +-
+ drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 5 +-
+ drivers/net/ethernet/ibm/emac/core.c | 5 +-
+ drivers/net/ethernet/ibm/emac/core.h | 2 +-
+ drivers/net/ethernet/ibm/emac/zmii.c | 3 +-
+ drivers/net/ethernet/ibm/emac/zmii.h | 3 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 26 +
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/hw.h | 12 +
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 7 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 276 +-
+ drivers/net/ethernet/intel/e1000e/ptp.c | 2 +
+ drivers/net/ethernet/intel/e1000e/regs.h | 4 +
+ drivers/net/ethernet/intel/fm10k/fm10k.h | 3 +
+ drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 48 +
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 1 +
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 3 +
+ drivers/net/ethernet/intel/fm10k/fm10k_tlv.h | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 71 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 118 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.h | 3 +
+ drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 41 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 36 +-
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 61 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 36 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 93 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 3 +-
+ drivers/net/ethernet/intel/ice/Makefile | 5 +-
+ drivers/net/ethernet/intel/ice/ice.h | 71 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 79 +
+ drivers/net/ethernet/intel/ice/ice_base.c | 859 ++
+ drivers/net/ethernet/intel/ice/ice_base.h | 31 +
+ drivers/net/ethernet/intel/ice/ice_common.c | 205 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 12 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 65 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.h | 7 +-
+ drivers/net/ethernet/intel/ice/ice_dcb.c | 6 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 313 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 28 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 933 ++
+ drivers/net/ethernet/intel/ice/ice_dcb_nl.h | 19 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 524 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 1327 +-
+ drivers/net/ethernet/intel/ice/ice_lib.h | 55 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 810 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.c | 51 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.h | 8 +
+ drivers/net/ethernet/intel/ice/ice_sched.c | 1267 +-
+ drivers/net/ethernet/intel/ice/ice_sched.h | 39 +
+ drivers/net/ethernet/intel/ice/ice_switch.c | 16 +-
+ drivers/net/ethernet/intel/ice/ice_switch.h | 5 -
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 600 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 140 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 273 +
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 59 +
+ drivers/net/ethernet/intel/ice/ice_type.h | 69 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 535 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 12 +
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 1181 ++
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 72 +
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 1 +
+ drivers/net/ethernet/intel/igb/igb_main.c | 28 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc.h | 1 -
+ drivers/net/ethernet/intel/igc/igc_defines.h | 8 +-
+ drivers/net/ethernet/intel/igc/igc_hw.h | 1 +
+ drivers/net/ethernet/intel/igc/igc_mac.c | 104 +
+ drivers/net/ethernet/intel/igc/igc_mac.h | 2 +
+ drivers/net/ethernet/intel/igc/igc_main.c | 231 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 +-
+ drivers/net/ethernet/marvell/Kconfig | 1 +
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 7 +-
+ drivers/net/ethernet/marvell/mvneta.c | 639 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 51 +-
+ drivers/net/ethernet/marvell/octeontx2/Kconfig | 9 +
+ drivers/net/ethernet/marvell/octeontx2/af/Makefile | 2 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 60 +
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 13 +
+ drivers/net/ethernet/marvell/octeontx2/af/common.h | 16 +
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 87 +-
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 28 +-
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h | 95 +-
+ .../ethernet/marvell/octeontx2/af/npc_profile.h | 14946 ++++++++++++++-----
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 116 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 217 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 130 +-
+ .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 1711 +++
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 876 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 55 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 187 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 28 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 36 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 4 +-
+ drivers/net/ethernet/mediatek/mtk_eth_path.c | 6 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 60 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +
+ drivers/net/ethernet/mediatek/mtk_sgmii.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 42 +
+ .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 34 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 7 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 47 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 163 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 588 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 91 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 273 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h | 10 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 61 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 218 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 30 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 65 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.h | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 78 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 6 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 13 +-
+ .../mellanox/mlx5/core/steering/dr_crc32.c | 98 -
+ .../mellanox/mlx5/core/steering/dr_domain.c | 3 -
+ .../mellanox/mlx5/core/steering/dr_matcher.c | 123 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 13 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 136 +-
+ .../mellanox/mlx5/core/steering/dr_types.h | 29 +-
+ .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h | 24 +
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 27 +-
+ drivers/net/ethernet/mellanox/mlx5/core/wq.c | 38 +-
+ drivers/net/ethernet/mellanox/mlx5/core/wq.h | 25 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 224 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 20 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 23 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 66 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 40 +-
+ drivers/net/ethernet/mellanox/mlxsw/emad.h | 7 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 34 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 18 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 7 +-
+ drivers/net/ethernet/mellanox/mlxsw/port.h | 2 -
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 78 +-
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 506 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 33 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 57 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 3 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 141 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 21 +
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 100 +
+ drivers/net/ethernet/mellanox/mlxsw/switchib.c | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 4 +-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 15 +
+ drivers/net/ethernet/microchip/lan743x_ptp.c | 299 +-
+ drivers/net/ethernet/microchip/lan743x_ptp.h | 27 +-
+ drivers/net/ethernet/mscc/ocelot.c | 1154 +-
+ drivers/net/ethernet/mscc/ocelot.h | 482 +-
+ drivers/net/ethernet/mscc/ocelot_ace.h | 4 +-
+ drivers/net/ethernet/mscc/ocelot_board.c | 154 +-
+ drivers/net/ethernet/mscc/ocelot_flower.c | 32 +-
+ drivers/net/ethernet/mscc/ocelot_io.c | 14 +-
+ drivers/net/ethernet/mscc/ocelot_police.c | 36 +-
+ drivers/net/ethernet/mscc/ocelot_police.h | 4 +-
+ drivers/net/ethernet/mscc/ocelot_regs.c | 3 +-
+ drivers/net/ethernet/mscc/ocelot_tc.c | 56 +-
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 8 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 3 +-
+ drivers/net/ethernet/ni/nixge.c | 5 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 59 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 28 +-
+ drivers/net/ethernet/pensando/ionic/ionic.h | 4 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c | 60 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h | 12 +
+ .../net/ethernet/pensando/ionic/ionic_devlink.c | 9 +-
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 128 +-
+ drivers/net/ethernet/pensando/ionic/ionic_if.h | 196 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 41 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.h | 13 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 24 +-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 290 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.h | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 8 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 6 +-
+ drivers/net/ethernet/realtek/r8169_firmware.c | 19 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 1023 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 4 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 7 +-
+ drivers/net/ethernet/rocker/rocker_main.c | 9 +-
+ .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +-
+ drivers/net/ethernet/sfc/ef10.c | 22 +-
+ drivers/net/ethernet/sfc/efx.c | 283 +-
+ drivers/net/ethernet/sfc/efx.h | 22 +-
+ drivers/net/ethernet/sfc/ethtool.c | 33 +
+ drivers/net/ethernet/sfc/net_driver.h | 84 +-
+ drivers/net/ethernet/sfc/rx.c | 220 +-
+ drivers/net/ethernet/sfc/tx.c | 92 +
+ drivers/net/ethernet/sgi/ioc3-eth.c | 62 +-
+ drivers/net/ethernet/socionext/netsec.c | 9 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 5 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 5 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 36 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 5 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 9 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 31 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 7 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 8 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 -
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 29 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 119 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 25 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 62 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 4 +
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 17 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 19 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 290 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 58 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 6 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 114 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 -
+ drivers/net/ethernet/ti/Kconfig | 20 +-
+ drivers/net/ethernet/ti/Makefile | 2 +
+ drivers/net/ethernet/ti/cpsw.c | 1377 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 150 +-
+ drivers/net/ethernet/ti/cpsw_ale.h | 11 +
+ drivers/net/ethernet/ti/cpsw_new.c | 2048 +++
+ drivers/net/ethernet/ti/cpsw_priv.c | 1246 +-
+ drivers/net/ethernet/ti/cpsw_priv.h | 81 +-
+ drivers/net/ethernet/ti/cpsw_switchdev.c | 589 +
+ drivers/net/ethernet/ti/cpsw_switchdev.h | 15 +
+ drivers/net/ethernet/ti/cpts.c | 2 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 5 +-
+ drivers/net/ethernet/xilinx/Kconfig | 4 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 18 +-
+ drivers/net/hyperv/hyperv_net.h | 4 +-
+ drivers/net/hyperv/netvsc_drv.c | 11 +-
+ drivers/net/hyperv/rndis_filter.c | 9 +-
+ drivers/net/ieee802154/Kconfig | 12 +-
+ drivers/net/ieee802154/cc2520.c | 3 -
+ drivers/net/ipvlan/ipvlan_main.c | 4 +-
+ drivers/net/loopback.c | 38 +-
+ drivers/net/netdevsim/Makefile | 2 +-
+ drivers/net/netdevsim/bus.c | 1 +
+ drivers/net/netdevsim/dev.c | 395 +-
+ drivers/net/netdevsim/fib.c | 176 +-
+ drivers/net/netdevsim/health.c | 319 +
+ drivers/net/netdevsim/netdev.c | 10 +-
+ drivers/net/netdevsim/netdevsim.h | 33 +-
+ drivers/net/nlmon.c | 28 +-
+ drivers/net/phy/Kconfig | 17 +-
+ drivers/net/phy/Makefile | 1 +
+ drivers/net/phy/at803x.c | 312 +-
+ drivers/net/phy/broadcom.c | 89 +-
+ drivers/net/phy/dp83867.c | 152 +-
+ drivers/net/phy/dp83869.c | 431 +
+ drivers/net/phy/marvell.c | 255 +-
+ drivers/net/phy/marvell10g.c | 25 +-
+ drivers/net/phy/mscc.c | 208 +-
+ drivers/net/phy/phy-core.c | 16 +-
+ drivers/net/phy/phy.c | 67 +-
+ drivers/net/phy/phy_device.c | 220 +-
+ drivers/net/phy/phylink.c | 66 +-
+ drivers/net/phy/sfp-bus.c | 216 +-
+ drivers/net/phy/sfp.c | 630 +-
+ drivers/net/team/team.c | 5 +-
+ drivers/net/tun.c | 53 +-
+ drivers/net/usb/ax88179_178a.c | 34 +-
+ drivers/net/usb/cdc_ether.c | 7 +
+ drivers/net/usb/lan78xx.c | 3 -
+ drivers/net/usb/r8152.c | 1277 +-
+ drivers/net/veth.c | 43 +-
+ drivers/net/virtio_net.c | 7 +-
+ drivers/net/vsockmon.c | 31 +-
+ drivers/net/vxlan.c | 29 +-
+ drivers/net/wimax/i2400m/debugfs.c | 6 +-
+ drivers/net/wimax/i2400m/usb.c | 2 +-
+ drivers/net/wireless/admtek/adm8211.c | 6 +-
+ drivers/net/wireless/ath/Kconfig | 12 +-
+ drivers/net/wireless/ath/ar5523/Kconfig | 14 +-
+ drivers/net/wireless/ath/ar5523/ar5523.c | 3 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 5 -
+ drivers/net/wireless/ath/ath10k/core.c | 55 +-
+ drivers/net/wireless/ath/ath10k/core.h | 9 +
+ drivers/net/wireless/ath/ath10k/coredump.c | 38 +-
+ drivers/net/wireless/ath/ath10k/coredump.h | 1 +
+ drivers/net/wireless/ath/ath10k/debug.c | 3 +-
+ drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 4 +-
+ drivers/net/wireless/ath/ath10k/hw.c | 4 +
+ drivers/net/wireless/ath/ath10k/hw.h | 3 +
+ drivers/net/wireless/ath/ath10k/mac.c | 188 +-
+ drivers/net/wireless/ath/ath10k/mac.h | 1 +
+ drivers/net/wireless/ath/ath10k/pci.c | 62 +-
+ drivers/net/wireless/ath/ath10k/qmi.c | 55 +-
+ drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 22 +
+ drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 +
+ drivers/net/wireless/ath/ath10k/sdio.c | 3 -
+ drivers/net/wireless/ath/ath10k/snoc.c | 387 +-
+ drivers/net/wireless/ath/ath10k/snoc.h | 30 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 2 +
+ drivers/net/wireless/ath/ath10k/usb.c | 9 +
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 82 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 68 +
+ drivers/net/wireless/ath/ath10k/wmi.c | 98 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 27 +
+ drivers/net/wireless/ath/ath5k/eeprom.c | 4 +-
+ drivers/net/wireless/ath/ath5k/pci.c | 3 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 6 +-
+ drivers/net/wireless/ath/ath9k/Kconfig | 58 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +-
+ .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 1 -
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 23 +-
+ drivers/net/wireless/ath/ath9k/main.c | 2 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 5 +-
+ drivers/net/wireless/ath/carl9170/main.c | 3 +-
+ drivers/net/wireless/ath/regd.c | 50 +-
+ drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 7 +-
+ drivers/net/wireless/ath/wil6210/boot_loader.h | 13 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 13 +-
+ drivers/net/wireless/ath/wil6210/debug.c | 13 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 13 +-
+ drivers/net/wireless/ath/wil6210/ethtool.c | 13 +-
+ drivers/net/wireless/ath/wil6210/fw.c | 13 +-
+ drivers/net/wireless/ath/wil6210/fw.h | 13 +-
+ drivers/net/wireless/ath/wil6210/fw_inc.c | 13 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 13 +-
+ drivers/net/wireless/ath/wil6210/main.c | 13 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 13 +-
+ drivers/net/wireless/ath/wil6210/p2p.c | 13 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 19 +-
+ drivers/net/wireless/ath/wil6210/pm.c | 13 +-
+ drivers/net/wireless/ath/wil6210/pmc.c | 13 +-
+ drivers/net/wireless/ath/wil6210/pmc.h | 17 +-
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 13 +-
+ drivers/net/wireless/ath/wil6210/trace.c | 13 +-
+ drivers/net/wireless/ath/wil6210/trace.h | 13 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 13 +-
+ drivers/net/wireless/ath/wil6210/txrx.h | 13 +-
+ drivers/net/wireless/ath/wil6210/txrx_edma.c | 13 +-
+ drivers/net/wireless/ath/wil6210/txrx_edma.h | 13 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 13 +-
+ drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 13 +-
+ drivers/net/wireless/ath/wil6210/wil_platform.c | 15 +-
+ drivers/net/wireless/ath/wil6210/wil_platform.h | 13 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 21 +-
+ drivers/net/wireless/ath/wil6210/wmi.h | 13 +-
+ drivers/net/wireless/atmel/Kconfig | 42 +-
+ drivers/net/wireless/atmel/atmel_cs.c | 2 -
+ drivers/net/wireless/broadcom/b43/dma.c | 4 +-
+ drivers/net/wireless/broadcom/b43/main.c | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 53 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 81 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 4 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 5 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +-
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 13 +
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 4 +
+ .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +-
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/main.c | 16 +-
+ .../broadcom/brcm80211/include/brcmu_wifi.h | 2 +
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 3 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 3 -
+ drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 4 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 8 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +-
+ drivers/net/wireless/intel/iwlegacy/common.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/Makefile | 3 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 85 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 25 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/led.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 287 +
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 84 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 8 +
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 514 +-
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 33 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 5 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 258 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 10 +-
+ .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 82 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 811 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 47 +-
+ drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 35 +
+ drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 63 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/img.h | 30 +-
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 69 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 31 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 891 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 22 +-
+ .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 35 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 40 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 31 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 392 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/led.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 33 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 55 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 56 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 42 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 -
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 16 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 29 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 625 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 5 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 189 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.h | 21 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 43 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 18 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 +-
+ .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 77 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 9 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 59 +-
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 180 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 46 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 16 +-
+ drivers/net/wireless/mac80211_hwsim.c | 51 +-
+ drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +
+ drivers/net/wireless/marvell/libertas/mesh.c | 1 -
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c | 14 +-
+ drivers/net/wireless/marvell/mwl8k.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/Makefile | 2 +-
+ drivers/net/wireless/mediatek/mt76/agg-rx.c | 20 +-
+ drivers/net/wireless/mediatek/mt76/airtime.c | 326 +
+ drivers/net/wireless/mediatek/mt76/debugfs.c | 5 +-
+ drivers/net/wireless/mediatek/mt76/dma.c | 11 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 194 +-
+ drivers/net/wireless/mediatek/mt76/mt76.h | 113 +-
+ .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 38 +
+ drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7603/init.c | 14 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 141 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 24 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 11 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 5 +
+ .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 100 +
+ drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 18 +
+ drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 3 +
+ drivers/net/wireless/mediatek/mt76/mt7615/init.c | 43 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 187 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/main.c | 51 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 16 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 11 +
+ drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 5 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 57 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 3 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 27 -
+ drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 9 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 3 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 29 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 13 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 16 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02.h | 3 +-
+ .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 5 +-
+ .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 5 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 119 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 8 +
+ drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 1 +
+ drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 10 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_usb.h | 1 +
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 31 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 23 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/mac.h | 1 -
+ .../net/wireless/mediatek/mt76/mt76x2/mt76x2u.h | 1 -
+ drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 4 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 30 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 26 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 6 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 7 -
+ .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c | 27 -
+ .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 9 +-
+ drivers/net/wireless/mediatek/mt76/tx.c | 23 +-
+ drivers/net/wireless/mediatek/mt76/usb.c | 44 +-
+ drivers/net/wireless/mediatek/mt7601u/debugfs.c | 2 +-
+ drivers/net/wireless/mediatek/mt7601u/main.c | 3 +-
+ drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +-
+ drivers/net/wireless/quantenna/qtnfmac/bus.h | 23 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 58 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 198 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.h | 4 +
+ drivers/net/wireless/quantenna/qtnfmac/core.c | 151 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h | 3 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c | 47 +-
+ drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 12 +-
+ .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h | 4 +-
+ .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 85 +-
+ .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 35 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 133 +
+ drivers/net/wireless/quantenna/qtnfmac/switchdev.h | 24 +
+ drivers/net/wireless/ralink/rt2x00/Kconfig | 44 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 +-
+ .../wireless/realtek/rtl818x/rtl8180/rtl8225se.c | 42 -
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 93 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 9 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 509 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 3 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 9 -
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 9 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/ps.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 35 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 -
+ .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 +
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 10 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 +
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 25 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 +
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 21 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/def.h | 619 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 31 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 189 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 18 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.c | 4 -
+ .../realtek/rtlwifi/rtl8723com/phy_common.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 19 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +-
+ drivers/net/wireless/realtek/rtw88/Makefile | 1 +
+ drivers/net/wireless/realtek/rtw88/bf.c | 400 +
+ drivers/net/wireless/realtek/rtw88/bf.h | 92 +
+ drivers/net/wireless/realtek/rtw88/coex.c | 38 +-
+ drivers/net/wireless/realtek/rtw88/debug.c | 174 +-
+ drivers/net/wireless/realtek/rtw88/debug.h | 2 +
+ drivers/net/wireless/realtek/rtw88/fw.c | 227 +-
+ drivers/net/wireless/realtek/rtw88/fw.h | 80 +-
+ drivers/net/wireless/realtek/rtw88/hci.h | 12 +
+ drivers/net/wireless/realtek/rtw88/mac.c | 138 +-
+ drivers/net/wireless/realtek/rtw88/mac.h | 6 +
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 263 +-
+ drivers/net/wireless/realtek/rtw88/main.c | 320 +-
+ drivers/net/wireless/realtek/rtw88/main.h | 239 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 236 +-
+ drivers/net/wireless/realtek/rtw88/pci.h | 16 +
+ drivers/net/wireless/realtek/rtw88/phy.c | 171 +-
+ drivers/net/wireless/realtek/rtw88/phy.h | 30 +
+ drivers/net/wireless/realtek/rtw88/ps.c | 191 +-
+ drivers/net/wireless/realtek/rtw88/ps.h | 18 +-
+ drivers/net/wireless/realtek/rtw88/reg.h | 7 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 469 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822b.h | 12 +
+ .../net/wireless/realtek/rtw88/rtw8822b_table.c | 829 +-
+ .../net/wireless/realtek/rtw88/rtw8822b_table.h | 2 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 376 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.h | 12 +
+ .../net/wireless/realtek/rtw88/rtw8822c_table.c | 94 +-
+ drivers/net/wireless/realtek/rtw88/rx.c | 101 +-
+ drivers/net/wireless/realtek/rtw88/rx.h | 11 +
+ drivers/net/wireless/realtek/rtw88/sec.c | 21 +
+ drivers/net/wireless/realtek/rtw88/sec.h | 1 +
+ drivers/net/wireless/realtek/rtw88/tx.c | 135 +-
+ drivers/net/wireless/realtek/rtw88/tx.h | 8 +
+ drivers/net/wireless/realtek/rtw88/util.c | 27 +
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1 +
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 4 +-
+ drivers/net/wireless/st/cw1200/fwio.c | 6 +-
+ drivers/net/wireless/st/cw1200/queue.c | 3 +-
+ drivers/net/wireless/st/cw1200/scan.c | 3 +-
+ drivers/net/wireless/ti/wl12xx/Kconfig | 8 +-
+ drivers/net/wireless/ti/wlcore/main.c | 15 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 2 +-
+ drivers/net/wireless/virt_wifi.c | 4 +-
+ drivers/net/xen-netback/interface.c | 114 +-
+ drivers/nfc/nfcmrvl/Kconfig | 2 +-
+ drivers/nfc/nfcmrvl/i2c.c | 1 -
+ drivers/nfc/pn533/Kconfig | 11 +
+ drivers/nfc/pn533/Makefile | 2 +
+ drivers/nfc/pn533/i2c.c | 32 +-
+ drivers/nfc/pn533/pn533.c | 287 +-
+ drivers/nfc/pn533/pn533.h | 40 +-
+ drivers/nfc/pn533/uart.c | 330 +
+ drivers/nfc/pn533/usb.c | 16 +-
+ drivers/nfc/s3fwrn5/i2c.c | 1 -
+ drivers/of/of_mdio.c | 4 +-
+ drivers/of/of_net.c | 16 +-
+ drivers/phy/ti/Kconfig | 4 +-
+ drivers/ptp/Kconfig | 12 +
+ drivers/ptp/Makefile | 1 +
+ drivers/ptp/idt8a340_reg.h | 659 +
+ drivers/ptp/ptp_clockmatrix.c | 1427 ++
+ drivers/ptp/ptp_clockmatrix.h | 104 +
+ drivers/ptp/ptp_dte.c | 4 +-
+ drivers/s390/cio/qdio.h | 1 +
+ drivers/s390/cio/qdio_main.c | 31 +-
+ drivers/s390/net/ism.h | 2 -
+ drivers/s390/net/qeth_core.h | 19 +-
+ drivers/s390/net/qeth_core_main.c | 190 +-
+ drivers/s390/net/qeth_core_mpc.h | 5 +-
+ drivers/s390/net/qeth_core_sys.c | 80 +-
+ drivers/s390/net/qeth_ethtool.c | 2 +
+ drivers/s390/net/qeth_l2_main.c | 47 +-
+ drivers/s390/net/qeth_l2_sys.c | 29 -
+ drivers/s390/net/qeth_l3.h | 25 +-
+ drivers/s390/net/qeth_l3_main.c | 257 +-
+ drivers/s390/net/qeth_l3_sys.c | 94 -
+ drivers/soc/fsl/qbman/qman.c | 7 +
+ drivers/spi/spi.c | 127 +
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/{net/ethernet => staging}/hp/Kconfig | 0
+ drivers/{net/ethernet => staging}/hp/Makefile | 0
+ drivers/{net/ethernet => staging}/hp/hp100.c | 0
+ drivers/{net/ethernet => staging}/hp/hp100.h | 0
+ drivers/vhost/vsock.c | 102 +-
+ include/dt-bindings/net/qca-ar803x.h | 13 +
+ include/dt-bindings/net/ti-dp83869.h | 42 +
+ include/linux/bpf.h | 242 +-
+ include/linux/bpf_types.h | 77 +-
+ include/linux/bpf_verifier.h | 9 +-
+ include/linux/brcmphy.h | 10 +-
+ include/linux/btf.h | 33 +
+ include/linux/can/platform/mcp251x.h | 22 -
+ include/linux/can/rx-offload.h | 7 +-
+ include/linux/dim.h | 63 +-
+ include/linux/extable.h | 10 +
+ include/linux/filter.h | 12 +-
+ include/linux/firmware/broadcom/tee_bnxt_fw.h | 14 +
+ include/linux/fsl/mc.h | 2 +
+ include/linux/icmp.h | 15 +
+ include/linux/icmpv6.h | 14 +
+ include/linux/linkmode.h | 6 +
+ include/linux/mlx5/driver.h | 16 +
+ include/linux/mlx5/fs.h | 3 +-
+ include/linux/mlx5/mlx5_ifc.h | 1 +
+ include/linux/mroute_base.h | 28 +-
+ include/linux/netdevice.h | 39 +-
+ include/linux/netfilter.h | 41 +-
+ include/linux/netfilter/ipset/ip_set.h | 196 +-
+ include/linux/netfilter/ipset/ip_set_bitmap.h | 14 -
+ include/linux/netfilter/ipset/ip_set_getport.h | 3 -
+ include/linux/of_net.h | 7 +-
+ include/linux/phy.h | 16 +-
+ include/linux/phylink.h | 25 +-
+ include/linux/sfp.h | 31 +-
+ include/linux/skbuff.h | 12 +-
+ include/linux/skmsg.h | 12 +-
+ include/linux/spi/spi.h | 61 +
+ include/linux/stmmac.h | 4 +-
+ include/linux/sxgbe_platform.h | 4 +-
+ include/linux/tcp.h | 2 +-
+ include/linux/u64_stats_sync.h | 51 +-
+ include/linux/uaccess.h | 16 +
+ include/linux/virtio_vsock.h | 18 +-
+ include/linux/vm_sockets.h | 15 -
+ include/linux/vmalloc.h | 1 +
+ include/linux/vmw_vmci_api.h | 2 +
+ include/net/act_api.h | 47 +-
+ include/net/addrconf.h | 6 +-
+ include/net/af_vsock.h | 45 +-
+ include/net/arp.h | 4 +-
+ include/net/cfg80211.h | 13 +-
+ include/net/devlink.h | 68 +-
+ include/net/dsa.h | 108 +-
+ include/net/fib_notifier.h | 13 +-
+ include/net/fib_rules.h | 3 +-
+ include/net/flow_dissector.h | 33 +-
+ include/net/gen_stats.h | 6 +
+ include/net/genetlink.h | 20 +-
+ include/net/ip.h | 8 +-
+ include/net/ip6_fib.h | 50 +-
+ include/net/ip_fib.h | 21 +-
+ include/net/ip_vs.h | 2 +-
+ include/net/ipv6.h | 5 +
+ include/net/mac80211.h | 90 +-
+ include/net/ndisc.h | 8 +-
+ include/net/neighbour.h | 2 +-
+ include/net/net_namespace.h | 6 +-
+ include/net/netfilter/nf_conntrack_extend.h | 10 -
+ include/net/netfilter/nf_flow_table.h | 64 +-
+ include/net/netfilter/nf_tables.h | 22 +-
+ include/net/netfilter/nf_tables_offload.h | 1 +
+ include/net/netns/ipv6.h | 3 +
+ include/net/netns/mib.h | 3 +
+ include/net/netns/sctp.h | 14 +
+ include/net/page_pool.h | 85 +-
+ include/net/route.h | 4 +
+ include/net/sch_generic.h | 18 +-
+ include/net/sctp/constants.h | 12 +
+ include/net/sctp/structs.h | 13 +-
+ include/net/sctp/ulpevent.h | 16 +-
+ include/net/smc.h | 7 +
+ include/net/snmp.h | 6 +
+ include/net/sock.h | 25 +-
+ include/net/tcp.h | 12 +-
+ include/net/tls.h | 69 +-
+ include/net/tls_toe.h | 77 +
+ include/net/vsock_addr.h | 2 +-
+ include/net/xdp_priv.h | 4 -
+ include/net/xdp_sock.h | 51 +-
+ include/net/xfrm.h | 7 -
+ include/soc/fsl/qman.h | 11 +
+ include/soc/mscc/ocelot.h | 550 +
+ .../net/ethernet => include/soc}/mscc/ocelot_sys.h | 0
+ include/trace/bpf_probe.h | 3 +-
+ include/trace/events/bridge.h | 12 +-
+ include/trace/events/page_pool.h | 44 +-
+ include/trace/events/xdp.h | 21 +-
+ include/uapi/linux/bpf.h | 188 +-
+ include/uapi/linux/dcbnl.h | 2 +-
+ include/uapi/linux/devlink.h | 4 +
+ include/uapi/linux/ethtool.h | 6 +
+ include/uapi/linux/gen_stats.h | 5 +-
+ include/uapi/linux/if.h | 1 +
+ include/uapi/linux/if_link.h | 2 +
+ include/uapi/linux/lwtunnel.h | 41 +
+ include/uapi/linux/netfilter/ipset/ip_set.h | 2 +
+ include/uapi/linux/netfilter/nf_tables.h | 4 +
+ include/uapi/linux/netfilter_arp/arp_tables.h | 2 +-
+ include/uapi/linux/netfilter_bridge/ebtables.h | 2 +-
+ include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +-
+ include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +-
+ include/uapi/linux/nl80211.h | 34 +
+ include/uapi/linux/openvswitch.h | 4 +-
+ include/uapi/linux/pkt_cls.h | 34 +
+ include/uapi/linux/pkt_sched.h | 22 +-
+ include/uapi/linux/rtnetlink.h | 7 +
+ include/uapi/linux/sctp.h | 31 +-
+ include/uapi/linux/snmp.h | 17 +
+ include/uapi/linux/tc_act/tc_tunnel_key.h | 29 +
+ include/uapi/linux/tcp.h | 10 +-
+ include/uapi/linux/tipc.h | 22 +
+ include/uapi/linux/tipc_config.h | 4 +-
+ include/uapi/linux/tipc_netlink.h | 4 +
+ include/uapi/linux/virtio_ring.h | 2 +-
+ init/do_mounts.c | 49 +
+ kernel/bpf/Makefile | 1 +
+ kernel/bpf/arraymap.c | 58 +-
+ kernel/bpf/btf.c | 796 +-
+ kernel/bpf/core.c | 56 +-
+ kernel/bpf/inode.c | 7 +-
+ kernel/bpf/map_in_map.c | 2 +-
+ kernel/bpf/stackmap.c | 7 +-
+ kernel/bpf/syscall.c | 326 +-
+ kernel/bpf/trampoline.c | 253 +
+ kernel/bpf/verifier.c | 406 +-
+ kernel/bpf/xskmap.c | 118 +-
+ kernel/events/core.c | 7 +-
+ kernel/extable.c | 2 +
+ kernel/trace/bpf_trace.c | 227 +-
+ lib/test_bpf.c | 112 +-
+ mm/maccess.c | 70 +-
+ mm/vmalloc.c | 20 +
+ net/Kconfig | 26 +-
+ net/atm/signaling.c | 2 +-
+ net/atm/svc.c | 2 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/ax25/ax25_in.c | 2 +-
+ net/batman-adv/bat_v.c | 1 -
+ net/batman-adv/bat_v_ogm.c | 34 +-
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/multicast.c | 2 +-
+ net/batman-adv/soft-interface.c | 5 +-
+ net/batman-adv/types.h | 3 -
+ net/bluetooth/af_bluetooth.c | 4 +-
+ net/bluetooth/hci_conn.c | 8 +
+ net/bluetooth/hci_core.c | 13 +-
+ net/bluetooth/hci_request.c | 19 +-
+ net/bluetooth/smp.c | 6 -
+ net/bpf/test_run.c | 52 +
+ net/bridge/br_device.c | 36 +-
+ net/bridge/br_fdb.c | 157 +-
+ net/bridge/br_input.c | 7 +-
+ net/bridge/br_private.h | 24 +-
+ net/bridge/br_switchdev.c | 12 +-
+ net/caif/Kconfig | 10 +-
+ net/core/bpf_sk_storage.c | 2 +-
+ net/core/dev.c | 413 +-
+ net/core/devlink.c | 311 +-
+ net/core/fib_notifier.c | 95 +-
+ net/core/fib_rules.c | 23 +-
+ net/core/filter.c | 29 +-
+ net/core/flow_dissector.c | 155 +-
+ net/core/gen_estimator.c | 4 +-
+ net/core/gen_stats.c | 12 +-
+ net/core/neighbour.c | 8 +-
+ net/core/net-procfs.c | 4 +-
+ net/core/page_pool.c | 189 +-
+ net/core/pktgen.c | 1 -
+ net/core/rtnetlink.c | 206 +-
+ net/core/skmsg.c | 13 +-
+ net/core/sock.c | 16 +-
+ net/core/xdp.c | 128 +-
+ net/dccp/proto.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/decnet/dn_nsp_in.c | 2 +-
+ net/dsa/Kconfig | 9 +-
+ net/dsa/Makefile | 1 +
+ net/dsa/dsa.c | 93 +-
+ net/dsa/dsa2.c | 384 +-
+ net/dsa/dsa_priv.h | 27 +-
+ net/dsa/port.c | 32 +-
+ net/dsa/slave.c | 25 +-
+ net/dsa/switch.c | 4 +-
+ net/dsa/tag_8021q.c | 20 +-
+ net/dsa/tag_ocelot.c | 241 +
+ net/ethernet/eth.c | 7 +-
+ net/ieee802154/nl802154.c | 39 +-
+ net/ipv4/Kconfig | 218 +-
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/fib_frontend.c | 10 -
+ net/ipv4/fib_notifier.c | 13 +-
+ net/ipv4/fib_rules.c | 5 +-
+ net/ipv4/fib_trie.c | 44 +-
+ net/ipv4/icmp.c | 14 +-
+ net/ipv4/igmp.c | 2 +-
+ net/ipv4/inet_connection_sock.c | 2 +-
+ net/ipv4/inet_diag.c | 15 +-
+ net/ipv4/inetpeer.c | 12 +-
+ net/ipv4/ip_gre.c | 6 +-
+ net/ipv4/ip_input.c | 38 +-
+ net/ipv4/ip_output.c | 4 +-
+ net/ipv4/ip_tunnel_core.c | 440 +-
+ net/ipv4/ipconfig.c | 13 +-
+ net/ipv4/ipmr.c | 13 +-
+ net/ipv4/ipmr_base.c | 30 +-
+ net/ipv4/netfilter/nf_flow_table_ipv4.c | 2 +
+ net/ipv4/netfilter/nf_socket_ipv4.c | 10 +-
+ net/ipv4/nexthop.c | 1 -
+ net/ipv4/route.c | 47 +-
+ net/ipv4/syncookies.c | 4 +-
+ net/ipv4/sysctl_net_ipv4.c | 4 +
+ net/ipv4/tcp.c | 32 +-
+ net/ipv4/tcp_cong.c | 6 +
+ net/ipv4/tcp_diag.c | 4 +-
+ net/ipv4/tcp_fastopen.c | 5 +-
+ net/ipv4/tcp_input.c | 4 +
+ net/ipv4/tcp_ipv4.c | 8 +-
+ net/ipv4/tcp_output.c | 2 +-
+ net/ipv4/tcp_ulp.c | 3 +
+ net/ipv4/udp.c | 2 +
+ net/ipv4/xfrm4_output.c | 2 +-
+ net/ipv6/addrconf.c | 7 +-
+ net/ipv6/fib6_notifier.c | 11 +-
+ net/ipv6/fib6_rules.c | 5 +-
+ net/ipv6/icmp.c | 22 +-
+ net/ipv6/ip6_fib.c | 54 +-
+ net/ipv6/ip6_input.c | 29 +-
+ net/ipv6/ip6_output.c | 4 +-
+ net/ipv6/ip6mr.c | 13 +-
+ net/ipv6/netfilter/Kconfig | 28 +-
+ net/ipv6/netfilter/nf_flow_table_ipv6.c | 2 +
+ net/ipv6/netfilter/nf_tproxy_ipv6.c | 2 +-
+ net/ipv6/route.c | 12 +-
+ net/ipv6/seg6_local.c | 22 +-
+ net/ipv6/tcp_ipv6.c | 2 +-
+ net/ipv6/xfrm6_output.c | 2 +-
+ net/llc/af_llc.c | 4 +-
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/agg-tx.c | 9 +-
+ net/mac80211/airtime.c | 597 +
+ net/mac80211/cfg.c | 2 +-
+ net/mac80211/debugfs.c | 88 +
+ net/mac80211/debugfs_sta.c | 43 +-
+ net/mac80211/ibss.c | 9 +-
+ net/mac80211/ieee80211_i.h | 8 +
+ net/mac80211/main.c | 10 +-
+ net/mac80211/mlme.c | 103 +-
+ net/mac80211/rc80211_minstrel.c | 48 +-
+ net/mac80211/rc80211_minstrel.h | 57 +-
+ net/mac80211/rc80211_minstrel_debugfs.c | 8 +-
+ net/mac80211/rc80211_minstrel_ht.c | 73 +-
+ net/mac80211/rc80211_minstrel_ht.h | 2 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 8 +-
+ net/mac80211/sta_info.c | 52 +
+ net/mac80211/sta_info.h | 12 +
+ net/mac80211/status.c | 39 +-
+ net/mac80211/tx.c | 136 +-
+ net/netfilter/Makefile | 3 +-
+ net/netfilter/core.c | 20 +
+ net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +-
+ net/netfilter/ipset/ip_set_bitmap_ip.c | 26 +-
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c | 18 +-
+ net/netfilter/ipset/ip_set_bitmap_port.c | 41 +-
+ net/netfilter/ipset/ip_set_core.c | 212 +-
+ net/netfilter/ipset/ip_set_getport.c | 28 -
+ net/netfilter/ipset/ip_set_hash_gen.h | 4 +-
+ net/netfilter/ipset/ip_set_hash_ip.c | 10 +-
+ net/netfilter/ipset/ip_set_hash_ipmac.c | 8 +-
+ net/netfilter/ipset/ip_set_hash_ipmark.c | 8 +-
+ net/netfilter/ipset/ip_set_hash_ipport.c | 8 +-
+ net/netfilter/ipset/ip_set_hash_ipportip.c | 8 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 24 +-
+ net/netfilter/ipset/ip_set_hash_mac.c | 6 +-
+ net/netfilter/ipset/ip_set_hash_net.c | 24 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 47 +-
+ net/netfilter/ipset/ip_set_hash_netnet.c | 28 +-
+ net/netfilter/ipset/ip_set_hash_netport.c | 24 +-
+ net/netfilter/ipset/ip_set_hash_netportnet.c | 28 +-
+ net/netfilter/ipset/ip_set_list_set.c | 4 +-
+ net/netfilter/ipvs/ip_vs_core.c | 47 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 12 +-
+ net/netfilter/ipvs/ip_vs_ovf.c | 2 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 18 +-
+ net/netfilter/nf_conntrack_core.c | 2 -
+ net/netfilter/nf_conntrack_ecache.c | 23 +-
+ net/netfilter/nf_conntrack_extend.c | 21 +-
+ net/netfilter/nf_conntrack_netlink.c | 76 +-
+ net/netfilter/nf_conntrack_proto_icmp.c | 6 +-
+ net/netfilter/nf_flow_table_core.c | 177 +-
+ net/netfilter/nf_flow_table_inet.c | 25 +
+ net/netfilter/nf_flow_table_offload.c | 851 ++
+ net/netfilter/nf_tables_api.c | 614 +-
+ net/netfilter/nf_tables_offload.c | 275 +-
+ net/netfilter/nft_chain_filter.c | 45 +-
+ net/netfilter/nft_cmp.c | 6 +
+ net/netfilter/nft_flow_offload.c | 5 +-
+ net/netfilter/nft_meta.c | 18 +-
+ net/netfilter/nft_payload.c | 94 +-
+ net/netfilter/xt_HMARK.c | 6 +-
+ net/netfilter/xt_time.c | 19 +-
+ net/netlink/genetlink.c | 303 +-
+ net/nfc/hci/Kconfig | 14 +-
+ net/nfc/netlink.c | 17 +-
+ net/openvswitch/actions.c | 2 +-
+ net/openvswitch/conntrack.c | 21 +-
+ net/openvswitch/datapath.c | 113 +-
+ net/openvswitch/datapath.h | 12 +
+ net/openvswitch/flow.c | 20 +-
+ net/openvswitch/flow.h | 10 +-
+ net/openvswitch/flow_netlink.c | 87 +-
+ net/openvswitch/flow_table.c | 381 +-
+ net/openvswitch/flow_table.h | 19 +-
+ net/openvswitch/vport.c | 5 +-
+ net/packet/af_packet.c | 12 +-
+ net/qrtr/tun.c | 6 +-
+ net/rds/ib.c | 10 +-
+ net/rds/ib.h | 15 +-
+ net/rds/ib_cm.c | 167 +-
+ net/rds/ib_recv.c | 13 +-
+ net/rds/ib_send.c | 19 +-
+ net/rose/af_rose.c | 4 +-
+ net/rxrpc/peer_object.c | 2 +
+ net/sched/act_api.c | 58 +-
+ net/sched/act_bpf.c | 5 +-
+ net/sched/act_connmark.c | 4 +-
+ net/sched/act_csum.c | 10 +-
+ net/sched/act_ct.c | 17 +-
+ net/sched/act_ctinfo.c | 4 +-
+ net/sched/act_gact.c | 21 +-
+ net/sched/act_ife.c | 5 +-
+ net/sched/act_ipt.c | 12 +-
+ net/sched/act_mirred.c | 19 +-
+ net/sched/act_mpls.c | 6 +-
+ net/sched/act_nat.c | 8 +-
+ net/sched/act_pedit.c | 5 +-
+ net/sched/act_police.c | 14 +-
+ net/sched/act_sample.c | 4 +-
+ net/sched/act_simple.c | 7 +-
+ net/sched/act_skbedit.c | 4 +-
+ net/sched/act_skbmod.c | 4 +-
+ net/sched/act_tunnel_key.c | 212 +-
+ net/sched/act_vlan.c | 16 +-
+ net/sched/cls_flower.c | 254 +
+ net/sched/em_meta.c | 4 +-
+ net/sched/sch_fq.c | 3 +-
+ net/sched/sch_fq_codel.c | 1 -
+ net/sched/sch_generic.c | 18 +-
+ net/sched/sch_pie.c | 120 +-
+ net/sctp/associola.c | 60 +-
+ net/sctp/chunk.c | 40 +-
+ net/sctp/diag.c | 4 +-
+ net/sctp/endpointola.c | 2 +-
+ net/sctp/protocol.c | 6 +
+ net/sctp/sm_sideeffect.c | 5 +
+ net/sctp/socket.c | 151 +-
+ net/sctp/sysctl.c | 22 +-
+ net/sctp/ulpevent.c | 57 +-
+ net/smc/af_smc.c | 24 +-
+ net/smc/smc.h | 1 +
+ net/smc/smc_cdc.c | 7 +-
+ net/smc/smc_clc.c | 2 +-
+ net/smc/smc_close.c | 97 +-
+ net/smc/smc_close.h | 2 +
+ net/smc/smc_core.c | 444 +-
+ net/smc/smc_core.h | 16 +-
+ net/smc/smc_ib.c | 24 +-
+ net/smc/smc_ib.h | 4 +
+ net/smc/smc_ism.c | 27 +-
+ net/smc/smc_llc.c | 11 +-
+ net/smc/smc_pnet.c | 5 +-
+ net/smc/smc_rx.c | 10 +-
+ net/smc/smc_tx.c | 28 +-
+ net/smc/smc_wr.c | 45 +-
+ net/smc/smc_wr.h | 10 +
+ net/tipc/Kconfig | 15 +
+ net/tipc/Makefile | 1 +
+ net/tipc/bcast.c | 6 +-
+ net/tipc/bcast.h | 2 +-
+ net/tipc/bearer.c | 49 +-
+ net/tipc/bearer.h | 6 +-
+ net/tipc/core.c | 30 +
+ net/tipc/core.h | 14 +
+ net/tipc/crypto.c | 1986 +++
+ net/tipc/crypto.h | 167 +
+ net/tipc/discover.c | 4 +-
+ net/tipc/link.c | 109 +-
+ net/tipc/link.h | 1 +
+ net/tipc/monitor.c | 15 +
+ net/tipc/monitor.h | 1 +
+ net/tipc/msg.c | 221 +-
+ net/tipc/msg.h | 77 +-
+ net/tipc/name_distr.c | 2 +-
+ net/tipc/name_table.c | 51 +-
+ net/tipc/name_table.h | 4 +
+ net/tipc/net.c | 2 +
+ net/tipc/netlink.c | 39 +-
+ net/tipc/netlink.h | 1 -
+ net/tipc/netlink_compat.c | 28 +-
+ net/tipc/node.c | 496 +-
+ net/tipc/node.h | 25 +-
+ net/tipc/socket.c | 131 +-
+ net/tipc/sysctl.c | 11 +
+ net/tipc/udp_media.c | 7 +-
+ net/tls/Kconfig | 10 +
+ net/tls/Makefile | 5 +-
+ net/tls/tls_device.c | 46 +-
+ net/tls/tls_main.c | 172 +-
+ net/tls/tls_proc.c | 49 +
+ net/tls/tls_sw.c | 18 +-
+ net/tls/tls_toe.c | 139 +
+ net/tls/trace.c | 10 +
+ net/tls/trace.h | 202 +
+ net/unix/af_unix.c | 6 +-
+ net/vmw_vsock/af_vsock.c | 397 +-
+ net/vmw_vsock/hyperv_transport.c | 94 +-
+ net/vmw_vsock/virtio_transport.c | 177 +-
+ net/vmw_vsock/virtio_transport_common.c | 223 +-
+ net/vmw_vsock/vmci_transport.c | 142 +-
+ net/vmw_vsock/vmci_transport.h | 3 -
+ net/vmw_vsock/vmci_transport_notify.h | 1 -
+ net/wireless/nl80211.c | 17 +-
+ net/wireless/reg.h | 2 +-
+ net/x25/af_x25.c | 4 +-
+ net/xdp/xsk.c | 33 +-
+ net/xfrm/Kconfig | 10 +-
+ net/xfrm/xfrm_interface.c | 23 -
+ samples/bpf/Makefile | 171 +-
+ samples/bpf/Makefile.target | 75 +
+ samples/bpf/README.rst | 49 +-
+ samples/bpf/hbm.c | 2 +-
+ samples/bpf/hbm_kern.h | 27 +-
+ samples/bpf/map_perf_test_kern.c | 28 +-
+ samples/bpf/offwaketime_kern.c | 1 +
+ samples/bpf/parse_ldabs.c | 1 +
+ samples/bpf/sampleip_kern.c | 1 +
+ samples/bpf/sockex1_kern.c | 13 +-
+ samples/bpf/sockex2_kern.c | 13 +-
+ samples/bpf/sockex3_kern.c | 1 +
+ samples/bpf/spintest_kern.c | 1 +
+ samples/bpf/tcbpf1_kern.c | 1 +
+ samples/bpf/test_map_in_map_kern.c | 20 +-
+ samples/bpf/test_overhead_kprobe_kern.c | 1 +
+ samples/bpf/test_probe_write_user_kern.c | 3 +-
+ samples/bpf/trace_event_kern.c | 1 +
+ samples/bpf/tracex1_kern.c | 1 +
+ samples/bpf/tracex2_kern.c | 1 +
+ samples/bpf/tracex3_kern.c | 1 +
+ samples/bpf/tracex4_kern.c | 1 +
+ samples/bpf/tracex5_kern.c | 1 +
+ samples/bpf/xdp1_kern.c | 12 +-
+ samples/bpf/xdp1_user.c | 2 +-
+ samples/bpf/xdp2_kern.c | 12 +-
+ samples/bpf/xdp_adjust_tail_kern.c | 19 +-
+ samples/bpf/xdp_adjust_tail_user.c | 29 +-
+ samples/bpf/xdp_fwd_kern.c | 13 +-
+ samples/bpf/xdp_redirect_cpu_kern.c | 108 +-
+ samples/bpf/xdp_redirect_kern.c | 24 +-
+ samples/bpf/xdp_redirect_map_kern.c | 24 +-
+ samples/bpf/xdp_router_ipv4_kern.c | 64 +-
+ samples/bpf/xdp_rxq_info_kern.c | 37 +-
+ samples/bpf/xdp_rxq_info_user.c | 6 +-
+ samples/bpf/xdp_sample_pkts_user.c | 2 +-
+ samples/bpf/xdp_tx_iptunnel_kern.c | 26 +-
+ samples/bpf/xdp_tx_iptunnel_user.c | 2 +-
+ samples/bpf/xdpsock.h | 11 +
+ samples/bpf/xdpsock_kern.c | 24 +
+ samples/bpf/xdpsock_user.c | 163 +-
+ samples/pktgen/README.rst | 2 +-
+ samples/pktgen/functions.sh | 154 +-
+ samples/pktgen/parameters.sh | 2 +-
+ .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 15 +-
+ .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 15 +-
+ samples/pktgen/pktgen_sample01_simple.sh | 23 +-
+ samples/pktgen/pktgen_sample02_multiqueue.sh | 23 +-
+ .../pktgen/pktgen_sample03_burst_single_flow.sh | 15 +-
+ samples/pktgen/pktgen_sample04_many_flows.sh | 22 +-
+ samples/pktgen/pktgen_sample05_flow_per_thread.sh | 15 +-
+ ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 23 +-
+ scripts/bpf_helpers_doc.py | 155 +-
+ security/selinux/nlmsgtab.c | 4 +-
+ tools/bpf/bpf_exp.y | 14 +-
+ tools/bpf/bpftool/btf.c | 57 +-
+ tools/bpf/bpftool/main.c | 4 +-
+ tools/bpf/bpftool/main.h | 2 +-
+ tools/bpf/bpftool/prog.c | 22 +-
+ tools/include/uapi/linux/bpf.h | 188 +-
+ tools/include/uapi/linux/if_link.h | 2 +
+ tools/lib/bpf/.gitignore | 4 +
+ tools/lib/bpf/Makefile | 58 +-
+ tools/lib/bpf/bpf.c | 11 +-
+ tools/lib/bpf/bpf.h | 10 +-
+ tools/lib/bpf/bpf_core_read.h | 263 +
+ tools/{testing/selftests => lib}/bpf/bpf_endian.h | 0
+ tools/lib/bpf/bpf_helpers.h | 60 +
+ tools/lib/bpf/bpf_prog_linfo.c | 14 +-
+ tools/lib/bpf/bpf_tracing.h | 195 +
+ tools/lib/bpf/btf.c | 97 +-
+ tools/lib/bpf/btf.h | 6 +-
+ tools/lib/bpf/btf_dump.c | 37 +-
+ tools/lib/bpf/libbpf.c | 1866 ++-
+ tools/lib/bpf/libbpf.h | 99 +-
+ tools/lib/bpf/libbpf.map | 18 +
+ tools/lib/bpf/libbpf_internal.h | 63 +-
+ tools/lib/bpf/libbpf_probes.c | 1 +
+ tools/lib/bpf/netlink.c | 87 +-
+ tools/lib/bpf/nlattr.c | 10 +-
+ tools/lib/bpf/{test_libbpf.cpp => test_libbpf.c} | 14 +-
+ tools/lib/bpf/xsk.c | 173 +-
+ tools/testing/selftests/bpf/.gitignore | 6 +-
+ tools/testing/selftests/bpf/Makefile | 396 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 535 -
+ tools/testing/selftests/bpf/bpf_legacy.h | 39 +
+ tools/testing/selftests/bpf/cgroup_helpers.c | 4 +-
+ .../selftests/bpf/prog_tests/attach_probe.c | 44 +-
+ .../bpf/{test_btf_dump.c => prog_tests/btf_dump.c} | 88 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 249 +-
+ .../selftests/bpf/prog_tests/fentry_fexit.c | 90 +
+ .../testing/selftests/bpf/prog_tests/fentry_test.c | 64 +
+ .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 76 +
+ .../selftests/bpf/prog_tests/fexit_stress.c | 76 +
+ .../testing/selftests/bpf/prog_tests/fexit_test.c | 64 +
+ .../bpf/prog_tests/flow_dissector_reattach.c | 140 +
+ tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 154 +
+ tools/testing/selftests/bpf/prog_tests/mmap.c | 220 +
+ tools/testing/selftests/bpf/prog_tests/pinning.c | 224 +
+ .../testing/selftests/bpf/prog_tests/probe_user.c | 78 +
+ .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 95 +
+ .../selftests/bpf/prog_tests/reference_tracking.c | 19 +-
+ .../section_names.c} | 90 +-
+ tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 5 +
+ .../btf__core_reloc_arrays___err_wrong_val_type.c | 3 +
+ .../btf__core_reloc_arrays___err_wrong_val_type1.c | 3 -
+ .../btf__core_reloc_arrays___err_wrong_val_type2.c | 3 -
+ .../bpf/progs/btf__core_reloc_bitfields.c | 3 +
+ .../btf__core_reloc_bitfields___bit_sz_change.c | 3 +
+ .../btf__core_reloc_bitfields___bitfield_vs_int.c | 3 +
+ ...__core_reloc_bitfields___err_too_big_bitfield.c | 3 +
+ .../btf__core_reloc_bitfields___just_big_enough.c | 3 +
+ .../bpf/progs/btf__core_reloc_existence.c | 3 +
+ ...tf__core_reloc_existence___err_wrong_arr_kind.c | 3 +
+ ...re_reloc_existence___err_wrong_arr_value_type.c | 3 +
+ ...tf__core_reloc_existence___err_wrong_int_kind.c | 3 +
+ .../btf__core_reloc_existence___err_wrong_int_sz.c | 3 +
+ ...tf__core_reloc_existence___err_wrong_int_type.c | 3 +
+ ..._core_reloc_existence___err_wrong_struct_type.c | 3 +
+ .../progs/btf__core_reloc_existence___minimal.c | 3 +
+ .../progs/btf__core_reloc_ints___err_bitfield.c | 3 -
+ .../progs/btf__core_reloc_ints___err_wrong_sz_16.c | 3 -
+ .../progs/btf__core_reloc_ints___err_wrong_sz_32.c | 3 -
+ .../progs/btf__core_reloc_ints___err_wrong_sz_64.c | 3 -
+ .../progs/btf__core_reloc_ints___err_wrong_sz_8.c | 3 -
+ .../selftests/bpf/progs/btf__core_reloc_size.c | 3 +
+ .../bpf/progs/btf__core_reloc_size___diff_sz.c | 3 +
+ .../bpf/progs/btf_dump_test_case_padding.c | 5 +-
+ .../testing/selftests/bpf/progs/core_reloc_types.h | 238 +-
+ tools/testing/selftests/bpf/progs/fentry_test.c | 90 +
+ tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 91 +
+ tools/testing/selftests/bpf/progs/fexit_test.c | 98 +
+ tools/testing/selftests/bpf/progs/kfree_skb.c | 170 +
+ tools/testing/selftests/bpf/progs/loop1.c | 1 +
+ tools/testing/selftests/bpf/progs/loop2.c | 1 +
+ tools/testing/selftests/bpf/progs/loop3.c | 1 +
+ tools/testing/selftests/bpf/progs/pyperf.h | 67 +-
+ tools/testing/selftests/bpf/progs/sockopt_sk.c | 13 +-
+ tools/testing/selftests/bpf/progs/strobemeta.h | 36 +-
+ tools/testing/selftests/bpf/progs/tcp_rtt.c | 13 +-
+ .../selftests/bpf/progs/test_attach_probe.c | 1 -
+ tools/testing/selftests/bpf/progs/test_btf_haskv.c | 5 +-
+ tools/testing/selftests/bpf/progs/test_btf_newkv.c | 5 +-
+ tools/testing/selftests/bpf/progs/test_btf_nokv.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_arrays.c | 11 +-
+ .../bpf/progs/test_core_reloc_bitfields_direct.c | 63 +
+ .../bpf/progs/test_core_reloc_bitfields_probed.c | 57 +
+ .../bpf/progs/test_core_reloc_existence.c | 79 +
+ .../selftests/bpf/progs/test_core_reloc_flavors.c | 9 +-
+ .../selftests/bpf/progs/test_core_reloc_ints.c | 19 +-
+ .../selftests/bpf/progs/test_core_reloc_kernel.c | 62 +-
+ .../selftests/bpf/progs/test_core_reloc_misc.c | 9 +-
+ .../selftests/bpf/progs/test_core_reloc_mods.c | 19 +-
+ .../selftests/bpf/progs/test_core_reloc_nesting.c | 7 +-
+ .../bpf/progs/test_core_reloc_primitives.c | 13 +-
+ .../bpf/progs/test_core_reloc_ptr_as_arr.c | 5 +-
+ .../selftests/bpf/progs/test_core_reloc_size.c | 51 +
+ .../selftests/bpf/progs/test_get_stack_rawtp.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_mmap.c | 45 +
+ .../testing/selftests/bpf/progs/test_perf_buffer.c | 1 -
+ tools/testing/selftests/bpf/progs/test_pinning.c | 31 +
+ .../selftests/bpf/progs/test_pinning_invalid.c | 16 +
+ .../testing/selftests/bpf/progs/test_pkt_access.c | 38 +-
+ .../testing/selftests/bpf/progs/test_probe_user.c | 26 +
+ .../bpf/{ => progs}/test_queue_stack_map.h | 0
+ .../testing/selftests/bpf/progs/test_rdonly_maps.c | 83 +
+ tools/testing/selftests/bpf/progs/test_seg6_loop.c | 4 +-
+ .../selftests/bpf/progs/test_sk_lookup_kern.c | 18 +-
+ tools/testing/selftests/bpf/progs/test_skb_ctx.c | 1 +
+ .../selftests/bpf/progs/test_stacktrace_map.c | 1 -
+ .../selftests/bpf/progs/test_sysctl_loop1.c | 5 +-
+ .../testing/selftests/bpf/progs/test_tcp_estats.c | 2 +-
+ tools/testing/selftests/bpf/test_flow_dissector.sh | 48 +-
+ tools/testing/selftests/bpf/test_libbpf.sh | 43 -
+ tools/testing/selftests/bpf/test_libbpf_open.c | 144 -
+ tools/testing/selftests/bpf/test_maps.c | 12 +-
+ tools/testing/selftests/bpf/test_offload.py | 20 +-
+ tools/testing/selftests/bpf/test_progs.c | 50 +-
+ tools/testing/selftests/bpf/test_sysctl.c | 23 +
+ tools/testing/selftests/bpf/test_tc_tunnel.sh | 5 +
+ tools/testing/selftests/bpf/verifier/loops1.c | 17 +
+ .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 68 +-
+ .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 563 +
+ .../net/mlxsw/devlink_trap_l3_exceptions.sh | 557 +
+ .../net/mlxsw/spectrum-2/mirror_gre_scale.sh | 16 +
+ .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 54 +
+ .../drivers/net/mlxsw/spectrum-2/router_scale.sh | 18 +
+ .../net/mlxsw/spectrum-2/tc_flower_scale.sh | 20 +
+ .../drivers/net/mlxsw/spectrum/mirror_gre_scale.sh | 7 +-
+ .../selftests/drivers/net/netdevsim/devlink.sh | 303 +-
+ .../drivers/net/netdevsim/devlink_in_netns.sh | 72 +
+ tools/testing/selftests/net/Makefile | 2 +-
+ tools/testing/selftests/net/altnames.sh | 75 +
+ tools/testing/selftests/net/fib_tests.sh | 52 +-
+ .../selftests/net/forwarding/devlink_lib.sh | 55 +
+ tools/testing/selftests/net/forwarding/ethtool.sh | 318 +
+ .../selftests/net/forwarding/ethtool_lib.sh | 69 +
+ tools/testing/selftests/net/forwarding/lib.sh | 36 +-
+ .../testing/selftests/net/forwarding/tc_common.sh | 11 +
+ tools/testing/selftests/net/tcp_mmap.c | 65 +-
+ tools/testing/selftests/net/traceroute.sh | 322 +
+ tools/testing/selftests/netfilter/Makefile | 2 +-
+ tools/testing/selftests/netfilter/ipvs.sh | 228 +
+ tools/testing/selftests/tc-testing/config | 10 +
+ .../tc-testing/tc-tests/actions/csum.json | 24 +
+ .../selftests/tc-testing/tc-tests/actions/ct.json | 96 +
+ .../tc-testing/tc-tests/actions/gact.json | 24 +
+ .../tc-testing/tc-tests/actions/mirred.json | 24 +
+ .../tc-testing/tc-tests/actions/mpls.json | 145 +
+ .../tc-testing/tc-tests/actions/pedit.json | 779 +-
+ .../tc-testing/tc-tests/actions/tunnel_key.json | 24 +
+ .../tc-testing/tc-tests/actions/vlan.json | 24 +
+ .../tc-testing/tc-tests/filters/basic.json | 325 +
+ 1617 files changed, 103231 insertions(+), 30629 deletions(-)
+ create mode 100644 Documentation/bpf/s390.rst
+ create mode 100644 Documentation/devicetree/bindings/net/nfc/pn532.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qca,ar803x.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/renesas,ether.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/ti,dp83869.yaml
+ create mode 100644 Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml
+ create mode 100644 Documentation/networking/device_drivers/freescale/dpaa2/mac-phy-support.rst
+ create mode 100644 Documentation/networking/device_drivers/ti/cpsw_switchdev.txt
+ create mode 100644 Documentation/networking/devlink-params-mlx5.txt
+ create mode 100644 Documentation/networking/devlink-params-mv88e6xxx.txt
+ create mode 100644 Documentation/networking/devlink-params-ti-cpsw-switch.txt
+ rename Documentation/networking/{nfc.txt => nfc.rst} (74%)
+ create mode 100644 arch/x86/mm/maccess.c
+ delete mode 100644 drivers/bluetooth/btwilink.c
+ create mode 100644 drivers/firmware/broadcom/tee_bnxt_fw.c
+ create mode 100644 drivers/net/dsa/ocelot/Kconfig
+ create mode 100644 drivers/net/dsa/ocelot/Makefile
+ create mode 100644 drivers/net/dsa/ocelot/felix.c
+ create mode 100644 drivers/net/dsa/ocelot/felix.h
+ create mode 100644 drivers/net/dsa/ocelot/felix_vsc9959.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_phy.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_phy.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ptp.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac.c
+ create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpmac.h
+ create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_qos.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_base.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_base.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb_nl.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb_nl.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_nvm.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_txrx_lib.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_txrx_lib.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_xsk.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_xsk.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c
+ create mode 100644 drivers/net/ethernet/ti/cpsw_new.c
+ create mode 100644 drivers/net/ethernet/ti/cpsw_switchdev.c
+ create mode 100644 drivers/net/ethernet/ti/cpsw_switchdev.h
+ create mode 100644 drivers/net/netdevsim/health.c
+ create mode 100644 drivers/net/phy/dp83869.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/airtime.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/switchdev.h
+ create mode 100644 drivers/net/wireless/realtek/rtw88/bf.c
+ create mode 100644 drivers/net/wireless/realtek/rtw88/bf.h
+ create mode 100644 drivers/nfc/pn533/uart.c
+ create mode 100644 drivers/ptp/idt8a340_reg.h
+ create mode 100644 drivers/ptp/ptp_clockmatrix.c
+ create mode 100644 drivers/ptp/ptp_clockmatrix.h
+ rename drivers/{net/ethernet => staging}/hp/Kconfig (100%)
+ rename drivers/{net/ethernet => staging}/hp/Makefile (100%)
+ rename drivers/{net/ethernet => staging}/hp/hp100.c (100%)
+ rename drivers/{net/ethernet => staging}/hp/hp100.h (100%)
+ create mode 100644 include/dt-bindings/net/qca-ar803x.h
+ create mode 100644 include/dt-bindings/net/ti-dp83869.h
+ delete mode 100644 include/linux/can/platform/mcp251x.h
+ create mode 100644 include/linux/firmware/broadcom/tee_bnxt_fw.h
+ delete mode 100644 include/linux/vm_sockets.h
+ create mode 100644 include/net/tls_toe.h
+ create mode 100644 include/soc/mscc/ocelot.h
+ rename {drivers/net/ethernet => include/soc}/mscc/ocelot_sys.h (100%)
+ create mode 100644 kernel/bpf/trampoline.c
+ create mode 100644 net/dsa/tag_ocelot.c
+ create mode 100644 net/mac80211/airtime.c
+ create mode 100644 net/netfilter/nf_flow_table_offload.c
+ create mode 100644 net/tipc/crypto.c
+ create mode 100644 net/tipc/crypto.h
+ create mode 100644 net/tls/tls_proc.c
+ create mode 100644 net/tls/tls_toe.c
+ create mode 100644 net/tls/trace.c
+ create mode 100644 net/tls/trace.h
+ create mode 100644 samples/bpf/Makefile.target
+ create mode 100644 samples/bpf/xdpsock.h
+ create mode 100644 samples/bpf/xdpsock_kern.c
+ create mode 100644 tools/lib/bpf/bpf_core_read.h
+ rename tools/{testing/selftests => lib}/bpf/bpf_endian.h (100%)
+ create mode 100644 tools/lib/bpf/bpf_helpers.h
+ create mode 100644 tools/lib/bpf/bpf_tracing.h
+ rename tools/lib/bpf/{test_libbpf.cpp => test_libbpf.c} (61%)
+ delete mode 100644 tools/testing/selftests/bpf/bpf_helpers.h
+ create mode 100644 tools/testing/selftests/bpf/bpf_legacy.h
+ rename tools/testing/selftests/bpf/{test_btf_dump.c => prog_tests/btf_dump.c} (51%)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fentry_fexit.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fentry_test.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fexit_stress.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fexit_test.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/kfree_skb.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/mmap.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/pinning.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/probe_user.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/rdonly_maps.c
+ rename tools/testing/selftests/bpf/{test_section_names.c => prog_tests/section_names.c} (73%)
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bit_sz_change.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bitfield_vs_int.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___err_too_big_bitfield.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___just_big_enough.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_kind.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_value_type.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_kind.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_sz.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_type.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_struct_type.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___minimal.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_sz.c
+ create mode 100644 tools/testing/selftests/bpf/progs/fentry_test.c
+ create mode 100644 tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c
+ create mode 100644 tools/testing/selftests/bpf/progs/fexit_test.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kfree_skb.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_direct.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_probed.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_existence.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_size.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_mmap.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_pinning.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_pinning_invalid.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_probe_user.c
+ rename tools/testing/selftests/bpf/{ => progs}/test_queue_stack_map.h (100%)
+ create mode 100644 tools/testing/selftests/bpf/progs/test_rdonly_maps.c
+ delete mode 100755 tools/testing/selftests/bpf/test_libbpf.sh
+ delete mode 100644 tools/testing/selftests/bpf/test_libbpf_open.c
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/mirror_gre_scale.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/router_scale.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower_scale.sh
+ create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh
+ create mode 100755 tools/testing/selftests/net/altnames.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ethtool.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ethtool_lib.sh
+ create mode 100755 tools/testing/selftests/net/traceroute.sh
+ create mode 100755 tools/testing/selftests/netfilter/ipvs.sh
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/basic.json
+Merging bpf-next/master (b633b4ea8a96 bpf: Simplify __bpf_arch_text_poke poke type handling)
+$ git merge bpf-next/master
+Auto-merging kernel/bpf/syscall.c
+CONFLICT (content): Merge conflict in kernel/bpf/syscall.c
+Recorded preimage for 'kernel/bpf/syscall.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'kernel/bpf/syscall.c'.
+[master 30248e85252e] Merge remote-tracking branch 'bpf-next/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/net/bpf_jit_comp.c | 229 +++++++---
+ include/linux/bpf.h | 60 ++-
+ include/linux/bpf_verifier.h | 3 +-
+ include/linux/filter.h | 15 +
+ kernel/bpf/arraymap.c | 205 ++++++++-
+ kernel/bpf/core.c | 73 ++-
+ kernel/bpf/devmap.c | 74 ++--
+ kernel/bpf/map_in_map.c | 5 +-
+ kernel/bpf/syscall.c | 56 +--
+ kernel/bpf/trampoline.c | 8 +-
+ kernel/bpf/verifier.c | 139 +++++-
+ net/xdp/xsk.c | 8 +-
+ tools/bpf/Makefile | 6 +
+ tools/bpf/bpftool/btf.c | 6 +-
+ tools/lib/bpf/bpf_helpers.h | 13 -
+ tools/lib/bpf/libbpf.c | 294 +++++++------
+ tools/testing/selftests/bpf/Makefile | 2 +-
+ tools/testing/selftests/bpf/bpf_trace_helpers.h | 58 +++
+ .../selftests/bpf/prog_tests/bpf_verif_scale.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 16 +-
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 487 +++++++++++++++++++++
+ .../selftests/bpf/prog_tests/test_overhead.c | 142 ++++++
+ tools/testing/selftests/bpf/progs/fentry_test.c | 72 +--
+ tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 27 +-
+ tools/testing/selftests/bpf/progs/fexit_test.c | 83 +---
+ tools/testing/selftests/bpf/progs/kfree_skb.c | 43 +-
+ tools/testing/selftests/bpf/progs/tailcall1.c | 48 ++
+ tools/testing/selftests/bpf/progs/tailcall2.c | 59 +++
+ tools/testing/selftests/bpf/progs/tailcall3.c | 31 ++
+ tools/testing/selftests/bpf/progs/tailcall4.c | 33 ++
+ tools/testing/selftests/bpf/progs/tailcall5.c | 40 ++
+ .../selftests/bpf/progs/test_core_reloc_arrays.c | 4 +-
+ .../bpf/progs/test_core_reloc_bitfields_direct.c | 4 +-
+ .../bpf/progs/test_core_reloc_bitfields_probed.c | 4 +-
+ .../bpf/progs/test_core_reloc_existence.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_flavors.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_ints.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_kernel.c | 8 +-
+ .../selftests/bpf/progs/test_core_reloc_misc.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_mods.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_nesting.c | 4 +-
+ .../bpf/progs/test_core_reloc_primitives.c | 4 +-
+ .../bpf/progs/test_core_reloc_ptr_as_arr.c | 4 +-
+ .../selftests/bpf/progs/test_core_reloc_size.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_overhead.c | 39 ++
+ tools/testing/selftests/bpf/test_bpftool_build.sh | 30 +-
+ tools/testing/selftests/bpf/test_progs.c | 18 +-
+ tools/testing/selftests/bpf/test_progs.h | 10 +-
+ tools/testing/selftests/bpf/test_stub.c | 4 +
+ tools/testing/selftests/bpf/verifier/jmp32.c | 83 ++++
+ 50 files changed, 2031 insertions(+), 548 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/bpf_trace_helpers.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tailcalls.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_overhead.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tailcall1.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tailcall2.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tailcall3.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tailcall4.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tailcall5.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_overhead.c
+Merging ipsec-next/master (72c996099dc6 cxgb4: Fix an error code in cxgb4_mqprio_alloc_hw_resources())
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (9c0015ef0928 IB/mlx5: Implement callbacks for getting VFs GUID attributes)
+$ git merge mlx5-next/mlx5-next
+Auto-merging net/core/rtnetlink.c
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/linux/netdevice.h
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/core/verbs.c
+Auto-merging drivers/infiniband/core/device.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/device.c | 1 +
+ drivers/infiniband/core/verbs.c | 10 ++++++++++
+ drivers/infiniband/hw/mlx5/ib_virt.c | 24 ++++++++++++++++++++++++
+ drivers/infiniband/hw/mlx5/main.c | 1 +
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +++
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 ++++++++++
+ include/linux/netdevice.h | 4 ++++
+ include/rdma/ib_verbs.h | 6 ++++++
+ net/core/rtnetlink.c | 14 ++++++++++++++
+ 9 files changed, 73 insertions(+)
+Merging netfilter-next/master (f3c9a666b285 net: sfp: soft status and control support)
+$ 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 net/nfc/netlink.c
+Auto-merging net/nfc/hci/core.c
+Auto-merging drivers/nfc/st95hf/core.c
+Auto-merging drivers/nfc/st21nfca/se.c
+CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
+Auto-merging drivers/nfc/st21nfca/dep.c
+Auto-merging drivers/nfc/fdp/i2c.c
+Auto-merging drivers/nfc/fdp/fdp.c
+Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e65f66d5e3f6] Merge remote-tracking branch 'nfc-next/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/nfc/fdp/fdp.c | 35 +++++------------------------------
+ drivers/nfc/fdp/i2c.c | 26 +++++++++++++-------------
+ drivers/nfc/st21nfca/dep.c | 3 ++-
+ drivers/nfc/st21nfca/se.c | 3 +--
+ drivers/nfc/st95hf/core.c | 7 ++-----
+ net/nfc/netlink.c | 3 ++-
+ 6 files changed, 25 insertions(+), 52 deletions(-)
+Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (05d6c8cfdbd6 mt76: fix fix ampdu locking)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (a4f95f31a9f3 Bluetooth: btbcm: Use the BDADDR_PROPERTY quirk)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 +
+ drivers/bluetooth/btbcm.c | 10 +++++++++
+ drivers/bluetooth/btusb.c | 3 ++-
+ drivers/bluetooth/hci_bcm.c | 1 +
+ net/bluetooth/hci_conn.c | 4 +++-
+ net/bluetooth/hci_core.c | 26 ++++++++++++++++++++--
+ net/bluetooth/l2cap_core.c | 4 +---
+ 7 files changed, 42 insertions(+), 7 deletions(-)
+Merging mac80211-next/master (7a89233ac504 mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue)
+$ git merge mac80211-next/master
+Already up to date.
+Merging gfs2/for-next (ade48088937f gfs2: Don't write log headers after file system withdraw)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/gfs2/bmap.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 6 +++---
+ fs/gfs2/bmap.c | 11 +++++++++--
+ fs/gfs2/file.c | 56 ++++++++++++++++++++++++++++++++--------------------
+ fs/gfs2/glock.c | 16 ++++++++++-----
+ fs/gfs2/glops.c | 4 ++--
+ fs/gfs2/inode.c | 16 +++++++--------
+ fs/gfs2/log.c | 25 +++++++++++++++++++----
+ fs/gfs2/log.h | 2 +-
+ fs/gfs2/lops.c | 34 +++++++++++++++----------------
+ fs/gfs2/lops.h | 3 ++-
+ fs/gfs2/meta_io.c | 6 +++---
+ fs/gfs2/ops_fstype.c | 5 ++---
+ fs/gfs2/quota.c | 4 ++--
+ fs/gfs2/recovery.c | 8 +++++---
+ fs/gfs2/super.c | 33 ++++++++++++++++++-------------
+ fs/gfs2/sys.c | 2 +-
+ fs/gfs2/trans.c | 2 ++
+ fs/gfs2/util.c | 2 +-
+ fs/gfs2/util.h | 9 +++++++++
+ 19 files changed, 152 insertions(+), 92 deletions(-)
+Merging mtd/mtd/next (589e1b6c47ce Merge tag 'nand/for-5.5' into mtd/next)
+$ git merge mtd/mtd/next
+Auto-merging drivers/mtd/ubi/debug.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/mtd/cadence-nand-controller.txt | 53 +
+ .../devicetree/bindings/mtd/intel,ixp4xx-flash.txt | 22 +
+ MAINTAINERS | 21 +-
+ drivers/mtd/chips/cfi_cmdset_0001.c | 10 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 79 +-
+ drivers/mtd/chips/cfi_cmdset_0020.c | 8 +-
+ drivers/mtd/chips/cfi_util.c | 2 +-
+ drivers/mtd/devices/mchp23k256.c | 20 +-
+ drivers/mtd/devices/spear_smi.c | 42 +-
+ drivers/mtd/devices/st_spi_fsm.c | 1 -
+ drivers/mtd/maps/Kconfig | 11 +
+ drivers/mtd/maps/Makefile | 1 +
+ drivers/mtd/maps/l440gx.c | 2 +-
+ drivers/mtd/maps/physmap-core.c | 5 +
+ drivers/mtd/maps/physmap-ixp4xx.c | 132 +
+ drivers/mtd/maps/physmap-ixp4xx.h | 17 +
+ drivers/mtd/mtdchar.c | 10 +-
+ drivers/mtd/mtdcore.c | 26 +-
+ drivers/mtd/mtdswap.c | 8 +-
+ drivers/mtd/nand/raw/Kconfig | 7 +
+ drivers/mtd/nand/raw/Makefile | 1 +
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 23 +-
+ drivers/mtd/nand/raw/cadence-nand-controller.c | 3030 ++++++++++++++++++++
+ drivers/mtd/nand/raw/denali_dt.c | 59 +-
+ drivers/mtd/nand/raw/hisi504_nand.c | 4 +-
+ drivers/mtd/nand/raw/lpc32xx_mlc.c | 1 -
+ drivers/mtd/nand/raw/marvell_nand.c | 4 +-
+ drivers/mtd/nand/raw/meson_nand.c | 4 +-
+ drivers/mtd/nand/raw/mtk_ecc.c | 4 +-
+ drivers/mtd/nand/raw/mtk_nand.c | 1 -
+ drivers/mtd/nand/raw/mxic_nand.c | 4 +-
+ drivers/mtd/nand/raw/nand_base.c | 8 +-
+ drivers/mtd/nand/raw/nand_micron.c | 4 +-
+ drivers/mtd/nand/raw/omap2.c | 8 +-
+ drivers/mtd/nand/raw/sh_flctl.c | 4 +-
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 5 +-
+ drivers/mtd/nand/raw/sunxi_nand.c | 4 +-
+ drivers/mtd/spi-nor/aspeed-smc.c | 23 +-
+ drivers/mtd/spi-nor/cadence-quadspi.c | 58 +-
+ drivers/mtd/spi-nor/hisi-sfc.c | 23 +-
+ drivers/mtd/spi-nor/intel-spi-pci.c | 6 +
+ drivers/mtd/spi-nor/intel-spi.c | 58 +-
+ drivers/mtd/spi-nor/mtk-quadspi.c | 25 +-
+ drivers/mtd/spi-nor/nxp-spifi.c | 23 +-
+ drivers/mtd/spi-nor/spi-nor.c | 1665 ++++++-----
+ drivers/mtd/ubi/debug.c | 131 +-
+ include/linux/mtd/spi-nor.h | 64 +-
+ include/linux/platform_data/intel-spi.h | 1 +
+ 48 files changed, 4612 insertions(+), 1110 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/intel,ixp4xx-flash.txt
+ create mode 100644 drivers/mtd/maps/physmap-ixp4xx.c
+ create mode 100644 drivers/mtd/maps/physmap-ixp4xx.h
+ create mode 100644 drivers/mtd/nand/raw/cadence-nand-controller.c
+Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL)
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (83cba933a6db mtd: spi-nor: Set default Quad Enable method for ISSI flashes)
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (4ee812f6143d crypto: vmx - Avoid weird build failures)
+$ git merge crypto/master
+Auto-merging net/xfrm/Kconfig
+Auto-merging lib/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/linux/pci.h
+Removing drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
+Auto-merging drivers/crypto/n2_core.c
+Removing drivers/crypto/hisilicon/sgl.h
+Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c
+Auto-merging drivers/char/hw_random/core.c
+Removing crypto/blkcipher.c
+Removing crypto/ablkcipher.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/mips/Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mach-omap2/pdata-quirks.c
+Removing arch/arm/crypto/chacha-neon-glue.c
+Auto-merging arch/arm/crypto/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/crypto/Kconfig
+Auto-merging arch/arm/boot/dts/omap3-n900.dts
+Auto-merging MAINTAINERS
+Resolved 'arch/arm/crypto/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2323ca386979] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-hisi-hpre | 57 +
+ Documentation/ABI/testing/debugfs-hisi-sec | 43 +
+ Documentation/crypto/api-skcipher.rst | 29 +-
+ Documentation/crypto/architecture.rst | 4 -
+ Documentation/crypto/crypto_engine.rst | 4 -
+ Documentation/crypto/devel-algos.rst | 27 +-
+ .../bindings/crypto/allwinner,sun8i-ss.yaml | 60 +
+ .../bindings/crypto/amlogic,gxl-crypto.yaml | 52 +
+ .../devicetree/bindings/rng/atmel-trng.txt | 2 +-
+ .../devicetree/bindings/rng/nuvoton,npcm-rng.txt | 12 +
+ .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 +
+ .../bindings/rng/samsung,exynos5250-trng.txt | 17 +
+ MAINTAINERS | 37 +-
+ arch/arm/boot/dts/omap3-n900.dts | 6 +
+ arch/arm/crypto/Kconfig | 36 +-
+ arch/arm/crypto/Makefile | 49 +-
+ arch/arm/crypto/chacha-glue.c | 343 +
+ arch/arm/crypto/chacha-neon-glue.c | 202 -
+ arch/arm/crypto/chacha-scalar-core.S | 460 ++
+ arch/arm/crypto/crct10dif-ce-core.S | 2 +-
+ arch/arm/crypto/curve25519-core.S | 2062 ++++++
+ arch/arm/crypto/curve25519-glue.c | 127 +
+ arch/arm/crypto/ghash-ce-core.S | 1 +
+ arch/arm/crypto/poly1305-armv4.pl | 1236 ++++
+ arch/arm/crypto/poly1305-core.S_shipped | 1158 +++
+ arch/arm/crypto/poly1305-glue.c | 276 +
+ arch/arm/crypto/sha1-ce-core.S | 1 +
+ arch/arm/crypto/sha2-ce-core.S | 1 +
+ arch/arm/mach-omap2/pdata-quirks.c | 14 +-
+ arch/arm64/Kconfig | 2 +-
+ arch/arm64/crypto/Kconfig | 17 +-
+ arch/arm64/crypto/Makefile | 10 +-
+ arch/arm64/crypto/aes-neonbs-glue.c | 2 +-
+ arch/arm64/crypto/chacha-neon-glue.c | 81 +-
+ arch/arm64/crypto/ghash-ce-core.S | 501 +-
+ arch/arm64/crypto/ghash-ce-glue.c | 293 +-
+ arch/arm64/crypto/poly1305-armv8.pl | 913 +++
+ arch/arm64/crypto/poly1305-core.S_shipped | 835 +++
+ arch/arm64/crypto/poly1305-glue.c | 237 +
+ arch/mips/Makefile | 2 +-
+ arch/mips/crypto/Makefile | 18 +
+ arch/mips/crypto/chacha-core.S | 497 ++
+ arch/mips/crypto/chacha-glue.c | 150 +
+ arch/mips/crypto/poly1305-glue.c | 203 +
+ arch/mips/crypto/poly1305-mips.pl | 1273 ++++
+ arch/powerpc/crypto/aes-spe-glue.c | 454 +-
+ arch/riscv/Kconfig | 2 +-
+ arch/s390/crypto/aes_s390.c | 609 +-
+ arch/s390/crypto/des_s390.c | 419 +-
+ arch/s390/crypto/paes_s390.c | 414 +-
+ arch/sparc/crypto/aes_glue.c | 310 +-
+ arch/sparc/crypto/camellia_glue.c | 217 +-
+ arch/sparc/crypto/des_glue.c | 499 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/crypto/Makefile | 3 +
+ arch/x86/crypto/blake2s-core.S | 258 +
+ arch/x86/crypto/blake2s-glue.c | 233 +
+ arch/x86/crypto/chacha_glue.c | 184 +-
+ arch/x86/crypto/curve25519-x86_64.c | 2475 +++++++
+ arch/x86/crypto/poly1305_glue.c | 199 +-
+ crypto/Kconfig | 171 +-
+ crypto/Makefile | 11 +-
+ crypto/ablkcipher.c | 407 --
+ crypto/adiantum.c | 5 +-
+ crypto/aead.c | 165 +-
+ crypto/aegis128-core.c | 125 +-
+ crypto/aegis128-neon-inner.c | 50 +
+ crypto/aegis128-neon.c | 21 +
+ crypto/af_alg.c | 2 +-
+ crypto/algapi.c | 26 -
+ crypto/algif_skcipher.c | 2 +-
+ crypto/api.c | 3 +-
+ crypto/blake2b_generic.c | 320 +
+ crypto/blake2s_generic.c | 171 +
+ crypto/blkcipher.c | 548 --
+ crypto/chacha_generic.c | 94 +-
+ crypto/cryptd.c | 2 +-
+ crypto/crypto_engine.c | 29 -
+ crypto/crypto_user_base.c | 4 +-
+ crypto/crypto_user_stat.c | 8 +-
+ crypto/curve25519-generic.c | 90 +
+ crypto/ecc.c | 5 +-
+ crypto/essiv.c | 9 +-
+ crypto/geniv.c | 176 +
+ crypto/jitterentropy-kcapi.c | 8 +-
+ crypto/jitterentropy.c | 13 +-
+ crypto/jitterentropy.h | 17 +
+ crypto/nhpoly1305.c | 3 +-
+ crypto/poly1305_generic.c | 228 +-
+ crypto/skcipher.c | 230 +-
+ crypto/tcrypt.c | 4 +-
+ crypto/testmgr.c | 82 +
+ crypto/testmgr.h | 2124 ++++++
+ crypto/tgr192.c | 4 +-
+ drivers/char/hw_random/Kconfig | 28 +-
+ drivers/char/hw_random/Makefile | 2 +
+ drivers/char/hw_random/atmel-rng.c | 43 +-
+ drivers/char/hw_random/bcm2835-rng.c | 5 +-
+ drivers/char/hw_random/core.c | 61 +-
+ drivers/char/hw_random/exynos-trng.c | 4 +-
+ drivers/char/hw_random/hisi-rng.c | 4 +-
+ drivers/char/hw_random/hisi-trng-v2.c | 99 +
+ drivers/char/hw_random/iproc-rng200.c | 9 +-
+ drivers/char/hw_random/ks-sa-rng.c | 44 +-
+ drivers/char/hw_random/meson-rng.c | 4 +-
+ drivers/char/hw_random/mtk-rng.c | 9 +-
+ drivers/char/hw_random/npcm-rng.c | 184 +
+ drivers/char/hw_random/omap-rng.c | 13 +-
+ drivers/char/hw_random/omap3-rom-rng.c | 168 +-
+ drivers/char/hw_random/pasemi-rng.c | 4 +-
+ drivers/char/hw_random/pic32-rng.c | 4 +-
+ drivers/char/hw_random/st-rng.c | 4 +-
+ drivers/char/hw_random/tx4939-rng.c | 4 +-
+ drivers/char/hw_random/xgene-rng.c | 4 +-
+ drivers/crypto/Kconfig | 92 +-
+ drivers/crypto/Makefile | 3 +-
+ drivers/crypto/allwinner/Kconfig | 87 +
+ drivers/crypto/allwinner/Makefile | 3 +
+ .../{sunxi-ss => allwinner/sun4i-ss}/Makefile | 0
+ .../sun4i-ss}/sun4i-ss-cipher.c | 34 +-
+ .../sun4i-ss}/sun4i-ss-core.c | 139 +-
+ .../sun4i-ss}/sun4i-ss-hash.c | 47 +-
+ .../sun4i-ss}/sun4i-ss-prng.c | 9 +-
+ .../{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss.h | 2 +
+ drivers/crypto/allwinner/sun8i-ce/Makefile | 2 +
+ .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 438 ++
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 676 ++
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 254 +
+ drivers/crypto/allwinner/sun8i-ss/Makefile | 2 +
+ .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 436 ++
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 642 ++
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 218 +
+ drivers/crypto/amcc/crypto4xx_core.c | 6 +-
+ drivers/crypto/amlogic/Kconfig | 24 +
+ drivers/crypto/amlogic/Makefile | 2 +
+ drivers/crypto/amlogic/amlogic-gxl-cipher.c | 382 +
+ drivers/crypto/amlogic/amlogic-gxl-core.c | 332 +
+ drivers/crypto/amlogic/amlogic-gxl.h | 161 +
+ drivers/crypto/atmel-aes.c | 590 +-
+ drivers/crypto/atmel-authenc.h | 2 +-
+ drivers/crypto/atmel-sha.c | 4 +-
+ drivers/crypto/atmel-tdes.c | 469 +-
+ drivers/crypto/bcm/cipher.c | 373 +-
+ drivers/crypto/bcm/cipher.h | 10 +-
+ drivers/crypto/bcm/spu2.c | 6 +-
+ drivers/crypto/caam/Kconfig | 6 +-
+ drivers/crypto/caam/caampkc.c | 72 +-
+ drivers/crypto/caam/caampkc.h | 8 +-
+ drivers/crypto/caam/ctrl.c | 222 +-
+ drivers/crypto/caam/intern.h | 4 -
+ drivers/crypto/caam/qi.c | 8 +-
+ drivers/crypto/caam/qi.h | 1 -
+ drivers/crypto/cavium/cpt/cptvf_algs.c | 292 +-
+ drivers/crypto/cavium/nitrox/Kconfig | 2 +-
+ drivers/crypto/cavium/nitrox/nitrox_aead.c | 39 +-
+ drivers/crypto/cavium/nitrox/nitrox_dev.h | 15 +
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 9 +-
+ drivers/crypto/cavium/nitrox/nitrox_mbx.c | 8 +
+ drivers/crypto/cavium/nitrox/nitrox_req.h | 4 +
+ drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 134 +-
+ drivers/crypto/ccp/Kconfig | 2 +-
+ drivers/crypto/ccp/ccp-crypto-aes-galois.c | 7 +-
+ drivers/crypto/ccp/ccp-crypto-aes-xts.c | 94 +-
+ drivers/crypto/ccp/ccp-crypto-aes.c | 169 +-
+ drivers/crypto/ccp/ccp-crypto-des3.c | 100 +-
+ drivers/crypto/ccp/ccp-crypto-main.c | 14 +-
+ drivers/crypto/ccp/ccp-crypto.h | 13 +-
+ drivers/crypto/ccp/ccp-dev-v5.c | 14 +-
+ drivers/crypto/ccp/ccp-dev.c | 15 +-
+ drivers/crypto/ccp/ccp-dmaengine.c | 1 +
+ drivers/crypto/ccp/ccp-ops.c | 3 +-
+ drivers/crypto/ccp/psp-dev.c | 59 +-
+ drivers/crypto/ccp/psp-dev.h | 1 +
+ drivers/crypto/ccree/cc_aead.c | 3 +-
+ drivers/crypto/ccree/cc_cipher.c | 4 +-
+ drivers/crypto/chelsio/chcr_algo.c | 334 +-
+ drivers/crypto/chelsio/chcr_algo.h | 2 +-
+ drivers/crypto/chelsio/chcr_crypto.h | 16 +-
+ drivers/crypto/chelsio/chtls/chtls_io.c | 5 +-
+ drivers/crypto/geode-aes.c | 433 +-
+ drivers/crypto/geode-aes.h | 15 +-
+ drivers/crypto/hifn_795x.c | 183 +-
+ drivers/crypto/hisilicon/Kconfig | 45 +-
+ drivers/crypto/hisilicon/Makefile | 6 +-
+ drivers/crypto/hisilicon/hpre/Makefile | 2 +
+ drivers/crypto/hisilicon/hpre/hpre.h | 83 +
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 1137 +++
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 1052 +++
+ drivers/crypto/hisilicon/qm.c | 142 +-
+ drivers/crypto/hisilicon/qm.h | 17 +-
+ drivers/crypto/hisilicon/sec2/Makefile | 2 +
+ drivers/crypto/hisilicon/sec2/sec.h | 156 +
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 889 +++
+ drivers/crypto/hisilicon/sec2/sec_crypto.h | 198 +
+ drivers/crypto/hisilicon/sec2/sec_main.c | 1095 +++
+ drivers/crypto/hisilicon/sgl.c | 184 +-
+ drivers/crypto/hisilicon/sgl.h | 24 -
+ drivers/crypto/hisilicon/zip/zip.h | 1 -
+ drivers/crypto/hisilicon/zip/zip_crypto.c | 46 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 294 +-
+ drivers/crypto/inside-secure/safexcel.c | 329 +-
+ drivers/crypto/inside-secure/safexcel.h | 131 +-
+ drivers/crypto/inside-secure/safexcel_cipher.c | 2062 +++++-
+ drivers/crypto/inside-secure/safexcel_hash.c | 1475 +++-
+ drivers/crypto/inside-secure/safexcel_ring.c | 5 +-
+ drivers/crypto/ixp4xx_crypto.c | 228 +-
+ drivers/crypto/marvell/cesa.h | 6 +-
+ drivers/crypto/marvell/cipher.c | 14 +-
+ drivers/crypto/mediatek/mtk-aes.c | 250 +-
+ drivers/crypto/mxs-dcp.c | 140 +-
+ drivers/crypto/n2_core.c | 194 +-
+ drivers/crypto/nx/nx-aes-cbc.c | 81 +-
+ drivers/crypto/nx/nx-aes-ccm.c | 45 +-
+ drivers/crypto/nx/nx-aes-ctr.c | 87 +-
+ drivers/crypto/nx/nx-aes-ecb.c | 76 +-
+ drivers/crypto/nx/nx-aes-gcm.c | 29 +-
+ drivers/crypto/nx/nx.c | 64 +-
+ drivers/crypto/nx/nx.h | 19 +-
+ drivers/crypto/nx/nx_debugfs.c | 18 +-
+ drivers/crypto/omap-aes.c | 209 +-
+ drivers/crypto/omap-aes.h | 4 +-
+ drivers/crypto/omap-des.c | 232 +-
+ drivers/crypto/padlock-aes.c | 157 +-
+ drivers/crypto/picoxcell_crypto.c | 386 +-
+ drivers/crypto/qat/Kconfig | 2 +-
+ drivers/crypto/qat/qat_common/qat_algs.c | 304 +-
+ drivers/crypto/qat/qat_common/qat_crypto.h | 4 +-
+ drivers/crypto/qce/Makefile | 2 +-
+ drivers/crypto/qce/cipher.h | 8 +-
+ drivers/crypto/qce/common.c | 12 +-
+ drivers/crypto/qce/common.h | 3 +-
+ drivers/crypto/qce/core.c | 2 +-
+ drivers/crypto/qce/dma.c | 4 +-
+ drivers/crypto/qce/sha.c | 2 +-
+ drivers/crypto/qce/{ablkcipher.c => skcipher.c} | 172 +-
+ drivers/crypto/rockchip/Makefile | 2 +-
+ drivers/crypto/rockchip/rk3288_crypto.c | 8 +-
+ drivers/crypto/rockchip/rk3288_crypto.h | 3 +-
+ drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 556 --
+ drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 538 ++
+ drivers/crypto/s5p-sss.c | 187 +-
+ drivers/crypto/sahara.c | 156 +-
+ drivers/crypto/stm32/stm32-cryp.c | 338 +-
+ drivers/crypto/talitos.c | 314 +-
+ drivers/crypto/ux500/Kconfig | 2 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 371 +-
+ drivers/crypto/ux500/hash/hash_core.c | 3 +-
+ drivers/crypto/virtio/Kconfig | 2 +-
+ drivers/crypto/virtio/virtio_crypto_algs.c | 192 +-
+ drivers/crypto/virtio/virtio_crypto_common.h | 2 +-
+ drivers/crypto/vmx/Makefile | 6 +-
+ drivers/net/wireless/cisco/Kconfig | 2 +-
+ include/crypto/aead.h | 2 +-
+ include/crypto/algapi.h | 149 -
+ include/crypto/blake2s.h | 106 +
+ include/crypto/chacha.h | 83 +-
+ include/crypto/chacha20poly1305.h | 48 +
+ include/crypto/curve25519.h | 71 +
+ include/crypto/engine.h | 4 -
+ include/crypto/hash.h | 2 +-
+ include/crypto/internal/blake2s.h | 24 +
+ include/crypto/internal/chacha.h | 43 +
+ include/crypto/internal/des.h | 12 -
+ include/crypto/internal/poly1305.h | 58 +
+ include/crypto/internal/skcipher.h | 62 -
+ include/crypto/poly1305.h | 69 +-
+ include/crypto/skcipher.h | 49 +-
+ include/linux/crypto.h | 861 +--
+ include/linux/pci.h | 1 +
+ include/uapi/linux/psp-sev.h | 3 +
+ init/Kconfig | 4 +
+ lib/Makefile | 3 +-
+ lib/crypto/Kconfig | 130 +
+ lib/crypto/Makefile | 42 +-
+ lib/crypto/blake2s-generic.c | 111 +
+ lib/crypto/blake2s-selftest.c | 622 ++
+ lib/crypto/blake2s.c | 126 +
+ lib/{ => crypto}/chacha.c | 20 +-
+ lib/crypto/chacha20poly1305-selftest.c | 7393 ++++++++++++++++++++
+ lib/crypto/chacha20poly1305.c | 369 +
+ lib/crypto/curve25519-fiat32.c | 864 +++
+ lib/crypto/curve25519-hacl64.c | 788 +++
+ lib/crypto/curve25519.c | 25 +
+ lib/crypto/libchacha.c | 35 +
+ lib/crypto/poly1305.c | 232 +
+ lib/ubsan.c | 2 +-
+ lib/ubsan.h | 2 +-
+ net/bluetooth/Kconfig | 2 +-
+ net/rxrpc/Kconfig | 2 +-
+ net/xfrm/Kconfig | 2 +-
+ net/xfrm/xfrm_algo.c | 4 +-
+ 291 files changed, 47109 insertions(+), 11394 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-hisi-hpre
+ create mode 100644 Documentation/ABI/testing/debugfs-hisi-sec
+ create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun8i-ss.yaml
+ create mode 100644 Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
+ create mode 100644 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt
+ create mode 100644 arch/arm/crypto/chacha-glue.c
+ delete mode 100644 arch/arm/crypto/chacha-neon-glue.c
+ create mode 100644 arch/arm/crypto/chacha-scalar-core.S
+ create mode 100644 arch/arm/crypto/curve25519-core.S
+ create mode 100644 arch/arm/crypto/curve25519-glue.c
+ create mode 100644 arch/arm/crypto/poly1305-armv4.pl
+ create mode 100644 arch/arm/crypto/poly1305-core.S_shipped
+ create mode 100644 arch/arm/crypto/poly1305-glue.c
+ create mode 100644 arch/arm64/crypto/poly1305-armv8.pl
+ create mode 100644 arch/arm64/crypto/poly1305-core.S_shipped
+ create mode 100644 arch/arm64/crypto/poly1305-glue.c
+ create mode 100644 arch/mips/crypto/chacha-core.S
+ create mode 100644 arch/mips/crypto/chacha-glue.c
+ create mode 100644 arch/mips/crypto/poly1305-glue.c
+ create mode 100644 arch/mips/crypto/poly1305-mips.pl
+ create mode 100644 arch/x86/crypto/blake2s-core.S
+ create mode 100644 arch/x86/crypto/blake2s-glue.c
+ create mode 100644 arch/x86/crypto/curve25519-x86_64.c
+ delete mode 100644 crypto/ablkcipher.c
+ create mode 100644 crypto/blake2b_generic.c
+ create mode 100644 crypto/blake2s_generic.c
+ delete mode 100644 crypto/blkcipher.c
+ create mode 100644 crypto/curve25519-generic.c
+ create mode 100644 crypto/geniv.c
+ create mode 100644 crypto/jitterentropy.h
+ create mode 100644 drivers/char/hw_random/hisi-trng-v2.c
+ create mode 100644 drivers/char/hw_random/npcm-rng.c
+ create mode 100644 drivers/crypto/allwinner/Kconfig
+ create mode 100644 drivers/crypto/allwinner/Makefile
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/Makefile (100%)
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-cipher.c (95%)
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-core.c (87%)
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-hash.c (93%)
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss-prng.c (92%)
+ rename drivers/crypto/{sunxi-ss => allwinner/sun4i-ss}/sun4i-ss.h (98%)
+ create mode 100644 drivers/crypto/allwinner/sun8i-ce/Makefile
+ create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
+ create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
+ create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h
+ create mode 100644 drivers/crypto/allwinner/sun8i-ss/Makefile
+ create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
+ create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
+ create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
+ create mode 100644 drivers/crypto/amlogic/Kconfig
+ create mode 100644 drivers/crypto/amlogic/Makefile
+ create mode 100644 drivers/crypto/amlogic/amlogic-gxl-cipher.c
+ create mode 100644 drivers/crypto/amlogic/amlogic-gxl-core.c
+ create mode 100644 drivers/crypto/amlogic/amlogic-gxl.h
+ create mode 100644 drivers/crypto/hisilicon/hpre/Makefile
+ create mode 100644 drivers/crypto/hisilicon/hpre/hpre.h
+ create mode 100644 drivers/crypto/hisilicon/hpre/hpre_crypto.c
+ create mode 100644 drivers/crypto/hisilicon/hpre/hpre_main.c
+ create mode 100644 drivers/crypto/hisilicon/sec2/Makefile
+ create mode 100644 drivers/crypto/hisilicon/sec2/sec.h
+ create mode 100644 drivers/crypto/hisilicon/sec2/sec_crypto.c
+ create mode 100644 drivers/crypto/hisilicon/sec2/sec_crypto.h
+ create mode 100644 drivers/crypto/hisilicon/sec2/sec_main.c
+ delete mode 100644 drivers/crypto/hisilicon/sgl.h
+ rename drivers/crypto/qce/{ablkcipher.c => skcipher.c} (62%)
+ delete mode 100644 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
+ create mode 100644 drivers/crypto/rockchip/rk3288_crypto_skcipher.c
+ create mode 100644 include/crypto/blake2s.h
+ create mode 100644 include/crypto/chacha20poly1305.h
+ create mode 100644 include/crypto/curve25519.h
+ create mode 100644 include/crypto/internal/blake2s.h
+ create mode 100644 include/crypto/internal/chacha.h
+ create mode 100644 include/crypto/internal/poly1305.h
+ create mode 100644 lib/crypto/Kconfig
+ create mode 100644 lib/crypto/blake2s-generic.c
+ create mode 100644 lib/crypto/blake2s-selftest.c
+ create mode 100644 lib/crypto/blake2s.c
+ rename lib/{ => crypto}/chacha.c (88%)
+ create mode 100644 lib/crypto/chacha20poly1305-selftest.c
+ create mode 100644 lib/crypto/chacha20poly1305.c
+ create mode 100644 lib/crypto/curve25519-fiat32.c
+ create mode 100644 lib/crypto/curve25519-hacl64.c
+ create mode 100644 lib/crypto/curve25519.c
+ create mode 100644 lib/crypto/libchacha.c
+ create mode 100644 lib/crypto/poly1305.c
+Merging drm/drm-next (17eee668b3ca Merge tag 'drm-misc-next-fixes-2019-11-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
+$ git merge drm/drm-next
+Removing include/drm/drm_vram_mm_helper.h
+Removing include/drm/drm_os_linux.h
+Removing include/drm/drmP.h
+Auto-merging drivers/video/fbdev/core/fbmem.c
+Auto-merging drivers/media/platform/seco-cec/seco-cec.c
+Auto-merging drivers/media/platform/meson/ao-cec.c
+Auto-merging drivers/media/platform/meson/ao-cec-g12a.c
+Removing drivers/gpu/drm/virtio/virtgpu_ttm.c
+Removing drivers/gpu/drm/vboxvideo/vbox_fb.c
+Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c
+Auto-merging drivers/gpu/drm/radeon/cik.c
+Removing drivers/gpu/drm/omapdrm/dss/core.c
+Auto-merging drivers/gpu/drm/mcde/mcde_dsi.c
+Removing drivers/gpu/drm/lima/lima_object.h
+Removing drivers/gpu/drm/lima/lima_object.c
+Removing drivers/gpu/drm/lima/lima_gem_prime.h
+Removing drivers/gpu/drm/lima/lima_gem_prime.c
+Auto-merging drivers/gpu/drm/i915/i915_scheduler.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_mocs.c
+Removing drivers/gpu/drm/i915/gt/intel_hangcheck.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pool.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_color.c
+Auto-merging drivers/gpu/drm/i915/display/intel_atomic.c
+Auto-merging drivers/gpu/drm/i915/Kconfig.debug
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
+Removing drivers/gpu/drm/drm_vram_mm_helper.c
+Removing drivers/gpu/drm/cirrus/cirrus_drv.h
+Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/si.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging MAINTAINERS
+Resolved 'drivers/gpu/drm/i915/Kconfig.debug' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_scheduler.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ce324b11f2f7] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 5 +
+ .../devicetree/bindings/display/arm,malidp.txt | 3 +
+ .../devicetree/bindings/display/bridge/anx7814.txt | 6 +-
+ .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 +
+ .../bindings/display/bridge/renesas,lvds.txt | 1 +
+ .../bindings/display/mediatek/mediatek,disp.txt | 30 +-
+ .../bindings/display/mediatek/mediatek,dsi.txt | 4 +-
+ .../devicetree/bindings/display/renesas,du.txt | 2 +
+ .../bindings/display/rockchip/rockchip-vop.txt | 6 +-
+ Documentation/gpu/amdgpu.rst | 65 +-
+ Documentation/gpu/drm-kms-helpers.rst | 3 -
+ Documentation/gpu/drm-mm.rst | 11 +-
+ Documentation/gpu/i915.rst | 82 +-
+ Documentation/gpu/mcde.rst | 2 +-
+ Documentation/gpu/todo.rst | 135 +-
+ MAINTAINERS | 13 +
+ drivers/dma-buf/dma-buf.c | 120 +-
+ drivers/dma-buf/dma-fence.c | 78 +-
+ drivers/gpu/drm/Kconfig | 36 +-
+ drivers/gpu/drm/Makefile | 6 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 102 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 77 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 147 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 289 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 214 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 214 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 176 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 86 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 274 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 306 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 216 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 107 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 28 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 38 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 70 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 84 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 101 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 71 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 53 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 418 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 87 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 659 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 209 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 99 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 9 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 41 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 230 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 158 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 318 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 92 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 67 +-
+ drivers/gpu/drm/amd/amdgpu/cik.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1388 ++++----
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 94 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 417 +--
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 380 +++
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 41 +
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 214 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nv.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 258 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 161 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 11 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 183 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/umc_v6_0.c | 37 +
+ drivers/gpu/drm/amd/amdgpu/umc_v6_0.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/vi.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/vi.h | 3 +
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +-
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 139 +-
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 19 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 8 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 272 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 108 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 15 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 37 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 26 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 32 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 25 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 +
+ drivers/gpu/drm/amd/display/Kconfig | 28 +-
+ drivers/gpu/drm/amd/display/Makefile | 7 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 381 ++-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 9 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 52 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 346 ++
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 66 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 17 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 49 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 153 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 4 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 25 +
+ .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 14 +-
+ .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 4 +-
+ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 13 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 186 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 1 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 304 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 4 +-
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 38 +-
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 281 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 345 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 101 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 44 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 74 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 44 +-
+ drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 91 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 18 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 23 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 22 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 93 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 187 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 8 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 52 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 44 +-
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 51 +-
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 52 +-
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 52 +-
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 51 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 8 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 28 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 27 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 50 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 60 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 43 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 62 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 57 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 89 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 4 -
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 12 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 640 +++-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 16 +
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 349 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 34 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 116 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 34 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 122 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 33 +
+ .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 470 +++
+ .../drm/amd/display/dc/dcn21/dcn21_link_encoder.h | 61 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 380 ++-
+ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 49 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 5 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 12 +-
+ .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 8 +-
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 8 +-
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 5 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 +
+ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 85 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 3 -
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 -
+ drivers/gpu/drm/amd/display/dc/hdcp/Makefile | 28 +
+ drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 324 ++
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 5 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 12 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 17 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 12 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 4 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 1 +
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 19 +-
+ .../drm/amd/display/include/ddc_service_types.h | 2 +
+ drivers/gpu/drm/amd/display/include/hdcp_types.h | 96 +
+ .../drm/amd/display/modules/color/color_gamma.c | 51 +-
+ .../drm/amd/display/modules/freesync/freesync.c | 53 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 32 +
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 426 +++
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 442 +++
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 531 ++++
+ .../amd/display/modules/hdcp/hdcp1_transition.c | 307 ++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 305 ++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 163 +
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 139 +
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 328 ++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 272 ++
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 +
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 289 ++
+ .../drm/amd/display/modules/inc/mod_info_packet.h | 3 +
+ .../amd/display/modules/info_packet/info_packet.c | 98 +
+ .../drm/amd/display/modules/power/power_helpers.c | 93 +-
+ .../drm/amd/display/modules/power/power_helpers.h | 1 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h | 1 +
+ .../drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h | 1 +
+ .../drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 10 +
+ .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 18 +-
+ .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 18 +-
+ .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 +
+ .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4 +-
+ .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 49 +-
+ .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 +
+ .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1 +
+ .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 +
+ .../amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 1 +
+ .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 2 +
+ .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 +
+ .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 176 ++
+ .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 12 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 27 +-
+ drivers/gpu/drm/amd/include/discovery.h | 1 -
+ .../amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h | 42 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 13 +-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 10 +
+ drivers/gpu/drm/amd/include/renoir_ip_offset.h | 34 +
+ drivers/gpu/drm/amd/include/vega10_enum.h | 1 +
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 45 +
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1173 +++++--
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 523 ++-
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c | 195 ++
+ drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h | 29 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.c | 19 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/common_baco.h | 13 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c | 196 ++
+ drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h | 29 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c | 222 ++
+ drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h | 29 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c | 91 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h | 32 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 17 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c | 231 ++
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h | 29 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 68 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 23 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 41 +-
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 369 +--
+ drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 4 +
+ .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 51 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 3 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 134 +-
+ .../gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h | 2 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 41 +-
+ drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 531 +++-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 11 +
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 483 ++-
+ drivers/gpu/drm/amd/powerplay/smu_internal.h | 204 ++
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 370 +--
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 153 +-
+ .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 2 -
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 4 +-
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 134 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 16 +-
+ drivers/gpu/drm/arc/arcpgu_hdmi.c | 1 +
+ drivers/gpu/drm/arm/display/Kconfig | 6 +
+ drivers/gpu/drm/arm/display/komeda/Makefile | 2 +
+ .../gpu/drm/arm/display/komeda/d71/d71_component.c | 221 +-
+ drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 41 +-
+ drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 +
+ drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 9 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 105 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 77 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 20 +
+ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 30 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_event.c | 140 +
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 +
+ .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 17 +-
+ .../drm/arm/display/komeda/komeda_pipeline_state.c | 76 +-
+ .../drm/arm/display/komeda/komeda_wb_connector.c | 5 +
+ drivers/gpu/drm/arm/malidp_drv.c | 16 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 9 +
+ drivers/gpu/drm/arm/malidp_hw.h | 3 +
+ drivers/gpu/drm/arm/malidp_regs.h | 10 +
+ drivers/gpu/drm/ast/Kconfig | 2 +
+ drivers/gpu/drm/ast/ast_drv.c | 6 +-
+ drivers/gpu/drm/ast/ast_drv.h | 43 +-
+ drivers/gpu/drm/ast/ast_main.c | 1 -
+ drivers/gpu/drm/ast/ast_mode.c | 266 +-
+ drivers/gpu/drm/ast/ast_ttm.c | 3 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 5 +-
+ drivers/gpu/drm/bochs/Kconfig | 2 +
+ drivers/gpu/drm/bochs/bochs.h | 1 -
+ drivers/gpu/drm/bochs/bochs_drv.c | 7 +-
+ drivers/gpu/drm/bochs/bochs_kms.c | 26 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 3 +-
+ drivers/gpu/drm/bridge/Kconfig | 3 +-
+ drivers/gpu/drm/bridge/analogix-anx78xx.c | 110 +-
+ drivers/gpu/drm/bridge/analogix-anx78xx.h | 17 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 +
+ drivers/gpu/drm/bridge/cdns-dsi.c | 3 +-
+ drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 +
+ drivers/gpu/drm/bridge/lvds-encoder.c | 3 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 +
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 +
+ drivers/gpu/drm/bridge/panel.c | 70 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 1 +
+ drivers/gpu/drm/bridge/sii902x.c | 1 +
+ drivers/gpu/drm/bridge/sii9234.c | 37 +-
+ drivers/gpu/drm/bridge/sil-sii8620.c | 11 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 4 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 114 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 39 +
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 10 +-
+ drivers/gpu/drm/bridge/tc358764.c | 1 +
+ drivers/gpu/drm/bridge/tc358767.c | 66 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 +
+ drivers/gpu/drm/bridge/ti-tfp410.c | 1 +
+ drivers/gpu/drm/cirrus/cirrus.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 247 --
+ drivers/gpu/drm/drm_atomic_helper.c | 18 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
+ drivers/gpu/drm/drm_blend.c | 7 +-
+ drivers/gpu/drm/drm_cache.c | 14 +-
+ drivers/gpu/drm/drm_client_modeset.c | 3 +-
+ drivers/gpu/drm/drm_connector.c | 142 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 23 +-
+ drivers/gpu/drm/drm_crtc_helper_internal.h | 3 +
+ drivers/gpu/drm/drm_damage_helper.c | 8 +-
+ drivers/gpu/drm/drm_debugfs_crc.c | 8 +-
+ drivers/gpu/drm/drm_dp_cec.c | 29 +-
+ drivers/gpu/drm/drm_dp_helper.c | 177 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 1807 ++++++++---
+ drivers/gpu/drm/drm_dp_mst_topology_internal.h | 24 +
+ drivers/gpu/drm/drm_drv.c | 17 -
+ drivers/gpu/drm/drm_dsc.c | 23 +-
+ drivers/gpu/drm/drm_edid.c | 222 +-
+ drivers/gpu/drm/drm_edid_load.c | 2 +-
+ drivers/gpu/drm/drm_encoder.c | 1 +
+ drivers/gpu/drm/drm_fb_helper.c | 62 +-
+ drivers/gpu/drm/drm_gem.c | 40 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 31 +-
+ drivers/gpu/drm/drm_gem_ttm_helper.c | 84 +
+ drivers/gpu/drm/drm_gem_vram_helper.c | 735 ++++-
+ drivers/gpu/drm/drm_memory.c | 1 +
+ drivers/gpu/drm/drm_mipi_dbi.c | 11 +-
+ drivers/gpu/drm/drm_mm.c | 36 +-
+ drivers/gpu/drm/drm_mode_config.c | 2 -
+ drivers/gpu/drm/drm_of.c | 5 -
+ drivers/gpu/drm/drm_panel.c | 14 +-
+ drivers/gpu/drm/drm_prime.c | 9 +
+ drivers/gpu/drm/drm_print.c | 60 +-
+ drivers/gpu/drm/drm_probe_helper.c | 4 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 3 +-
+ drivers/gpu/drm/drm_syncobj.c | 38 +-
+ drivers/gpu/drm/drm_trace.h | 14 +-
+ drivers/gpu/drm/drm_vblank.c | 60 +-
+ drivers/gpu/drm/drm_vram_helper_common.c | 8 +-
+ drivers/gpu/drm/drm_vram_mm_helper.c | 297 --
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_dp.c | 1 +
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 +
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 +
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 32 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 4 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 +
+ drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 3 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 14 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 3 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 +
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda9950.c | 12 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 10 +-
+ drivers/gpu/drm/i810/i810_dma.c | 4 +-
+ drivers/gpu/drm/i915/Kconfig | 18 +-
+ drivers/gpu/drm/i915/Kconfig.debug | 148 +-
+ drivers/gpu/drm/i915/Kconfig.profile | 49 +
+ drivers/gpu/drm/i915/Kconfig.unstable | 29 +
+ drivers/gpu/drm/i915/Makefile | 25 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 68 +-
+ drivers/gpu/drm/i915/display/intel_atomic.h | 5 +
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 58 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 4 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 46 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 81 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 1316 ++++----
+ drivers/gpu/drm/i915/display/intel_cdclk.h | 13 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 550 +++-
+ drivers/gpu/drm/i915/display/intel_color.h | 7 +
+ drivers/gpu/drm/i915/display/intel_connector.c | 21 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 839 +++--
+ drivers/gpu/drm/i915/display/intel_ddi.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 2404 ++++++++------
+ drivers/gpu/drm/i915/display/intel_display.h | 66 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 554 ++--
+ drivers/gpu/drm/i915/display/intel_display_power.h | 43 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 63 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 509 ++-
+ drivers/gpu/drm/i915/display/intel_dp.h | 9 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 75 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 412 ++-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 5 +
+ drivers/gpu/drm/i915/display/intel_dsb.c | 332 ++
+ drivers/gpu/drm/i915/display/intel_dsb.h | 52 +
+ drivers/gpu/drm/i915/display/intel_dsi.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 216 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 297 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 1 +
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 1 +
+ drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 32 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 441 ++-
+ drivers/gpu/drm/i915/display/intel_psr.h | 1 -
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.h | 1 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 549 +++-
+ drivers/gpu/drm/i915/display/intel_sprite.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 87 +-
+ drivers/gpu/drm/i915/display/intel_tc.h | 1 +
+ drivers/gpu/drm/i915/display/intel_tv.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 55 +
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 74 +-
+ drivers/gpu/drm/i915/display/intel_vga.c | 160 +
+ drivers/gpu/drm/i915/display/intel_vga.h | 18 +
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 9 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 614 ++--
+ drivers/gpu/drm/i915/gem/i915_gem_context.h | 61 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 22 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 56 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 89 +-
+ drivers/gpu/drm/i915/gem/i915_gem_internal.c | 20 +-
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 99 +
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 37 +
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 84 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 38 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 52 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 34 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 48 +-
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pm.c | 165 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 -
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 174 +
+ drivers/gpu/drm/i915/gem/i915_gem_region.h | 29 +
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 82 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 124 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 130 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 42 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 33 +-
+ .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 3 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 579 +++-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c | 30 +-
+ .../drm/i915/gem/selftests/i915_gem_coherency.c | 214 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 704 +++--
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 306 +-
+ .../drm/i915/gem/selftests/i915_gem_object_blt.c | 354 ++-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 2 -
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 33 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 13 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_context.c | 17 +-
+ drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 19 +-
+ drivers/gpu/drm/i915/gt/intel_context.c | 25 +-
+ drivers/gpu/drm/i915/gt/intel_context.h | 1 +
+ drivers/gpu/drm/i915/gt/intel_context_types.h | 1 +
+ drivers/gpu/drm/i915/gt/intel_engine.h | 231 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 246 +-
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 234 ++
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h | 23 +
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 28 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pool.c | 15 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pool.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 91 +-
+ drivers/gpu/drm/i915/gt/intel_engine_user.c | 18 +-
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 37 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 160 +-
+ drivers/gpu/drm/i915/gt/intel_gt.h | 16 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 5 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 209 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.h | 16 +-
+ drivers/gpu/drm/i915/gt/intel_gt_requests.c | 132 +
+ drivers/gpu/drm/i915/gt/intel_gt_requests.h | 24 +
+ drivers/gpu/drm/i915/gt/intel_gt_types.h | 36 +-
+ drivers/gpu/drm/i915/gt/intel_hangcheck.c | 360 ---
+ drivers/gpu/drm/i915/gt/intel_llc.c | 161 +
+ drivers/gpu/drm/i915/gt/intel_llc.h | 15 +
+ drivers/gpu/drm/i915/gt/intel_llc_types.h | 13 +
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 1500 ++++++---
+ drivers/gpu/drm/i915/gt/intel_lrc.h | 39 +-
+ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 66 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 277 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.h | 3 -
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 787 +++++
+ drivers/gpu/drm/i915/gt/intel_rc6.h | 28 +
+ drivers/gpu/drm/i915/gt/intel_rc6_types.h | 29 +
+ drivers/gpu/drm/i915/gt/intel_renderstate.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_reset.c | 172 +-
+ drivers/gpu/drm/i915/gt/intel_reset.h | 14 +-
+ drivers/gpu/drm/i915/gt/intel_reset_types.h | 6 +
+ drivers/gpu/drm/i915/gt/intel_ring.c | 323 ++
+ drivers/gpu/drm/i915/gt/intel_ring.h | 131 +
+ ...{intel_ringbuffer.c => intel_ring_submission.c} | 404 +--
+ drivers/gpu/drm/i915/gt/intel_ring_types.h | 51 +
+ drivers/gpu/drm/i915/gt/intel_rps.c | 1872 +++++++++++
+ drivers/gpu/drm/i915/gt/intel_rps.h | 38 +
+ drivers/gpu/drm/i915/gt/intel_rps_types.h | 93 +
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 37 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.h | 37 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 52 +-
+ drivers/gpu/drm/i915/gt/intel_timeline_types.h | 10 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 67 +-
+ drivers/gpu/drm/i915/gt/mock_engine.c | 7 +
+ drivers/gpu/drm/i915/gt/selftest_context.c | 71 +-
+ .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 350 +++
+ drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 60 +
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 207 +-
+ drivers/gpu/drm/i915/gt/selftest_llc.c | 80 +
+ drivers/gpu/drm/i915/gt/selftest_llc.h | 14 +
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 1943 ++++++++++--
+ drivers/gpu/drm/i915/gt/selftest_reset.c | 16 +-
+ drivers/gpu/drm/i915/gt/selftest_timeline.c | 138 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 270 +-
+ drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 185 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 56 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 21 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 41 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 15 -
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 38 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 76 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 11 +-
+ drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 46 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 14 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +-
+ drivers/gpu/drm/i915/gvt/execlist.c | 4 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 23 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 17 -
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 1 +
+ drivers/gpu/drm/i915/gvt/scheduler.c | 48 +-
+ drivers/gpu/drm/i915/i915_active.c | 389 ++-
+ drivers/gpu/drm/i915/i915_active.h | 330 +-
+ drivers/gpu/drm/i915/i915_active_types.h | 34 +-
+ drivers/gpu/drm/i915/i915_buddy.c | 1 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 522 ++-
+ drivers/gpu/drm/i915/i915_drv.c | 289 +-
+ drivers/gpu/drm/i915/i915_drv.h | 622 +---
+ drivers/gpu/drm/i915/i915_gem.c | 406 +--
+ drivers/gpu/drm/i915/i915_gem.h | 16 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 58 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 104 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.h | 7 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 413 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 77 +-
+ drivers/gpu/drm/i915/i915_getparam.c | 8 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 150 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 8 +-
+ drivers/gpu/drm/i915/i915_irq.c | 839 ++---
+ drivers/gpu/drm/i915/i915_irq.h | 16 +-
+ drivers/gpu/drm/i915/i915_params.c | 12 +-
+ drivers/gpu/drm/i915/i915_params.h | 5 +-
+ drivers/gpu/drm/i915/i915_pci.c | 80 +-
+ drivers/gpu/drm/i915/i915_perf.c | 1860 +++++++----
+ drivers/gpu/drm/i915/i915_perf.h | 32 +-
+ drivers/gpu/drm/i915/i915_perf_types.h | 435 +++
+ drivers/gpu/drm/i915/i915_pmu.c | 309 +-
+ drivers/gpu/drm/i915/i915_pmu.h | 8 +-
+ drivers/gpu/drm/i915/i915_priolist_types.h | 7 +
+ drivers/gpu/drm/i915/i915_query.c | 306 +-
+ drivers/gpu/drm/i915/i915_reg.h | 876 ++++--
+ drivers/gpu/drm/i915/i915_request.c | 235 +-
+ drivers/gpu/drm/i915/i915_request.h | 40 +-
+ drivers/gpu/drm/i915/i915_scatterlist.h | 8 +-
+ drivers/gpu/drm/i915/i915_scheduler.c | 5 +-
+ drivers/gpu/drm/i915/i915_scheduler.h | 18 -
+ drivers/gpu/drm/i915/i915_scheduler_types.h | 9 +
+ drivers/gpu/drm/i915/i915_suspend.c | 11 +-
+ drivers/gpu/drm/i915/i915_switcheroo.c | 67 +
+ drivers/gpu/drm/i915/i915_switcheroo.h | 14 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 162 +-
+ drivers/gpu/drm/i915/i915_trace.h | 40 +-
+ drivers/gpu/drm/i915/i915_utils.c | 43 +-
+ drivers/gpu/drm/i915/i915_utils.h | 34 +-
+ drivers/gpu/drm/i915/i915_vma.c | 639 ++--
+ drivers/gpu/drm/i915/i915_vma.h | 134 +-
+ drivers/gpu/drm/i915/intel_csr.c | 4 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 230 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 8 +-
+ drivers/gpu/drm/i915/intel_memory_region.c | 272 ++
+ drivers/gpu/drm/i915/intel_memory_region.h | 129 +
+ drivers/gpu/drm/i915/intel_pch.c | 14 +-
+ drivers/gpu/drm/i915/intel_pch.h | 6 +-
+ drivers/gpu/drm/i915/intel_pm.c | 3317 ++------------------
+ drivers/gpu/drm/i915/intel_pm.h | 30 -
+ drivers/gpu/drm/i915/intel_region_lmem.c | 132 +
+ drivers/gpu/drm/i915/intel_region_lmem.h | 16 +
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 1 -
+ drivers/gpu/drm/i915/intel_uncore.c | 94 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 20 +-
+ drivers/gpu/drm/i915/oa/i915_oa_tgl.c | 121 +
+ drivers/gpu/drm/i915/oa/i915_oa_tgl.h | 16 +
+ drivers/gpu/drm/i915/selftests/i915_active.c | 90 +-
+ drivers/gpu/drm/i915/selftests/i915_buddy.c | 4 +
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 46 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 143 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 404 ++-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 5 +
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 +
+ drivers/gpu/drm/i915/selftests/i915_perf.c | 217 ++
+ drivers/gpu/drm/i915/selftests/i915_random.c | 20 +
+ drivers/gpu/drm/i915/selftests/i915_random.h | 4 +
+ drivers/gpu/drm/i915/selftests/i915_request.c | 502 +--
+ drivers/gpu/drm/i915/selftests/i915_selftest.c | 23 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 19 +-
+ drivers/gpu/drm/i915/selftests/igt_flush_test.c | 33 +-
+ drivers/gpu/drm/i915/selftests/igt_flush_test.h | 2 +-
+ drivers/gpu/drm/i915/selftests/igt_live_test.c | 19 +-
+ drivers/gpu/drm/i915/selftests/igt_reset.c | 4 +-
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 624 ++++
+ drivers/gpu/drm/i915/selftests/intel_uncore.c | 56 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 53 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 8 +-
+ drivers/gpu/drm/i915/selftests/mock_region.c | 60 +
+ drivers/gpu/drm/i915/selftests/mock_region.h | 16 +
+ drivers/gpu/drm/i915/selftests/mock_uncore.c | 5 +-
+ drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 1 +
+ drivers/gpu/drm/imx/parallel-display.c | 1 +
+ drivers/gpu/drm/ingenic/ingenic-drm.c | 5 +-
+ drivers/gpu/drm/lima/Kconfig | 1 +
+ drivers/gpu/drm/lima/Makefile | 4 +-
+ drivers/gpu/drm/lima/lima_device.c | 5 +-
+ drivers/gpu/drm/lima/lima_drv.c | 22 +-
+ drivers/gpu/drm/lima/lima_gem.c | 195 +-
+ drivers/gpu/drm/lima/lima_gem.h | 32 +-
+ drivers/gpu/drm/lima/lima_gem_prime.c | 46 -
+ drivers/gpu/drm/lima/lima_gem_prime.h | 13 -
+ drivers/gpu/drm/lima/lima_mmu.c | 1 -
+ drivers/gpu/drm/lima/lima_object.c | 119 -
+ drivers/gpu/drm/lima/lima_object.h | 35 -
+ drivers/gpu/drm/lima/lima_sched.c | 6 +-
+ drivers/gpu/drm/lima/lima_vm.c | 87 +-
+ drivers/gpu/drm/mcde/mcde_drv.c | 3 +-
+ drivers/gpu/drm/mcde/mcde_dsi.c | 4 +-
+ drivers/gpu/drm/mediatek/Makefile | 2 +
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 111 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 1 +
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 136 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +
+ drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 128 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 67 +
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 43 +
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 24 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 234 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 +
+ drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 338 +-
+ drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 49 +
+ drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c | 288 ++
+ drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 149 +
+ drivers/gpu/drm/meson/meson_drv.c | 32 +
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 115 +-
+ drivers/gpu/drm/meson/meson_vclk.c | 9 +-
+ drivers/gpu/drm/mgag200/Kconfig | 2 +
+ drivers/gpu/drm/mgag200/mgag200_cursor.c | 327 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 7 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 23 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 20 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 17 +-
+ drivers/gpu/drm/mgag200/mgag200_ttm.c | 7 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +-
+ drivers/gpu/drm/msm/dsi/dsi.h | 1 +
+ drivers/gpu/drm/msm/edp/edp.c | 4 +-
+ drivers/gpu/drm/msm/edp/edp.h | 1 +
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 70 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 2 +
+ drivers/gpu/drm/msm/msm_debugfs.c | 6 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 20 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 46 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.h | 4 +-
+ drivers/gpu/drm/mxsfb/mxsfb_out.c | 26 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 40 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 43 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 +
+ drivers/gpu/drm/omapdrm/dss/Makefile | 2 +-
+ drivers/gpu/drm/omapdrm/dss/core.c | 55 -
+ drivers/gpu/drm/omapdrm/dss/dispc.c | 46 +-
+ drivers/gpu/drm/omapdrm/dss/dsi.c | 3 +-
+ drivers/gpu/drm/omapdrm/dss/dss.c | 37 +
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 9 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 129 +-
+ drivers/gpu/drm/omapdrm/dss/output.c | 1 +
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 2 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 1 +
+ drivers/gpu/drm/omapdrm/omap_encoder.c | 1 +
+ drivers/gpu/drm/omapdrm/omap_fb.c | 9 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 137 +-
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/panel/panel-arm-versatile.c | 5 +-
+ .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 5 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 5 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 5 +-
+ drivers/gpu/drm/panel/panel-innolux-p079zca.c | 5 +-
+ drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 5 +-
+ drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 5 +-
+ drivers/gpu/drm/panel/panel-lg-lb035q02.c | 5 +-
+ drivers/gpu/drm/panel/panel-lg-lg4573.c | 5 +-
+ drivers/gpu/drm/panel/panel-lvds.c | 26 +-
+ drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 5 +-
+ drivers/gpu/drm/panel/panel-novatek-nt39016.c | 5 +-
+ drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +-
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 5 +-
+ drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 5 +-
+ .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 5 +-
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +-
+ drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +-
+ drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +-
+ drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +-
+ drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-ld9040.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 5 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 5 +-
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 5 +-
+ drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 5 +-
+ drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 5 +-
+ drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 5 +-
+ drivers/gpu/drm/panel/panel-simple.c | 29 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 5 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +-
+ drivers/gpu/drm/panel/panel-sony-acx565akm.c | 5 +-
+ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 5 +-
+ drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 5 +-
+ drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 +-
+ drivers/gpu/drm/panel/panel-truly-nt35597.c | 5 +-
+ drivers/gpu/drm/panfrost/TODO | 2 +
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 124 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 +-
+ drivers/gpu/drm/panfrost/panfrost_device.h | 14 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
+ drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
+ drivers/gpu/drm/panfrost/panfrost_issues.h | 81 +
+ drivers/gpu/drm/panfrost/panfrost_job.c | 17 +-
+ drivers/gpu/drm/pl111/pl111_display.c | 4 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 4 +-
+ drivers/gpu/drm/qxl/Kconfig | 1 +
+ drivers/gpu/drm/qxl/qxl_drv.c | 20 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 4 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 32 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 11 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 62 +-
+ drivers/gpu/drm/radeon/cik.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_audio.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 27 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 24 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 11 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 +
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +-
+ drivers/gpu/drm/rcar-du/rcar_lvds.c | 29 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 12 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.h | 3 +-
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 19 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 169 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 10 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 +
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 48 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 12 +-
+ drivers/gpu/drm/scheduler/sched_fence.c | 4 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 66 +-
+ drivers/gpu/drm/selftests/Makefile | 2 +-
+ drivers/gpu/drm/selftests/drm_modeset_selftests.h | 2 +
+ drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 238 ++
+ drivers/gpu/drm/selftests/test-drm_framebuffer.c | 2 +-
+ drivers/gpu/drm/selftests/test-drm_mm.c | 14 +-
+ .../gpu/drm/selftests/test-drm_modeset_common.h | 2 +
+ drivers/gpu/drm/sti/sti_cursor.c | 2 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 3 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 2 +-
+ drivers/gpu/drm/sti/sti_hda.c | 3 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 26 +-
+ drivers/gpu/drm/sti/sti_tvout.c | 10 +-
+ drivers/gpu/drm/sti/sti_vtg.c | 2 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 5 +-
+ drivers/gpu/drm/stm/ltdc.c | 39 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_lvds.c | 1 +
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 +
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 +
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 35 +-
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 1 +
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 +
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 1 +
+ drivers/gpu/drm/tegra/Kconfig | 2 +-
+ drivers/gpu/drm/tegra/Makefile | 1 +
+ drivers/gpu/drm/tegra/dc.c | 30 +-
+ drivers/gpu/drm/tegra/dc.h | 2 -
+ drivers/gpu/drm/tegra/dp.c | 876 ++++++
+ drivers/gpu/drm/tegra/dp.h | 177 ++
+ drivers/gpu/drm/tegra/dpaux.c | 208 +-
+ drivers/gpu/drm/tegra/drm.c | 417 +--
+ drivers/gpu/drm/tegra/drm.h | 13 +-
+ drivers/gpu/drm/tegra/falcon.c | 64 +-
+ drivers/gpu/drm/tegra/falcon.h | 16 +-
+ drivers/gpu/drm/tegra/fb.c | 4 +-
+ drivers/gpu/drm/tegra/gem.c | 81 +-
+ drivers/gpu/drm/tegra/gem.h | 2 +-
+ drivers/gpu/drm/tegra/gr2d.c | 12 +-
+ drivers/gpu/drm/tegra/gr3d.c | 12 +-
+ drivers/gpu/drm/tegra/hub.c | 6 +-
+ drivers/gpu/drm/tegra/output.c | 28 +-
+ drivers/gpu/drm/tegra/plane.c | 104 +
+ drivers/gpu/drm/tegra/plane.h | 8 +
+ drivers/gpu/drm/tegra/sor.c | 2576 ++++++++-------
+ drivers/gpu/drm/tegra/sor.h | 3 +
+ drivers/gpu/drm/tegra/vic.c | 138 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 5 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +-
+ drivers/gpu/drm/tiny/gm12u320.c | 2 +-
+ drivers/gpu/drm/ttm/Makefile | 4 +-
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 190 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 27 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 69 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 57 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 7 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 4 +-
+ drivers/gpu/drm/udl/udl_connector.c | 8 -
+ drivers/gpu/drm/v3d/v3d_bo.c | 2 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 5 +-
+ drivers/gpu/drm/v3d/v3d_gem.c | 55 +-
+ drivers/gpu/drm/vboxvideo/Kconfig | 2 +
+ drivers/gpu/drm/vboxvideo/Makefile | 2 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 19 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.h | 27 -
+ drivers/gpu/drm/vboxvideo/vbox_fb.c | 149 -
+ drivers/gpu/drm/vboxvideo/vbox_main.c | 119 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c | 138 +-
+ drivers/gpu/drm/vboxvideo/vbox_ttm.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 4 +-
+ drivers/gpu/drm/virtio/Kconfig | 2 +-
+ drivers/gpu/drm/virtio/Makefile | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 22 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 135 +-
+ drivers/gpu/drm/virtio/virtgpu_fence.c | 4 +
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 183 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 228 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 24 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 270 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 61 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 34 -
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 305 --
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 227 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 9 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 15 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 6 +
+ drivers/gpu/drm/vkms/vkms_gem.c | 27 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 2 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 3 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +-
+ drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +-
+ drivers/gpu/host1x/Kconfig | 2 +-
+ drivers/gpu/host1x/bus.c | 2 +-
+ drivers/gpu/host1x/cdma.c | 6 +-
+ drivers/gpu/host1x/channel.c | 13 +-
+ drivers/gpu/host1x/channel.h | 1 +
+ drivers/gpu/host1x/dev.c | 236 +-
+ drivers/gpu/host1x/dev.h | 3 +
+ drivers/gpu/host1x/intr.c | 1 -
+ drivers/gpu/host1x/job.c | 91 +-
+ drivers/gpu/host1x/job.h | 4 +
+ drivers/media/cec/cec-notifier.c | 5 +-
+ drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 6 +-
+ drivers/media/platform/meson/ao-cec-g12a.c | 4 +-
+ drivers/media/platform/meson/ao-cec.c | 4 +-
+ drivers/media/platform/s5p-cec/s5p_cec.c | 4 +-
+ drivers/media/platform/seco-cec/seco-cec.c | 4 +-
+ drivers/media/platform/sti/cec/stih-cec.c | 4 +-
+ drivers/media/platform/tegra-cec/tegra_cec.c | 4 +-
+ drivers/misc/mei/hdcp/mei_hdcp.c | 45 +-
+ drivers/misc/mei/hdcp/mei_hdcp.h | 17 +-
+ drivers/video/fbdev/core/fbmem.c | 17 +-
+ drivers/video/fbdev/sa1100fb.c | 13 -
+ drivers/video/hdmi.c | 8 +-
+ include/drm/amd_asic_type.h | 56 +-
+ include/drm/bridge/dw_hdmi.h | 2 +
+ include/drm/drmP.h | 103 -
+ include/drm/drm_bridge.h | 33 +-
+ include/drm/drm_connector.h | 25 +-
+ include/drm/drm_crtc.h | 1 -
+ include/drm/drm_dp_helper.h | 140 +-
+ include/drm/drm_dp_mst_helper.h | 172 +-
+ include/drm/drm_drv.h | 2 -
+ include/drm/drm_edid.h | 5 +-
+ include/drm/drm_encoder.h | 6 +-
+ include/drm/drm_fb_helper.h | 7 +-
+ include/drm/drm_gem.h | 15 +
+ include/drm/drm_gem_shmem_helper.h | 30 +-
+ include/drm/drm_gem_ttm_helper.h | 21 +
+ include/drm/drm_gem_vram_helper.h | 107 +-
+ include/drm/drm_mm.h | 7 +-
+ include/drm/drm_modeset_helper_vtables.h | 7 +-
+ include/drm/drm_modeset_lock.h | 9 +
+ include/drm/drm_os_linux.h | 55 -
+ include/drm/drm_panel.h | 13 +-
+ include/drm/drm_plane.h | 31 +-
+ include/drm/drm_prime.h | 2 -
+ include/drm/drm_print.h | 26 +
+ include/drm/drm_rect.h | 31 +
+ include/drm/drm_simple_kms_helper.h | 2 +-
+ include/drm/drm_vblank.h | 15 +-
+ include/drm/drm_vram_mm_helper.h | 104 -
+ include/drm/gpu_scheduler.h | 3 +
+ include/drm/i915_drm.h | 18 -
+ include/drm/i915_mei_hdcp_interface.h | 42 +-
+ include/drm/ttm/ttm_bo_api.h | 66 +-
+ include/drm/ttm/ttm_bo_driver.h | 32 +-
+ include/drm/ttm/ttm_execbuf_util.h | 2 +-
+ include/drm/ttm/ttm_memory.h | 1 -
+ include/drm/ttm/ttm_page_alloc.h | 2 +-
+ include/linux/device_cgroup.h | 19 +-
+ include/linux/dma-buf.h | 63 +-
+ include/linux/fb.h | 2 +-
+ include/linux/host1x.h | 26 +-
+ include/media/cec-notifier.h | 7 +-
+ include/uapi/drm/amdgpu_drm.h | 2 +
+ include/uapi/drm/drm.h | 3 +-
+ include/uapi/drm/drm_fourcc.h | 28 +-
+ include/uapi/drm/exynos_drm.h | 2 +-
+ include/uapi/drm/i915_drm.h | 128 +-
+ include/uapi/drm/omap_drm.h | 18 +-
+ include/uapi/drm/v3d_drm.h | 8 +-
+ security/device_cgroup.c | 15 +-
+ 1116 files changed, 60958 insertions(+), 29872 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_0.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dm_cp_psp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c
+ create mode 100644 drivers/gpu/drm/amd/display/include/hdcp_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ci_baco.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_baco.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris_baco.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_baco.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_baco.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smu_internal.h
+ create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_event.c
+ delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h
+ create mode 100644 drivers/gpu/drm/drm_dp_mst_topology_internal.h
+ create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c
+ delete mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c
+ create mode 100644 drivers/gpu/drm/i915/Kconfig.unstable
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dsb.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_vga.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_vga.h
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.h
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.c
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_requests.h
+ delete mode 100644 drivers/gpu/drm/i915/gt/intel_hangcheck.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_llc.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_llc_types.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rc6_types.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_ring.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_ring.h
+ rename drivers/gpu/drm/i915/gt/{intel_ringbuffer.c => intel_ring_submission.c} (85%)
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_ring_types.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rps.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rps.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_rps_types.h
+ create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
+ create mode 100644 drivers/gpu/drm/i915/gt/selftest_gt_pm.c
+ create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.c
+ create mode 100644 drivers/gpu/drm/i915/gt/selftest_llc.h
+ create mode 100644 drivers/gpu/drm/i915/i915_perf_types.h
+ create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.c
+ create mode 100644 drivers/gpu/drm/i915/i915_switcheroo.h
+ create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c
+ create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h
+ create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c
+ create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.c
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h
+ delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c
+ delete mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h
+ delete mode 100644 drivers/gpu/drm/lima/lima_object.c
+ delete mode 100644 drivers/gpu/drm/lima/lima_object.h
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.h
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8173_mipi_tx.c
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/core.c
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c
+ create mode 100644 drivers/gpu/drm/tegra/dp.c
+ create mode 100644 drivers/gpu/drm/tegra/dp.h
+ delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_fb.c
+ delete mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c
+ delete mode 100644 include/drm/drmP.h
+ create mode 100644 include/drm/drm_gem_ttm_helper.h
+ delete mode 100644 include/drm/drm_os_linux.h
+ delete mode 100644 include/drm/drm_vram_mm_helper.h
+$ git am -3 ../patches/0001-cec-fix-up-for-cec-add-cec_adapter-to-cec_notifier_c.patch
+Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/media/platform/cec-gpio/cec-gpio.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 078ea3bcd88d] Merge remote-tracking branch 'drm/drm-next'
+ Date: Mon Nov 25 11:21:47 2019 +1100
+$ git am -3 ../patches/drm_v3d-Fix-double-free-in-v3d_submit_cl_ioctl.patch
+Applying: drm/v3d: Fix double free in v3d_submit_cl_ioctl()
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/v3d/v3d_gem.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 9b7a6b8a3f8a] Merge remote-tracking branch 'drm/drm-next'
+ Date: Mon Nov 25 11:21:47 2019 +1100
+Merging amdgpu/drm-next (ba77517eba6d MAINTAINERS: Drop Rex Zhu for amdgpu powerplay)
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/radeon/si.c
+Auto-merging drivers/gpu/drm/radeon/cik.c
+Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h
+Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h
+Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/Makefile
+Auto-merging drivers/gpu/drm/amd/display/dc/calcs/Makefile
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Removing drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/si.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 -
+ drivers/gpu/drm/amd/amdgpu/Makefile | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 157 +++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 99 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 211 +++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 62 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 96 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +-
+ .../kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} | 49 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 5 -
+ drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 5 -
+ drivers/gpu/drm/amd/amdgpu/cik.c | 18 +
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 86 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 57 ++
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 62 ++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 584 ++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 32 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 827 +++++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 42 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 641 +++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 234 ++++--
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 257 +++++-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/nv.c | 53 +-
+ drivers/gpu/drm/amd/amdgpu/nvd.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 65 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 89 +--
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.h | 16 +-
+ drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 481 +----------
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 496 +-----------
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 13 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 252 +-----
+ drivers/gpu/drm/amd/amdgpu/vi.c | 22 +
+ drivers/gpu/drm/amd/amdkfd/Makefile | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 68 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 3 -
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 68 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 6 -
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 348 --------
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 56 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 24 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 4 +-
+ ...d_kernel_queue_v9.c => kfd_packet_manager_v9.c} | 90 +--
+ ...d_kernel_queue_vi.c => kfd_packet_manager_vi.c} | 41 -
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 30 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 25 +-
+ drivers/gpu/drm/amd/display/Kconfig | 33 +-
+ drivers/gpu/drm/amd/display/Makefile | 4 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 518 ++++++++++--
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 50 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 1 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 64 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 53 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 42 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 18 +-
+ drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 101 +++
+ drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 42 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 75 +-
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 80 ++
+ .../amd/display/dc/bios/command_table_helper2.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 -
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 6 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 166 ++--
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 50 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 26 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 578 +++++++++++---
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 25 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 14 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 67 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 134 ++++
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 60 ++
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 62 +-
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 257 ++++++
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 20 -
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 18 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 34 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 4 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 46 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 10 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 87 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 13 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 19 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 43 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h | 6 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 21 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 10 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 21 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 -
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 10 +-
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +-
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 14 +-
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 -
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 7 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 2 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 3 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 501 ++++--------
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 181 +++--
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.h | 43 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 105 +++
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h | 33 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 4 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 6 -
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 10 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 10 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 12 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 27 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 315 +++++++-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 478 +++++------
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 150 ++--
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 127 +++
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h | 33 +
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 7 +-
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 8 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 102 +--
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 15 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 410 +++++++++-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 131 +++
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h | 33 +
+ .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 2 -
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 78 +-
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 10 -
+ drivers/gpu/drm/amd/display/dc/dm_services.h | 10 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +-
+ .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 6 +-
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 -
+ .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 -
+ .../drm/amd/display/dc/dml/display_mode_enums.h | 2 -
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 -
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 8 -
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 6 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 9 +-
+ .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 14 +-
+ .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.h | 2 -
+ .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 -
+ .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.h | 2 -
+ .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 -
+ .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 2 -
+ .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 -
+ .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 12 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 23 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 32 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 6 -
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 12 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 17 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 10 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 +-
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 11 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 -
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 54 +-
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 +
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 -
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 6 +-
+ .../amd/display/dc/irq/dce110/irq_service_dce110.c | 4 +-
+ .../amd/display/dc/irq/dce120/irq_service_dce120.c | 4 +-
+ .../amd/display/dc/irq/dce80/irq_service_dce80.c | 4 +-
+ .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +-
+ .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 4 +-
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/os_types.h | 3 +-
+ .../display/dc/virtual/virtual_stream_encoder.c | 9 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 267 +++++++
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 129 +++
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 518 ++++++++++++
+ .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 68 ++
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h | 64 ++
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 27 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 142 ++++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 64 ++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 126 +++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 45 ++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 109 +++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 120 +++
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 430 ++++++++++
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 -
+ drivers/gpu/drm/amd/display/include/dal_types.h | 4 -
+ .../amd/display/include/grph_object_ctrl_defs.h | 3 +-
+ .../drm/amd/display/include/link_service_types.h | 7 +
+ drivers/gpu/drm/amd/display/include/logger_types.h | 6 -
+ .../drm/amd/display/modules/color/color_gamma.c | 2 -
+ drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 101 ++-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 197 ++++-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 40 +-
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 884 +++++++++++++++++++++
+ .../amd/display/modules/hdcp/hdcp2_transition.c | 674 ++++++++++++++++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 326 ++++++++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 118 +++
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 98 ++-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 511 +++++++++++-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 194 +++++
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 15 +-
+ .../drm/amd/display/modules/inc/mod_info_packet.h | 4 +-
+ .../gpu/drm/amd/display/modules/inc/mod_shared.h | 2 -
+ .../amd/display/modules/info_packet/info_packet.c | 46 +-
+ drivers/gpu/drm/amd/include/amd_shared.h | 5 +-
+ .../amd/include/asic_reg/mmhub/mmhub_1_0_offset.h | 16 +
+ .../amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h | 122 +++
+ .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 53 --
+ .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 257 ------
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 58 +-
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 10 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 9 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 2 -
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 10 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 6 +
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 47 +-
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 103 +++
+ drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 +
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 54 +-
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 44 +
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +-
+ .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 17 +-
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 3 -
+ drivers/gpu/drm/radeon/cik.c | 4 +-
+ drivers/gpu/drm/radeon/r600.c | 4 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_combios.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 2 -
+ drivers/gpu/drm/radeon/radeon_legacy_tv.c | 8 +-
+ drivers/gpu/drm/radeon/si.c | 4 +-
+ drivers/gpu/drm/radeon/si_dpm.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 174 ++--
+ include/drm/ttm/ttm_bo_api.h | 14 +
+ include/uapi/drm/amdgpu_drm.h | 13 +-
+ include/uapi/linux/kfd_ioctl.h | 19 +-
+ 361 files changed, 14406 insertions(+), 5316 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
+ rename drivers/gpu/drm/amd/{amdkfd/kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} (56%)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h
+ delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c
+ rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_v9.c => kfd_packet_manager_v9.c} (81%)
+ rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_vi.c => kfd_packet_manager_vi.c} (91%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_trace_buffer.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c
+ delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h
+ delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h
+Merging drm-intel/for-linux-next (15b9cbb2c5e1 Revert "drm/i915/gt: Wait for new requests in intel_gt_retire_requests()")
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gt/intel_gt_requests.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (84db889e6d82 drm/tegra: Unconditionally select IOMMU_IOVA)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up to date.
+Merging drm-misc/for-linux-next (9786b65bc61a drm/ttm: fix mmap refcounting)
+$ git merge drm-misc/for-linux-next
+Already up to date.
+Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU)
+$ git merge drm-msm/msm-next
+Auto-merging drivers/soc/qcom/Makefile
+Auto-merging drivers/soc/qcom/Kconfig
+Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/display/msm/gmu.txt | 51 +++
+ .../devicetree/bindings/display/msm/mdp5.txt | 2 +
+ .../devicetree/bindings/sram/qcom,ocmem.yaml | 96 +++++
+ drivers/firmware/qcom_scm-32.c | 52 ++-
+ drivers/firmware/qcom_scm-64.c | 12 +
+ drivers/firmware/qcom_scm.c | 53 +++
+ drivers/firmware/qcom_scm.h | 9 +
+ drivers/gpu/drm/msm/Kconfig | 1 +
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 28 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 25 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 3 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 79 +++-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 7 +
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 15 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 15 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 43 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 21 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 20 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 15 -
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 60 +--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 6 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 10 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 114 +++++-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 23 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 -
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 28 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 +
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 8 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 60 ++-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 8 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 6 +-
+ drivers/gpu/drm/msm/msm_gpummu.c | 6 +-
+ drivers/gpu/drm/msm/msm_iommu.c | 6 +-
+ drivers/gpu/drm/msm/msm_mmu.h | 4 +-
+ drivers/gpu/drm/msm/msm_rd.c | 16 +-
+ drivers/soc/qcom/Kconfig | 10 +
+ drivers/soc/qcom/Makefile | 1 +
+ drivers/soc/qcom/ocmem.c | 433 +++++++++++++++++++++
+ include/linux/qcom_scm.h | 26 ++
+ include/soc/qcom/ocmem.h | 65 ++++
+ 49 files changed, 1235 insertions(+), 307 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
+ create mode 100644 drivers/soc/qcom/ocmem.c
+ create mode 100644 include/soc/qcom/ocmem.h
+Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
+$ git merge mali-dp/for-upstream/mali-dp
+Merge made by the 'recursive' strategy.
+Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
+$ git merge imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells)
+$ git merge etnaviv/etnaviv/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt | 1 +
+ 1 file changed, 1 insertion(+)
+Merging regmap/for-next (0c4b6e03b8ad Merge branch 'regmap-5.5' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-w1.c | 4 ----
+ 1 file changed, 4 deletions(-)
+Merging sound/for-next (c6b6fc206586 ALSA: aloop: Fix dependency on timer API)
+$ git merge sound/for-next
+Auto-merging sound/soc/sh/rcar/core.c
+Removing sound/soc/samsung/arndale_rt5631.c
+Auto-merging sound/soc/codecs/rt5682.c
+Auto-merging sound/soc/codecs/rt5645.c
+Auto-merging include/linux/pci.h
+Auto-merging include/drm/bridge/dw_hdmi.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
+Removing Documentation/devicetree/bindings/sound/sun4i-codec.txt
+Removing Documentation/devicetree/bindings/sound/samsung-i2s.txt
+Removing Documentation/devicetree/bindings/sound/samsung,odroid.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/adi,adau7118.yaml | 85 ++
+ .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 267 +++++
+ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 38 +
+ .../devicetree/bindings/sound/arndale.txt | 5 +-
+ .../devicetree/bindings/sound/fsl,mqs.txt | 36 +
+ .../bindings/sound/google,cros-ec-codec.txt | 24 +-
+ .../devicetree/bindings/sound/mt8183-afe-pcm.txt | 6 +
+ .../sound/mt8183-mt6358-ts3a227-max98357.txt | 7 +-
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 1 +
+ .../bindings/sound/rockchip-max98090.txt | 27 +-
+ Documentation/devicetree/bindings/sound/rt1011.txt | 10 +
+ Documentation/devicetree/bindings/sound/rt5682.txt | 6 +
+ .../devicetree/bindings/sound/samsung,odroid.txt | 54 -
+ .../devicetree/bindings/sound/samsung,odroid.yaml | 91 ++
+ .../devicetree/bindings/sound/samsung-i2s.txt | 84 --
+ .../devicetree/bindings/sound/samsung-i2s.yaml | 138 +++
+ .../devicetree/bindings/sound/sun4i-codec.txt | 94 --
+ .../bindings/sound/sun8i-codec-analog.txt | 17 -
+ .../devicetree/bindings/sound/tas2562.txt | 34 +
+ .../devicetree/bindings/sound/tas2770.txt | 37 +
+ .../sound/kernel-api/writing-an-alsa-driver.rst | 222 ++--
+ MAINTAINERS | 1 +
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 +-
+ drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
+ drivers/media/pci/tw686x/tw686x-audio.c | 2 +-
+ drivers/media/usb/usbtv/usbtv-audio.c | 3 +-
+ drivers/pci/pci.c | 18 +
+ drivers/platform/chrome/cros_ec_trace.c | 5 +-
+ drivers/staging/most/sound/sound.c | 8 +-
+ drivers/usb/gadget/function/u_audio.c | 2 +-
+ include/drm/bridge/dw_hdmi.h | 4 +
+ include/dt-bindings/sound/samsung-i2s.h | 12 +-
+ include/linux/pci.h | 2 +
+ include/linux/platform_data/cros_ec_commands.h | 285 +++--
+ include/sound/core.h | 1 +
+ include/sound/dmaengine_pcm.h | 5 +
+ include/sound/hda_codec.h | 1 +
+ include/sound/intel-dsp-config.h | 34 +
+ include/sound/memalloc.h | 2 +-
+ include/sound/pcm.h | 20 +-
+ include/sound/pxa2xx-lib.h | 26 +-
+ include/sound/rt5682.h | 1 +
+ include/sound/simple_card_utils.h | 1 +
+ include/sound/soc-acpi-intel-match.h | 1 +
+ include/sound/soc-acpi.h | 4 +
+ include/sound/soc-component.h | 48 +-
+ include/sound/soc-dpcm.h | 18 +-
+ include/sound/soc.h | 31 +-
+ include/sound/sof.h | 3 +
+ include/sound/sof/dai-imx.h | 34 +
+ include/sound/sof/dai.h | 2 +
+ include/sound/sof/header.h | 2 +
+ include/sound/sof/pm.h | 8 +
+ include/sound/sof/stream.h | 4 +-
+ include/sound/timer.h | 6 +-
+ include/sound/wm8904.h | 2 +-
+ include/uapi/sound/sof/abi.h | 2 +-
+ include/uapi/sound/sof/tokens.h | 11 +-
+ sound/aoa/soundbus/i2sbus/pcm.c | 2 +-
+ sound/arm/pxa2xx-pcm-lib.c | 80 +-
+ sound/core/Kconfig | 28 +-
+ sound/core/init.c | 1 +
+ sound/core/memalloc.c | 25 +-
+ sound/core/pcm_dmaengine.c | 83 ++
+ sound/core/pcm_local.h | 7 +
+ sound/core/pcm_memory.c | 88 +-
+ sound/core/pcm_native.c | 68 +-
+ sound/core/seq/seq_timer.c | 18 +-
+ sound/core/timer.c | 182 ++--
+ sound/drivers/Kconfig | 21 +-
+ sound/drivers/aloop.c | 665 +++++++++++-
+ sound/drivers/dummy.c | 2 +-
+ sound/drivers/ml403-ac97cr.c | 2 +-
+ sound/drivers/pcsp/pcsp_lib.c | 4 +-
+ sound/drivers/vx/vx_pcm.c | 10 +-
+ sound/firewire/Kconfig | 6 +-
+ sound/firewire/amdtp-stream.c | 407 +++++--
+ sound/firewire/amdtp-stream.h | 28 +-
+ sound/firewire/bebob/bebob.h | 4 +-
+ sound/firewire/bebob/bebob_midi.c | 2 +-
+ sound/firewire/bebob/bebob_pcm.c | 80 +-
+ sound/firewire/bebob/bebob_stream.c | 92 +-
+ sound/firewire/dice/dice-midi.c | 2 +-
+ sound/firewire/dice/dice-pcm.c | 83 +-
+ sound/firewire/dice/dice-stream.c | 11 +-
+ sound/firewire/dice/dice.h | 4 +-
+ sound/firewire/digi00x/digi00x-midi.c | 2 +-
+ sound/firewire/digi00x/digi00x-pcm.c | 66 +-
+ sound/firewire/digi00x/digi00x-stream.c | 14 +-
+ sound/firewire/digi00x/digi00x.h | 4 +-
+ sound/firewire/fireface/ff-pcm.c | 60 +-
+ sound/firewire/fireface/ff-stream.c | 22 +-
+ sound/firewire/fireface/ff.h | 4 +-
+ sound/firewire/fireworks/fireworks.h | 4 +-
+ sound/firewire/fireworks/fireworks_midi.c | 2 +-
+ sound/firewire/fireworks/fireworks_pcm.c | 72 +-
+ sound/firewire/fireworks/fireworks_stream.c | 14 +-
+ sound/firewire/isight.c | 8 +-
+ sound/firewire/motu/motu-midi.c | 2 +-
+ sound/firewire/motu/motu-pcm.c | 63 +-
+ sound/firewire/motu/motu-proc.c | 4 +-
+ sound/firewire/motu/motu-protocol-v2.c | 142 +--
+ sound/firewire/motu/motu-protocol-v3.c | 4 +-
+ sound/firewire/motu/motu-stream.c | 14 +-
+ sound/firewire/motu/motu.c | 34 +-
+ sound/firewire/motu/motu.h | 10 +-
+ sound/firewire/oxfw/oxfw-midi.c | 4 +-
+ sound/firewire/oxfw/oxfw-pcm.c | 80 +-
+ sound/firewire/oxfw/oxfw-stream.c | 15 +-
+ sound/firewire/oxfw/oxfw.h | 4 +-
+ sound/firewire/tascam/tascam-pcm.c | 65 +-
+ sound/firewire/tascam/tascam-stream.c | 14 +-
+ sound/firewire/tascam/tascam.h | 4 +-
+ sound/hda/Kconfig | 10 +-
+ sound/hda/Makefile | 5 +-
+ sound/hda/hdac_regmap.c | 1 +
+ sound/hda/intel-dsp-config.c | 357 +++++++
+ sound/hda/intel-nhlt.c | 3 -
+ sound/isa/Kconfig | 18 +-
+ sound/isa/cs423x/cs4236.c | 3 +-
+ sound/mips/Kconfig | 12 +-
+ sound/mips/hal2.c | 3 +-
+ sound/mips/sgio2audio.c | 12 +-
+ sound/pci/Kconfig | 2 +-
+ sound/pci/ad1889.c | 6 +-
+ sound/pci/ali5451/ali5451.c | 2 +-
+ sound/pci/als300.c | 3 +-
+ sound/pci/als4000.c | 3 +-
+ sound/pci/asihpi/asihpi.c | 4 +-
+ sound/pci/atiixp.c | 6 +-
+ sound/pci/atiixp_modem.c | 4 +-
+ sound/pci/au88x0/au88x0_pcm.c | 3 +-
+ sound/pci/aw2/aw2-alsa.c | 6 +-
+ sound/pci/azt3328.c | 8 +-
+ sound/pci/bt87x.c | 5 +-
+ sound/pci/ca0106/ca0106_main.c | 6 +-
+ sound/pci/cmipci.c | 6 +-
+ sound/pci/cs4281.c | 3 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 16 +-
+ sound/pci/cs5535audio/cs5535audio_pcm.c | 6 +-
+ sound/pci/ctxfi/ctpcm.c | 5 +-
+ sound/pci/ctxfi/ctvmem.c | 2 +-
+ sound/pci/echoaudio/echoaudio.c | 24 +-
+ sound/pci/emu10k1/emu10k1.c | 5 +-
+ sound/pci/emu10k1/emu10k1x.c | 6 +-
+ sound/pci/emu10k1/emufx.c | 2 +-
+ sound/pci/emu10k1/emupcm.c | 12 +-
+ sound/pci/emu10k1/memory.c | 4 +-
+ sound/pci/emu10k1/p16v.c | 4 +-
+ sound/pci/ens1370.c | 8 +-
+ sound/pci/es1938.c | 3 +-
+ sound/pci/es1968.c | 4 +-
+ sound/pci/fm801.c | 2 +-
+ sound/pci/hda/Kconfig | 11 +-
+ sound/pci/hda/hda_bind.c | 4 +
+ sound/pci/hda/hda_controller.c | 1 -
+ sound/pci/hda/hda_intel.c | 66 +-
+ sound/pci/hda/hda_jack.c | 151 ++-
+ sound/pci/hda/hda_jack.h | 107 +-
+ sound/pci/hda/patch_conexant.c | 1 +
+ sound/pci/hda/patch_hdmi.c | 330 +++---
+ sound/pci/hda/patch_realtek.c | 53 +-
+ sound/pci/ice1712/ice1712.c | 9 +-
+ sound/pci/ice1712/ice1724.c | 6 +-
+ sound/pci/intel8x0.c | 4 +-
+ sound/pci/intel8x0m.c | 4 +-
+ sound/pci/korg1212/korg1212.c | 8 +-
+ sound/pci/lola/lola.c | 2 +-
+ sound/pci/lola/lola_pcm.c | 5 +-
+ sound/pci/lx6464es/lx6464es.c | 2 +-
+ sound/pci/maestro3.c | 3 +-
+ sound/pci/mixart/mixart.c | 7 +-
+ sound/pci/oxygen/oxygen_pcm.c | 10 +-
+ sound/pci/pcxhr/pcxhr.c | 4 +-
+ sound/pci/riptide/riptide.c | 6 +-
+ sound/pci/rme32.c | 4 +-
+ sound/pci/rme9652/hdsp.c | 7 +-
+ sound/pci/rme9652/hdspm.c | 3 +-
+ sound/pci/rme9652/rme9652.c | 7 +-
+ sound/pci/sis7019.c | 3 +-
+ sound/pci/sonicvibes.c | 3 +-
+ sound/pci/trident/trident_main.c | 24 +-
+ sound/pci/via82xx.c | 17 +-
+ sound/pci/via82xx_modem.c | 6 +-
+ sound/pci/ymfpci/ymfpci_main.c | 16 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 9 +-
+ sound/sh/aica.c | 2 +-
+ sound/sh/sh_dac_audio.c | 2 +-
+ sound/soc/amd/acp-pcm-dma.c | 63 +-
+ sound/soc/amd/raven/acp3x-pcm-dma.c | 56 +-
+ sound/soc/atmel/atmel-pcm-pdc.c | 48 +-
+ sound/soc/au1x/dbdma2.c | 64 +-
+ sound/soc/au1x/dma.c | 65 +-
+ sound/soc/bcm/cygnus-pcm.c | 56 +-
+ sound/soc/cirrus/Kconfig | 14 +-
+ sound/soc/codecs/Kconfig | 73 +-
+ sound/soc/codecs/Makefile | 10 +
+ sound/soc/codecs/adau1761.c | 129 +++
+ sound/soc/codecs/adau7118-hw.c | 43 +
+ sound/soc/codecs/adau7118-i2c.c | 82 ++
+ sound/soc/codecs/adau7118.c | 586 ++++++++++
+ sound/soc/codecs/adau7118.h | 24 +
+ sound/soc/codecs/cros_ec_codec.c | 1128 +++++++++++++++-----
+ sound/soc/codecs/cx2072x.c | 2 +-
+ sound/soc/codecs/hdac_hda.c | 114 +-
+ sound/soc/codecs/hdac_hda.h | 13 +-
+ sound/soc/codecs/madera.h | 2 +
+ sound/soc/codecs/msm8916-wcd-analog.c | 54 +-
+ sound/soc/codecs/mt6358.c | 105 ++
+ sound/soc/codecs/pcm3168a.c | 95 +-
+ sound/soc/codecs/rt1011.c | 249 ++++-
+ sound/soc/codecs/rt1011.h | 24 +
+ sound/soc/codecs/rt5514-spi.c | 48 +-
+ sound/soc/codecs/rt5645.c | 13 +
+ sound/soc/codecs/rt5663.c | 4 +-
+ sound/soc/codecs/rt5677-spi.c | 385 +++++++
+ sound/soc/codecs/rt5677-spi.h | 1 +
+ sound/soc/codecs/rt5682.c | 15 +
+ sound/soc/codecs/tas2562.c | 590 ++++++++++
+ sound/soc/codecs/tas2562.h | 85 ++
+ sound/soc/codecs/tas2770.c | 819 ++++++++++++++
+ sound/soc/codecs/tas2770.h | 143 +++
+ sound/soc/codecs/tlv320aic32x4.c | 3 +
+ sound/soc/codecs/wcd9335.c | 10 +-
+ sound/soc/codecs/wm8958-dsp2.c | 22 +-
+ sound/soc/codecs/wm8994.c | 156 ++-
+ sound/soc/codecs/wm8994.h | 10 +-
+ sound/soc/dwc/dwc-pcm.c | 50 +-
+ sound/soc/fsl/Kconfig | 10 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl_asrc.c | 110 +-
+ sound/soc/fsl/fsl_asrc.h | 7 +-
+ sound/soc/fsl/fsl_asrc_dma.c | 120 ++-
+ sound/soc/fsl/fsl_dma.c | 54 +-
+ sound/soc/fsl/fsl_esai.c | 12 +
+ sound/soc/fsl/fsl_mqs.c | 335 ++++++
+ sound/soc/fsl/imx-pcm-fiq.c | 56 +-
+ sound/soc/fsl/mpc5200_dma.c | 51 +-
+ sound/soc/generic/audio-graph-card.c | 4 +-
+ sound/soc/generic/simple-card.c | 4 +-
+ sound/soc/intel/Kconfig | 21 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 30 +-
+ sound/soc/intel/baytrail/sst-baytrail-pcm.c | 52 +-
+ sound/soc/intel/boards/Kconfig | 100 +-
+ sound/soc/intel/boards/Makefile | 14 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 11 +
+ sound/soc/intel/boards/bxt_rt298.c | 11 +
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +-
+ sound/soc/intel/boards/cml_rt1011_rt5682.c | 487 +++++++++
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 11 +
+ sound/soc/intel/boards/hda_dsp_common.c | 85 ++
+ sound/soc/intel/boards/hda_dsp_common.h | 32 +
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 146 ++-
+ sound/soc/intel/boards/skl_hda_dsp_common.c | 6 +
+ sound/soc/intel/boards/skl_hda_dsp_common.h | 27 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 3 +-
+ sound/soc/intel/boards/sof_rt5682.c | 13 +-
+ sound/soc/intel/common/Makefile | 1 +
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 7 +
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 18 +
+ sound/soc/intel/haswell/sst-haswell-pcm.c | 50 +-
+ sound/soc/intel/skylake/skl-pcm.c | 57 +-
+ sound/soc/intel/skylake/skl.c | 19 +-
+ sound/soc/jz4740/jz4740-i2s.c | 6 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 52 +-
+ sound/soc/mediatek/Kconfig | 1 +
+ .../soc/mediatek/common/mtk-afe-platform-driver.c | 28 +-
+ .../soc/mediatek/common/mtk-afe-platform-driver.h | 10 +-
+ sound/soc/mediatek/common/mtk-btcvsd.c | 76 +-
+ sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 11 +-
+ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 26 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 70 +-
+ sound/soc/meson/axg-fifo.c | 56 +-
+ sound/soc/meson/axg-fifo.h | 20 +-
+ sound/soc/meson/axg-frddr.c | 24 +-
+ sound/soc/meson/axg-toddr.c | 24 +-
+ sound/soc/pxa/Kconfig | 16 +-
+ sound/soc/pxa/mmp-pcm.c | 62 +-
+ sound/soc/pxa/poodle.c | 2 +-
+ sound/soc/pxa/pxa-ssp.c | 14 +-
+ sound/soc/pxa/pxa2xx-ac97.c | 14 +-
+ sound/soc/pxa/pxa2xx-i2s.c | 14 +-
+ sound/soc/pxa/pxa2xx-pcm.c | 14 +-
+ sound/soc/qcom/Kconfig | 20 +-
+ sound/soc/qcom/lpass-platform.c | 70 +-
+ sound/soc/qcom/qdsp6/q6asm-dai.c | 71 +-
+ sound/soc/qcom/qdsp6/q6routing.c | 14 +-
+ sound/soc/rockchip/Kconfig | 3 +-
+ sound/soc/rockchip/rockchip_max98090.c | 313 ++++--
+ sound/soc/samsung/Kconfig | 12 +-
+ sound/soc/samsung/Makefile | 4 +-
+ sound/soc/samsung/arndale.c | 217 ++++
+ sound/soc/samsung/arndale_rt5631.c | 164 ---
+ sound/soc/samsung/idma.c | 58 +-
+ sound/soc/sh/dma-sh7760.c | 48 +-
+ sound/soc/sh/fsi.c | 31 +-
+ sound/soc/sh/rcar/core.c | 34 +-
+ sound/soc/sh/rcar/dma.c | 30 +-
+ sound/soc/sh/siu_pcm.c | 44 +-
+ sound/soc/soc-component.c | 136 ++-
+ sound/soc/soc-compress.c | 52 +-
+ sound/soc/soc-core.c | 860 +++++++--------
+ sound/soc/soc-generic-dmaengine-pcm.c | 163 +--
+ sound/soc/soc-ops.c | 11 +-
+ sound/soc/soc-pcm.c | 219 ++--
+ sound/soc/soc-topology.c | 17 +-
+ sound/soc/soc-utils.c | 11 +-
+ sound/soc/sof/Kconfig | 43 +-
+ sound/soc/sof/control.c | 34 +
+ sound/soc/sof/core.c | 31 +-
+ sound/soc/sof/debug.c | 16 +
+ sound/soc/sof/imx/Kconfig | 20 +-
+ sound/soc/sof/imx/imx8.c | 7 +
+ sound/soc/sof/intel/Kconfig | 68 +-
+ sound/soc/sof/intel/apl.c | 8 +
+ sound/soc/sof/intel/bdw.c | 31 +-
+ sound/soc/sof/intel/byt.c | 44 +-
+ sound/soc/sof/intel/cnl.c | 67 +-
+ sound/soc/sof/intel/hda-codec.c | 22 +-
+ sound/soc/sof/intel/hda-dsp.c | 122 ++-
+ sound/soc/sof/intel/hda-ipc.c | 6 +-
+ sound/soc/sof/intel/hda-ipc.h | 51 +
+ sound/soc/sof/intel/hda-loader.c | 25 +-
+ sound/soc/sof/intel/hda-pcm.c | 15 +-
+ sound/soc/sof/intel/hda-stream.c | 24 +-
+ sound/soc/sof/intel/hda.c | 14 +-
+ sound/soc/sof/intel/hda.h | 20 +-
+ sound/soc/sof/ipc.c | 10 +-
+ sound/soc/sof/ops.h | 10 +
+ sound/soc/sof/pcm.c | 123 ++-
+ sound/soc/sof/pm.c | 95 +-
+ sound/soc/sof/sof-acpi-dev.c | 12 +-
+ sound/soc/sof/sof-pci-dev.c | 86 +-
+ sound/soc/sof/sof-priv.h | 52 +-
+ sound/soc/sof/topology.c | 462 +++++---
+ sound/soc/sof/trace.c | 17 +-
+ sound/soc/sprd/sprd-pcm-dma.c | 74 +-
+ sound/soc/stm/stm32_adfsdm.c | 42 +-
+ sound/soc/stm/stm32_sai.c | 2 +-
+ sound/soc/stm/stm32_spdifrx.c | 18 +-
+ sound/soc/sunxi/sun4i-codec.c | 6 +-
+ sound/soc/tegra/tegra30_i2s.c | 56 +-
+ sound/soc/txx9/txx9aclc.c | 48 +-
+ sound/soc/uniphier/aio-dma.c | 51 +-
+ sound/soc/ux500/ux500_msp_i2s.c | 3 +-
+ sound/soc/xilinx/Kconfig | 20 +-
+ sound/soc/xilinx/xlnx_formatter_pcm.c | 63 +-
+ sound/soc/xtensa/xtfpga-i2s.c | 30 +-
+ sound/soc/zte/Kconfig | 12 +-
+ sound/sparc/amd7930.c | 2 +-
+ sound/sparc/dbri.c | 2 +-
+ sound/usb/6fire/pcm.c | 16 +-
+ sound/usb/Kconfig | 32 +-
+ sound/usb/caiaq/audio.c | 8 +-
+ sound/usb/card.c | 3 +
+ sound/usb/clock.c | 10 +-
+ sound/usb/hiface/pcm.c | 9 +-
+ sound/usb/line6/pcm.c | 4 +-
+ sound/usb/misc/ua101.c | 14 +-
+ sound/usb/mixer.c | 3 +
+ sound/usb/mixer_scarlett_gen2.c | 36 +-
+ sound/usb/pcm.c | 50 +-
+ sound/usb/usbaudio.h | 1 +
+ sound/usb/usx2y/usbusx2yaudio.c | 4 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 4 +-
+ sound/usb/validate.c | 23 +-
+ sound/x86/intel_hdmi_audio.c | 4 +-
+ 368 files changed, 14398 insertions(+), 4547 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7118.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,mqs.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tas2770.txt
+ create mode 100644 include/sound/intel-dsp-config.h
+ create mode 100644 include/sound/sof/dai-imx.h
+ create mode 100644 sound/hda/intel-dsp-config.c
+ create mode 100644 sound/soc/codecs/adau7118-hw.c
+ create mode 100644 sound/soc/codecs/adau7118-i2c.c
+ create mode 100644 sound/soc/codecs/adau7118.c
+ create mode 100644 sound/soc/codecs/adau7118.h
+ create mode 100644 sound/soc/codecs/tas2562.c
+ create mode 100644 sound/soc/codecs/tas2562.h
+ create mode 100644 sound/soc/codecs/tas2770.c
+ create mode 100644 sound/soc/codecs/tas2770.h
+ create mode 100644 sound/soc/fsl/fsl_mqs.c
+ create mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c
+ create mode 100644 sound/soc/intel/boards/hda_dsp_common.c
+ create mode 100644 sound/soc/intel/boards/hda_dsp_common.h
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+ create mode 100644 sound/soc/samsung/arndale.c
+ delete mode 100644 sound/soc/samsung/arndale_rt5631.c
+ create mode 100644 sound/soc/sof/intel/hda-ipc.h
+Merging sound-asoc/for-next (8c4d2a0bfbd2 Merge branch 'asoc-5.5' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/sof/sof-pci-dev.c
+Auto-merging sound/soc/sof/intel/Kconfig
+Auto-merging sound/soc/soc-pcm.c
+Auto-merging sound/soc/soc-component.c
+Auto-merging sound/soc/intel/boards/Kconfig
+Auto-merging sound/soc/codecs/rt5677-spi.c
+Auto-merging sound/soc/codecs/Kconfig
+CONFLICT (content): Merge conflict in sound/soc/codecs/Kconfig
+Auto-merging include/sound/soc-component.h
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/sound/renesas,fsi.txt
+Resolved 'sound/soc/codecs/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ee31951fcd11] Merge remote-tracking branch 'sound-asoc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/sound/renesas,fsi.txt | 31 --
+ .../devicetree/bindings/sound/renesas,fsi.yaml | 76 ++++
+ .../devicetree/bindings/sound/ti,pcm3168a.txt | 8 +
+ .../devicetree/bindings/sound/tlv320aic31xx.txt | 5 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +-
+ include/sound/soc-acpi-intel-match.h | 2 +
+ include/sound/soc-component.h | 4 +-
+ include/sound/soc.h | 7 +
+ include/uapi/sound/compress_params.h | 10 +
+ sound/soc/codecs/Kconfig | 3 +-
+ sound/soc/codecs/pcm3168a.c | 48 ++-
+ sound/soc/codecs/rt5677-spi.c | 13 +
+ sound/soc/codecs/rt5677.c | 445 +++++++++++++++++----
+ sound/soc/codecs/rt5677.h | 11 +-
+ sound/soc/codecs/tas2770.c | 10 +-
+ sound/soc/codecs/tlv320aic31xx.c | 45 +++
+ sound/soc/codecs/tlv320aic31xx.h | 8 +
+ sound/soc/codecs/wm2200.c | 5 +
+ sound/soc/codecs/wm5100.c | 2 +
+ sound/soc/codecs/wm8904.c | 72 ++--
+ sound/soc/codecs/wm8904.h | 1 +
+ sound/soc/codecs/wm_adsp.c | 81 +++-
+ sound/soc/codecs/wm_adsp.h | 4 +
+ sound/soc/fsl/fsl_audmix.c | 6 +
+ sound/soc/fsl/fsl_audmix.h | 1 +
+ sound/soc/intel/boards/Kconfig | 24 +-
+ sound/soc/intel/boards/bdw-rt5677.c | 51 +++
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +
+ sound/soc/intel/common/Makefile | 3 +-
+ sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 18 +
+ sound/soc/intel/common/soc-acpi-intel-cml-match.c | 56 +++
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 38 --
+ sound/soc/qcom/qdsp6/q6asm-dai.c | 35 +-
+ sound/soc/qcom/qdsp6/q6asm.c | 55 +++
+ sound/soc/qcom/qdsp6/q6asm.h | 15 +
+ sound/soc/soc-component.c | 8 +-
+ sound/soc/soc-core.c | 421 +++++++++----------
+ sound/soc/soc-generic-dmaengine-pcm.c | 2 +-
+ sound/soc/soc-pcm.c | 22 +-
+ sound/soc/sof/core.c | 13 +
+ sound/soc/sof/intel/Kconfig | 10 +-
+ sound/soc/sof/intel/hda-dsp.c | 15 +
+ sound/soc/sof/intel/hda.c | 11 +-
+ sound/soc/sof/intel/hda.h | 3 +
+ sound/soc/sof/pm.c | 39 +-
+ sound/soc/sof/sof-pci-dev.c | 8 +-
+ sound/soc/sof/sof-priv.h | 2 +
+ sound/soc/sof/topology.c | 72 +++-
+ sound/soc/ti/davinci-mcasp.c | 2 +-
+ 49 files changed, 1335 insertions(+), 491 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.yaml
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-cfl-match.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-cml-match.c
+Merging modules/modules-next (5d603311615f kernel/module.c: wakeup processes in module_wq on module unload)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Auto-merging include/linux/export.h
+Merge made by the 'recursive' strategy.
+ include/linux/export.h | 91 ++++++++++++++-------------------------------
+ include/linux/moduleparam.h | 4 +-
+ kernel/module.c | 4 +-
+ 3 files changed, 33 insertions(+), 66 deletions(-)
+Merging input/next (bcf1e034d3aa Input: fix Kconfig indentation)
+$ git merge input/next
+Removing include/linux/platform_data/pixcir_i2c_ts.h
+Auto-merging drivers/input/rmi4/rmi_f54.c
+Removing Documentation/devicetree/bindings/input/mpr121-touchkey.txt
+Removing Documentation/devicetree/bindings/input/keys.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 14 +
+ .../bindings/input/fsl,mpr121-touchkey.yaml | 89 +++++
+ .../devicetree/bindings/input/ilitek,ili2xxx.txt | 3 +-
+ Documentation/devicetree/bindings/input/input.yaml | 36 ++
+ Documentation/devicetree/bindings/input/keys.txt | 8 -
+ .../devicetree/bindings/input/mpr121-touchkey.txt | 30 --
+ .../devicetree/bindings/input/mtk-pmic-keys.txt | 4 +-
+ .../devicetree/bindings/input/st,stpmic1-onkey.txt | 2 +-
+ .../bindings/input/touchscreen/ad7879.txt | 4 +-
+ .../bindings/input/touchscreen/edt-ft5x06.txt | 1 +
+ drivers/gpio/gpiolib-devres.c | 33 +-
+ drivers/gpio/gpiolib.c | 48 +++
+ drivers/input/input-poller.c | 9 +
+ drivers/input/joystick/Kconfig | 1 -
+ drivers/input/joystick/psxpad-spi.c | 64 ++--
+ drivers/input/keyboard/Kconfig | 28 +-
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/adc-keys.c | 36 +-
+ drivers/input/keyboard/adp5589-keys.c | 171 +++++----
+ drivers/input/keyboard/clps711x-keypad.c | 70 ++--
+ drivers/input/keyboard/gpio_keys.c | 6 +-
+ drivers/input/keyboard/gpio_keys_polled.c | 72 ++--
+ drivers/input/keyboard/imx_sc_key.c | 187 +++++++++
+ drivers/input/keyboard/jornada680_kbd.c | 37 +-
+ drivers/input/keyboard/mpr121_touchkey.c | 69 +++-
+ drivers/input/misc/Kconfig | 15 -
+ drivers/input/misc/apanel.c | 153 ++++----
+ drivers/input/misc/bma150.c | 190 +++-------
+ drivers/input/misc/cobalt_btns.c | 73 ++--
+ drivers/input/misc/gpio_decoder.c | 42 ++-
+ drivers/input/misc/hp_sdc_rtc.c | 342 -----------------
+ drivers/input/misc/kxtj9.c | 224 +++--------
+ drivers/input/misc/mma8450.c | 101 +++--
+ drivers/input/misc/rb532_button.c | 48 +--
+ drivers/input/misc/sgi_btns.c | 54 +--
+ drivers/input/misc/wistron_btns.c | 51 +--
+ drivers/input/mouse/Kconfig | 15 +-
+ drivers/input/mouse/gpio_mouse.c | 45 +--
+ drivers/input/rmi4/rmi_f54.c | 48 +--
+ drivers/input/tablet/Kconfig | 20 +-
+ drivers/input/touchscreen/Kconfig | 6 +-
+ drivers/input/touchscreen/ar1021_i2c.c | 4 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 4 +
+ drivers/input/touchscreen/colibri-vf50-ts.c | 1 -
+ drivers/input/touchscreen/edt-ft5x06.c | 30 ++
+ drivers/input/touchscreen/ili210x.c | 418 ++++++++++++---------
+ drivers/input/touchscreen/mms114.c | 3 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 177 +++++----
+ drivers/input/touchscreen/raspberrypi-ts.c | 38 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 1 -
+ drivers/input/touchscreen/st1232.c | 184 +++++----
+ drivers/input/touchscreen/sur40.c | 92 +++--
+ drivers/input/touchscreen/tps6507x-ts.c | 36 +-
+ drivers/input/touchscreen/ts4800-ts.c | 68 ++--
+ drivers/input/touchscreen/wacom_i2c.c | 1 -
+ include/linux/gpio/consumer.h | 54 ++-
+ include/linux/input.h | 1 +
+ include/linux/platform_data/pixcir_i2c_ts.h | 64 ----
+ 58 files changed, 1717 insertions(+), 1909 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/fsl,mpr121-touchkey.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/input.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/keys.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt
+ create mode 100644 drivers/input/keyboard/imx_sc_key.c
+ delete mode 100644 include/linux/platform_data/pixcir_i2c_ts.h
+Merging block/for-next (832ef6680601 Merge branch 'for-5.5/io_uring-post' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/fs.h
+CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in block/for-next. Version block/for-next of include/Kbuild left in tree.
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging drivers/block/nbd.c
+Auto-merging drivers/ata/sata_nv.c
+Auto-merging drivers/ata/ahci.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/iostats.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f include/Kbuild
+rm 'include/Kbuild'
+$ git commit --no-edit -v -a
+[master 9c195863c1dc] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/procfs-diskstats | 5 +
+ Documentation/ABI/testing/sysfs-block | 6 +
+ Documentation/admin-guide/iostats.rst | 9 +
+ Documentation/block/stat.rst | 14 +-
+ Documentation/driver-api/libata.rst | 14 +-
+ MAINTAINERS | 6 +-
+ block/Kconfig | 4 +
+ block/Kconfig.iosched | 1 +
+ block/Makefile | 1 +
+ block/bfq-cgroup.c | 85 +-
+ block/bfq-iosched.c | 4 +
+ block/bfq-iosched.h | 10 +
+ block/blk-cgroup-rwstat.c | 129 ++
+ block/blk-cgroup-rwstat.h | 149 ++
+ block/blk-cgroup.c | 304 ++--
+ block/blk-core.c | 16 +-
+ block/blk-exec.c | 2 +
+ block/blk-flush.c | 15 +-
+ block/blk-merge.c | 17 +-
+ block/blk-mq-sysfs.c | 31 +-
+ block/blk-mq-tag.c | 8 -
+ block/blk-mq-tag.h | 1 -
+ block/blk-mq.c | 136 +-
+ block/blk-mq.h | 9 -
+ block/blk-softirq.c | 4 -
+ block/blk-stat.c | 7 +-
+ block/blk-sysfs.c | 8 -
+ block/blk-throttle.c | 71 +-
+ block/blk-zoned.c | 453 +++---
+ block/blk.h | 7 +-
+ block/elevator.c | 9 +
+ block/genhd.c | 8 +-
+ block/ioctl.c | 42 +-
+ block/opal_proto.h | 6 +-
+ block/partition-generic.c | 231 +--
+ block/sed-opal.c | 318 +++-
+ block/t10-pi.c | 8 +-
+ drivers/ata/acard-ahci.c | 6 +-
+ drivers/ata/ahci.c | 13 +
+ drivers/ata/ahci_tegra.c | 6 +-
+ drivers/ata/ata_piix.c | 14 +-
+ drivers/ata/libahci.c | 6 +-
+ drivers/ata/libata-core.c | 12 +-
+ drivers/ata/libata-sff.c | 12 +-
+ drivers/ata/pata_artop.c | 4 +-
+ drivers/ata/pata_macio.c | 6 +-
+ drivers/ata/pata_pxa.c | 8 +-
+ drivers/ata/pdc_adma.c | 7 +-
+ drivers/ata/sata_fsl.c | 4 +-
+ drivers/ata/sata_inic162x.c | 4 +-
+ drivers/ata/sata_mv.c | 34 +-
+ drivers/ata/sata_nv.c | 18 +-
+ drivers/ata/sata_promise.c | 6 +-
+ drivers/ata/sata_qstor.c | 8 +-
+ drivers/ata/sata_rcar.c | 6 +-
+ drivers/ata/sata_sil.c | 8 +-
+ drivers/ata/sata_sil24.c | 6 +-
+ drivers/ata/sata_sx4.c | 6 +-
+ drivers/block/loop.c | 39 +-
+ drivers/block/mtip32xx/mtip32xx.c | 2 +-
+ drivers/block/nbd.c | 5 +-
+ drivers/block/null_blk.h | 19 +-
+ drivers/block/null_blk_main.c | 125 +-
+ drivers/block/null_blk_zoned.c | 87 +-
+ drivers/md/bcache/Makefile | 2 -
+ drivers/md/bcache/alloc.c | 5 +-
+ drivers/md/bcache/bcache.h | 4 +-
+ drivers/md/bcache/bset.c | 17 +-
+ drivers/md/bcache/btree.c | 19 +-
+ drivers/md/bcache/closure.c | 7 -
+ drivers/md/bcache/request.c | 12 -
+ drivers/md/bcache/super.c | 56 +-
+ drivers/md/bcache/sysfs.c | 7 +
+ drivers/md/bcache/writeback.c | 4 +
+ drivers/md/dm-flakey.c | 25 +-
+ drivers/md/dm-linear.c | 22 +-
+ drivers/md/dm-zoned-metadata.c | 137 +-
+ drivers/md/dm.c | 135 +-
+ drivers/md/md-bitmap.c | 2 +-
+ drivers/md/md-linear.c | 5 +-
+ drivers/md/md-multipath.c | 5 +-
+ drivers/md/md.c | 57 +-
+ drivers/md/md.h | 4 +-
+ drivers/md/raid0.c | 7 +-
+ drivers/md/raid1.c | 6 +-
+ drivers/md/raid10.c | 7 +-
+ drivers/md/raid5-ppl.c | 2 +-
+ drivers/md/raid5.c | 8 +-
+ drivers/nvme/host/Kconfig | 10 +
+ drivers/nvme/host/Makefile | 1 +
+ drivers/nvme/host/core.c | 42 +-
+ drivers/nvme/host/fc.c | 49 +-
+ drivers/nvme/host/hwmon.c | 259 +++
+ drivers/nvme/host/multipath.c | 13 +-
+ drivers/nvme/host/nvme.h | 33 +-
+ drivers/nvme/host/pci.c | 9 +-
+ drivers/nvme/host/rdma.c | 16 +-
+ drivers/nvme/host/tcp.c | 4 +-
+ drivers/nvme/target/admin-cmd.c | 133 +-
+ drivers/nvme/target/core.c | 20 +-
+ drivers/nvme/target/discovery.c | 70 +-
+ drivers/nvme/target/fabrics-cmd.c | 15 +-
+ drivers/nvme/target/fc.c | 31 +-
+ drivers/nvme/target/io-cmd-bdev.c | 43 +-
+ drivers/nvme/target/io-cmd-file.c | 20 +-
+ drivers/nvme/target/loop.c | 7 +-
+ drivers/nvme/target/nvmet.h | 10 +-
+ drivers/nvme/target/rdma.c | 8 +-
+ drivers/nvme/target/tcp.c | 14 +-
+ drivers/s390/block/dasd_genhd.c | 4 +-
+ drivers/scsi/sd.c | 15 +-
+ drivers/scsi/sd.h | 12 +-
+ drivers/scsi/sd_zbc.c | 257 ++-
+ fs/Kconfig | 3 +
+ fs/Makefile | 1 +
+ fs/block_dev.c | 69 +-
+ fs/f2fs/segment.c | 3 +-
+ fs/f2fs/super.c | 51 +-
+ fs/fcntl.c | 2 +-
+ fs/io-wq.c | 1088 +++++++++++++
+ fs/io-wq.h | 84 +
+ fs/io_uring.c | 2428 +++++++++++++++++++---------
+ include/linux/blk-cgroup.h | 199 +--
+ include/linux/blk-mq.h | 300 +++-
+ include/linux/blk_types.h | 28 +-
+ include/linux/blkdev.h | 31 +-
+ include/linux/device-mapper.h | 24 +-
+ include/linux/fs.h | 4 -
+ include/linux/genhd.h | 5 +-
+ include/linux/libata.h | 13 +-
+ include/linux/nvme-fc.h | 182 ++-
+ include/linux/nvme.h | 60 +-
+ include/linux/sbitmap.h | 9 -
+ include/linux/sched.h | 1 +
+ include/linux/sed-opal.h | 1 +
+ include/linux/socket.h | 6 +
+ include/trace/events/io_uring.h | 358 ++++
+ include/trace/events/wbt.h | 12 +-
+ include/uapi/linux/blkzoned.h | 17 +-
+ include/uapi/linux/fcntl.h | 9 +-
+ include/uapi/linux/io_uring.h | 25 +-
+ include/uapi/linux/sed-opal.h | 20 +
+ init/Kconfig | 1 +
+ kernel/sched/core.c | 16 +-
+ lib/sbitmap.c | 17 -
+ net/socket.c | 95 +-
+ tools/include/uapi/linux/fcntl.h | 9 +-
+ 147 files changed, 6492 insertions(+), 2948 deletions(-)
+ create mode 100644 block/blk-cgroup-rwstat.c
+ create mode 100644 block/blk-cgroup-rwstat.h
+ create mode 100644 drivers/nvme/host/hwmon.c
+ create mode 100644 fs/io-wq.c
+ create mode 100644 fs/io-wq.h
+ create mode 100644 include/trace/events/io_uring.h
+Merging device-mapper/for-next (f612b2132db5 Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues")
+$ git merge device-mapper/for-next
+Auto-merging include/linux/device-mapper.h
+Auto-merging drivers/md/dm-zoned-metadata.c
+Merge made by the 'recursive' strategy.
+ .../admin-guide/device-mapper/dm-integrity.rst | 5 +
+ .../admin-guide/device-mapper/dm-raid.rst | 2 +
+ drivers/md/Kconfig | 54 +++----
+ drivers/md/dm-bio-prison-v1.c | 27 ++--
+ drivers/md/dm-bio-prison-v2.c | 26 ++--
+ drivers/md/dm-cache-target.c | 77 ++++------
+ drivers/md/dm-clone-metadata.c | 29 ++--
+ drivers/md/dm-clone-metadata.h | 4 +-
+ drivers/md/dm-clone-target.c | 62 ++++----
+ drivers/md/dm-crypt.c | 9 +-
+ drivers/md/dm-dust.c | 97 ++++++++----
+ drivers/md/dm-integrity.c | 28 +++-
+ drivers/md/dm-raid.c | 164 +++++++++++----------
+ drivers/md/dm-stripe.c | 15 +-
+ drivers/md/dm-table.c | 27 +---
+ drivers/md/dm-thin.c | 118 +++++++--------
+ drivers/md/dm-writecache.c | 5 +-
+ drivers/md/dm-zoned-metadata.c | 29 ++--
+ drivers/md/dm-zoned-reclaim.c | 8 +-
+ drivers/md/dm-zoned-target.c | 54 +++++--
+ drivers/md/dm-zoned.h | 2 +
+ include/linux/device-mapper.h | 3 -
+ 22 files changed, 433 insertions(+), 412 deletions(-)
+Merging pcmcia/pcmcia-next (bd9d6e0371d1 pcmcia: remove unused dprintk definition)
+$ git merge pcmcia/pcmcia-next
+Merge made by the 'recursive' strategy.
+ drivers/pcmcia/cardbus.c | 2 ++
+ drivers/pcmcia/cistpl.c | 1 +
+ drivers/pcmcia/i82092.c | 34 ++++++++++++++++------------------
+ drivers/pcmcia/i82092aa.h | 2 --
+ drivers/pcmcia/yenta_socket.c | 3 +--
+ 5 files changed, 20 insertions(+), 22 deletions(-)
+Merging mmc/next (def7bd940f8c dt-bindings: mmc: Correct the type of the clk phase properties)
+$ git merge mmc/next
+Auto-merging include/linux/firmware/xlnx-zynqmp.h
+Auto-merging drivers/mmc/host/tmio_mmc_core.c
+Auto-merging drivers/memstick/host/jmb38x_ms.c
+Auto-merging arch/arm/mach-omap2/pdata-quirks.c
+Removing arch/arm/mach-omap2/hsmmc.h
+Removing arch/arm/mach-omap2/hsmmc.c
+Auto-merging arch/arm/mach-omap2/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/arasan,sdhci.txt | 42 +-
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 3 +
+ Documentation/devicetree/bindings/mmc/jz4740.txt | 8 +-
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 14 +
+ Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 59 ++
+ .../devicetree/bindings/mmc/renesas,sdhi.txt | 1 +
+ .../devicetree/bindings/mmc/sdhci-atmel.txt | 5 +
+ .../devicetree/bindings/mmc/sdhci-milbeaut.txt | 30 +
+ .../devicetree/bindings/net/wireless/ti,wl1251.txt | 26 +
+ MAINTAINERS | 6 +-
+ arch/arm/boot/dts/omap3-pandora-common.dtsi | 36 +-
+ arch/arm/mach-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/common.h | 1 -
+ arch/arm/mach-omap2/hsmmc.c | 171 -----
+ arch/arm/mach-omap2/hsmmc.h | 32 -
+ arch/arm/mach-omap2/pdata-quirks.c | 105 ----
+ drivers/memstick/core/Kconfig | 18 +-
+ drivers/memstick/host/Kconfig | 4 +-
+ drivers/memstick/host/jmb38x_ms.c | 12 +-
+ drivers/mmc/core/block.c | 151 ++---
+ drivers/mmc/core/core.c | 12 +-
+ drivers/mmc/core/core.h | 2 +
+ drivers/mmc/core/mmc.c | 9 +-
+ drivers/mmc/core/quirks.h | 7 +
+ drivers/mmc/core/sdio.c | 28 +-
+ drivers/mmc/core/sdio_bus.c | 9 +-
+ drivers/mmc/host/Kconfig | 21 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/atmel-mci.c | 3 +-
+ drivers/mmc/host/bcm2835.c | 4 +-
+ drivers/mmc/host/cavium-octeon.c | 15 +-
+ drivers/mmc/host/dw_mmc.c | 4 +-
+ drivers/mmc/host/jz4740_mmc.c | 41 +-
+ drivers/mmc/host/mmc_spi.c | 2 +-
+ drivers/mmc/host/mmci.c | 198 +++---
+ drivers/mmc/host/mmci.h | 5 +
+ drivers/mmc/host/mmci_stm32_sdmmc.c | 46 +-
+ drivers/mmc/host/moxart-mmc.c | 4 +-
+ drivers/mmc/host/omap_hsmmc.c | 31 +-
+ drivers/mmc/host/owl-mmc.c | 696 +++++++++++++++++++++
+ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 +
+ drivers/mmc/host/sdhci-esdhc.h | 14 +
+ drivers/mmc/host/sdhci-milbeaut.c | 362 +++++++++++
+ drivers/mmc/host/sdhci-of-arasan.c | 493 ++++++++++++++-
+ drivers/mmc/host/sdhci-of-aspeed.c | 12 +
+ drivers/mmc/host/sdhci-of-at91.c | 19 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 257 ++++++--
+ drivers/mmc/host/sdhci-pci-core.c | 53 +-
+ drivers/mmc/host/sdhci-pci.h | 2 +
+ drivers/mmc/host/sdhci.c | 15 +-
+ drivers/mmc/host/sdhci_am654.c | 71 ++-
+ drivers/mmc/host/sdhci_f_sdh30.c | 26 +-
+ drivers/mmc/host/sdhci_f_sdh30.h | 32 +
+ drivers/mmc/host/tmio_mmc_core.c | 2 +-
+ drivers/mmc/host/vub300.c | 7 -
+ drivers/net/wireless/marvell/mwifiex/main.c | 5 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 1 +
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 33 +-
+ drivers/net/wireless/ti/wl1251/sdio.c | 25 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 8 -
+ include/linux/firmware/xlnx-zynqmp.h | 13 +-
+ include/linux/mmc/card.h | 3 +-
+ include/linux/mmc/sdio_ids.h | 2 +
+ include/linux/platform_data/hsmmc-omap.h | 3 -
+ 64 files changed, 2631 insertions(+), 694 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/owl-mmc.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-milbeaut.txt
+ delete mode 100644 arch/arm/mach-omap2/hsmmc.c
+ delete mode 100644 arch/arm/mach-omap2/hsmmc.h
+ create mode 100644 drivers/mmc/host/owl-mmc.c
+ create mode 100644 drivers/mmc/host/sdhci-milbeaut.c
+ create mode 100644 drivers/mmc/host/sdhci_f_sdh30.h
+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 (de98a43eb76b mfd: ti_am335x_tscadc: Fix static checker warning)
+$ git merge mfd/for-mfd-next
+Auto-merging lib/devres.c
+Auto-merging drivers/mfd/mt6397-core.c
+CONFLICT (content): Merge conflict in drivers/mfd/mt6397-core.c
+Auto-merging drivers/mfd/intel_soc_pmic_crc.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/mfd/max77650.txt
+Resolved 'drivers/mfd/mt6397-core.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5d4dff8d5182] Merge remote-tracking branch 'mfd/for-mfd-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mfd/madera.txt | 8 ++
+ Documentation/devicetree/bindings/mfd/max77650.txt | 46 -------
+ .../devicetree/bindings/mfd/max77650.yaml | 149 +++++++++++++++++++++
+ Documentation/devicetree/bindings/mfd/max77693.txt | 1 +
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 +
+ .../devicetree/bindings/rtc/rtc-mt6397.txt | 29 ++++
+ Documentation/driver-api/driver-model/devres.rst | 1 +
+ MAINTAINERS | 7 +
+ arch/arm/mach-ux500/cpu-db8500.c | 2 +-
+ arch/sparc/include/asm/io_64.h | 1 +
+ arch/x86/platform/olpc/olpc-xo1-pm.c | 8 --
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 6 -
+ drivers/mfd/ab8500-core.c | 138 ++++++-------------
+ drivers/mfd/arizona-core.c | 6 +-
+ drivers/mfd/cs5535-mfd.c | 108 +++++++--------
+ drivers/mfd/db8500-prcmu.c | 84 +++++++-----
+ drivers/mfd/intel-lpss-pci.c | 41 ++++--
+ drivers/mfd/intel-lpss.c | 2 +-
+ drivers/mfd/intel_soc_pmic_crc.c | 3 +
+ drivers/mfd/ipaq-micro.c | 6 +-
+ drivers/mfd/madera-core.c | 27 +++-
+ drivers/mfd/max77620.c | 5 +-
+ drivers/mfd/mfd-core.c | 118 ++++------------
+ drivers/mfd/mt6397-core.c | 12 +-
+ drivers/mfd/qcom-spmi-pmic.c | 4 +
+ drivers/mfd/rk808.c | 22 +--
+ drivers/mfd/rohm-bd70528.c | 17 ++-
+ drivers/mfd/ti_am335x_tscadc.c | 2 +-
+ drivers/mfd/wm8998-tables.c | 12 --
+ drivers/power/reset/Kconfig | 10 ++
+ drivers/power/reset/Makefile | 1 +
+ drivers/power/reset/mt6323-poweroff.c | 97 ++++++++++++++
+ drivers/rtc/rtc-mt6397.c | 107 +++------------
+ include/linux/io.h | 2 +
+ include/linux/mfd/arizona/registers.h | 7 -
+ include/linux/mfd/core.h | 49 ++++---
+ include/linux/mfd/db8500-prcmu.h | 4 +-
+ include/linux/mfd/dbx500-prcmu.h | 7 +-
+ include/linux/mfd/madera/core.h | 11 ++
+ include/linux/mfd/max77620.h | 1 -
+ include/linux/mfd/mt6397/rtc.h | 71 ++++++++++
+ include/linux/mfd/rk808.h | 2 +-
+ include/linux/mfd/twl.h | 12 +-
+ lib/devres.c | 19 +++
+ 44 files changed, 730 insertions(+), 537 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/max77650.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt6397.txt
+ create mode 100644 drivers/power/reset/mt6323-poweroff.c
+ create mode 100644 include/linux/mfd/mt6397/rtc.h
+Merging backlight/for-backlight-next (9afa302473f3 backlight: gpio: Pull gpio_backlight_initial_power_state() into probe)
+$ git merge backlight/for-backlight-next
+Removing drivers/video/backlight/pm8941-wled.c
+Removing Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/leds/backlight/led-backlight.txt | 28 +
+ .../bindings/leds/backlight/lm3630a-backlight.yaml | 6 +
+ .../bindings/leds/backlight/pm8941-wled.txt | 42 -
+ .../bindings/leds/backlight/qcom-wled.txt | 154 +++
+ arch/arm/mach-pxa/include/mach/tosa.h | 15 -
+ arch/arm/mach-pxa/tosa.c | 22 +
+ arch/sh/boards/mach-ecovec24/setup.c | 33 +-
+ drivers/video/backlight/Kconfig | 12 +-
+ drivers/video/backlight/Makefile | 2 +-
+ drivers/video/backlight/gpio_backlight.c | 128 +-
+ drivers/video/backlight/ipaq_micro_bl.c | 2 +-
+ drivers/video/backlight/lm3630a_bl.c | 13 +-
+ drivers/video/backlight/pm8941-wled.c | 424 -------
+ drivers/video/backlight/pwm_bl.c | 39 +-
+ drivers/video/backlight/qcom-wled.c | 1296 ++++++++++++++++++++
+ drivers/video/backlight/tosa_bl.c | 10 +-
+ drivers/video/backlight/tosa_bl.h | 8 +
+ drivers/video/backlight/tosa_lcd.c | 28 +-
+ include/linux/platform_data/gpio_backlight.h | 3 -
+ 19 files changed, 1653 insertions(+), 612 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/led-backlight.txt
+ delete mode 100644 Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt
+ delete mode 100644 drivers/video/backlight/pm8941-wled.c
+ create mode 100644 drivers/video/backlight/qcom-wled.c
+ create mode 100644 drivers/video/backlight/tosa_bl.h
+Merging battery/for-next (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading)
+$ git merge battery/for-next
+Removing include/linux/mfd/abx500/ab8500-gpadc.h
+Removing drivers/mfd/ab8500-gpadc.c
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/ab8500.txt | 119 ++
+ .../bindings/power/supply/cpcap-charger.txt | 9 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 6 +-
+ drivers/hwmon/Kconfig | 3 +-
+ drivers/hwmon/ab8500.c | 65 +-
+ drivers/iio/adc/Kconfig | 10 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ab8500-gpadc.c | 1218 ++++++++++++++++++++
+ drivers/mfd/Kconfig | 7 -
+ drivers/mfd/Makefile | 1 -
+ drivers/mfd/ab8500-debugfs.c | 715 ------------
+ drivers/mfd/ab8500-gpadc.c | 1075 -----------------
+ drivers/power/reset/at91-reset.c | 6 +-
+ drivers/power/reset/at91-sama5d2_shdwc.c | 8 +-
+ drivers/power/supply/Kconfig | 2 +-
+ drivers/power/supply/ab8500_btemp.c | 50 +-
+ drivers/power/supply/ab8500_charger.c | 83 +-
+ drivers/power/supply/ab8500_fg.c | 49 +-
+ drivers/power/supply/abx500_chargalg.c | 8 +-
+ drivers/power/supply/axp20x_usb_power.c | 8 +
+ drivers/power/supply/bd70528-charger.c | 1 +
+ drivers/power/supply/cpcap-battery.c | 271 ++++-
+ drivers/power/supply/cpcap-charger.c | 222 +++-
+ drivers/power/supply/test_power.c | 61 +
+ include/linux/mfd/abx500/ab8500-gpadc.h | 75 --
+ 26 files changed, 2044 insertions(+), 2030 deletions(-)
+ create mode 100644 drivers/iio/adc/ab8500-gpadc.c
+ delete mode 100644 drivers/mfd/ab8500-gpadc.c
+ delete mode 100644 include/linux/mfd/abx500/ab8500-gpadc.h
+Merging regulator/for-next (a21da94f617b Merge branch 'regulator-5.5' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/da9062.txt | 4 +
+ .../bindings/regulator/fixed-regulator.yaml | 4 +
+ .../bindings/regulator/qcom,rpmh-regulator.txt | 4 +
+ .../bindings/regulator/qcom,smd-rpm-regulator.txt | 21 +++++
+ .../bindings/regulator/qcom,spmi-regulator.txt | 25 ++++++
+ .../devicetree/bindings/regulator/regulator.yaml | 7 +-
+ drivers/mfd/tps6105x.c | 34 +++++++-
+ drivers/regulator/Kconfig | 8 +-
+ drivers/regulator/ab8500.c | 17 ----
+ drivers/regulator/bd718x7-regulator.c | 1 +
+ drivers/regulator/core.c | 10 ++-
+ drivers/regulator/da9062-regulator.c | 63 ++++++++-------
+ drivers/regulator/da9063-regulator.c | 9 +--
+ drivers/regulator/da9211-regulator.c | 12 +--
+ drivers/regulator/fan53555.c | 2 +
+ drivers/regulator/fixed.c | 2 +
+ drivers/regulator/max77686-regulator.c | 5 +-
+ drivers/regulator/max8907-regulator.c | 15 +++-
+ drivers/regulator/pbias-regulator.c | 75 +++++++-----------
+ drivers/regulator/pcap-regulator.c | 4 -
+ drivers/regulator/qcom-rpmh-regulator.c | 62 ++++++++++++++-
+ drivers/regulator/qcom_smd-regulator.c | 92 ++++++++++++++++++++++
+ drivers/regulator/qcom_spmi-regulator.c | 41 ++++++++++
+ drivers/regulator/rk808-regulator.c | 29 ++-----
+ drivers/regulator/s2mps11.c | 7 +-
+ drivers/regulator/s5m8767.c | 7 +-
+ drivers/regulator/slg51000-regulator.c | 13 ++-
+ drivers/regulator/stm32-vrefbuf.c | 4 +-
+ drivers/regulator/stpmic1_regulator.c | 6 ++
+ drivers/regulator/tps6105x-regulator.c | 2 +
+ drivers/regulator/tps65090-regulator.c | 26 +++---
+ drivers/regulator/tps65132-regulator.c | 17 ++--
+ drivers/regulator/uniphier-regulator.c | 4 +-
+ drivers/regulator/vexpress-regulator.c | 5 +-
+ .../dt-bindings/regulator/dlg,da9063-regulator.h | 16 ++++
+ include/linux/regulator/ab8500.h | 3 -
+ include/linux/regulator/fixed.h | 1 +
+ 37 files changed, 465 insertions(+), 192 deletions(-)
+ create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h
+Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390)
+$ git merge security/next-testing
+Already up to date.
+Merging apparmor/apparmor-next (341c1fda5e17 apparmor: make it so work buffers can be allocated from atomic context)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging security/apparmor/policy.c
+Auto-merging security/apparmor/mount.c
+Auto-merging security/apparmor/match.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/label.c
+Auto-merging security/apparmor/include/policy_unpack.h
+Auto-merging security/apparmor/include/path.h
+Auto-merging security/apparmor/include/match.h
+Auto-merging security/apparmor/include/file.h
+Auto-merging security/apparmor/include/apparmor.h
+Auto-merging security/apparmor/file.c
+Auto-merging security/apparmor/domain.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 | 130 +++++++++++++++++++-
+ security/apparmor/domain.c | 46 +++----
+ security/apparmor/file.c | 45 ++++---
+ security/apparmor/include/apparmor.h | 1 +
+ security/apparmor/include/file.h | 2 +-
+ security/apparmor/include/match.h | 3 +-
+ security/apparmor/include/path.h | 50 +-------
+ security/apparmor/include/policy_unpack.h | 8 +-
+ security/apparmor/label.c | 12 +-
+ security/apparmor/lsm.c | 198 ++++++++++++++++++++++++------
+ security/apparmor/match.c | 6 +-
+ security/apparmor/mount.c | 67 +++++++---
+ security/apparmor/policy.c | 5 +-
+ security/apparmor/policy_unpack.c | 116 ++++++++++++++++-
+ 15 files changed, 526 insertions(+), 165 deletions(-)
+Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc())
+$ git merge integrity/next-integrity
+Already up to date.
+Merging keys/keys-next (48274e1e5d24 Merge branch 'notifications-core' into keys-next)
+$ git merge keys/keys-next
+Auto-merging include/linux/security.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/blkdev.h
+Auto-merging block/blk-core.c
+Auto-merging block/Kconfig
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Auto-merging Documentation/security/keys/core.rst
+Merge made by the 'recursive' strategy.
+ Documentation/security/keys/core.rst | 58 ++
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ Documentation/watch_queue.rst | 460 +++++++++++
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/include/asm/unistd.h | 2 +-
+ arch/arm64/include/asm/unistd32.h | 2 +
+ arch/ia64/kernel/syscalls/syscall.tbl | 1 +
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ block/Kconfig | 9 +
+ block/blk-core.c | 29 +
+ drivers/base/Kconfig | 9 +
+ drivers/base/Makefile | 1 +
+ drivers/base/watch.c | 90 +++
+ drivers/misc/Kconfig | 13 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/watch_queue.c | 898 +++++++++++++++++++++
+ drivers/usb/core/Kconfig | 9 +
+ drivers/usb/core/devio.c | 49 ++
+ drivers/usb/core/hub.c | 4 +
+ include/linux/blkdev.h | 15 +
+ include/linux/device.h | 7 +
+ include/linux/key.h | 3 +
+ include/linux/lsm_audit.h | 1 +
+ include/linux/lsm_hooks.h | 38 +
+ include/linux/sched/user.h | 3 +-
+ include/linux/security.h | 32 +-
+ include/linux/syscalls.h | 1 +
+ include/linux/usb.h | 18 +
+ include/linux/watch_queue.h | 94 +++
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/keyctl.h | 2 +
+ include/uapi/linux/watch_queue.h | 181 +++++
+ kernel/sys_ni.c | 1 +
+ samples/Kconfig | 7 +
+ samples/Makefile | 1 +
+ samples/watch_queue/Makefile | 7 +
+ samples/watch_queue/watch_test.c | 231 ++++++
+ security/keys/Kconfig | 9 +
+ security/keys/compat.c | 3 +
+ security/keys/gc.c | 5 +
+ security/keys/internal.h | 30 +-
+ security/keys/key.c | 38 +-
+ security/keys/keyctl.c | 99 ++-
+ security/keys/keyring.c | 20 +-
+ security/keys/request_key.c | 4 +-
+ security/security.c | 23 +
+ security/selinux/hooks.c | 14 +
+ security/smack/smack_lsm.c | 83 +-
+ 61 files changed, 2593 insertions(+), 32 deletions(-)
+ create mode 100644 Documentation/watch_queue.rst
+ create mode 100644 drivers/base/watch.c
+ create mode 100644 drivers/misc/watch_queue.c
+ create mode 100644 include/linux/watch_queue.h
+ create mode 100644 include/uapi/linux/watch_queue.h
+ create mode 100644 samples/watch_queue/Makefile
+ create mode 100644 samples/watch_queue/watch_test.c
+Merging selinux/next (42345b68c2e3 selinux: default_range glblub implementation)
+$ git merge selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/hooks.c | 12 ++++++++++++
+ security/selinux/include/security.h | 3 ++-
+ security/selinux/selinuxfs.c | 4 ----
+ security/selinux/ss/context.h | 32 ++++++++++++++++++++++++++++++++
+ security/selinux/ss/ebitmap.c | 18 ++++++++++++++++++
+ security/selinux/ss/ebitmap.h | 1 +
+ security/selinux/ss/mls.c | 3 +++
+ security/selinux/ss/policydb.c | 5 +++++
+ security/selinux/ss/policydb.h | 1 +
+ 9 files changed, 74 insertions(+), 5 deletions(-)
+Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
+$ git merge smack/for-next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'recursive' strategy.
+Merging tomoyo/master (79c8ca578dbf Revert "printk: Monitor change of console loglevel.")
+$ git merge tomoyo/master
+Merge made by the 'recursive' strategy.
+ security/tomoyo/tomoyo.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging tpmdd/next (0b40dbcbba92 KEYS: trusted: Remove set but not used variable 'keyhndl')
+$ git merge tpmdd/next
+CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in tpmdd/next. Version tpmdd/next of include/Kbuild left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f include/Kbuild
+rm 'include/Kbuild'
+$ git commit --no-edit -v -a
+[master 0877006a73cc] Merge remote-tracking branch 'tpmdd/next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/security/tpm/google,cr50.txt | 19 ++
+ crypto/asymmetric_keys/asym_tpm.c | 101 +++----
+ drivers/char/tpm/Kconfig | 7 +
+ drivers/char/tpm/Makefile | 4 +-
+ drivers/char/tpm/tpm-interface.c | 64 +---
+ drivers/char/tpm/tpm-sysfs.c | 45 +--
+ drivers/char/tpm/tpm.h | 248 +---------------
+ drivers/char/tpm/tpm1-cmd.c | 15 +
+ drivers/char/tpm/tpm2-cmd.c | 311 +-------------------
+ drivers/char/tpm/tpm_crb.c | 123 +++++---
+ drivers/char/tpm/tpm_tis.c | 2 +-
+ drivers/char/tpm/tpm_tis_core.c | 79 +++++
+ drivers/char/tpm/tpm_tis_spi.c | 143 +++++----
+ drivers/char/tpm/tpm_tis_spi.h | 53 ++++
+ drivers/char/tpm/tpm_tis_spi_cr50.c | 322 +++++++++++++++++++++
+ include/keys/{trusted.h => trusted_tpm.h} | 49 +---
+ include/linux/tpm.h | 250 ++++++++++++++--
+ security/keys/Makefile | 2 +-
+ security/keys/trusted-keys/Makefile | 8 +
+ .../{trusted.c => trusted-keys/trusted_tpm1.c} | 98 +++----
+ security/keys/trusted-keys/trusted_tpm2.c | 314 ++++++++++++++++++++
+ 21 files changed, 1371 insertions(+), 886 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/security/tpm/google,cr50.txt
+ create mode 100644 drivers/char/tpm/tpm_tis_spi.h
+ create mode 100644 drivers/char/tpm/tpm_tis_spi_cr50.c
+ rename include/keys/{trusted.h => trusted_tpm.h} (77%)
+ create mode 100644 security/keys/trusted-keys/Makefile
+ rename security/keys/{trusted.c => trusted-keys/trusted_tpm1.c} (94%)
+ create mode 100644 security/keys/trusted-keys/trusted_tpm2.c
+Merging watchdog/master (33c26ab4d6be watchdog: jz4740: Drop dependency on MACH_JZ47xx)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-watchdog | 9 +-
+ .../bindings/watchdog/atmel-sama5d4-wdt.txt | 2 +-
+ drivers/watchdog/Kconfig | 5 +-
+ drivers/watchdog/aspeed_wdt.c | 16 +--
+ drivers/watchdog/at91sam9_wdt.h | 34 ++++---
+ drivers/watchdog/bd70528_wdt.c | 4 +-
+ drivers/watchdog/cadence_wdt.c | 6 +-
+ drivers/watchdog/imx2_wdt.c | 30 +++---
+ drivers/watchdog/imx7ulp_wdt.c | 45 ++++++---
+ drivers/watchdog/intel-mid_wdt.c | 1 +
+ drivers/watchdog/jz4740_wdt.c | 108 ++++++++++-----------
+ drivers/watchdog/sbc7240_wdt.c | 3 +-
+ drivers/watchdog/sprd_wdt.c | 6 +-
+ drivers/watchdog/w83627hf_wdt.c | 11 ++-
+ drivers/watchdog/watchdog_dev.c | 101 +++++++++++--------
+ drivers/watchdog/wdat_wdt.c | 2 +-
+ 16 files changed, 214 insertions(+), 169 deletions(-)
+Merging iommu/next (9b3a713feef8 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next)
+$ git merge iommu/next
+Auto-merging include/linux/qcom_scm.h
+Auto-merging drivers/iommu/dma-iommu.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/iommu/Kconfig
+Auto-merging drivers/firmware/qcom_scm.h
+Auto-merging drivers/firmware/qcom_scm.c
+Auto-merging drivers/firmware/qcom_scm-64.c
+Auto-merging drivers/firmware/qcom_scm-32.c
+Merge made by the 'recursive' strategy.
+ .../bindings/iommu/renesas,ipmmu-vmsa.txt | 1 +
+ arch/ia64/include/asm/iommu.h | 5 +
+ arch/x86/include/asm/iommu.h | 18 +
+ drivers/firmware/qcom_scm-32.c | 5 +
+ drivers/firmware/qcom_scm-64.c | 153 ++--
+ drivers/firmware/qcom_scm.c | 6 +
+ drivers/firmware/qcom_scm.h | 5 +
+ drivers/iommu/Kconfig | 5 +
+ drivers/iommu/Makefile | 3 +-
+ drivers/iommu/amd_iommu.c | 893 ++++-----------------
+ drivers/iommu/amd_iommu_types.h | 3 +-
+ drivers/iommu/arm-smmu-impl.c | 5 +-
+ drivers/iommu/arm-smmu-qcom.c | 51 ++
+ drivers/iommu/arm-smmu-v3.c | 12 +-
+ drivers/iommu/arm-smmu.c | 223 ++---
+ drivers/iommu/arm-smmu.h | 16 +-
+ drivers/iommu/dma-iommu.c | 43 +-
+ drivers/iommu/dmar.c | 5 +-
+ drivers/iommu/exynos-iommu.c | 2 +-
+ drivers/iommu/intel-iommu.c | 61 +-
+ drivers/iommu/io-pgtable-arm-v7s.c | 15 +-
+ drivers/iommu/io-pgtable-arm.c | 130 +--
+ drivers/iommu/ioasid.c | 422 ++++++++++
+ drivers/iommu/iommu.c | 73 +-
+ drivers/iommu/ipmmu-vmsa.c | 223 +++--
+ drivers/iommu/msm_iommu.c | 2 +-
+ drivers/iommu/mtk_iommu.c | 90 +--
+ drivers/iommu/mtk_iommu.h | 2 +-
+ drivers/iommu/mtk_iommu_v1.c | 2 +-
+ drivers/iommu/omap-iommu.c | 2 +-
+ drivers/iommu/qcom_iommu.c | 10 +-
+ drivers/iommu/rockchip-iommu.c | 11 +-
+ drivers/iommu/s390-iommu.c | 2 +-
+ drivers/iommu/tegra-gart.c | 2 +-
+ drivers/iommu/tegra-smmu.c | 38 +-
+ drivers/iommu/virtio-iommu.c | 5 +-
+ drivers/memory/mtk-smi.c | 4 +
+ include/linux/dmar.h | 2 +
+ include/linux/io-pgtable.h | 2 +-
+ include/linux/ioasid.h | 76 ++
+ include/linux/iommu.h | 65 +-
+ include/linux/qcom_scm.h | 2 +
+ include/uapi/linux/iommu.h | 169 ++++
+ 43 files changed, 1651 insertions(+), 1213 deletions(-)
+ create mode 100644 drivers/iommu/arm-smmu-qcom.c
+ create mode 100644 drivers/iommu/ioasid.c
+ create mode 100644 include/linux/ioasid.h
+Merging vfio/next (026948f01eac vfio/type1: remove hugepage checks in is_invalid_reserved_pfn())
+$ git merge vfio/next
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Merge made by the 'recursive' strategy.
+ drivers/vfio/vfio_iommu_type1.c | 26 ++++----------------------
+ 1 file changed, 4 insertions(+), 22 deletions(-)
+Merging audit/next (c34c78dfc1fc audit: remove redundant condition check in kauditd_thread())
+$ git merge audit/next
+Merge made by the 'recursive' strategy.
+ fs/namei.c | 8 ++++++--
+ include/linux/audit.h | 5 +++--
+ include/uapi/linux/audit.h | 1 +
+ kernel/audit.c | 15 ++++++++-------
+ 4 files changed, 18 insertions(+), 11 deletions(-)
+Merging devicetree/for-next (10378fadadef dt-bindings: interrupt-controller: arm,gic-v3: Add missing type to interrupt-partition-* nodes)
+$ git merge devicetree/for-next
+Auto-merging scripts/checkpatch.pl
+Auto-merging drivers/of/property.c
+Auto-merging drivers/of/fdt.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
+Auto-merging Documentation/devicetree/bindings/usb/generic-ehci.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic-ehci.yaml
+Auto-merging Documentation/devicetree/bindings/usb/amlogic,dwc3.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/amlogic,dwc3.txt
+Removing Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt
+Removing Documentation/devicetree/bindings/timer/st,stm32-timer.txt
+Removing Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
+Auto-merging Documentation/devicetree/bindings/timer/ingenic,tcu.txt
+Removing Documentation/devicetree/bindings/thermal/stm32-thermal.txt
+Removing Documentation/devicetree/bindings/sram/sram.txt
+Removing Documentation/devicetree/bindings/sram/samsung-sram.txt
+Removing Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt
+Removing Documentation/devicetree/bindings/sram/renesas,smp-sram.txt
+Removing Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt
+Removing Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt
+Removing Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt
+Removing Documentation/devicetree/bindings/serial/sprd-uart.txt
+Removing Documentation/devicetree/bindings/serial/samsung_uart.txt
+Removing Documentation/devicetree/bindings/rtc/s3c-rtc.txt
+Removing Documentation/devicetree/bindings/rtc/rtc-sh.txt
+Removing Documentation/devicetree/bindings/rng/st,stm32-rng.txt
+Removing Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt
+Removing Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt
+Removing Documentation/devicetree/bindings/regulator/max77650-regulator.txt
+Auto-merging Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
+Removing Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt
+Removing Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt
+Removing Documentation/devicetree/bindings/pwm/pwm-stm32.txt
+Removing Documentation/devicetree/bindings/pwm/pwm-stm32-lp.txt
+Removing Documentation/devicetree/bindings/pwm/pwm-samsung.txt
+Removing Documentation/devicetree/bindings/power/supply/max77650-charger.txt
+Removing Documentation/devicetree/bindings/power/reset/syscon-reboot.txt
+Removing Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt
+Removing Documentation/devicetree/bindings/power/pd-samsung.txt
+Removing Documentation/devicetree/bindings/net/davinci-mdio.txt
+Removing Documentation/devicetree/bindings/net/can/sun4i_can.txt
+Removing Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt
+Removing Documentation/devicetree/bindings/misc/allwinner,syscon.txt
+Removing Documentation/devicetree/bindings/mfd/syscon.txt
+Removing Documentation/devicetree/bindings/mfd/stm32-timers.txt
+Removing Documentation/devicetree/bindings/mfd/stm32-lptimer.txt
+Removing Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt
+Removing Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
+Removing Documentation/devicetree/bindings/media/st,stm32-cec.txt
+Auto-merging Documentation/devicetree/bindings/media/rc.yaml
+Removing Documentation/devicetree/bindings/media/meson-ao-cec.txt
+Removing Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt
+Removing Documentation/devicetree/bindings/leds/leds-max77650.txt
+Removing Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+Removing Documentation/devicetree/bindings/iommu/arm,smmu.txt
+Removing Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
+Removing Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt
+Removing Documentation/devicetree/bindings/input/max77650-onkey.txt
+Removing Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
+Removing Documentation/devicetree/bindings/iio/timer/stm32-lptimer-trigger.txt
+Removing Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-stm32.txt
+Removing Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt
+Removing Documentation/devicetree/bindings/gpu/samsung-scaler.txt
+Removing Documentation/devicetree/bindings/gpu/samsung-rotator.txt
+Removing Documentation/devicetree/bindings/gpu/samsung-g2d.txt
+Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
+Removing Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
+Removing Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt
+Removing Documentation/devicetree/bindings/crypto/st,stm32-hash.txt
+Removing Documentation/devicetree/bindings/crypto/st,stm32-cryp.txt
+Removing Documentation/devicetree/bindings/crypto/st,stm32-crc.txt
+Removing Documentation/devicetree/bindings/crypto/samsung-sss.txt
+Removing Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
+Removing Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt
+Removing Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt
+Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
+Removing Documentation/devicetree/bindings/bus/simple-pm-bus.txt
+Removing Documentation/devicetree/bindings/bus/renesas,bsc.txt
+Removing Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt
+Removing Documentation/devicetree/bindings/arm/sprd.txt
+Removing Documentation/devicetree/bindings/arm/samsung/sysreg.txt
+Removing Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
+Removing Documentation/devicetree/bindings/arm/samsung/pmu.txt
+Removing Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt
+Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+Removing Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt
+Resolved 'Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml' using previous resolution.
+Resolved 'Documentation/devicetree/bindings/usb/amlogic,dwc3.txt' using previous resolution.
+Resolved 'Documentation/devicetree/bindings/usb/generic-ehci.yaml' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master bc5fd6e30164] Merge remote-tracking branch 'devicetree/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/Makefile | 5 +-
+ .../devicetree/bindings/arm/amlogic/smp-sram.txt | 32 ---
+ Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +-
+ Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +-
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 2 +-
+ .../bindings/arm/samsung/exynos-chipid.txt | 12 -
+ .../bindings/arm/samsung/exynos-chipid.yaml | 39 ++++
+ .../devicetree/bindings/arm/samsung/pmu.txt | 72 ------
+ .../devicetree/bindings/arm/samsung/pmu.yaml | 105 +++++++++
+ .../bindings/arm/samsung/samsung-boards.txt | 83 -------
+ .../bindings/arm/samsung/samsung-boards.yaml | 181 +++++++++++++++
+ .../arm/samsung/samsung-secure-firmware.yaml | 31 +++
+ .../devicetree/bindings/arm/samsung/sysreg.txt | 19 --
+ .../devicetree/bindings/arm/samsung/sysreg.yaml | 45 ++++
+ Documentation/devicetree/bindings/arm/sprd.txt | 14 --
+ Documentation/devicetree/bindings/arm/sprd.yaml | 33 +++
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 27 ++-
+ .../devicetree/bindings/arm/sunxi/smp-sram.txt | 44 ----
+ .../devicetree/bindings/ata/sata_rcar.txt | 7 +-
+ .../devicetree/bindings/bus/renesas,bsc.txt | 46 ----
+ .../devicetree/bindings/bus/renesas,bsc.yaml | 60 +++++
+ .../devicetree/bindings/bus/simple-pm-bus.txt | 44 ----
+ .../devicetree/bindings/bus/simple-pm-bus.yaml | 75 ++++++
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +-
+ .../devicetree/bindings/clock/ti/davinci/psc.txt | 2 +-
+ .../bindings/counter/stm32-lptimer-cnt.txt | 29 ---
+ .../bindings/counter/stm32-timer-cnt.txt | 31 ---
+ .../devicetree/bindings/crypto/samsung-slimsss.txt | 19 --
+ .../bindings/crypto/samsung-slimsss.yaml | 47 ++++
+ .../devicetree/bindings/crypto/samsung-sss.txt | 32 ---
+ .../devicetree/bindings/crypto/samsung-sss.yaml | 58 +++++
+ .../devicetree/bindings/crypto/st,stm32-crc.txt | 16 --
+ .../devicetree/bindings/crypto/st,stm32-crc.yaml | 38 +++
+ .../devicetree/bindings/crypto/st,stm32-cryp.txt | 19 --
+ .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 51 ++++
+ .../devicetree/bindings/crypto/st,stm32-hash.txt | 30 ---
+ .../devicetree/bindings/crypto/st,stm32-hash.yaml | 69 ++++++
+ .../bindings/display/amlogic,meson-dw-hdmi.yaml | 2 -
+ .../bindings/display/bridge/ti,sn65dsi86.txt | 2 +-
+ .../bindings/display/cirrus,clps711x-fb.txt | 2 +-
+ .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 +-
+ .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 ---
+ .../bindings/display/panel/sharp,ld-d5116z01b.yaml | 30 +++
+ .../devicetree/bindings/display/st,stm32-dsi.yaml | 150 ++++++++++++
+ .../devicetree/bindings/display/st,stm32-ltdc.txt | 144 ------------
+ .../devicetree/bindings/display/st,stm32-ltdc.yaml | 81 +++++++
+ .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 4 +-
+ Documentation/devicetree/bindings/eeprom/at24.txt | 90 +-------
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 188 +++++++++++++++
+ .../devicetree/bindings/example-schema.yaml | 81 ++++++-
+ .../intel,ixp4xx-network-processing-engine.yaml | 2 -
+ .../bindings/firmware/nvidia,tegra186-bpmp.txt | 2 +-
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 4 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 22 +-
+ .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +-
+ .../devicetree/bindings/gpu/samsung-g2d.txt | 27 ---
+ .../devicetree/bindings/gpu/samsung-g2d.yaml | 75 ++++++
+ .../devicetree/bindings/gpu/samsung-rotator.txt | 28 ---
+ .../devicetree/bindings/gpu/samsung-rotator.yaml | 48 ++++
+ .../devicetree/bindings/gpu/samsung-scaler.txt | 27 ---
+ .../devicetree/bindings/gpu/samsung-scaler.yaml | 81 +++++++
+ .../bindings/hwlock/st,stm32-hwspinlock.txt | 23 --
+ .../bindings/hwlock/st,stm32-hwspinlock.yaml | 50 ++++
+ .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 4 +-
+ .../devicetree/bindings/i2c/i2c-stm32.txt | 65 ------
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 4 +-
+ .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 141 +++++++++++
+ .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 3 -
+ .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 5 +-
+ .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 1 -
+ .../devicetree/bindings/iio/adc/avia-hx711.yaml | 1 -
+ .../bindings/iio/adc/samsung,exynos-adc.txt | 107 ---------
+ .../bindings/iio/adc/samsung,exynos-adc.yaml | 151 ++++++++++++
+ .../bindings/iio/chemical/plantower,pms7003.yaml | 1 -
+ .../devicetree/bindings/iio/pressure/bmp085.yaml | 2 -
+ .../bindings/iio/timer/stm32-lptimer-trigger.txt | 23 --
+ .../bindings/iio/timer/stm32-timer-trigger.txt | 25 --
+ .../devicetree/bindings/input/max77650-onkey.txt | 26 ---
+ .../devicetree/bindings/input/max77650-onkey.yaml | 35 +++
+ .../bindings/interconnect/qcom,qcs404.txt | 45 ----
+ .../bindings/interconnect/qcom,qcs404.yaml | 77 ++++++
+ .../allwinner,sun7i-a20-sc-nmi.yaml | 4 +-
+ .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 +
+ .../bindings/interrupt-controller/renesas,irqc.txt | 48 ----
+ .../interrupt-controller/renesas,irqc.yaml | 87 +++++++
+ .../interrupt-controller/st,stm32-exti.txt | 29 ---
+ .../interrupt-controller/st,stm32-exti.yaml | 98 ++++++++
+ .../devicetree/bindings/iommu/arm,smmu-v3.txt | 77 ------
+ .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 95 ++++++++
+ .../devicetree/bindings/iommu/arm,smmu.txt | 182 ---------------
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 230 ++++++++++++++++++
+ .../devicetree/bindings/iommu/samsung,sysmmu.txt | 67 ------
+ .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 108 +++++++++
+ .../devicetree/bindings/leds/leds-max77650.txt | 57 -----
+ .../devicetree/bindings/leds/leds-max77650.yaml | 51 ++++
+ .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 84 +++++++
+ .../devicetree/bindings/mailbox/stm32-ipcc.txt | 47 ----
+ .../bindings/media/allwinner,sun4i-a10-ir.yaml | 4 +-
+ .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 91 ++++++++
+ .../devicetree/bindings/media/meson-ao-cec.txt | 37 ---
+ Documentation/devicetree/bindings/media/rc.yaml | 6 +
+ .../devicetree/bindings/media/st,stm32-cec.txt | 19 --
+ .../devicetree/bindings/media/st,stm32-cec.yaml | 54 +++++
+ .../devicetree/bindings/media/st,stm32-dcmi.txt | 45 ----
+ .../devicetree/bindings/media/st,stm32-dcmi.yaml | 86 +++++++
+ .../bindings/memory-controllers/exynos-srom.txt | 79 -------
+ .../bindings/memory-controllers/exynos-srom.yaml | 128 ++++++++++
+ .../bindings/mfd/samsung,exynos5433-lpass.txt | 2 +-
+ .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 120 ++++++++++
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 162 +++++++++++++
+ .../devicetree/bindings/mfd/stm32-lptimer.txt | 48 ----
+ .../devicetree/bindings/mfd/stm32-timers.txt | 73 ------
+ Documentation/devicetree/bindings/mfd/syscon.txt | 32 ---
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 84 +++++++
+ .../devicetree/bindings/misc/allwinner,syscon.txt | 20 --
+ .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 6 +-
+ .../bindings/mtd/st,stm32-fmc2-nand.yaml | 98 ++++++++
+ .../devicetree/bindings/mtd/stm32-fmc2-nand.txt | 61 -----
+ .../bindings/net/allwinner,sun4i-a10-emac.yaml | 6 +-
+ .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 6 +-
+ .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 6 +-
+ .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 6 +-
+ .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 51 ++++
+ .../devicetree/bindings/net/can/sun4i_can.txt | 36 ---
+ .../devicetree/bindings/net/davinci-mdio.txt | 36 ---
+ .../devicetree/bindings/net/ti,davinci-mdio.yaml | 71 ++++++
+ .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 4 +-
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 +
+ .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 1 -
+ .../bindings/pinctrl/st,stm32-pinctrl.yaml | 7 +-
+ .../bindings/power/amlogic,meson-gx-pwrc.txt | 2 +-
+ .../devicetree/bindings/power/fsl,imx-gpc.txt | 2 +-
+ .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 2 +-
+ .../devicetree/bindings/power/pd-samsung.txt | 45 ----
+ .../devicetree/bindings/power/pd-samsung.yaml | 66 ++++++
+ .../devicetree/bindings/power/power-domain.yaml | 133 +++++++++++
+ .../devicetree/bindings/power/power_domain.txt | 95 +-------
+ .../bindings/power/renesas,sysc-rmobile.txt | 2 +-
+ .../bindings/power/reset/syscon-poweroff.txt | 30 ---
+ .../bindings/power/reset/syscon-poweroff.yaml | 60 +++++
+ .../bindings/power/reset/syscon-reboot.txt | 30 ---
+ .../bindings/power/reset/syscon-reboot.yaml | 60 +++++
+ .../bindings/power/supply/max77650-charger.txt | 28 ---
+ .../bindings/power/supply/max77650-charger.yaml | 34 +++
+ .../bindings/power/xlnx,zynqmp-genpd.txt | 2 +-
+ .../devicetree/bindings/pwm/atmel-hlcdc-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/atmel-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/brcm,kona-pwm.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/img-pwm.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/imx-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/imx-tpm-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/lpc1850-sct-pwm.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-bcm2835.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-berlin.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-hibvt.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-lp3943.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-mediatek.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-meson.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-rockchip.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-samsung.txt | 51 ----
+ .../devicetree/bindings/pwm/pwm-samsung.yaml | 109 +++++++++
+ .../devicetree/bindings/pwm/pwm-sifive.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/pwm-sprd.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-stm32-lp.txt | 30 ---
+ .../devicetree/bindings/pwm/pwm-stm32.txt | 38 ---
+ .../devicetree/bindings/pwm/pwm-tiecap.txt | 2 +-
+ .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/pwm-zx.txt | 2 +-
+ Documentation/devicetree/bindings/pwm/pwm.txt | 11 +-
+ Documentation/devicetree/bindings/pwm/pwm.yaml | 29 +++
+ .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 40 ----
+ .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 78 +++++++
+ .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 35 ---
+ .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 69 ++++++
+ .../devicetree/bindings/pwm/spear-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/st,stmpe-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/ti,twl-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/ti,twl-pwmled.txt | 2 +-
+ .../devicetree/bindings/pwm/vt8500-pwm.txt | 2 +-
+ .../bindings/regulator/fixed-regulator.yaml | 1 -
+ .../bindings/regulator/max77650-regulator.txt | 41 ----
+ .../bindings/regulator/max77650-regulator.yaml | 31 +++
+ .../bindings/remoteproc/st,stm32-rproc.yaml | 128 ++++++++++
+ .../devicetree/bindings/remoteproc/stm32-rproc.txt | 63 -----
+ .../bindings/rng/samsung,exynos4-rng.txt | 19 --
+ .../bindings/rng/samsung,exynos4-rng.yaml | 45 ++++
+ .../devicetree/bindings/rng/st,stm32-rng.txt | 25 --
+ .../devicetree/bindings/rng/st,stm32-rng.yaml | 48 ++++
+ .../devicetree/bindings/rtc/renesas,sh-rtc.yaml | 70 ++++++
+ Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 ---
+ Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 31 ---
+ Documentation/devicetree/bindings/rtc/s3c-rtc.yaml | 89 +++++++
+ .../devicetree/bindings/serial/samsung_uart.txt | 58 -----
+ .../devicetree/bindings/serial/samsung_uart.yaml | 118 ++++++++++
+ .../devicetree/bindings/serial/sprd-uart.txt | 32 ---
+ .../devicetree/bindings/serial/sprd-uart.yaml | 72 ++++++
+ .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 51 ++++
+ .../bindings/serio/allwinner,sun4i-ps2.txt | 22 --
+ .../bindings/soc/amlogic/amlogic,canvas.txt | 33 ---
+ .../bindings/soc/amlogic/amlogic,canvas.yaml | 49 ++++
+ .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 2 +-
+ .../devicetree/bindings/soc/mediatek/scpsys.txt | 2 +-
+ .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 2 +-
+ .../devicetree/bindings/sram/milbeaut-smp-sram.txt | 24 --
+ .../devicetree/bindings/sram/renesas,smp-sram.txt | 27 ---
+ .../devicetree/bindings/sram/rockchip-smp-sram.txt | 30 ---
+ .../devicetree/bindings/sram/samsung-sram.txt | 38 ---
+ Documentation/devicetree/bindings/sram/sram.txt | 80 -------
+ Documentation/devicetree/bindings/sram/sram.yaml | 257 +++++++++++++++++++++
+ .../devicetree/bindings/submitting-patches.txt | 21 +-
+ .../bindings/thermal/st,stm32-thermal.yaml | 79 +++++++
+ .../devicetree/bindings/thermal/stm32-thermal.txt | 61 -----
+ .../devicetree/bindings/timer/ingenic,tcu.txt | 2 +-
+ .../bindings/timer/samsung,exynos4210-mct.txt | 88 -------
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 124 ++++++++++
+ .../devicetree/bindings/timer/st,stm32-timer.txt | 22 --
+ .../devicetree/bindings/timer/st,stm32-timer.yaml | 47 ++++
+ .../bindings/usb/allwinner,sun4i-a10-musb.txt | 28 ---
+ .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 100 ++++++++
+ .../devicetree/bindings/usb/amlogic,dwc3.txt | 88 -------
+ .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 127 ++++++++++
+ .../devicetree/bindings/usb/generic-ehci.yaml | 5 +
+ .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 3 +
+ .../devicetree/bindings/watchdog/renesas,wdt.txt | 1 +
+ .../devicetree/bindings/watchdog/samsung-wdt.txt | 35 ---
+ .../devicetree/bindings/watchdog/samsung-wdt.yaml | 74 ++++++
+ Documentation/devicetree/writing-schema.rst | 9 +-
+ MAINTAINERS | 17 +-
+ drivers/of/address.c | 103 ++++-----
+ drivers/of/base.c | 32 ++-
+ drivers/of/fdt.c | 4 +-
+ drivers/of/of_private.h | 14 ++
+ drivers/of/property.c | 8 +-
+ drivers/of/unittest-data/testcases.dts | 1 +
+ drivers/of/unittest-data/tests-address.dtsi | 48 ++++
+ drivers/of/unittest.c | 92 ++++++++
+ include/linux/libfdt_env.h | 2 +-
+ include/linux/of_address.h | 21 +-
+ scripts/checkpatch.pl | 8 +
+ scripts/dtc/Makefile | 4 +-
+ scripts/dtc/dtx_diff | 12 +-
+ 250 files changed, 6283 insertions(+), 3744 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/smp-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-secure-firmware.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/sprd.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/sprd.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/sunxi/smp-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.yaml
+ delete mode 100644 Documentation/devicetree/bindings/counter/stm32-lptimer-cnt.txt
+ delete mode 100644 Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt
+ delete mode 100644 Documentation/devicetree/bindings/crypto/samsung-slimsss.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml
+ delete mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.yaml
+ delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-crc.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-crc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-cryp.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-cryp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/st,stm32-dsi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
+ create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
+ create mode 100644 Documentation/devicetree/bindings/eeprom/at24.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.yaml
+ delete mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt
+ create mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-stm32.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-lptimer-trigger.txt
+ delete mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt
+ create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt
+ create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.txt
+ create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+ create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.yaml
+ create mode 100644 Documentation/devicetree/bindings/mailbox/st,stm32-ipcc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt
+ create mode 100644 Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/meson-ao-cec.txt
+ delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.txt
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/stm32-lptimer.txt
+ delete mode 100644 Documentation/devicetree/bindings/mfd/stm32-timers.txt
+ delete mode 100644 Documentation/devicetree/bindings/mfd/syscon.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/syscon.yaml
+ delete mode 100644 Documentation/devicetree/bindings/misc/allwinner,syscon.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/pd-samsung.txt
+ create mode 100644 Documentation/devicetree/bindings/power/pd-samsung.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/power-domain.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-poweroff.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32-lp.txt
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt
+ delete mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos4-rng.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/renesas,sh-rtc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt
+ delete mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/sprd-uart.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/sprd-uart.yaml
+ create mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt
+ delete mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sram/milbeaut-smp-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/sram/samsung-sram.txt
+ delete mode 100644 Documentation/devicetree/bindings/sram/sram.txt
+ create mode 100644 Documentation/devicetree/bindings/sram/sram.yaml
+ create mode 100644 Documentation/devicetree/bindings/thermal/st,stm32-thermal.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/stm32-thermal.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/st,stm32-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/st,stm32-timer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
+ create mode 100644 drivers/of/unittest-data/tests-address.dtsi
+Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (e2ce328b282d Merge remote-tracking branch 'spi/topic/ptp' into spi-next)
+$ git merge spi/for-next
+Auto-merging sound/soc/pxa/pxa-ssp.c
+Removing Documentation/devicetree/bindings/spi/spi-stm32-qspi.txt
+Removing Documentation/devicetree/bindings/spi/spi-sifive.txt
+Removing Documentation/devicetree/bindings/spi/sh-msiof.txt
+Removing Documentation/devicetree/bindings/spi/sh-hspi.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/renesas,hspi.yaml | 57 ++++++
+ .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 ++
+ .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 159 ++++++++++++++++
+ Documentation/devicetree/bindings/spi/sh-hspi.txt | 26 ---
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 105 -----------
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 3 +-
+ .../devicetree/bindings/spi/spi-sifive.txt | 37 ----
+ .../devicetree/bindings/spi/spi-sifive.yaml | 86 +++++++++
+ .../devicetree/bindings/spi/spi-stm32-qspi.txt | 47 -----
+ .../devicetree/bindings/spi/spi-xilinx.txt | 4 +-
+ .../devicetree/bindings/spi/st,stm32-qspi.yaml | 83 ++++++++
+ arch/arm/plat-pxa/ssp.c | 4 +-
+ drivers/iio/imu/adis.c | 24 +--
+ drivers/spi/Kconfig | 19 +-
+ drivers/spi/spi-at91-usart.c | 4 +-
+ drivers/spi/spi-atmel.c | 209 ++++++++++++---------
+ drivers/spi/spi-axi-spi-engine.c | 16 +-
+ drivers/spi/spi-bcm-qspi.c | 7 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 3 +-
+ drivers/spi/spi-bcm63xx.c | 2 +-
+ drivers/spi/spi-cavium.c | 3 +-
+ drivers/spi/spi-dw-mmio.c | 1 +
+ drivers/spi/spi-dw-pci.c | 24 ++-
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-dw.h | 1 -
+ drivers/spi/spi-falcon.c | 2 +-
+ drivers/spi/spi-fsl-dspi.c | 38 +++-
+ drivers/spi/spi-fsl-espi.c | 19 +-
+ drivers/spi/spi-fsl-lpspi.c | 6 +-
+ drivers/spi/spi-fsl-qspi.c | 17 ++
+ drivers/spi/spi-fsl-spi.c | 3 +-
+ drivers/spi/spi-gpio.c | 5 +-
+ drivers/spi/spi-img-spfi.c | 2 +
+ drivers/spi/spi-imx.c | 4 +-
+ drivers/spi/spi-lantiq-ssc.c | 10 +-
+ drivers/spi/spi-loopback-test.c | 12 +-
+ drivers/spi/spi-mem.c | 2 +-
+ drivers/spi/spi-mpc512x-psc.c | 3 +-
+ drivers/spi/spi-mpc52xx-psc.c | 3 +-
+ drivers/spi/spi-mt65xx.c | 23 ++-
+ drivers/spi/spi-mxic.c | 2 +-
+ drivers/spi/spi-npcm-pspi.c | 3 +-
+ drivers/spi/spi-nxp-fspi.c | 2 +-
+ drivers/spi/spi-omap-100k.c | 7 +-
+ drivers/spi/spi-omap2-mcspi.c | 105 +++++------
+ drivers/spi/spi-orion.c | 6 +-
+ drivers/spi/spi-pic32.c | 46 +++--
+ drivers/spi/spi-pl022.c | 29 ++-
+ drivers/spi/spi-pxa2xx.c | 76 ++++----
+ drivers/spi/spi-qup.c | 4 +-
+ drivers/spi/spi-s3c64xx.c | 6 +-
+ drivers/spi/spi-sc18is602.c | 3 +-
+ drivers/spi/spi-sh-hspi.c | 3 +-
+ drivers/spi/spi-slave-mt27xx.c | 12 +-
+ drivers/spi/spi-sprd-adi.c | 8 +
+ drivers/spi/spi-sprd.c | 15 +-
+ drivers/spi/spi-st-ssc4.c | 3 +
+ drivers/spi/spi-tegra114.c | 42 +++--
+ drivers/spi/spi-tegra20-sflash.c | 5 +-
+ drivers/spi/spi-tegra20-slink.c | 8 +-
+ drivers/spi/spi-topcliff-pch.c | 7 +-
+ drivers/spi/spi-txx9.c | 78 ++++++--
+ drivers/spi/spi-xcomm.c | 3 +-
+ drivers/spi/spi-xilinx.c | 7 +-
+ drivers/spi/spi-xtensa-xtfpga.c | 10 +-
+ drivers/spi/spi-zynq-qspi.c | 84 +++++----
+ drivers/spi/spi.c | 186 +++++++++++++++---
+ drivers/spi/spidev.c | 6 +-
+ include/linux/platform_data/spi-mt65xx.h | 1 -
+ include/linux/pxa2xx_ssp.h | 2 +-
+ include/linux/spi/spi.h | 71 +++++--
+ sound/soc/pxa/mmp-sspa.c | 2 +-
+ sound/soc/pxa/pxa-ssp.c | 10 +-
+ 73 files changed, 1226 insertions(+), 711 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/renesas,hspi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/sh-hspi.txt
+ delete mode 100644 Documentation/devicetree/bindings/spi/sh-msiof.txt
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sifive.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-stm32-qspi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/st,stm32-qspi.yaml
+Merging tip/auto-latest (e16a444976e9 Merge branch 'locking/core')
+$ git merge tip/auto-latest
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging net/sched/act_vlan.c
+Auto-merging net/sched/act_tunnel_key.c
+Auto-merging net/sched/act_skbedit.c
+Auto-merging net/sched/act_sample.c
+Auto-merging net/sched/act_police.c
+Auto-merging net/sched/act_mpls.c
+Auto-merging net/sched/act_mirred.c
+Auto-merging net/sched/act_ife.c
+Auto-merging net/sched/act_ctinfo.c
+Auto-merging net/sched/act_ct.c
+Auto-merging net/sched/act_csum.c
+Auto-merging net/sched/act_api.c
+Auto-merging net/netfilter/nf_tables_api.c
+Auto-merging net/core/sock.c
+Auto-merging net/core/dev.c
+Auto-merging lib/ubsan.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging kernel/sched/idle.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/module.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/bpf/stackmap.c
+Auto-merging include/trace/events/rpcrdma.h
+CONFLICT (content): Merge conflict in include/trace/events/rpcrdma.h
+Auto-merging include/net/sock.h
+Auto-merging include/linux/security.h
+CONFLICT (content): Merge conflict in include/linux/security.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/jbd2.h
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/efi.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/jbd2/transaction.c
+CONFLICT (content): Merge conflict in fs/jbd2/transaction.c
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
+Auto-merging drivers/gpu/drm/drm_connector.c
+Auto-merging drivers/firmware/efi/libstub/random.c
+Auto-merging drivers/cpufreq/cpufreq.c
+Auto-merging arch/xtensa/kernel/vmlinux.lds.S
+CONFLICT (content): Merge conflict in arch/xtensa/kernel/vmlinux.lds.S
+Removing arch/x86/mm/pat_rbtree.c
+Auto-merging arch/x86/mm/Makefile
+Auto-merging arch/x86/kernel/umip.c
+Removing arch/x86/kernel/tce_64.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/pci-dma.c
+Removing arch/x86/kernel/pci-calgary_64.c
+Auto-merging arch/x86/kernel/kprobes/opt.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/opt.c
+Auto-merging arch/x86/kernel/jump_label.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/jump_label.c
+Auto-merging arch/x86/kernel/e820.c
+Auto-merging arch/x86/kernel/apic/apic.c
+Auto-merging arch/x86/kernel/alternative.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/alternative.c
+Auto-merging arch/x86/include/asm/text-patching.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/text-patching.h
+Removing arch/x86/include/asm/tce.h
+Removing arch/x86/include/asm/rio.h
+Removing arch/x86/include/asm/pci_64.h
+Removing arch/x86/include/asm/calgary.h
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/boot/compressed/kaslr.c
+Auto-merging arch/x86/boot/compressed/eboot.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/microblaze/kernel/vmlinux.lds.S
+Auto-merging arch/arm64/kernel/vmlinux.lds.S
+Auto-merging arch/arm/kernel/Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/index.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Removing Documentation/RCU/Design/Requirements/Requirements.html
+Removing Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html
+Removing Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html
+Removing Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
+Removing Documentation/RCU/Design/Data-Structures/Data-Structures.html
+Auto-merging .mailmap
+Resolved 'arch/x86/include/asm/text-patching.h' using previous resolution.
+Resolved 'arch/x86/kernel/alternative.c' using previous resolution.
+Resolved 'arch/x86/kernel/jump_label.c' using previous resolution.
+Resolved 'arch/x86/kernel/kprobes/opt.c' using previous resolution.
+Resolved 'arch/xtensa/kernel/vmlinux.lds.S' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/gem/i915_gem_shrinker.c' using previous resolution.
+Resolved 'fs/jbd2/transaction.c' using previous resolution.
+Resolved 'include/linux/security.h' using previous resolution.
+Resolved 'include/trace/events/rpcrdma.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9c76b9c100da] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 1 +
+ .../Design/Data-Structures/Data-Structures.html | 1391 ---
+ .../RCU/Design/Data-Structures/Data-Structures.rst | 1163 ++
+ .../Expedited-Grace-Periods.html | 668 -
+ .../Expedited-Grace-Periods.rst | 521 +
+ .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 -
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 704 --
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 624 +
+ .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 2 +-
+ .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 2 +-
+ .../RCU/Design/Requirements/Requirements.html | 3401 ------
+ .../RCU/Design/Requirements/Requirements.rst | 2704 +++++
+ Documentation/RCU/index.rst | 7 +-
+ Documentation/RCU/lockdep.txt | 18 +-
+ Documentation/RCU/whatisRCU.txt | 14 +-
+ Documentation/admin-guide/hw-vuln/mds.rst | 7 +-
+ .../admin-guide/hw-vuln/tsx_async_abort.rst | 5 +-
+ Documentation/admin-guide/kernel-parameters.txt | 11 +
+ Documentation/asm-annotations.rst | 216 +
+ Documentation/index.rst | 8 +
+ Documentation/x86/boot.rst | 174 +
+ MAINTAINERS | 25 +-
+ arch/alpha/kernel/vmlinux.lds.S | 18 +-
+ arch/arc/kernel/vmlinux.lds.S | 6 +-
+ arch/arm/kernel/Makefile | 4 +-
+ arch/arm/kernel/ftrace.c | 10 +-
+ arch/arm/kernel/vmlinux-xip.lds.S | 4 +-
+ arch/arm/kernel/vmlinux.lds.S | 4 +-
+ arch/arm64/kernel/vmlinux.lds.S | 10 +-
+ arch/c6x/kernel/vmlinux.lds.S | 8 +-
+ arch/csky/kernel/vmlinux.lds.S | 5 +-
+ arch/h8300/kernel/vmlinux.lds.S | 9 +-
+ arch/hexagon/kernel/vmlinux.lds.S | 5 +-
+ arch/ia64/kernel/time.c | 4 +-
+ arch/ia64/kernel/vmlinux.lds.S | 20 +-
+ arch/m68k/kernel/vmlinux-nommu.lds | 4 +-
+ arch/m68k/kernel/vmlinux-std.lds | 4 +-
+ arch/m68k/kernel/vmlinux-sun3.lds | 4 +-
+ arch/microblaze/kernel/vmlinux.lds.S | 8 +-
+ arch/mips/kernel/vmlinux.lds.S | 15 +-
+ arch/nds32/kernel/ftrace.c | 12 -
+ arch/nds32/kernel/vmlinux.lds.S | 5 +-
+ arch/nios2/kernel/vmlinux.lds.S | 5 +-
+ arch/openrisc/kernel/vmlinux.lds.S | 7 +-
+ arch/parisc/kernel/vmlinux.lds.S | 11 +-
+ arch/powerpc/kernel/time.c | 6 +-
+ arch/powerpc/kernel/vmlinux.lds.S | 37 +-
+ arch/powerpc/perf/core-book3s.c | 18 +-
+ arch/riscv/kernel/vmlinux.lds.S | 5 +-
+ arch/s390/kernel/vmlinux.lds.S | 12 +-
+ arch/s390/kernel/vtime.c | 4 +-
+ arch/sh/kernel/vmlinux.lds.S | 3 +-
+ arch/sparc/kernel/vmlinux.lds.S | 3 +-
+ arch/um/include/asm/common.lds.S | 3 +-
+ arch/unicore32/kernel/vmlinux.lds.S | 5 +-
+ arch/x86/Kconfig | 71 +-
+ arch/x86/Kconfig.cpu | 25 +-
+ arch/x86/Makefile_32.cpu | 1 +
+ arch/x86/boot/Makefile | 3 +-
+ arch/x86/boot/compressed/Makefile | 5 +-
+ arch/x86/boot/compressed/eboot.c | 3 +
+ arch/x86/boot/compressed/efi_stub_32.S | 4 +-
+ arch/x86/boot/compressed/efi_thunk_64.S | 33 +-
+ arch/x86/boot/compressed/head_32.S | 15 +-
+ arch/x86/boot/compressed/head_64.S | 63 +-
+ arch/x86/boot/compressed/kaslr.c | 12 +
+ arch/x86/boot/compressed/kernel_info.S | 22 +
+ arch/x86/boot/compressed/mem_encrypt.S | 11 +-
+ arch/x86/boot/copy.S | 16 +-
+ arch/x86/boot/header.S | 3 +-
+ arch/x86/boot/pmjump.S | 10 +-
+ arch/x86/boot/tools/build.c | 5 +
+ arch/x86/configs/x86_64_defconfig | 1 -
+ arch/x86/crypto/aegis128-aesni-asm.S | 36 +-
+ arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 12 +-
+ arch/x86/crypto/aesni-intel_asm.S | 114 +-
+ arch/x86/crypto/aesni-intel_avx-x86_64.S | 32 +-
+ arch/x86/crypto/blowfish-x86_64-asm_64.S | 16 +-
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 44 +-
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 44 +-
+ arch/x86/crypto/camellia-x86_64-asm_64.S | 16 +-
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 24 +-
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 32 +-
+ arch/x86/crypto/chacha-avx2-x86_64.S | 12 +-
+ arch/x86/crypto/chacha-avx512vl-x86_64.S | 12 +-
+ arch/x86/crypto/chacha-ssse3-x86_64.S | 16 +-
+ arch/x86/crypto/crc32-pclmul_asm.S | 4 +-
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 4 +-
+ arch/x86/crypto/crct10dif-pcl-asm_64.S | 4 +-
+ arch/x86/crypto/des3_ede-asm_64.S | 8 +-
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 12 +-
+ arch/x86/crypto/nh-avx2-x86_64.S | 4 +-
+ arch/x86/crypto/nh-sse2-x86_64.S | 4 +-
+ arch/x86/crypto/poly1305-avx2-x86_64.S | 4 +-
+ arch/x86/crypto/poly1305-sse2-x86_64.S | 8 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 32 +-
+ arch/x86/crypto/serpent-avx2-asm_64.S | 32 +-
+ arch/x86/crypto/serpent-sse2-i586-asm_32.S | 8 +-
+ arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 8 +-
+ arch/x86/crypto/sha1_avx2_x86_64_asm.S | 4 +-
+ arch/x86/crypto/sha1_ni_asm.S | 4 +-
+ arch/x86/crypto/sha1_ssse3_asm.S | 4 +-
+ arch/x86/crypto/sha256-avx-asm.S | 4 +-
+ arch/x86/crypto/sha256-avx2-asm.S | 4 +-
+ arch/x86/crypto/sha256-ssse3-asm.S | 4 +-
+ arch/x86/crypto/sha256_ni_asm.S | 4 +-
+ arch/x86/crypto/sha512-avx-asm.S | 4 +-
+ arch/x86/crypto/sha512-avx2-asm.S | 4 +-
+ arch/x86/crypto/sha512-ssse3-asm.S | 4 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 32 +-
+ arch/x86/crypto/twofish-i586-asm_32.S | 8 +-
+ arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 8 +-
+ arch/x86/crypto/twofish-x86_64-asm_64.S | 8 +-
+ arch/x86/entry/calling.h | 2 +-
+ arch/x86/entry/common.c | 4 +
+ arch/x86/entry/entry_32.S | 194 +-
+ arch/x86/entry/entry_64.S | 112 +-
+ arch/x86/entry/entry_64_compat.S | 16 +-
+ arch/x86/entry/syscall_32.c | 8 +-
+ arch/x86/entry/syscall_64.c | 14 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 8 +-
+ arch/x86/entry/thunk_32.S | 4 +-
+ arch/x86/entry/thunk_64.S | 7 +-
+ arch/x86/entry/vdso/Makefile | 2 -
+ arch/x86/entry/vdso/vdso32/system_call.S | 2 +-
+ arch/x86/events/amd/core.c | 13 +-
+ arch/x86/events/core.c | 8 +
+ arch/x86/events/intel/bts.c | 8 +-
+ arch/x86/events/intel/core.c | 12 +-
+ arch/x86/events/intel/lbr.c | 23 +
+ arch/x86/events/intel/p4.c | 5 +-
+ arch/x86/events/intel/pt.c | 203 +-
+ arch/x86/events/intel/pt.h | 12 +-
+ arch/x86/events/perf_event.h | 11 +
+ arch/x86/hyperv/hv_apic.c | 16 +-
+ arch/x86/hyperv/hv_init.c | 6 +
+ arch/x86/ia32/ia32_signal.c | 5 +-
+ arch/x86/include/asm/asm.h | 8 +-
+ arch/x86/include/asm/calgary.h | 57 -
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/include/asm/crash.h | 9 +-
+ arch/x86/include/asm/disabled-features.h | 2 +-
+ arch/x86/include/asm/emulate_prefix.h | 14 +
+ arch/x86/include/asm/fixmap.h | 2 +-
+ arch/x86/include/asm/ftrace.h | 2 -
+ arch/x86/include/asm/hyperv-tlfs.h | 5 +
+ arch/x86/include/asm/insn.h | 6 +
+ arch/x86/include/asm/io_bitmap.h | 29 +
+ arch/x86/include/asm/kexec.h | 10 -
+ arch/x86/include/asm/kprobes.h | 14 +-
+ arch/x86/include/asm/linkage.h | 4 -
+ arch/x86/include/asm/module.h | 2 +
+ arch/x86/include/asm/mtrr.h | 2 +-
+ arch/x86/include/asm/paravirt.h | 4 -
+ arch/x86/include/asm/paravirt_types.h | 2 -
+ arch/x86/include/asm/pci.h | 7 -
+ arch/x86/include/asm/pci_64.h | 28 -
+ arch/x86/include/asm/pgtable-3level.h | 46 +-
+ arch/x86/include/asm/pgtable_32_types.h | 2 +-
+ arch/x86/include/asm/processor.h | 125 +-
+ arch/x86/include/asm/ptrace.h | 6 +
+ arch/x86/include/asm/purgatory.h | 10 -
+ arch/x86/include/asm/rio.h | 64 -
+ arch/x86/include/asm/sections.h | 1 -
+ arch/x86/include/asm/segment.h | 12 +
+ arch/x86/include/asm/set_memory.h | 2 -
+ arch/x86/include/asm/switch_to.h | 10 +
+ arch/x86/include/asm/syscall_wrapper.h | 76 +-
+ arch/x86/include/asm/tce.h | 35 -
+ arch/x86/include/asm/text-patching.h | 86 +-
+ arch/x86/include/asm/thread_info.h | 14 +-
+ arch/x86/include/asm/trace/hyperv.h | 15 +
+ arch/x86/include/asm/umip.h | 4 +-
+ arch/x86/include/asm/uv/bios.h | 2 +-
+ arch/x86/include/asm/uv/uv.h | 16 +-
+ arch/x86/include/asm/uv/uv_hub.h | 61 +-
+ arch/x86/include/asm/xen/hypervisor.h | 2 -
+ arch/x86/include/asm/xen/interface.h | 11 +-
+ arch/x86/include/uapi/asm/bootparam.h | 41 +-
+ arch/x86/kernel/Makefile | 3 +-
+ arch/x86/kernel/acpi/wakeup_32.S | 9 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 10 +-
+ arch/x86/kernel/alternative.c | 122 +-
+ arch/x86/kernel/apic/apic.c | 2 +-
+ arch/x86/kernel/apic/io_apic.c | 25 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 184 +-
+ arch/x86/kernel/cpu/bugs.c | 30 +-
+ arch/x86/kernel/cpu/common.c | 193 +-
+ arch/x86/kernel/cpu/intel.c | 8 +-
+ arch/x86/kernel/cpu/mce/amd.c | 2 +-
+ arch/x86/kernel/cpu/mce/core.c | 93 +-
+ arch/x86/kernel/cpu/mce/intel.c | 11 +-
+ arch/x86/kernel/cpu/mce/internal.h | 6 +
+ arch/x86/kernel/cpu/mce/therm_throt.c | 251 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 4 +-
+ arch/x86/kernel/cpu/microcode/core.c | 36 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 5 +-
+ arch/x86/kernel/cpu/mshyperv.c | 7 +-
+ arch/x86/kernel/cpu/rdrand.c | 22 +-
+ arch/x86/kernel/crash.c | 128 +-
+ arch/x86/kernel/doublefault.c | 2 +-
+ arch/x86/kernel/e820.c | 11 +
+ arch/x86/kernel/fpu/xstate.c | 22 +-
+ arch/x86/kernel/ftrace.c | 688 +-
+ arch/x86/kernel/ftrace_32.S | 23 +-
+ arch/x86/kernel/ftrace_64.S | 47 +-
+ arch/x86/kernel/head_32.S | 62 +-
+ arch/x86/kernel/head_64.S | 113 +-
+ arch/x86/kernel/ioport.c | 209 +-
+ arch/x86/kernel/irqflags.S | 8 +-
+ arch/x86/kernel/jailhouse.c | 136 +-
+ arch/x86/kernel/jump_label.c | 116 +-
+ arch/x86/kernel/kdebugfs.c | 21 +-
+ arch/x86/kernel/kprobes/core.c | 24 +-
+ arch/x86/kernel/kprobes/opt.c | 67 +-
+ arch/x86/kernel/ksysfs.c | 31 +-
+ arch/x86/kernel/machine_kexec_64.c | 47 -
+ arch/x86/kernel/paravirt.c | 2 -
+ arch/x86/kernel/pci-calgary_64.c | 1586 ---
+ arch/x86/kernel/pci-dma.c | 6 -
+ arch/x86/kernel/process.c | 206 +-
+ arch/x86/kernel/process_32.c | 77 -
+ arch/x86/kernel/process_64.c | 86 -
+ arch/x86/kernel/ptrace.c | 12 +-
+ arch/x86/kernel/relocate_kernel_32.S | 13 +-
+ arch/x86/kernel/relocate_kernel_64.S | 13 +-
+ arch/x86/kernel/setup.c | 187 +-
+ arch/x86/kernel/tce_64.c | 177 -
+ arch/x86/kernel/traps.c | 14 -
+ arch/x86/kernel/umip.c | 12 +-
+ arch/x86/kernel/uprobes.c | 2 +-
+ arch/x86/kernel/verify_cpu.S | 4 +-
+ arch/x86/kernel/vmlinux.lds.S | 16 +-
+ arch/x86/kernel/x86_init.c | 24 +-
+ arch/x86/kvm/pmu.c | 4 +-
+ arch/x86/kvm/vmx/vmenter.S | 12 +-
+ arch/x86/kvm/vmx/vmx.c | 8 -
+ arch/x86/kvm/x86.c | 4 +-
+ arch/x86/lib/atomic64_386_32.S | 4 +-
+ arch/x86/lib/atomic64_cx8_32.S | 32 +-
+ arch/x86/lib/checksum_32.S | 16 +-
+ arch/x86/lib/clear_page_64.S | 12 +-
+ arch/x86/lib/cmpxchg16b_emu.S | 4 +-
+ arch/x86/lib/cmpxchg8b_emu.S | 4 +-
+ arch/x86/lib/copy_page_64.S | 8 +-
+ arch/x86/lib/copy_user_64.S | 21 +-
+ arch/x86/lib/csum-copy_64.S | 4 +-
+ arch/x86/lib/getuser.S | 22 +-
+ arch/x86/lib/hweight.S | 8 +-
+ arch/x86/lib/insn.c | 34 +
+ arch/x86/lib/iomap_copy_64.S | 4 +-
+ arch/x86/lib/memcpy_64.S | 20 +-
+ arch/x86/lib/memmove_64.S | 8 +-
+ arch/x86/lib/memset_64.S | 16 +-
+ arch/x86/lib/msr-reg.S | 8 +-
+ arch/x86/lib/putuser.S | 19 +-
+ arch/x86/lib/retpoline.S | 4 +-
+ arch/x86/lib/x86-opcode-map.txt | 18 +-
+ arch/x86/math-emu/div_Xsig.S | 4 +-
+ arch/x86/math-emu/div_small.S | 4 +-
+ arch/x86/math-emu/fpu_system.h | 6 +-
+ arch/x86/math-emu/mul_Xsig.S | 12 +-
+ arch/x86/math-emu/polynom_Xsig.S | 4 +-
+ arch/x86/math-emu/reg_ld_str.c | 6 +-
+ arch/x86/math-emu/reg_norm.S | 8 +-
+ arch/x86/math-emu/reg_round.S | 4 +-
+ arch/x86/math-emu/reg_u_add.S | 4 +-
+ arch/x86/math-emu/reg_u_div.S | 4 +-
+ arch/x86/math-emu/reg_u_mul.S | 4 +-
+ arch/x86/math-emu/reg_u_sub.S | 4 +-
+ arch/x86/math-emu/round_Xsig.S | 8 +-
+ arch/x86/math-emu/shr_Xsig.S | 4 +-
+ arch/x86/math-emu/wm_shrx.S | 8 +-
+ arch/x86/math-emu/wm_sqrt.S | 4 +-
+ arch/x86/mm/Makefile | 2 +-
+ arch/x86/mm/cpu_entry_area.c | 8 +
+ arch/x86/mm/init.c | 8 +-
+ arch/x86/mm/init_32.c | 28 -
+ arch/x86/mm/init_64.c | 48 +-
+ arch/x86/mm/ioremap.c | 11 +
+ arch/x86/mm/mem_encrypt_boot.S | 8 +-
+ arch/x86/mm/numa.c | 2 +-
+ arch/x86/mm/pat.c | 155 +-
+ arch/x86/mm/pat_internal.h | 20 +-
+ arch/x86/mm/pat_interval.c | 195 +
+ arch/x86/mm/pat_rbtree.c | 268 -
+ arch/x86/mm/pgtable.c | 4 +-
+ arch/x86/mm/pti.c | 2 +-
+ arch/x86/platform/efi/efi_stub_32.S | 4 +-
+ arch/x86/platform/efi/efi_stub_64.S | 4 +-
+ arch/x86/platform/efi/efi_thunk_64.S | 16 +-
+ arch/x86/platform/olpc/xo1-wakeup.S | 3 +-
+ arch/x86/platform/pvh/head.S | 18 +-
+ arch/x86/platform/uv/bios_uv.c | 9 +-
+ arch/x86/power/hibernate_asm_32.S | 14 +-
+ arch/x86/power/hibernate_asm_64.S | 14 +-
+ arch/x86/purgatory/entry64.S | 24 +-
+ arch/x86/purgatory/purgatory.c | 19 -
+ arch/x86/purgatory/setup-x86_64.S | 14 +-
+ arch/x86/purgatory/stack.S | 7 +-
+ arch/x86/realmode/init.c | 2 +
+ arch/x86/realmode/rm/header.S | 8 +-
+ arch/x86/realmode/rm/realmode.lds.S | 1 +
+ arch/x86/realmode/rm/reboot.S | 13 +-
+ arch/x86/realmode/rm/stack.S | 14 +-
+ arch/x86/realmode/rm/trampoline_32.S | 16 +-
+ arch/x86/realmode/rm/trampoline_64.S | 29 +-
+ arch/x86/realmode/rm/trampoline_common.S | 2 +-
+ arch/x86/realmode/rm/wakeup_asm.S | 17 +-
+ arch/x86/realmode/rmpiggy.S | 10 +-
+ arch/x86/tools/gen-insn-attr-x86.awk | 4 +-
+ arch/x86/um/vdso/vdso.S | 6 +-
+ arch/x86/xen/enlighten_pv.c | 10 -
+ arch/x86/xen/xen-asm.S | 28 +-
+ arch/x86/xen/xen-asm_32.S | 81 +-
+ arch/x86/xen/xen-asm_64.S | 34 +-
+ arch/x86/xen/xen-head.S | 8 +-
+ arch/xtensa/kernel/vmlinux.lds.S | 8 +-
+ drivers/clocksource/Kconfig | 1 +
+ drivers/clocksource/asm9260_timer.c | 4 +
+ drivers/clocksource/hyperv_timer.c | 154 +-
+ drivers/clocksource/renesas-ostm.c | 189 +-
+ drivers/clocksource/timer-of.c | 6 +-
+ drivers/cpufreq/cpufreq.c | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 5 +-
+ drivers/firmware/efi/libstub/arm-stub.c | 2 +
+ drivers/firmware/efi/libstub/efistub.h | 2 -
+ drivers/firmware/efi/libstub/random.c | 23 +-
+ drivers/gpu/drm/drm_connector.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/i915_request.c | 2 +-
+ drivers/hv/hv.c | 4 +-
+ drivers/hv/vmbus_drv.c | 30 +-
+ drivers/infiniband/hw/hfi1/trace_tid.h | 8 +-
+ drivers/infiniband/hw/hfi1/trace_tx.h | 2 +-
+ drivers/leds/trigger/ledtrig-activity.c | 2 +-
+ drivers/lightnvm/pblk-trace.h | 8 +-
+ drivers/net/fjes/fjes_trace.h | 2 +-
+ drivers/net/wireless/ath/ath10k/trace.h | 6 +-
+ drivers/scsi/scsi.c | 4 +-
+ drivers/scsi/scsi_sysfs.c | 8 +-
+ drivers/tty/tty_ldsem.c | 8 +-
+ fs/afs/vl_list.c | 4 +-
+ fs/dcache.c | 2 +-
+ fs/exec.c | 4 +-
+ fs/jbd2/transaction.c | 2 +-
+ fs/kernfs/dir.c | 4 +-
+ fs/ocfs2/dlmglue.c | 2 +-
+ fs/proc/array.c | 2 +-
+ fs/proc/stat.c | 4 +-
+ fs/xfs/scrub/trace.h | 6 +-
+ fs/xfs/xfs_trace.h | 4 +-
+ include/asm-generic/vmlinux.lds.h | 53 +-
+ include/clocksource/hyperv_timer.h | 7 +-
+ include/linux/compat.h | 2 -
+ include/linux/context_tracking.h | 30 +-
+ include/linux/context_tracking_state.h | 21 +-
+ include/linux/cpuhotplug.h | 1 +
+ include/linux/efi.h | 2 +
+ include/linux/futex.h | 40 +-
+ include/linux/hrtimer.h | 14 +-
+ include/linux/interrupt.h | 3 +-
+ include/linux/irq_work.h | 10 +-
+ include/linux/jbd2.h | 2 +-
+ include/linux/kernel_stat.h | 11 +
+ include/linux/linkage.h | 249 +-
+ include/linux/lockdep.h | 21 +-
+ include/linux/lsm_hooks.h | 15 +
+ include/linux/module.h | 4 -
+ include/linux/percpu-rwsem.h | 4 +-
+ include/linux/perf_event.h | 64 +-
+ include/linux/rculist_bl.h | 28 -
+ include/linux/rcupdate.h | 20 +-
+ include/linux/rcutiny.h | 1 +
+ include/linux/rcutree.h | 1 +
+ include/linux/rwlock_api_smp.h | 16 +-
+ include/linux/sched.h | 14 +-
+ include/linux/sched/mm.h | 6 +-
+ include/linux/security.h | 38 +
+ include/linux/seqlock.h | 4 +-
+ include/linux/spinlock_api_smp.h | 8 +-
+ include/linux/tick.h | 9 +-
+ include/linux/trace_events.h | 18 +-
+ include/linux/vtime.h | 59 +-
+ include/linux/ww_mutex.h | 2 +-
+ include/net/sock.h | 2 +-
+ include/trace/events/filemap.h | 2 +-
+ include/trace/events/rcu.h | 47 +-
+ include/trace/events/timer.h | 3 +-
+ include/trace/trace_events.h | 64 +-
+ include/uapi/linux/perf_event.h | 10 +-
+ kernel/Kconfig.preempt | 2 +-
+ kernel/bpf/cgroup.c | 4 +-
+ kernel/bpf/stackmap.c | 4 +-
+ kernel/context_tracking.c | 6 +-
+ kernel/cpu.c | 2 +-
+ kernel/events/core.c | 320 +-
+ kernel/events/internal.h | 1 +
+ kernel/events/ring_buffer.c | 60 +-
+ kernel/exit.c | 30 +-
+ kernel/fork.c | 42 +-
+ kernel/futex.c | 326 +-
+ kernel/irq/irqdesc.c | 2 +-
+ kernel/irq_work.c | 34 +-
+ kernel/locking/lockdep.c | 7 +-
+ kernel/locking/locktorture.c | 9 +-
+ kernel/locking/mutex.c | 8 +-
+ kernel/locking/rtmutex.c | 6 +-
+ kernel/locking/rwsem.c | 10 +-
+ kernel/module.c | 43 -
+ kernel/printk/printk.c | 12 +-
+ kernel/rcu/rcu.h | 4 +-
+ kernel/rcu/rcu_segcblist.c | 6 +-
+ kernel/rcu/rcuperf.c | 16 -
+ kernel/rcu/rcutorture.c | 44 +-
+ kernel/rcu/tree.c | 73 +-
+ kernel/rcu/tree.h | 1 +
+ kernel/rcu/tree_plugin.h | 2 +-
+ kernel/sched/core.c | 20 +-
+ kernel/sched/cputime.c | 160 +-
+ kernel/sched/deadline.c | 12 +-
+ kernel/sched/fair.c | 1437 ++-
+ kernel/sched/features.h | 1 +
+ kernel/sched/idle.c | 10 +-
+ kernel/sched/rt.c | 12 +-
+ kernel/sched/sched.h | 25 +-
+ kernel/sched/stop_task.c | 9 +-
+ kernel/sched/topology.c | 9 +-
+ kernel/stacktrace.c | 4 +-
+ kernel/stop_machine.c | 1 +
+ kernel/time/hrtimer.c | 11 +-
+ kernel/time/tick-sched.c | 13 +-
+ kernel/time/time.c | 23 +-
+ kernel/trace/bpf_trace.c | 2 +-
+ kernel/trace/trace.h | 31 +-
+ kernel/trace/trace_entries.h | 66 +-
+ kernel/trace/trace_event_perf.c | 15 +-
+ kernel/trace/trace_events.c | 20 +-
+ kernel/trace/trace_events_hist.c | 8 +-
+ kernel/trace/trace_export.c | 106 +-
+ kernel/trace/trace_kprobe.c | 16 +-
+ kernel/trace/trace_syscalls.c | 50 +-
+ kernel/trace/trace_uprobe.c | 9 +-
+ kernel/workqueue.c | 10 +-
+ lib/locking-selftest.c | 24 +-
+ lib/smp_processor_id.c | 2 +-
+ lib/ubsan.c | 5 +-
+ mm/memcontrol.c | 2 +-
+ net/core/dev.c | 4 +-
+ net/core/sock.c | 2 +-
+ net/core/sock_reuseport.c | 4 +-
+ net/mac80211/trace.h | 28 +-
+ net/netfilter/nf_tables_api.c | 5 +-
+ net/sched/act_api.c | 2 +-
+ net/sched/act_csum.c | 4 +-
+ net/sched/act_ct.c | 3 +-
+ net/sched/act_ctinfo.c | 4 +-
+ net/sched/act_ife.c | 2 +-
+ net/sched/act_mirred.c | 4 +-
+ net/sched/act_mpls.c | 2 +-
+ net/sched/act_police.c | 6 +-
+ net/sched/act_sample.c | 4 +-
+ net/sched/act_skbedit.c | 4 +-
+ net/sched/act_tunnel_key.c | 4 +-
+ net/sched/act_vlan.c | 2 +-
+ net/wireless/trace.h | 6 +-
+ security/safesetid/securityfs.c | 4 +-
+ security/security.c | 27 +
+ security/selinux/hooks.c | 69 +
+ security/selinux/include/classmap.h | 2 +
+ security/selinux/include/objsec.h | 6 +-
+ tools/arch/x86/include/asm/disabled-features.h | 2 +-
+ tools/arch/x86/include/asm/emulate_prefix.h | 14 +
+ tools/arch/x86/include/asm/insn.h | 6 +
+ tools/arch/x86/include/asm/irq_vectors.h | 146 +
+ tools/arch/x86/include/asm/msr-index.h | 857 ++
+ tools/arch/x86/lib/insn.c | 34 +
+ tools/arch/x86/lib/x86-opcode-map.txt | 18 +-
+ tools/arch/x86/tools/gen-insn-attr-x86.awk | 4 +-
+ tools/lib/lockdep/include/liblockdep/common.h | 3 +-
+ tools/lib/lockdep/include/liblockdep/mutex.h | 2 +-
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 2 +-
+ tools/lib/lockdep/preload.c | 16 +-
+ tools/lib/subcmd/Makefile | 9 +-
+ tools/lib/traceevent/event-parse.c | 7 +-
+ tools/memory-model/Documentation/explanation.txt | 602 +-
+ tools/memory-model/linux-kernel.cat | 2 +-
+ tools/objtool/check.c | 1 +
+ tools/objtool/sync-check.sh | 3 +-
+ tools/perf/Documentation/perf-config.txt | 5 +
+ tools/perf/Documentation/perf-diff.txt | 5 +
+ tools/perf/Documentation/perf-list.txt | 3 +
+ tools/perf/Documentation/perf-record.txt | 7 +
+ tools/perf/Documentation/perf-report.txt | 11 +
+ tools/perf/Documentation/perf-stat.txt | 11 +
+ tools/perf/Documentation/perf-trace.txt | 14 +
+ .../Documentation/perf.data-directory-format.txt | 63 +
+ tools/perf/Documentation/perf.txt | 2 +
+ tools/perf/Makefile.config | 33 +-
+ tools/perf/Makefile.perf | 21 +-
+ tools/perf/arch/arm/util/Build | 2 +
+ tools/perf/arch/arm/util/perf_regs.c | 6 +
+ tools/perf/arch/arm64/util/Build | 1 +
+ tools/perf/arch/arm64/util/perf_regs.c | 6 +
+ tools/perf/arch/arm64/util/sym-handl