Add linux-next specific files for 20170630

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..1f6bbc5
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,268 @@
+Name		SHA1
+----		----
+origin		4d8a991d460d4fa4829beaffdcba45a217ca0fa7
+fixes		97da3854c526d3a6ee05c849c96e48d21527606c
+kbuild-current	ad8181060788c80c0ad75b583f24c22fa962a7a6
+arc-current	c0bc126f97fb929b3ae02c1c62322645d70eb408
+arm-current	d360a687d99577110c181e67ebfb9a1b6fed63a2
+m68k-current	f6ab4d59a5fe205f12287e515a43fc5e6de779b1
+metag-fixes	b884a190afcecdbef34ca508ea5ee88bb7c77861
+powerpc-fixes	d6bd8194e2867e85ac2de63486d3b83ccfae4e62
+sparc		dbd2667a4fb9ce4f547982b07cd69dda127c47ea
+fscrypt-current	42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net		d58299a478c416c0b48e4b31c6332fe7beb63000
+ipsec		ca3a1b856636f596c691ab5b3764045a142186db
+netfilter	91af6ba7ff16bd7e5919aedfe70aad73a3375619
+ipvs		3c5ab3f395d66a9e4e937fcfdf6ebc63894f028b
+wireless-drivers	35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37
+mac80211	4b153ca989a9bf61f622ded32e1d689df88edaa5
+sound-current	d94815f917da770d42c377786dc428f542e38f71
+pci-current	98dbf5af4fdd142f6184dbb4e4164a8d1850d526
+driver-core.current	08332893e37af6ae779367e78e444f8f9571511d
+tty.current	3c2993b8c6143d8a5793746a54eba8f86f95240f
+usb.current	dec08194ffeccfa1cf085906b53d301930eae18f
+usb-gadget-fixes	f50b878fed33e360d01dcdc31a8eeb1815d033d5
+usb-serial-fixes	996fab55d864ed604158f71724ff52db1c2454a3
+usb-chipidea-fixes	cbb22ebcfb9920380ed69854a7095d497798063d
+phy		9605bc46433d54f89b12d443a3d9aabf8070824b
+staging.current	41f1830f5a7af77cf5c86359aba3cbd706687e52
+char-misc.current	32c1431eea4881a6b17bd7c639315010aeefa452
+input-current	9768935264c4f0e4afd788a185d8e8d89c28e41d
+crypto-current	019d62db54017f4639fd7d4f6592f5a116a16695
+ide		acfead32f3f938e456d7d5e1a82c743d30b8b886
+vfio-fixes	39da7c509acff13fc8cb12ec1bb20337c988ed36
+kselftest-fixes	2ea659a9ef488125eb46da6eb571de5eae5c43f6
+backlight-fixes	68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes	6224beb12e190ff11f3c7d4bf50cb2922878f600
+nand-fixes	d4ed3b9015b5eebc90d629579d9e7944607cbae5
+spi-nor-fixes	2ea659a9ef488125eb46da6eb571de5eae5c43f6
+mfd-fixes	9e69672e90ccff10dab6f0c9545226a886e5973c
+v4l-dvb-fixes	2a2599c663684a1142dae0bff7737e125891ae6d
+reset-fixes	4497a224f759cd8350e07382307b55f870ef0df2
+drm-intel-fixes	611cdf3695a307fdca3ff3779a1e6cca935e2d31
+drm-misc-fixes	e94ac3510b6a0f696f2c442c4fc4051c8101ef12
+kbuild		39be5eac380dabc761c47358cdf8036bb5090f6b
+uuid		b86a496a42064e2a864bae31306e0c78eced2a3b
+dma-mapping	020278bbae01d9620a87b961a2eb5a64ac75b45b
+asm-generic	a351e9b9fc24e982ec2f0e76379a49826036da12
+arc		6f8119230ed026cee037dad784e7f8968ebfb052
+arm		06dbb655be93cc6d0f4d172dd9b34fb16d0d4c8c
+arm-perf	c0f7f7acdecdd7cf9a19c0af5c3dc649e1b934f7
+arm-soc		b0ebfd91e5490c581a5c8b4226642ab0aaf9a56b
+actions		8ba75fbb148a798c3220ce61fdf5d05518158847
+alpine		a1144b2b1ec47f50951a83eb2bd847c74415b567
+amlogic		f99503e956ae20c4dbc8b47841a460b970019977
+aspeed		4944e5dbb215cb99491bc5cd519045ae84536d2c
+at91		630efea351f0771beee5566d33cddfd1060f1e13
+bcm2835		652fb0c6435cb16aa92ab216622ace0aead51ec8
+berlin		5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m	f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs		bf6e15ed7f86926ed0dc2f96d377334476d5145c
+keystone	b45371147f9dc1b77b7cd96d8fb276ddd40d8f56
+mvebu		cf79eb3aab84d141651ead531272e915d90c44dd
+omap		eb00289871434f5fb4fa28f17b4e3ae669bb1615
+omap-pending	c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+reset		dfeac250c42974c078093256c67bb9794c10488f
+qcom		9c60544280d44ca80f9da7ca0eb9d13c0d6b8266
+realtek		007e6304223c86173ff1a754736c774f2c771f57
+renesas		d75d45bfffd5ed7d72ef07a014d6be03efaefe0e
+rockchip	dd3f24b9ff88c694b4ec23a2a1ecb9ba64b67d78
+rpi		bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung		2ea659a9ef488125eb46da6eb571de5eae5c43f6
+samsung-krzk	005537e095a63fdfffa647be544fb0f1d7f51b02
+sunxi		efb85d294c2ab7b35d7f3d9d1160664c56978de9
+tegra		07bb9460b188dd86fd648ae62d39eebfb32fac4b
+arm64		5fbd5fc49fc39ac8433da62d16682a1d0217ea4f
+clk		682430e87734799ff2d71311d29f04e86f10f2cc
+c6x		91ebcd1b97aea87172e8ae8871f1f328b9fa9c05
+cris		8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300		58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon		02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64		fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k		204a2be30a7a8a8d12642f23f3fbdc8b9923b500
+m68knommu	354b6382847d1d95b576d0c851df7a5743b8a2c2
+metag		e3cd7f013bac3105d44b8bd5a90359989d45b5a5
+microblaze	14ef905bb2eecb02f7ce31b8fbedd4a75ddf0f57
+mips		152e63e374cdc0dc7a321d523dd2930de0acdabf
+nios2		e118c3fec9c0d8d2a96462c4c035305dc952e402
+openrisc	9d15eb228b10fbe9c7ca2cfb257ddf8be826c428
+parisc-hd	d6b1d990957c9a11f7835a5c0410a40e64c945d8
+powerpc		4d0d7c02df680740da41f5f92a238c35796ca5be
+fsl		61baf15555129f69720334f232b153890895ef71
+mpc5xxx		39e69f55f85731d9c0320c03212a4d1f149464f0
+s390		9e293b5a7062981016ace93160c56a980fcb73b8
+sparc-next	a718d1392700bb7420ba26051ec35c20107ac981
+sh		6e2fbfdd585f46128ce8879738bca09719a65138
+tile		0af0bc38175d9859753a08f07af3aa767601265b
+uml		ce4586063f1af780b1c6b7e344907e6f9c1ba59a
+unicore32	bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa		bdf3b55fde37836dc5d024bfcbdbc2d18622ae6e
+fscrypt		c250b7dd8e73b5f7d88d231fbaac92e3360a7234
+befs		0bbabf98dd76229db3a1a2f2903a25c611fd68ae
+btrfs		8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave	4a240ddbe6b5dc8762958eecd0431027e0b331bb
+ceph		4ca2fea6f8277ab381bd08b996d641255b6f7b00
+cifs		bdda26555dd2c5f406e116ecd1476156f9a7ea4e
+configfs	19e72d3abb63cb16d021a4066ce1a18880509e99
+ecryptfs	be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3		08db141b5313ac2f64b844fb5725b8d81744b417
+ext4		037ee411053829e8ab75b0b905b8a53bd26fb044
+f2fs		01d42209996c097466904c625d29fa00b140c80d
+freevxfs	bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache		d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse		68227c03cba84a24faf8a7277d2b1a03c8959c2c
+jfs		684666e51585f3b136a3f505f8173d7580bc52cd
+nfs		2e31b4cb895ae78db31dffb860cd255d86c6561c
+nfsd		bb2a8b0cd116219777b99cb71fe9e24b31d3f521
+orangefs	2f713b5c7d2a90baba6c88174c81fb9a96bfde21
+overlayfs	fbaf94ee3cd5cfa85fe2d4d04be968820cb00556
+v9fs		a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs		7bccd12d27b7e358823feb5429731b8ee698b173
+xfs		50e0bdbe9f48f98bb02eac7030d682f4716884ae
+file-locks	3832ff35309d00936921f6958297531b7c28b8ae
+vfs		919bb328b0209612b2ba1d966f4289f01dc9a808
+vfs-jk		030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos	0eb8af4916a540c362a2950e5ab54eca32eb7d58
+printk		f4e981cba2dec675d40ac4f270b7e8ac164c9004
+pci		d0eebbbf7512674da03f0f79b1de093bf068d2a9
+pstore		0752e4028c003fba1e2b44c4b3cf6a4482e931b6
+hid		0f9089b979a6388d8831bba1f4ad08e53445cfd2
+i2c		25c34d08744fd7716c1fc141f57b620277a112ff
+jdelvare-hwmon	08d27eb2066622cd659b91d877d0406ebd651225
+dmi		8efa050f19fe8adbd73b6baa454be6d27eeefeac
+hwmon-staging	44b413661b57cbbb7e4c3adf7b087fada42a443e
+jc_docs		52b3f239bb692d9b3a68461798fb15c011e4108e
+v4l-dvb		2748e76ddb2967c4030171342ebdd3faa6a5e8e8
+v4l-dvb-next	d9c4615854ec5b9717784ad7a3672764c9442ed5
+fbdev		a8feae09110675e77022b6f04ac6d308e842d75d
+pm		0491dac9f1c996bf6f2fbeb5895e5b8c4e704df2
+idle		306899f94804aece6d8fa8b4223ede3b48dbb59c
+thermal		cb15c81a0c1c1f7829b9809a209ecacc77f5aa63
+thermal-soc	33011c583fcc959fa9d57b9da3319ebae716f2d7
+ieee1394	72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm		591c3beb86c4fe3e400c59bfd028db3e79c1da11
+swiotlb		69369f52d28a34c84acb6f2a8a585e743441566a
+net-next	fcce2fdbf478c749aa194e286858f6b6b601f5ee
+ipsec-next	8bafd73093f2f431f5a363f8057abc0ccc118853
+netfilter-next	04ba724b659c6808b0ca31528121bdb2f2807e00
+nfc-next	bd751808f9ff5e1822c627f6c4283009e66b2e53
+ipvs-next	fb90e8dedb465bd06512f718b139ed8680d26dbe
+wireless-drivers-next	fdcbe65d618af080ee23229f0137ffd37f2de36b
+bluetooth	feb16722b5d5f05b7ae1278a43e717c3d35cd512
+mac80211-next	3dc02251f43fb5ec7fa576138005edbfe35ed1ca
+rdma		bc5214ee29220251e5507882696ded5ca183b169
+gfs2		722f6f62a563108dc0f311bd86120b8fbfa0c6df
+mtd		05e97a9eda72d58dba293857df6aac62584ef99a
+l2-mtd		c169e3d3c049d93929a92f909a4b80ba0f85a3c3
+nand		edfee3619c4955be38d414f25bd4f6c5c1b029ba
+spi-nor		1a18915b497185e1659878e7eae0e68411ae769b
+crypto		bcf741cb779283081db47853264cc94854e7ad83
+drm		12d016626f99f48edbf5b006625b4e8c0de1eec7
+drm-panel	e4bac408b08437d190785ab1250cc676304ed171
+drm-intel	bdbbf7d619d1fd2f1fa9eb529b7817e4faf73f5e
+drm-tegra	43240bbd871e2c8f89584d369278a3d18680d9ea
+drm-misc	138b87fa43b629ed14429e2e056fe4d5ef132921
+drm-exynos	7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm		4a630fadbb29d9efaedb525f1a8f7449ad107641
+hdlcd		fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec
+mali-dp		e40eda3dda1ef36ddef7e02c1b280a9ae91a561b
+sunxi-drm	110d33dd428ea49b9482bcb780fb096dfb4dcd3e
+imx-drm		994fc62e1d04a4647f19b4754d9cd5cb1b526735
+etnaviv		46a269da7e8a1ab6510ea5c88b2732925e5efc79
+kconfig		5bcba792bb304e8341217d759ec486969a3b4258
+regmap		2c25d66dc22da0b53ccbf7cd743fbc6dfc77d6f6
+sound		a5a041b6b50bcaf96f96e5db4850d11006d61d26
+sound-asoc	3453c8631b55762cd1bb2889a051f20a70a5981f
+modules		96b5b19459b3c2aed2872bac42cbe19edfae710f
+input		be19788c73d382f66dd3fba3c5ccef59cf12a126
+block		a5de4e3e9ccc8dc39aefd3044e8271cad5ac4c19
+lightnvm	1c6286f26301ad154a1c10fb6e68925493dd28ba
+device-mapper	0aefb813be29c2f1e14665c2bbf4941b5e5727f2
+pcmcia		e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc		e47c0b96678c5fd731c125dca677880e06d6394c
+kgdb		7a6653fca50077f342bcdc39222d78928e3f0feb
+md		7f053a6a745557b3f3ad63e9d28ba85c3c0b1563
+mfd		d905cd268c76f437483a0b585041bd25b386c7b4
+backlight	7e715c2d9c27c23f3187454157c58cf292ed103e
+battery		bfa953d336cdd713f6968c85ca820ef22333dc35
+omap_dss2	c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator	2d324eda8235a39e82c130b049d384932441bbfb
+security	c4758fa59285fe4dbfeab4364a6957936d040fbf
+integrity	fc26bd50539b6f52aa75ffbaec7b083825ec5451
+keys		3088c2ad40cf1541e8674e7e62df576419eef562
+selinux		6a3911837da0a90ed599fd0a9836472f5e7ddf1b
+tpmdd		0608454e221737ee80ac3a4ff0782f33a28f0cc2
+watchdog	3a9aedb282acf1499a31834c457335e4535e4a1d
+iommu		6a7086431fa18df7d03b1ed0126426c79b38dc8c
+dwmw2-iommu	910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio		5d6dee80a1e94cc284d03e06d930e60e8d3ecf7d
+trivial		6fbc8798d9461c0ff22fab9fbaddde13de815941
+audit		cd33f5f2cbfaadc21270f3ddac7c3c33e0a1a28c
+devicetree	ce4fecf1fe1518131ff80eebf412de0080fea049
+mailbox		25bfee16d5a3158086273cc51110c7470144c842
+spi		9e138741788f5cd6934647928f7385e4df50a17a
+tip		e45571dd9ccbe62230d1c06eaa7537ba85119578
+clockevents	d9569035d594cd1a3c87fe7c6ad67526ccfe64b6
+edac		345fb0a9a6340ba0b3b714d62f877fde88c8a755
+edac-amd	164c29244d4beb9a105102c42821f4925e4a0c7a
+irqchip		c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+ftrace		681bec0367c2606b6154060310a2ffa543175980
+rcu		49729e9a4e674edcbf323b7804f847688e22e347
+kvm		865279c53ca9d88718d974bb014b2c6ce259ac75
+kvm-arm		d38338e396ee0571b3502962fd2fbaec4d2d9a8f
+kvm-mips	dc44abd6aad22411f7f9890e39fd4753dabf0d03
+kvm-ppc		da4ec555fd4cd5a91105783214db12d16fae34c4
+kvms390		d52cd2076eb2ace9fe95dbf795f6d93587453914
+xen-tip		a5d5f328b0e2baa5ee7c119fd66324eb79eeeb66
+percpu		e3efe3db932b55ed34ba32862f568abae32046d0
+workqueues	bacb71fc9187f288e98c3132e87f36c0362318df
+drivers-x86	baea2c0e8f13ce8144c7d752de02bcfefc390ea4
+chrome-platform	5d6a312e8f99f0a0bf793256c203fa17c97a15e1
+hsi		67ddd75771b6b860bc0cebb3b7fd4cbebeda9cd4
+leds		64601cb1343f1b740aa7a612a1aec778a8163445
+ipmi		1e7a75f74a193f92eb9e5da20d1fb1b388241631
+driver-core	d565ed38d045793b76f022565a50793a3535bdbd
+usb		fd90f73a9925f248d696bde1cfc836d9fda5570d
+usb-gadget	0591bc2360152f851e29246884805bb77a2c3b9d
+usb-serial	c22ac6d29f18d3210c545f77e4f95b856ab5f983
+usb-chipidea-next	c4a0bbbdb7f6e3c37fa6deb3ef28c5ed99da6175
+phy-next	af850e14a7ae493e85090723eb9cf85dafb8b243
+tty		9f60e0e7aea66e87948fcde05fc873988e881c93
+char-misc	cbbdc6082917a92da0fc07cee255111de16ed64a
+extcon		1f4be24786b8521945b00e1810576911994ba504
+staging		8a21ff775f5654eb078ae57ba64cdbd32b9297c4
+mux		a351e9b9fc24e982ec2f0e76379a49826036da12
+slave-dma	e9446e2b2d9ddf0b0ebd62738fd8f2576133b644
+cgroup		5136f6365ce3eace5a926e10f16ed2a233db5ba9
+scsi		1912374d933bceba2e1c218a128472b2171f50f1
+scsi-mkp	f62f9ffdb5ef683ef8cffb43932fa72cc3713e94
+target-updates	055c758171c96f73df8426d245a4f1d23ce277d3
+target-merge	2994a75183173defc21f0d26ce23b63232211b88
+target-bva	2ea659a9ef488125eb46da6eb571de5eae5c43f6
+libata		af62e4938e3c9aa578c93f497011cf1083136c4b
+binfmt_misc	4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost		e41b1355508debe45fda33ef8c03ff3ba5d206b9
+rpmsg		9ef2b6cc595a01c6c0ec53c44f1679ca3a977c55
+gpio		a4196d365937dc9b6256e97b0a5781f196ecb933
+pinctrl		cf342f7302c0f117b3abb31369341b30bb0be4c2
+pinctrl-samsung	a453f3693f2aa9ebba623f8cff1e3d7c5df96ddd
+pwm		97512ceafaacf8cdb96d6a36ae55e8335c0a9e55
+dma-buf		194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns		296990deb389c7da21c78030376ba244dc1badf5
+ktest		f7c6401ff84ab8ffffc281a29aa0a787f7eb346e
+random		e2682130931f66806b7a12acf0c62ebaf30aea14
+aio		b562e44f507e863c6792946e4e1b1449fbbac85d
+kselftest	cb2e4ba3a5443abd48e5af8acc27faa675c7cbcc
+y2038		69973b830859bc6529a7a0468ba0d80ee5117826
+luto-misc	2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger	e76d21c40bd6c67fd4e2c1540d77e113df962b4d
+livepatching	26d8d1e9bb4878285f8ce852783cbd2f6bb95c1f
+coresight	92cd7037795e1e935b83cba2c7949baabb064eb9
+rtc		9f4ad359c801d5858387a5caa05e9211ab746653
+hwspinlock	bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm		159deeb6dbcfeef7061aaa25347f27911467d0d2
+dax-misc	4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+idr		f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371
+kspp		b3645fbb0553edc94899e43c545d8dbd278e1aae
+akpm-current	f33857ea9f81974cbc996f8e767e66eca49e93c4
+akpm		ff0374dbac9192147d538cc3b22c1db58d3b7ee8
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..50e4730
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,270 @@
+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
+m68k-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+metag-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes
+powerpc-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+sparc		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable
+net		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+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
+sound-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.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
+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
+backlight-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+ftrace-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent
+nand-fixes	git	git://git.infradead.org/linux-mtd.git#nand/fixes
+spi-nor-fixes	git	git://git.infradead.org/linux-mtd.git#spi-nor/fixes
+mfd-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes	git	git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes	git	https://git.pengutronix.de/git/pza/linux#reset/fixes
+drm-intel-fixes	git	git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+drm-misc-fixes	git	git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild		git	git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+uuid		git	git://git.infradead.org/users/hch/uuid.git#for-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
+arm-perf		git	git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc		git	git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+actions		git	git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next
+alpine		git	git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next
+amlogic		git	git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+aspeed		git	git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next
+at91		git	git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next
+bcm2835		git	git://github.com/anholt/linux.git#for-next
+berlin		git	git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next
+cortex-m		git	git://git.pengutronix.de/git/ukl/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
+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
+omap-pending	git	git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next
+reset		git	https://git.pengutronix.de/git/pza/linux#reset/next
+qcom		git	git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next
+realtek		git	git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
+renesas		git	git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+rockchip		git	git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+rpi		git	git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next
+samsung		git	git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+samsung-krzk	git	git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+sunxi		git	git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tegra		git	git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+arm64		git	git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+clk		git	git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+c6x		git	git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next
+cris		git	git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next
+h8300		git	git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next
+hexagon		git	git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-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
+metag		git	git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next
+microblaze	git	git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips		git	git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-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
+mpc5xxx		git	git://git.denx.de/linux-denx-agust.git#next
+s390		git	git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+sh		git	git://git.libc.org/linux-sh#for-next
+tile		git	git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+uml		git	git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+unicore32	git	git://github.com/gxt/linux.git#unicore32
+xtensa		git	git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+fscrypt		git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master
+befs		git	git://github.com/luisbg/linux-befs.git#for-next
+btrfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+btrfs-kdave	git	git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph		git	git://github.com/ceph/ceph-client.git#master
+cifs		git	git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs		git	git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3		git	git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4		git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs		git	git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+freevxfs		git	git://git.infradead.org/users/hch/freevxfs.git#for-next
+fscache		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache
+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
+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
+v9fs		git	git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs		git	git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs		git	git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+file-locks	git	git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#linux-next
+vfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+vfs-jk		git	git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs
+vfs-miklos	git	git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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/jikos/hid.git#for-next
+i2c		git	git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+jdelvare-hwmon	quilt	http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
+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
+idle		git	git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal		git	git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc	git	git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394		git	git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm		git	git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb		git	git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+net-next		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+ipsec-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+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
+rdma		git	git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next
+gfs2		git	git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+mtd		git	git://git.infradead.org/mtd-2.6.git#master
+l2-mtd		git	git://git.infradead.org/l2-mtd.git#master
+nand		git	git://git.infradead.org/l2-mtd.git#nand/next
+spi-nor		git	git://git.infradead.org/l2-mtd.git#spi-nor/next
+crypto		git	git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm		git	git://people.freedesktop.org/~airlied/linux.git#drm-next
+drm-panel	git	git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-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-exynos	git	git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next
+drm-msm		git	git://people.freedesktop.org/~robclark/linux#msm-next
+hdlcd		git	git://linux-arm.org/linux-ld#for-upstream/hdlcd
+mali-dp		git	git://linux-arm.org/linux-ld#for-upstream/mali-dp
+sunxi-drm	git	git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next
+imx-drm		git	https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv		git	https://git.pengutronix.de/git/lst/linux#etnaviv/next
+kconfig		git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+regmap		git	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound		git	git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc	git	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules		git	git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next
+input		git	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block		git	git://git.kernel.dk/linux-block.git#for-next
+lightnvm		git	git://github.com/OpenChannelSSD/linux.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/pcmcia.git#master
+mmc		git	git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+kgdb		git	git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md		git	git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next
+mfd		git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery		git	git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+omap_dss2	git	git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.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
+integrity	git	git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next
+keys		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+selinux		git	git://git.infradead.org/users/pcmoore/selinux#next
+tpmdd		git	git://git.infradead.org/users/jjs/linux-tpmdd.git#next
+watchdog		git	git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu		git	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+dwmw2-iommu	git	git://git.infradead.org/iommu-2.6.git#master
+vfio		git	git://github.com/awilliam/linux-vfio.git#next
+trivial		git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit		git	git://git.infradead.org/users/pcmoore/audit#next
+devicetree	git	git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox		git	git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi		git	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents	git	git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next
+edac		git	git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd		git	git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+irqchip		git	git://git.infradead.org/users/jcooper/linux.git#irqchip/for-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-mips		git	git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.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/tj/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/users/dvhart/linux-platform-drivers-x86.git#for-next
+chrome-platform	git	git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next
+hsi		git	git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds		git	git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next
+ipmi		git	git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget	git	git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial	git	git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next
+phy-next		git	git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next
+tty		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+extcon		git	git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+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
+slave-dma	git	git://git.infradead.org/users/vkoul/slave-dma.git#next
+cgroup		git	git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi		git	git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp		git	git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+target-updates	git	git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-merge	git	git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge
+target-bva	git	git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next
+libata		git	git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next
+binfmt_misc	git	git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next
+vhost		git	git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg		git	git://github.com/andersson/remoteproc.git#for-next
+gpio		git	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+pinctrl		git	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-samsung	git	git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm		git	git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+dma-buf		git	git://git.linaro.org/people/sumitsemwal/linux-dma-buf.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
+aio		git	git://git.kvack.org/~bcrl/aio-next.git#master
+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
+luto-misc	git	git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next
+borntraeger	git	git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next
+livepatching	git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/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
+hwspinlock	git	git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next
+nvdimm		git	git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+dax-misc		git	git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc
+idr		git	git://git.infradead.org/users/willy/linux-dax.git#idr-4.11
+kspp		git	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+akpm-current	mmotm	http://www.ozlabs.org/~akpm/mmotm/
+akpm		mmotm	http://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000..b19c238
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,13446 @@
+$ date -R
+Fri, 30 Jun 2017 07:45:09 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 3c2bfbaadff6 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
+Merging origin/master (4d8a991d460d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge origin/master
+Updating 3c2bfbaadff6..4d8a991d460d
+Fast-forward
+ arch/arc/include/asm/processor.h                   |  2 -
+ arch/blackfin/include/asm/processor.h              |  5 --
+ arch/c6x/include/asm/processor.h                   |  5 --
+ arch/cris/arch-v10/kernel/process.c                |  8 --
+ arch/cris/arch-v32/kernel/process.c                |  8 --
+ arch/cris/include/asm/processor.h                  |  2 -
+ arch/frv/include/asm/processor.h                   |  5 --
+ arch/frv/kernel/process.c                          |  9 ---
+ arch/h8300/include/asm/processor.h                 |  4 -
+ arch/h8300/kernel/process.c                        |  5 --
+ arch/hexagon/include/asm/processor.h               |  3 -
+ arch/hexagon/kernel/process.c                      |  8 --
+ arch/ia64/include/asm/processor.h                  | 17 -----
+ arch/m32r/include/asm/processor.h                  |  2 -
+ arch/m32r/kernel/process.c                         |  8 --
+ arch/m68k/include/asm/processor.h                  |  2 -
+ arch/m68k/kernel/process.c                         | 14 ----
+ arch/microblaze/include/asm/processor.h            |  6 --
+ arch/microblaze/kernel/process.c                   | 17 -----
+ arch/mn10300/include/asm/processor.h               |  5 --
+ arch/mn10300/kernel/process.c                      |  8 --
+ arch/nios2/include/asm/processor.h                 |  3 -
+ arch/openrisc/include/asm/processor.h              |  5 --
+ arch/openrisc/kernel/process.c                     |  5 --
+ arch/parisc/include/asm/processor.h                |  5 --
+ arch/parisc/kernel/process.c                       |  5 --
+ arch/powerpc/include/asm/processor.h               |  6 --
+ arch/s390/include/asm/processor.h                  |  5 --
+ arch/s390/kernel/process.c                         | 25 -------
+ arch/score/include/asm/processor.h                 |  1 -
+ arch/score/kernel/process.c                        |  5 --
+ arch/sparc/include/asm/processor_32.h              |  3 -
+ arch/sparc/include/asm/processor_64.h              |  2 -
+ arch/sparc/kernel/process_32.c                     |  8 --
+ arch/sparc/kernel/process_64.c                     | 19 -----
+ arch/tile/include/asm/processor.h                  |  7 --
+ arch/um/include/asm/processor-generic.h            |  2 -
+ arch/um/kernel/um_arch.c                           |  6 --
+ arch/x86/include/asm/processor.h                   |  2 -
+ arch/x86/kernel/process.c                          | 11 ---
+ arch/xtensa/include/asm/processor.h                |  2 -
+ block/bio.c                                        | 12 ++-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h              |  3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |  2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c                |  6 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c         | 17 ++++-
+ drivers/gpu/drm/i915/i915_vma.c                    |  5 ++
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c         |  1 +
+ drivers/md/dm-raid.c                               | 17 ++++-
+ drivers/md/dm-thin.c                               | 26 +++----
+ drivers/net/arcnet/arcnet.c                        |  7 +-
+ drivers/net/arcnet/capmode.c                       |  2 +-
+ drivers/net/arcnet/com20020-pci.c                  |  6 +-
+ drivers/net/arcnet/com20020.c                      |  2 -
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c          | 61 +++++++++++++---
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h          |  6 +-
+ drivers/net/ethernet/freescale/fman/Kconfig        |  1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  3 +
+ drivers/net/ethernet/rocker/rocker_ofdpa.c         |  2 +-
+ drivers/net/ethernet/sfc/ef10.c                    | 15 ++--
+ drivers/net/ethernet/ti/cpsw-common.c              |  2 +-
+ drivers/net/hyperv/netvsc_drv.c                    |  4 +-
+ drivers/net/macvlan.c                              | 85 ++++++++++++++++++----
+ drivers/net/phy/dp83640.c                          |  2 +-
+ drivers/net/phy/micrel.c                           |  2 +
+ drivers/net/usb/ax88179_178a.c                     | 16 ++++
+ drivers/net/veth.c                                 |  4 +-
+ drivers/net/virtio_net.c                           |  1 +
+ drivers/net/xen-netback/common.h                   |  1 +
+ drivers/net/xen-netback/interface.c                |  6 +-
+ drivers/net/xen-netback/netback.c                  |  6 +-
+ drivers/nvme/host/pci.c                            |  3 +-
+ fs/block_dev.c                                     |  5 +-
+ fs/nfs/callback_xdr.c                              |  1 -
+ fs/nfs/dir.c                                       | 51 ++++++-------
+ fs/nfs/nfs4proc.c                                  |  5 +-
+ fs/nfs/nfs4state.c                                 |  2 +
+ include/linux/bio.h                                |  1 +
+ include/net/xfrm.h                                 |  7 +-
+ kernel/bpf/verifier.c                              |  5 ++
+ net/core/dev.c                                     | 30 +++++---
+ net/ipv4/ip_output.c                               |  3 +-
+ net/ipv4/tcp.c                                     |  2 +
+ net/ipv6/addrconf.c                                |  5 +-
+ net/ipv6/datagram.c                                |  8 +-
+ net/ipv6/esp6_offload.c                            | 25 +++++++
+ net/ipv6/ip6_output.c                              |  2 +-
+ net/ipv6/route.c                                   |  6 +-
+ net/ipv6/sit.c                                     |  2 +-
+ net/ipv6/udp.c                                     |  3 +-
+ net/ipv6/xfrm6_input.c                             |  2 +-
+ net/key/af_key.c                                   | 19 ++++-
+ net/sched/sch_api.c                                |  3 +-
+ net/xfrm/Makefile                                  |  3 +-
+ net/xfrm/xfrm_device.c                             |  2 +
+ net/xfrm/xfrm_policy.c                             |  4 -
+ net/xfrm/xfrm_user.c                               |  1 +
+ tools/testing/selftests/bpf/test_verifier.c        | 66 +++++++++++++++++
+ 99 files changed, 450 insertions(+), 411 deletions(-)
+Merging fixes/master (97da3854c526 Linux 4.11-rc3)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
+$ git merge kbuild-current/fixes
+Already up-to-date.
+Merging arc-current/for-curr (c0bc126f97fb Linux 4.12-rc7)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (d360a687d995 ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (d6bd8194e286 powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user())
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/uaccess.h |  8 +-------
+ drivers/misc/cxl/context.c         |  6 +++---
+ drivers/misc/cxl/cxl.h             | 18 +++++-------------
+ drivers/misc/cxl/fault.c           | 23 +++++++++++++++--------
+ drivers/misc/cxl/main.c            | 17 +++++++++++++----
+ drivers/misc/cxl/native.c          | 29 +++++++++++++++++------------
+ drivers/misc/cxl/pci.c             | 11 ++++-------
+ 7 files changed, 58 insertions(+), 54 deletions(-)
+Merging sparc/master (dbd2667a4fb9 sparc64: Fix gup_huge_pmd)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/asm-prototypes.h | 24 ++++++++++++++++++
+ arch/sparc/lib/atomic_64.S              | 44 +++++++++++++++++++--------------
+ arch/sparc/lib/checksum_64.S            |  1 +
+ arch/sparc/lib/csum_copy.S              |  1 +
+ arch/sparc/lib/memscan_64.S             |  2 ++
+ arch/sparc/lib/memset.S                 |  1 +
+ arch/sparc/mm/gup.c                     |  4 +--
+ 7 files changed, 57 insertions(+), 20 deletions(-)
+ create mode 100644 arch/sparc/include/asm/asm-prototypes.h
+Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
+$ git merge fscrypt-current/for-stable
+Already up-to-date.
+Merging net/master (d58299a478c4 sfc: fix attempt to translate invalid filter ID)
+$ git merge net/master
+Already up-to-date.
+Merging ipsec/master (ca3a1b856636 esp6_offload: Fix IP6CB(skb)->nhoff for ESP GRO)
+$ git merge ipsec/master
+Already up-to-date.
+Merging netfilter/master (91af6ba7ff16 netfilter: ebt_nflog: fix unexpected truncated packet)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ net/bridge/netfilter/ebt_nflog.c        | 1 +
+ net/netfilter/nf_conntrack_proto_dccp.c | 7 +++++++
+ net/netfilter/nf_conntrack_proto_sctp.c | 7 +++++++
+ 3 files changed, 15 insertions(+)
+Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2())
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (4b153ca989a9 Merge tag 'mac80211-for-davem-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (d94815f917da ALSA: hda - Fix endless loop of codec configure)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/hda_codec.h      | 2 ++
+ sound/pci/hda/hda_controller.c | 8 ++++++--
+ sound/pci/hda/hda_generic.c    | 1 +
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (3c2993b8c614 Linux 4.12-rc4)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (dec08194ffec xhci: Limit USB2 port wake support for AMD Promontory hosts)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/host/xhci-hub.c   |  3 +++
+ drivers/usb/host/xhci-pci.c   | 12 ++++++++++++
+ drivers/usb/host/xhci.h       |  1 +
+ drivers/usb/serial/option.c   |  4 ++++
+ drivers/usb/serial/qcserial.c |  1 +
+ 5 files changed, 21 insertions(+)
+Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
+$ git merge phy/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (41f1830f5a7a Linux 4.12-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (9768935264c4 Input: synaptics-rmi4 - only read the F54 query registers which are used)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (019d62db5401 crypto: caam - fix gfp allocation flags (part II))
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ crypto/drbg.c                    |  1 +
+ drivers/crypto/caam/caamalg.c    | 10 ++++------
+ drivers/crypto/caam/caamalg_qi.c | 10 ++++------
+ drivers/crypto/caam/caamhash.c   | 32 ++++++++++++++++----------------
+ drivers/crypto/caam/caampkc.c    |  4 ++--
+ 5 files changed, 27 insertions(+), 30 deletions(-)
+Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
+$ git merge ide/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up-to-date.
+Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
+$ git merge ftrace-fixes/for-next-urgent
+Already up-to-date.
+Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
+$ git merge nand-fixes/nand/fixes
+Already up-to-date.
+Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge spi-nor-fixes/spi-nor/fixes
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging v4l-dvb-fixes/fixes (2a2599c66368 [media] media: entity: Catch unbalanced media_pipeline_stop calls)
+$ git merge v4l-dvb-fixes/fixes
+Auto-merging include/media/v4l2-fwnode.h
+Removing drivers/staging/media/lirc/TODO.lirc_zilog
+Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c
+Removing drivers/media/v4l2-core/v4l2-of.c
+Removing drivers/media/platform/vimc/vimc-sensor.h
+Removing drivers/media/platform/vimc/vimc-core.h
+Removing drivers/media/platform/vimc/vimc-capture.h
+Auto-merging MAINTAINERS
+Removing Documentation/media/kapi/v4l2-of.rst
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/media/cec.txt    |    8 +
+ .../devicetree/bindings/media/i2c/adv7180.txt      |   15 +
+ .../devicetree/bindings/media/i2c/max2175.txt      |   59 +
+ .../devicetree/bindings/media/i2c/ov5640.txt       |   45 +
+ Documentation/devicetree/bindings/media/imx.txt    |   53 +
+ .../devicetree/bindings/media/mediatek-mdp.txt     |   12 +-
+ .../devicetree/bindings/media/qcom,venus.txt       |  107 +
+ .../devicetree/bindings/media/rcar_vin.txt         |    4 +-
+ .../devicetree/bindings/media/renesas,drif.txt     |  176 ++
+ .../devicetree/bindings/media/s5p-cec.txt          |    6 +-
+ .../devicetree/bindings/media/st,stm32-cec.txt     |   19 +
+ .../devicetree/bindings/media/st,stm32-dcmi.txt    |   45 +
+ .../devicetree/bindings/media/stih-cec.txt         |    2 +-
+ .../devicetree/bindings/media/video-mux.txt        |   60 +
+ .../devicetree/bindings/property-units.txt         |    1 +
+ Documentation/media/kapi/cec-core.rst              |   18 +
+ Documentation/media/kapi/v4l2-core.rst             |    2 +-
+ Documentation/media/kapi/v4l2-fwnode.rst           |    3 +
+ Documentation/media/kapi/v4l2-of.rst               |    3 -
+ .../media/uapi/cec/cec-ioc-adap-g-caps.rst         |    8 +
+ .../media/uapi/dvb/fe-diseqc-send-burst.rst        |    4 +-
+ Documentation/media/uapi/dvb/fe-set-tone.rst       |    4 +-
+ Documentation/media/uapi/dvb/fe-set-voltage.rst    |    7 +-
+ .../media/uapi/mediactl/media-ioc-g-topology.rst   |    8 +-
+ Documentation/media/uapi/mediactl/media-types.rst  |   21 +
+ Documentation/media/uapi/v4l/control.rst           |    6 +
+ Documentation/media/uapi/v4l/extended-controls.rst |    9 +-
+ .../media/uapi/v4l/pixfmt-sdr-pcu16be.rst          |   55 +
+ .../media/uapi/v4l/pixfmt-sdr-pcu18be.rst          |   55 +
+ .../media/uapi/v4l/pixfmt-sdr-pcu20be.rst          |   54 +
+ Documentation/media/uapi/v4l/sdr-formats.rst       |    3 +
+ Documentation/media/uapi/v4l/vidioc-cropcap.rst    |   23 +-
+ Documentation/media/uapi/v4l/vidioc-g-crop.rst     |   22 +-
+ .../media/uapi/v4l/vidioc-g-selection.rst          |   22 +-
+ Documentation/media/v4l-drivers/imx.rst            |  614 +++++
+ Documentation/media/v4l-drivers/index.rst          |    1 +
+ Documentation/media/v4l-drivers/max2175.rst        |   62 +
+ MAINTAINERS                                        |   78 +-
+ drivers/leds/leds-aat1290.c                        |    5 +-
+ drivers/leds/leds-max77693.c                       |    5 +-
+ drivers/media/cec/cec-adap.c                       |   88 +-
+ drivers/media/cec/cec-api.c                        |    5 +-
+ drivers/media/cec/cec-core.c                       |    1 +
+ drivers/media/dvb-core/dvb_ca_en50221.c            |   39 +-
+ drivers/media/dvb-frontends/Kconfig                |    1 +
+ drivers/media/dvb-frontends/af9013.c               | 1186 +++++-----
+ drivers/media/dvb-frontends/af9013.h               |   86 +-
+ drivers/media/dvb-frontends/af9013_priv.h          |    2 +
+ drivers/media/dvb-frontends/au8522_common.c        |    1 +
+ drivers/media/dvb-frontends/au8522_decoder.c       |   74 +-
+ drivers/media/dvb-frontends/au8522_dig.c           |  215 +-
+ drivers/media/dvb-frontends/bcm3510.c              |    4 +-
+ drivers/media/dvb-frontends/cxd2841er.c            |  302 ++-
+ drivers/media/dvb-frontends/cxd2841er.h            |   10 +
+ drivers/media/dvb-frontends/cxd2841er_priv.h       |    3 +
+ drivers/media/dvb-frontends/dib7000p.c             |    6 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c        |   20 +-
+ drivers/media/dvb-frontends/drxd_hard.c            |   10 +-
+ drivers/media/dvb-frontends/drxk_hard.c            |   20 +-
+ drivers/media/dvb-frontends/mt352.c                |    1 +
+ drivers/media/dvb-frontends/or51132.c              |    4 +-
+ drivers/media/dvb-frontends/s5h1411.c              |    4 +-
+ drivers/media/dvb-frontends/stv0367.c              | 1168 ++++------
+ drivers/media/dvb-frontends/stv0367.h              |   13 +
+ drivers/media/dvb-frontends/stv0367_defs.h         | 1301 +++++++++++
+ drivers/media/dvb-frontends/stv0367_regs.h         |    4 -
+ drivers/media/dvb-frontends/zl10353.c              |    3 +-
+ drivers/media/i2c/Kconfig                          |   51 +
+ drivers/media/i2c/Makefile                         |    5 +
+ drivers/media/i2c/ad5820.c                         |    2 +-
+ drivers/media/i2c/adv7180.c                        |    2 +
+ drivers/media/i2c/adv7604.c                        |    7 +-
+ drivers/media/i2c/as3645a.c                        |   12 +-
+ drivers/media/i2c/cx25840/cx25840-core.c           |   36 +-
+ drivers/media/i2c/dw9714.c                         |  291 +++
+ drivers/media/i2c/max2175.c                        | 1453 ++++++++++++
+ drivers/media/i2c/max2175.h                        |  109 +
+ drivers/media/i2c/msp3400-kthreads.c               |    1 +
+ drivers/media/i2c/mt9v032.c                        |    7 +-
+ drivers/media/i2c/ov13858.c                        | 1816 +++++++++++++++
+ drivers/media/i2c/ov2659.c                         |   11 +-
+ drivers/media/i2c/ov5640.c                         | 2344 ++++++++++++++++++++
+ drivers/media/i2c/ov5645.c                         |    7 +-
+ drivers/media/i2c/ov5647.c                         |    7 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c           |    7 +-
+ drivers/media/i2c/s5k5baf.c                        |    6 +-
+ drivers/media/i2c/s5k6aa.c                         |    2 +-
+ drivers/media/i2c/smiapp/Kconfig                   |    1 +
+ drivers/media/i2c/smiapp/smiapp-core.c             |   29 +-
+ drivers/media/i2c/soc_camera/ov6650.c              |    2 +
+ drivers/media/i2c/soc_camera/ov772x.c              |    6 +-
+ drivers/media/i2c/tc358743.c                       |   77 +-
+ drivers/media/i2c/tvp514x.c                        |    6 +-
+ drivers/media/i2c/tvp5150.c                        |    7 +-
+ drivers/media/i2c/tvp7002.c                        |    6 +-
+ drivers/media/media-entity.c                       |   43 +-
+ drivers/media/pci/bt8xx/dst_ca.c                   |    1 +
+ drivers/media/pci/cobalt/cobalt-driver.c           |    2 +
+ drivers/media/pci/cx18/cx18-alsa-pcm.c             |    4 +-
+ drivers/media/pci/cx18/cx18-dvb.c                  |    2 +-
+ drivers/media/pci/cx23885/cx23885-cards.c          |    3 +-
+ drivers/media/pci/cx88/cx88-cards.c                |    9 +-
+ drivers/media/pci/cx88/cx88-video.c                |    4 +-
+ drivers/media/pci/ddbridge/Kconfig                 |    6 +
+ drivers/media/pci/ddbridge/ddbridge-core.c         |  531 ++++-
+ drivers/media/pci/ddbridge/ddbridge-regs.h         |    4 +
+ drivers/media/pci/ddbridge/ddbridge.h              |   41 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c             |    4 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c |    3 +-
+ drivers/media/pci/saa7134/saa7134-cards.c          |    4 +-
+ drivers/media/pci/saa7164/saa7164-bus.c            |   13 +-
+ drivers/media/pci/saa7164/saa7164-cmd.c            |    2 +
+ drivers/media/pci/solo6x10/solo6x10-core.c         |    1 +
+ drivers/media/pci/solo6x10/solo6x10-i2c.c          |    1 +
+ drivers/media/pci/ttpci/av7110.c                   |    5 +
+ drivers/media/pci/zoran/zoran_driver.c             |    2 +
+ drivers/media/platform/Kconfig                     |   74 +
+ drivers/media/platform/Makefile                    |   13 +-
+ drivers/media/platform/am437x/Kconfig              |    1 +
+ drivers/media/platform/am437x/am437x-vpfe.c        |   15 +-
+ drivers/media/platform/atmel/Kconfig               |    2 +
+ drivers/media/platform/atmel/atmel-isc.c           |   36 +-
+ drivers/media/platform/atmel/atmel-isi.c           |   35 +-
+ drivers/media/platform/coda/coda-bit.c             |   49 +-
+ drivers/media/platform/coda/coda-common.c          |   70 +-
+ drivers/media/platform/coda/coda.h                 |    5 +
+ drivers/media/platform/coda/imx-vdoa.c             |   49 +-
+ drivers/media/platform/davinci/Kconfig             |    1 +
+ drivers/media/platform/davinci/vpif.c              |   57 +-
+ drivers/media/platform/davinci/vpif_capture.c      |  232 +-
+ drivers/media/platform/davinci/vpif_display.c      |    5 +
+ drivers/media/platform/exynos-gsc/gsc-core.c       |   13 +-
+ drivers/media/platform/exynos-gsc/gsc-core.h       |    1 +
+ drivers/media/platform/exynos-gsc/gsc-m2m.c        |    8 +-
+ drivers/media/platform/exynos4-is/Kconfig          |    2 +
+ drivers/media/platform/exynos4-is/fimc-capture.c   |    7 +-
+ drivers/media/platform/exynos4-is/fimc-is.c        |    7 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c      |    4 +-
+ drivers/media/platform/exynos4-is/media-dev.c      |   13 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c      |    6 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c    |    1 +
+ drivers/media/platform/mtk-mdp/mtk_mdp_core.c      |   12 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |   10 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_util.h    |   20 +-
+ drivers/media/platform/omap3isp/isp.c              |   49 +-
+ drivers/media/platform/pxa_camera.c                |   77 +-
+ drivers/media/platform/qcom/venus/Makefile         |   11 +
+ drivers/media/platform/qcom/venus/core.c           |  390 ++++
+ drivers/media/platform/qcom/venus/core.h           |  324 +++
+ drivers/media/platform/qcom/venus/firmware.c       |  108 +
+ drivers/media/platform/qcom/venus/firmware.h       |   23 +
+ drivers/media/platform/qcom/venus/helpers.c        |  725 ++++++
+ drivers/media/platform/qcom/venus/helpers.h        |   45 +
+ drivers/media/platform/qcom/venus/hfi.c            |  522 +++++
+ drivers/media/platform/qcom/venus/hfi.h            |  175 ++
+ drivers/media/platform/qcom/venus/hfi_cmds.c       | 1259 +++++++++++
+ drivers/media/platform/qcom/venus/hfi_cmds.h       |  304 +++
+ drivers/media/platform/qcom/venus/hfi_helper.h     | 1050 +++++++++
+ drivers/media/platform/qcom/venus/hfi_msgs.c       | 1052 +++++++++
+ drivers/media/platform/qcom/venus/hfi_msgs.h       |  283 +++
+ drivers/media/platform/qcom/venus/hfi_venus.c      | 1572 +++++++++++++
+ drivers/media/platform/qcom/venus/hfi_venus.h      |   23 +
+ drivers/media/platform/qcom/venus/hfi_venus_io.h   |  113 +
+ drivers/media/platform/qcom/venus/vdec.c           | 1162 ++++++++++
+ drivers/media/platform/qcom/venus/vdec.h           |   23 +
+ drivers/media/platform/qcom/venus/vdec_ctrls.c     |  158 ++
+ drivers/media/platform/qcom/venus/venc.c           | 1283 +++++++++++
+ drivers/media/platform/qcom/venus/venc.h           |   23 +
+ drivers/media/platform/qcom/venus/venc_ctrls.c     |  270 +++
+ drivers/media/platform/rcar-vin/Kconfig            |    1 +
+ drivers/media/platform/rcar-vin/rcar-core.c        |   66 +-
+ drivers/media/platform/rcar-vin/rcar-dma.c         |  230 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c        |   97 +-
+ drivers/media/platform/rcar-vin/rcar-vin.h         |    9 +-
+ drivers/media/platform/rcar_drif.c                 | 1498 +++++++++++++
+ drivers/media/platform/rcar_fdp1.c                 |   12 +-
+ drivers/media/platform/s3c-camif/camif-capture.c   |    4 +-
+ drivers/media/platform/s5p-cec/s5p_cec.c           |    6 +-
+ drivers/media/platform/s5p-cec/s5p_cec.h           |    1 -
+ drivers/media/platform/s5p-jpeg/jpeg-core.c        |   20 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    |    2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |    2 +-
+ drivers/media/platform/sh_vou.c                    |    2 +
+ drivers/media/platform/soc_camera/soc_camera.c     |    7 +-
+ drivers/media/platform/soc_camera/soc_mediabus.c   |    1 +
+ drivers/media/platform/sti/cec/stih-cec.c          |   16 +-
+ drivers/media/platform/stm32/Makefile              |    2 +
+ drivers/media/platform/stm32/stm32-cec.c           |  362 +++
+ drivers/media/platform/stm32/stm32-dcmi.c          | 1404 ++++++++++++
+ drivers/media/platform/ti-vpe/cal.c                |   15 +-
+ drivers/media/platform/video-mux.c                 |  334 +++
+ drivers/media/platform/vimc/Kconfig                |    1 +
+ drivers/media/platform/vimc/Makefile               |   10 +-
+ drivers/media/platform/vimc/vimc-capture.c         |  321 +--
+ drivers/media/platform/vimc/vimc-capture.h         |   28 -
+ drivers/media/platform/vimc/vimc-common.c          |  473 ++++
+ drivers/media/platform/vimc/vimc-common.h          |  229 ++
+ drivers/media/platform/vimc/vimc-core.c            |  610 ++---
+ drivers/media/platform/vimc/vimc-core.h            |  112 -
+ drivers/media/platform/vimc/vimc-debayer.c         |  601 +++++
+ drivers/media/platform/vimc/vimc-scaler.c          |  455 ++++
+ drivers/media/platform/vimc/vimc-sensor.c          |  321 ++-
+ drivers/media/platform/vimc/vimc-sensor.h          |   28 -
+ drivers/media/platform/vivid/vivid-cec.c           |    6 +-
+ drivers/media/platform/xilinx/Kconfig              |    1 +
+ drivers/media/platform/xilinx/xilinx-vipp.c        |   63 +-
+ drivers/media/rc/Kconfig                           |    8 +-
+ drivers/media/rc/ati_remote.c                      |    3 -
+ drivers/media/rc/iguanair.c                        |    1 +
+ drivers/media/rc/img-ir/img-ir-hw.c                |    4 -
+ drivers/media/rc/imon.c                            |    2 +-
+ drivers/media/rc/ir-lirc-codec.c                   |   37 +-
+ drivers/media/rc/ir-spi.c                          |   11 +-
+ drivers/media/rc/lirc_dev.c                        |  254 +--
+ drivers/media/rc/mceusb.c                          |  158 +-
+ drivers/media/rc/meson-ir.c                        |   89 +-
+ drivers/media/rc/rc-core-priv.h                    |    2 +
+ drivers/media/rc/rc-ir-raw.c                       |   36 +-
+ drivers/media/rc/rc-main.c                         |  160 +-
+ drivers/media/rc/sir_ir.c                          |   94 +-
+ drivers/media/tuners/tda18271-fe.c                 |    2 +-
+ drivers/media/tuners/xc5000.c                      |   27 +-
+ drivers/media/usb/au0828/au0828-dvb.c              |   30 +
+ drivers/media/usb/au0828/au0828.h                  |    2 +
+ drivers/media/usb/cpia2/cpia2_core.c               |   51 +-
+ drivers/media/usb/cx231xx/Kconfig                  |    2 +
+ drivers/media/usb/cx231xx/cx231xx-cards.c          |   34 +
+ drivers/media/usb/cx231xx/cx231xx-dvb.c            |   49 +
+ drivers/media/usb/cx231xx/cx231xx-input.c          |    5 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c          |    2 +-
+ drivers/media/usb/cx231xx/cx231xx.h                |    1 +
+ drivers/media/usb/dvb-usb-v2/af9015.c              |  199 +-
+ drivers/media/usb/dvb-usb-v2/af9015.h              |    4 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c             |    1 +
+ drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c        |    4 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c            |   32 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.h            |    8 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c        |    1 +
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c         |    5 +
+ drivers/media/usb/dvb-usb/dw2102.c                 |    4 +-
+ drivers/media/usb/em28xx/em28xx-cards.c            |    4 +-
+ drivers/media/usb/em28xx/em28xx-core.c             |   35 +-
+ drivers/media/usb/gspca/m5602/m5602_s5k83a.c       |    5 +
+ drivers/media/usb/gspca/ov519.c                    |    3 +-
+ drivers/media/usb/pulse8-cec/pulse8-cec.c          |    9 +-
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c       |    2 +-
+ drivers/media/usb/pwc/pwc-v4l.c                    |    3 +-
+ drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |   14 +-
+ drivers/media/usb/s2255/s2255drv.c                 |    2 +
+ drivers/media/usb/tm6000/tm6000-input.c            |    4 -
+ drivers/media/usb/usbvision/usbvision-i2c.c        |    3 +
+ drivers/media/usb/usbvision/usbvision-video.c      |    4 +-
+ drivers/media/usb/uvc/uvc_driver.c                 |   34 +-
+ drivers/media/usb/uvc/uvc_video.c                  |    4 +-
+ drivers/media/v4l2-core/Kconfig                    |    3 +
+ drivers/media/v4l2-core/Makefile                   |    4 +-
+ drivers/media/v4l2-core/v4l2-async.c               |   29 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c               |   51 +-
+ drivers/media/v4l2-core/v4l2-event.c               |    8 +-
+ drivers/media/v4l2-core/v4l2-flash-led-class.c     |   12 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c              |  345 +++
+ drivers/media/v4l2-core/v4l2-ioctl.c               |   94 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c             |   37 +
+ drivers/media/v4l2-core/v4l2-of.c                  |  327 ---
+ drivers/media/v4l2-core/v4l2-subdev.c              |    8 +-
+ drivers/media/v4l2-core/videobuf2-core.c           |   40 +-
+ drivers/media/v4l2-core/videobuf2-dma-sg.c         |    8 +-
+ drivers/staging/media/Kconfig                      |    2 +
+ drivers/staging/media/Makefile                     |    1 +
+ drivers/staging/media/atomisp/i2c/Makefile         |    6 +
+ drivers/staging/media/atomisp/i2c/gc0310.c         |    1 +
+ drivers/staging/media/atomisp/i2c/imx/Makefile     |    7 +
+ drivers/staging/media/atomisp/i2c/lm3554.c         |    4 +-
+ drivers/staging/media/atomisp/i2c/mt9m114.c        |    2 +-
+ drivers/staging/media/atomisp/i2c/ov2680.c         |   15 +-
+ drivers/staging/media/atomisp/i2c/ov5693/Makefile  |    7 +
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.c  |    2 +-
+ .../staging/media/atomisp/pci/atomisp2/Makefile    |    7 +-
+ .../atomisp/pci/atomisp2/atomisp_compat_css20.c    |    1 -
+ .../media/atomisp/pci/atomisp2/atomisp_fops.c      |   14 +-
+ .../media/atomisp/pci/atomisp2/atomisp_ioctl.c     |    2 +-
+ .../media/atomisp/pci/atomisp2/atomisp_tpg.c       |    1 +
+ .../media/atomisp/pci/atomisp2/atomisp_v4l2.c      |    6 +-
+ .../media/atomisp/pci/atomisp2/css2400/Makefile    |    2 -
+ .../css2400/hive_isp_css_include/math_support.h    |    6 +-
+ .../css2400/hive_isp_css_include/string_support.h  |    9 +-
+ .../pci/atomisp2/css2400/ia_css_mmu_private.h      |    2 -
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c   |    6 +-
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c    |    2 +-
+ .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c      |    2 +-
+ .../css2400/isp/modes/interface/isp_const.h        |   16 -
+ .../css2400/isp/modes/interface/isp_exprs.h        |   23 -
+ .../atomisp2/css2400/runtime/binary/src/binary.c   |   36 +-
+ .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c   |    2 +-
+ .../css2400/runtime/debug/interface/ia_css_debug.h |    1 +
+ .../css2400/runtime/debug/src/ia_css_debug.c       |   13 +-
+ .../atomisp2/css2400/runtime/spctrl/src/spctrl.c   |   10 +-
+ .../media/atomisp/pci/atomisp2/css2400/sh_css.c    |  297 +--
+ .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c |   34 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_internal.h |    7 -
+ .../atomisp/pci/atomisp2/css2400/sh_css_irq.c      |   16 -
+ .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c     |    2 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_mmu.c      |    6 -
+ .../atomisp/pci/atomisp2/css2400/sh_css_params.c   |   24 +-
+ .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c   |    8 +-
+ .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c |    4 +-
+ .../platform/intel-mid/atomisp_gmin_platform.c     |  227 +-
+ .../platform/intel-mid/intel_mid_pcihelpers.c      |   12 +-
+ drivers/staging/media/cxd2099/cxd2099.c            |    6 +-
+ drivers/staging/media/imx/Kconfig                  |   21 +
+ drivers/staging/media/imx/Makefile                 |   12 +
+ drivers/staging/media/imx/TODO                     |   23 +
+ drivers/staging/media/imx/imx-ic-common.c          |  113 +
+ drivers/staging/media/imx/imx-ic-prp.c             |  518 +++++
+ drivers/staging/media/imx/imx-ic-prpencvf.c        | 1309 +++++++++++
+ drivers/staging/media/imx/imx-ic.h                 |   38 +
+ drivers/staging/media/imx/imx-media-capture.c      |  775 +++++++
+ drivers/staging/media/imx/imx-media-csi.c          | 1817 +++++++++++++++
+ drivers/staging/media/imx/imx-media-dev.c          |  667 ++++++
+ drivers/staging/media/imx/imx-media-fim.c          |  494 +++++
+ drivers/staging/media/imx/imx-media-internal-sd.c  |  349 +++
+ drivers/staging/media/imx/imx-media-of.c           |  270 +++
+ drivers/staging/media/imx/imx-media-utils.c        |  896 ++++++++
+ drivers/staging/media/imx/imx-media-vdic.c         | 1009 +++++++++
+ drivers/staging/media/imx/imx-media.h              |  325 +++
+ drivers/staging/media/imx/imx6-mipi-csi2.c         |  698 ++++++
+ drivers/staging/media/lirc/TODO                    |   47 +-
+ drivers/staging/media/lirc/TODO.lirc_zilog         |   36 -
+ drivers/staging/media/lirc/lirc_zilog.c            |  136 +-
+ include/linux/imx-media.h                          |   29 +
+ include/media/cec.h                                |   29 +
+ include/media/davinci/vpif_types.h                 |    9 +-
+ include/media/imx.h                                |   15 +
+ include/media/lirc_dev.h                           |   32 -
+ include/media/media-entity.h                       |   28 +
+ include/media/rc-core.h                            |    2 -
+ include/media/v4l2-async.h                         |    8 +-
+ include/media/v4l2-ctrls.h                         |   13 +
+ include/media/v4l2-flash-led-class.h               |    6 +-
+ include/media/{v4l2-of.h => v4l2-fwnode.h}         |   96 +-
+ include/media/v4l2-mem2mem.h                       |   92 +
+ include/media/v4l2-subdev.h                        |   16 +-
+ include/uapi/linux/cec.h                           |    2 +
+ include/uapi/linux/dvb/video.h                     |    3 +-
+ include/uapi/linux/max2175.h                       |   28 +
+ include/uapi/linux/media.h                         |    6 +
+ include/uapi/linux/v4l2-controls.h                 |   11 +-
+ include/uapi/linux/videodev2.h                     |    3 +
+ 348 files changed, 40503 insertions(+), 5135 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/cec.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/max2175.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/ov5640.txt
+ create mode 100644 Documentation/devicetree/bindings/media/imx.txt
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,venus.txt
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,drif.txt
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.txt
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
+ create mode 100644 Documentation/devicetree/bindings/media/video-mux.txt
+ create mode 100644 Documentation/media/kapi/v4l2-fwnode.rst
+ delete mode 100644 Documentation/media/kapi/v4l2-of.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu16be.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu18be.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-sdr-pcu20be.rst
+ create mode 100644 Documentation/media/v4l-drivers/imx.rst
+ create mode 100644 Documentation/media/v4l-drivers/max2175.rst
+ create mode 100644 drivers/media/dvb-frontends/stv0367_defs.h
+ create mode 100644 drivers/media/i2c/dw9714.c
+ create mode 100644 drivers/media/i2c/max2175.c
+ create mode 100644 drivers/media/i2c/max2175.h
+ create mode 100644 drivers/media/i2c/ov13858.c
+ create mode 100644 drivers/media/i2c/ov5640.c
+ create mode 100644 drivers/media/platform/qcom/venus/Makefile
+ create mode 100644 drivers/media/platform/qcom/venus/core.c
+ create mode 100644 drivers/media/platform/qcom/venus/core.h
+ create mode 100644 drivers/media/platform/qcom/venus/firmware.c
+ create mode 100644 drivers/media/platform/qcom/venus/firmware.h
+ create mode 100644 drivers/media/platform/qcom/venus/helpers.c
+ create mode 100644 drivers/media/platform/qcom/venus/helpers.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi.c
+ create mode 100644 drivers/media/platform/qcom/venus/hfi.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_cmds.c
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_cmds.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_helper.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_msgs.c
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_msgs.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_venus.c
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_venus.h
+ create mode 100644 drivers/media/platform/qcom/venus/hfi_venus_io.h
+ create mode 100644 drivers/media/platform/qcom/venus/vdec.c
+ create mode 100644 drivers/media/platform/qcom/venus/vdec.h
+ create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c
+ create mode 100644 drivers/media/platform/qcom/venus/venc.c
+ create mode 100644 drivers/media/platform/qcom/venus/venc.h
+ create mode 100644 drivers/media/platform/qcom/venus/venc_ctrls.c
+ create mode 100644 drivers/media/platform/rcar_drif.c
+ create mode 100644 drivers/media/platform/stm32/Makefile
+ create mode 100644 drivers/media/platform/stm32/stm32-cec.c
+ create mode 100644 drivers/media/platform/stm32/stm32-dcmi.c
+ create mode 100644 drivers/media/platform/video-mux.c
+ delete mode 100644 drivers/media/platform/vimc/vimc-capture.h
+ create mode 100644 drivers/media/platform/vimc/vimc-common.c
+ create mode 100644 drivers/media/platform/vimc/vimc-common.h
+ delete mode 100644 drivers/media/platform/vimc/vimc-core.h
+ create mode 100644 drivers/media/platform/vimc/vimc-debayer.c
+ create mode 100644 drivers/media/platform/vimc/vimc-scaler.c
+ delete mode 100644 drivers/media/platform/vimc/vimc-sensor.h
+ create mode 100644 drivers/media/v4l2-core/v4l2-fwnode.c
+ delete mode 100644 drivers/media/v4l2-core/v4l2-of.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c
+ create mode 100644 drivers/staging/media/imx/Kconfig
+ create mode 100644 drivers/staging/media/imx/Makefile
+ create mode 100644 drivers/staging/media/imx/TODO
+ create mode 100644 drivers/staging/media/imx/imx-ic-common.c
+ create mode 100644 drivers/staging/media/imx/imx-ic-prp.c
+ create mode 100644 drivers/staging/media/imx/imx-ic-prpencvf.c
+ create mode 100644 drivers/staging/media/imx/imx-ic.h
+ create mode 100644 drivers/staging/media/imx/imx-media-capture.c
+ create mode 100644 drivers/staging/media/imx/imx-media-csi.c
+ create mode 100644 drivers/staging/media/imx/imx-media-dev.c
+ create mode 100644 drivers/staging/media/imx/imx-media-fim.c
+ create mode 100644 drivers/staging/media/imx/imx-media-internal-sd.c
+ create mode 100644 drivers/staging/media/imx/imx-media-of.c
+ create mode 100644 drivers/staging/media/imx/imx-media-utils.c
+ create mode 100644 drivers/staging/media/imx/imx-media-vdic.c
+ create mode 100644 drivers/staging/media/imx/imx-media.h
+ create mode 100644 drivers/staging/media/imx/imx6-mipi-csi2.c
+ delete mode 100644 drivers/staging/media/lirc/TODO.lirc_zilog
+ create mode 100644 include/linux/imx-media.h
+ create mode 100644 include/media/imx.h
+ rename include/media/{v4l2-of.h => v4l2-fwnode.h} (50%)
+ create mode 100644 include/uapi/linux/max2175.h
+Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
+$ git merge reset-fixes/reset/fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging drm-misc-fixes/for-linux-next-fixes (e94ac3510b6a drm: Fix GETCONNECTOR regression)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging kbuild/for-next (39be5eac380d Merge branches 'misc', 'kbuild' and 'thin-ar' into for-next)
+$ git merge kbuild/for-next
+Auto-merging arch/x86/Makefile
+Auto-merging arch/powerpc/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/kbuild.txt      |  8 ++++--
+ Documentation/kbuild/makefiles.txt   | 41 +++++--------------------------
+ Documentation/process/changes.rst    |  9 +++----
+ Makefile                             | 26 +++++++-------------
+ arch/Kconfig                         |  2 +-
+ arch/arm/include/uapi/asm/Kbuild     |  6 ++---
+ arch/ia64/kernel/Makefile.gate       | 18 +++++++++-----
+ arch/powerpc/Kconfig                 |  8 ------
+ arch/sh/kernel/vsyscall/Makefile     | 18 ++++++++------
+ arch/sparc/lib/hweight.S             | 16 ++++++------
+ arch/tile/kernel/vdso/Makefile       | 27 +++++++++++----------
+ arch/x86/Makefile                    | 33 +++++++++++++++++++------
+ arch/x86/Makefile_32.cpu             |  7 +++---
+ arch/x86/include/uapi/asm/Kbuild     |  6 ++---
+ arch/x86/um/vdso/Makefile            |  2 +-
+ scripts/Kbuild.include               | 19 +++++++++------
+ scripts/Makefile.asm-generic         |  2 +-
+ scripts/Makefile.build               |  8 +++---
+ scripts/Makefile.host                |  6 -----
+ scripts/bootgraph.pl                 |  2 +-
+ scripts/checkincludes.pl             |  2 +-
+ scripts/checkpatch.pl                |  3 ++-
+ scripts/checkstack.pl                |  2 +-
+ scripts/checksyscalls.sh             | 11 +++------
+ scripts/checkversion.pl              |  2 +-
+ scripts/cleanfile                    |  3 ++-
+ scripts/cleanpatch                   |  3 ++-
+ scripts/dtc/dt_to_config             |  2 +-
+ scripts/export_report.pl             |  3 ++-
+ scripts/extract-module-sig.pl        |  3 ++-
+ scripts/extract-sys-certs.pl         |  3 ++-
+ scripts/extract_xc3028.pl            |  2 +-
+ scripts/get_dvb_firmware             |  2 +-
+ scripts/get_maintainer.pl            |  3 ++-
+ scripts/headerdep.pl                 |  2 +-
+ scripts/headers_check.pl             |  3 ++-
+ scripts/kconfig/streamline_config.pl |  3 ++-
+ scripts/kernel-doc                   |  3 ++-
+ scripts/kernel-doc-xml-ref           |  3 ++-
+ scripts/link-vmlinux.sh              | 47 ++++++++++++++++++++++++++++--------
+ scripts/markup_oops.pl               |  2 +-
+ scripts/mkcompile_h                  |  2 +-
+ scripts/namespace.pl                 |  4 +--
+ scripts/profile2linkerlist.pl        |  2 +-
+ scripts/recordmcount.pl              |  3 ++-
+ scripts/stackdelta                   |  2 +-
+ tools/build/Makefile.build           |  8 +-----
+ tools/scripts/Makefile.include       |  8 +-----
+ 48 files changed, 203 insertions(+), 197 deletions(-)
+Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static)
+$ git merge uuid/for-next
+Auto-merging include/acpi/acpi_bus.h
+Removing fs/xfs/uuid.h
+Removing fs/xfs/uuid.c
+Auto-merging fs/ext4/super.c
+Auto-merging drivers/usb/host/xhci-pci.c
+Auto-merging drivers/scsi/scsi_debug.c
+Auto-merging drivers/nvme/host/fc.c
+Auto-merging drivers/md/md.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        | 11 +++
+ arch/s390/include/asm/sysinfo.h                    |  4 +-
+ arch/s390/kernel/sysinfo.c                         |  2 +-
+ block/partitions/ldm.c                             | 10 +--
+ block/partitions/ldm.h                             |  6 +-
+ drivers/acpi/acpi_extlog.c                         | 20 ++---
+ drivers/acpi/apei/ghes.c                           |  8 +-
+ drivers/acpi/bus.c                                 | 29 +------
+ drivers/acpi/nfit/core.c                           | 54 ++++++------
+ drivers/acpi/nfit/nfit.h                           |  3 +-
+ drivers/acpi/utils.c                               | 16 ++--
+ drivers/char/tpm/tpm_crb.c                         |  9 +-
+ drivers/char/tpm/tpm_ppi.c                         | 20 ++---
+ drivers/gpu/drm/i915/intel_acpi.c                  | 14 ++-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c             | 20 ++---
+ drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c     |  9 +-
+ drivers/hid/i2c-hid/i2c-hid.c                      |  9 +-
+ drivers/iommu/dmar.c                               | 11 ++-
+ drivers/md/md.c                                    |  8 +-
+ drivers/mmc/host/sdhci-pci-core.c                  |  9 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 15 ++--
+ drivers/nvdimm/btt_devs.c                          |  9 +-
+ drivers/nvme/host/fabrics.c                        |  8 +-
+ drivers/nvme/host/fabrics.h                        |  2 +-
+ drivers/nvme/host/fc.c                             |  3 +-
+ drivers/nvme/target/nvmet.h                        |  1 +
+ drivers/pci/pci-acpi.c                             | 13 ++-
+ drivers/pci/pci-label.c                            |  4 +-
+ drivers/scsi/scsi_debug.c                          | 10 +--
+ drivers/thermal/int340x_thermal/int3400_thermal.c  |  8 +-
+ drivers/usb/dwc3/dwc3-pci.c                        | 10 +--
+ drivers/usb/host/xhci-pci.c                        |  9 +-
+ drivers/usb/misc/ucsi.c                            |  6 +-
+ drivers/usb/typec/typec_wcove.c                    |  8 +-
+ drivers/xen/tmem.c                                 |  6 +-
+ fs/afs/cmservice.c                                 | 16 ++--
+ fs/afs/internal.h                                  | 11 ++-
+ fs/afs/main.c                                      |  2 +-
+ fs/ext4/super.c                                    |  2 +-
+ fs/f2fs/super.c                                    |  2 +-
+ fs/gfs2/ops_fstype.c                               |  2 +-
+ fs/gfs2/sys.c                                      | 22 ++---
+ fs/nfsd/export.c                                   |  4 +-
+ fs/ocfs2/super.c                                   |  2 +-
+ fs/overlayfs/copy_up.c                             |  7 +-
+ fs/overlayfs/namei.c                               |  2 +-
+ fs/overlayfs/overlayfs.h                           |  2 +-
+ fs/xfs/Makefile                                    |  3 +-
+ fs/xfs/uuid.c                                      | 63 --------------
+ fs/xfs/uuid.h                                      | 35 --------
+ fs/xfs/xfs_inode_item.c                            |  8 +-
+ fs/xfs/xfs_linux.h                                 |  2 +-
+ fs/xfs/xfs_log_recover.c                           |  6 +-
+ fs/xfs/xfs_mount.c                                 | 16 ++--
+ include/acpi/acpi_bus.h                            | 11 +--
+ include/linux/acpi.h                               |  4 +-
+ include/linux/cleancache.h                         |  2 +-
+ include/linux/fs.h                                 |  5 +-
+ include/linux/genhd.h                              | 11 ---
+ include/linux/nvme-fc.h                            |  3 +-
+ include/linux/nvme.h                               |  3 +-
+ include/linux/pci-acpi.h                           |  2 +-
+ include/linux/uuid.h                               | 99 ++++++++++++++--------
+ include/uapi/linux/uuid.h                          | 28 ++----
+ kernel/sysctl_binary.c                             |  4 +-
+ lib/test_uuid.c                                    | 36 ++++----
+ lib/uuid.c                                         | 33 ++++----
+ lib/vsprintf.c                                     |  4 +-
+ mm/cleancache.c                                    |  2 +-
+ mm/shmem.c                                         |  2 +
+ security/integrity/evm/evm_crypto.c                |  2 +-
+ security/integrity/ima/ima_policy.c                | 12 ++-
+ sound/soc/intel/skylake/skl-nhlt.c                 |  7 +-
+ tools/testing/nvdimm/test/iomap.c                  |  6 +-
+ tools/testing/nvdimm/test/nfit.c                   |  2 +-
+ tools/testing/nvdimm/test/nfit_test.h              |  4 +-
+ 76 files changed, 373 insertions(+), 500 deletions(-)
+ delete mode 100644 fs/xfs/uuid.c
+ delete mode 100644 fs/xfs/uuid.h
+Merging dma-mapping/for-next (020278bbae01 ARM: dma-mapping: Remove traces of NOMMU code)
+$ git merge dma-mapping/for-next
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt                    |  31 +--
+ .../bindings/reserved-memory/reserved-memory.txt   |   3 +
+ Documentation/driver-model/devres.txt              |   3 +-
+ MAINTAINERS                                        |  15 ++
+ arch/arm/Kconfig                                   |   1 +
+ arch/arm/common/dmabounce.c                        |  19 +-
+ arch/arm/include/asm/dma-iommu.h                   |   4 +
+ arch/arm/include/asm/dma-mapping.h                 |   6 +-
+ arch/arm/mm/Kconfig                                |   8 +-
+ arch/arm/mm/Makefile                               |   5 +-
+ arch/arm/mm/dma-mapping-nommu.c                    | 246 +++++++++++++++++++++
+ arch/arm/mm/dma-mapping.c                          |  77 +++----
+ arch/arm/xen/mm.c                                  |  17 --
+ arch/arm64/include/asm/dma-mapping.h               |   1 -
+ arch/arm64/mm/dma-mapping.c                        |   3 +-
+ arch/c6x/include/asm/dma-mapping.h                 |   5 -
+ arch/hexagon/include/asm/dma-mapping.h             |   5 -
+ arch/hexagon/kernel/dma.c                          |  21 +-
+ arch/hexagon/kernel/hexagon_ksyms.c                |   1 -
+ arch/ia64/include/asm/dma-mapping.h                |   2 -
+ arch/m32r/include/asm/dma-mapping.h                |   2 -
+ arch/microblaze/include/asm/dma-mapping.h          |   2 -
+ arch/mips/loongson64/common/dma-swiotlb.c          |  19 +-
+ arch/openrisc/include/asm/dma-mapping.h            |   9 -
+ arch/powerpc/include/asm/dma-mapping.h             |   5 -
+ arch/powerpc/include/asm/iommu.h                   |   4 +
+ arch/powerpc/kernel/dma-iommu.c                    |   6 +
+ arch/powerpc/kernel/dma.c                          |  17 +-
+ arch/powerpc/kernel/iommu.c                        |  28 +--
+ arch/powerpc/platforms/cell/iommu.c                |  53 ++---
+ arch/powerpc/platforms/pseries/vio.c               |   3 +-
+ arch/s390/include/asm/dma-mapping.h                |   2 -
+ arch/s390/pci/pci_dma.c                            |  18 +-
+ arch/sh/include/asm/dma-mapping.h                  |   2 -
+ arch/sparc/include/asm/dma-mapping.h               |   8 +-
+ arch/sparc/kernel/iommu.c                          |  52 +++--
+ arch/sparc/kernel/iommu_common.h                   |   2 +
+ arch/sparc/kernel/ioport.c                         |  27 +--
+ arch/sparc/kernel/pci_sun4v.c                      |  31 ++-
+ arch/tile/kernel/pci-dma.c                         |  30 ---
+ arch/x86/include/asm/dma-mapping.h                 |   5 -
+ arch/x86/include/asm/iommu.h                       |   2 +
+ arch/x86/kernel/amd_gart_64.c                      |   1 +
+ arch/x86/kernel/pci-calgary_64.c                   |  25 ++-
+ arch/x86/kernel/pci-dma.c                          |   8 +-
+ arch/x86/kernel/pci-nommu.c                        |  11 +-
+ arch/x86/pci/sta2x11-fixup.c                       |   3 +-
+ arch/x86/xen/pci-swiotlb-xen.c                     |  14 --
+ arch/xtensa/include/asm/dma-mapping.h              |   2 -
+ drivers/base/dma-coherent.c                        |  74 ++++++-
+ drivers/base/dma-mapping.c                         |  56 ++---
+ drivers/crypto/qat/qat_common/qat_algs.c           |  40 ++--
+ drivers/dma/ioat/init.c                            |  24 +-
+ drivers/firmware/tegra/ivc.c                       |   4 +-
+ drivers/gpu/drm/armada/armada_fb.c                 |   2 +-
+ drivers/gpu/drm/armada/armada_gem.c                |   5 +-
+ drivers/gpu/drm/armada/armada_gem.h                |   1 +
+ drivers/gpu/drm/exynos/exynos_drm_fb.c             |   4 +-
+ drivers/iommu/amd_iommu.c                          |  20 +-
+ drivers/iommu/dma-iommu.c                          |  18 +-
+ drivers/iommu/intel-iommu.c                        |   3 +
+ drivers/net/ethernet/ibm/ibmveth.c                 | 159 +++++++------
+ drivers/video/fbdev/au1100fb.c                     |   4 -
+ drivers/video/fbdev/au1200fb.c                     |   5 +-
+ drivers/xen/swiotlb-xen.c                          | 113 +++++-----
+ include/linux/dma-mapping.h                        |  20 +-
+ include/xen/swiotlb-xen.h                          |  62 +-----
+ lib/dma-noop.c                                     |  21 +-
+ lib/dma-virt.c                                     |  12 -
+ 69 files changed, 788 insertions(+), 723 deletions(-)
+ create mode 100644 arch/arm/mm/dma-mapping-nommu.c
+Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/configs/nps_defconfig          |  1 -
+ arch/arc/configs/tb10x_defconfig        |  1 -
+ arch/arc/include/asm/irqflags-arcv2.h   |  3 ---
+ arch/arc/include/asm/irqflags-compact.h |  2 --
+ arch/arc/include/asm/spinlock.h         | 12 ++++++++++++
+ arch/arc/kernel/entry-compact.S         | 22 +++++++++++-----------
+ arch/arc/kernel/process.c               | 29 +++++++++++++++++++++++++++--
+ arch/arc/kernel/setup.c                 |  6 +++---
+ arch/arc/kernel/traps.c                 |  2 +-
+ arch/arc/mm/cache.c                     |  2 +-
+ arch/arc/mm/fault.c                     |  2 +-
+ arch/arc/mm/tlb.c                       |  2 +-
+ arch/arc/mm/tlbex.S                     |  9 +++++++++
+ arch/arc/plat-eznps/Kconfig             | 15 +++++++++++++--
+ arch/arc/plat-eznps/include/plat/ctop.h |  1 +
+ arch/arc/plat-eznps/mtm.c               | 11 +++++++++--
+ 16 files changed, 89 insertions(+), 31 deletions(-)
+Merging arm/for-next (06dbb655be93 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Auto-merging mm/mmap.c
+Auto-merging arch/arm/mm/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig                  |   1 +
+ arch/arm/include/asm/bitops.h     |   8 +--
+ arch/arm/include/asm/ftrace.h     |   4 ++
+ arch/arm/include/asm/page-nommu.h |   6 ---
+ arch/arm/kernel/entry-ftrace.S    | 100 ++++++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/ftrace.c          |  37 ++++++++++++++
+ arch/arm/kernel/process.c         |  16 ++++--
+ arch/arm/kernel/vdso.c            |  18 +++++++
+ arch/arm/mm/Kconfig               |   6 ++-
+ arch/x86/entry/vdso/vma.c         |   3 --
+ mm/mmap.c                         |   4 ++
+ 11 files changed, 185 insertions(+), 18 deletions(-)
+Merging arm-perf/for-next/perf (c0f7f7acdecd perf: xgene: Add support for SoC PMU version 3)
+$ git merge arm-perf/for-next/perf
+Merge made by the 'recursive' strategy.
+ arch/arm/kernel/perf_event_v6.c |   2 +-
+ arch/arm64/kernel/perf_event.c  |   2 +-
+ drivers/perf/Kconfig            |   9 +-
+ drivers/perf/xgene_pmu.c        | 684 ++++++++++++++++++++++++++++++++++++----
+ 4 files changed, 635 insertions(+), 62 deletions(-)
+Merging arm-soc/for-next (b0ebfd91e549 arm-soc: document merges)
+$ git merge arm-soc/for-next
+Removing arch/arm/mach-omap2/pmu.c
+Removing arch/arm/mach-omap2/opp.c
+Removing arch/arm/boot/dts/tegra20-whistler.dts
+Auto-merging arch/arm/boot/dts/rv1108.dtsi
+Auto-merging arch/arm/boot/dts/rv1108-evb.dts
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/i2c/i2c-mtk.txt
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Atmel/README                     |  38 +-
+ Documentation/devicetree/bindings/arm/actions.txt  |  39 ++
+ Documentation/devicetree/bindings/arm/amlogic.txt  |  23 +-
+ .../devicetree/bindings/arm/atmel-at91.txt         |  30 +
+ .../devicetree/bindings/arm/bcm/brcm,stingray.txt  |  12 +
+ Documentation/devicetree/bindings/arm/ccn.txt      |   1 +
+ Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
+ Documentation/devicetree/bindings/arm/gemini.txt   |  24 +-
+ .../bindings/arm/hisilicon/hisilicon.txt           |   4 +
+ .../devicetree/bindings/arm/keystone/keystone.txt  |   3 +
+ Documentation/devicetree/bindings/arm/mediatek.txt |   8 +
+ Documentation/devicetree/bindings/arm/realtek.txt  |  20 +
+ Documentation/devicetree/bindings/arm/rockchip.txt |   8 +-
+ Documentation/devicetree/bindings/arm/shmobile.txt |  13 +-
+ Documentation/devicetree/bindings/arm/tegra.txt    |   1 -
+ .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |   2 +-
+ .../devicetree/bindings/bus/brcm,gisb-arb.txt      |   3 +-
+ .../bindings/clock/brcm,iproc-clocks.txt           |  76 ++
+ .../devicetree/bindings/cpufreq/ti-cpufreq.txt     |  20 +-
+ .../devicetree/bindings/gpio/gpio_atmel.txt        |  10 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.txt   |  86 +++
+ .../bindings/i2c/{i2c-mt6577.txt => i2c-mtk.txt}   |  10 +-
+ .../interrupt-controller/mediatek,sysirq.txt       |  28 +-
+ Documentation/devicetree/bindings/mfd/hi6421.txt   |   4 +-
+ .../devicetree/bindings/mmc/fsl-esdhc.txt          |  14 +
+ .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   1 +
+ .../devicetree/bindings/mtd/atmel-nand.txt         |  14 +
+ .../devicetree/bindings/pci/kirin-pcie.txt         |  50 ++
+ .../devicetree/bindings/power/actions,owl-sps.txt  |  17 +
+ .../devicetree/bindings/reset/ti,sci-reset.txt     |  62 ++
+ .../devicetree/bindings/serial/mtk-uart.txt        |   2 +
+ .../devicetree/bindings/soc/mediatek/scpsys.txt    |   6 +-
+ .../bindings/timer/actions,owl-timer.txt           |  20 +
+ .../devicetree/bindings/vendor-prefixes.txt        |   5 +
+ MAINTAINERS                                        |  27 +-
+ arch/arm/Kconfig                                   |   3 +
+ arch/arm/Kconfig.debug                             |  41 ++
+ arch/arm/Makefile                                  |   1 +
+ arch/arm/arm-soc-for-next-contents.txt             | 246 +++++++
+ arch/arm/boot/dts/Makefile                         |  27 +-
+ arch/arm/boot/dts/aks-cdu.dts                      |  56 +-
+ arch/arm/boot/dts/am335x-baltos.dtsi               |   2 +-
+ arch/arm/boot/dts/am335x-base0033.dts              |   2 +-
+ arch/arm/boot/dts/am335x-bone-common.dtsi          |  10 +-
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts    |   5 +
+ arch/arm/boot/dts/am335x-boneblack.dts             |   2 +-
+ arch/arm/boot/dts/am335x-boneblue.dts              | 460 ++++++++++++
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts    |   5 +
+ arch/arm/boot/dts/am335x-nano.dts                  |   2 +-
+ arch/arm/boot/dts/am335x-pepper.dts                |   2 +-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi          |   2 +-
+ arch/arm/boot/dts/am335x-shc.dts                   |   2 +-
+ arch/arm/boot/dts/am335x-sl50.dts                  |   2 +-
+ arch/arm/boot/dts/am33xx.dtsi                      |  26 +-
+ arch/arm/boot/dts/am4372.dtsi                      |  10 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts                |   2 -
+ arch/arm/boot/dts/am437x-idk-evm.dts               |   2 +-
+ arch/arm/boot/dts/am437x-sk-evm.dts                |   4 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts               |   4 +-
+ arch/arm/boot/dts/am43xx-clocks.dtsi               |  36 +
+ arch/arm/boot/dts/am571x-idk.dts                   |  17 +
+ arch/arm/boot/dts/am572x-idk.dts                   |  20 +
+ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi    |   2 +-
+ arch/arm/boot/dts/animeo_ip.dts                    |  53 +-
+ arch/arm/boot/dts/armada-370.dtsi                  |  19 +-
+ arch/arm/boot/dts/armada-385-linksys-caiman.dts    | 187 +++--
+ arch/arm/boot/dts/armada-385-linksys-cobra.dts     | 187 +++--
+ arch/arm/boot/dts/armada-385-linksys-rango.dts     | 203 ++++++
+ arch/arm/boot/dts/armada-385-linksys-shelby.dts    | 187 +++--
+ arch/arm/boot/dts/armada-385-linksys.dtsi          | 362 ++++------
+ arch/arm/boot/dts/armada-385-turris-omnia.dts      |   2 +-
+ arch/arm/boot/dts/armada-38x.dtsi                  |  16 +-
+ arch/arm/boot/dts/armada-xp-98dx3236.dtsi          |   4 +
+ arch/arm/boot/dts/armada-xp-98dx4251.dtsi          |   1 +
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts      |   8 +-
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi           |  16 +-
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi           |  19 +-
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi           |  19 +-
+ arch/arm/boot/dts/aspeed-g4.dtsi                   |   7 +-
+ arch/arm/boot/dts/aspeed-g5.dtsi                   |   7 +-
+ arch/arm/boot/dts/at91-cosino.dtsi                 |  83 ++-
+ arch/arm/boot/dts/at91-kizbox.dts                  |  42 +-
+ arch/arm/boot/dts/at91-kizbox2.dts                 |  45 +-
+ arch/arm/boot/dts/at91-kizboxmini.dts              |  52 +-
+ arch/arm/boot/dts/at91-linea.dtsi                  |  27 +-
+ arch/arm/boot/dts/at91-qil_a9260.dts               | 103 +--
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts        |  32 +-
+ arch/arm/boot/dts/at91-sama5d3_xplained.dts        |  97 +--
+ arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi          |   4 +-
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts        |  83 ++-
+ arch/arm/boot/dts/at91-sama5d4ek.dts               |  83 ++-
+ arch/arm/boot/dts/at91-tse850-3.dts                |  72 +-
+ arch/arm/boot/dts/at91sam9260.dtsi                 |  65 +-
+ arch/arm/boot/dts/at91sam9261.dtsi                 |  48 +-
+ arch/arm/boot/dts/at91sam9261ek.dts                |  83 ++-
+ arch/arm/boot/dts/at91sam9263.dtsi                 |  89 ++-
+ arch/arm/boot/dts/at91sam9263ek.dts                | 103 +--
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi        | 103 +--
+ arch/arm/boot/dts/at91sam9g45.dtsi                 |  64 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts             |  49 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi                 |  74 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts                |  26 +-
+ arch/arm/boot/dts/at91sam9rl.dtsi                  |  69 +-
+ arch/arm/boot/dts/at91sam9rlek.dts                 |  85 ++-
+ arch/arm/boot/dts/at91sam9x5.dtsi                  | 134 ++--
+ arch/arm/boot/dts/at91sam9x5cm.dtsi                |  83 ++-
+ arch/arm/boot/dts/axp209.dtsi                      |   5 +
+ arch/arm/boot/dts/axp22x.dtsi                      |   5 +
+ arch/arm/boot/dts/bcm-cygnus.dtsi                  |  71 ++
+ arch/arm/boot/dts/bcm-nsp.dtsi                     |  26 +
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts             |   2 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi                 |   2 +-
+ arch/arm/boot/dts/bcm2835.dtsi                     |   4 +
+ arch/arm/boot/dts/bcm2836.dtsi                     |   4 +
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts              |   1 +
+ arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi         |  10 +
+ arch/arm/boot/dts/bcm283x.dtsi                     |  27 +
+ arch/arm/boot/dts/bcm5301x.dtsi                    |  34 +
+ arch/arm/boot/dts/bcm911360_entphn.dts             |  20 +
+ arch/arm/boot/dts/da850-evm.dts                    |   2 +
+ arch/arm/boot/dts/da850-lego-ev3.dts               |  28 +
+ arch/arm/boot/dts/da850.dtsi                       |  29 +-
+ arch/arm/boot/dts/dra7-evm.dts                     |   3 +-
+ arch/arm/boot/dts/dra7.dtsi                        |   4 +-
+ arch/arm/boot/dts/dra72-evm-common.dtsi            |   3 +-
+ arch/arm/boot/dts/dra7xx-clocks.dtsi               |  20 +
+ arch/arm/boot/dts/emev2.dtsi                       |   2 +-
+ arch/arm/boot/dts/ethernut5.dts                    |  47 +-
+ arch/arm/boot/dts/exynos3250-monk.dts              |   6 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts            |   8 +-
+ arch/arm/boot/dts/exynos4210-origen.dts            |   2 +-
+ arch/arm/boot/dts/exynos4210-trats.dts             |   4 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |   6 +-
+ arch/arm/boot/dts/exynos4412-odroidu3.dts          |   4 +
+ arch/arm/boot/dts/exynos4412-odroidx.dts           |   2 +-
+ arch/arm/boot/dts/exynos4412-trats2.dts            |   8 +-
+ arch/arm/boot/dts/exynos5.dtsi                     |  84 +--
+ arch/arm/boot/dts/exynos5250-arndale.dts           |   1 -
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi          |   7 +
+ arch/arm/boot/dts/exynos5250-smdk5250.dts          |   1 -
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi      |   4 +
+ arch/arm/boot/dts/exynos5250-spring.dts            |   1 -
+ arch/arm/boot/dts/exynos5250.dtsi                  |  21 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts      |   1 -
+ arch/arm/boot/dts/exynos5420-peach-pit.dts         |   5 +-
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi          |   7 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts          |   1 -
+ arch/arm/boot/dts/exynos5420.dtsi                  |  89 ++-
+ arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |   2 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |   5 +-
+ arch/arm/boot/dts/exynos5440.dtsi                  |   2 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts          |   5 +-
+ arch/arm/boot/dts/ge863-pro3.dtsi                  |  41 +-
+ arch/arm/boot/dts/gemini-nas4220b.dts              |  10 +
+ arch/arm/boot/dts/gemini-sq201.dts                 |  10 +
+ arch/arm/boot/dts/gemini.dtsi                      |  81 ++-
+ arch/arm/boot/dts/imx23-sansa.dts                  |   7 +-
+ arch/arm/boot/dts/imx25-karo-tx25.dts              |   2 +-
+ arch/arm/boot/dts/imx25-pdk.dts                    |   2 +-
+ arch/arm/boot/dts/imx25.dtsi                       |   1 +
+ arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi  |   2 +-
+ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi    |   2 +-
+ arch/arm/boot/dts/imx28-cfa10037.dts               |   2 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts               |   2 +-
+ arch/arm/boot/dts/imx28-cfa10057.dts               |   2 +-
+ arch/arm/boot/dts/imx28-cfa10058.dts               |   2 +-
+ arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts       |   2 +-
+ arch/arm/boot/dts/imx28-evk.dts                    |   4 +-
+ arch/arm/boot/dts/imx28-m28cu3.dts                 |   2 +-
+ arch/arm/boot/dts/imx50-evk.dts                    |   2 +-
+ arch/arm/boot/dts/imx50.dtsi                       |   1 +
+ arch/arm/boot/dts/imx51-apf51.dts                  |   2 +-
+ arch/arm/boot/dts/imx53-mba53.dts                  |   2 +-
+ arch/arm/boot/dts/imx53-qsb-common.dtsi            |   2 +-
+ arch/arm/boot/dts/imx53-smd.dts                    |   2 +-
+ arch/arm/boot/dts/imx53-tqma53.dtsi                |   2 +-
+ arch/arm/boot/dts/imx53-tx53.dtsi                  |   2 +-
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi        |   2 +-
+ arch/arm/boot/dts/imx6dl-gw560x.dts                |  55 ++
+ arch/arm/boot/dts/imx6dl-riotboard.dts             |   2 +-
+ arch/arm/boot/dts/imx6dl-sabrelite.dts             |   5 +
+ arch/arm/boot/dts/imx6dl-sabresd.dts               |   5 +
+ arch/arm/boot/dts/imx6dl.dtsi                      | 189 +++++
+ arch/arm/boot/dts/imx6q-ba16.dtsi                  |   2 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts                 |  43 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            |   4 +-
+ arch/arm/boot/dts/imx6q-evi.dts                    |   2 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts               |   7 +-
+ arch/arm/boot/dts/imx6q-gw560x.dts                 |  59 ++
+ arch/arm/boot/dts/imx6q-novena.dts                 |   4 +-
+ arch/arm/boot/dts/imx6q-sabrelite.dts              |   5 +
+ arch/arm/boot/dts/imx6q-sabresd.dts                |   5 +
+ arch/arm/boot/dts/imx6q-utilite-pro.dts            |   2 +-
+ arch/arm/boot/dts/imx6q-zii-rdu2.dts               |   4 +-
+ arch/arm/boot/dts/imx6q.dtsi                       | 127 +++-
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi             |   2 +-
+ arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |   2 +-
+ arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |   4 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi             |   1 +
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |   5 -
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |   5 -
+ arch/arm/boot/dts/imx6qdl-gw560x.dtsi              | 749 ++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi     |   2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |   2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi      |   2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |   2 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |   2 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           | 131 +++-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           | 152 +++-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi             | 116 ++-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |   5 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |   3 +-
+ arch/arm/boot/dts/imx6qdl.dtsi                     |  60 +-
+ arch/arm/boot/dts/imx6qp-zii-rdu2.dts              |   4 +-
+ arch/arm/boot/dts/imx6qp.dtsi                      |   4 +
+ arch/arm/boot/dts/imx6sl.dtsi                      |   3 +
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts           |   4 +-
+ arch/arm/boot/dts/imx6sx-sdb.dts                   |   8 +
+ arch/arm/boot/dts/imx6sx.dtsi                      |   3 +
+ arch/arm/boot/dts/imx6ul-opos6ul.dtsi              |   2 +-
+ arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts       |   2 +-
+ arch/arm/boot/dts/imx6ul-tx6ul.dtsi                |   7 +-
+ arch/arm/boot/dts/imx6ul.dtsi                      |   1 +
+ arch/arm/boot/dts/imx7-colibri.dtsi                |   2 +-
+ arch/arm/boot/dts/imx7d-nitrogen7.dts              |   6 +-
+ arch/arm/boot/dts/imx7d-pico.dts                   | 403 +++++++++++
+ arch/arm/boot/dts/imx7d-pinfunc.h                  |   6 +-
+ arch/arm/boot/dts/imx7d-sdb.dts                    | 133 +++-
+ arch/arm/boot/dts/imx7d.dtsi                       |  37 +
+ arch/arm/boot/dts/imx7s-warp.dts                   |   3 +-
+ arch/arm/boot/dts/imx7s.dtsi                       |  50 +-
+ arch/arm/boot/dts/keystone-k2g-evm.dts             |   2 +-
+ arch/arm/boot/dts/keystone-k2g-ice.dts             |  35 +
+ arch/arm/boot/dts/keystone-k2g.dtsi                |   3 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts       |   2 +-
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi         |   4 +
+ arch/arm/boot/dts/ls1021a.dtsi                     |  90 +--
+ arch/arm/boot/dts/meson.dtsi                       | 213 ++++--
+ arch/arm/boot/dts/meson6-atv1200.dts               |   2 +-
+ arch/arm/boot/dts/meson6.dtsi                      |   4 +-
+ arch/arm/boot/dts/meson8.dtsi                      | 240 +++++--
+ arch/arm/boot/dts/meson8b.dtsi                     | 272 +++----
+ arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi     |  16 +
+ arch/arm/boot/dts/moxart.dtsi                      |   3 +-
+ arch/arm/boot/dts/mt2701-evb.dts                   | 132 ++++
+ arch/arm/boot/dts/mt2701.dtsi                      | 179 ++++-
+ arch/arm/boot/dts/mt7623.dtsi                      | 546 ++++++++++++++-
+ arch/arm/boot/dts/omap3-cm-t3x.dtsi                |   2 +-
+ arch/arm/boot/dts/omap3-devkit8000-common.dtsi     |   9 +-
+ arch/arm/boot/dts/omap3-evm-37xx.dts               | 102 +++
+ arch/arm/boot/dts/omap3-evm-common.dtsi            |  34 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi                 |   2 +-
+ arch/arm/boot/dts/omap3-sb-t35.dtsi                |   3 +-
+ arch/arm/boot/dts/omap3-tao3530.dtsi               |   1 -
+ arch/arm/boot/dts/omap4-droid4-xt894.dts           |  39 +-
+ arch/arm/boot/dts/omap4-duovero.dtsi               |   4 +
+ arch/arm/boot/dts/omap4-var-som-om44.dtsi          |   2 +-
+ arch/arm/boot/dts/omap4.dtsi                       |  22 +-
+ arch/arm/boot/dts/omap44xx-clocks.dtsi             |  22 +-
+ arch/arm/boot/dts/omap5-cm-t54.dts                 |   2 +-
+ arch/arm/boot/dts/omap5-sbc-t54.dts                |   2 +-
+ arch/arm/boot/dts/omap5-uevm.dts                   |  13 +
+ arch/arm/boot/dts/omap54xx-clocks.dtsi             |   6 +
+ arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts     |  26 +
+ arch/arm/boot/dts/owl-s500-guitar.dtsi             |  22 +
+ arch/arm/boot/dts/owl-s500.dtsi                    | 186 +++++
+ arch/arm/boot/dts/pm9g45.dts                       |  99 +--
+ arch/arm/boot/dts/pxa25x.dtsi                      |   8 +-
+ arch/arm/boot/dts/pxa27x.dtsi                      |  14 +-
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts     | 129 ++++
+ .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts |  48 +-
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts |  20 +-
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |  53 +-
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |  53 +-
+ .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts |  16 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi                | 154 ++--
+ arch/arm/boot/dts/qcom-apq8074-dragonboard.dts     |  20 +
+ arch/arm/boot/dts/qcom-ipq4019.dtsi                |   4 +-
+ arch/arm/boot/dts/qcom-ipq8064.dtsi                |  23 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi                |  84 +++
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   |   1 -
+ arch/arm/boot/dts/qcom-msm8974.dtsi                |  54 +-
+ arch/arm/boot/dts/qcom-pm8941.dtsi                 |  36 +-
+ arch/arm/boot/dts/r7s72100-gr-peach.dts            |  66 ++
+ arch/arm/boot/dts/r7s72100.dtsi                    |   6 +-
+ arch/arm/boot/dts/r8a73a4.dtsi                     |   2 +-
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +
+ arch/arm/boot/dts/r8a7740.dtsi                     |   2 +-
+ arch/arm/boot/dts/r8a7743-iwg20d-q7.dts            |  25 +
+ arch/arm/boot/dts/r8a7743-iwg20m.dtsi              |  29 +
+ arch/arm/boot/dts/r8a7778.dtsi                     |   2 +-
+ arch/arm/boot/dts/r8a7779.dtsi                     |   2 +-
+ arch/arm/boot/dts/r8a7790.dtsi                     |  18 +-
+ arch/arm/boot/dts/r8a7791.dtsi                     |  32 +-
+ arch/arm/boot/dts/r8a7793-gose.dts                 | 161 ++++-
+ arch/arm/boot/dts/r8a7793.dtsi                     |   5 +-
+ arch/arm/boot/dts/r8a7794.dtsi                     |  16 +-
+ arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi     |   3 +-
+ arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |   3 +-
+ arch/arm/boot/dts/rk3229-evb.dts                   |  74 ++
+ arch/arm/boot/dts/rk322x.dtsi                      | 211 +++++-
+ arch/arm/boot/dts/rk3288-firefly-reload.dts        |  17 +
+ arch/arm/boot/dts/rk3288-firefly.dtsi              |  18 +
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   5 +
+ arch/arm/boot/dts/rk3288-rock2-square.dts          |   8 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi               |   5 +
+ arch/arm/boot/dts/rk3288.dtsi                      |  43 ++
+ .../boot/dts/{rk1108-evb.dts => rv1108-evb.dts}    |   6 +-
+ arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi}     |  20 +-
+ arch/arm/boot/dts/sama5d2.dtsi                     | 117 ++++
+ arch/arm/boot/dts/sama5d3.dtsi                     | 131 +++-
+ arch/arm/boot/dts/sama5d3xcm.dtsi                  |  97 ++-
+ arch/arm/boot/dts/sama5d3xcm_cmp.dtsi              |  77 +-
+ arch/arm/boot/dts/sama5d4.dtsi                     | 177 ++++-
+ arch/arm/boot/dts/sh73a0.dtsi                      |   2 +-
+ arch/arm/boot/dts/socfpga.dtsi                     |   4 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk.dtsi       |   2 +-
+ arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts  |   2 +-
+ arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts      |   2 +-
+ arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 101 ++-
+ arch/arm/boot/dts/stm32429i-eval.dts               |  88 +++
+ arch/arm/boot/dts/stm32f429-disco.dts              |   4 +
+ arch/arm/boot/dts/stm32f429.dtsi                   | 121 +++-
+ arch/arm/boot/dts/stm32f746-disco.dts              |  74 ++
+ arch/arm/boot/dts/stm32f746.dtsi                   |  36 +
+ arch/arm/boot/dts/stm32f769-disco.dts              |  74 ++
+ arch/arm/boot/dts/stm32h743-pinctrl.dtsi           |  13 +
+ arch/arm/boot/dts/stm32h743.dtsi                   |   8 +
+ arch/arm/boot/dts/stm32h743i-disco.dts             |  73 ++
+ arch/arm/boot/dts/sun4i-a10-a1000.dts              |   2 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts         |   2 +-
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |   2 +-
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |   6 +-
+ arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts   |   2 +-
+ arch/arm/boot/dts/sun4i-a10-gemei-g9.dts           |   2 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts          |   2 +-
+ arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts       |   6 +-
+ arch/arm/boot/dts/sun4i-a10-inet1.dts              |   2 +-
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |   2 +-
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |   2 +-
+ .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts    |   2 +-
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts         |   2 +-
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts          |   2 +-
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts         |   2 +-
+ arch/arm/boot/dts/sun4i-a10-mk802.dts              |   2 +-
+ arch/arm/boot/dts/sun4i-a10-mk802ii.dts            |   2 +-
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |   2 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts            |   2 +-
+ arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts   |   2 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi                   |   6 -
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts       |   8 -
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts       |   4 -
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |  33 +-
+ arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts           |   4 -
+ arch/arm/boot/dts/sun5i-a10s.dtsi                  |  47 ++
+ .../boot/dts/sun5i-a13-empire-electronix-d709.dts  |   4 -
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts           |   5 -
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts          |   4 -
+ arch/arm/boot/dts/sun5i-r8-chip.dts                |   4 +
+ arch/arm/boot/dts/sun5i.dtsi                       |  10 +
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  10 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi                   | 172 ++++-
+ arch/arm/boot/dts/sun6i-a31s-primo81.dts           |  20 +-
+ arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts   |   2 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts   |   6 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts           |  51 ++
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts          |   2 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |  14 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |   5 +-
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts        |   2 +-
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts          |   4 +-
+ arch/arm/boot/dts/sun7i-a20-icnova-swac.dts        |   2 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts         |   2 +-
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts          |   8 -
+ arch/arm/boot/dts/sun7i-a20-m3.dts                 |   2 +-
+ arch/arm/boot/dts/sun7i-a20-mk808c.dts             |   2 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts     |   2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |   2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |   2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |   2 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts      |   2 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |   6 +-
+ arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts     |   2 +-
+ arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts   |   4 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi                   |   9 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |   8 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi                   |  30 +-
+ .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts  |   2 +-
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts   |  50 +-
+ arch/arm/boot/dts/sun8i-a83t.dtsi                  | 111 ++-
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  |  21 +
+ arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts    |  53 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts      |  64 ++
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts          |   7 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |  21 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts        |   8 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts    |   5 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |  30 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts       |  32 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts     |  26 +
+ arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts |  96 +++
+ arch/arm/boot/dts/sun8i-v3s.dtsi                   | 183 ++++-
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi     |  30 -
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |  48 +-
+ arch/arm/boot/dts/tegra124-apalis-eval.dts         |   2 +-
+ arch/arm/boot/dts/tegra124-apalis.dtsi             |   2 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts          |   2 +-
+ arch/arm/boot/dts/tegra124.dtsi                    |   4 +-
+ arch/arm/boot/dts/tegra20-harmony.dts              |   2 +-
+ arch/arm/boot/dts/tegra20-tamonten.dtsi            |   2 +-
+ arch/arm/boot/dts/tegra20-tec.dts                  |   2 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts            |   2 +-
+ arch/arm/boot/dts/tegra20-whistler.dts             | 636 -----------------
+ arch/arm/boot/dts/tegra20.dtsi                     |   4 +-
+ arch/arm/boot/dts/tegra30-apalis-eval.dts          |   2 +-
+ arch/arm/boot/dts/tegra30-apalis.dtsi              |   2 +-
+ arch/arm/boot/dts/tegra30-beaver.dts               |   2 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi              |   2 +-
+ arch/arm/boot/dts/tegra30.dtsi                     |   5 +-
+ arch/arm/boot/dts/tny_a9260_common.dtsi            |  89 ++-
+ arch/arm/boot/dts/tny_a9263.dts                    | 103 +--
+ arch/arm/boot/dts/twl4030.dtsi                     |   2 +
+ arch/arm/boot/dts/uniphier-ld4-ref.dts             |  38 +-
+ arch/arm/boot/dts/uniphier-ld4.dtsi                |  40 +-
+ arch/arm/boot/dts/uniphier-ld6b-ref.dts            |  38 +-
+ arch/arm/boot/dts/uniphier-ld6b.dtsi               |  38 +-
+ arch/arm/boot/dts/uniphier-pro4-ace.dts            |  40 +-
+ arch/arm/boot/dts/uniphier-pro4-ref.dts            |  38 +-
+ arch/arm/boot/dts/uniphier-pro4-sanji.dts          |  40 +-
+ arch/arm/boot/dts/uniphier-pro4.dtsi               |  40 +-
+ arch/arm/boot/dts/uniphier-pro5.dtsi               |  34 +-
+ arch/arm/boot/dts/uniphier-pxs2-gentil.dts         |  40 +-
+ arch/arm/boot/dts/uniphier-pxs2-vodka.dts          |  38 +-
+ arch/arm/boot/dts/uniphier-pxs2.dtsi               |  56 +-
+ arch/arm/boot/dts/uniphier-ref-daughter.dtsi       |  38 +-
+ arch/arm/boot/dts/uniphier-sld3-ref.dts            |  38 +-
+ arch/arm/boot/dts/uniphier-sld3.dtsi               |  40 +-
+ arch/arm/boot/dts/uniphier-sld8-ref.dts            |  38 +-
+ arch/arm/boot/dts/uniphier-sld8.dtsi               |  40 +-
+ arch/arm/boot/dts/uniphier-support-card.dtsi       |  42 +-
+ arch/arm/boot/dts/usb_a9260_common.dtsi            | 103 +--
+ arch/arm/boot/dts/usb_a9263.dts                    | 103 +--
+ arch/arm/boot/dts/vf610-zii-dev-rev-b.dts          |   2 +
+ arch/arm/configs/acs5k_defconfig                   |   8 -
+ arch/arm/configs/acs5k_tiny_defconfig              |  10 -
+ arch/arm/configs/am200epdkit_defconfig             |   7 -
+ arch/arm/configs/assabet_defconfig                 |   3 -
+ arch/arm/configs/axm55xx_defconfig                 |   1 -
+ arch/arm/configs/badge4_defconfig                  |   5 -
+ arch/arm/configs/bcm2835_defconfig                 |   8 +
+ arch/arm/configs/cerfcube_defconfig                |   4 -
+ arch/arm/configs/cm_x2xx_defconfig                 |  13 -
+ arch/arm/configs/cm_x300_defconfig                 |  10 -
+ arch/arm/configs/cns3420vb_defconfig               |   7 -
+ arch/arm/configs/colibri_pxa270_defconfig          |  13 -
+ arch/arm/configs/colibri_pxa300_defconfig          |   9 -
+ arch/arm/configs/collie_defconfig                  |   4 -
+ arch/arm/configs/corgi_defconfig                   |  13 -
+ arch/arm/configs/davinci_all_defconfig             |  12 +-
+ arch/arm/configs/dove_defconfig                    |   1 -
+ arch/arm/configs/ebsa110_defconfig                 |   1 -
+ arch/arm/configs/efm32_defconfig                   |   1 -
+ arch/arm/configs/em_x270_defconfig                 |  13 -
+ arch/arm/configs/ep93xx_defconfig                  |   1 -
+ arch/arm/configs/eseries_pxa_defconfig             |   8 -
+ arch/arm/configs/exynos_defconfig                  |  12 +-
+ arch/arm/configs/ezx_defconfig                     |  18 -
+ arch/arm/configs/footbridge_defconfig              |   1 -
+ arch/arm/configs/h5000_defconfig                   |   6 -
+ arch/arm/configs/hackkit_defconfig                 |   3 -
+ arch/arm/configs/imote2_defconfig                  |  16 -
+ arch/arm/configs/imx_v4_v5_defconfig               |   1 -
+ arch/arm/configs/imx_v6_v7_defconfig               |   6 +
+ arch/arm/configs/iop13xx_defconfig                 |   4 -
+ arch/arm/configs/iop32x_defconfig                  |   5 -
+ arch/arm/configs/iop33x_defconfig                  |   6 -
+ arch/arm/configs/ixp4xx_defconfig                  |   9 -
+ arch/arm/configs/jornada720_defconfig              |   8 -
+ arch/arm/configs/ks8695_defconfig                  |   7 -
+ arch/arm/configs/lart_defconfig                    |   3 -
+ arch/arm/configs/lpc18xx_defconfig                 |   1 -
+ arch/arm/configs/lpd270_defconfig                  |   5 -
+ arch/arm/configs/lubbock_defconfig                 |   4 -
+ arch/arm/configs/magician_defconfig                |  15 -
+ arch/arm/configs/mainstone_defconfig               |   4 -
+ arch/arm/configs/mini2440_defconfig                |  91 +--
+ arch/arm/configs/mmp2_defconfig                    |   9 -
+ arch/arm/configs/moxart_defconfig                  |   1 -
+ arch/arm/configs/mps2_defconfig                    |   1 -
+ arch/arm/configs/multi_v7_defconfig                |   9 +
+ arch/arm/configs/mv78xx0_defconfig                 |   8 -
+ arch/arm/configs/mvebu_v7_defconfig                |   2 +
+ arch/arm/configs/mxs_defconfig                     |   7 +-
+ arch/arm/configs/neponset_defconfig                |   4 -
+ arch/arm/configs/netwinder_defconfig               |   3 -
+ arch/arm/configs/netx_defconfig                    |   6 -
+ arch/arm/configs/nhk8815_defconfig                 |   1 -
+ arch/arm/configs/nuc910_defconfig                  |   7 -
+ arch/arm/configs/nuc950_defconfig                  |   7 -
+ arch/arm/configs/nuc960_defconfig                  |   7 -
+ arch/arm/configs/omap1_defconfig                   |   2 -
+ arch/arm/configs/orion5x_defconfig                 |   2 -
+ arch/arm/configs/palmz72_defconfig                 |   6 -
+ arch/arm/configs/pcm027_defconfig                  |   8 -
+ arch/arm/configs/pleb_defconfig                    |   3 -
+ arch/arm/configs/pxa168_defconfig                  |   9 -
+ arch/arm/configs/pxa255-idp_defconfig              |   4 -
+ arch/arm/configs/pxa3xx_defconfig                  |   9 -
+ arch/arm/configs/pxa910_defconfig                  |   9 -
+ arch/arm/configs/pxa_defconfig                     |   2 -
+ arch/arm/configs/qcom_defconfig                    |   4 +-
+ arch/arm/configs/raumfeld_defconfig                |  11 -
+ arch/arm/configs/realview_defconfig                |   1 -
+ arch/arm/configs/rpc_defconfig                     |   6 -
+ arch/arm/configs/s3c2410_defconfig                 |  38 +-
+ arch/arm/configs/s3c6400_defconfig                 |  18 +-
+ arch/arm/configs/s5pv210_defconfig                 |  28 +-
+ arch/arm/configs/sama5_defconfig                   |   4 +-
+ arch/arm/configs/shannon_defconfig                 |   3 -
+ arch/arm/configs/simpad_defconfig                  |   7 -
+ arch/arm/configs/spear13xx_defconfig               |   4 -
+ arch/arm/configs/spear3xx_defconfig                |   4 -
+ arch/arm/configs/spear6xx_defconfig                |   3 -
+ arch/arm/configs/spitz_defconfig                   |  13 -
+ arch/arm/configs/stm32_defconfig                   |   3 +
+ arch/arm/configs/sunxi_defconfig                   |   1 -
+ arch/arm/configs/tct_hammer_defconfig              |  15 +-
+ arch/arm/configs/trizeps4_defconfig                |   8 -
+ arch/arm/configs/u300_defconfig                    |   1 -
+ arch/arm/configs/vexpress_defconfig                |   1 -
+ arch/arm/configs/viper_defconfig                   |   9 -
+ arch/arm/configs/xcep_defconfig                    |   8 -
+ arch/arm/configs/zeus_defconfig                    |  10 -
+ arch/arm/configs/zx_defconfig                      |   2 -
+ arch/arm/mach-actions/Kconfig                      |  16 +
+ arch/arm/mach-actions/Makefile                     |   4 +
+ arch/arm/mach-actions/headsmp.S                    |  68 ++
+ arch/arm/mach-actions/owl.c                        |  28 +
+ arch/arm/mach-actions/platsmp.c                    | 198 ++++++
+ arch/arm/mach-at91/Kconfig                         |  16 +-
+ arch/arm/mach-at91/Makefile                        |   4 +-
+ arch/arm/mach-at91/Makefile.boot                   |   3 +
+ arch/arm/mach-at91/generic.h                       |   2 +
+ arch/arm/mach-at91/pm.c                            | 206 +++++-
+ arch/arm/mach-at91/pm.h                            |   5 +
+ arch/arm/mach-at91/pm_data-offsets.c               |   3 +
+ arch/arm/mach-at91/pm_suspend.S                    |  73 +-
+ arch/arm/mach-at91/sama5.c                         |  19 +-
+ arch/arm/mach-at91/samv7.c                         |  25 +
+ arch/arm/mach-bcm/Kconfig                          |   2 +
+ arch/arm/mach-davinci/board-dm646x-evm.c           |   4 +-
+ arch/arm/mach-davinci/devices-da8xx.c              |  30 +
+ arch/arm/mach-davinci/include/mach/da8xx.h         |   5 +
+ arch/arm/mach-davinci/pdata-quirks.c               |   4 +-
+ arch/arm/mach-imx/Kconfig                          |   1 +
+ arch/arm/mach-imx/cpu.c                            |   3 +
+ arch/arm/mach-imx/mxc.h                            |   6 +
+ arch/arm/mach-imx/pm-imx6.c                        |   6 +-
+ arch/arm/mach-meson/Kconfig                        |   1 +
+ arch/arm/mach-omap1/dma.c                          |   5 +-
+ arch/arm/mach-omap1/timer.c                        |   4 +-
+ arch/arm/mach-omap2/Makefile                       |   4 -
+ arch/arm/mach-omap2/board-n8x0.c                   |  14 +-
+ arch/arm/mach-omap2/clockdomain.c                  |   8 +
+ arch/arm/mach-omap2/clockdomain.h                  |   2 +
+ arch/arm/mach-omap2/cm.h                           |   7 +-
+ arch/arm/mach-omap2/cm2xxx_3xxx.h                  |   4 +-
+ arch/arm/mach-omap2/cm33xx.c                       |   4 +-
+ arch/arm/mach-omap2/cm3xxx.c                       |   3 +-
+ arch/arm/mach-omap2/cm_common.c                    |  31 +-
+ arch/arm/mach-omap2/cminst44xx.c                   |  29 +-
+ arch/arm/mach-omap2/devices.c                      | 175 -----
+ arch/arm/mach-omap2/hsmmc.c                        |   5 +-
+ arch/arm/mach-omap2/io.c                           |  59 +-
+ arch/arm/mach-omap2/mcbsp.c                        |  70 --
+ arch/arm/mach-omap2/omap-wakeupgen.c               |  68 +-
+ arch/arm/mach-omap2/omap_device.c                  |   5 +-
+ arch/arm/mach-omap2/omap_hwmod.c                   | 168 ++++-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   3 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c         | 146 +++-
+ arch/arm/mach-omap2/opp.c                          | 104 ---
+ arch/arm/mach-omap2/opp3xxx_data.c                 |  86 ---
+ arch/arm/mach-omap2/opp4xxx_data.c                 |  79 ---
+ arch/arm/mach-omap2/pm.c                           |   2 +-
+ arch/arm/mach-omap2/pmu.c                          |  97 ---
+ arch/arm/mach-omap2/prcm-common.h                  |   7 +
+ arch/arm/mach-omap2/prcm_mpu44xx.c                 |   4 +-
+ arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h           |   4 +-
+ arch/arm/mach-omap2/prm.h                          |   2 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.h                 |   4 +-
+ arch/arm/mach-omap2/prm33xx.c                      |   4 +-
+ arch/arm/mach-omap2/prm3xxx.c                      |  19 +-
+ arch/arm/mach-omap2/prm44xx.c                      |  63 +-
+ arch/arm/mach-omap2/prm_common.c                   |  32 +-
+ arch/arm/mach-omap2/prminst44xx.c                  |  16 +-
+ arch/arm/mach-omap2/sr_device.c                    |  15 +-
+ arch/arm/mach-omap2/timer.c                        | 200 ++----
+ arch/arm/mach-omap2/wd_timer.c                     |  28 -
+ arch/arm/mach-prima2/Kconfig                       |   1 -
+ arch/arm/mach-pxa/include/mach/magician.h          |   1 +
+ arch/arm/mach-pxa/magician.c                       |  84 ++-
+ arch/arm/mach-pxa/pm.c                             |   4 +-
+ arch/arm/mach-pxa/pxa3xx-ulpi.c                    |   6 +-
+ arch/arm/mach-rockchip/rockchip.c                  |   1 +
+ arch/arm/mach-s3c64xx/Kconfig                      |   1 -
+ arch/arm/mach-shmobile/pm-rmobile.c                |  19 +-
+ arch/arm/mach-stm32/Kconfig                        |   5 +
+ arch/arm64/Kconfig.platforms                       |  21 +-
+ arch/arm64/boot/dts/Makefile                       |   2 +
+ arch/arm64/boot/dts/actions/Makefile               |   5 +
+ arch/arm64/boot/dts/actions/s900-bubblegum-96.dts  |  35 +
+ arch/arm64/boot/dts/actions/s900.dtsi              | 164 +++++
+ arch/arm64/boot/dts/allwinner/Makefile             |   5 +
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |  15 +
+ .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts |  95 +++
+ .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts  |  17 +-
+ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |  57 ++
+ .../dts/allwinner/sun50i-a64-sopine-baseboard.dts  | 126 ++++
+ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi      |  65 ++
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      | 137 +++-
+ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts   | 161 +++++
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |  27 +
+ .../dts/allwinner/sun50i-h5-orangepi-prime.dts     | 232 ++++++
+ .../allwinner/sun50i-h5-orangepi-zero-plus2.dts    |  92 +++
+ arch/arm64/boot/dts/amlogic/Makefile               |   9 +-
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |  60 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi          |  11 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts      | 291 ++++++++
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts    |  52 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 108 +--
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi   |  66 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi      |  56 +-
+ .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts      |   6 +-
+ .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts    |  40 ++
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        | 220 +++---
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts      |  24 +
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     |  25 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts   |  92 +++
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts    |  52 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dts      |  23 +
+ arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi   |   2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi         | 127 +++-
+ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |  87 ++-
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 240 +++++++
+ arch/arm64/boot/dts/arm/juno-base.dtsi             |  58 +-
+ arch/arm64/boot/dts/arm/juno-r1.dts                |  24 +
+ arch/arm64/boot/dts/arm/juno-r2.dts                |  24 +
+ arch/arm64/boot/dts/arm/juno.dts                   |  24 +
+ arch/arm64/boot/dts/broadcom/Makefile              |   1 +
+ arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts   |  17 +
+ arch/arm64/boot/dts/broadcom/bcm2837.dtsi          |   4 +
+ arch/arm64/boot/dts/broadcom/ns2.dtsi              |  14 +
+ arch/arm64/boot/dts/broadcom/stingray/Makefile     |   6 +
+ .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 131 ++++
+ .../boot/dts/broadcom/stingray/bcm958742k.dts      |  78 +++
+ .../boot/dts/broadcom/stingray/bcm958742t.dts      |  40 ++
+ .../boot/dts/broadcom/stingray/stingray-clock.dtsi | 170 +++++
+ .../dts/broadcom/stingray/stingray-pinctrl.dtsi    | 345 +++++++++
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 460 ++++++++++++
+ arch/arm64/boot/dts/exynos/exynos5433-tm2.dts      |   1 -
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts |   2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |  10 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  |  15 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |  39 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi |  45 ++
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts  |   4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts  |  79 ++-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |  69 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi |  48 ++
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts  |   4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |  70 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  75 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts  |  28 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts  |  20 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     | 111 ++-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts  |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts  |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts |   2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi     |   2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts  |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts  |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi     |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi |   4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi |   3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |   5 +-
+ .../boot/dts/freescale/qoriq-bman-portals.dtsi     |  71 ++
+ .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi    |  42 ++
+ .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi    |  42 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi     |  41 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi     |  41 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi     |  41 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi     |  41 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi     |  41 ++
+ .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi     |  41 ++
+ arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi   |  81 +++
+ .../boot/dts/freescale/qoriq-qman-portals.dtsi     |  80 +++
+ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts  | 217 +++++-
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi          | 706 ++++++++++++++++++-
+ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts     |  34 +-
+ arch/arm64/boot/dts/hisilicon/hi6220.dtsi          |  26 +
+ .../arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi | 778 +++++++++++++++++++--
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts     | 120 ++--
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |  25 +-
+ arch/arm64/boot/dts/marvell/armada-7020.dtsi       |   2 +-
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts     |   6 +-
+ arch/arm64/boot/dts/marvell/armada-7040.dtsi       |   2 +-
+ arch/arm64/boot/dts/marvell/armada-70x0.dtsi       |  68 ++
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi       |   3 +-
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts     |  24 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  |  42 ++
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi       |   3 +-
+ arch/arm64/boot/dts/marvell/armada-80x0.dtsi       |  76 ++
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi      |  48 +-
+ .../boot/dts/marvell/armada-cp110-master.dtsi      | 145 ++--
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 146 ++--
+ arch/arm64/boot/dts/mediatek/Makefile              |   1 +
+ arch/arm64/boot/dts/mediatek/mt6797-evb.dts        |  36 +
+ arch/arm64/boot/dts/mediatek/mt6797.dtsi           | 244 +++++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi           | 153 ++--
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi           |   4 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi           |   7 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts |   2 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi           |   4 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |  36 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi              |  62 +-
+ arch/arm64/boot/dts/qcom/msm8992.dtsi              |  53 ++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi              |   6 +
+ arch/arm64/boot/dts/realtek/Makefile               |   5 +
+ arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts  |  42 ++
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi           | 131 ++++
+ arch/arm64/boot/dts/renesas/Makefile               |   2 +
+ arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |  42 ++
+ .../boot/dts/renesas/r8a7795-es1-salvator-x.dts    | 115 +++
+ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi       |  84 +++
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts     | 342 +--------
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 565 ++-------------
+ .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 109 +++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 133 ++--
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts     | 168 +----
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 244 +------
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 421 +++++++++++
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi   | 629 +++++++++++++++++
+ arch/arm64/boot/dts/renesas/salvator-x.dtsi        |  30 +
+ arch/arm64/boot/dts/renesas/salvator-xs.dtsi       |  20 +
+ arch/arm64/boot/dts/renesas/ulcb.dtsi              | 367 ++++++++++
+ arch/arm64/boot/dts/rockchip/Makefile              |   1 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  33 +
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    | 718 +++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |   2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi   | 145 ++++
+ arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi       |  18 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi           | 165 ++++-
+ arch/arm64/boot/dts/socionext/Makefile             |   2 +
+ .../boot/dts/socionext/uniphier-ld11-global.dts    |  70 ++
+ .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts |  38 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi   |  61 +-
+ .../boot/dts/socionext/uniphier-ld20-global.dts    |  52 ++
+ .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts |  38 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi   |  79 +--
+ arch/arm64/boot/dts/zte/zx296718.dtsi              |  10 +-
+ arch/arm64/configs/defconfig                       |  26 +-
+ drivers/base/power/domain.c                        |   8 +-
+ drivers/bus/Kconfig                                |   2 +-
+ drivers/bus/arm-ccn.c                              |  10 +-
+ drivers/bus/brcmstb_gisb.c                         | 121 ++--
+ drivers/clk/meson/gxbb.h                           |  20 +-
+ drivers/clk/meson/meson8b.h                        |  20 +-
+ drivers/clocksource/Kconfig                        |   7 +
+ drivers/clocksource/Makefile                       |   1 +
+ drivers/clocksource/owl-timer.c                    | 172 +++++
+ drivers/cpufreq/scpi-cpufreq.c                     |  38 +-
+ drivers/firmware/arm_scpi.c                        |  63 ++
+ drivers/firmware/tegra/bpmp.c                      |  32 +-
+ drivers/memory/omap-gpmc.c                         |   9 +-
+ drivers/reset/Kconfig                              |  17 +-
+ drivers/reset/Makefile                             |   4 +-
+ drivers/reset/core.c                               |  23 +-
+ drivers/reset/reset-gemini.c                       | 110 +++
+ drivers/reset/reset-ti-sci.c                       | 269 +++++++
+ drivers/reset/sti/reset-syscfg.c                   |   6 +-
+ drivers/soc/Kconfig                                |   2 +
+ drivers/soc/Makefile                               |   3 +-
+ drivers/soc/actions/Kconfig                        |  16 +
+ drivers/soc/actions/Makefile                       |   2 +
+ drivers/soc/actions/owl-sps-helper.c               |  51 ++
+ drivers/soc/actions/owl-sps.c                      | 224 ++++++
+ drivers/soc/atmel/soc.c                            |  24 +
+ drivers/soc/atmel/soc.h                            |  26 +
+ drivers/soc/bcm/Kconfig                            |   2 +-
+ drivers/soc/imx/Makefile                           |   2 +-
+ drivers/soc/mediatek/mtk-pmic-wrap.c               |  14 +-
+ drivers/soc/mediatek/mtk-scpsys.c                  | 149 +++-
+ drivers/soc/qcom/smsm.c                            |   9 +-
+ drivers/soc/renesas/Kconfig                        |  63 ++
+ drivers/soc/renesas/Makefile                       |  31 +-
+ drivers/soc/renesas/rcar-sysc.c                    |  52 +-
+ drivers/soc/renesas/rcar-sysc.h                    |   2 -
+ drivers/soc/tegra/Kconfig                          |   5 +
+ drivers/soc/tegra/Makefile                         |   1 +
+ drivers/soc/tegra/flowctrl.c                       |   2 +-
+ drivers/soc/tegra/powergate-bpmp.c                 | 359 ++++++++++
+ include/dt-bindings/clock/bcm-sr.h                 | 101 +++
+ include/dt-bindings/clock/gxbb-clkc.h              |  10 +-
+ include/dt-bindings/clock/meson8b-clkc.h           |  10 +
+ include/dt-bindings/clock/r7s72100-clock.h         |  53 ++
+ include/dt-bindings/clock/r8a7791-clock.h          |   1 +
+ include/dt-bindings/clock/rk3228-cru.h             |  47 ++
+ include/dt-bindings/clock/rk3399-cru.h             |   2 +
+ .../dt-bindings/pinctrl/brcm,pinctrl-stingray.h    |  68 ++
+ include/dt-bindings/pinctrl/r7s72100-pinctrl.h     |  16 +
+ include/dt-bindings/power/mt6797-power.h           |  30 +
+ include/dt-bindings/power/owl-s500-powergate.h     |  19 +
+ include/dt-bindings/reset/altr,rst-mgr-s10.h       | 108 +++
+ include/dt-bindings/reset/cortina,gemini-reset.h   |  36 +
+ include/linux/platform_data/atmel.h                |  28 +-
+ include/linux/pm_domain.h                          |   4 +
+ include/linux/scpi_protocol.h                      |   3 +
+ include/linux/soc/actions/owl-sps.h                |  11 +
+ include/linux/soc/renesas/rcar-rst.h               |   3 +-
+ include/soc/tegra/bpmp-abi.h                       | 418 ++++++++++-
+ include/soc/tegra/bpmp.h                           |  12 +
+ 821 files changed, 27285 insertions(+), 8444 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/actions.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/realtek.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+ rename Documentation/devicetree/bindings/i2c/{i2c-mt6577.txt => i2c-mtk.txt} (77%)
+ create mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/power/actions,owl-sps.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/actions,owl-timer.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/am335x-boneblue.dts
+ create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts
+ create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+ create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw560x.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw560x.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw560x.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7d-pico.dts
+ create mode 100644 arch/arm/boot/dts/keystone-k2g-ice.dts
+ create mode 100644 arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts
+ create mode 100644 arch/arm/boot/dts/owl-s500-guitar.dtsi
+ create mode 100644 arch/arm/boot/dts/owl-s500.dtsi
+ create mode 100644 arch/arm/boot/dts/r7s72100-gr-peach.dts
+ create mode 100644 arch/arm/boot/dts/r8a7743-iwg20d-q7.dts
+ create mode 100644 arch/arm/boot/dts/r8a7743-iwg20m.dtsi
+ rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (94%)
+ rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (95%)
+ create mode 100644 arch/arm/boot/dts/stm32f746-disco.dts
+ create mode 100644 arch/arm/boot/dts/stm32f769-disco.dts
+ create mode 100644 arch/arm/boot/dts/stm32h743i-disco.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
+ delete mode 100644 arch/arm/boot/dts/tegra20-whistler.dts
+ create mode 100644 arch/arm/mach-actions/Kconfig
+ create mode 100644 arch/arm/mach-actions/Makefile
+ create mode 100644 arch/arm/mach-actions/headsmp.S
+ create mode 100644 arch/arm/mach-actions/owl.c
+ create mode 100644 arch/arm/mach-actions/platsmp.c
+ create mode 100644 arch/arm/mach-at91/Makefile.boot
+ create mode 100644 arch/arm/mach-at91/samv7.c
+ delete mode 100644 arch/arm/mach-omap2/opp.c
+ delete mode 100644 arch/arm/mach-omap2/pmu.c
+ create mode 100644 arch/arm64/boot/dts/actions/Makefile
+ create mode 100644 arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
+ create mode 100644 arch/arm64/boot/dts/actions/s900.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/Makefile
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-80x0.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6797-evb.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6797.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/Makefile
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/salvator-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/salvator-x.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/salvator-xs.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/ulcb.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
+ create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
+ create mode 100644 drivers/clocksource/owl-timer.c
+ create mode 100644 drivers/reset/reset-gemini.c
+ create mode 100644 drivers/reset/reset-ti-sci.c
+ create mode 100644 drivers/soc/actions/Kconfig
+ create mode 100644 drivers/soc/actions/Makefile
+ create mode 100644 drivers/soc/actions/owl-sps-helper.c
+ create mode 100644 drivers/soc/actions/owl-sps.c
+ create mode 100644 drivers/soc/renesas/Kconfig
+ create mode 100644 drivers/soc/tegra/powergate-bpmp.c
+ create mode 100644 include/dt-bindings/clock/bcm-sr.h
+ create mode 100644 include/dt-bindings/pinctrl/brcm,pinctrl-stingray.h
+ create mode 100644 include/dt-bindings/pinctrl/r7s72100-pinctrl.h
+ create mode 100644 include/dt-bindings/power/mt6797-power.h
+ create mode 100644 include/dt-bindings/power/owl-s500-powergate.h
+ create mode 100644 include/dt-bindings/reset/altr,rst-mgr-s10.h
+ create mode 100644 include/dt-bindings/reset/cortina,gemini-reset.h
+ create mode 100644 include/linux/soc/actions/owl-sps.h
+Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next)
+$ git merge actions/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
+$ git merge alpine/alpine/for-next
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (f99503e956ae Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
+$ git merge aspeed/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
+$ git merge at91/at91-next
+Resolved 'arch/arm/mach-at91/Kconfig' using previous resolution.
+Resolved 'arch/arm/mach-at91/samv7.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/samv7.c
+CONFLICT (add/add): Merge conflict in arch/arm/mach-at91/samv7.c
+Auto-merging arch/arm/mach-at91/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c9ff3a442b2a] Merge remote-tracking branch 'at91/at91-next'
+$ git diff -M --stat --summary HEAD^..
+Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next)
+$ git merge bcm2835/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (bf6e15ed7f86 Merge branch 'zte/dt64' into for-next)
+$ git merge imx-mxs/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (cf79eb3aab84 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+Merging omap/for-next (eb0028987143 Merge branch 'omap-for-v4.13/dt' 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/dm8168-evm.dts              | 34 ++++++++++++++++++++++++++-
+ arch/arm/boot/dts/dm816x.dtsi                 |  2 +-
+ arch/arm/boot/dts/dra7-evm.dts                | 10 +++++++-
+ arch/arm/boot/dts/dra7.dtsi                   |  5 ++++
+ arch/arm/boot/dts/dra71-evm.dts               | 18 ++++++++++++--
+ arch/arm/boot/dts/dra72-evm-common.dtsi       |  2 --
+ arch/arm/boot/dts/dra72-evm-revc.dts          | 18 ++++++++++++++
+ arch/arm/boot/dts/dra72-evm.dts               | 18 ++++++++++++++
+ arch/arm/mach-omap2/pdata-quirks.c            | 31 ++++++++++++++++++++++++
+ include/linux/platform_data/hsmmc-omap.h      |  3 +++
+ 11 files changed, 135 insertions(+), 8 deletions(-)
+Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
+$ git merge omap-pending/for-next
+Already up-to-date.
+Merging reset/reset/next (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.)
+$ git merge reset/reset/next
+Merge made by the 'recursive' strategy.
+ drivers/reset/reset-zx2967.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging qcom/for-next (9c60544280d4 Merge tag 'qcom-drivers-for-4.13' into all-for-4.13-revised)
+$ git merge qcom/for-next
+Merge made by the 'recursive' strategy.
+Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next)
+$ git merge realtek/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (d75d45bfffd5 Merge branch 'fixes-for-v4.13' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/rockchip,rk3128-cru.txt         |  56 ++
+ drivers/clk/rockchip/Makefile                      |   1 +
+ drivers/clk/rockchip/clk-rk3036.c                  |   1 +
+ drivers/clk/rockchip/clk-rk3128.c                  | 612 +++++++++++++++++++++
+ drivers/clk/rockchip/clk-rk3228.c                  | 164 ++++--
+ drivers/clk/rockchip/clk-rk3288.c                  |  14 +-
+ drivers/clk/rockchip/clk-rk3368.c                  |   5 +-
+ drivers/clk/rockchip/clk-rk3399.c                  |   4 +-
+ include/dt-bindings/clock/rk3128-cru.h             | 282 ++++++++++
+ 9 files changed, 1073 insertions(+), 66 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt
+ create mode 100644 drivers/clk/rockchip/clk-rk3128.c
+ create mode 100644 include/dt-bindings/clock/rk3128-cru.h
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (005537e095a6 Merge branch 'fixes' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos4.dtsi | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/sun8i-de2.txt        |  31 +
+ .../devicetree/bindings/clock/sunxi-ccu.txt        |   5 +-
+ drivers/clk/clk-divider.c                          |  19 +-
+ drivers/clk/sunxi-ng/Kconfig                       | 116 +--
+ drivers/clk/sunxi-ng/Makefile                      |  37 +-
+ drivers/clk/sunxi-ng/ccu-sun50i-a64.c              |  10 +-
+ drivers/clk/sunxi-ng/ccu-sun5i.h                   |   6 +-
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c               |  10 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a23.c               |  10 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a33.c               |  10 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a83t.c              | 922 +++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu-sun8i-a83t.h              |  64 ++
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c               | 260 ++++++
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.h               |  28 +
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c                |  10 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-r.c                 | 117 ++-
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c               |  10 +-
+ drivers/clk/sunxi-ng/ccu_div.c                     |  38 +-
+ drivers/clk/sunxi-ng/ccu_mp.c                      |  15 +-
+ drivers/clk/sunxi-ng/ccu_mult.c                    |  19 +-
+ drivers/clk/sunxi-ng/ccu_mux.c                     | 108 ++-
+ drivers/clk/sunxi-ng/ccu_mux.h                     |  24 +-
+ drivers/clk/sunxi-ng/ccu_nkm.c                     |   7 +-
+ drivers/clk/sunxi-ng/ccu_reset.h                   |   1 +
+ include/dt-bindings/clock/sun5i-ccu.h              |   3 +
+ include/dt-bindings/clock/sun8i-a83t-ccu.h         | 140 ++++
+ include/dt-bindings/clock/sun8i-de2.h              |  18 +
+ include/dt-bindings/reset/sun8i-a83t-ccu.h         |  98 +++
+ include/dt-bindings/reset/sun8i-de2.h              |  14 +
+ include/linux/clk-provider.h                       |  16 +-
+ 30 files changed, 1893 insertions(+), 273 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.h
+ create mode 100644 include/dt-bindings/clock/sun8i-a83t-ccu.h
+ create mode 100644 include/dt-bindings/clock/sun8i-de2.h
+ create mode 100644 include/dt-bindings/reset/sun8i-a83t-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun8i-de2.h
+Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
+$ git merge tegra/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (5fbd5fc49fc3 arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set())
+$ git merge arm64/for-next/core
+Auto-merging virt/kvm/arm/mmu.c
+Auto-merging include/linux/uuid.h
+Auto-merging drivers/acpi/arm64/iort.c
+Auto-merging arch/arm64/mm/dma-mapping.c
+Auto-merging arch/arm64/kernel/vdso.c
+Auto-merging arch/arm64/include/asm/dma-mapping.h
+Auto-merging arch/arm64/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/kvm_arm.h            |  10 +
+ arch/arm/include/asm/system_misc.h        |   5 +
+ arch/arm64/Kconfig                        |   9 +-
+ arch/arm64/Makefile                       |   7 +-
+ arch/arm64/include/asm/checksum.h         |   2 +-
+ arch/arm64/include/asm/dma-mapping.h      |   2 -
+ arch/arm64/include/asm/elf.h              |   6 +
+ arch/arm64/include/asm/esr.h              |   1 +
+ arch/arm64/include/asm/futex.h            |   8 +-
+ arch/arm64/include/asm/kvm_arm.h          |  10 +
+ arch/arm64/include/asm/module.h           |   3 +
+ arch/arm64/include/asm/pgtable.h          |   2 +-
+ arch/arm64/include/asm/processor.h        |   3 +
+ arch/arm64/include/asm/stacktrace.h       |   1 +
+ arch/arm64/include/asm/system_misc.h      |   4 +-
+ arch/arm64/include/uapi/asm/sigcontext.h  |  55 ++++
+ arch/arm64/kernel/Makefile                |   3 +
+ arch/arm64/kernel/acpi_parking_protocol.c |   6 +-
+ arch/arm64/kernel/alternative.c           |   8 +-
+ arch/arm64/kernel/cpufeature.c            |  25 +-
+ arch/arm64/kernel/debug-monitors.c        |  14 +-
+ arch/arm64/kernel/ftrace-mod.S            |  18 ++
+ arch/arm64/kernel/ftrace.c                | 103 +++++++-
+ arch/arm64/kernel/insn.c                  |   7 +-
+ arch/arm64/kernel/kaslr.c                 |   2 +-
+ arch/arm64/kernel/module.c                |  20 +-
+ arch/arm64/kernel/pci.c                   |   3 +
+ arch/arm64/kernel/probes/kprobes.c        |   4 +-
+ arch/arm64/kernel/process.c               |   9 +-
+ arch/arm64/kernel/ptrace.c                |  39 ++-
+ arch/arm64/kernel/setup.c                 |   3 +
+ arch/arm64/kernel/signal.c                | 413 +++++++++++++++++++++++++++---
+ arch/arm64/kernel/stacktrace.c            |   1 +
+ arch/arm64/kernel/traps.c                 |  18 +-
+ arch/arm64/kernel/vdso.c                  |  10 +-
+ arch/arm64/mm/dma-mapping.c               |   9 -
+ arch/arm64/mm/fault.c                     | 215 +++++++++++-----
+ arch/arm64/mm/hugetlbpage.c               |  29 +--
+ arch/arm64/mm/mmap.c                      |  19 +-
+ arch/arm64/mm/mmu.c                       |   1 +
+ drivers/acpi/apei/Kconfig                 |  15 ++
+ drivers/acpi/apei/ghes.c                  | 206 ++++++++++++---
+ drivers/acpi/apei/hest.c                  |   7 +-
+ drivers/acpi/arm64/iort.c                 |  15 --
+ drivers/char/Kconfig                      |   2 +
+ drivers/firmware/efi/cper.c               | 204 +++++++++++++--
+ drivers/irqchip/Kconfig                   |   1 -
+ drivers/ras/ras.c                         |  16 +-
+ fs/proc/kcore.c                           |   2 +-
+ include/acpi/ghes.h                       |  48 +++-
+ include/linux/acpi_iort.h                 |   2 -
+ include/linux/cper.h                      |  54 ++++
+ include/linux/ras.h                       |  17 ++
+ include/linux/uuid.h                      |   4 +-
+ include/ras/ras_event.h                   |  90 +++++++
+ virt/kvm/arm/mmu.c                        |  36 ++-
+ 56 files changed, 1551 insertions(+), 275 deletions(-)
+ create mode 100644 arch/arm64/kernel/ftrace-mod.S
+Merging clk/clk-next (682430e87734 clk: keystone: TI_SCI_PROTOCOL is needed for clk driver)
+$ git merge clk/clk-next
+Resolved 'MAINTAINERS' using previous resolution.
+Removing include/linux/platform_data/clk-realview.h
+Removing drivers/clk/versatile/clk-realview.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d3366b90945c] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../arm/marvell/ap806-system-controller.txt        |   24 +-
+ .../bindings/clock/amlogic,meson8b-clkc.txt        |   11 +-
+ .../devicetree/bindings/clock/hi6220-clock.txt     |    1 +
+ .../devicetree/bindings/clock/qcom,gcc.txt         |    1 +
+ .../devicetree/bindings/clock/qoriq-clock.txt      |    6 +
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt |   10 +-
+ .../devicetree/bindings/clock/ti,sci-clk.txt       |   37 +
+ .../devicetree/bindings/clock/ti-clkctrl.txt       |   56 ++
+ MAINTAINERS                                        |    2 +
+ arch/mips/lantiq/clk.c                             |    5 -
+ drivers/clk/Kconfig                                |   17 +-
+ drivers/clk/Makefile                               |    7 +-
+ drivers/clk/at91/clk-generated.c                   |    4 +-
+ drivers/clk/bcm/Kconfig                            |    8 +
+ drivers/clk/bcm/Makefile                           |    1 +
+ drivers/clk/bcm/clk-bcm2835.c                      |   65 +-
+ drivers/clk/bcm/clk-iproc-pll.c                    |   12 +-
+ drivers/clk/bcm/clk-sr.c                           |  327 +++++++
+ drivers/clk/clk-bulk.c                             |  157 +++
+ drivers/clk/clk-conf.c                             |    2 +-
+ drivers/clk/clk-devres.c                           |   36 +
+ drivers/clk/clk-gemini.c                           |  454 +++++++++
+ drivers/clk/clk-palmas.c                           |    1 +
+ drivers/clk/clk-qoriq.c                            |   91 +-
+ drivers/clk/clk-scpi.c                             |    6 +-
+ drivers/clk/hisilicon/clk-hi3660.c                 |   98 +-
+ drivers/clk/hisilicon/clk-hi6220.c                 |   22 +
+ drivers/clk/hisilicon/crg-hi3798cv200.c            |   21 +
+ drivers/clk/imx/clk-imx7d.c                        |    8 +-
+ drivers/clk/imx/clk-pllv3.c                        |    5 +
+ drivers/clk/imx/clk.h                              |    1 +
+ drivers/clk/keystone/Kconfig                       |   16 +
+ drivers/clk/keystone/Makefile                      |    3 +-
+ drivers/clk/keystone/sci-clk.c                     |  724 ++++++++++++++
+ drivers/clk/mediatek/Makefile                      |    2 +-
+ drivers/clk/mediatek/clk-cpumux.c                  |  120 +++
+ drivers/clk/mediatek/clk-cpumux.h                  |   30 +
+ drivers/clk/mediatek/clk-mt2701.c                  |    8 +
+ drivers/clk/mediatek/clk-mt8173.c                  |   23 +
+ drivers/clk/meson/Kconfig                          |    6 +-
+ drivers/clk/meson/gxbb.c                           |  137 ++-
+ drivers/clk/meson/gxbb.h                           |    7 +-
+ drivers/clk/meson/meson8b.c                        |    7 +-
+ drivers/clk/mvebu/ap806-system-controller.c        |  107 ++-
+ drivers/clk/mvebu/armada-38x.c                     |    7 +-
+ drivers/clk/mvebu/cp110-system-controller.c        |  199 ++--
+ drivers/clk/qcom/Kconfig                           |    9 +
+ drivers/clk/qcom/Makefile                          |    1 +
+ drivers/clk/qcom/gcc-ipq8074.c                     | 1007 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-msm8916.c                     |    1 +
+ drivers/clk/renesas/Kconfig                        |  139 ++-
+ drivers/clk/renesas/Makefile                       |   41 +-
+ drivers/clk/renesas/clk-mstp.c                     |    2 +-
+ drivers/clk/renesas/clk-rcar-gen2.c                |   23 +-
+ drivers/clk/renesas/r8a7745-cpg-mssr.c             |   17 +-
+ drivers/clk/renesas/r8a7790-cpg-mssr.c             |  278 ++++++
+ drivers/clk/renesas/r8a7791-cpg-mssr.c             |  286 ++++++
+ drivers/clk/renesas/r8a7792-cpg-mssr.c             |  221 +++++
+ drivers/clk/renesas/r8a7794-cpg-mssr.c             |  255 +++++
+ drivers/clk/renesas/r8a7795-cpg-mssr.c             |   43 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c             |   39 +
+ drivers/clk/renesas/renesas-cpg-mssr.c             |   43 +-
+ drivers/clk/renesas/renesas-cpg-mssr.h             |    4 +
+ drivers/clk/samsung/clk-cpu.c                      |   17 +-
+ drivers/clk/samsung/clk-exynos-audss.c             |   58 +-
+ drivers/clk/samsung/clk-exynos-clkout.c            |   18 +-
+ drivers/clk/samsung/clk-exynos5420.c               |   27 +-
+ drivers/clk/samsung/clk-pll.c                      |  101 +-
+ drivers/clk/samsung/clk-pll.h                      |    4 -
+ drivers/clk/samsung/clk-s3c2410-dclk.c             |   75 +-
+ drivers/clk/samsung/clk-s5pv210-audss.c            |   52 +-
+ drivers/clk/samsung/clk.c                          |   91 +-
+ drivers/clk/samsung/clk.h                          |    9 +-
+ drivers/clk/socfpga/clk-gate-a10.c                 |    2 +-
+ drivers/clk/socfpga/clk.h                          |    3 +
+ drivers/clk/sunxi-ng/ccu_mux.c                     |    2 +-
+ drivers/clk/ti/Makefile                            |    3 +-
+ drivers/clk/ti/clk-44xx.c                          |  663 +++++++++++++
+ drivers/clk/ti/clkctrl.c                           |  497 ++++++++++
+ drivers/clk/ti/clock.h                             |   31 +
+ drivers/clk/uniphier/clk-uniphier-sys.c            |   15 +-
+ drivers/clk/versatile/Makefile                     |    1 -
+ drivers/clk/versatile/clk-realview.c               |   97 --
+ drivers/clk/zte/clk-zx296718.c                     |    8 +-
+ include/dt-bindings/clock/cortina,gemini-clock.h   |   29 +
+ include/dt-bindings/clock/exynos5420.h             |    3 +
+ include/dt-bindings/clock/hi3660-clock.h           |   17 +
+ include/dt-bindings/clock/hi6220-clock.h           |    4 +
+ include/dt-bindings/clock/histb-clock.h            |    9 +-
+ include/dt-bindings/clock/imx7d-clock.h            |    4 +-
+ include/dt-bindings/clock/mt2701-clk.h             |    3 +-
+ include/dt-bindings/clock/mt8173-clk.h             |    4 +-
+ include/dt-bindings/clock/omap4.h                  |  146 +++
+ include/dt-bindings/clock/qcom,gcc-ipq8074.h       |  152 +++
+ include/dt-bindings/clock/r8a7790-cpg-mssr.h       |   52 +
+ include/dt-bindings/clock/r8a7791-cpg-mssr.h       |   48 +
+ include/dt-bindings/clock/r8a7792-cpg-mssr.h       |   43 +
+ include/dt-bindings/clock/r8a7793-cpg-mssr.h       |   48 +
+ include/dt-bindings/clock/r8a7794-cpg-mssr.h       |   47 +
+ include/dt-bindings/clock/zx296718-clock.h         |    6 +-
+ include/linux/clk.h                                |  136 +++
+ include/linux/platform_data/clk-realview.h         |    1 -
+ 102 files changed, 7165 insertions(+), 662 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/ti-clkctrl.txt
+ create mode 100644 drivers/clk/bcm/clk-sr.c
+ create mode 100644 drivers/clk/clk-bulk.c
+ create mode 100644 drivers/clk/clk-gemini.c
+ create mode 100644 drivers/clk/keystone/Kconfig
+ create mode 100644 drivers/clk/keystone/sci-clk.c
+ create mode 100644 drivers/clk/mediatek/clk-cpumux.c
+ create mode 100644 drivers/clk/mediatek/clk-cpumux.h
+ create mode 100644 drivers/clk/qcom/gcc-ipq8074.c
+ create mode 100644 drivers/clk/renesas/r8a7790-cpg-mssr.c
+ create mode 100644 drivers/clk/renesas/r8a7791-cpg-mssr.c
+ create mode 100644 drivers/clk/renesas/r8a7792-cpg-mssr.c
+ create mode 100644 drivers/clk/renesas/r8a7794-cpg-mssr.c
+ create mode 100644 drivers/clk/ti/clkctrl.c
+ delete mode 100644 drivers/clk/versatile/clk-realview.c
+ create mode 100644 include/dt-bindings/clock/cortina,gemini-clock.h
+ create mode 100644 include/dt-bindings/clock/omap4.h
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq8074.h
+ create mode 100644 include/dt-bindings/clock/r8a7790-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r8a7791-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r8a7792-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r8a7793-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r8a7794-cpg-mssr.h
+ delete mode 100644 include/linux/platform_data/clk-realview.h
+Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (204a2be30a7a m68k: Remove ptrace_signal_deliver)
+$ git merge m68k/for-next
+Auto-merging kernel/signal.c
+Auto-merging include/linux/ptrace.h
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig    |   8 ++-
+ 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    |   8 ++-
+ 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/include/asm/signal.h       |   5 --
+ arch/m68k/kernel/signal.c            |  16 -----
+ drivers/nubus/nubus.c                | 125 +++--------------------------------
+ include/linux/ptrace.h               |   4 --
+ kernel/signal.c                      |   1 -
+ 17 files changed, 95 insertions(+), 152 deletions(-)
+Merging m68knommu/for-next (354b6382847d m68k: defconfig: Cleanup from old Kconfig options)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/m5208evb_defconfig | 1 -
+ arch/m68k/configs/m5249evb_defconfig | 1 -
+ arch/m68k/configs/m5272c3_defconfig  | 1 -
+ arch/m68k/configs/m5275evb_defconfig | 1 -
+ arch/m68k/configs/m5307c3_defconfig  | 1 -
+ arch/m68k/configs/m5407c3_defconfig  | 1 -
+ 6 files changed, 6 deletions(-)
+Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
+$ git merge microblaze/next
+Removing arch/microblaze/include/uapi/asm/termios.h
+Removing arch/microblaze/include/uapi/asm/termbits.h
+Removing arch/microblaze/include/uapi/asm/swab.h
+Removing arch/microblaze/include/uapi/asm/statfs.h
+Removing arch/microblaze/include/uapi/asm/stat.h
+Removing arch/microblaze/include/uapi/asm/sockios.h
+Removing arch/microblaze/include/uapi/asm/socket.h
+Removing arch/microblaze/include/uapi/asm/signal.h
+Removing arch/microblaze/include/uapi/asm/siginfo.h
+Removing arch/microblaze/include/uapi/asm/shmbuf.h
+Removing arch/microblaze/include/uapi/asm/sembuf.h
+Removing arch/microblaze/include/uapi/asm/resource.h
+Removing arch/microblaze/include/uapi/asm/poll.h
+Removing arch/microblaze/include/uapi/asm/param.h
+Removing arch/microblaze/include/uapi/asm/msgbuf.h
+Removing arch/microblaze/include/uapi/asm/mman.h
+Removing arch/microblaze/include/uapi/asm/kvm_para.h
+Removing arch/microblaze/include/uapi/asm/ipcbuf.h
+Removing arch/microblaze/include/uapi/asm/ioctls.h
+Removing arch/microblaze/include/uapi/asm/ioctl.h
+Removing arch/microblaze/include/uapi/asm/fcntl.h
+Removing arch/microblaze/include/uapi/asm/errno.h
+Removing arch/microblaze/include/uapi/asm/bitsperlong.h
+Removing arch/microblaze/include/asm/xor.h
+Removing arch/microblaze/include/asm/vga.h
+Removing arch/microblaze/include/asm/ucontext.h
+Removing arch/microblaze/include/asm/topology.h
+Removing arch/microblaze/include/asm/shmparam.h
+Removing arch/microblaze/include/asm/serial.h
+Removing arch/microblaze/include/asm/percpu.h
+Removing arch/microblaze/include/asm/parport.h
+Removing arch/microblaze/include/asm/local64.h
+Removing arch/microblaze/include/asm/local.h
+Removing arch/microblaze/include/asm/linkage.h
+Removing arch/microblaze/include/asm/kmap_types.h
+Removing arch/microblaze/include/asm/kdebug.h
+Removing arch/microblaze/include/asm/irq_regs.h
+Removing arch/microblaze/include/asm/hardirq.h
+Removing arch/microblaze/include/asm/fb.h
+Removing arch/microblaze/include/asm/emergency-restart.h
+Removing arch/microblaze/include/asm/div64.h
+Removing arch/microblaze/include/asm/bugs.h
+Removing arch/microblaze/include/asm/bug.h
+Removing arch/microblaze/include/asm/bitops.h
+Merge made by the 'recursive' strategy.
+ arch/microblaze/configs/mmu_defconfig           | 16 ++++-----
+ arch/microblaze/configs/nommu_defconfig         | 17 ++--------
+ arch/microblaze/include/asm/Kbuild              | 45 ++++++++++++++++++++++++-
+ arch/microblaze/include/asm/bitops.h            |  1 -
+ arch/microblaze/include/asm/bug.h               |  1 -
+ arch/microblaze/include/asm/bugs.h              |  1 -
+ arch/microblaze/include/asm/div64.h             |  1 -
+ arch/microblaze/include/asm/emergency-restart.h |  1 -
+ arch/microblaze/include/asm/fb.h                |  1 -
+ arch/microblaze/include/asm/hardirq.h           |  1 -
+ arch/microblaze/include/asm/irq_regs.h          |  1 -
+ arch/microblaze/include/asm/kdebug.h            |  1 -
+ arch/microblaze/include/asm/kmap_types.h        |  6 ----
+ arch/microblaze/include/asm/linkage.h           |  1 -
+ arch/microblaze/include/asm/local.h             |  1 -
+ arch/microblaze/include/asm/local64.h           |  1 -
+ arch/microblaze/include/asm/parport.h           |  1 -
+ arch/microblaze/include/asm/percpu.h            |  1 -
+ arch/microblaze/include/asm/serial.h            |  1 -
+ arch/microblaze/include/asm/shmparam.h          |  1 -
+ arch/microblaze/include/asm/topology.h          |  1 -
+ arch/microblaze/include/asm/ucontext.h          |  1 -
+ arch/microblaze/include/asm/unistd.h            |  2 +-
+ arch/microblaze/include/asm/vga.h               |  1 -
+ arch/microblaze/include/asm/xor.h               |  1 -
+ arch/microblaze/include/uapi/asm/bitsperlong.h  |  1 -
+ arch/microblaze/include/uapi/asm/errno.h        |  1 -
+ arch/microblaze/include/uapi/asm/fcntl.h        |  1 -
+ arch/microblaze/include/uapi/asm/ioctl.h        |  1 -
+ arch/microblaze/include/uapi/asm/ioctls.h       |  1 -
+ arch/microblaze/include/uapi/asm/ipcbuf.h       |  1 -
+ arch/microblaze/include/uapi/asm/kvm_para.h     |  1 -
+ arch/microblaze/include/uapi/asm/mman.h         |  1 -
+ arch/microblaze/include/uapi/asm/msgbuf.h       |  1 -
+ arch/microblaze/include/uapi/asm/param.h        |  1 -
+ arch/microblaze/include/uapi/asm/poll.h         |  1 -
+ arch/microblaze/include/uapi/asm/resource.h     |  1 -
+ arch/microblaze/include/uapi/asm/sembuf.h       |  1 -
+ arch/microblaze/include/uapi/asm/shmbuf.h       |  1 -
+ arch/microblaze/include/uapi/asm/siginfo.h      |  1 -
+ arch/microblaze/include/uapi/asm/signal.h       |  1 -
+ arch/microblaze/include/uapi/asm/socket.h       |  1 -
+ arch/microblaze/include/uapi/asm/sockios.h      |  1 -
+ arch/microblaze/include/uapi/asm/stat.h         |  1 -
+ arch/microblaze/include/uapi/asm/statfs.h       |  1 -
+ arch/microblaze/include/uapi/asm/swab.h         |  1 -
+ arch/microblaze/include/uapi/asm/termbits.h     |  1 -
+ arch/microblaze/include/uapi/asm/termios.h      |  1 -
+ arch/microblaze/include/uapi/asm/unistd.h       |  1 +
+ arch/microblaze/kernel/dma.c                    |  3 +-
+ arch/microblaze/kernel/entry.S                  | 28 ++++++++++-----
+ arch/microblaze/kernel/syscall_table.S          |  1 +
+ arch/microblaze/kernel/timer.c                  |  2 ++
+ arch/microblaze/mm/highmem.c                    | 24 ++++++-------
+ 54 files changed, 90 insertions(+), 98 deletions(-)
+ delete mode 100644 arch/microblaze/include/asm/bitops.h
+ delete mode 100644 arch/microblaze/include/asm/bug.h
+ delete mode 100644 arch/microblaze/include/asm/bugs.h
+ delete mode 100644 arch/microblaze/include/asm/div64.h
+ delete mode 100644 arch/microblaze/include/asm/emergency-restart.h
+ delete mode 100644 arch/microblaze/include/asm/fb.h
+ delete mode 100644 arch/microblaze/include/asm/hardirq.h
+ delete mode 100644 arch/microblaze/include/asm/irq_regs.h
+ delete mode 100644 arch/microblaze/include/asm/kdebug.h
+ delete mode 100644 arch/microblaze/include/asm/kmap_types.h
+ delete mode 100644 arch/microblaze/include/asm/linkage.h
+ delete mode 100644 arch/microblaze/include/asm/local.h
+ delete mode 100644 arch/microblaze/include/asm/local64.h
+ delete mode 100644 arch/microblaze/include/asm/parport.h
+ delete mode 100644 arch/microblaze/include/asm/percpu.h
+ delete mode 100644 arch/microblaze/include/asm/serial.h
+ delete mode 100644 arch/microblaze/include/asm/shmparam.h
+ delete mode 100644 arch/microblaze/include/asm/topology.h
+ delete mode 100644 arch/microblaze/include/asm/ucontext.h
+ delete mode 100644 arch/microblaze/include/asm/vga.h
+ delete mode 100644 arch/microblaze/include/asm/xor.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/bitsperlong.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/errno.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/fcntl.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/ioctl.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/ioctls.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/ipcbuf.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/kvm_para.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/mman.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/msgbuf.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/param.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/poll.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/resource.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/sembuf.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/shmbuf.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/signal.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/socket.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/sockios.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/stat.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/statfs.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/swab.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/termbits.h
+ delete mode 100644 arch/microblaze/include/uapi/asm/termios.h
+Merging mips/mips-for-linux-next (152e63e374cd Merge branch '4.12-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/kernel/module-rela.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |   6 +
+ arch/mips/Kconfig                                  | 115 +++---
+ arch/mips/Makefile                                 |   2 +-
+ arch/mips/boot/dts/mti/sead3.dts                   |  24 +-
+ arch/mips/configs/ar7_defconfig                    |   6 -
+ arch/mips/configs/ath79_defconfig                  |   2 -
+ arch/mips/configs/bcm63xx_defconfig                |   7 -
+ arch/mips/configs/bigsur_defconfig                 |   4 -
+ arch/mips/configs/bmips_be_defconfig               |   1 -
+ arch/mips/configs/capcella_defconfig               |   4 -
+ arch/mips/configs/cavium_octeon_defconfig          |   1 -
+ arch/mips/configs/ci20_defconfig                   |   1 -
+ arch/mips/configs/cobalt_defconfig                 |   8 -
+ arch/mips/configs/decstation_defconfig             |   1 -
+ arch/mips/configs/e55_defconfig                    |   2 -
+ arch/mips/configs/fuloong2e_defconfig              |  11 -
+ arch/mips/configs/gpr_defconfig                    |   8 -
+ arch/mips/configs/ip22_defconfig                   |  11 -
+ arch/mips/configs/ip27_defconfig                   |   5 -
+ arch/mips/configs/ip28_defconfig                   |   5 -
+ arch/mips/configs/ip32_defconfig                   |   8 -
+ arch/mips/configs/jazz_defconfig                   |   6 -
+ arch/mips/configs/jmr3927_defconfig                |   7 -
+ arch/mips/configs/lasat_defconfig                  |   5 -
+ arch/mips/configs/lemote2f_defconfig               |  12 -
+ arch/mips/configs/loongson3_defconfig              |   3 -
+ arch/mips/configs/malta_kvm_defconfig              |   1 -
+ arch/mips/configs/malta_kvm_guest_defconfig        |   1 -
+ arch/mips/configs/malta_qemu_32r6_defconfig        |   1 -
+ arch/mips/configs/maltaaprp_defconfig              |   2 -
+ arch/mips/configs/maltasmvp_defconfig              |   1 -
+ arch/mips/configs/maltasmvp_eva_defconfig          |   2 -
+ arch/mips/configs/maltaup_defconfig                |   2 -
+ arch/mips/configs/markeins_defconfig               |   4 -
+ arch/mips/configs/mips_paravirt_defconfig          |   1 -
+ arch/mips/configs/mpc30x_defconfig                 |   5 -
+ arch/mips/configs/msp71xx_defconfig                |   2 -
+ arch/mips/configs/mtx1_defconfig                   |  11 -
+ arch/mips/configs/nlm_xlp_defconfig                |   5 -
+ arch/mips/configs/nlm_xlr_defconfig                |   9 -
+ arch/mips/configs/pnx8335_stb225_defconfig         |   7 -
+ arch/mips/configs/qi_lb60_defconfig                |   3 -
+ arch/mips/configs/rb532_defconfig                  |   6 -
+ arch/mips/configs/rbtx49xx_defconfig               |   7 -
+ arch/mips/configs/rm200_defconfig                  |   8 -
+ arch/mips/configs/rt305x_defconfig                 |   2 -
+ arch/mips/configs/sb1250_swarm_defconfig           |   1 -
+ arch/mips/configs/tb0219_defconfig                 |   6 -
+ arch/mips/configs/tb0226_defconfig                 |   7 -
+ arch/mips/configs/tb0287_defconfig                 |   5 -
+ arch/mips/configs/workpad_defconfig                |   4 -
+ arch/mips/generic/Kconfig                          |   8 +
+ arch/mips/generic/Makefile                         |   1 +
+ arch/mips/generic/board-sead3.c                    | 234 ++---------
+ arch/mips/generic/init.c                           |  27 ++
+ arch/mips/generic/yamon-dt.c                       | 240 ++++++++++++
+ arch/mips/include/asm/Kbuild                       |   2 +
+ arch/mips/include/asm/branch.h                     |   5 +-
+ arch/mips/include/asm/cmpxchg.h                    | 280 ++++++--------
+ arch/mips/include/asm/cpu-features.h               |  41 ++
+ arch/mips/include/asm/cpu-type.h                   |   1 +
+ arch/mips/include/asm/cpu.h                        |   8 +-
+ arch/mips/include/asm/mach-generic/mc146818rtc.h   |   2 +-
+ arch/mips/include/asm/mach-loongson64/boot_param.h |  22 +-
+ arch/mips/include/asm/machine.h                    |  31 ++
+ arch/mips/include/asm/module.h                     |   8 +-
+ arch/mips/include/asm/spinlock.h                   | 426 +--------------------
+ arch/mips/include/asm/spinlock_types.h             |  34 +-
+ arch/mips/include/asm/uasm.h                       |  30 ++
+ arch/mips/include/asm/vdso.h                       |   4 +-
+ arch/mips/include/asm/yamon-dt.h                   |  64 ++++
+ arch/mips/include/uapi/asm/inst.h                  |  20 +-
+ arch/mips/kernel/Makefile                          |   3 +-
+ arch/mips/kernel/branch.c                          |  73 ++--
+ arch/mips/kernel/cmpxchg.c                         | 109 ++++++
+ arch/mips/kernel/cps-vec.S                         |   7 +-
+ arch/mips/kernel/cpu-probe.c                       |  22 ++
+ arch/mips/kernel/head.S                            |   2 +-
+ arch/mips/kernel/mips-cm.c                         |  40 +-
+ arch/mips/kernel/module-rela.c                     | 202 ----------
+ arch/mips/kernel/module.c                          | 221 ++++++++---
+ arch/mips/kernel/perf_event_mipsxx.c               |  14 +-
+ arch/mips/kernel/ptrace.c                          |  22 +-
+ arch/mips/kernel/scall32-o32.S                     |   2 +-
+ arch/mips/kernel/scall64-64.S                      |   2 +-
+ arch/mips/kernel/scall64-n32.S                     |   2 +-
+ arch/mips/kernel/scall64-o32.S                     |   2 +-
+ arch/mips/kernel/setup.c                           |  40 ++
+ arch/mips/kernel/smp-cps.c                         |  35 +-
+ arch/mips/kernel/smp.c                             |   3 +
+ arch/mips/kernel/syscall.c                         |  19 +-
+ arch/mips/kernel/unaligned.c                       | 174 +++++----
+ arch/mips/lib/memcpy.S                             |   3 +
+ arch/mips/loongson64/common/env.c                  |  12 +-
+ arch/mips/loongson64/common/init.c                 |  13 +
+ arch/mips/loongson64/loongson-3/irq.c              |  58 ++-
+ arch/mips/loongson64/loongson-3/smp.c              |  23 +-
+ arch/mips/math-emu/cp1emu.c                        |  43 ++-
+ arch/mips/math-emu/dp_maddf.c                      |   5 +-
+ arch/mips/math-emu/sp_maddf.c                      |   5 +-
+ arch/mips/mm/c-r4k.c                               |   2 +
+ arch/mips/mm/dma-default.c                         |  23 +-
+ arch/mips/mm/tlbex.c                               |  41 +-
+ arch/mips/mm/uasm-micromips.c                      | 188 +++++----
+ arch/mips/mm/uasm-mips.c                           | 238 ++++++------
+ arch/mips/mm/uasm.c                                |  61 ++-
+ arch/mips/net/Makefile                             |   3 +-
+ arch/mips/vdso/gettimeofday.c                      |  59 ++-
+ drivers/platform/mips/cpu_hwmon.c                  | 136 +++----
+ 109 files changed, 1927 insertions(+), 1836 deletions(-)
+ create mode 100644 arch/mips/generic/yamon-dt.c
+ create mode 100644 arch/mips/include/asm/yamon-dt.h
+ create mode 100644 arch/mips/kernel/cmpxchg.c
+ delete mode 100644 arch/mips/kernel/module-rela.c
+Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
+$ git merge openrisc/for-next
+Auto-merging arch/openrisc/kernel/process.c
+Merge made by the 'recursive' strategy.
+ arch/openrisc/configs/or1ksim_defconfig | 3 +--
+ arch/openrisc/include/asm/fixmap.h      | 1 +
+ arch/openrisc/kernel/or32_ksyms.c       | 2 +-
+ arch/openrisc/kernel/process.c          | 2 +-
+ arch/openrisc/lib/delay.c               | 3 ++-
+ 5 files changed, 6 insertions(+), 5 deletions(-)
+Merging parisc-hd/for-next (d6b1d990957c parisc: use compat_sys_keyctl())
+$ git merge parisc-hd/for-next
+Auto-merging arch/parisc/include/asm/processor.h
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/io.h          |  16 ++--
+ arch/parisc/include/asm/mmu_context.h |  15 +++-
+ arch/parisc/include/asm/pdc.h         |  18 +++++
+ arch/parisc/include/asm/pdcpat.h      |  35 ++++++---
+ arch/parisc/include/asm/pgtable.h     |   3 +
+ arch/parisc/include/asm/processor.h   |   2 +
+ arch/parisc/include/asm/uaccess.h     |  11 ---
+ arch/parisc/include/uapi/asm/pdc.h    |  12 +--
+ arch/parisc/kernel/Makefile           |   2 +-
+ arch/parisc/kernel/asm-offsets.c      |   5 --
+ arch/parisc/kernel/firmware.c         | 108 +++++++++++++++++++++++++
+ arch/parisc/kernel/hpmc.S             |   5 +-
+ arch/parisc/kernel/inventory.c        |   9 +++
+ arch/parisc/kernel/pdt.c              | 143 ++++++++++++++++++++++++++++++++++
+ arch/parisc/kernel/processor.c        |   5 +-
+ arch/parisc/kernel/syscall_table.S    |   2 +-
+ arch/parisc/kernel/time.c             |  24 +++++-
+ arch/parisc/lib/lusercopy.S           |  25 +++---
+ arch/parisc/mm/fault.c                |  10 +--
+ arch/parisc/mm/init.c                 |   3 +
+ 20 files changed, 378 insertions(+), 75 deletions(-)
+ create mode 100644 arch/parisc/kernel/pdt.c
+Merging powerpc/next (4d0d7c02df68 powerpc/powernv/idle: Clear r12 on wakeup from stop lite)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/sysdev/xive/common.c
+Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
+Auto-merging arch/powerpc/platforms/powernv/subcore.c
+Auto-merging arch/powerpc/perf/power9-pmu.c
+Auto-merging arch/powerpc/mm/mmu_context_book3s64.c
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/kernel/setup-common.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+Removing arch/powerpc/include/uapi/asm/statfs.h
+Removing arch/powerpc/include/uapi/asm/sockios.h
+Removing arch/powerpc/include/uapi/asm/resource.h
+Removing arch/powerpc/include/uapi/asm/poll.h
+Removing arch/powerpc/include/uapi/asm/param.h
+Auto-merging arch/powerpc/include/asm/processor.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/powerpc/firmware-assisted-dump.txt   |   4 +-
+ MAINTAINERS                                        |  11 +-
+ arch/powerpc/Kconfig                               |  22 +-
+ arch/powerpc/Makefile                              |  11 +
+ arch/powerpc/Makefile.postlink                     |  17 +-
+ arch/powerpc/boot/Makefile                         |   5 +-
+ arch/powerpc/boot/crtsavres.S                      |   8 +-
+ arch/powerpc/boot/dts/digsy_mtc.dts                |   2 +-
+ arch/powerpc/boot/dts/fsl/b4qds.dtsi               |   8 +-
+ arch/powerpc/boot/dts/fsl/c293pcie.dts             |   2 +-
+ arch/powerpc/boot/dts/fsl/p1010rdb.dtsi            |   2 +-
+ arch/powerpc/boot/dts/fsl/p1023rdb.dts             |   2 +-
+ arch/powerpc/boot/dts/fsl/p2041rdb.dts             |   4 +-
+ arch/powerpc/boot/dts/fsl/p3041ds.dts              |   4 +-
+ arch/powerpc/boot/dts/fsl/p4080ds.dts              |   4 +-
+ arch/powerpc/boot/dts/fsl/p5020ds.dts              |   4 +-
+ arch/powerpc/boot/dts/fsl/p5040ds.dts              |   4 +-
+ arch/powerpc/boot/dts/fsl/t208xqds.dtsi            |   8 +-
+ arch/powerpc/boot/dts/fsl/t4240qds.dts             |  12 +-
+ arch/powerpc/boot/dts/fsl/t4240rdb.dts             |   6 +-
+ arch/powerpc/boot/dts/fsp2.dts                     | 608 +++++++++++++++++++++
+ arch/powerpc/boot/dts/mpc5121ads.dts               |   2 +-
+ arch/powerpc/boot/dts/mpc8308_p1m.dts              |   2 +-
+ arch/powerpc/boot/dts/mpc8349emitx.dts             |   4 +-
+ arch/powerpc/boot/dts/mpc8377_rdb.dts              |   2 +-
+ arch/powerpc/boot/dts/mpc8377_wlan.dts             |   2 +-
+ arch/powerpc/boot/dts/mpc8378_rdb.dts              |   2 +-
+ arch/powerpc/boot/dts/mpc8379_rdb.dts              |   2 +-
+ arch/powerpc/boot/dts/pcm030.dts                   |   2 +-
+ arch/powerpc/boot/dts/pcm032.dts                   |   2 +-
+ arch/powerpc/boot/dts/sequoia.dts                  |   2 +-
+ arch/powerpc/boot/dts/warp.dts                     |   2 +-
+ arch/powerpc/boot/ppc_asm.h                        |  12 +-
+ arch/powerpc/configs/44x/fsp2_defconfig            | 126 +++++
+ arch/powerpc/include/asm/barrier.h                 |   5 +
+ arch/powerpc/include/asm/bitops.h                  |  87 +--
+ arch/powerpc/include/asm/book3s/32/pgalloc.h       |   3 +-
+ arch/powerpc/include/asm/book3s/32/pgtable.h       |   2 +
+ arch/powerpc/include/asm/book3s/64/pgalloc.h       |  16 +-
+ arch/powerpc/include/asm/dbell.h                   |  13 +
+ arch/powerpc/include/asm/exception-64s.h           |  49 +-
+ arch/powerpc/include/asm/fadump.h                  |   4 +
+ arch/powerpc/include/asm/head-64.h                 |  25 +-
+ arch/powerpc/include/asm/hw_irq.h                  |   4 +
+ arch/powerpc/include/asm/machdep.h                 |   1 +
+ arch/powerpc/include/asm/mce.h                     |  15 +-
+ arch/powerpc/include/asm/nohash/32/pgalloc.h       |   3 +-
+ arch/powerpc/include/asm/nohash/32/pgtable.h       |   2 +
+ arch/powerpc/include/asm/nohash/64/pgalloc.h       |  11 +-
+ arch/powerpc/include/asm/opal-api.h                |  75 ++-
+ arch/powerpc/include/asm/paca.h                    |  14 +-
+ arch/powerpc/include/asm/pgalloc.h                 |  14 +
+ arch/powerpc/include/asm/ppc-opcode.h              |  11 +-
+ arch/powerpc/include/asm/ppc_asm.h                 |  11 +-
+ arch/powerpc/include/asm/processor.h               |  10 +-
+ arch/powerpc/include/asm/trace.h                   |  33 ++
+ arch/powerpc/include/uapi/asm/Kbuild               |   6 +
+ arch/powerpc/include/uapi/asm/param.h              |   1 -
+ arch/powerpc/include/uapi/asm/poll.h               |   1 -
+ arch/powerpc/include/uapi/asm/resource.h           |   1 -
+ arch/powerpc/include/uapi/asm/sockios.h            |  20 -
+ arch/powerpc/include/uapi/asm/statfs.h             |   6 -
+ arch/powerpc/kernel/Makefile                       |   2 -
+ arch/powerpc/kernel/asm-offsets.c                  |  10 +-
+ arch/powerpc/kernel/entry_64.S                     | 113 ++--
+ arch/powerpc/kernel/exceptions-64s.S               | 282 ++++++----
+ arch/powerpc/kernel/fadump.c                       | 196 ++++++-
+ arch/powerpc/kernel/idle_book3s.S                  | 188 +++----
+ arch/powerpc/kernel/irq.c                          |  62 ++-
+ arch/powerpc/kernel/mce.c                          |   1 +
+ arch/powerpc/kernel/mce_power.c                    |   3 +
+ arch/powerpc/kernel/misc_32.S                      |   6 +-
+ arch/powerpc/kernel/process.c                      |  45 +-
+ arch/powerpc/kernel/setup-common.c                 |   4 +
+ arch/powerpc/kernel/smp.c                          |   3 +-
+ arch/powerpc/kernel/time.c                         |  88 ++-
+ arch/powerpc/kernel/tm.S                           |   4 +-
+ arch/powerpc/kernel/vmlinux.lds.S                  |  51 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c                |  11 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S            |  12 +-
+ arch/powerpc/lib/Makefile                          |  15 +-
+ arch/powerpc/lib/copyuser_power7.S                 |   4 +-
+ arch/powerpc/lib/crtsavres.S                       |   6 +-
+ arch/powerpc/lib/xor_vmx.c                         |  53 +-
+ arch/powerpc/lib/xor_vmx.h                         |  20 +
+ arch/powerpc/lib/xor_vmx_glue.c                    |  62 +++
+ arch/powerpc/mm/8xx_mmu.c                          |   2 +-
+ arch/powerpc/mm/dma-noncoherent.c                  |   2 +-
+ arch/powerpc/mm/dump_hashpagetable.c               |   2 +-
+ arch/powerpc/mm/fault.c                            |  17 +-
+ arch/powerpc/mm/hash_native_64.c                   |   3 +
+ arch/powerpc/mm/hash_utils_64.c                    |   2 +
+ arch/powerpc/mm/hugetlbpage.c                      |   2 +-
+ arch/powerpc/mm/init_64.c                          |  21 +
+ arch/powerpc/mm/mem.c                              |   4 +-
+ arch/powerpc/mm/mmu_context_book3s64.c             |  15 +-
+ arch/powerpc/mm/mmu_decl.h                         |   1 -
+ arch/powerpc/mm/pgtable-hash64.c                   |  75 +++
+ arch/powerpc/mm/pgtable-radix.c                    |  19 +-
+ arch/powerpc/mm/pgtable_32.c                       |  15 +-
+ arch/powerpc/mm/pgtable_64.c                       |  28 +-
+ arch/powerpc/mm/slb.c                              |  10 +-
+ arch/powerpc/mm/slb_low.S                          |  30 +-
+ arch/powerpc/mm/tlb-radix.c                        |   9 +
+ arch/powerpc/mm/tlb_hash64.c                       |   6 +-
+ arch/powerpc/perf/power9-events-list.h             |   4 +-
+ arch/powerpc/perf/power9-pmu.c                     |   8 +-
+ arch/powerpc/platforms/44x/Kconfig                 |  12 +
+ arch/powerpc/platforms/44x/Makefile                |   1 +
+ arch/powerpc/platforms/44x/fsp2.c                  |  62 +++
+ arch/powerpc/platforms/cell/smp.c                  |   3 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c       |  16 +-
+ arch/powerpc/platforms/powernv/idle.c              | 198 +++++--
+ arch/powerpc/platforms/powernv/opal-wrappers.S     |   6 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c          | 133 ++++-
+ arch/powerpc/platforms/powernv/pci.c               | 160 +++++-
+ arch/powerpc/platforms/powernv/pci.h               |  13 +-
+ arch/powerpc/platforms/powernv/smp.c               |  34 +-
+ arch/powerpc/platforms/powernv/subcore.c           |   3 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c       |   2 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c    |   7 +
+ arch/powerpc/platforms/pseries/smp.c               |   3 +-
+ arch/powerpc/sysdev/mpc8xx_pic.c                   |   2 +-
+ arch/powerpc/sysdev/xive/common.c                  |   2 +-
+ arch/powerpc/sysdev/xive/native.c                  |   4 +-
+ arch/powerpc/tools/head_check.sh                   |  78 +++
+ arch/powerpc/tools/unrel_branch_check.sh           |  57 ++
+ arch/powerpc/xmon/xmon.c                           |   8 +-
+ drivers/cpuidle/cpuidle-powernv.c                  |  53 +-
+ drivers/cpuidle/cpuidle-pseries.c                  |  22 +-
+ drivers/misc/cxl/flash.c                           |   8 +-
+ drivers/tty/hvc/hvcs.c                             |   3 +-
+ drivers/watchdog/Kconfig                           |   2 +-
+ include/asm-generic/vmlinux.lds.h                  |  12 +
+ .../selftests/powerpc/benchmarks/context_switch.c  |  53 +-
+ 135 files changed, 2957 insertions(+), 869 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/fsp2.dts
+ create mode 100644 arch/powerpc/configs/44x/fsp2_defconfig
+ delete mode 100644 arch/powerpc/include/uapi/asm/param.h
+ delete mode 100644 arch/powerpc/include/uapi/asm/poll.h
+ delete mode 100644 arch/powerpc/include/uapi/asm/resource.h
+ delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h
+ delete mode 100644 arch/powerpc/include/uapi/asm/statfs.h
+ create mode 100644 arch/powerpc/lib/xor_vmx.h
+ create mode 100644 arch/powerpc/lib/xor_vmx_glue.c
+ create mode 100644 arch/powerpc/platforms/44x/fsp2.c
+ create mode 100644 arch/powerpc/tools/head_check.sh
+ create mode 100755 arch/powerpc/tools/unrel_branch_check.sh
+Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (9e293b5a7062 Merge tag 'nmiforkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features)
+$ git merge s390/features
+Removing drivers/s390/block/scm_blk_cluster.c
+Auto-merging arch/s390/pci/pci_dma.c
+Auto-merging arch/s390/mm/mmap.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/gaccess.c
+Auto-merging arch/s390/include/asm/processor.h
+Auto-merging arch/s390/include/asm/kvm_host.h
+Removing arch/s390/include/asm/fb.h
+Removing arch/s390/include/asm/device.h
+Auto-merging arch/s390/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig                     |   3 +-
+ arch/s390/crypto/Makefile             |   3 +-
+ arch/s390/crypto/arch_random.c        |   1 +
+ arch/s390/include/asm/Kbuild          |   2 +
+ arch/s390/include/asm/device.h        |  10 --
+ arch/s390/include/asm/elf.h           |  32 +++++
+ arch/s390/include/asm/fb.h            |  12 --
+ arch/s390/include/asm/io.h            |   4 +-
+ arch/s390/include/asm/kvm_host.h      |  17 ++-
+ arch/s390/include/asm/mmu_context.h   |   4 +-
+ arch/s390/include/asm/nmi.h           |   7 +
+ arch/s390/include/asm/page.h          |   3 +
+ arch/s390/include/asm/pci.h           |  15 +-
+ arch/s390/include/asm/pci_insn.h      |   2 +-
+ arch/s390/include/asm/pgalloc.h       |  25 +++-
+ arch/s390/include/asm/pgtable.h       | 105 +++++++++++---
+ arch/s390/include/asm/processor.h     |   6 +-
+ arch/s390/include/asm/ptrace.h        |  54 +++----
+ arch/s390/include/asm/sigp.h          |   2 +-
+ arch/s390/include/asm/thread_info.h   |   1 +
+ arch/s390/include/asm/tlb.h           |  15 ++
+ arch/s390/kernel/asm-offsets.c        |   3 +
+ arch/s390/kernel/dumpstack.c          |  33 +----
+ arch/s390/kernel/entry.S              |  30 +++-
+ arch/s390/kernel/nmi.c                |  84 +++++++++--
+ arch/s390/kernel/perf_cpum_sf.c       |  10 +-
+ arch/s390/kernel/perf_event.c         |   3 +-
+ arch/s390/kernel/ptrace.c             |  15 +-
+ arch/s390/kernel/smp.c                |   3 +
+ arch/s390/kernel/traps.c              |   1 +
+ arch/s390/kernel/uprobes.c            |  12 +-
+ arch/s390/kernel/vdso.c               |  91 ++++++++----
+ arch/s390/kernel/vtime.c              |  14 +-
+ arch/s390/kvm/gaccess.c               |  22 +--
+ arch/s390/kvm/gaccess.h               |   4 +-
+ arch/s390/kvm/guestdbg.c              |   6 +-
+ arch/s390/kvm/kvm-s390.c              |   1 +
+ arch/s390/kvm/priv.c                  |   8 +-
+ arch/s390/mm/dump_pagetables.c        |  23 ++-
+ arch/s390/mm/fault.c                  |   2 +-
+ arch/s390/mm/gmap.c                   |  11 +-
+ arch/s390/mm/gup.c                    |  33 ++++-
+ arch/s390/mm/hugetlbpage.c            |  30 ++--
+ arch/s390/mm/init.c                   |   6 +-
+ arch/s390/mm/mmap.c                   |   4 +-
+ arch/s390/mm/pageattr.c               |  30 +++-
+ arch/s390/mm/pgalloc.c                |  57 +++++---
+ arch/s390/mm/pgtable.c                |   6 +-
+ arch/s390/mm/vmem.c                   |  44 +++++-
+ arch/s390/pci/pci.c                   | 173 ++++++++++++----------
+ arch/s390/pci/pci_clp.c               |  77 ++++++----
+ arch/s390/pci/pci_dma.c               |   4 +-
+ arch/s390/pci/pci_event.c             |  14 +-
+ arch/s390/pci/pci_insn.c              |  10 +-
+ arch/s390/tools/gen_facilities.c      |   2 -
+ drivers/crypto/Kconfig                |  15 +-
+ drivers/s390/block/Kconfig            |   7 -
+ drivers/s390/block/Makefile           |   3 -
+ drivers/s390/block/dasd.c             |  76 +++++-----
+ drivers/s390/block/dasd_devmap.c      |  75 ++++++----
+ drivers/s390/block/scm_blk.c          | 262 +++++++++++++++-------------------
+ drivers/s390/block/scm_blk.h          |  60 +-------
+ drivers/s390/block/scm_blk_cluster.c  | 255 ---------------------------------
+ drivers/s390/cio/css.c                |  49 +++++++
+ drivers/s390/cio/device.c             |  42 ------
+ drivers/s390/cio/vfio_ccw_drv.c       |  58 +-------
+ drivers/s390/crypto/ap_bus.c          |  21 ++-
+ drivers/s390/crypto/pkey_api.c        |   6 +-
+ drivers/s390/crypto/zcrypt_api.c      |  12 +-
+ drivers/s390/crypto/zcrypt_cca_key.h  | 115 +--------------
+ drivers/s390/crypto/zcrypt_msgtype6.c |   4 +-
+ drivers/tty/hvc/Kconfig               |   2 +-
+ 72 files changed, 1135 insertions(+), 1116 deletions(-)
+ delete mode 100644 arch/s390/include/asm/device.h
+ delete mode 100644 arch/s390/include/asm/fb.h
+ delete mode 100644 drivers/s390/block/scm_blk_cluster.c
+Merging sparc-next/master (a718d1392700 sparc64: fix typo in property)
+$ git merge sparc-next/master
+Auto-merging arch/sparc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/sparc/Kconfig                      |   5 +
+ arch/sparc/include/asm/cmpxchg_64.h     |  76 +++++++-
+ arch/sparc/include/asm/ldc.h            |   8 +
+ arch/sparc/include/asm/mdesc.h          |  24 ++-
+ arch/sparc/include/asm/qrwlock.h        |   7 +
+ arch/sparc/include/asm/qspinlock.h      |   7 +
+ arch/sparc/include/asm/setup.h          |   2 +-
+ arch/sparc/include/asm/spinlock_64.h    | 208 +-------------------
+ arch/sparc/include/asm/spinlock_types.h |  12 +-
+ arch/sparc/include/asm/timer_64.h       |  67 +++++++
+ arch/sparc/include/asm/vio.h            |  13 +-
+ arch/sparc/kernel/apc.c                 |   2 +-
+ arch/sparc/kernel/kernel.h              |   3 +
+ arch/sparc/kernel/ldc.c                 | 151 ++++++++++-----
+ arch/sparc/kernel/mdesc.c               | 331 +++++++++++++++++++++++++++-----
+ arch/sparc/kernel/prom_64.c             |   2 +-
+ arch/sparc/kernel/setup_64.c            |   7 +-
+ arch/sparc/kernel/time_32.c             |   2 +-
+ arch/sparc/kernel/time_64.c             | 179 +++++++++++------
+ arch/sparc/kernel/vio.c                 | 244 ++++++++++++-----------
+ arch/sparc/kernel/viohs.c               |  24 ++-
+ arch/sparc/kernel/vmlinux.lds.S         |   5 +
+ kernel/locking/qrwlock.c                |   1 +
+ 23 files changed, 889 insertions(+), 491 deletions(-)
+ create mode 100644 arch/sparc/include/asm/qrwlock.h
+ create mode 100644 arch/sparc/include/asm/qspinlock.h
+Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
+$ git merge sh/for-next
+Merge made by the 'recursive' strategy.
+ arch/sh/include/asm/futex.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/include/uapi/arch/abi.h    | 49 +++----------------------
+ arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++
+ arch/tile/mm/init.c                  | 30 ----------------
+ 3 files changed, 74 insertions(+), 75 deletions(-)
+ create mode 100644 arch/tile/include/uapi/arch/intreg.h
+Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig                          |  14 +
+ arch/unicore32/include/asm/Kbuild               |   3 -
+ arch/unicore32/include/asm/signal.h             |  21 +
+ arch/unicore32/include/asm/syscalls.h           |  25 +
+ arch/unicore32/include/uapi/asm/sigcontext.h    |  14 +
+ arch/unicore32/include/uapi/asm/stat-oldabi.h   |  71 +++
+ arch/unicore32/include/uapi/asm/stat.h          |  19 +
+ arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
+ arch/unicore32/include/uapi/asm/unistd.h        |   8 +
+ arch/unicore32/kernel/entry.S                   |  17 +
+ arch/unicore32/kernel/signal.c                  |  41 ++
+ 11 files changed, 1000 insertions(+), 3 deletions(-)
+ create mode 100644 arch/unicore32/include/asm/signal.h
+ create mode 100644 arch/unicore32/include/asm/syscalls.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat.h
+ create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
+Merging xtensa/xtensa-for-next (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
+$ git merge fscrypt/master
+Auto-merging fs/ext4/super.c
+Merge made by the 'recursive' strategy.
+ fs/crypto/Kconfig              |   1 +
+ fs/crypto/crypto.c             |  23 ++++--
+ fs/crypto/fname.c              |   9 ---
+ fs/crypto/fscrypt_private.h    |   9 ++-
+ fs/crypto/keyinfo.c            | 173 ++++++++++++++++++++++++++++++++---------
+ fs/crypto/policy.c             |   8 +-
+ fs/ext4/super.c                |   2 +-
+ include/linux/fscrypt_common.h |  18 +++--
+ include/linux/fscrypt_supp.h   |   7 +-
+ include/uapi/linux/fs.h        |   2 +
+ 10 files changed, 182 insertions(+), 70 deletions(-)
+Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
+$ git merge btrfs/next
+Already up-to-date.
+Merging btrfs-kdave/for-next (4a240ddbe6b5 Merge branch 'for-next-current-v4.12-20170626' into for-next-20170626)
+$ git merge btrfs-kdave/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c               |  10 +-
+ fs/btrfs/check-integrity.c       |  53 ++---
+ fs/btrfs/compression.c           |  94 ++------
+ fs/btrfs/compression.h           |  44 +++-
+ fs/btrfs/ctree.c                 |  42 ++--
+ fs/btrfs/ctree.h                 |  84 ++++---
+ fs/btrfs/delayed-ref.c           |  29 ++-
+ fs/btrfs/delayed-ref.h           |   6 +-
+ fs/btrfs/dev-replace.c           |   4 +-
+ fs/btrfs/dir-item.c              |  94 +++++++-
+ fs/btrfs/disk-io.c               | 179 +++++++-------
+ fs/btrfs/disk-io.h               |   8 +-
+ fs/btrfs/export.c                |   5 +
+ fs/btrfs/extent-tree.c           | 493 +++++++++++++++++++++------------------
+ fs/btrfs/extent_io.c             | 217 ++++++++---------
+ fs/btrfs/extent_io.h             |  82 +++++--
+ fs/btrfs/file-item.c             |  31 ++-
+ fs/btrfs/file.c                  |  46 ++--
+ fs/btrfs/free-space-tree.c       |  38 ++-
+ fs/btrfs/inode-map.c             |   4 +-
+ fs/btrfs/inode.c                 | 449 +++++++++++++++++++----------------
+ fs/btrfs/ioctl.c                 |  18 +-
+ fs/btrfs/lzo.c                   |  33 +--
+ fs/btrfs/ordered-data.c          |  17 +-
+ fs/btrfs/ordered-data.h          |   4 +-
+ fs/btrfs/print-tree.c            |   7 +-
+ fs/btrfs/props.c                 |   7 +
+ fs/btrfs/qgroup.c                | 225 +++++++++++++-----
+ fs/btrfs/qgroup.h                |   9 +-
+ fs/btrfs/raid56.c                |  16 +-
+ fs/btrfs/reada.c                 |   1 -
+ fs/btrfs/relocation.c            |  17 +-
+ fs/btrfs/root-tree.c             |   7 +
+ fs/btrfs/scrub.c                 | 211 +++++++----------
+ fs/btrfs/send.c                  | 112 ++++++---
+ fs/btrfs/super.c                 |  74 +-----
+ fs/btrfs/sysfs.c                 |  41 ++++
+ fs/btrfs/tests/extent-io-tests.c |   2 +-
+ fs/btrfs/transaction.c           |  25 +-
+ fs/btrfs/tree-log.c              |  44 +++-
+ fs/btrfs/volumes.c               |  74 +++---
+ fs/btrfs/volumes.h               |   7 +
+ fs/btrfs/xattr.c                 |   2 +-
+ fs/btrfs/zlib.c                  |  20 +-
+ include/trace/events/btrfs.h     |  36 ---
+ include/uapi/linux/btrfs.h       |  63 +++--
+ 46 files changed, 1706 insertions(+), 1378 deletions(-)
+Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (bdda26555dd2 cifs: Do not modify mid entry after submitting I/O in cifs_call_async)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/Kconfig         |   9 ++
+ fs/cifs/cifs_unicode.c  |   8 ++
+ fs/cifs/cifsglob.h      |  14 ++-
+ fs/cifs/connect.c       |   8 +-
+ fs/cifs/file.c          |  12 +--
+ fs/cifs/smb2ops.c       | 234 ++++++++++++++++++++++++++++--------------------
+ fs/cifs/smb2pdu.c       |  58 +++++++++---
+ fs/cifs/smb2proto.h     |   3 +
+ fs/cifs/smb2transport.c |  28 +++++-
+ fs/cifs/transport.c     |   7 +-
+ 10 files changed, 258 insertions(+), 123 deletions(-)
+Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c          | 15 ---------------
+ fs/ecryptfs/ecryptfs_kernel.h |  9 ++++++++-
+ fs/ecryptfs/keystore.c        |  2 +-
+ fs/ecryptfs/main.c            |  2 +-
+ fs/ecryptfs/miscdev.c         |  2 +-
+ 5 files changed, 11 insertions(+), 19 deletions(-)
+Merging ext3/for_next (08db141b5313 reiserfs: fix race in prealloc discard)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/reiserfs/bitmap.c | 14 ++++++--
+ fs/udf/file.c        | 12 +++++--
+ fs/udf/inode.c       |  4 +--
+ fs/udf/super.c       |  2 --
+ fs/udf/udftime.c     | 98 +++++++---------------------------------------------
+ 5 files changed, 35 insertions(+), 95 deletions(-)
+Merging ext4/dev (037ee4110538 ext4: require key for truncate(2) of encrypted file)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Merge made by the 'recursive' strategy.
+ fs/ext2/ext2.h          |    2 +-
+ fs/ext2/super.c         |   16 +-
+ fs/ext2/xattr.c         |   48 +-
+ fs/ext4/acl.c           |   10 +-
+ fs/ext4/ext4.h          |   63 +-
+ fs/ext4/ext4_jbd2.h     |   14 -
+ fs/ext4/extents.c       |    3 +-
+ fs/ext4/file.c          |    7 -
+ fs/ext4/fsmap.c         |    4 +
+ fs/ext4/ialloc.c        |   15 +-
+ fs/ext4/indirect.c      |    3 +-
+ fs/ext4/inline.c        |    2 +-
+ fs/ext4/inode.c         |   72 +-
+ fs/ext4/ioctl.c         |   10 +-
+ fs/ext4/mballoc.c       |  143 ++--
+ fs/ext4/mballoc.h       |    6 +-
+ fs/ext4/migrate.c       |    2 +-
+ fs/ext4/move_extent.c   |    2 +-
+ fs/ext4/namei.c         |  131 ++--
+ fs/ext4/super.c         |  108 ++-
+ fs/ext4/sysfs.c         |    2 +-
+ fs/ext4/xattr.c         | 1750 ++++++++++++++++++++++++++++++++++++++++-------
+ fs/ext4/xattr.h         |   32 +-
+ fs/mbcache.c            |   52 +-
+ fs/quota/dquot.c        |   16 +-
+ include/linux/mbcache.h |   11 +-
+ include/linux/quota.h   |    2 +
+ 27 files changed, 2006 insertions(+), 520 deletions(-)
+Merging f2fs/dev (01d42209996c f2fs: introduce reserved_blocks in sysfs)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/segment.h
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs |  20 +-
+ Documentation/filesystems/f2fs.txt      |   2 +
+ fs/f2fs/Makefile                        |   2 +-
+ fs/f2fs/acl.c                           |   2 +-
+ fs/f2fs/checkpoint.c                    |  19 +-
+ fs/f2fs/data.c                          | 170 +++++++++-----
+ fs/f2fs/extent_cache.c                  |  12 +-
+ fs/f2fs/f2fs.h                          |  93 ++++++--
+ fs/f2fs/file.c                          | 149 +++++++++---
+ fs/f2fs/gc.c                            |  40 +++-
+ fs/f2fs/inline.c                        |  22 +-
+ fs/f2fs/inode.c                         |  12 +-
+ fs/f2fs/node.c                          |  45 ++--
+ fs/f2fs/node.h                          |   6 +-
+ fs/f2fs/segment.c                       | 194 +++++++++------
+ fs/f2fs/segment.h                       |   4 +
+ fs/f2fs/super.c                         | 401 ++++++--------------------------
+ fs/f2fs/sysfs.c                         | 363 +++++++++++++++++++++++++++++
+ include/trace/events/f2fs.h             |  16 +-
+ 19 files changed, 989 insertions(+), 583 deletions(-)
+ create mode 100644 fs/f2fs/sysfs.c
+Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
+$ git merge freevxfs/for-next
+Already up-to-date.
+Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
+$ git merge fscache/fscache
+Already up-to-date.
+Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
+$ git merge jfs/jfs-next
+Auto-merging fs/jfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/jfs/resize.c | 4 ++--
+ fs/jfs/super.c  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (2e31b4cb895a NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete())
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
+$ git merge nfsd/nfsd-next
+Auto-merging include/linux/sunrpc/svc.h
+Auto-merging fs/nfsd/nfsxdr.c
+Auto-merging fs/nfsd/nfs4proc.c
+Auto-merging fs/nfsd/nfs3xdr.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/callback_xdr.c
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c                  |  34 ++-
+ fs/lockd/clntxdr.c                   |  58 +++--
+ fs/lockd/mon.c                       |  38 ++--
+ fs/lockd/svc.c                       |  38 ++--
+ fs/lockd/svc4proc.c                  | 124 +++++++----
+ fs/lockd/svcproc.c                   | 124 +++++++----
+ fs/lockd/xdr.c                       |  43 ++--
+ fs/lockd/xdr4.c                      |  43 ++--
+ fs/nfs/callback.c                    |   2 +-
+ fs/nfs/callback.h                    |  27 +--
+ fs/nfs/callback_proc.c               |  33 ++-
+ fs/nfs/callback_xdr.c                | 113 +++++-----
+ fs/nfs/internal.h                    |  10 +-
+ fs/nfs/mount_clnt.c                  |  29 ++-
+ fs/nfs/nfs2xdr.c                     |  70 ++++--
+ fs/nfs/nfs3xdr.c                     | 151 ++++++++-----
+ fs/nfs/nfs42xdr.c                    |  52 +++--
+ fs/nfs/nfs4_fs.h                     |   6 +-
+ fs/nfs/nfs4xdr.c                     | 331 ++++++++++++++++++----------
+ fs/nfsd/current_stateid.h            |  36 ++-
+ fs/nfsd/nfs2acl.c                    | 116 +++++-----
+ fs/nfsd/nfs3acl.c                    |  75 ++++---
+ fs/nfsd/nfs3proc.c                   | 301 +++++++++++++------------
+ fs/nfsd/nfs3xdr.c                    | 164 ++++++++------
+ fs/nfsd/nfs4callback.c               |  32 ++-
+ fs/nfsd/nfs4proc.c                   | 412 ++++++++++++++++++-----------------
+ fs/nfsd/nfs4state.c                  | 142 +++++++-----
+ fs/nfsd/nfs4xdr.c                    |  13 +-
+ fs/nfsd/nfsd.h                       |   6 +-
+ fs/nfsd/nfsproc.c                    | 206 +++++++++---------
+ fs/nfsd/nfssvc.c                     |  24 +-
+ fs/nfsd/nfsxdr.c                     |  92 ++++----
+ fs/nfsd/xdr.h                        |  50 ++---
+ fs/nfsd/xdr3.h                       | 100 +++------
+ fs/nfsd/xdr4.h                       |  78 +++----
+ include/linux/lockd/lockd.h          |   4 +-
+ include/linux/lockd/xdr.h            |  26 +--
+ include/linux/lockd/xdr4.h           |  26 +--
+ include/linux/sunrpc/clnt.h          |   6 +-
+ include/linux/sunrpc/sched.h         |   2 +-
+ include/linux/sunrpc/svc.h           |  21 +-
+ include/linux/sunrpc/xdr.h           |  15 +-
+ net/sunrpc/auth_gss/gss_rpc_upcall.c |   9 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.c    |  14 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.h    |   4 +-
+ net/sunrpc/clnt.c                    |  16 +-
+ net/sunrpc/rpcb_clnt.c               |  82 ++++---
+ net/sunrpc/stats.c                   |  16 +-
+ net/sunrpc/svc.c                     |  33 +--
+ 49 files changed, 1956 insertions(+), 1491 deletions(-)
+Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
+$ git merge orangefs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (fbaf94ee3cd5 ovl: don't set origin on broken lower hardlink)
+$ git merge overlayfs/overlayfs-next
+Auto-merging fs/overlayfs/copy_up.c
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/copy_up.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (50e0bdbe9f48 xfs: grab dquots without taking the ilock)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/xfs/xfs_log_recover.c
+Auto-merging fs/xfs/xfs_linux.h
+Auto-merging fs/xfs/xfs_aops.c
+Merge made by the 'recursive' strategy.
+ fs/xfs/Kconfig                     |  13 ++
+ fs/xfs/libxfs/xfs_ag_resv.c        |   3 +-
+ fs/xfs/libxfs/xfs_alloc.c          |   8 +-
+ fs/xfs/libxfs/xfs_alloc.h          |   2 +
+ fs/xfs/libxfs/xfs_alloc_btree.c    |  26 ++-
+ fs/xfs/libxfs/xfs_attr.c           |  26 ++-
+ fs/xfs/libxfs/xfs_attr_remote.c    |  13 +-
+ fs/xfs/libxfs/xfs_attr_sf.h        |  10 +-
+ fs/xfs/libxfs/xfs_bit.h            |  24 +--
+ fs/xfs/libxfs/xfs_bmap.c           |  51 ++++--
+ fs/xfs/libxfs/xfs_bmap.h           |   2 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c     |  34 +++-
+ fs/xfs/libxfs/xfs_btree.c          |  52 +++---
+ fs/xfs/libxfs/xfs_btree.h          |  33 ++--
+ fs/xfs/libxfs/xfs_cksum.h          |  16 +-
+ fs/xfs/libxfs/xfs_da_btree.c       |  12 +-
+ fs/xfs/libxfs/xfs_da_btree.h       |   8 +-
+ fs/xfs/libxfs/xfs_da_format.c      |  28 +--
+ fs/xfs/libxfs/xfs_da_format.h      |  64 +++----
+ fs/xfs/libxfs/xfs_dir2.c           |   3 +-
+ fs/xfs/libxfs/xfs_dir2.h           |   8 +-
+ fs/xfs/libxfs/xfs_dir2_leaf.c      |  14 +-
+ fs/xfs/libxfs/xfs_dir2_node.c      |  10 +-
+ fs/xfs/libxfs/xfs_dir2_priv.h      |  10 +-
+ fs/xfs/libxfs/xfs_dir2_sf.c        |   2 +-
+ fs/xfs/libxfs/xfs_format.h         | 112 ++++++------
+ fs/xfs/libxfs/xfs_fs.h             |  16 +-
+ fs/xfs/libxfs/xfs_ialloc.c         |  53 +++---
+ fs/xfs/libxfs/xfs_ialloc.h         |   5 +
+ fs/xfs/libxfs/xfs_ialloc_btree.c   |  36 +++-
+ fs/xfs/libxfs/xfs_inode_buf.c      |   7 +-
+ fs/xfs/libxfs/xfs_inode_buf.h      |  31 ++--
+ fs/xfs/libxfs/xfs_log_format.h     | 256 ++++++++++++++--------------
+ fs/xfs/libxfs/xfs_log_recover.h    |   2 +-
+ fs/xfs/libxfs/xfs_quota_defs.h     |   6 +-
+ fs/xfs/libxfs/xfs_refcount.c       |  16 +-
+ fs/xfs/libxfs/xfs_refcount.h       |  16 ++
+ fs/xfs/libxfs/xfs_refcount_btree.c |  12 +-
+ fs/xfs/libxfs/xfs_rmap.c           |  14 +-
+ fs/xfs/libxfs/xfs_rmap.h           |  11 +-
+ fs/xfs/libxfs/xfs_rmap_btree.c     |  34 ++--
+ fs/xfs/libxfs/xfs_rtbitmap.c       |   4 +-
+ fs/xfs/libxfs/xfs_sb.c             |   4 +-
+ fs/xfs/libxfs/xfs_types.h          |  46 ++---
+ fs/xfs/xfs.h                       |   4 +
+ fs/xfs/xfs_acl.c                   |   6 +-
+ fs/xfs/xfs_acl.h                   |   1 +
+ fs/xfs/xfs_aops.c                  |   4 +-
+ fs/xfs/xfs_attr.h                  |   3 +
+ fs/xfs/xfs_attr_list.c             |  61 ++++---
+ fs/xfs/xfs_bmap_item.c             |  17 +-
+ fs/xfs/xfs_bmap_util.c             | 164 ++++++++++--------
+ fs/xfs/xfs_bmap_util.h             |   4 +
+ fs/xfs/xfs_buf.c                   |  62 ++++++-
+ fs/xfs/xfs_buf.h                   |   1 +
+ fs/xfs/xfs_buf_item.c              |  21 ++-
+ fs/xfs/xfs_dir2_readdir.c          | 341 +++++++++++--------------------------
+ fs/xfs/xfs_discard.c               |   4 +-
+ fs/xfs/xfs_dquot.c                 |  16 +-
+ fs/xfs/xfs_error.c                 | 308 +++++++++++++++++++++++++--------
+ fs/xfs/xfs_error.h                 |  44 +++--
+ fs/xfs/xfs_file.c                  |   3 +-
+ fs/xfs/xfs_fsops.c                 |  16 +-
+ fs/xfs/xfs_fsops.h                 |   4 +-
+ fs/xfs/xfs_globals.c               |   5 +
+ fs/xfs/xfs_icache.c                |  52 +++++-
+ fs/xfs/xfs_icache.h                |   4 +
+ fs/xfs/xfs_inode.c                 |  17 +-
+ fs/xfs/xfs_inode.h                 |   4 +-
+ fs/xfs/xfs_ioctl.c                 |  27 ++-
+ fs/xfs/xfs_ioctl.h                 |  10 +-
+ fs/xfs/xfs_ioctl32.h               |   6 +-
+ fs/xfs/xfs_iomap.c                 |   4 +-
+ fs/xfs/xfs_iops.c                  |   4 +-
+ fs/xfs/xfs_itable.c                |   2 +-
+ fs/xfs/xfs_itable.h                |   2 +
+ fs/xfs/xfs_linux.h                 |  20 +--
+ fs/xfs/xfs_log.c                   |  87 +++++++---
+ fs/xfs/xfs_log.h                   |   2 +-
+ fs/xfs/xfs_log_cil.c               |  91 ++++++----
+ fs/xfs/xfs_log_priv.h              |   3 +-
+ fs/xfs/xfs_log_recover.c           |  49 ++++--
+ fs/xfs/xfs_message.c               |   5 +-
+ fs/xfs/xfs_mount.c                 |  26 +--
+ fs/xfs/xfs_mount.h                 |  60 +++----
+ fs/xfs/xfs_qm.c                    |  28 ++-
+ fs/xfs/xfs_qm_bhv.c                |   2 +-
+ fs/xfs/xfs_reflink.c               | 101 ++++++-----
+ fs/xfs/xfs_reflink.h               |   8 +-
+ fs/xfs/xfs_rtalloc.c               |   8 +-
+ fs/xfs/xfs_rtalloc.h               |   3 +
+ fs/xfs/xfs_stats.c                 |   8 +-
+ fs/xfs/xfs_stats.h                 | 190 ++++++++++-----------
+ fs/xfs/xfs_super.c                 |  26 +--
+ fs/xfs/xfs_symlink.c               |   6 +-
+ fs/xfs/xfs_symlink.h               |   1 +
+ fs/xfs/xfs_sysctl.h                |   1 +
+ fs/xfs/xfs_sysfs.c                 |  81 ++-------
+ fs/xfs/xfs_trace.h                 |  40 ++---
+ fs/xfs/xfs_trans.h                 |   8 +-
+ fs/xfs/xfs_trans_bmap.c            |  11 +-
+ fs/xfs/xfs_trans_buf.c             |  21 ++-
+ fs/xfs/xfs_trans_rmap.c            |   2 +-
+ 103 files changed, 1828 insertions(+), 1434 deletions(-)
+Merging file-locks/linux-next (3832ff35309d btrfs: minimal conversion to errseq_t writeback error reporting on fsync)
+$ git merge file-locks/linux-next
+Resolved 'include/linux/fs.h' using previous resolution.
+Auto-merging mm/memory-failure.c
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/fs.h
+CONFLICT (content): Merge conflict in include/linux/fs.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/dax.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/block_dev.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8b9ae1f7a9c8] Merge remote-tracking branch 'file-locks/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/vfs.txt               |  44 ++++-
+ MAINTAINERS                                     |   6 +
+ drivers/dax/device.c                            |   1 +
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c |   2 +-
+ fs/9p/vfs_file.c                                |   2 +-
+ fs/block_dev.c                                  |   3 +-
+ fs/btrfs/file.c                                 |  13 +-
+ fs/buffer.c                                     |  20 ++-
+ fs/ceph/locks.c                                 |   2 +-
+ fs/cifs/cifssmb.c                               |   2 +-
+ fs/dax.c                                        |   4 +-
+ fs/dlm/plock.c                                  |   2 +-
+ fs/exofs/dir.c                                  |   2 +-
+ fs/ext2/dir.c                                   |   2 +-
+ fs/ext2/file.c                                  |   5 +-
+ fs/ext4/fsync.c                                 |   2 +-
+ fs/fcntl.c                                      | 172 +++++++++++++-------
+ fs/file_table.c                                 |   1 +
+ fs/fuse/file.c                                  |   6 +-
+ fs/gfs2/lops.c                                  |   2 +-
+ fs/jbd2/commit.c                                |  16 +-
+ fs/jfs/jfs_metapage.c                           |   7 +-
+ fs/jfs/jfs_metapage.h                           |   1 +
+ fs/libfs.c                                      |   6 +-
+ fs/locks.c                                      | 193 ++++++++++------------
+ fs/minix/dir.c                                  |   2 +-
+ fs/open.c                                       |   3 +
+ fs/sync.c                                       |   2 +-
+ fs/sysv/dir.c                                   |   2 +-
+ fs/ufs/dir.c                                    |   2 +-
+ fs/xfs/xfs_file.c                               |   2 +-
+ include/linux/buffer_head.h                     |   1 +
+ include/linux/errseq.h                          |  19 +++
+ include/linux/fs.h                              |  80 +++++++--
+ include/linux/mm.h                              |   2 +-
+ include/linux/pagemap.h                         |  31 +++-
+ include/trace/events/filemap.h                  |  57 +++++++
+ ipc/shm.c                                       |   2 +-
+ lib/Makefile                                    |   2 +-
+ lib/errseq.c                                    | 208 ++++++++++++++++++++++++
+ mm/filemap.c                                    | 126 ++++++++++++--
+ mm/memory-failure.c                             |   2 +-
+ mm/page-writeback.c                             |  19 +--
+ net/socket.c                                    |   3 +-
+ 44 files changed, 806 insertions(+), 275 deletions(-)
+ create mode 100644 include/linux/errseq.h
+ create mode 100644 lib/errseq.c
+Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
+$ git merge vfs/for-next
+Auto-merging fs/stat.c
+Auto-merging fs/namei.c
+Merge made by the 'recursive' strategy.
+ fs/namei.c                 | 56 ++++++++++++++++++++++++++++++++++------------
+ fs/stat.c                  |  4 +++-
+ include/linux/namei.h      |  2 ++
+ include/uapi/linux/fcntl.h |  1 +
+ 4 files changed, 48 insertions(+), 15 deletions(-)
+Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
+$ git merge vfs-jk/vfs
+Already up-to-date.
+Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
+$ git merge vfs-miklos/next
+Already up-to-date.
+Merging printk/for-next (f4e981cba2de printk: add __printf attributes to internal functions)
+$ git merge printk/for-next
+Auto-merging kernel/printk/printk.c
+Merge made by the 'recursive' strategy.
+ kernel/printk/internal.h    |  6 ++++--
+ kernel/printk/printk.c      | 19 ++++++++++++++-----
+ kernel/printk/printk_safe.c | 36 +++++++++++++++++++++++++++++-------
+ lib/nmi_backtrace.c         |  3 +++
+ 4 files changed, 50 insertions(+), 14 deletions(-)
+Merging pci/next (d0eebbbf7512 Merge branch 'pci/host-xilinx' into next)
+$ git merge pci/next
+Resolved 'drivers/gpu/drm/radeon/radeon_device.c' using previous resolution.
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/switch/switchtec.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-label.c
+Auto-merging drivers/pci/dwc/pci-imx6.c
+Auto-merging drivers/nvme/host/pci.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging arch/arm64/kernel/pci.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4a4f87245cae] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pci/faraday,ftpci100.txt   |   7 +
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.txt     |   4 +
+ .../bindings/pci/mediatek,mt7623-pcie.txt          | 130 +++++
+ .../devicetree/bindings/pci/qcom,pcie.txt          |  20 +-
+ Documentation/devicetree/bindings/pci/rcar-pci.txt |   2 +-
+ Documentation/driver-model/devres.txt              |   1 +
+ MAINTAINERS                                        |   9 +-
+ arch/arm/include/asm/mach/pci.h                    |   3 +-
+ arch/arm/kernel/bios32.c                           |  43 +-
+ arch/arm/mach-dove/pcie.c                          |  33 +-
+ arch/arm/mach-iop13xx/pci.c                        |  33 +-
+ arch/arm/mach-iop13xx/pci.h                        |   3 +-
+ arch/arm/mach-mv78xx0/pcie.c                       |   9 +-
+ arch/arm/mach-orion5x/common.h                     |   3 +-
+ arch/arm/mach-orion5x/pci.c                        |  39 +-
+ arch/arm64/kernel/pci.c                            |  10 +-
+ .../asm/mach-loongson64/cs5536/cs5536_pci.h        |   1 -
+ arch/mips/include/asm/pci.h                        |   1 -
+ arch/mips/pci/pci-legacy.c                         |   3 +-
+ arch/x86/include/uapi/asm/hyperv.h                 |   6 +
+ arch/x86/pci/common.c                              |  27 +-
+ arch/x86/pci/fixup.c                               |  15 +
+ arch/x86/pci/pcbios.c                              |   2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   4 -
+ drivers/gpu/drm/radeon/radeon_device.c             |  11 -
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  36 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c        |  75 +--
+ drivers/nvme/host/pci.c                            |  15 +-
+ drivers/of/of_pci_irq.c                            |   3 +-
+ drivers/pci/Makefile                               |  17 +-
+ drivers/pci/ats.c                                  |  87 +++-
+ drivers/pci/dwc/Kconfig                            |   1 +
+ drivers/pci/dwc/pci-dra7xx.c                       |   6 +-
+ drivers/pci/dwc/pci-exynos.c                       |   2 +-
+ drivers/pci/dwc/pci-imx6.c                         |  39 +-
+ drivers/pci/dwc/pci-keystone.c                     |   2 +-
+ drivers/pci/dwc/pci-layerscape.c                   |   6 +-
+ drivers/pci/dwc/pcie-armada8k.c                    |   2 +-
+ drivers/pci/dwc/pcie-artpec6.c                     |   2 +-
+ drivers/pci/dwc/pcie-designware-host.c             |  43 +-
+ drivers/pci/dwc/pcie-designware-plat.c             |   5 +-
+ drivers/pci/dwc/pcie-designware.h                  |   2 +-
+ drivers/pci/dwc/pcie-qcom.c                        | 427 +++++++++++++---
+ drivers/pci/dwc/pcie-spear13xx.c                   |   2 +-
+ drivers/pci/host/Kconfig                           |  11 +
+ drivers/pci/host/Makefile                          |   1 +
+ drivers/pci/host/pci-aardvark.c                    |  21 +-
+ drivers/pci/host/pci-ftpci100.c                    | 143 ++++--
+ drivers/pci/host/pci-host-common.c                 |  27 +-
+ drivers/pci/host/pci-hyperv.c                      | 445 ++++++++++++++---
+ drivers/pci/host/pci-tegra.c                       |  42 +-
+ drivers/pci/host/pci-versatile.c                   |  36 +-
+ drivers/pci/host/pci-xgene.c                       |  23 +-
+ drivers/pci/host/pcie-altera.c                     |  24 +-
+ drivers/pci/host/pcie-iproc-bcma.c                 |   7 +-
+ drivers/pci/host/pcie-iproc-platform.c             |   7 +-
+ drivers/pci/host/pcie-iproc.c                      | 135 +++--
+ drivers/pci/host/pcie-mediatek.c                   | 555 +++++++++++++++++++++
+ drivers/pci/host/pcie-rcar.c                       |  40 +-
+ drivers/pci/host/pcie-rockchip.c                   | 131 ++++-
+ drivers/pci/host/pcie-xilinx-nwl.c                 |  79 ++-
+ drivers/pci/host/pcie-xilinx.c                     |  34 +-
+ drivers/pci/host/vmd.c                             |  10 +-
+ drivers/pci/iov.c                                  |   4 -
+ drivers/pci/msi.c                                  |  14 +-
+ drivers/pci/pci-driver.c                           |   3 +
+ drivers/pci/pci-label.c                            |   7 +-
+ drivers/pci/pci-sysfs.c                            | 204 +++++++-
+ drivers/pci/pci.c                                  | 205 ++++----
+ drivers/pci/pci.h                                  |   1 -
+ drivers/pci/pcie/pcie-dpc.c                        |   4 +-
+ drivers/pci/pcie/portdrv.h                         |   7 +-
+ drivers/pci/pcie/portdrv_core.c                    | 104 ++--
+ drivers/pci/probe.c                                | 140 ++++--
+ drivers/pci/quirks.c                               |  19 +-
+ drivers/pci/setup-irq.c                            |  45 +-
+ drivers/pci/switch/switchtec.c                     |  40 +-
+ drivers/video/fbdev/efifb.c                        |   2 +-
+ include/linux/interrupt.h                          |   4 +-
+ include/linux/pci-ats.h                            |  10 +
+ include/linux/pci.h                                |  35 +-
+ include/uapi/linux/pci_regs.h                      |   1 +
+ include/uapi/linux/switchtec_ioctl.h               |   3 +
+ kernel/irq/affinity.c                              |  13 +-
+ 84 files changed, 3006 insertions(+), 821 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/mediatek,mt7623-pcie.txt
+ create mode 100644 drivers/pci/host/pcie-mediatek.c
+Merging pstore/for-next/pstore (0752e4028c00 powerpc/nvram: use memdup_user)
+$ git merge pstore/for-next/pstore
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/nvram_64.c    | 14 +++----
+ drivers/firmware/efi/efi-pstore.c | 87 +++++++++++++++++----------------------
+ fs/pstore/inode.c                 | 22 +++++-----
+ fs/pstore/internal.h              |  2 +
+ fs/pstore/platform.c              | 69 ++++++++++++++++++++-----------
+ fs/pstore/pmsg.c                  | 10 ++---
+ fs/pstore/ram.c                   | 16 +++----
+ include/linux/pstore.h            |  5 ++-
+ 8 files changed, 114 insertions(+), 111 deletions(-)
+Merging hid/for-next (0f9089b979a6 Merge branch 'for-4.13/wacom' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/hid/i2c-hid/i2c-hid.c
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig                            |  15 ++
+ drivers/hid/Makefile                           |   2 +
+ drivers/hid/hid-apple.c                        |  59 ++++----
+ drivers/hid/hid-asus.c                         |  30 ++++
+ drivers/hid/hid-chicony.c                      |   2 -
+ drivers/hid/hid-core.c                         | 102 ++++++++++++-
+ drivers/hid/hid-ids.h                          |  14 +-
+ drivers/hid/hid-input.c                        |   9 ++
+ drivers/hid/hid-ite.c                          |  56 +++++++
+ drivers/hid/hid-multitouch.c                   | 184 ++++++++++++++++++-----
+ drivers/hid/hid-retrode.c                      | 100 +++++++++++++
+ drivers/hid/i2c-hid/i2c-hid.c                  |  34 ++---
+ drivers/hid/intel-ish-hid/Kconfig              |   2 +-
+ drivers/hid/intel-ish-hid/ipc/ipc.c            |  15 +-
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c   |   5 +-
+ drivers/hid/intel-ish-hid/ishtp/client.c       |  49 +++---
+ drivers/hid/intel-ish-hid/ishtp/client.h       |   6 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c          |  11 +-
+ drivers/hid/usbhid/hid-core.c                  | 150 +++++++++----------
+ drivers/hid/usbhid/hiddev.c                    |  24 +--
+ drivers/hid/usbhid/usbhid.h                    |  15 +-
+ drivers/hid/wacom.h                            |   1 +
+ drivers/hid/wacom_sys.c                        |   4 +-
+ drivers/hid/wacom_wac.c                        | 200 +++++++++++++++----------
+ drivers/hid/wacom_wac.h                        |   7 +
+ drivers/staging/greybus/hid.c                  |  43 ++----
+ include/linux/hid.h                            |  82 +++-------
+ include/linux/{i2c => platform_data}/i2c-hid.h |   0
+ 28 files changed, 794 insertions(+), 427 deletions(-)
+ create mode 100644 drivers/hid/hid-ite.c
+ create mode 100644 drivers/hid/hid-retrode.c
+ rename include/linux/{i2c => platform_data}/i2c-hid.h (100%)
+Merging i2c/i2c/for-next (25c34d08744f Merge branch 'i2c/for-4.13' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Removing include/linux/i2c/i2c-sh_mobile.h
+Auto-merging drivers/i2c/i2c-core-base.c
+Auto-merging drivers/i2c/busses/i2c-designware-master.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-aspeed.txt         |   48 +
+ .../devicetree/bindings/i2c/i2c-designware.txt     |   16 +-
+ .../devicetree/bindings/i2c/i2c-pca-platform.txt   |   29 +
+ .../devicetree/bindings/i2c/i2c-zx2967.txt         |   22 +
+ Documentation/driver-api/i2c.rst                   |    5 +-
+ Documentation/i2c/busses/i2c-i801                  |    2 +
+ Documentation/i2c/dev-interface                    |   14 +-
+ MAINTAINERS                                        |   13 +
+ drivers/i2c/Makefile                               |    7 +-
+ drivers/i2c/algos/i2c-algo-bit.c                   |   13 +-
+ drivers/i2c/busses/Kconfig                         |   35 +-
+ drivers/i2c/busses/Makefile                        |    6 +
+ drivers/i2c/busses/i2c-aspeed.c                    |  891 +++++++++++
+ drivers/i2c/busses/i2c-at91.c                      |   16 +-
+ drivers/i2c/busses/i2c-cadence.c                   |    6 +-
+ drivers/i2c/busses/i2c-designware-common.c         |  281 ++++
+ drivers/i2c/busses/i2c-designware-core.h           |  180 ++-
+ ...c-designware-core.c => i2c-designware-master.c} |  469 +-----
+ drivers/i2c/busses/i2c-designware-pcidrv.c         |    9 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c        |  117 +-
+ drivers/i2c/busses/i2c-designware-slave.c          |  394 +++++
+ drivers/i2c/busses/i2c-emev2.c                     |    4 +-
+ drivers/i2c/busses/i2c-i801.c                      |    8 +
+ drivers/i2c/busses/i2c-mxs.c                       |    6 +-
+ drivers/i2c/busses/i2c-pca-platform.c              |  125 +-
+ drivers/i2c/busses/i2c-rcar.c                      |    9 +-
+ drivers/i2c/busses/i2c-sh_mobile.c                 |   27 +-
+ drivers/i2c/busses/i2c-xgene-slimpro.c             |  242 ++-
+ drivers/i2c/busses/i2c-xlp9xx.c                    |    1 +
+ drivers/i2c/busses/i2c-zx2967.c                    |  609 +++++++
+ drivers/i2c/i2c-core-acpi.c                        |  653 ++++++++
+ drivers/i2c/{i2c-core.c => i2c-core-base.c}        | 1684 +-------------------
+ drivers/i2c/i2c-core-of.c                          |  276 ++++
+ drivers/i2c/i2c-core-slave.c                       |  115 ++
+ drivers/i2c/i2c-core-smbus.c                       |  594 +++++++
+ drivers/i2c/i2c-core.h                             |   24 +
+ drivers/i2c/i2c-stub.c                             |   14 +-
+ include/linux/i2c/i2c-sh_mobile.h                  |   11 -
+ include/trace/events/i2c.h                         |  226 +--
+ include/trace/events/smbus.h                       |  249 +++
+ 40 files changed, 4948 insertions(+), 2502 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-pca-platform.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
+ create mode 100644 drivers/i2c/busses/i2c-aspeed.c
+ create mode 100644 drivers/i2c/busses/i2c-designware-common.c
+ rename drivers/i2c/busses/{i2c-designware-core.c => i2c-designware-master.c} (60%)
+ create mode 100644 drivers/i2c/busses/i2c-designware-slave.c
+ create mode 100644 drivers/i2c/busses/i2c-zx2967.c
+ create mode 100644 drivers/i2c/i2c-core-acpi.c
+ rename drivers/i2c/{i2c-core.c => i2c-core-base.c} (58%)
+ create mode 100644 drivers/i2c/i2c-core-of.c
+ create mode 100644 drivers/i2c/i2c-core-slave.c
+ create mode 100644 drivers/i2c/i2c-core-smbus.c
+ delete mode 100644 include/linux/i2c/i2c-sh_mobile.h
+ create mode 100644 include/trace/events/smbus.h
+Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging dmi/master (8efa050f19fe firmware: dmi_scan: Check DMI structure length)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+Merging hwmon-staging/hwmon-next (44b413661b57 hwmon: (aspeed-pwm-tacho) Poll with short sleeps.)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/ads1015                    |   2 +-
+ Documentation/hwmon/adt7475                    |   9 +
+ Documentation/hwmon/ir35221                    |  87 +++++++
+ Documentation/hwmon/ltc4245                    |   2 +-
+ Documentation/hwmon/pmbus-core                 |   2 +-
+ MAINTAINERS                                    |   4 +-
+ drivers/hwmon/ads1015.c                        |   2 +-
+ drivers/hwmon/adt7475.c                        | 184 +++++++++++---
+ drivers/hwmon/aspeed-pwm-tacho.c               |  50 +++-
+ drivers/hwmon/ds620.c                          |   2 +-
+ drivers/hwmon/ibmpowernv.c                     |  96 +++++--
+ drivers/hwmon/ltc4245.c                        |   2 +-
+ drivers/hwmon/max6639.c                        |   2 +-
+ drivers/hwmon/nct6775.c                        | 325 ++++++++++++++++--------
+ drivers/hwmon/pmbus/Kconfig                    |  10 +
+ drivers/hwmon/pmbus/Makefile                   |   1 +
+ drivers/hwmon/pmbus/ir35221.c                  | 337 +++++++++++++++++++++++++
+ drivers/hwmon/pmbus/pmbus.c                    |   2 +-
+ drivers/hwmon/pmbus/pmbus_core.c               |   2 +-
+ drivers/hwmon/pmbus/ucd9000.c                  |   2 +-
+ drivers/hwmon/pmbus/ucd9200.c                  |   2 +-
+ drivers/hwmon/pwm-fan.c                        |  68 ++---
+ drivers/hwmon/scpi-hwmon.c                     |  54 +++-
+ drivers/iio/adc/ti-ads1015.c                   |   2 +-
+ include/linux/{i2c => platform_data}/ads1015.h |   0
+ include/linux/{i2c => platform_data}/ds620.h   |   0
+ include/linux/{i2c => platform_data}/ltc4245.h |   0
+ include/linux/{i2c => platform_data}/max6639.h |   0
+ include/linux/{i2c => }/pmbus.h                |   0
+ 29 files changed, 1025 insertions(+), 224 deletions(-)
+ create mode 100644 Documentation/hwmon/ir35221
+ create mode 100644 drivers/hwmon/pmbus/ir35221.c
+ rename include/linux/{i2c => platform_data}/ads1015.h (100%)
+ rename include/linux/{i2c => platform_data}/ds620.h (100%)
+ rename include/linux/{i2c => platform_data}/ltc4245.h (100%)
+ rename include/linux/{i2c => platform_data}/max6639.h (100%)
+ rename include/linux/{i2c => }/pmbus.h (100%)
+Merging jc_docs/docs-next (52b3f239bb69 Docs: clean up some DocBook loose ends)
+$ git merge jc_docs/docs-next
+Auto-merging security/keys/trusted.c
+Auto-merging security/keys/encrypted-keys/encrypted.c
+CONFLICT (modify/delete): scripts/kernel-doc-xml-ref deleted in jc_docs/docs-next and modified in HEAD. Version HEAD of scripts/kernel-doc-xml-ref left in tree.
+Removing scripts/docproc.c
+Removing scripts/check-lc_ctype.c
+Auto-merging net/core/sock.c
+Auto-merging kernel/irq/chip.c
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/key.h
+Auto-merging fs/namei.c
+Auto-merging fs/jbd2/transaction.c
+Auto-merging drivers/net/phy/phy.c
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging drivers/ata/libata-core.c
+Auto-merging drivers/ata/ahci.c
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/userspace-api/seccomp_filter.rst
+Auto-merging Documentation/userspace-api/no_new_privs.rst
+Removing Documentation/sphinx/tmplcvt
+Removing Documentation/sphinx/post_convert.sed
+Removing Documentation/sphinx/convert_template.sed
+Auto-merging Documentation/security/self-protection.rst
+Auto-merging Documentation/security/keys/trusted-encrypted.rst
+Auto-merging Documentation/security/keys/request-key.rst
+Auto-merging Documentation/security/keys/ecryptfs.rst
+Auto-merging Documentation/security/keys/core.rst
+Auto-merging Documentation/security/credentials.rst
+Removing Documentation/security/conf.py
+Auto-merging Documentation/security/IMA-templates.rst
+Removing Documentation/security/00-INDEX
+Auto-merging Documentation/process/changes.rst
+Auto-merging Documentation/media/uapi/v4l/vidioc-g-selection.rst
+Auto-merging Documentation/kbuild/makefiles.txt
+Auto-merging Documentation/driver-api/i2c.rst
+Removing Documentation/doc-guide/docbook.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/admin-guide/LSM/tomoyo.rst
+Auto-merging Documentation/admin-guide/LSM/index.rst
+Auto-merging Documentation/admin-guide/LSM/apparmor.rst
+Auto-merging Documentation/admin-guide/LSM/Yama.rst
+Auto-merging Documentation/admin-guide/LSM/Smack.rst
+Auto-merging Documentation/admin-guide/LSM/SELinux.rst
+Auto-merging Documentation/admin-guide/LSM/LoadPin.rst
+Removing Documentation/Makefile.sphinx
+Removing Documentation/DocBook/z8530book.tmpl
+Removing Documentation/DocBook/w1.tmpl
+Removing Documentation/DocBook/stylesheet.xsl
+Removing Documentation/DocBook/sh.tmpl
+Removing Documentation/DocBook/scsi.tmpl
+Removing Documentation/DocBook/s390-drivers.tmpl
+Removing Documentation/DocBook/rapidio.tmpl
+Removing Documentation/DocBook/networking.tmpl
+Removing Documentation/DocBook/mtdnand.tmpl
+Removing Documentation/DocBook/lsm.tmpl
+Removing Documentation/DocBook/librs.tmpl
+Removing Documentation/DocBook/libata.tmpl
+Removing Documentation/DocBook/kgdb.tmpl
+Removing Documentation/DocBook/kernel-locking.tmpl
+Removing Documentation/DocBook/kernel-hacking.tmpl
+Removing Documentation/DocBook/filesystems.tmpl
+Removing Documentation/DocBook/Makefile
+Removing Documentation/DocBook/.gitignore
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f scripts/kernel-doc-xml-ref
+scripts/kernel-doc-xml-ref: needs merge
+rm 'scripts/kernel-doc-xml-ref'
+$ git commit -v -a
+[master c63cc513a195] Merge remote-tracking branch 'jc_docs/docs-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/00-INDEX                             |    6 +-
+ Documentation/DMA-API.txt                          |    2 +-
+ Documentation/DocBook/.gitignore                   |   17 -
+ Documentation/DocBook/Makefile                     |  282 ---
+ Documentation/DocBook/filesystems.tmpl             |  381 ----
+ Documentation/DocBook/kernel-hacking.tmpl          | 1312 ------------
+ Documentation/DocBook/kernel-locking.tmpl          | 2151 --------------------
+ Documentation/DocBook/kgdb.tmpl                    |  918 ---------
+ Documentation/DocBook/libata.tmpl                  | 1625 ---------------
+ Documentation/DocBook/librs.tmpl                   |  289 ---
+ Documentation/DocBook/lsm.tmpl                     |  265 ---
+ Documentation/DocBook/mtdnand.tmpl                 | 1291 ------------
+ Documentation/DocBook/networking.tmpl              |  111 -
+ Documentation/DocBook/rapidio.tmpl                 |  155 --
+ Documentation/DocBook/s390-drivers.tmpl            |  161 --
+ Documentation/DocBook/scsi.tmpl                    |  409 ----
+ Documentation/DocBook/sh.tmpl                      |  105 -
+ Documentation/DocBook/stylesheet.xsl               |   11 -
+ Documentation/DocBook/w1.tmpl                      |  101 -
+ Documentation/DocBook/z8530book.tmpl               |  371 ----
+ Documentation/Makefile                             |  125 ++
+ Documentation/Makefile.sphinx                      |  130 --
+ Documentation/PCI/MSI-HOWTO.txt                    |    2 +-
+ .../LoadPin.txt => admin-guide/LSM/LoadPin.rst}    |   12 +-
+ .../SELinux.txt => admin-guide/LSM/SELinux.rst}    |   18 +-
+ .../Smack.txt => admin-guide/LSM/Smack.rst}        |  273 ++-
+ .../Yama.txt => admin-guide/LSM/Yama.rst}          |   55 +-
+ .../apparmor.txt => admin-guide/LSM/apparmor.rst}  |   36 +-
+ .../LSM.txt => admin-guide/LSM/index.rst}          |   28 +-
+ .../tomoyo.txt => admin-guide/LSM/tomoyo.rst}      |   22 +-
+ Documentation/admin-guide/README.rst               |    6 -
+ Documentation/admin-guide/index.rst                |    1 +
+ Documentation/admin-guide/kernel-parameters.txt    |    6 +-
+ Documentation/admin-guide/ras.rst                  |   10 +-
+ Documentation/conf.py                              |   44 +-
+ Documentation/core-api/assoc_array.rst             |    5 +-
+ Documentation/core-api/index.rst                   |    1 +
+ Documentation/core-api/librs.rst                   |  212 ++
+ Documentation/crypto/asymmetric-keys.txt           |    2 +-
+ Documentation/crypto/conf.py                       |   10 +
+ Documentation/dev-tools/index.rst                  |    1 +
+ Documentation/dev-tools/kgdb.rst                   |  907 +++++++++
+ Documentation/doc-guide/docbook.rst                |   90 -
+ Documentation/doc-guide/index.rst                  |    1 -
+ Documentation/doc-guide/kernel-doc.rst             |   10 +
+ Documentation/doc-guide/sphinx.rst                 |    5 -
+ Documentation/dontdiff                             |    1 -
+ Documentation/driver-api/i2c.rst                   |    9 +-
+ Documentation/driver-api/index.rst                 |    6 +
+ Documentation/driver-api/libata.rst                | 1031 ++++++++++
+ Documentation/driver-api/mtdnand.rst               | 1007 +++++++++
+ Documentation/driver-api/rapidio.rst               |  107 +
+ Documentation/driver-api/s390-drivers.rst          |  111 +
+ Documentation/driver-api/scsi.rst                  |  344 ++++
+ Documentation/driver-api/w1.rst                    |   70 +
+ Documentation/fb/api.txt                           |    4 +-
+ Documentation/filesystems/conf.py                  |   10 +
+ Documentation/filesystems/index.rst                |  317 +++
+ Documentation/filesystems/nfs/idmapper.txt         |    2 +-
+ Documentation/gpu/todo.rst                         |    2 +-
+ Documentation/index.rst                            |   18 +-
+ Documentation/kbuild/makefiles.txt                 |    2 +-
+ Documentation/kernel-doc-nano-HOWTO.txt            |   65 +-
+ Documentation/kernel-hacking/conf.py               |   10 +
+ Documentation/kernel-hacking/hacking.rst           |  811 ++++++++
+ Documentation/kernel-hacking/index.rst             |    9 +
+ Documentation/kernel-hacking/locking.rst           | 1446 +++++++++++++
+ Documentation/lsm.txt                              |  201 ++
+ .../media/uapi/v4l/vidioc-g-selection.rst          |    4 +-
+ Documentation/networking/conf.py                   |   10 +
+ Documentation/networking/dns_resolver.txt          |    2 +-
+ Documentation/networking/index.rst                 |   18 +
+ Documentation/networking/kapi.rst                  |  147 ++
+ Documentation/networking/z8530book.rst             |  256 +++
+ Documentation/process/changes.rst                  |   26 +-
+ Documentation/process/coding-style.rst             |    4 +-
+ Documentation/process/email-clients.rst            |    5 +
+ Documentation/process/howto.rst                    |    8 -
+ Documentation/process/kernel-docs.rst              |   34 +-
+ Documentation/security/00-INDEX                    |   26 -
+ .../{IMA-templates.txt => IMA-templates.rst}       |   46 +-
+ Documentation/security/LSM.rst                     |   14 +
+ Documentation/security/conf.py                     |    8 -
+ .../security/{credentials.txt => credentials.rst}  |  275 ++-
+ Documentation/security/index.rst                   |    8 +-
+ Documentation/security/{keys.txt => keys/core.rst} |  314 ++-
+ .../{keys-ecryptfs.txt => keys/ecryptfs.rst}       |   19 +-
+ Documentation/security/keys/index.rst              |   11 +
+ .../{keys-request-key.txt => keys/request-key.rst} |   73 +-
+ .../trusted-encrypted.rst}                         |   32 +-
+ .../{self-protection.txt => self-protection.rst}   |   99 +-
+ Documentation/sh/conf.py                           |   10 +
+ Documentation/sh/index.rst                         |   59 +
+ Documentation/sound/conf.py                        |   10 +
+ Documentation/sphinx/convert_template.sed          |   18 -
+ Documentation/sphinx/post_convert.sed              |   23 -
+ Documentation/sphinx/tmplcvt                       |   28 -
+ Documentation/translations/ja_JP/howto.rst         |    7 -
+ Documentation/translations/ko_KR/howto.rst         |   27 +-
+ .../translations/ko_KR/memory-barriers.txt         |    2 +-
+ Documentation/userspace-api/index.rst              |    2 +
+ .../no_new_privs.rst}                              |   44 +-
+ .../seccomp_filter.rst}                            |  116 +-
+ Documentation/userspace-api/unshare.rst            |    2 +-
+ MAINTAINERS                                        |   21 +-
+ Makefile                                           |   10 +-
+ arch/ia64/include/asm/io.h                         |    2 +-
+ arch/ia64/sn/kernel/iomv.c                         |    2 +-
+ drivers/ata/acard-ahci.c                           |    2 +-
+ drivers/ata/ahci.c                                 |    2 +-
+ drivers/ata/ahci.h                                 |    2 +-
+ drivers/ata/ata_piix.c                             |    2 +-
+ drivers/ata/libahci.c                              |    2 +-
+ drivers/ata/libata-core.c                          |    2 +-
+ drivers/ata/libata-eh.c                            |    2 +-
+ drivers/ata/libata-scsi.c                          |    9 +-
+ drivers/ata/libata-sff.c                           |    2 +-
+ drivers/ata/libata.h                               |    2 +-
+ drivers/ata/pata_pdc2027x.c                        |    2 +-
+ drivers/ata/pdc_adma.c                             |    2 +-
+ drivers/ata/sata_nv.c                              |    2 +-
+ drivers/ata/sata_promise.c                         |    2 +-
+ drivers/ata/sata_promise.h                         |    2 +-
+ drivers/ata/sata_qstor.c                           |    2 +-
+ drivers/ata/sata_sil.c                             |    2 +-
+ drivers/ata/sata_sis.c                             |    2 +-
+ drivers/ata/sata_svw.c                             |    2 +-
+ drivers/ata/sata_sx4.c                             |    2 +-
+ drivers/ata/sata_uli.c                             |    2 +-
+ drivers/ata/sata_via.c                             |    2 +-
+ drivers/ata/sata_vsc.c                             |    2 +-
+ drivers/mtd/nand/nand_base.c                       |    7 +-
+ drivers/net/phy/phy.c                              |    1 +
+ drivers/scsi/qla1280.c                             |    2 +-
+ drivers/scsi/scsi_scan.c                           |    7 +-
+ drivers/scsi/scsi_transport_fc.c                   |   18 +-
+ drivers/scsi/scsicam.c                             |    4 +-
+ drivers/usb/gadget/Kconfig                         |    2 +-
+ fs/debugfs/file.c                                  |    2 +-
+ fs/debugfs/inode.c                                 |    2 +-
+ fs/eventfd.c                                       |    4 +-
+ fs/fs-writeback.c                                  |   12 +-
+ fs/jbd2/transaction.c                              |   42 +-
+ fs/mpage.c                                         |    1 +
+ fs/namei.c                                         |    1 +
+ include/linux/ata.h                                |    2 +-
+ include/linux/cred.h                               |    2 +-
+ include/linux/debugfs.h                            |    2 +-
+ include/linux/key.h                                |    2 +-
+ include/linux/libata.h                             |    2 +-
+ include/linux/lsm_hooks.h                          |   25 +-
+ include/linux/mtd/nand.h                           |    2 +-
+ include/linux/mutex.h                              |    6 +-
+ include/linux/netdevice.h                          |    9 +-
+ include/linux/skbuff.h                             |    2 +-
+ include/net/sock.h                                 |    9 +-
+ kernel/cred.c                                      |    2 +-
+ kernel/futex.c                                     |   40 +-
+ kernel/irq/chip.c                                  |    2 +-
+ kernel/irq/handle.c                                |    2 +-
+ kernel/irq/irqdesc.c                               |    2 +-
+ kernel/locking/mutex.c                             |    6 +-
+ lib/Kconfig.debug                                  |    2 +-
+ lib/Kconfig.kgdb                                   |    2 +-
+ net/core/datagram.c                                |    2 +-
+ net/core/sock.c                                    |    7 +-
+ scripts/.gitignore                                 |    1 -
+ scripts/Makefile                                   |   10 +-
+ scripts/check-lc_ctype.c                           |   11 -
+ scripts/docproc.c                                  |  681 -------
+ scripts/kernel-doc-xml-ref                         |  199 --
+ scripts/selinux/README                             |    2 +-
+ security/apparmor/match.c                          |    2 +-
+ security/apparmor/policy_unpack.c                  |    2 +-
+ security/keys/encrypted-keys/encrypted.c           |    2 +-
+ security/keys/encrypted-keys/masterkey_trusted.c   |    2 +-
+ security/keys/request_key.c                        |    2 +-
+ security/keys/request_key_auth.c                   |    2 +-
+ security/keys/trusted.c                            |    2 +-
+ security/yama/Kconfig                              |    3 +-
+ 180 files changed, 8397 insertions(+), 12192 deletions(-)
+ delete mode 100644 Documentation/DocBook/.gitignore
+ delete mode 100644 Documentation/DocBook/Makefile
+ delete mode 100644 Documentation/DocBook/filesystems.tmpl
+ delete mode 100644 Documentation/DocBook/kernel-hacking.tmpl
+ delete mode 100644 Documentation/DocBook/kernel-locking.tmpl
+ delete mode 100644 Documentation/DocBook/kgdb.tmpl
+ delete mode 100644 Documentation/DocBook/libata.tmpl
+ delete mode 100644 Documentation/DocBook/librs.tmpl
+ delete mode 100644 Documentation/DocBook/lsm.tmpl
+ delete mode 100644 Documentation/DocBook/mtdnand.tmpl
+ delete mode 100644 Documentation/DocBook/networking.tmpl
+ delete mode 100644 Documentation/DocBook/rapidio.tmpl
+ delete mode 100644 Documentation/DocBook/s390-drivers.tmpl
+ delete mode 100644 Documentation/DocBook/scsi.tmpl
+ delete mode 100644 Documentation/DocBook/sh.tmpl
+ delete mode 100644 Documentation/DocBook/stylesheet.xsl
+ delete mode 100644 Documentation/DocBook/w1.tmpl
+ delete mode 100644 Documentation/DocBook/z8530book.tmpl
+ delete mode 100644 Documentation/Makefile.sphinx
+ rename Documentation/{security/LoadPin.txt => admin-guide/LSM/LoadPin.rst} (73%)
+ rename Documentation/{security/SELinux.txt => admin-guide/LSM/SELinux.rst} (71%)
+ rename Documentation/{security/Smack.txt => admin-guide/LSM/Smack.rst} (85%)
+ rename Documentation/{security/Yama.txt => admin-guide/LSM/Yama.rst} (60%)
+ rename Documentation/{security/apparmor.txt => admin-guide/LSM/apparmor.rst} (65%)
+ rename Documentation/{security/LSM.txt => admin-guide/LSM/index.rst} (62%)
+ rename Documentation/{security/tomoyo.txt => admin-guide/LSM/tomoyo.rst} (85%)
+ create mode 100644 Documentation/core-api/librs.rst
+ create mode 100644 Documentation/crypto/conf.py
+ create mode 100644 Documentation/dev-tools/kgdb.rst
+ delete mode 100644 Documentation/doc-guide/docbook.rst
+ create mode 100644 Documentation/driver-api/libata.rst
+ create mode 100644 Documentation/driver-api/mtdnand.rst
+ create mode 100644 Documentation/driver-api/rapidio.rst
+ create mode 100644 Documentation/driver-api/s390-drivers.rst
+ create mode 100644 Documentation/driver-api/scsi.rst
+ create mode 100644 Documentation/driver-api/w1.rst
+ create mode 100644 Documentation/filesystems/conf.py
+ create mode 100644 Documentation/filesystems/index.rst
+ create mode 100644 Documentation/kernel-hacking/conf.py
+ create mode 100644 Documentation/kernel-hacking/hacking.rst
+ create mode 100644 Documentation/kernel-hacking/index.rst
+ create mode 100644 Documentation/kernel-hacking/locking.rst
+ create mode 100644 Documentation/lsm.txt
+ create mode 100644 Documentation/networking/conf.py
+ create mode 100644 Documentation/networking/index.rst
+ create mode 100644 Documentation/networking/kapi.rst
+ create mode 100644 Documentation/networking/z8530book.rst
+ delete mode 100644 Documentation/security/00-INDEX
+ rename Documentation/security/{IMA-templates.txt => IMA-templates.rst} (72%)
+ create mode 100644 Documentation/security/LSM.rst
+ delete mode 100644 Documentation/security/conf.py
+ rename Documentation/security/{credentials.txt => credentials.rst} (72%)
+ rename Documentation/security/{keys.txt => keys/core.rst} (89%)
+ rename Documentation/security/{keys-ecryptfs.txt => keys/ecryptfs.rst} (91%)
+ create mode 100644 Documentation/security/keys/index.rst
+ rename Documentation/security/{keys-request-key.txt => keys/request-key.rst} (77%)
+ rename Documentation/security/{keys-trusted-encrypted.txt => keys/trusted-encrypted.rst} (93%)
+ rename Documentation/security/{self-protection.txt => self-protection.rst} (83%)
+ create mode 100644 Documentation/sh/conf.py
+ create mode 100644 Documentation/sh/index.rst
+ create mode 100644 Documentation/sound/conf.py
+ delete mode 100644 Documentation/sphinx/convert_template.sed
+ delete mode 100644 Documentation/sphinx/post_convert.sed
+ delete mode 100755 Documentation/sphinx/tmplcvt
+ rename Documentation/{prctl/no_new_privs.txt => userspace-api/no_new_privs.rst} (54%)
+ rename Documentation/{prctl/seccomp_filter.txt => userspace-api/seccomp_filter.rst} (71%)
+ delete mode 100644 scripts/check-lc_ctype.c
+ delete mode 100644 scripts/docproc.c
+ delete mode 100755 scripts/kernel-doc-xml-ref
+Merging v4l-dvb/master (2748e76ddb29 media: staging: cxd2099: Activate cxd2099 buffer mode)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ Documentation/media/kapi/dtv-core.rst             | 443 +++++++++++++++++++++-
+ Documentation/media/uapi/v4l/vidioc-g-fmt.rst     |   6 +
+ Documentation/media/v4l-drivers/imx.rst           |   7 +-
+ Documentation/media/v4l-drivers/index.rst         |   1 +
+ drivers/media/dvb-core/dvb_ca_en50221.c           | 143 ++++---
+ drivers/media/dvb-core/dvb_ca_en50221.h           |   7 +
+ drivers/media/dvb-frontends/cxd2841er.c           |   5 +-
+ drivers/media/dvb-frontends/drx39xyj/drx_driver.h |  15 +-
+ drivers/media/dvb-frontends/lnbh25.c              |   6 +-
+ drivers/media/dvb-frontends/stv0367.c             | 210 ++++++++--
+ drivers/media/i2c/et8ek8/et8ek8_driver.c          |   1 -
+ drivers/media/i2c/tvp5150.c                       |  25 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c        | 102 +++--
+ drivers/media/pci/ngene/ngene-core.c              |  32 +-
+ drivers/media/pci/ngene/ngene-i2c.c               |   6 +-
+ drivers/media/pci/ngene/ngene.h                   |   6 +-
+ drivers/media/pci/tw5864/tw5864-video.c           |   1 +
+ drivers/media/platform/coda/coda-bit.c            |   8 +-
+ drivers/media/platform/coda/coda-common.c         |   4 +-
+ drivers/media/platform/coda/coda.h                |   2 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c      | 133 ++++---
+ drivers/media/platform/omap/omap_voutdef.h        |   6 +-
+ drivers/media/platform/qcom/venus/core.c          |   2 +-
+ drivers/media/platform/sti/bdisp/bdisp-debug.c    |  14 +-
+ drivers/media/radio/radio-wl1273.c                |  15 +-
+ drivers/media/tuners/fc0011.c                     |   1 +
+ drivers/media/tuners/mxl5005s.c                   |   2 -
+ drivers/media/usb/au0828/au0828-input.c           |   2 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c            |  10 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c          |  38 +-
+ drivers/media/usb/em28xx/em28xx-cards.c           |  18 +
+ drivers/media/usb/em28xx/em28xx-dvb.c             |   1 +
+ drivers/media/usb/em28xx/em28xx-i2c.c             |   2 -
+ drivers/media/usb/em28xx/em28xx-input.c           |   2 +-
+ drivers/media/usb/em28xx/em28xx.h                 |   1 +
+ drivers/media/usb/rainshadow-cec/rainshadow-cec.c |  18 +-
+ drivers/media/usb/stkwebcam/stk-sensor.c          |  32 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c          |  70 ++--
+ drivers/media/usb/stkwebcam/stk-webcam.h          |   6 -
+ drivers/media/v4l2-core/tuner-core.c              |   2 -
+ drivers/staging/media/cxd2099/cxd2099.c           | 165 +++++---
+ drivers/staging/media/cxd2099/cxd2099.h           |   6 +-
+ 42 files changed, 1167 insertions(+), 409 deletions(-)
+Merging v4l-dvb-next/master (d9c4615854ec [media] dvb uapi docs: enums are passed by value, not reference)
+$ git merge v4l-dvb-next/master
+Resolved 'Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst' using previous resolution.
+Resolved 'Documentation/media/uapi/dvb/fe-set-tone.rst' using previous resolution.
+Resolved 'Documentation/media/uapi/dvb/fe-set-voltage.rst' using previous resolution.
+Auto-merging Documentation/media/uapi/dvb/fe-set-voltage.rst
+CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-voltage.rst
+Auto-merging Documentation/media/uapi/dvb/fe-set-tone.rst
+CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-tone.rst
+Auto-merging Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
+CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 866cb6ac0950] Merge remote-tracking branch 'v4l-dvb-next/master'
+$ git diff -M --stat --summary HEAD^..
+Merging fbdev/fbdev-for-next (a8feae091106 uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening)
+$ git merge fbdev/fbdev-for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/console/mdacon.c                     |  89 +++++++------
+ .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c     |   2 +-
+ .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c   |  14 +-
+ drivers/video/fbdev/pxafb.c                        |   5 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c             |   2 +-
+ drivers/video/fbdev/uvesafb.c                      | 148 +++++++++------------
+ 6 files changed, 123 insertions(+), 137 deletions(-)
+Merging pm/linux-next (0491dac9f1c9 Merge branch 'device-properties' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/base/power/domain.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/opp/opp.txt      |   38 +-
+ .../bindings/power/rockchip-io-domain.txt          |    7 +
+ Documentation/power/runtime_pm.txt                 |    7 +-
+ arch/x86/include/asm/msr-index.h                   |   18 +-
+ arch/x86/include/asm/suspend_64.h                  |    5 +-
+ arch/x86/kernel/acpi/cstate.c                      |    3 +-
+ arch/x86/kernel/cpu/Makefile                       |    1 +
+ arch/x86/kernel/cpu/aperfmperf.c                   |   79 +
+ arch/x86/kernel/cpu/proc.c                         |   10 +-
+ arch/x86/power/hibernate_64.c                      |    6 +-
+ drivers/acpi/acpi_configfs.c                       |   20 +-
+ drivers/acpi/acpi_dbg.c                            |    2 +-
+ drivers/acpi/acpica/Makefile                       |    1 +
+ drivers/acpi/acpica/acapps.h                       |    4 +-
+ drivers/acpi/acpica/acglobal.h                     |    3 +
+ drivers/acpi/acpica/aclocal.h                      |   15 +-
+ drivers/acpi/acpica/acopcode.h                     |    2 +-
+ drivers/acpi/acpica/acpredef.h                     |   16 +
+ drivers/acpi/acpica/acresrc.h                      |   15 +-
+ drivers/acpi/acpica/acutils.h                      |    1 +
+ drivers/acpi/acpica/amlcode.h                      |   61 +-
+ drivers/acpi/acpica/amlresrc.h                     |  104 ++
+ drivers/acpi/acpica/dbexec.c                       |   12 +
+ drivers/acpi/acpica/dbobject.c                     |    6 +-
+ drivers/acpi/acpica/dbxface.c                      |    2 +-
+ drivers/acpi/acpica/dsargs.c                       |    5 +-
+ drivers/acpi/acpica/dsdebug.c                      |    1 +
+ drivers/acpi/acpica/dsmethod.c                     |   12 +-
+ drivers/acpi/acpica/dsopcode.c                     |   11 +-
+ drivers/acpi/acpica/dsutils.c                      |    9 -
+ drivers/acpi/acpica/dswexec.c                      |    4 +-
+ drivers/acpi/acpica/dswload.c                      |   42 +-
+ drivers/acpi/acpica/dswload2.c                     |   16 +
+ drivers/acpi/acpica/evxfevnt.c                     |   18 +
+ drivers/acpi/acpica/exdebug.c                      |    4 +-
+ drivers/acpi/acpica/exdump.c                       |   30 +-
+ drivers/acpi/acpica/exoparg1.c                     |   25 +-
+ drivers/acpi/acpica/exresolv.c                     |   23 +-
+ drivers/acpi/acpica/hwxfsleep.c                    |   14 +-
+ drivers/acpi/acpica/nsaccess.c                     |   27 +
+ drivers/acpi/acpica/nsnames.c                      |    3 -
+ drivers/acpi/acpica/nsutils.c                      |    2 +-
+ drivers/acpi/acpica/nsxfeval.c                     |   39 +-
+ drivers/acpi/acpica/psobject.c                     |   14 +
+ drivers/acpi/acpica/psopcode.c                     |    8 +-
+ drivers/acpi/acpica/psparse.c                      |   14 +-
+ drivers/acpi/acpica/rscalc.c                       |  139 ++
+ drivers/acpi/acpica/rsdump.c                       |   48 +
+ drivers/acpi/acpica/rsdumpinfo.c                   |  114 ++
+ drivers/acpi/acpica/rsinfo.c                       |   28 +-
+ drivers/acpi/acpica/rsmisc.c                       |    4 +-
+ drivers/acpi/acpica/rsserial.c                     |  373 +++++
+ drivers/acpi/acpica/tbdata.c                       |    4 +
+ drivers/acpi/acpica/tbfadt.c                       |    4 +-
+ drivers/acpi/acpica/tbutils.c                      |    6 +-
+ drivers/acpi/acpica/utdecode.c                     |    8 +-
+ drivers/acpi/acpica/utownerid.c                    |   12 +-
+ drivers/acpi/acpica/utresdecode.c                  |  315 ++++
+ drivers/acpi/acpica/utresrc.c                      |  259 +---
+ drivers/acpi/acpica/utxfmutex.c                    |    5 +-
+ drivers/acpi/battery.c                             |    2 +-
+ drivers/acpi/button.c                              |    7 +-
+ drivers/acpi/device_pm.c                           |  106 +-
+ drivers/acpi/ec.c                                  |   86 +-
+ drivers/acpi/internal.h                            |    6 +-
+ drivers/acpi/ioapic.c                              |    2 +-
+ drivers/acpi/pci_root.c                            |    5 +-
+ drivers/acpi/pmic/intel_pmic_xpower.c              |   21 +-
+ drivers/acpi/proc.c                                |    4 +-
+ drivers/acpi/property.c                            |  117 ++
+ drivers/acpi/scan.c                                |   33 +-
+ drivers/acpi/sleep.c                               |  152 +-
+ drivers/acpi/video_detect.c                        |    8 +
+ drivers/ata/libata-zpodd.c                         |    9 +-
+ drivers/base/power/domain.c                        |  103 +-
+ drivers/base/power/domain_governor.c               |   12 +-
+ drivers/base/power/main.c                          |   40 +-
+ drivers/base/power/opp/core.c                      |  154 +-
+ drivers/base/power/opp/debugfs.c                   |    7 +-
+ drivers/base/power/opp/of.c                        |   10 +-
+ drivers/base/power/sysfs.c                         |   12 +-
+ drivers/base/power/wakeup.c                        |   50 +-
+ drivers/base/property.c                            |  348 ++---
+ drivers/char/tpm/tpm_crb.c                         |    4 +-
+ drivers/cpufreq/cppc_cpufreq.c                     |   19 +-
+ drivers/cpufreq/cpufreq-dt-platdev.c               |    1 +
+ drivers/cpufreq/cpufreq.c                          |   12 +-
+ drivers/cpufreq/exynos5440-cpufreq.c               |    6 +-
+ drivers/cpufreq/imx6q-cpufreq.c                    |    6 +-
+ drivers/cpufreq/intel_pstate.c                     |  166 +--
+ drivers/cpufreq/sfi-cpufreq.c                      |    2 +-
+ drivers/cpuidle/Kconfig.arm                        |    1 +
+ drivers/cpuidle/cpuidle-arm.c                      |   62 +-
+ drivers/cpuidle/governors/menu.c                   |   20 +-
+ drivers/idle/intel_idle.c                          |   32 +-
+ drivers/mailbox/pcc.c                              |   10 +-
+ drivers/of/Makefile                                |    2 +-
+ drivers/of/base.c                                  |  733 ----------
+ drivers/of/property.c                              |  914 ++++++++++++
+ drivers/pci/pci-acpi.c                             |   90 +-
+ drivers/pci/pci-driver.c                           |    2 +-
+ drivers/pci/pci-mid.c                              |   10 +-
+ drivers/pci/pci.c                                  |   68 +-
+ drivers/pci/pci.h                                  |    9 +-
+ drivers/pci/pcie/pme.c                             |   16 +-
+ drivers/platform/x86/Kconfig                       |   19 +
+ drivers/platform/x86/Makefile                      |    1 +
+ drivers/platform/x86/intel-hid.c                   |   40 +-
+ drivers/platform/x86/intel-vbtn.c                  |   39 +-
+ drivers/platform/x86/intel_int0002_vgpio.c         |  219 +++
+ drivers/pnp/pnpacpi/core.c                         |    6 +-
+ drivers/power/avs/rockchip-io-domain.c             |   14 +
+ drivers/powercap/intel_rapl.c                      |    4 +-
+ drivers/usb/core/hcd-pci.c                         |    7 +-
+ drivers/usb/dwc3/dwc3-pci.c                        |    3 +-
+ drivers/usb/host/uhci-pci.c                        |    2 +-
+ include/acpi/acpi_bus.h                            |   29 +-
+ include/acpi/acpixf.h                              |    2 +-
+ include/acpi/acrestyp.h                            |   92 +-
+ include/acpi/actbl1.h                              |  238 +++-
+ include/acpi/actbl2.h                              |   59 +-
+ include/acpi/actbl3.h                              |   82 +-
+ include/acpi/actypes.h                             |   67 +-
+ include/acpi/acuuid.h                              |    5 +
+ include/acpi/platform/acenv.h                      |    4 +
+ include/acpi/platform/acgcc.h                      |   10 +
+ include/acpi/platform/acintel.h                    |    2 +
+ include/acpi/platform/aclinux.h                    |    2 +
+ include/linux/acpi.h                               |    4 +
+ include/linux/cpufreq.h                            |    2 +
+ include/linux/fwnode.h                             |   69 +
+ include/linux/of.h                                 |   32 +-
+ include/linux/pci.h                                |   10 +-
+ include/linux/pm.h                                 |    1 -
+ include/linux/pm_opp.h                             |    9 +
+ include/linux/pm_runtime.h                         |   12 -
+ include/linux/property.h                           |    5 +
+ include/linux/suspend.h                            |    7 +-
+ kernel/power/process.c                             |    2 +-
+ kernel/power/snapshot.c                            |   11 +-
+ kernel/power/suspend.c                             |   35 +-
+ .../acpi/os_specific/service_layers/osunixxf.c     |   10 +-
+ tools/power/cpupower/utils/helpers/amd.c           |   31 +-
+ tools/power/cpupower/utils/helpers/helpers.h       |    2 +
+ tools/power/cpupower/utils/helpers/misc.c          |   23 +-
+ tools/power/x86/turbostat/turbostat.c              |   94 +-
+ tools/power/x86/x86_energy_perf_policy/Makefile    |   27 +-
+ .../x86_energy_perf_policy.8                       |  241 +++-
+ .../x86_energy_perf_policy.c                       | 1504 +++++++++++++++++---
+ 149 files changed, 6323 insertions(+), 2311 deletions(-)
+ create mode 100644 arch/x86/kernel/cpu/aperfmperf.c
+ create mode 100644 drivers/acpi/acpica/utresdecode.c
+ create mode 100644 drivers/of/property.c
+ create mode 100644 drivers/platform/x86/intel_int0002_vgpio.c
+Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
+$ git merge thermal-soc/next
+Auto-merging include/linux/cpufreq.h
+Merge made by the 'recursive' strategy.
+ drivers/cpufreq/arm_big_little.c                   |   2 +-
+ drivers/cpufreq/cpufreq-dt.c                       |   2 +-
+ drivers/cpufreq/cpufreq_stats.c                    |  13 +-
+ drivers/cpufreq/dbx500-cpufreq.c                   |   2 +-
+ drivers/cpufreq/mt8173-cpufreq.c                   |   4 +-
+ drivers/cpufreq/qoriq-cpufreq.c                    |   3 +-
+ drivers/thermal/cpu_cooling.c                      | 609 +++++++++------------
+ drivers/thermal/imx_thermal.c                      |  22 +-
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c |  22 +-
+ include/linux/cpu_cooling.h                        |  32 +-
+ include/linux/cpufreq.h                            |  14 +
+ 11 files changed, 317 insertions(+), 408 deletions(-)
+Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/debug_fs.c  | 25 ++++++++++++-------------
+ fs/dlm/lock.c      |  8 +++-----
+ fs/dlm/lockspace.c |  3 ++-
+ fs/dlm/member.c    | 15 ++++++---------
+ fs/dlm/user.c      |  2 ++
+ 5 files changed, 25 insertions(+), 28 deletions(-)
+Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging net-next/master (fcce2fdbf478 Merge branch 'mlx4-dynamic-tc-tx-queues')
+$ git merge net-next/master
+Recorded preimage for 'arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts'
+Recorded preimage for 'arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts'
+Recorded preimage for 'arch/arm/boot/dts/sun8i-h3-orangepi-2.dts'
+Recorded preimage for 'arch/arm/boot/dts/sun8i-h3-orangepi-one.dts'
+Recorded preimage for 'arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts'
+Recorded preimage for 'drivers/net/ethernet/rocker/rocker_ofdpa.c'
+Resolved 'drivers/net/macvlan.c' using previous resolution.
+Resolved 'drivers/net/wireless/marvell/mwifiex/pcie.c' using previous resolution.
+Auto-merging tools/testing/selftests/bpf/test_verifier.c
+Auto-merging net/xfrm/xfrm_user.c
+Auto-merging net/xfrm/xfrm_policy.c
+Auto-merging net/xfrm/xfrm_device.c
+Auto-merging net/socket.c
+Auto-merging net/sched/sch_api.c
+Auto-merging net/key/af_key.c
+Auto-merging net/ipv6/udp.c
+Auto-merging net/ipv6/sit.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/core/sock.c
+Auto-merging net/core/dev.c
+Auto-merging net/core/datagram.c
+Auto-merging kernel/bpf/verifier.c
+Removing include/uapi/linux/wil6210_uapi.h
+Auto-merging include/net/xfrm.h
+Auto-merging include/net/sock.h
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/qed/qede_rdma.h
+Auto-merging include/linux/qed/qed_rdma_if.h
+Auto-merging include/linux/netdevice.h
+Auto-merging drivers/scsi/qedi/qedi_main.c
+Auto-merging drivers/scsi/qedi/qedi_fw.c
+Removing drivers/net/wireless/rsi/rsi_91x_pkt.c
+Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/pcie.c
+Removing drivers/net/wireless/ath/wil6210/ioctl.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/net/veth.c
+Auto-merging drivers/net/usb/ax88179_178a.c
+Auto-merging drivers/net/phy/phy.c
+Auto-merging drivers/net/phy/micrel.c
+Auto-merging drivers/net/macvlan.c
+CONFLICT (content): Merge conflict in drivers/net/macvlan.c
+Auto-merging drivers/net/hyperv/netvsc_drv.c
+Auto-merging drivers/net/ethernet/sfc/ef10.c
+Auto-merging drivers/net/ethernet/rocker/rocker_ofdpa.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/rocker/rocker_ofdpa.c
+Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.h
+Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.c
+Auto-merging drivers/net/ethernet/qlogic/qede/qede_rdma.c
+Auto-merging drivers/net/ethernet/netronome/nfp/bpf/verifier.c
+Auto-merging drivers/net/ethernet/netronome/nfp/bpf/offload.c
+Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.h
+Auto-merging drivers/net/ethernet/netronome/nfp/bpf/jit.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
+Removing drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
+Removing drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
+Auto-merging drivers/net/ethernet/ibm/ibmveth.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Removing drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+Auto-merging drivers/net/arcnet/com20020-pci.c
+Auto-merging drivers/net/arcnet/capmode.c
+Auto-merging drivers/net/arcnet/arcnet.c
+Auto-merging drivers/firewire/net.c
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+Auto-merging arch/arm/configs/sunxi_defconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+Auto-merging arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+Auto-merging arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+Auto-merging arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+Auto-merging arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+Auto-merging MAINTAINERS
+Removing Documentation/networking/policy-routing.txt
+Removing Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts'.
+Recorded resolution for 'arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts'.
+Recorded resolution for 'arch/arm/boot/dts/sun8i-h3-orangepi-2.dts'.
+Recorded resolution for 'arch/arm/boot/dts/sun8i-h3-orangepi-one.dts'.
+Recorded resolution for 'arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts'.
+Recorded resolution for 'drivers/net/ethernet/rocker/rocker_ofdpa.c'.
+[master 5b93346aca90] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-net          |    8 +
+ Documentation/ABI/testing/sysfs-class-net-phydev   |   36 +
+ .../devicetree/bindings/misc/allwinner,syscon.txt  |   20 +
+ Documentation/devicetree/bindings/net/cortina.txt  |   21 +
+ Documentation/devicetree/bindings/net/dsa/b53.txt  |    3 +
+ Documentation/devicetree/bindings/net/dsa/ksz.txt  |   72 +
+ .../devicetree/bindings/net/dwmac-sun8i.txt        |   84 +
+ Documentation/devicetree/bindings/net/ethernet.txt |    3 +
+ .../devicetree/bindings/net/marvell-orion-mdio.txt |   10 +-
+ .../devicetree/bindings/net/qca,qca7000.txt        |   88 +
+ .../devicetree/bindings/net/qca-qca7000-spi.txt    |   47 -
+ .../devicetree/bindings/net/ti,wilink-st.txt       |   12 +
+ .../devicetree/bindings/net/wireless/ti,wlcore.txt |    1 +
+ .../devicetree/bindings/ptp/brcm,ptp-dte.txt       |   13 +
+ .../devicetree/bindings/serial/slave-device.txt    |    9 +
+ Documentation/networking/checksum-offloads.txt     |   11 +-
+ Documentation/networking/i40evf.txt                |   23 +-
+ Documentation/networking/phy.txt                   |    1 -
+ Documentation/networking/policy-routing.txt        |  150 -
+ Documentation/networking/rxrpc.txt                 |  111 +-
+ Documentation/networking/timestamping.txt          |   26 +-
+ Documentation/networking/tls.txt                   |  135 +
+ MAINTAINERS                                        |   67 +-
+ arch/alpha/include/uapi/asm/socket.h               |    4 +
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  |    2 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts          |    2 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |    2 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts        |    2 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |    2 +-
+ arch/arm/configs/multi_v7_defconfig                |    1 +
+ arch/arm/configs/sunxi_defconfig                   |    1 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |   20 +
+ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts     |    2 +
+ arch/arm64/configs/defconfig                       |    1 +
+ arch/arm64/net/bpf_jit_comp.c                      |   25 +-
+ arch/frv/include/uapi/asm/socket.h                 |    4 +
+ arch/ia64/include/uapi/asm/socket.h                |    4 +
+ arch/m32r/include/uapi/asm/socket.h                |    4 +
+ arch/mips/include/uapi/asm/socket.h                |    4 +
+ arch/mn10300/include/uapi/asm/socket.h             |    4 +
+ arch/parisc/include/uapi/asm/socket.h              |    4 +
+ arch/powerpc/boot/dts/fsl/kmcent2.dts              |    4 +-
+ arch/powerpc/include/asm/hvcall.h                  |    2 +
+ arch/powerpc/include/uapi/asm/socket.h             |   90 +-
+ arch/powerpc/net/bpf_jit_comp64.c                  |    3 +-
+ arch/s390/include/asm/diag.h                       |   26 +
+ arch/s390/include/uapi/asm/socket.h                |    4 +
+ arch/s390/kernel/diag.c                            |   29 +
+ arch/s390/net/bpf_jit_comp.c                       |    3 +-
+ arch/sparc/include/uapi/asm/socket.h               |    4 +
+ arch/sparc/net/bpf_jit_comp_64.c                   |   12 +-
+ arch/x86/net/bpf_jit.S                             |   20 +-
+ arch/x86/net/bpf_jit_comp.c                        |   66 +-
+ arch/xtensa/include/uapi/asm/socket.h              |    4 +
+ drivers/atm/atmtcp.c                               |    4 +-
+ drivers/atm/fore200e.c                             |    2 +-
+ drivers/atm/he.c                                   |    2 +-
+ drivers/atm/idt77252.c                             |   11 +-
+ drivers/atm/solos-pci.c                            |   20 +-
+ drivers/bluetooth/Kconfig                          |    3 +-
+ drivers/bluetooth/bfusb.c                          |    6 +-
+ drivers/bluetooth/bluecard_cs.c                    |    4 +-
+ drivers/bluetooth/bpa10x.c                         |    2 +-
+ drivers/bluetooth/bt3c_cs.c                        |    2 +-
+ drivers/bluetooth/btbcm.c                          |   36 +
+ drivers/bluetooth/btintel.c                        |    2 +
+ drivers/bluetooth/btmrvl_main.c                    |    4 +-
+ drivers/bluetooth/btqcomsmd.c                      |    2 +-
+ drivers/bluetooth/btuart_cs.c                      |    2 +-
+ drivers/bluetooth/btusb.c                          |   27 +-
+ drivers/bluetooth/btwilink.c                       |    1 -
+ drivers/bluetooth/dtl1_cs.c                        |    4 +-
+ drivers/bluetooth/hci_bcm.c                        |   11 +-
+ drivers/bluetooth/hci_bcsp.c                       |   16 +-
+ drivers/bluetooth/hci_h4.c                         |    2 +-
+ drivers/bluetooth/hci_h5.c                         |   12 +-
+ drivers/bluetooth/hci_intel.c                      |   27 +-
+ drivers/bluetooth/hci_ldisc.c                      |   40 +-
+ drivers/bluetooth/hci_ll.c                         |   27 +-
+ drivers/bluetooth/hci_mrvl.c                       |    2 +-
+ drivers/bluetooth/hci_nokia.c                      |   14 +-
+ drivers/bluetooth/hci_qca.c                        |    4 +-
+ drivers/bluetooth/hci_uart.h                       |    1 +
+ drivers/bluetooth/hci_vhci.c                       |    4 +-
+ drivers/char/pcmcia/synclink_cs.c                  |    2 +-
+ drivers/crypto/chelsio/chcr_algo.c                 |   15 +-
+ drivers/firewire/net.c                             |   10 +-
+ drivers/infiniband/core/addr.c                     |    3 +-
+ drivers/infiniband/core/sa_query.c                 |    3 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c             |    8 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.c              |   31 +-
+ drivers/infiniband/hw/cxgb3/iwch_qp.c              |    6 +-
+ drivers/infiniband/hw/cxgb4/cm.c                   |   51 +-
+ drivers/infiniband/hw/cxgb4/cq.c                   |    6 +-
+ drivers/infiniband/hw/cxgb4/mem.c                  |    6 +-
+ drivers/infiniband/hw/cxgb4/qp.c                   |    9 +-
+ drivers/infiniband/hw/mlx4/main.c                  |    5 +-
+ drivers/infiniband/hw/mlx5/cq.c                    |    6 +-
+ drivers/infiniband/hw/mlx5/mad.c                   |    4 +-
+ drivers/infiniband/hw/mlx5/main.c                  |  132 +-
+ drivers/infiniband/hw/mlx5/mr.c                    |    2 +-
+ drivers/infiniband/hw/mlx5/qp.c                    |   32 +-
+ drivers/infiniband/hw/mlx5/srq.c                   |    4 +-
+ drivers/infiniband/hw/qedr/main.c                  |   16 +-
+ drivers/infiniband/hw/qedr/qedr.h                  |    6 +-
+ drivers/infiniband/hw/qedr/qedr_cm.c               |  240 +-
+ drivers/infiniband/hw/qedr/verbs.c                 |    6 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c          |    4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c       |   10 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c   |    2 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c  |    2 +-
+ drivers/isdn/capi/capi.c                           |    6 +-
+ drivers/isdn/capi/capidrv.c                        |    2 +-
+ drivers/isdn/gigaset/asyncdata.c                   |   26 +-
+ drivers/isdn/gigaset/isocdata.c                    |    2 +-
+ drivers/isdn/hardware/avm/b1.c                     |    6 +-
+ drivers/isdn/hardware/avm/b1dma.c                  |    6 +-
+ drivers/isdn/hardware/avm/c4.c                     |    6 +-
+ drivers/isdn/hardware/avm/t1isa.c                  |    6 +-
+ drivers/isdn/hardware/mISDN/hfcmulti.c             |    5 +-
+ drivers/isdn/hardware/mISDN/hfcsusb.c              |    2 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c            |   16 +-
+ drivers/isdn/hisax/amd7930_fn.c                    |    3 +-
+ drivers/isdn/hisax/avm_pci.c                       |    5 +-
+ drivers/isdn/hisax/diva.c                          |    6 +-
+ drivers/isdn/hisax/elsa_ser.c                      |    4 +-
+ drivers/isdn/hisax/hfc_usb.c                       |    2 +-
+ drivers/isdn/hisax/hisax_fcpcipnp.c                |    3 +-
+ drivers/isdn/hisax/hisax_isac.c                    |    4 +-
+ drivers/isdn/hisax/hscx_irq.c                      |    6 +-
+ drivers/isdn/hisax/icc.c                           |    2 +-
+ drivers/isdn/hisax/ipacx.c                         |    8 +-
+ drivers/isdn/hisax/isac.c                          |    2 +-
+ drivers/isdn/hisax/isar.c                          |    6 +-
+ drivers/isdn/hisax/isdnl2.c                        |    4 +-
+ drivers/isdn/hisax/jade_irq.c                      |    6 +-
+ drivers/isdn/hisax/l3_1tr6.c                       |    8 +-
+ drivers/isdn/hisax/l3dss1.c                        |   28 +-
+ drivers/isdn/hisax/l3ni1.c                         |   32 +-
+ drivers/isdn/hisax/netjet.c                        |    2 +-
+ drivers/isdn/hisax/st5481_usb.c                    |    2 +-
+ drivers/isdn/hisax/w6692.c                         |    9 +-
+ drivers/isdn/hysdn/hycapi.c                        |   39 +-
+ drivers/isdn/hysdn/hysdn_net.c                     |    2 +-
+ drivers/isdn/i4l/isdn_audio.c                      |    4 +-
+ drivers/isdn/i4l/isdn_bsdcomp.c                    |    9 +-
+ drivers/isdn/i4l/isdn_ppp.c                        |    7 +-
+ drivers/isdn/i4l/isdn_tty.c                        |    2 +-
+ drivers/isdn/i4l/isdn_v110.c                       |    6 +-
+ drivers/isdn/i4l/isdn_x25iface.c                   |    4 +-
+ drivers/isdn/isdnloop/isdnloop.c                   |    2 +-
+ drivers/isdn/mISDN/dsp_cmx.c                       |    3 +-
+ drivers/isdn/mISDN/layer2.c                        |    8 +-
+ drivers/isdn/mISDN/tei.c                           |    2 +-
+ drivers/media/dvb-core/dvb_net.c                   |    5 +-
+ drivers/media/radio/wl128x/fmdrv_common.c          |    4 +-
+ drivers/misc/ti-st/st_core.c                       |    2 +-
+ drivers/misc/ti-st/st_kim.c                        |    2 +-
+ drivers/net/arcnet/arc-rawmode.c                   |    2 +-
+ drivers/net/arcnet/arcdevice.h                     |    4 +
+ drivers/net/arcnet/arcnet.c                        |   74 +-
+ drivers/net/arcnet/capmode.c                       |    2 +-
+ drivers/net/arcnet/com20020-pci.c                  |   58 +
+ drivers/net/arcnet/rfc1051.c                       |    2 +-
+ drivers/net/arcnet/rfc1201.c                       |    2 +-
+ drivers/net/bonding/bond_3ad.c                     |    9 +-
+ drivers/net/bonding/bond_alb.c                     |    4 +-
+ drivers/net/bonding/bond_main.c                    |    9 +-
+ drivers/net/bonding/bond_netlink.c                 |   16 +-
+ drivers/net/bonding/bond_options.c                 |  159 +-
+ drivers/net/caif/caif_hsi.c                        |   14 +-
+ drivers/net/caif/caif_serial.c                     |    4 +-
+ drivers/net/caif/caif_spi.c                        |    4 +-
+ drivers/net/caif/caif_virtio.c                     |    2 +-
+ drivers/net/can/dev.c                              |   15 +-
+ drivers/net/can/m_can/m_can.c                      |   87 +-
+ drivers/net/can/slcan.c                            |    3 +-
+ drivers/net/can/vxcan.c                            |    3 +-
+ drivers/net/cris/eth_v10.c                         |    5 +-
+ drivers/net/dsa/Kconfig                            |   42 +-
+ drivers/net/dsa/Makefile                           |    7 +-
+ drivers/net/dsa/b53/b53_common.c                   |   21 +-
+ drivers/net/dsa/b53/b53_priv.h                     |    4 +-
+ drivers/net/dsa/b53/b53_srab.c                     |    2 +
+ drivers/net/dsa/bcm_sf2.c                          |   25 +-
+ drivers/net/dsa/dsa_loop.c                         |   99 +-
+ drivers/net/dsa/lan9303-core.c                     |    2 +-
+ drivers/net/dsa/microchip/Kconfig                  |   12 +
+ drivers/net/dsa/microchip/Makefile                 |    2 +
+ drivers/net/dsa/microchip/ksz_9477_reg.h           | 1676 +++++++++
+ drivers/net/dsa/microchip/ksz_common.c             | 1279 +++++++
+ drivers/net/dsa/microchip/ksz_priv.h               |  210 ++
+ drivers/net/dsa/microchip/ksz_spi.c                |  216 ++
+ drivers/net/dsa/mt7530.c                           |    9 +-
+ drivers/net/dsa/mv88e6060.c                        |    2 +-
+ drivers/net/dsa/mv88e6xxx/Makefile                 |    2 +
+ drivers/net/dsa/mv88e6xxx/chip.c                   |  901 ++---
+ drivers/net/dsa/mv88e6xxx/chip.h                   |  518 +++
+ drivers/net/dsa/mv88e6xxx/global1.c                |  170 +-
+ drivers/net/dsa/mv88e6xxx/global1.h                |  206 +-
+ drivers/net/dsa/mv88e6xxx/global1_atu.c            |   58 +-
+ drivers/net/dsa/mv88e6xxx/global1_vtu.c            |   64 +-
+ drivers/net/dsa/mv88e6xxx/global2.c                |  409 ++-
+ drivers/net/dsa/mv88e6xxx/global2.h                |  212 +-
+ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h              |  946 -----
+ drivers/net/dsa/mv88e6xxx/phy.c                    |  249 ++
+ drivers/net/dsa/mv88e6xxx/phy.h                    |   43 +
+ drivers/net/dsa/mv88e6xxx/port.c                   |  409 ++-
+ drivers/net/dsa/mv88e6xxx/port.h                   |  235 +-
+ drivers/net/dsa/mv88e6xxx/serdes.c                 |  229 ++
+ drivers/net/dsa/mv88e6xxx/serdes.h                 |   48 +
+ drivers/net/dsa/qca8k.c                            |    7 +-
+ drivers/net/dummy.c                                |    3 +-
+ drivers/net/ethernet/3com/3c509.c                  |    8 +-
+ drivers/net/ethernet/3com/3c515.c                  |    6 +-
+ drivers/net/ethernet/3com/3c59x.c                  |    9 +-
+ drivers/net/ethernet/8390/ax88796.c                |    6 +
+ drivers/net/ethernet/aeroflex/greth.c              |    3 +-
+ drivers/net/ethernet/agere/et131x.c                |    2 +-
+ drivers/net/ethernet/allwinner/sun4i-emac.c        |    2 +-
+ drivers/net/ethernet/amazon/ena/ena_admin_defs.h   |   31 +
+ drivers/net/ethernet/amazon/ena/ena_com.c          |   85 +-
+ drivers/net/ethernet/amazon/ena/ena_com.h          |   10 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.c      |    5 +
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c      |   11 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c       |  306 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h       |   30 +-
+ drivers/net/ethernet/amazon/ena/ena_regs_defs.h    |   34 +
+ drivers/net/ethernet/amd/pcnet32.c                 |    5 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-common.h        |   53 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-desc.c          |   94 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |  244 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |  252 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c       |    2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-i2c.c           |   30 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c          |   14 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-mdio.c          |   33 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-pci.c           |   14 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c        |  240 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-platform.c      |   10 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-ptp.c           |    2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h               |   56 +-
+ drivers/net/ethernet/apm/xgene-v2/ethtool.c        |    4 +-
+ .../net/ethernet/apm/xgene/xgene_enet_ethtool.c    |  146 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |  188 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h     |   70 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   74 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |   12 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c  |  110 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c  |   77 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h  |    5 +
+ drivers/net/ethernet/apple/bmac.c                  |    3 +-
+ drivers/net/ethernet/apple/macmace.c               |    2 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c   |    2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |    2 +-
+ drivers/net/ethernet/aurora/nb8800.c               |    4 +-
+ drivers/net/ethernet/broadcom/b44.c                |    4 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       |    8 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c         |    2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |    4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |    4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  174 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h          |   42 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  |    3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c      |   19 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h      |    2 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c      |    3 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c     |    4 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c       |   24 +-
+ drivers/net/ethernet/broadcom/tg3.c                |    4 +-
+ drivers/net/ethernet/cadence/macb.c                |  100 +-
+ drivers/net/ethernet/cadence/macb.h                |    1 +
+ .../ethernet/cavium/liquidio/cn23xx_pf_device.c    |   10 +-
+ .../ethernet/cavium/liquidio/cn23xx_vf_device.c    |   17 +-
+ .../net/ethernet/cavium/liquidio/cn66xx_device.c   |    8 +-
+ drivers/net/ethernet/cavium/liquidio/lio_core.c    |   10 +-
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |   19 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c    |   60 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   46 +-
+ .../net/ethernet/cavium/liquidio/liquidio_common.h |    6 +-
+ .../net/ethernet/cavium/liquidio/octeon_config.h   |   13 +-
+ .../net/ethernet/cavium/liquidio/octeon_console.c  |    6 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.c   |  103 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.h   |   25 +
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.c |   48 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.h |   18 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_iq.h   |    2 +-
+ .../net/ethernet/cavium/liquidio/octeon_mailbox.c  |    5 +-
+ .../net/ethernet/cavium/liquidio/octeon_mailbox.h  |   12 +-
+ .../net/ethernet/cavium/liquidio/octeon_mem_ops.c  |    4 +-
+ .../net/ethernet/cavium/liquidio/octeon_mem_ops.h  |    2 +-
+ .../net/ethernet/cavium/liquidio/octeon_network.h  |   33 +-
+ .../net/ethernet/cavium/liquidio/request_manager.c |    3 +-
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c   |    1 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c   |   34 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c |    8 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c            |    4 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |   16 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    4 +-
+ drivers/net/ethernet/chelsio/cxgb3/l2t.c           |    2 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c           |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   15 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   12 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |   34 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c  |    5 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  206 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |   24 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  267 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h |    5 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |    4 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |    6 +
+ drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h  |   10 +-
+ drivers/net/ethernet/cirrus/cs89x0.c               |    7 +-
+ drivers/net/ethernet/cirrus/ep93xx_eth.c           |    5 +-
+ drivers/net/ethernet/cisco/enic/enic.h             |    4 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c        |   14 +-
+ drivers/net/ethernet/davicom/dm9000.c              |    2 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c           |   11 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c             |    6 +-
+ drivers/net/ethernet/dec/tulip/interrupt.c         |   12 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c           |    6 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c       |    5 +-
+ drivers/net/ethernet/dnet.c                        |    2 +-
+ drivers/net/ethernet/ec_bhf.c                      |    2 +-
+ drivers/net/ethernet/emulex/benet/be.h             |    2 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h          |    3 +
+ drivers/net/ethernet/emulex/benet/be_main.c        |   27 +-
+ drivers/net/ethernet/faraday/ftmac100.c            |    5 +-
+ drivers/net/ethernet/fealnx.c                      |    9 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c     |    4 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c |    6 +-
+ drivers/net/ethernet/freescale/fec.h               |    4 +
+ drivers/net/ethernet/freescale/fec_main.c          |   31 +-
+ drivers/net/ethernet/freescale/gianfar.c           |    4 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c  |    4 +-
+ drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |    2 +-
+ drivers/net/ethernet/hp/hp100.c                    |    2 +-
+ drivers/net/ethernet/i825xx/82596.c                |    3 +-
+ drivers/net/ethernet/i825xx/lib82596.c             |    3 +-
+ drivers/net/ethernet/ibm/emac/phy.c                |   12 +-
+ drivers/net/ethernet/ibm/ibmveth.c                 |  109 +-
+ drivers/net/ethernet/ibm/ibmveth.h                 |    1 +
+ drivers/net/ethernet/ibm/ibmvnic.c                 |  403 ++-
+ drivers/net/ethernet/ibm/ibmvnic.h                 |    5 +-
+ drivers/net/ethernet/intel/Kconfig                 |   10 +-
+ drivers/net/ethernet/intel/e100.c                  |    5 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c      |    2 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h          |    1 +
+ drivers/net/ethernet/intel/e1000e/ethtool.c        |    3 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c         |   51 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    |    4 +-
+ drivers/net/ethernet/intel/i40e/i40e.h             |   76 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  |    4 +-
+ drivers/net/ethernet/intel/i40e/i40e_client.c      |   10 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c      |    8 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c         |   15 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |   49 +-
+ drivers/net/ethernet/intel/i40e/i40e_fcoe.c        |    2 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c        |  530 ++-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h   |    6 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c         |   49 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  272 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h        |   12 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl.h    |  449 ---
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |  474 +--
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h |    9 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    |    5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c    |   18 +-
+ drivers/net/ethernet/intel/i40evf/i40e_devids.h    |    1 +
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h |    6 +-
+ drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h  |  449 ---
+ drivers/net/ethernet/intel/i40evf/i40evf.h         |   26 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_client.c  |   18 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c    |   84 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |  286 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c       |    1 +
+ drivers/net/ethernet/intel/igb/igb.h               |    4 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c       |    3 +-
+ drivers/net/ethernet/intel/igb/igb_main.c          |   66 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c           |   42 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h           |    2 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |    9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   44 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c      |    2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  105 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       |    5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |   43 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   63 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |   61 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   28 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c            |    2 +
+ drivers/net/ethernet/jme.c                         |   47 +-
+ drivers/net/ethernet/korina.c                      |    5 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c         |    5 +-
+ drivers/net/ethernet/marvell/mvmdio.c              |  214 +-
+ drivers/net/ethernet/marvell/mvneta.c              |   10 +-
+ drivers/net/ethernet/marvell/mvpp2.c               |  107 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   91 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h        |   18 +-
+ drivers/net/ethernet/mellanox/Kconfig              |    1 +
+ drivers/net/ethernet/mellanox/Makefile             |    1 +
+ drivers/net/ethernet/mellanox/mlx4/cmd.c           |    2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c         |   25 +-
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c     |    6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |   19 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c       |   14 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |  107 +-
+ drivers/net/ethernet/mellanox/mlx4/en_resources.c  |    3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c         |  145 +-
+ drivers/net/ethernet/mellanox/mlx4/en_selftest.c   |    4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c         |  311 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c          |    6 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    3 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   35 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig    |   26 +
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile   |   13 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c  |   78 +
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h  |  138 +
+ drivers/net/ethernet/mellanox/mlx5/core/alloc.c    |    1 -
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |   46 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c  |    5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h       |   61 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c   |  461 +++
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h   |  140 +
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c       |  378 ++
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h       |   55 +
+ .../mellanox/mlx5/core/en_accel/ipsec_stats.c      |  133 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c  |   29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_clock.c |   11 +-
+ .../net/ethernet/mellanox/mlx5/core/en_common.c    |    5 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |  322 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c    |   25 +-
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c    |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |  223 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |   12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |  178 +-
+ .../net/ethernet/mellanox/mlx5/core/en_selftest.c  |   10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h |    6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |  329 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |   36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c  |   19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   26 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h  |    1 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c |  238 ++
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h |   84 +
+ .../net/ethernet/mellanox/mlx5/core/fpga/conn.c    | 1042 ++++++
+ .../net/ethernet/mellanox/mlx5/core/fpga/conn.h    |   96 +
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.c    |  283 ++
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.h    |  113 +
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c   |  376 ++
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h   |   94 +
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.c |  164 +
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h |  204 ++
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c   |   38 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c       |  296 ++
+ drivers/net/ethernet/mellanox/mlx5/core/health.c   |   36 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c    |  145 +
+ .../mellanox/mlx5/core/{ => ipoib}/ipoib.c         |   80 +-
+ .../mellanox/mlx5/core/{ => ipoib}/ipoib.h         |    7 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c      |   71 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c  |  154 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h |   43 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c     |   90 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |   12 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |    5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c     |    6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c       |   21 -
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |   15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/srq.c      |   14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c    |   38 +-
+ drivers/net/ethernet/mellanox/mlx5/core/wq.c       |   46 +
+ drivers/net/ethernet/mellanox/mlx5/core/wq.h       |   27 +
+ drivers/net/ethernet/mellanox/mlxfw/Kconfig        |   13 +
+ drivers/net/ethernet/mellanox/mlxfw/Makefile       |    2 +
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw.h        |  111 +
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c    |  273 ++
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c   |  619 ++++
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h   |   66 +
+ .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h  |   60 +
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h    |  103 +
+ .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h   |   98 +
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c |  126 +
+ .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h |   71 +
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig        |    2 +
+ drivers/net/ethernet/mellanox/mlxsw/Makefile       |    3 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h         |   12 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.c         |   40 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.h         |    1 +
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |    2 +
+ drivers/net/ethernet/mellanox/mlxsw/pci_hw.h       |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h          |  297 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c     | 1689 ++++-----
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |  416 +--
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c |   22 +
+ .../mellanox/mlxsw/spectrum_acl_flex_keys.h        |    6 +
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |    1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c |   73 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c   |   22 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c |  992 ++++++
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |   50 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 1027 +++---
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h  |    2 +
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   | 2009 ++++++-----
+ drivers/net/ethernet/mellanox/mlxsw/trap.h         |    1 +
+ drivers/net/ethernet/micrel/ks8842.c               |    4 +-
+ drivers/net/ethernet/micrel/ks8851.c               |    5 +-
+ drivers/net/ethernet/micrel/ks8851_mll.c           |    5 +-
+ drivers/net/ethernet/micrel/ksz884x.c              |    3 +-
+ drivers/net/ethernet/neterion/s2io.c               |    5 -
+ drivers/net/ethernet/neterion/vxge/vxge-main.c     |    1 +
+ drivers/net/ethernet/netronome/Kconfig             |   11 +
+ drivers/net/ethernet/netronome/nfp/Makefile        |   22 +-
+ .../netronome/nfp/{nfp_bpf_jit.c => bpf/jit.c}     |    4 +-
+ drivers/net/ethernet/netronome/nfp/bpf/main.c      |  160 +
+ .../netronome/nfp/{nfp_bpf.h => bpf/main.h}        |   23 +
+ .../nfp/{nfp_net_offload.c => bpf/offload.c}       |   61 +-
+ .../nfp/{nfp_bpf_verifier.c => bpf/verifier.c}     |    2 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.c   |  158 +
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |  116 +
+ drivers/net/ethernet/netronome/nfp/flower/main.c   |  370 ++
+ drivers/net/ethernet/netronome/nfp/nfp_app.c       |  126 +
+ drivers/net/ethernet/netronome/nfp/nfp_app.h       |  314 ++
+ drivers/net/ethernet/netronome/nfp/nfp_app_nic.c   |   75 +
+ drivers/net/ethernet/netronome/nfp/nfp_asm.h       |    2 +-
+ drivers/net/ethernet/netronome/nfp/nfp_devlink.c   |  199 ++
+ drivers/net/ethernet/netronome/nfp/nfp_hwmon.c     |  192 +
+ drivers/net/ethernet/netronome/nfp/nfp_main.c      |  150 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.h      |   79 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net.h       |  148 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c    | 1433 +++++---
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h  |   50 +-
+ .../net/ethernet/netronome/nfp/nfp_net_debugfs.c   |   15 +-
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |   79 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_main.c  |  851 +++--
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c  |  388 ++
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.h  |  119 +
+ .../net/ethernet/netronome/nfp/nfp_netvf_main.c    |   16 +-
+ drivers/net/ethernet/netronome/nfp/nfp_port.c      |  189 +
+ drivers/net/ethernet/netronome/nfp/nfp_port.h      |  193 +
+ drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h   |    6 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c  |   49 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h   |   35 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c   |  186 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp_cpplib.c    |   40 +
+ .../ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c    |   70 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_mip.c   |    7 +
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c |    9 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h  |   20 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c   |   24 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h   |   17 +
+ .../ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c  |   47 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c   |   16 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp_resource.c  |   10 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c |  154 +-
+ drivers/net/ethernet/netronome/nfp/nic/main.c      |   58 +
+ drivers/net/ethernet/nuvoton/w90p910_ether.c       |    5 +-
+ drivers/net/ethernet/nxp/lpc_eth.c                 |    8 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    6 +-
+ drivers/net/ethernet/packetengines/hamachi.c       |    4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c |   15 +-
+ drivers/net/ethernet/qlogic/qed/Makefile           |    2 +-
+ drivers/net/ethernet/qlogic/qed/qed.h              |   26 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c          |  230 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.h          |   54 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c         |   66 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.h         |    2 +-
+ drivers/net/ethernet/qlogic/qed/qed_debug.c        | 3582 +++++++++++--------
+ drivers/net/ethernet/qlogic/qed/qed_debug.h        |    3 +
+ drivers/net/ethernet/qlogic/qed/qed_dev.c          |  277 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |    5 +-
+ drivers/net/ethernet/qlogic/qed/qed_fcoe.c         |   43 +-
+ drivers/net/ethernet/qlogic/qed/qed_fcoe.h         |   22 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h          | 3717 +++++++++++++-------
+ .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c    |  267 +-
+ drivers/net/ethernet/qlogic/qed/qed_init_ops.c     |    4 +
+ drivers/net/ethernet/qlogic/qed/qed_int.c          | 2090 +++--------
+ drivers/net/ethernet/qlogic/qed/qed_int.h          |   93 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.c        |  126 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.h        |   23 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.c           |  316 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.h           |   79 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c          |  912 ++---
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h          |  126 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c         |   71 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c          |  189 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h          |   35 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.c          |   30 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.h          |   26 +-
+ drivers/net/ethernet/qlogic/qed/qed_ptp.c          |    4 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c         | 1722 +++++++++
+ drivers/net/ethernet/qlogic/qed/qed_rdma.h         |  201 ++
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h     |  196 +-
+ drivers/net/ethernet/qlogic/qed/qed_roce.c         | 1964 +----------
+ drivers/net/ethernet/qlogic/qed/qed_roce.h         |  199 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp.h           |   62 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c  |   61 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c          |  116 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c        |  559 ++-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.h        |   43 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.c           |  271 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.h           |  102 +-
+ drivers/net/ethernet/qlogic/qede/Makefile          |    2 +-
+ drivers/net/ethernet/qlogic/qede/qede.h            |    6 +-
+ drivers/net/ethernet/qlogic/qede/qede_dcbnl.c      |    1 -
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |   24 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c     |   63 +-
+ drivers/net/ethernet/qlogic/qede/qede_fp.c         |   46 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c       |  130 +-
+ drivers/net/ethernet/qlogic/qede/qede_ptp.c        |    1 +
+ .../qlogic/qede/{qede_roce.c => qede_rdma.c}       |  144 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c       |    7 +-
+ drivers/net/ethernet/qualcomm/Kconfig              |   24 +-
+ drivers/net/ethernet/qualcomm/Makefile             |    7 +-
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.c    |   23 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c          |   16 +-
+ drivers/net/ethernet/qualcomm/qca_7k.c             |   30 +-
+ drivers/net/ethernet/qualcomm/qca_7k.h             |   15 +-
+ .../qualcomm/{qca_framing.c => qca_7k_common.c}    |   26 +-
+ .../qualcomm/{qca_framing.h => qca_7k_common.h}    |   24 +-
+ drivers/net/ethernet/qualcomm/qca_debug.c          |    5 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c            |   51 +-
+ drivers/net/ethernet/qualcomm/qca_spi.h            |    5 +-
+ drivers/net/ethernet/qualcomm/qca_uart.c           |  423 +++
+ drivers/net/ethernet/realtek/8139cp.c              |    5 +-
+ drivers/net/ethernet/realtek/r8169.c               |    4 +-
+ drivers/net/ethernet/renesas/ravb_main.c           |   14 +-
+ drivers/net/ethernet/renesas/sh_eth.c              |   25 +-
+ drivers/net/ethernet/rocker/rocker.h               |   21 +-
+ drivers/net/ethernet/rocker/rocker_main.c          |  235 +-
+ drivers/net/ethernet/rocker/rocker_ofdpa.c         |  610 ++--
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |    3 +-
+ drivers/net/ethernet/sfc/ef10.c                    |    1 +
+ drivers/net/ethernet/sfc/efx.h                     |    4 +-
+ drivers/net/ethernet/sfc/falcon/efx.h              |    4 +-
+ drivers/net/ethernet/sfc/falcon/selftest.c         |    3 +-
+ drivers/net/ethernet/sfc/falcon/tx.c               |    4 +-
+ drivers/net/ethernet/sfc/selftest.c                |    3 +-
+ drivers/net/ethernet/sfc/tx.c                      |    4 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c                |    5 +-
+ drivers/net/ethernet/silan/sc92031.c               |   10 +-
+ drivers/net/ethernet/sis/sis190.c                  |    4 +-
+ drivers/net/ethernet/smsc/epic100.c                |    5 +-
+ drivers/net/ethernet/smsc/smc911x.c                |    7 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c            |   13 +-
+ drivers/net/ethernet/smsc/smc91x.c                 |    9 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig        |   11 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile       |    1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h       |    8 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c  | 1011 ++++++
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |   26 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c    |    4 +-
+ .../net/ethernet/stmicro/stmmac/dwmac100_core.c    |    6 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |   26 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c   |   16 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c    |    3 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |    7 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   77 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |  203 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   10 +-
+ drivers/net/ethernet/sun/ldmvsw.c                  |    2 +-
+ drivers/net/ethernet/sun/niu.c                     |    2 +-
+ drivers/net/ethernet/sun/sunvnet.c                 |    2 +-
+ drivers/net/ethernet/ti/cpsw.c                     |   25 +-
+ drivers/net/ethernet/ti/cpts.h                     |   16 +
+ drivers/net/ethernet/ti/davinci_cpdma.c            |    5 +-
+ drivers/net/ethernet/ti/netcp_core.c               |    4 +-
+ drivers/net/ethernet/ti/netcp_ethss.c              |   26 +-
+ drivers/net/ethernet/tile/tilegx.c                 |    1 +
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c       |    2 +-
+ drivers/net/ethernet/tundra/tsi108_eth.c           |    5 +-
+ drivers/net/ethernet/via/via-rhine.c               |    5 +-
+ drivers/net/fjes/fjes_main.c                       |    4 +-
+ drivers/net/geneve.c                               |   45 +-
+ drivers/net/gtp.c                                  |   10 +-
+ drivers/net/hamradio/mkiss.c                       |    2 +-
+ drivers/net/hamradio/scc.c                         |    4 +-
+ drivers/net/hippi/rrunner.c                        |    6 +-
+ drivers/net/hyperv/hyperv_net.h                    |   10 +-
+ drivers/net/hyperv/netvsc.c                        |   51 +-
+ drivers/net/hyperv/netvsc_drv.c                    |   65 +-
+ drivers/net/hyperv/rndis_filter.c                  |    4 +-
+ drivers/net/ieee802154/at86rf230.c                 |    2 +-
+ drivers/net/ieee802154/ca8210.c                    |   14 +-
+ drivers/net/ieee802154/mrf24j40.c                  |    2 +-
+ drivers/net/ifb.c                                  |    3 +-
+ drivers/net/ipvlan/ipvlan.h                        |    3 +-
+ drivers/net/ipvlan/ipvlan_main.c                   |   78 +-
+ drivers/net/ipvlan/ipvtap.c                        |    9 +-
+ drivers/net/irda/smsc-ircc2.c                      |    2 +-
+ drivers/net/irda/vlsi_ir.c                         |    2 +-
+ drivers/net/macsec.c                               |   39 +-
+ drivers/net/macvlan.c                              |   12 +-
+ drivers/net/macvtap.c                              |    7 +-
+ drivers/net/mii.c                                  |    8 +-
+ drivers/net/nlmon.c                                |    3 +-
+ drivers/net/phy/Kconfig                            |   10 +
+ drivers/net/phy/Makefile                           |    4 +-
+ drivers/net/phy/broadcom.c                         |   30 +-
+ drivers/net/phy/cortina.c                          |  118 +
+ drivers/net/phy/lxt.c                              |   11 +-
+ drivers/net/phy/marvell.c                          |  731 ++--
+ drivers/net/phy/marvell10g.c                       |  368 ++
+ drivers/net/phy/mdio-mux.c                         |   26 +-
+ drivers/net/phy/mdio-xgene.c                       |   74 +-
+ drivers/net/phy/mdio-xgene.h                       |    3 +
+ drivers/net/phy/mdio_bus.c                         |   66 +-
+ drivers/net/phy/micrel.c                           |   38 +-
+ drivers/net/phy/microchip.c                        |    2 +-
+ drivers/net/phy/phy-c45.c                          |  298 ++
+ drivers/net/phy/phy.c                              |   63 +-
+ drivers/net/phy/phy_device.c                       |  138 +-
+ drivers/net/phy/smsc.c                             |   84 +-
+ drivers/net/ppp/ppp_async.c                        |    5 +-
+ drivers/net/ppp/ppp_generic.c                      |   34 +-
+ drivers/net/ppp/ppp_mppe.c                         |   15 +-
+ drivers/net/ppp/ppp_synctty.c                      |    5 +-
+ drivers/net/ppp/pppoe.c                            |    2 +-
+ drivers/net/ppp/pptp.c                             |    4 +-
+ drivers/net/slip/slip.c                            |    2 +-
+ drivers/net/sungem_phy.c                           |   26 +-
+ drivers/net/tap.c                                  |   25 +-
+ drivers/net/team/team.c                            |   12 +-
+ drivers/net/team/team_mode_activebackup.c          |    2 +-
+ drivers/net/team/team_mode_broadcast.c             |    2 +-
+ drivers/net/team/team_mode_loadbalance.c           |    2 +-
+ drivers/net/team/team_mode_random.c                |    2 +-
+ drivers/net/team/team_mode_roundrobin.c            |    2 +-
+ drivers/net/tun.c                                  |   40 +-
+ drivers/net/usb/asix_common.c                      |    5 +-
+ drivers/net/usb/ax88179_178a.c                     |    5 +-
+ drivers/net/usb/cdc-phonet.c                       |    2 +-
+ drivers/net/usb/cdc_mbim.c                         |    2 +-
+ drivers/net/usb/cdc_ncm.c                          |   16 +-
+ drivers/net/usb/gl620a.c                           |    5 +-
+ drivers/net/usb/hso.c                              |   14 +-
+ drivers/net/usb/int51x1.c                          |    4 +-
+ drivers/net/usb/ipheth.c                           |    2 +-
+ drivers/net/usb/kalmia.c                           |    2 +-
+ drivers/net/usb/kaweth.c                           |    2 +-
+ drivers/net/usb/lan78xx.c                          |    2 +-
+ drivers/net/usb/lg-vl600.c                         |    4 +-
+ drivers/net/usb/net1080.c                          |   15 +-
+ drivers/net/usb/qmi_wwan.c                         |    4 +-
+ drivers/net/usb/r8152.c                            | 1005 +++++-
+ drivers/net/usb/rndis_host.c                       |    2 +-
+ drivers/net/usb/usbnet.c                           |    4 +-
+ drivers/net/usb/zaurus.c                           |    8 +-
+ drivers/net/veth.c                                 |    8 +-
+ drivers/net/virtio_net.c                           |   24 +-
+ drivers/net/vrf.c                                  |   14 +-
+ drivers/net/vxlan.c                                |  433 ++-
+ drivers/net/wan/farsync.c                          |    2 +-
+ drivers/net/wan/fsl_ucc_hdlc.c                     |   92 +-
+ drivers/net/wan/fsl_ucc_hdlc.h                     |    1 +
+ drivers/net/wan/hdlc_ppp.c                         |    8 +-
+ drivers/net/wan/hdlc_raw_eth.c                     |    3 +-
+ drivers/net/wan/x25_asy.c                          |    2 +-
+ drivers/net/wimax/i2400m/netdev.c                  |    4 +-
+ drivers/net/wireless/Kconfig                       |    1 +
+ drivers/net/wireless/Makefile                      |    1 +
+ drivers/net/wireless/admtek/adm8211.c              |    8 +-
+ drivers/net/wireless/ath/ar5523/ar5523.c           |    4 +-
+ drivers/net/wireless/ath/ath10k/Kconfig            |    7 +
+ drivers/net/wireless/ath/ath10k/Makefile           |    3 +
+ drivers/net/wireless/ath/ath10k/bmi.c              |   71 +
+ drivers/net/wireless/ath/ath10k/bmi.h              |    8 +-
+ drivers/net/wireless/ath/ath10k/ce.c               |  168 +-
+ drivers/net/wireless/ath/ath10k/ce.h               |  132 -
+ drivers/net/wireless/ath/ath10k/core.c             |   89 +-
+ drivers/net/wireless/ath/ath10k/core.h             |    4 +
+ drivers/net/wireless/ath/ath10k/debug.c            |   16 +-
+ drivers/net/wireless/ath/ath10k/debug.h            |    2 +
+ drivers/net/wireless/ath/ath10k/htc.c              |  244 +-
+ drivers/net/wireless/ath/ath10k/htc.h              |   39 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c           |   27 +-
+ drivers/net/wireless/ath/ath10k/hw.c               |  137 +
+ drivers/net/wireless/ath/ath10k/hw.h               |  140 +
+ drivers/net/wireless/ath/ath10k/mac.c              |   82 +-
+ drivers/net/wireless/ath/ath10k/pci.c              |   27 +-
+ drivers/net/wireless/ath/ath10k/sdio.c             | 2113 +++++++++++
+ drivers/net/wireless/ath/ath10k/sdio.h             |  229 ++
+ drivers/net/wireless/ath/ath10k/targaddrs.h        |   24 +
+ drivers/net/wireless/ath/ath10k/testmode.c         |    7 +
+ drivers/net/wireless/ath/ath10k/testmode_i.h       |    1 +
+ drivers/net/wireless/ath/ath10k/wmi.c              |   56 +-
+ drivers/net/wireless/ath/ath10k/wmi.h              |    3 +
+ drivers/net/wireless/ath/ath5k/debug.c             |    5 +-
+ drivers/net/wireless/ath/ath6kl/debug.c            |    2 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c         |   11 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c             |   13 +-
+ drivers/net/wireless/ath/ath9k/channel.c           |    8 +-
+ drivers/net/wireless/ath/ath9k/common.c            |    2 +-
+ drivers/net/wireless/ath/ath9k/eeprom.c            |    2 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c           |    2 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.c           |   12 +-
+ drivers/net/wireless/ath/ath9k/tx99.c              |    2 +-
+ drivers/net/wireless/ath/ath9k/wmi.c               |    6 +-
+ drivers/net/wireless/ath/carl9170/rx.c             |    6 +-
+ drivers/net/wireless/ath/carl9170/tx.c             |    2 +-
+ drivers/net/wireless/ath/wil6210/Makefile          |    1 -
+ drivers/net/wireless/ath/wil6210/cfg80211.c        |  613 ++++
+ drivers/net/wireless/ath/wil6210/debugfs.c         |   61 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c       |    6 +
+ drivers/net/wireless/ath/wil6210/ioctl.c           |  180 -
+ drivers/net/wireless/ath/wil6210/main.c            |    7 +-
+ drivers/net/wireless/ath/wil6210/netdev.c          |    8 -
+ drivers/net/wireless/ath/wil6210/pcie_bus.c        |   98 +-
+ drivers/net/wireless/ath/wil6210/pm.c              |  228 +-
+ drivers/net/wireless/ath/wil6210/txrx.c            |   73 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h         |   40 +-
+ drivers/net/wireless/ath/wil6210/wil_platform.h    |    7 +-
+ drivers/net/wireless/ath/wil6210/wmi.c             |  151 +-
+ drivers/net/wireless/ath/wil6210/wmi.h             |   27 +-
+ drivers/net/wireless/atmel/atmel.c                 |    5 +-
+ drivers/net/wireless/broadcom/b43/main.c           |   10 +
+ drivers/net/wireless/broadcom/b43legacy/dma.c      |    2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  |   15 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c  |    4 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   90 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h         |    8 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c    |    1 +
+ .../wireless/broadcom/brcm80211/brcmfmac/debug.h   |    2 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c |   22 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.h |    4 +-
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h       |   76 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c |  452 ++-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h |   55 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |    7 +-
+ drivers/net/wireless/cisco/airo.c                  |    4 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c       |    7 +-
+ drivers/net/wireless/intel/ipw2x00/libipw_tx.c     |    9 +-
+ drivers/net/wireless/intel/iwlegacy/3945.c         |    2 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c     |    2 +-
+ drivers/net/wireless/intel/iwlegacy/common.c       |    2 +
+ drivers/net/wireless/intel/iwlegacy/common.h       |    1 +
+ drivers/net/wireless/intel/iwlwifi/dvm/rx.c        |    2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tx.c        |    3 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-8000.c      |   10 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-9000.c      |   14 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-a000.c      |    8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h    |   11 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h       |    8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c       |    6 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.h       |   12 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h        |    2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-api.h    |  205 ++
+ .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h |    8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h   |   16 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-io.c        |    4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h |    2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |   95 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c     |    2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |  167 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/coex.c      |    3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/constants.h |    1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |   82 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-coex.h   |   10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h |   29 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-mac.h    |   10 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-power.h  |   45 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h |   88 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-scan.h   |   34 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h    |   46 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-stats.h  |   29 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-tof.h    |   18 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h |   67 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h    |  555 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c    |   52 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c        |   65 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/led.c       |    5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |    8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   42 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |   25 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c       |  133 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |   32 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c        |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c      |    5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |   48 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h       |    2 +
+ drivers/net/wireless/intel/iwlwifi/mvm/tdls.c      |    3 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c    |    5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tof.c       |    6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c        |   14 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c        |   27 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c      |   12 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h |    3 +
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |  135 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |  172 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |   10 +-
+ .../net/wireless/intersil/hostap/hostap_80211_rx.c |    8 +-
+ .../net/wireless/intersil/hostap/hostap_80211_tx.c |    2 +-
+ drivers/net/wireless/intersil/hostap/hostap_ap.c   |   11 +-
+ drivers/net/wireless/intersil/hostap/hostap_hw.c   |   23 +-
+ drivers/net/wireless/intersil/hostap/hostap_main.c |    6 +-
+ drivers/net/wireless/intersil/hostap/hostap_wlan.h |    3 +-
+ drivers/net/wireless/intersil/orinoco/main.c       |    9 +-
+ .../net/wireless/intersil/orinoco/orinoco_usb.c    |   15 +-
+ drivers/net/wireless/intersil/p54/fwio.c           |   48 +-
+ drivers/net/wireless/intersil/p54/p54spi.c         |    4 +-
+ drivers/net/wireless/intersil/p54/txrx.c           |   12 +-
+ drivers/net/wireless/intersil/prism54/islpci_eth.c |    5 +-
+ drivers/net/wireless/mac80211_hwsim.c              |   17 +-
+ drivers/net/wireless/marvell/libertas/cfg.c        |  104 +-
+ drivers/net/wireless/marvell/libertas/cmd.c        |  116 +-
+ drivers/net/wireless/marvell/libertas/cmdresp.c    |    9 -
+ drivers/net/wireless/marvell/libertas/defs.h       |    9 -
+ drivers/net/wireless/marvell/libertas/ethtool.c    |    3 -
+ drivers/net/wireless/marvell/libertas/if_cs.c      |   36 -
+ drivers/net/wireless/marvell/libertas/if_sdio.c    |   71 +-
+ drivers/net/wireless/marvell/libertas/if_spi.c     |   38 +-
+ drivers/net/wireless/marvell/libertas/if_usb.c     |   27 +-
+ drivers/net/wireless/marvell/libertas/main.c       |   81 +-
+ drivers/net/wireless/marvell/libertas/mesh.c       |   54 +-
+ drivers/net/wireless/marvell/libertas/rx.c         |    8 +-
+ drivers/net/wireless/marvell/libertas/tx.c         |    3 -
+ drivers/net/wireless/marvell/libertas_tf/main.c    |    2 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c         |    6 -
+ drivers/net/wireless/marvell/mwifiex/11n.c         |   17 +-
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.c    |   18 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   83 +-
+ drivers/net/wireless/marvell/mwifiex/cfp.c         |    2 +-
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c      |   18 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c     |    3 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h          |   10 +
+ drivers/net/wireless/marvell/mwifiex/init.c        |   17 +-
+ drivers/net/wireless/marvell/mwifiex/main.c        |    4 +
+ drivers/net/wireless/marvell/mwifiex/main.h        |   23 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c        |  207 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c        |    4 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c        |   28 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c     |   18 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c |   24 +
+ drivers/net/wireless/marvell/mwifiex/sta_tx.c      |   12 +-
+ drivers/net/wireless/marvell/mwifiex/tdls.c        |   60 +-
+ drivers/net/wireless/marvell/mwifiex/txrx.c        |   15 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c   |   11 +
+ drivers/net/wireless/marvell/mwifiex/uap_txrx.c    |    5 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c         |  585 ++-
+ drivers/net/wireless/marvell/mwifiex/usb.h         |   23 +
+ drivers/net/wireless/marvell/mwifiex/wmm.c         |   16 +-
+ drivers/net/wireless/mediatek/mt7601u/dma.c        |    4 +-
+ drivers/net/wireless/mediatek/mt7601u/mcu.c        |    2 +-
+ drivers/net/wireless/mediatek/mt7601u/tx.c         |    2 +-
+ drivers/net/wireless/quantenna/Kconfig             |   16 +
+ drivers/net/wireless/quantenna/Makefile            |    6 +
+ drivers/net/wireless/quantenna/qtnfmac/Kconfig     |   19 +
+ drivers/net/wireless/quantenna/qtnfmac/Makefile    |   31 +
+ drivers/net/wireless/quantenna/qtnfmac/bus.h       |  139 +
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |  995 ++++++
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.h  |   43 +
+ drivers/net/wireless/quantenna/qtnfmac/commands.c  | 1978 +++++++++++
+ drivers/net/wireless/quantenna/qtnfmac/commands.h  |   74 +
+ drivers/net/wireless/quantenna/qtnfmac/core.c      |  618 ++++
+ drivers/net/wireless/quantenna/qtnfmac/core.h      |  173 +
+ drivers/net/wireless/quantenna/qtnfmac/debug.c     |   46 +
+ drivers/net/wireless/quantenna/qtnfmac/debug.h     |   50 +
+ drivers/net/wireless/quantenna/qtnfmac/event.c     |  452 +++
+ drivers/net/wireless/quantenna/qtnfmac/event.h     |   27 +
+ .../net/wireless/quantenna/qtnfmac/pearl/pcie.c    | 1378 ++++++++
+ .../quantenna/qtnfmac/pearl/pcie_bus_priv.h        |   89 +
+ .../wireless/quantenna/qtnfmac/pearl/pcie_ipc.h    |  158 +
+ .../quantenna/qtnfmac/pearl/pcie_regs_pearl.h      |  353 ++
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h     |  901 +++++
+ .../net/wireless/quantenna/qtnfmac/qlink_util.c    |   71 +
+ .../net/wireless/quantenna/qtnfmac/qlink_util.h    |   74 +
+ .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h    |   32 +
+ drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c   |  176 +
+ drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h   |   80 +
+ .../net/wireless/quantenna/qtnfmac/shm_ipc_defs.h  |   46 +
+ drivers/net/wireless/quantenna/qtnfmac/trans.c     |  224 ++
+ drivers/net/wireless/quantenna/qtnfmac/trans.h     |   57 +
+ drivers/net/wireless/quantenna/qtnfmac/util.c      |  114 +
+ drivers/net/wireless/quantenna/qtnfmac/util.h      |   45 +
+ drivers/net/wireless/ralink/rt2x00/rt2400pci.c     |  181 +-
+ drivers/net/wireless/ralink/rt2x00/rt2500pci.c     |  195 +-
+ drivers/net/wireless/ralink/rt2x00/rt2500usb.c     |  173 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c     |  911 ++---
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.h     |   22 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800mmio.c    |   44 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800pci.c     |    6 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c     |   20 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h        |   12 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c   |    9 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.h   |    4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c    |    2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h    |    7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.h   |   12 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.c     |    2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.h     |   16 +-
+ drivers/net/wireless/ralink/rt2x00/rt61pci.c       |  285 +-
+ drivers/net/wireless/ralink/rt2x00/rt73usb.c       |  189 +-
+ drivers/net/wireless/ray_cs.c                      |    7 +-
+ drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c |    6 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  |    2 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c        |  186 +-
+ drivers/net/wireless/realtek/rtlwifi/base.h        |   14 +
+ .../realtek/rtlwifi/btcoexist/halbt_precomp.h      |   22 +
+ .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c    |   70 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h    |   34 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c    | 2087 ++++++++---
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h    |   80 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    |   80 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h    |    5 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c    |  275 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h    |   42 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c    |  515 +--
+ .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h    |   36 +-
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c       |  871 +++--
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h       |   73 +-
+ .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c   |   85 +-
+ .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h   |    7 +
+ drivers/net/wireless/realtek/rtlwifi/core.c        |    5 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.c       |    2 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.h       |    7 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c         |    4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c    |    3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c    |    2 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c  |    3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c    |    3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c    |   72 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h    |    4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c    |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c   |    3 +
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h   |   14 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c    |    9 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c    |    3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c    |    4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c    |   73 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h    |    4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |    5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c   |    3 +
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h   |   16 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c    |   78 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h    |    4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/reg.h   |    2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c   |    3 +
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h   |   17 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c         |    2 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h        |   18 +
+ drivers/net/wireless/rsi/Makefile                  |    2 +-
+ drivers/net/wireless/rsi/rsi_91x_core.c            |    2 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c             |  742 ++++
+ drivers/net/wireless/rsi/rsi_91x_main.c            |    9 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c            |  132 +-
+ drivers/net/wireless/rsi/rsi_91x_pkt.c             |  215 --
+ drivers/net/wireless/rsi/rsi_91x_sdio.c            |  228 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c        |  190 +-
+ drivers/net/wireless/rsi/rsi_91x_usb.c             |  167 +-
+ drivers/net/wireless/rsi/rsi_91x_usb_ops.c         |  125 -
+ drivers/net/wireless/rsi/rsi_boot_params.h         |   15 +-
+ drivers/net/wireless/rsi/rsi_common.h              |    3 +-
+ drivers/net/wireless/rsi/rsi_hal.h                 |   84 +
+ drivers/net/wireless/rsi/rsi_main.h                |   64 +-
+ drivers/net/wireless/rsi/rsi_mgmt.h                |   76 +
+ drivers/net/wireless/rsi/rsi_sdio.h                |    6 +-
+ drivers/net/wireless/rsi/rsi_usb.h                 |    5 +-
+ drivers/net/wireless/st/cw1200/scan.c              |    2 +-
+ drivers/net/wireless/st/cw1200/txrx.c              |    2 +-
+ drivers/net/wireless/ti/wl1251/main.c              |    2 +-
+ drivers/net/wireless/ti/wl1251/tx.c                |    3 +-
+ drivers/net/wireless/ti/wlcore/cmd.c               |    9 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c           |   13 +-
+ drivers/net/wireless/ti/wlcore/main.c              |    5 +-
+ drivers/net/wireless/ti/wlcore/rx.c                |    5 +-
+ drivers/net/wireless/ti/wlcore/sdio.c              |    1 +
+ drivers/net/wireless/ti/wlcore/spi.c               |   14 +-
+ drivers/net/wireless/ti/wlcore/tx.c                |    3 +-
+ drivers/net/wireless/zydas/zd1201.c                |   26 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_mac.c       |    5 +-
+ drivers/nfc/fdp/fdp.c                              |    3 +-
+ drivers/nfc/fdp/i2c.c                              |    8 +-
+ drivers/nfc/microread/i2c.c                        |    6 +-
+ drivers/nfc/microread/microread.c                  |    8 +-
+ drivers/nfc/nfcmrvl/fw_dnld.c                      |   13 +-
+ drivers/nfc/nfcmrvl/i2c.c                          |    2 +-
+ drivers/nfc/nfcmrvl/main.c                         |    2 +-
+ drivers/nfc/nfcmrvl/usb.c                          |    4 +-
+ drivers/nfc/nxp-nci/firmware.c                     |    6 +-
+ drivers/nfc/nxp-nci/i2c.c                          |    5 +-
+ drivers/nfc/pn533/pn533.c                          |   73 +-
+ drivers/nfc/pn533/usb.c                            |    4 +-
+ drivers/nfc/pn544/i2c.c                            |    8 +-
+ drivers/nfc/pn544/pn544.c                          |    8 +-
+ drivers/nfc/port100.c                              |   18 +-
+ drivers/nfc/s3fwrn5/firmware.c                     |    4 +-
+ drivers/nfc/s3fwrn5/i2c.c                          |    2 +-
+ drivers/nfc/st-nci/ndlc.c                          |    2 +-
+ drivers/nfc/st21nfca/core.c                        |    6 +-
+ drivers/nfc/st21nfca/dep.c                         |   32 +-
+ drivers/nfc/st21nfca/i2c.c                         |   12 +-
+ drivers/nfc/st95hf/core.c                          |    2 +-
+ drivers/of/of_mdio.c                               |   23 -
+ drivers/ptp/Kconfig                                |   16 +
+ drivers/ptp/Makefile                               |    1 +
+ drivers/ptp/ptp_dte.c                              |  353 ++
+ drivers/rpmsg/rpmsg_char.c                         |    2 +-
+ drivers/s390/net/ctcm_fsms.c                       |    7 +-
+ drivers/s390/net/ctcm_main.c                       |   10 +-
+ drivers/s390/net/ctcm_mpc.c                        |   46 +-
+ drivers/s390/net/lcs.c                             |    2 +-
+ drivers/s390/net/netiucv.c                         |   10 +-
+ drivers/s390/net/qeth_core.h                       |    3 +
+ drivers/s390/net/qeth_core_main.c                  |  203 +-
+ drivers/s390/net/qeth_core_mpc.c                   |   16 +
+ drivers/s390/net/qeth_core_mpc.h                   |   20 +-
+ drivers/s390/net/qeth_core_sys.c                   |    2 +-
+ drivers/s390/net/qeth_l2_main.c                    |   61 +-
+ drivers/s390/net/qeth_l3.h                         |    1 +
+ drivers/s390/net/qeth_l3_main.c                    |   65 +-
+ drivers/s390/net/qeth_l3_sys.c                     |   11 +
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |    2 +-
+ drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |    2 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |   10 +-
+ drivers/scsi/fcoe/fcoe.c                           |    2 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c                      |    5 +-
+ drivers/scsi/fnic/fnic_fcs.c                       |    9 +-
+ drivers/scsi/libfc/fc_libfc.c                      |    2 +-
+ drivers/scsi/qedf/qedf_fip.c                       |    3 +-
+ drivers/scsi/qedf/qedf_main.c                      |    6 +-
+ drivers/scsi/qedi/qedi_fw.c                        |   20 +-
+ drivers/scsi/qedi/qedi_fw_api.c                    |    3 +-
+ drivers/scsi/qedi/qedi_iscsi.c                     |    3 -
+ drivers/scsi/qedi/qedi_main.c                      |    2 +-
+ drivers/ssb/main.c                                 |    1 -
+ drivers/staging/gdm724x/gdm_lte.c                  |   25 +-
+ drivers/staging/ks7010/ks_hostif.c                 |   11 +-
+ drivers/staging/most/aim-network/networking.c      |    8 +-
+ drivers/staging/netlogic/xlr_net.c                 |    5 +-
+ drivers/staging/octeon/ethernet-rx.c               |   10 +-
+ drivers/staging/octeon/ethernet-tx.c               |    3 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c          |    4 +-
+ drivers/staging/rtl8188eu/os_dep/mon.c             |    2 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c          |   10 +-
+ drivers/staging/rtl8192e/rtllib_rx.c               |   12 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c          |   48 +-
+ drivers/staging/rtl8192e/rtllib_tx.c               |   12 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    9 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   33 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    7 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |    8 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c           |    4 +-
+ drivers/staging/rtl8712/rtl8712_recv.c             |    5 +-
+ drivers/staging/rtl8723bs/os_dep/recv_linux.c      |    4 +-
+ drivers/staging/wilc1000/linux_mon.c               |   12 +-
+ drivers/staging/wilc1000/linux_wlan.c              |    2 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c              |    6 +-
+ drivers/staging/wlan-ng/p80211conv.c               |   14 +-
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c            |   18 +-
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c           |    2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c        |    5 +-
+ drivers/tty/ipwireless/network.c                   |    2 +-
+ drivers/tty/n_gsm.c                                |    2 +-
+ drivers/tty/synclink.c                             |    2 +-
+ drivers/tty/synclink_gt.c                          |    2 +-
+ drivers/tty/synclinkmp.c                           |    2 +-
+ drivers/usb/gadget/function/f_ncm.c                |   30 +-
+ drivers/usb/gadget/function/f_phonet.c             |    2 +-
+ drivers/usb/gadget/function/rndis.c                |    2 +-
+ drivers/vhost/net.c                                |  128 +-
+ fs/afs/rxrpc.c                                     |   18 +-
+ include/linux/avf/virtchnl.h                       |  701 ++++
+ include/linux/bpf.h                                |   17 +-
+ include/linux/bpf_verifier.h                       |    2 +
+ include/linux/filter.h                             |    6 +-
+ include/linux/ieee80211.h                          |    4 +
+ include/linux/if_bridge.h                          |   14 +
+ include/linux/if_tap.h                             |    5 +
+ include/linux/if_team.h                            |    2 +
+ include/linux/if_tun.h                             |    5 +
+ include/linux/if_vlan.h                            |    2 +-
+ include/linux/inetdevice.h                         |    7 +
+ include/linux/mISDNif.h                            |    2 +-
+ include/linux/micrel_phy.h                         |    2 +
+ include/linux/mii.h                                |    2 +-
+ include/linux/mlx5/device.h                        |   12 +
+ include/linux/mlx5/driver.h                        |   36 +-
+ include/linux/mlx5/mlx5_ifc.h                      |  199 +-
+ include/linux/mlx5/mlx5_ifc_fpga.h                 |  432 +++
+ include/linux/mlx5/port.h                          |   13 +
+ include/linux/mlx5/qp.h                            |   16 +-
+ include/linux/netdevice.h                          |   36 +-
+ include/linux/netlink.h                            |   15 +
+ include/linux/of_mdio.h                            |   24 +-
+ include/linux/perf_event.h                         |    7 +-
+ include/linux/phy.h                                |   53 +-
+ include/linux/platform_data/microchip-ksz.h        |   29 +
+ include/linux/ptr_ring.h                           |  120 +
+ include/linux/qed/common_hsi.h                     |  209 +-
+ include/linux/qed/eth_common.h                     |    3 +-
+ include/linux/qed/fcoe_common.h                    |    1 -
+ include/linux/qed/iscsi_common.h                   |   91 +-
+ include/linux/qed/qed_chain.h                      |    7 +
+ include/linux/qed/qed_eth_if.h                     |    6 +-
+ include/linux/qed/qed_fcoe_if.h                    |    5 +
+ include/linux/qed/qed_if.h                         |   72 +-
+ include/linux/qed/qed_iscsi_if.h                   |    7 +
+ include/linux/qed/qed_ll2_if.h                     |  128 +
+ include/linux/qed/{qed_roce_if.h => qed_rdma_if.h} |   84 +-
+ include/linux/qed/{qede_roce.h => qede_rdma.h}     |   42 +-
+ include/linux/qed/rdma_common.h                    |    2 +-
+ include/linux/qed/roce_common.h                    |    2 +
+ include/linux/qed/tcp_common.h                     |    5 +-
+ include/linux/rtnetlink.h                          |    3 +-
+ include/linux/rxrpc.h                              |   25 +-
+ include/linux/skb_array.h                          |   31 +
+ include/linux/skbuff.h                             |  244 +-
+ include/linux/socket.h                             |    1 +
+ include/linux/stmmac.h                             |    2 +
+ include/linux/tcp.h                                |   24 +-
+ include/linux/udp.h                                |    3 +
+ include/net/act_api.h                              |   13 +-
+ include/net/addrconf.h                             |   10 +-
+ include/net/af_rxrpc.h                             |    2 +
+ include/net/bluetooth/hci.h                        |    8 +
+ include/net/bond_options.h                         |    2 +
+ include/net/cfg80211.h                             |   42 +
+ include/net/dsa.h                                  |   79 +-
+ include/net/dst.h                                  |   45 +-
+ include/net/dst_metadata.h                         |   41 +-
+ include/net/flow_dissector.h                       |   20 +
+ include/net/genetlink.h                            |    1 -
+ include/net/inet_connection_sock.h                 |    4 +
+ include/net/inet_frag.h                            |    2 +-
+ include/net/ip6_fib.h                              |    5 +-
+ include/net/ip6_route.h                            |    3 +-
+ include/net/ip_fib.h                               |    7 +-
+ include/net/lwtunnel.h                             |   22 +-
+ include/net/mac80211.h                             |   37 +-
+ include/net/neighbour.h                            |    1 +
+ include/net/netns/ipv4.h                           |    3 +
+ include/net/pkt_cls.h                              |   44 +-
+ include/net/pkt_sched.h                            |    3 -
+ include/net/request_sock.h                         |    2 +-
+ include/net/route.h                                |   16 +-
+ include/net/rtnetlink.h                            |   15 +-
+ include/net/sch_generic.h                          |   26 +-
+ include/net/sctp/structs.h                         |   11 +-
+ include/net/secure_seq.h                           |    5 +-
+ include/net/sock.h                                 |   40 +-
+ include/net/switchdev.h                            |    9 +-
+ include/net/tc_act/tc_gact.h                       |   15 +-
+ include/net/tcp.h                                  |  124 +-
+ include/net/tls.h                                  |  237 ++
+ include/net/udp.h                                  |   70 +-
+ include/net/udplite.h                              |    2 +-
+ include/net/vxlan.h                                |    3 +-
+ include/net/xfrm.h                                 |   12 +-
+ include/rxrpc/packet.h                             |    2 +
+ include/soc/fsl/qe/qe.h                            |    9 +
+ include/trace/events/rxrpc.h                       |    1 +
+ include/uapi/asm-generic/socket.h                  |    4 +
+ include/uapi/linux/bpf.h                           |   60 +-
+ include/uapi/linux/if_link.h                       |   20 +-
+ include/uapi/linux/mroute.h                        |   54 +
+ include/uapi/linux/mroute6.h                       |   12 +
+ include/uapi/linux/neighbour.h                     |    1 +
+ include/uapi/linux/net_tstamp.h                    |   15 +-
+ include/uapi/linux/nl80211.h                       |   73 +-
+ include/uapi/linux/pkt_cls.h                       |   17 +
+ include/uapi/linux/rtnetlink.h                     |    9 +
+ include/uapi/linux/snmp.h                          |    1 +
+ include/uapi/linux/tc_act/tc_bpf.h                 |    1 +
+ include/uapi/linux/tc_act/tc_tunnel_key.h          |    1 +
+ include/uapi/linux/tcp.h                           |   10 +-
+ include/uapi/linux/tls.h                           |   79 +
+ include/uapi/linux/wil6210_uapi.h                  |   87 -
+ kernel/bpf/arraymap.c                              |   55 +-
+ kernel/bpf/core.c                                  |   49 +-
+ kernel/bpf/hashtab.c                               |   21 +
+ kernel/bpf/map_in_map.c                            |    5 +
+ kernel/bpf/map_in_map.h                            |    1 +
+ kernel/bpf/syscall.c                               |  453 ++-
+ kernel/bpf/verifier.c                              |  105 +-
+ kernel/events/core.c                               |   47 +-
+ kernel/trace/bpf_trace.c                           |   56 +-
+ lib/nlattr.c                                       |   11 +-
+ lib/test_bpf.c                                     |   59 +-
+ net/802/fc.c                                       |    4 +-
+ net/802/fddi.c                                     |    2 +-
+ net/802/garp.c                                     |    8 +-
+ net/802/hippi.c                                    |    2 +-
+ net/802/mrp.c                                      |   11 +-
+ net/8021q/vlan_dev.c                               |    8 +-
+ net/8021q/vlan_netlink.c                           |   13 +-
+ net/Kconfig                                        |    1 +
+ net/Makefile                                       |    1 +
+ net/appletalk/ddp.c                                |    4 +-
+ net/atm/clip.c                                     |    2 +-
+ net/atm/signaling.c                                |    3 +-
+ net/ax25/af_ax25.c                                 |    2 +-
+ net/batman-adv/bat_iv_ogm.c                        |    9 +-
+ net/batman-adv/bat_v.c                             |    2 +-
+ net/batman-adv/bat_v_elp.c                         |   13 +-
+ net/batman-adv/bat_v_ogm.c                         |    6 +-
+ net/batman-adv/bridge_loop_avoidance.c             |   73 +-
+ net/batman-adv/distributed-arp-table.c             |    2 +-
+ net/batman-adv/fragmentation.c                     |    3 +-
+ net/batman-adv/icmp_socket.c                       |    2 +-
+ net/batman-adv/main.h                              |    4 +-
+ net/batman-adv/network-coding.c                    |    4 +-
+ net/batman-adv/routing.c                           |    4 +-
+ net/batman-adv/send.c                              |    6 +-
+ net/batman-adv/tp_meter.c                          |    9 +-
+ net/batman-adv/translation-table.c                 |   21 +-
+ net/bluetooth/a2mp.c                               |    4 +-
+ net/bluetooth/af_bluetooth.c                       |    2 +-
+ net/bluetooth/bnep/core.c                          |   15 +-
+ net/bluetooth/bnep/netdev.c                        |   12 +-
+ net/bluetooth/cmtp/core.c                          |    2 +-
+ net/bluetooth/ecdh_helper.c                        |   11 +-
+ net/bluetooth/hci_core.c                           |   65 +-
+ net/bluetooth/hci_request.c                        |    4 +-
+ net/bluetooth/hci_sock.c                           |   32 +-
+ net/bluetooth/hidp/core.c                          |    4 +-
+ net/bluetooth/l2cap_core.c                         |   18 +-
+ net/bluetooth/mgmt_util.c                          |   16 +-
+ net/bluetooth/rfcomm/core.c                        |    6 +-
+ net/bluetooth/rfcomm/tty.c                         |    2 +-
+ net/bluetooth/smp.c                                |   39 +-
+ net/bridge/br.c                                    |   19 +-
+ net/bridge/br_fdb.c                                |   26 +-
+ net/bridge/br_if.c                                 |    2 +-
+ net/bridge/br_mdb.c                                |    4 +-
+ net/bridge/br_multicast.c                          |    8 +
+ net/bridge/br_netlink.c                            |  104 +-
+ net/bridge/br_private.h                            |   37 +-
+ net/bridge/br_stp_bpdu.c                           |    2 +-
+ net/bridge/br_stp_if.c                             |   11 -
+ net/bridge/br_switchdev.c                          |   76 +
+ net/bridge/br_sysfs_br.c                           |    2 +-
+ net/bridge/br_vlan.c                               |    8 +
+ net/bridge/netfilter/nft_reject_bridge.c           |   21 +-
+ net/caif/caif_socket.c                             |    2 +-
+ net/caif/chnl_net.c                                |    6 +-
+ net/can/bcm.c                                      |    6 +-
+ net/core/datagram.c                                |   96 +-
+ net/core/dev.c                                     |  125 +-
+ net/core/dev_ioctl.c                               |    1 +
+ net/core/dst.c                                     |  291 +-
+ net/core/filter.c                                  |  175 +-
+ net/core/flow_dissector.c                          |   69 +
+ net/core/lwt_bpf.c                                 |    5 +-
+ net/core/lwtunnel.c                                |   38 +-
+ net/core/neighbour.c                               |   60 +-
+ net/core/net-procfs.c                              |   13 +-
+ net/core/net-sysfs.c                               |   14 +-
+ net/core/net_namespace.c                           |   43 +-
+ net/core/netpoll.c                                 |    4 +-
+ net/core/pktgen.c                                  |   42 +-
+ net/core/rtnetlink.c                               |  130 +-
+ net/core/secure_seq.c                              |    9 +-
+ net/core/skbuff.c                                  |  162 +-
+ net/core/sock.c                                    |   57 +
+ net/dcb/dcbnl.c                                    |   11 +-
+ net/dccp/ccids/ccid2.c                             |    8 +-
+ net/dccp/ccids/ccid2.h                             |    2 +-
+ net/dccp/ipv4.c                                    |   17 +-
+ net/dccp/ipv6.c                                    |   20 +-
+ net/dccp/options.c                                 |    2 +-
+ net/decnet/af_decnet.c                             |    2 +-
+ net/decnet/dn_dev.c                                |    6 +-
+ net/decnet/dn_nsp_out.c                            |   28 +-
+ net/decnet/dn_route.c                              |   32 +-
+ net/dsa/Kconfig                                    |    9 +-
+ net/dsa/Makefile                                   |    9 +-
+ net/dsa/dsa.c                                      |   46 +-
+ net/dsa/dsa2.c                                     |  182 +-
+ net/dsa/dsa_priv.h                                 |  117 +-
+ net/dsa/legacy.c                                   |   46 +-
+ net/dsa/port.c                                     |  259 ++
+ net/dsa/slave.c                                    |  448 +--
+ net/dsa/switch.c                                   |  194 +-
+ net/dsa/tag_brcm.c                                 |   24 +-
+ net/dsa/tag_dsa.c                                  |   23 +-
+ net/dsa/tag_edsa.c                                 |   23 +-
+ net/dsa/tag_ksz.c                                  |   99 +
+ net/dsa/tag_lan9303.c                              |    7 +-
+ net/dsa/tag_mtk.c                                  |   17 +-
+ net/dsa/tag_qca.c                                  |   22 +-
+ net/dsa/tag_trailer.c                              |   23 +-
+ net/ethernet/eth.c                                 |    2 +-
+ net/hsr/hsr_device.c                               |    6 +-
+ net/hsr/hsr_netlink.c                              |    3 +-
+ net/ieee802154/6lowpan/core.c                      |    6 +-
+ net/ieee802154/6lowpan/tx.c                        |    7 +-
+ net/ieee802154/socket.c                            |   10 +-
+ net/ipv4/Makefile                                  |    2 +-
+ net/ipv4/ah4.c                                     |   13 +-
+ net/ipv4/arp.c                                     |    6 +-
+ net/ipv4/devinet.c                                 |   33 +
+ net/ipv4/esp4.c                                    |   22 +-
+ net/ipv4/fib_frontend.c                            |   31 +-
+ net/ipv4/fib_lookup.h                              |    6 +-
+ net/ipv4/fib_semantics.c                           |  162 +-
+ net/ipv4/fib_trie.c                                |   39 +-
+ net/ipv4/fou.c                                     |   82 +-
+ net/ipv4/icmp.c                                    |    2 +-
+ net/ipv4/igmp.c                                    |    6 +-
+ net/ipv4/inet_connection_sock.c                    |    2 +-
+ net/ipv4/ip_gre.c                                  |   18 +-
+ net/ipv4/ip_tunnel_core.c                          |   17 +-
+ net/ipv4/ip_vti.c                                  |    9 +-
+ net/ipv4/ipconfig.c                                |    3 +-
+ net/ipv4/ipip.c                                    |    9 +-
+ net/ipv4/ipmr.c                                    |  266 +-
+ net/ipv4/netfilter/ipt_SYNPROXY.c                  |   10 +-
+ net/ipv4/netfilter/nf_reject_ipv4.c                |    7 +-
+ net/ipv4/proc.c                                    |    1 +
+ net/ipv4/route.c                                   |  213 +-
+ net/ipv4/syncookies.c                              |   25 +-
+ net/ipv4/sysctl_net_ipv4.c                         |   67 +-
+ net/ipv4/tcp.c                                     |   87 +-
+ net/ipv4/tcp_bbr.c                                 |   43 +-
+ net/ipv4/tcp_bic.c                                 |    6 +-
+ net/ipv4/tcp_cubic.c                               |   14 +-
+ net/ipv4/tcp_htcp.c                                |    2 +-
+ net/ipv4/tcp_input.c                               |  207 +-
+ net/ipv4/tcp_ipv4.c                                |  108 +-
+ net/ipv4/tcp_lp.c                                  |   17 +-
+ net/ipv4/tcp_metrics.c                             |    2 +-
+ net/ipv4/tcp_minisocks.c                           |   12 +-
+ net/ipv4/tcp_nv.c                                  |    5 +-
+ net/ipv4/tcp_output.c                              |  150 +-
+ net/ipv4/tcp_rate.c                                |   17 +-
+ net/ipv4/tcp_recovery.c                            |   24 +-
+ net/ipv4/tcp_timer.c                               |   45 +-
+ net/ipv4/tcp_ulp.c                                 |  135 +
+ net/ipv4/tcp_westwood.c                            |    6 +-
+ net/ipv4/udp.c                                     |  239 +-
+ net/ipv4/xfrm4_mode_beet.c                         |    3 +-
+ net/ipv6/addrconf.c                                |   25 +-
+ net/ipv6/addrconf_core.c                           |   19 +
+ net/ipv6/ah6.c                                     |   13 +-
+ net/ipv6/esp6.c                                    |   27 +-
+ net/ipv6/exthdrs.c                                 |    6 +-
+ net/ipv6/fou6.c                                    |   14 +-
+ net/ipv6/ila/ila_lwt.c                             |    7 +-
+ net/ipv6/ip6_fib.c                                 |   50 +-
+ net/ipv6/ip6_gre.c                                 |   16 +-
+ net/ipv6/ip6_output.c                              |   15 +-
+ net/ipv6/ip6_tunnel.c                              |    9 +-
+ net/ipv6/ip6_vti.c                                 |    9 +-
+ net/ipv6/ip6mr.c                                   |   77 +-
+ net/ipv6/mcast.c                                   |   11 +-
+ net/ipv6/ndisc.c                                   |    8 +-
+ net/ipv6/netfilter/ip6t_SYNPROXY.c                 |   10 +-
+ net/ipv6/netfilter/nf_reject_ipv6.c                |    5 +-
+ net/ipv6/route.c                                   |  264 +-
+ net/ipv6/seg6.c                                    |    4 -
+ net/ipv6/seg6_iptunnel.c                           |    5 +-
+ net/ipv6/sit.c                                     |    9 +-
+ net/ipv6/syncookies.c                              |    9 +-
+ net/ipv6/tcp_ipv6.c                                |   46 +-
+ net/ipv6/udp.c                                     |   29 +-
+ net/ipv6/xfrm6_mode_beet.c                         |    2 +-
+ net/irda/ircomm/ircomm_tty.c                       |    2 +-
+ net/irda/irlap_frame.c                             |   24 +-
+ net/irda/irnet/irnet_irda.c                        |    2 +-
+ net/iucv/af_iucv.c                                 |   13 +-
+ net/kcm/kcmsock.c                                  |    2 +-
+ net/key/af_key.c                                   |  136 +-
+ net/mac80211/agg-rx.c                              |   50 +-
+ net/mac80211/agg-tx.c                              |    6 +-
+ net/mac80211/cfg.c                                 |    5 +-
+ net/mac80211/debugfs_netdev.c                      |    5 +-
+ net/mac80211/debugfs_sta.c                         |    6 +
+ net/mac80211/ht.c                                  |   17 +-
+ net/mac80211/ibss.c                                |    3 +-
+ net/mac80211/ieee80211_i.h                         |   16 +-
+ net/mac80211/iface.c                               |   25 +-
+ net/mac80211/mesh.c                                |   98 +-
+ net/mac80211/mesh_hwmp.c                           |    6 +-
+ net/mac80211/mesh_plink.c                          |    6 +-
+ net/mac80211/mesh_ps.c                             |    4 +-
+ net/mac80211/mlme.c                                |   19 +-
+ net/mac80211/offchannel.c                          |    3 +-
+ net/mac80211/rate.c                                |    3 +-
+ net/mac80211/rx.c                                  |   11 +-
+ net/mac80211/spectmgmt.c                           |   10 +-
+ net/mac80211/sta_info.c                            |   32 +-
+ net/mac80211/sta_info.h                            |   14 +
+ net/mac80211/status.c                              |    6 +-
+ net/mac80211/tdls.c                                |   49 +-
+ net/mac80211/trace.h                               |   11 +-
+ net/mac80211/tx.c                                  |   49 +-
+ net/mac80211/util.c                                |   48 +-
+ net/mac80211/wpa.c                                 |    6 +-
+ net/mpls/af_mpls.c                                 |  266 +-
+ net/mpls/internal.h                                |    4 +-
+ net/mpls/mpls_iptunnel.c                           |   17 +-
+ net/ncsi/ncsi-cmd.c                                |   38 +-
+ net/netfilter/nf_synproxy_core.c                   |    2 +-
+ net/netfilter/nfnetlink_log.c                      |    2 +-
+ net/netfilter/nfnetlink_queue.c                    |    2 +-
+ net/netlink/af_netlink.c                           |    4 +-
+ net/nfc/af_nfc.c                                   |    2 +-
+ net/nfc/digital_core.c                             |    4 +-
+ net/nfc/digital_dep.c                              |   21 +-
+ net/nfc/digital_technology.c                       |   22 +-
+ net/nfc/hci/core.c                                 |   10 +-
+ net/nfc/hci/llc_shdlc.c                            |   12 +-
+ net/nfc/llcp_commands.c                            |   15 +-
+ net/nfc/llcp_core.c                                |    2 +-
+ net/nfc/nci/core.c                                 |    6 +-
+ net/nfc/nci/data.c                                 |    4 +-
+ net/nfc/nci/hci.c                                  |   13 +-
+ net/nfc/nci/spi.c                                  |   12 +-
+ net/nfc/nci/uart.c                                 |    4 +-
+ net/nfc/rawsock.c                                  |    2 +-
+ net/openvswitch/datapath.c                         |    4 +-
+ net/openvswitch/flow_netlink.c                     |    4 +-
+ net/openvswitch/vport-vxlan.c                      |    4 +-
+ net/packet/af_packet.c                             |   11 +-
+ net/psample/psample.c                              |    2 +-
+ net/qrtr/qrtr.c                                    |  109 +-
+ net/rds/connection.c                               |    6 +-
+ net/rds/rds.h                                      |    8 +-
+ net/rds/recv.c                                     |   18 +-
+ net/rds/send.c                                     |   21 +-
+ net/rds/tcp.h                                      |    1 +
+ net/rds/tcp_connect.c                              |    5 +-
+ net/rds/tcp_listen.c                               |   42 +-
+ net/rds/threads.c                                  |    5 +-
+ net/rfkill/rfkill-gpio.c                           |    5 +-
+ net/rxrpc/Makefile                                 |    1 +
+ net/rxrpc/af_rxrpc.c                               |  156 +-
+ net/rxrpc/ar-internal.h                            |   87 +-
+ net/rxrpc/call_accept.c                            |   20 +-
+ net/rxrpc/call_object.c                            |   49 +-
+ net/rxrpc/conn_client.c                            |  206 +-
+ net/rxrpc/conn_event.c                             |    4 +-
+ net/rxrpc/conn_object.c                            |   58 +-
+ net/rxrpc/conn_service.c                           |   23 +-
+ net/rxrpc/input.c                                  |   17 +
+ net/rxrpc/local_object.c                           |   49 +-
+ net/rxrpc/net_ns.c                                 |   84 +
+ net/rxrpc/output.c                                 |    4 +
+ net/rxrpc/peer_object.c                            |   33 +-
+ net/rxrpc/proc.c                                   |   42 +-
+ net/rxrpc/recvmsg.c                                |    7 +-
+ net/rxrpc/rxkad.c                                  |   21 +-
+ net/rxrpc/security.c                               |    5 +-
+ net/rxrpc/sendmsg.c                                |  138 +-
+ net/sched/Kconfig                                  |    1 +
+ net/sched/act_api.c                                |   55 +-
+ net/sched/act_bpf.c                                |    3 +
+ net/sched/act_csum.c                               |    1 +
+ net/sched/act_tunnel_key.c                         |   15 +-
+ net/sched/cls_api.c                                |  425 ++-
+ net/sched/cls_bpf.c                                |    5 +
+ net/sched/cls_flower.c                             |   62 +-
+ net/sched/cls_matchall.c                           |    9 +-
+ net/sched/cls_u32.c                                |   12 +-
+ net/sched/sch_api.c                                |   50 +-
+ net/sched/sch_atm.c                                |   30 +-
+ net/sched/sch_cbq.c                                |   22 +-
+ net/sched/sch_drr.c                                |   16 +-
+ net/sched/sch_dsmark.c                             |   18 +-
+ net/sched/sch_fq.c                                 |    8 +
+ net/sched/sch_fq_codel.c                           |   18 +-
+ net/sched/sch_hfsc.c                               |   22 +-
+ net/sched/sch_htb.c                                |   29 +-
+ net/sched/sch_ingress.c                            |   61 +-
+ net/sched/sch_mqprio.c                             |    5 +-
+ net/sched/sch_multiq.c                             |   17 +-
+ net/sched/sch_prio.c                               |   20 +-
+ net/sched/sch_qfq.c                                |   17 +-
+ net/sched/sch_sfb.c                                |   18 +-
+ net/sched/sch_sfq.c                                |   18 +-
+ net/sctp/associola.c                               |   47 +-
+ net/sctp/chunk.c                                   |    4 +-
+ net/sctp/offload.c                                 |    7 +
+ net/sctp/output.c                                  |    8 +-
+ net/sctp/outqueue.c                                |   10 +-
+ net/sctp/proc.c                                    |   10 +-
+ net/sctp/sm_make_chunk.c                           |   18 +-
+ net/sctp/sm_sideeffect.c                           |   28 +-
+ net/sctp/sm_statefuns.c                            |   12 +-
+ net/sctp/socket.c                                  |   20 +-
+ net/sctp/stream.c                                  |   93 +-
+ net/sctp/transport.c                               |   54 +-
+ net/sctp/ulpevent.c                                |   37 +-
+ net/sctp/ulpqueue.c                                |    8 +-
+ net/socket.c                                       |   49 +-
+ net/switchdev/switchdev.c                          |   30 +-
+ net/tls/Kconfig                                    |   15 +
+ net/tls/Makefile                                   |    7 +
+ net/tls/tls_main.c                                 |  489 +++
+ net/tls/tls_sw.c                                   |  772 ++++
+ net/vmw_vsock/virtio_transport_common.c            |    9 +-
+ net/wireless/core.c                                |    5 +
+ net/wireless/mesh.c                                |    8 +
+ net/wireless/nl80211.c                             |  135 +-
+ net/wireless/rdev-ops.h                            |   25 +
+ net/wireless/sme.c                                 |    1 +
+ net/wireless/trace.h                               |   60 +
+ net/wireless/util.c                                |   13 +-
+ net/x25/x25_subr.c                                 |   21 +-
+ net/xfrm/xfrm_device.c                             |    2 +-
+ net/xfrm/xfrm_policy.c                             |   62 +-
+ net/xfrm/xfrm_state.c                              |   35 +-
+ net/xfrm/xfrm_user.c                               |   37 +-
+ samples/bpf/Makefile                               |   15 +-
+ samples/bpf/bpf_helpers.h                          |   16 +-
+ samples/bpf/bpf_load.c                             |   19 +-
+ samples/bpf/sockex3_user.c                         |   15 +-
+ samples/bpf/syscall_nrs.c                          |   12 +
+ samples/bpf/test_map_in_map_user.c                 |   17 +
+ samples/bpf/trace_event_user.c                     |   73 +-
+ samples/bpf/tracex5_kern.c                         |   11 +-
+ samples/bpf/tracex6_kern.c                         |   28 +-
+ samples/bpf/tracex6_user.c                         |  180 +-
+ samples/pktgen/README.rst                          |    2 +
+ samples/pktgen/parameters.sh                       |   25 +-
+ .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh |    6 +-
+ .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh    |    6 +-
+ samples/pktgen/pktgen_sample01_simple.sh           |    2 +-
+ samples/pktgen/pktgen_sample02_multiqueue.sh       |    7 +-
+ .../pktgen/pktgen_sample03_burst_single_flow.sh    |    6 +-
+ samples/pktgen/pktgen_sample04_many_flows.sh       |    6 +-
+ samples/pktgen/pktgen_sample05_flow_per_thread.sh  |    6 +-
+ security/selinux/nlmsgtab.c                        |    3 +-
+ tools/hv/bondvf.sh                                 |   33 +-
+ tools/include/uapi/linux/bpf.h                     |   60 +-
+ tools/lib/bpf/bpf.c                                |   68 +
+ tools/lib/bpf/bpf.h                                |    5 +
+ tools/net/bpf_jit_disasm.c                         |   37 +-
+ tools/testing/selftests/bpf/Makefile               |    3 +-
+ tools/testing/selftests/bpf/test_align.c           |    7 +-
+ tools/testing/selftests/bpf/test_maps.c            |   50 +
+ tools/testing/selftests/bpf/test_obj_id.c          |   35 +
+ tools/testing/selftests/bpf/test_pkt_md_access.c   |   35 +
+ tools/testing/selftests/bpf/test_progs.c           |  225 +-
+ tools/testing/selftests/bpf/test_verifier.c        |  202 +-
+ tools/testing/selftests/tc-testing/.gitignore      |    1 +
+ tools/testing/selftests/tc-testing/README          |  102 +
+ tools/testing/selftests/tc-testing/TODO.txt        |   10 +
+ .../creating-testcases/AddingTestCases.txt         |   69 +
+ .../tc-testing/creating-testcases/template.json    |   40 +
+ .../tc-testing/tc-tests/actions/tests.json         | 1115 ++++++
+ .../tc-testing/tc-tests/filters/tests.json         |   21 +
+ tools/testing/selftests/tc-testing/tdc.py          |  413 +++
+ tools/testing/selftests/tc-testing/tdc_config.py   |   17 +
+ tools/testing/selftests/tc-testing/tdc_helper.py   |   75 +
+ 1662 files changed, 85000 insertions(+), 32366 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-net-phydev
+ create mode 100644 Documentation/devicetree/bindings/misc/allwinner,syscon.txt
+ create mode 100644 Documentation/devicetree/bindings/net/cortina.txt
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/ksz.txt
+ create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qca,qca7000.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/ptp/brcm,ptp-dte.txt
+ delete mode 100644 Documentation/networking/policy-routing.txt
+ create mode 100644 Documentation/networking/tls.txt
+ create mode 100644 drivers/net/dsa/microchip/Kconfig
+ create mode 100644 drivers/net/dsa/microchip/Makefile
+ create mode 100644 drivers/net/dsa/microchip/ksz_9477_reg.h
+ create mode 100644 drivers/net/dsa/microchip/ksz_common.c
+ create mode 100644 drivers/net/dsa/microchip/ksz_priv.h
+ create mode 100644 drivers/net/dsa/microchip/ksz_spi.c
+ create mode 100644 drivers/net/dsa/mv88e6xxx/chip.h
+ delete mode 100644 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
+ create mode 100644 drivers/net/dsa/mv88e6xxx/phy.c
+ create mode 100644 drivers/net/dsa/mv88e6xxx/phy.h
+ create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.c
+ create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.h
+ delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
+ delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+ rename drivers/net/ethernet/mellanox/mlx5/core/{ => ipoib}/ipoib.c (88%)
+ rename drivers/net/ethernet/mellanox/mlx5/core/{ => ipoib}/ipoib.h (89%)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Kconfig
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Makefile
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
+ rename drivers/net/ethernet/netronome/nfp/{nfp_bpf_jit.c => bpf/jit.c} (99%)
+ create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/main.c
+ rename drivers/net/ethernet/netronome/nfp/{nfp_bpf.h => bpf/main.h} (88%)
+ rename drivers/net/ethernet/netronome/nfp/{nfp_net_offload.c => bpf/offload.c} (85%)
+ rename drivers/net/ethernet/netronome/nfp/{nfp_bpf_verifier.c => bpf/verifier.c} (99%)
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/cmsg.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/main.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app_nic.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_devlink.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nic/main.c
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_rdma.c
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_rdma.h
+ rename drivers/net/ethernet/qlogic/qede/{qede_roce.c => qede_rdma.c} (59%)
+ rename drivers/net/ethernet/qualcomm/{qca_framing.c => qca_7k_common.c} (85%)
+ rename drivers/net/ethernet/qualcomm/{qca_framing.h => qca_7k_common.h} (86%)
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_uart.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+ create mode 100644 drivers/net/phy/cortina.c
+ create mode 100644 drivers/net/phy/marvell10g.c
+ create mode 100644 drivers/net/phy/phy-c45.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/sdio.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/sdio.h
+ delete mode 100644 drivers/net/wireless/ath/wil6210/ioctl.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-fw-api.h
+ create mode 100644 drivers/net/wireless/quantenna/Kconfig
+ create mode 100644 drivers/net/wireless/quantenna/Makefile
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Kconfig
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Makefile
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/bus.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_ipc.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_regs_pearl.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qtn_hw_ids.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc_defs.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.h
+ create mode 100644 drivers/net/wireless/rsi/rsi_91x_hal.c
+ delete mode 100644 drivers/net/wireless/rsi/rsi_91x_pkt.c
+ create mode 100644 drivers/net/wireless/rsi/rsi_hal.h
+ create mode 100644 drivers/ptp/ptp_dte.c
+ create mode 100644 include/linux/avf/virtchnl.h
+ create mode 100644 include/linux/mlx5/mlx5_ifc_fpga.h
+ create mode 100644 include/linux/platform_data/microchip-ksz.h
+ rename include/linux/qed/{qed_roce_if.h => qed_rdma_if.h} (91%)
+ rename include/linux/qed/{qede_roce.h => qede_rdma.h} (65%)
+ create mode 100644 include/net/tls.h
+ create mode 100644 include/uapi/linux/tls.h
+ delete mode 100644 include/uapi/linux/wil6210_uapi.h
+ create mode 100644 net/dsa/port.c
+ create mode 100644 net/dsa/tag_ksz.c
+ create mode 100644 net/ipv4/tcp_ulp.c
+ create mode 100644 net/rxrpc/net_ns.c
+ create mode 100644 net/tls/Kconfig
+ create mode 100644 net/tls/Makefile
+ create mode 100644 net/tls/tls_main.c
+ create mode 100644 net/tls/tls_sw.c
+ create mode 100644 samples/bpf/syscall_nrs.c
+ create mode 100644 tools/testing/selftests/bpf/test_obj_id.c
+ create mode 100644 tools/testing/selftests/bpf/test_pkt_md_access.c
+ create mode 100644 tools/testing/selftests/tc-testing/.gitignore
+ create mode 100644 tools/testing/selftests/tc-testing/README
+ create mode 100644 tools/testing/selftests/tc-testing/TODO.txt
+ create mode 100644 tools/testing/selftests/tc-testing/creating-testcases/AddingTestCases.txt
+ create mode 100644 tools/testing/selftests/tc-testing/creating-testcases/template.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/tests.json
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/tests.json
+ create mode 100755 tools/testing/selftests/tc-testing/tdc.py
+ create mode 100644 tools/testing/selftests/tc-testing/tdc_config.py
+ create mode 100644 tools/testing/selftests/tc-testing/tdc_helper.py
+$ git am -3 ../patches/0001-remove-duplicate-ethernet-noce-intruduced-by-merge.patch
+Applying: remove duplicate ethernet node intruduced by merge
+$ git reset HEAD^
+Unstaged changes after reset:
+M	arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+$ git add -A .
+$ git commit -v -a --amend
+[master b4fa2d8d19a3] Merge remote-tracking branch 'net-next/master'
+ Date: Fri Jun 30 10:57:09 2017 +1000
+Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/nft_set_rbtree.c
+Auto-merging net/netfilter/nfnetlink_queue.c
+Auto-merging net/netfilter/nfnetlink_log.c
+Auto-merging net/netfilter/nf_nat_core.c
+Auto-merging net/netfilter/nf_conntrack_netlink.c
+Auto-merging net/core/net_namespace.c
+Merge made by the 'recursive' strategy.
+ include/linux/netfilter/nfnetlink.h          |  10 +-
+ include/linux/netfilter_bridge/ebtables.h    |   2 -
+ include/net/net_namespace.h                  |   3 +
+ include/net/netfilter/nf_conntrack.h         |  10 +-
+ include/net/netfilter/nf_conntrack_l3proto.h |   4 +-
+ include/net/netfilter/nf_tables.h            |  29 +-
+ net/bridge/netfilter/ebt_dnat.c              |   2 +-
+ net/bridge/netfilter/ebt_mark.c              |   2 +-
+ net/bridge/netfilter/ebt_redirect.c          |   2 +-
+ net/bridge/netfilter/ebt_snat.c              |   2 +-
+ net/core/net_namespace.c                     |  17 +
+ net/ipv4/netfilter/ipt_CLUSTERIP.c           | 115 +++++--
+ net/ipv4/netfilter/nf_nat_masquerade_ipv4.c  |   4 +-
+ net/ipv6/netfilter/nf_nat_masquerade_ipv6.c  |  10 +-
+ net/netfilter/Makefile                       |   7 +-
+ net/netfilter/ipset/ip_set_core.c            |  39 ++-
+ net/netfilter/nf_conntrack_amanda.c          |  12 +-
+ net/netfilter/nf_conntrack_core.c            | 149 +++++++--
+ net/netfilter/nf_conntrack_h323_main.c       |  63 ++--
+ net/netfilter/nf_conntrack_helper.c          |  50 +--
+ net/netfilter/nf_conntrack_netlink.c         |  47 ++-
+ net/netfilter/nf_conntrack_proto.c           |  44 ++-
+ net/netfilter/nf_dup_netdev.c                |   1 +
+ net/netfilter/nf_nat_core.c                  |  37 +--
+ net/netfilter/nf_tables_api.c                | 137 +++++---
+ net/netfilter/nfnetlink.c                    |  21 +-
+ net/netfilter/nfnetlink_acct.c               |   9 +-
+ net/netfilter/nfnetlink_cthelper.c           |   9 +-
+ net/netfilter/nfnetlink_cttimeout.c          |  54 +--
+ net/netfilter/nfnetlink_log.c                |   6 +-
+ net/netfilter/nfnetlink_queue.c              |  12 +-
+ net/netfilter/nft_compat.c                   |   3 +-
+ net/netfilter/nft_rt.c                       |  16 +-
+ net/netfilter/nft_set_bitmap.c               |  13 +-
+ net/netfilter/nft_set_hash.c                 | 471 ++++++++++++++++++++-------
+ net/netfilter/nft_set_rbtree.c               |  21 +-
+ net/netfilter/xt_osf.c                       |   6 +-
+ 37 files changed, 945 insertions(+), 494 deletions(-)
+Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
+$ git merge nfc-next/master
+Removing include/linux/platform_data/st-nci.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/nfc/trf7970a.txt       |  10 +-
+ MAINTAINERS                                        |  11 +-
+ drivers/nfc/Kconfig                                |   2 +-
+ drivers/nfc/fdp/fdp.c                              |  15 +-
+ drivers/nfc/fdp/i2c.c                              |  38 +-
+ drivers/nfc/nfcmrvl/fw_dnld.c                      |   7 +-
+ drivers/nfc/nfcmrvl/main.c                         |  40 ++-
+ drivers/nfc/nfcmrvl/uart.c                         |  11 +-
+ drivers/nfc/nfcmrvl/usb.c                          |   4 +-
+ drivers/nfc/nfcsim.c                               |   6 +-
+ drivers/nfc/pn544/i2c.c                            |   3 +-
+ drivers/nfc/st-nci/i2c.c                           | 164 ++-------
+ drivers/nfc/st-nci/spi.c                           | 162 ++-------
+ drivers/nfc/st21nfca/i2c.c                         |  62 +---
+ drivers/nfc/trf7970a.c                             | 391 ++++++++++-----------
+ include/linux/platform_data/nfcmrvl.h              |   2 +-
+ include/linux/platform_data/st-nci.h               |  31 --
+ net/nfc/core.c                                     |  31 +-
+ net/nfc/digital_core.c                             |  12 +-
+ net/nfc/digital_dep.c                              |   2 +-
+ net/nfc/digital_technology.c                       |   3 +-
+ net/nfc/llcp_sock.c                                |   9 +-
+ net/nfc/nci/core.c                                 |  12 +-
+ net/nfc/netlink.c                                  |   4 +-
+ 24 files changed, 363 insertions(+), 669 deletions(-)
+ delete mode 100644 include/linux/platform_data/st-nci.h
+Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
+$ git merge ipvs-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (fdcbe65d618a Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
+$ git merge wireless-drivers-next/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |   3 +
+ drivers/net/wireless/ath/ath10k/mac.c              |   2 +-
+ drivers/net/wireless/ath/ath10k/pci.c              |   2 +-
+ drivers/net/wireless/ath/ath10k/sdio.c             |   4 +-
+ drivers/net/wireless/ath/ath10k/thermal.c          |   2 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c          |   2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   2 -
+ drivers/net/wireless/ath/ath9k/main.c              |   8 +-
+ drivers/net/wireless/ath/ath9k/mci.c               |   2 +-
+ drivers/net/wireless/ath/ath9k/rng.c               |  10 +-
+ drivers/net/wireless/ath/ath9k/tx99.c              |  13 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  18 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   4 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c    |  28 ++-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c |   1 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  13 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/main.c      |   4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-a000.c      |   2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h    |   1 +
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h       |   4 +
+ .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h |  11 +-
+ .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h  |  19 +-
+ .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h  |   9 -
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h        |  28 ++-
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h   |   1 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |   2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h      |  17 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c     |   5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |  19 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |  39 ++--
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c   |  22 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |  19 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-mac.h    |   1 +
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-scan.h   |   2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h |  89 +++++++--
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h    |  23 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c    |  10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |   3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |  63 ++++--
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |  30 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c       |  43 +++--
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |  39 ++--
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |   6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c      |   2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c       | 212 ++++++++++++++-------
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h       |   8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c        |  70 +++++--
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c     |  93 ++++++---
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c      |  12 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h |  18 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c       | 116 ++++++-----
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c   |  28 +--
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c    | 168 ++++++++++------
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c  |  14 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  43 +++--
+ drivers/net/wireless/marvell/libertas/mesh.c       |   5 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   6 +-
+ .../net/wireless/quantenna/qtnfmac/pearl/pcie.c    |   2 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c        | 102 ++++++++++
+ drivers/net/wireless/realtek/rtlwifi/base.h        |   2 +
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c       |  36 ++--
+ drivers/net/wireless/realtek/rtlwifi/core.c        |   3 +
+ drivers/net/wireless/realtek/rtlwifi/pci.c         |   4 +
+ drivers/net/wireless/realtek/rtlwifi/ps.c          |  14 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c    |  10 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |   3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c    |   8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |   7 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c   |   3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c    |   4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c    |  10 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c    |   4 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h        |  16 ++
+ drivers/net/wireless/rsi/rsi_91x_debugfs.c         |   2 +
+ drivers/net/wireless/st/cw1200/cw1200_sdio.c       |   2 +-
+ drivers/net/wireless/st/cw1200/cw1200_spi.c        |   2 +-
+ drivers/net/wireless/ti/wl18xx/main.c              |   6 +-
+ 77 files changed, 1125 insertions(+), 535 deletions(-)
+Merging bluetooth/master (feb16722b5d5 Bluetooth: btbcm: Add entry for BCM43430 UART bluetooth)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btbcm.c      |  1 +
+ drivers/bluetooth/hci_bcm.c    | 12 ++++++++++--
+ drivers/bluetooth/hci_serdev.c |  4 ++--
+ net/bluetooth/bnep/core.c      | 11 +++++------
+ net/bluetooth/cmtp/core.c      | 17 ++++++++++-------
+ net/bluetooth/hci_core.c       |  7 +++----
+ net/bluetooth/hidp/core.c      | 33 ++++++++++++++++++++++-----------
+ net/bluetooth/l2cap_sock.c     |  5 +++--
+ net/bluetooth/rfcomm/sock.c    |  3 ++-
+ net/bluetooth/sco.c            |  6 ++----
+ 10 files changed, 60 insertions(+), 39 deletions(-)
+Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
+$ git merge mac80211-next/master
+Already up-to-date.
+Merging rdma/for-next (bc5214ee2922 IB/hfi1: Handle missing magic values in config file)
+$ git merge rdma/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/verbs.c                 |   1 +
+ drivers/infiniband/hw/hfi1/Makefile             |   2 +-
+ drivers/infiniband/hw/hfi1/affinity.c           |  18 +-
+ drivers/infiniband/hw/hfi1/affinity.h           |  14 +-
+ drivers/infiniband/hw/hfi1/chip.c               | 310 ++++++++++++-----------
+ drivers/infiniband/hw/hfi1/chip.h               |   4 +-
+ drivers/infiniband/hw/hfi1/common.h             |   1 +
+ drivers/infiniband/hw/hfi1/driver.c             | 169 +++++++++----
+ drivers/infiniband/hw/hfi1/eprom.c              |  11 +-
+ drivers/infiniband/hw/hfi1/exp_rcv.c            | 114 +++++++++
+ drivers/infiniband/hw/hfi1/exp_rcv.h            | 187 ++++++++++++++
+ drivers/infiniband/hw/hfi1/file_ops.c           |  43 ++--
+ drivers/infiniband/hw/hfi1/hfi.h                | 103 ++++----
+ drivers/infiniband/hw/hfi1/init.c               |  62 ++++-
+ drivers/infiniband/hw/hfi1/mad.c                | 323 ++++++++++++++----------
+ drivers/infiniband/hw/hfi1/mad.h                |   2 +-
+ drivers/infiniband/hw/hfi1/mmu_rb.c             |  14 +-
+ drivers/infiniband/hw/hfi1/mmu_rb.h             |   5 +-
+ drivers/infiniband/hw/hfi1/pcie.c               |  80 ++----
+ drivers/infiniband/hw/hfi1/platform.c           |  30 +--
+ drivers/infiniband/hw/hfi1/qp.c                 |   6 -
+ drivers/infiniband/hw/hfi1/rc.c                 |  42 ++-
+ drivers/infiniband/hw/hfi1/ruc.c                |  91 ++++---
+ drivers/infiniband/hw/hfi1/sdma.c               |   6 +-
+ drivers/infiniband/hw/hfi1/trace.c              |  58 ++++-
+ drivers/infiniband/hw/hfi1/trace_ibhdrs.h       | 322 +++++++++++++++--------
+ drivers/infiniband/hw/hfi1/trace_misc.h         |  20 ++
+ drivers/infiniband/hw/hfi1/trace_rx.h           |  90 ++++---
+ drivers/infiniband/hw/hfi1/uc.c                 |  18 +-
+ drivers/infiniband/hw/hfi1/ud.c                 |  64 ++---
+ drivers/infiniband/hw/hfi1/user_exp_rcv.c       | 121 ---------
+ drivers/infiniband/hw/hfi1/user_exp_rcv.h       |  23 +-
+ drivers/infiniband/hw/hfi1/user_sdma.c          | 207 +++++++--------
+ drivers/infiniband/hw/hfi1/verbs.c              | 106 ++++----
+ drivers/infiniband/hw/hfi1/verbs.h              |  10 +-
+ drivers/infiniband/hw/hfi1/vnic_main.c          |  11 +-
+ drivers/infiniband/hw/qib/qib.h                 |   8 +-
+ drivers/infiniband/hw/qib/qib_iba6120.c         |   6 +-
+ drivers/infiniband/hw/qib/qib_iba7220.c         |   7 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c         |  48 ++--
+ drivers/infiniband/hw/qib/qib_mad.c             |  13 +-
+ drivers/infiniband/hw/qib/qib_pcie.c            | 149 +++++------
+ drivers/infiniband/hw/qib/qib_ruc.c             |  22 +-
+ drivers/infiniband/hw/qib/qib_ud.c              |  43 +---
+ drivers/infiniband/hw/qib/qib_verbs.h           |   4 +-
+ drivers/infiniband/sw/rdmavt/mr.c               |  51 +++-
+ drivers/infiniband/sw/rdmavt/qp.c               |  60 ++---
+ drivers/infiniband/sw/rdmavt/trace_mr.h         |  62 +++++
+ drivers/infiniband/sw/rdmavt/trace_tx.h         |  11 +-
+ drivers/infiniband/sw/rdmavt/vt.c               |   9 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c |  27 +-
+ include/rdma/ib_hdrs.h                          |  84 ++++++
+ include/rdma/ib_verbs.h                         |   5 +-
+ include/rdma/rdma_vt.h                          |   4 +-
+ include/rdma/rdmavt_qp.h                        |   2 +-
+ 55 files changed, 1945 insertions(+), 1358 deletions(-)
+ create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c
+ create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h
+Merging gfs2/for-next (722f6f62a563 GFS2: Eliminate vestigial sd_log_flush_wrapped)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/gfs2/log.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/dir.c    | 3 ++-
+ fs/gfs2/incore.h | 2 --
+ fs/gfs2/log.c    | 3 ---
+ fs/gfs2/lops.c   | 4 +---
+ fs/gfs2/main.c   | 1 -
+ 5 files changed, 3 insertions(+), 10 deletions(-)
+Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (c169e3d3c049 mtd: partitions: fixup some allocate_partition() whitespace)
+$ git merge l2-mtd/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/mtd/microchip,mchp23k256.txt          |  18 +
+ .../devicetree/bindings/mtd/partition.txt          |  32 +-
+ MAINTAINERS                                        |   3 +-
+ drivers/mtd/Kconfig                                |   4 +
+ drivers/mtd/Makefile                               |   1 +
+ drivers/mtd/bcm47xxpart.c                          |  99 +-----
+ drivers/mtd/chips/cfi_cmdset_0020.c                |   2 +-
+ drivers/mtd/devices/Kconfig                        |  10 +
+ drivers/mtd/devices/Makefile                       |   1 +
+ drivers/mtd/devices/mchp23k256.c                   | 236 +++++++++++++
+ drivers/mtd/devices/mtd_dataflash.c                | 200 ++++++-----
+ drivers/mtd/maps/physmap_of_gemini.c               |   2 +-
+ drivers/mtd/mtdpart.c                              | 370 +++++++++++++--------
+ drivers/mtd/parsers/Kconfig                        |   8 +
+ drivers/mtd/parsers/Makefile                       |   1 +
+ drivers/mtd/parsers/parser_trx.c                   | 126 +++++++
+ drivers/mtd/tests/subpagetest.c                    |   2 +-
+ include/linux/mtd/partitions.h                     |   7 +
+ 18 files changed, 785 insertions(+), 337 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt
+ create mode 100644 drivers/mtd/devices/mchp23k256.c
+ create mode 100644 drivers/mtd/parsers/Kconfig
+ create mode 100644 drivers/mtd/parsers/Makefile
+ create mode 100644 drivers/mtd/parsers/parser_trx.c
+Merging nand/nand/next (edfee3619c49 mtd: nand: mtk: add ->setup_data_interface() hook)
+$ git merge nand/nand/next
+Auto-merging include/linux/mtd/nand.h
+Auto-merging drivers/mtd/nand/tango_nand.c
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/denali-nand.txt        |   13 +
+ Documentation/devicetree/bindings/mtd/elm.txt      |    2 +-
+ .../devicetree/bindings/mtd/gpmc-nand.txt          |    2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nor.txt |    4 +-
+ .../devicetree/bindings/mtd/gpmc-onenand.txt       |    2 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt          |   14 +-
+ Documentation/devicetree/bindings/mtd/mtk-nand.txt |    5 +-
+ Documentation/devicetree/bindings/mtd/nand.txt     |    2 +-
+ Documentation/devicetree/bindings/net/gpmc-eth.txt |    4 +-
+ MAINTAINERS                                        |    6 +
+ drivers/mtd/nand/Kconfig                           |    3 +
+ drivers/mtd/nand/atmel/nand-controller.c           |  354 +++-
+ drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c       |    2 +
+ drivers/mtd/nand/cafe_nand.c                       |    2 +
+ drivers/mtd/nand/davinci_nand.c                    |    3 +
+ drivers/mtd/nand/denali.c                          | 1831 +++++++++-----------
+ drivers/mtd/nand/denali.h                          |  315 ++--
+ drivers/mtd/nand/denali_dt.c                       |   53 +-
+ drivers/mtd/nand/denali_pci.c                      |   26 +-
+ drivers/mtd/nand/docg4.c                           |    2 +
+ drivers/mtd/nand/fsl_elbc_nand.c                   |    2 +
+ drivers/mtd/nand/fsl_ifc_nand.c                    |   81 +-
+ drivers/mtd/nand/fsmc_nand.c                       |  122 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c              |    6 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |   75 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   13 +-
+ drivers/mtd/nand/hisi504_nand.c                    |    2 +
+ drivers/mtd/nand/jz4780_nand.c                     |    2 +-
+ drivers/mtd/nand/mpc5121_nfc.c                     |    2 +
+ drivers/mtd/nand/mtk_ecc.c                         |  226 +--
+ drivers/mtd/nand/mtk_ecc.h                         |    2 +-
+ drivers/mtd/nand/mtk_nand.c                        |  279 +--
+ drivers/mtd/nand/mxc_nand.c                        |   12 +-
+ drivers/mtd/nand/nand_base.c                       |  349 +++-
+ drivers/mtd/nand/nand_micron.c                     |  222 +++
+ drivers/mtd/nand/orion_nand.c                      |    6 +-
+ drivers/mtd/nand/pxa3xx_nand.c                     |    2 +
+ drivers/mtd/nand/qcom_nandc.c                      |    2 +
+ drivers/mtd/nand/s3c2410.c                         |    5 +-
+ drivers/mtd/nand/sh_flctl.c                        |    2 +
+ drivers/mtd/nand/sunxi_nand.c                      |    9 +-
+ drivers/mtd/nand/tango_nand.c                      |   22 +-
+ drivers/mtd/nand/vf610_nfc.c                       |    2 +
+ drivers/staging/mt29f_spinand/mt29f_spinand.c      |    2 +
+ include/linux/mtd/nand.h                           |   80 +-
+ 45 files changed, 2544 insertions(+), 1628 deletions(-)
+Merging spi-nor/spi-nor/next (1a18915b4971 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables)
+$ git merge spi-nor/spi-nor/next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/devices/m25p80.c            |  121 ++-
+ drivers/mtd/devices/serial_flash_cmds.h |    1 -
+ drivers/mtd/devices/st_spi_fsm.c        |    4 +-
+ drivers/mtd/spi-nor/Kconfig             |    2 +-
+ drivers/mtd/spi-nor/aspeed-smc.c        |  183 ++++-
+ drivers/mtd/spi-nor/atmel-quadspi.c     |   83 +-
+ drivers/mtd/spi-nor/cadence-quadspi.c   |   20 +-
+ drivers/mtd/spi-nor/fsl-quadspi.c       |    6 +-
+ drivers/mtd/spi-nor/hisi-sfc.c          |   31 +-
+ drivers/mtd/spi-nor/intel-spi.c         |    7 +-
+ drivers/mtd/spi-nor/mtk-quadspi.c       |   15 +-
+ drivers/mtd/spi-nor/nxp-spifi.c         |   22 +-
+ drivers/mtd/spi-nor/spi-nor.c           | 1251 ++++++++++++++++++++++++++++---
+ drivers/mtd/spi-nor/stm32-quadspi.c     |   32 +-
+ include/linux/mtd/spi-nor.h             |  167 ++++-
+ 15 files changed, 1699 insertions(+), 246 deletions(-)
+Merging crypto/master (bcf741cb7792 crypto: testmgr - Reenable sha1/aes in FIPS mode)
+$ git merge crypto/master
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+Auto-merging drivers/crypto/qat/qat_common/qat_algs.c
+Auto-merging drivers/crypto/chelsio/chcr_algo.c
+Auto-merging drivers/crypto/caam/caampkc.c
+Auto-merging drivers/crypto/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/crypto/api-samples.rst               |   38 +-
+ Documentation/crypto/userspace-if.rst              |    2 +-
+ .../bindings/crypto/inside-secure-safexcel.txt     |   29 +
+ .../devicetree/bindings/crypto/mediatek-crypto.txt |    8 +-
+ Documentation/devicetree/bindings/rng/mtk-rng.txt  |    4 +-
+ .../devicetree/bindings/rng/timeriomem_rng.txt     |    7 +
+ MAINTAINERS                                        |   18 +
+ arch/arm/crypto/aes-ce-glue.c                      |    6 +-
+ arch/arm/crypto/crc32-ce-glue.c                    |    6 +
+ arch/arm/crypto/ghash-ce-glue.c                    |    6 +-
+ arch/arm/crypto/sha1-ce-glue.c                     |    5 +-
+ arch/arm/crypto/sha2-ce-glue.c                     |    5 +-
+ arch/arm64/crypto/sha1-ce-core.S                   |    6 +-
+ arch/arm64/crypto/sha1-ce-glue.c                   |   11 +-
+ arch/arm64/crypto/sha2-ce-core.S                   |    6 +-
+ arch/arm64/crypto/sha2-ce-glue.c                   |   13 +-
+ arch/x86/crypto/aes-x86_64-asm_64.S                |   47 +-
+ arch/x86/crypto/aesni-intel_asm.S                  |  231 ++++-
+ arch/x86/crypto/aesni-intel_avx-x86_64.S           |  283 +++--
+ arch/x86/crypto/aesni-intel_glue.c                 |  208 +++-
+ arch/x86/crypto/glue_helper.c                      |    3 -
+ arch/x86/crypto/sha512-mb/sha512_mb.c              |    7 +-
+ crypto/Kconfig                                     |    1 +
+ crypto/Makefile                                    |    9 +-
+ crypto/aes_ti.c                                    |    2 +-
+ crypto/algapi.c                                    |    2 +-
+ crypto/crypto_engine.c                             |   23 +-
+ crypto/dh.c                                        |    9 +-
+ crypto/dh_helper.c                                 |    4 +-
+ crypto/ecc.c                                       |   88 +-
+ crypto/ecc.h                                       |   41 +-
+ crypto/ecdh.c                                      |   29 +-
+ crypto/ecdh_helper.c                               |    4 +-
+ crypto/hmac.c                                      |    5 +-
+ crypto/rng.c                                       |    5 -
+ crypto/rsa-pkcs1pad.c                              |   12 +-
+ crypto/rsa.c                                       |    4 +-
+ crypto/tcrypt.c                                    |    4 -
+ crypto/testmgr.c                                   |  128 ++-
+ crypto/testmgr.h                                   |  143 +++
+ drivers/char/hw_random/mtk-rng.c                   |   42 +
+ drivers/char/hw_random/omap3-rom-rng.c             |   11 +-
+ drivers/char/hw_random/timeriomem-rng.c            |    7 +
+ drivers/crypto/Kconfig                             |   30 +
+ drivers/crypto/Makefile                            |    6 +-
+ drivers/crypto/amcc/crypto4xx_core.c               |    1 +
+ drivers/crypto/bcm/cipher.c                        |    7 +-
+ drivers/crypto/caam/caampkc.c                      |  468 ++++++++-
+ drivers/crypto/caam/caampkc.h                      |   58 ++
+ drivers/crypto/caam/jr.c                           |    2 +-
+ drivers/crypto/caam/pdb.h                          |   62 ++
+ drivers/crypto/caam/pkc_desc.c                     |   36 +
+ drivers/crypto/cavium/cpt/cptvf_algs.c             |  234 +++--
+ drivers/crypto/cavium/cpt/cptvf_algs.h             |    7 +
+ drivers/crypto/cavium/cpt/cptvf_main.c             |    2 +-
+ drivers/crypto/cavium/nitrox/Kconfig               |   21 +
+ drivers/crypto/cavium/nitrox/Makefile              |    8 +
+ drivers/crypto/cavium/nitrox/nitrox_algs.c         |  457 ++++++++
+ drivers/crypto/cavium/nitrox/nitrox_common.h       |   42 +
+ drivers/crypto/cavium/nitrox/nitrox_csr.h          | 1084 +++++++++++++++++++
+ drivers/crypto/cavium/nitrox/nitrox_dev.h          |  179 ++++
+ drivers/crypto/cavium/nitrox/nitrox_hal.c          |  401 +++++++
+ drivers/crypto/cavium/nitrox/nitrox_isr.c          |  467 +++++++++
+ drivers/crypto/cavium/nitrox/nitrox_lib.c          |  210 ++++
+ drivers/crypto/cavium/nitrox/nitrox_main.c         |  640 ++++++++++++
+ drivers/crypto/cavium/nitrox/nitrox_req.h          |  445 ++++++++
+ drivers/crypto/cavium/nitrox/nitrox_reqmgr.c       |  735 +++++++++++++
+ drivers/crypto/ccp/Makefile                        |    3 +-
+ drivers/crypto/ccp/ccp-crypto-sha.c                |    5 +-
+ drivers/crypto/ccp/ccp-debugfs.c                   |  344 ++++++
+ drivers/crypto/ccp/ccp-dev-v5.c                    |   28 +-
+ drivers/crypto/ccp/ccp-dev.c                       |    3 +-
+ drivers/crypto/ccp/ccp-dev.h                       |   20 +
+ drivers/crypto/ccp/ccp-platform.c                  |    4 +-
+ drivers/crypto/chelsio/chcr_algo.c                 | 1096 ++++++++++++++++----
+ drivers/crypto/chelsio/chcr_algo.h                 |   30 +-
+ drivers/crypto/chelsio/chcr_core.c                 |   56 +-
+ drivers/crypto/chelsio/chcr_core.h                 |    5 +-
+ drivers/crypto/chelsio/chcr_crypto.h               |   25 +-
+ drivers/crypto/img-hash.c                          |   12 +-
+ drivers/crypto/inside-secure/Makefile              |    2 +
+ drivers/crypto/inside-secure/safexcel.c            |  926 +++++++++++++++++
+ drivers/crypto/inside-secure/safexcel.h            |  574 ++++++++++
+ drivers/crypto/inside-secure/safexcel_cipher.c     |  561 ++++++++++
+ drivers/crypto/inside-secure/safexcel_hash.c       | 1052 +++++++++++++++++++
+ drivers/crypto/inside-secure/safexcel_ring.c       |  157 +++
+ drivers/crypto/ixp4xx_crypto.c                     |    3 +-
+ drivers/crypto/marvell/hash.c                      |    5 +-
+ drivers/crypto/mediatek/mtk-platform.c             |   11 +-
+ drivers/crypto/mediatek/mtk-platform.h             |    2 -
+ drivers/crypto/mediatek/mtk-sha.c                  |    5 +-
+ drivers/crypto/mv_cesa.c                           |    5 +-
+ drivers/crypto/n2_core.c                           |    4 +-
+ drivers/crypto/omap-aes-gcm.c                      |  408 ++++++++
+ drivers/crypto/omap-aes.c                          |  461 ++++----
+ drivers/crypto/omap-aes.h                          |  214 ++++
+ drivers/crypto/omap-crypto.c                       |  184 ++++
+ drivers/crypto/omap-crypto.h                       |   37 +
+ drivers/crypto/omap-des.c                          |  138 +--
+ drivers/crypto/omap-sham.c                         |   38 +-
+ drivers/crypto/qat/qat_common/adf_aer.c            |   15 +-
+ drivers/crypto/qat/qat_common/qat_algs.c           |    5 +-
+ drivers/crypto/qat/qat_common/qat_asym_algs.c      |    8 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c          |  213 ++--
+ drivers/crypto/sunxi-ss/sun4i-ss-core.c            |  237 +++--
+ drivers/crypto/sunxi-ss/sun4i-ss-hash.c            |  138 +--
+ drivers/crypto/sunxi-ss/sun4i-ss.h                 |   34 +-
+ drivers/crypto/talitos.c                           |    7 +-
+ drivers/crypto/vmx/aes.c                           |    7 +-
+ drivers/crypto/vmx/aes_cbc.c                       |    7 +-
+ drivers/crypto/vmx/aes_ctr.c                       |    7 +-
+ drivers/crypto/vmx/aes_xts.c                       |    7 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   35 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c     |    1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |   10 +
+ include/crypto/akcipher.h                          |   11 +-
+ include/crypto/dh.h                                |    4 +-
+ include/crypto/ecdh.h                              |    4 +-
+ include/crypto/engine.h                            |    1 +
+ include/crypto/hmac.h                              |    7 +
+ include/crypto/kpp.h                               |   15 +-
+ include/linux/timeriomem-rng.h                     |    3 +
+ 123 files changed, 12814 insertions(+), 1505 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt
+ create mode 100644 drivers/crypto/cavium/nitrox/Kconfig
+ create mode 100644 drivers/crypto/cavium/nitrox/Makefile
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_algs.c
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_common.h
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_csr.h
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_dev.h
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_hal.c
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_isr.c
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_lib.c
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_main.c
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_req.h
+ create mode 100644 drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
+ create mode 100644 drivers/crypto/ccp/ccp-debugfs.c
+ create mode 100644 drivers/crypto/inside-secure/Makefile
+ create mode 100644 drivers/crypto/inside-secure/safexcel.c
+ create mode 100644 drivers/crypto/inside-secure/safexcel.h
+ create mode 100644 drivers/crypto/inside-secure/safexcel_cipher.c
+ create mode 100644 drivers/crypto/inside-secure/safexcel_hash.c
+ create mode 100644 drivers/crypto/inside-secure/safexcel_ring.c
+ create mode 100644 drivers/crypto/omap-aes-gcm.c
+ create mode 100644 drivers/crypto/omap-aes.h
+ create mode 100644 drivers/crypto/omap-crypto.c
+ create mode 100644 drivers/crypto/omap-crypto.h
+ create mode 100644 include/crypto/hmac.h
+Merging drm/drm-next (12d016626f99 Merge tag 'drm-amdkfd-next-2017-06-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/i915_gem_execbuffer.c' using previous resolution.
+Removing include/drm/drm_mem_util.h
+Removing drivers/gpu/drm/omapdrm/dss/rfbi.c
+Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
+Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c
+Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c
+Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/bus/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/gpu/todo.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8d028b35a558] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/display/brcm,bcm-vc4.txt   |      7 +-
+ .../bindings/display/exynos/exynos5433-decon.txt   |     13 +-
+ .../bindings/display/panel/auo,p320hvn03.txt       |      8 +
+ .../bindings/display/panel/innolux,p079zca.txt     |     23 +
+ .../bindings/display/panel/nec,nl12880b20-05.txt   |      8 +
+ .../display/panel/nlt,nl192108ac18-02d.txt         |      8 +
+ .../bindings/display/panel/samsung,s6e3ha2.txt     |      5 +-
+ .../devicetree/bindings/display/st,stm32-ltdc.txt  |     36 +
+ .../bindings/display/sunxi/sun4i-drm.txt           |    127 +-
+ .../devicetree/bindings/display/zte,vou.txt        |     21 +
+ .../devicetree/bindings/vendor-prefixes.txt        |      1 +
+ Documentation/gpu/drm-internals.rst                |     66 +-
+ Documentation/gpu/drm-kms-helpers.rst              |      6 +
+ Documentation/gpu/drm-kms.rst                      |      4 +-
+ Documentation/gpu/drm-mm.rst                       |     12 +
+ Documentation/gpu/index.rst                        |      2 +
+ Documentation/gpu/pl111.rst                        |      6 +
+ Documentation/gpu/tegra.rst                        |    178 +
+ Documentation/gpu/todo.rst                         |     13 -
+ Documentation/sync_file.txt                        |     23 +-
+ MAINTAINERS                                        |     19 +
+ drivers/bus/Kconfig                                |      1 -
+ drivers/dma-buf/dma-buf.c                          |      8 +-
+ drivers/dma-buf/dma-fence.c                        |      5 +
+ drivers/dma-buf/sync_debug.c                       |     10 +-
+ drivers/dma-buf/sync_file.c                        |     52 +-
+ drivers/gpu/drm/Kconfig                            |      4 +
+ drivers/gpu/drm/Makefile                           |      6 +-
+ drivers/gpu/drm/amd/amdgpu/Kconfig                 |     16 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile                |     15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    165 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |    101 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |     14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  |     76 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  |     64 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c        |    105 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |    307 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |     10 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |    438 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |      2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |     83 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |     12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c           |      6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |     54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |    206 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |     60 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |     16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h             |      3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |      3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |     42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |    116 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |      3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c      |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |     25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |      2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c      |    299 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |     83 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |     12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |     19 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h           |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |     37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |     33 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h          |     28 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c            |     30 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h            |      2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |    654 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |     77 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |     24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |      3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |    633 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |     31 +-
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/ci_smc.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c                   |    123 +-
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c                 |      2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |      2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |      2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    600 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |      2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |      2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |   1615 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |    652 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h              |      5 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |   1291 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h              |      5 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |   1782 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c           |    435 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h           |      3 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |     78 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |     95 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |     95 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |    152 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c            |      2 +-
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/kv_smc.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c            |    522 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h            |      4 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |     35 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c              |     25 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c             |     54 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c             |    212 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h             |     49 +
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c             |    308 +
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h             |     41 +
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c              |     34 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             |      6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |    152 +-
+ drivers/gpu/drm/amd/amdgpu/si.c                    |     86 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/si_ih.c                 |      2 +-
+ drivers/gpu/drm/amd/amdgpu/si_smc.c                |      2 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c                 |    184 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.h                 |      1 +
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h          |     14 +
+ drivers/gpu/drm/amd/amdgpu/soc15d.h                |     90 +
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c              |      2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c              |    193 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c              |     61 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |   1189 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h              |     29 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |     12 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c                    |    216 +-
+ drivers/gpu/drm/amd/amdgpu/vid.h                   |      6 +
+ drivers/gpu/drm/amd/amdkfd/Makefile                |      2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c            |      4 +
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    149 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |     10 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c  |      2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c    |      3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c           |      7 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |      2 +-
+ drivers/gpu/drm/amd/include/amd_shared.h           |      4 +-
+ .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h |      2 +
+ .../include/asic_reg/raven1/DCN/dcn_1_0_default.h  |   7988 ++
+ .../include/asic_reg/raven1/DCN/dcn_1_0_offset.h   |  14087 +++
+ .../include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h  |  54316 ++++++++
+ .../include/asic_reg/raven1/GC/gc_9_1_default.h    |   4005 +
+ .../amd/include/asic_reg/raven1/GC/gc_9_1_offset.h |   7491 ++
+ .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h    |  31191 +++++
+ .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h      |   1028 +
+ .../asic_reg/raven1/MMHUB/mmhub_9_1_offset.h       |   1999 +
+ .../asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h      |   9790 ++
+ .../include/asic_reg/raven1/MP/mp_10_0_default.h   |    182 +
+ .../include/asic_reg/raven1/MP/mp_10_0_offset.h    |    336 +
+ .../include/asic_reg/raven1/MP/mp_10_0_sh_mask.h   |    886 +
+ .../asic_reg/raven1/NBIO/nbio_7_0_default.h        |  14865 +++
+ .../include/asic_reg/raven1/NBIO/nbio_7_0_offset.h |   4640 +
+ .../asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h        | 118945 ++++++++++++++++++
+ .../asic_reg/raven1/SDMA0/sdma0_4_1_default.h      |    242 +
+ .../asic_reg/raven1/SDMA0/sdma0_4_1_offset.h       |    459 +
+ .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h      |   1658 +
+ .../include/asic_reg/raven1/THM/thm_10_0_default.h |    141 +
+ .../include/asic_reg/raven1/THM/thm_10_0_offset.h  |    257 +
+ .../include/asic_reg/raven1/THM/thm_10_0_sh_mask.h |    885 +
+ .../include/asic_reg/raven1/VCN/vcn_1_0_default.h  |    202 +
+ .../include/asic_reg/raven1/VCN/vcn_1_0_offset.h   |    376 +
+ .../include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h  |   1308 +
+ drivers/gpu/drm/amd/include/atomfirmware.h         |     12 +-
+ .../gpu/drm/amd/include/ivsrcid/irqsrcs_dcn_1_0.h  |   1134 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h    |     18 +-
+ drivers/gpu/drm/amd/include/pptable.h              |     57 +-
+ drivers/gpu/drm/amd/powerplay/Makefile             |      2 +-
+ drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c  |      4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile       |      3 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c     |      6 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c        |     13 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c      |      2 +-
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c    |   1276 +
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h    |     48 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c |     43 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h |      3 +
+ .../gpu/drm/amd/powerplay/hwmgr/processpptables.c  |     10 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c     |   1059 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h     |    301 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h       |     43 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |      4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |    502 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |      2 +
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h   |     31 +
+ .../amd/powerplay/hwmgr/vega10_processpptables.c   |     49 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c   |      3 -
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h  |      5 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |     16 +-
+ drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h       |     77 +
+ drivers/gpu/drm/amd/powerplay/inc/smu10.h          |    188 +
+ .../gpu/drm/amd/powerplay/inc/smu10_driver_if.h    |    116 +
+ drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h |     38 +-
+ drivers/gpu/drm/amd/powerplay/inc/smumgr.h         |      1 +
+ drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h   |      3 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |      2 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c   |      8 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c   |    398 +
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h   |     62 +
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c      |     14 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   |      4 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c      |     11 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.h      |      7 +
+ drivers/gpu/drm/arc/arcpgu_drv.c                   |      1 -
+ drivers/gpu/drm/arm/hdlcd_crtc.c                   |     11 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c                    |      7 +
+ drivers/gpu/drm/arm/malidp_crtc.c                  |     11 +-
+ drivers/gpu/drm/arm/malidp_drv.c                   |      2 -
+ drivers/gpu/drm/arm/malidp_drv.h                   |      2 +-
+ drivers/gpu/drm/arm/malidp_hw.c                    |     19 +-
+ drivers/gpu/drm/arm/malidp_planes.c                |     30 +-
+ drivers/gpu/drm/armada/armada_overlay.c            |      2 +-
+ drivers/gpu/drm/ast/Makefile                       |      2 -
+ drivers/gpu/drm/ast/ast_ttm.c                      |      3 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c     |     10 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |      6 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h       |      5 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c   |    173 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |     20 +-
+ drivers/gpu/drm/bochs/Makefile                     |      1 -
+ drivers/gpu/drm/bochs/bochs.h                      |      4 +-
+ drivers/gpu/drm/bridge/Kconfig                     |     11 +-
+ drivers/gpu/drm/bridge/Makefile                    |      2 -
+ drivers/gpu/drm/bridge/analogix-anx78xx.c          |     14 +-
+ drivers/gpu/drm/bridge/lvds-encoder.c              |    157 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c               |     12 +-
+ drivers/gpu/drm/bridge/panel.c                     |    200 +
+ drivers/gpu/drm/bridge/parade-ps8622.c             |     10 +-
+ drivers/gpu/drm/bridge/sii902x.c                   |      6 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |     87 +-
+ drivers/gpu/drm/cirrus/Makefile                    |      1 -
+ drivers/gpu/drm/cirrus/cirrus_ttm.c                |      3 +-
+ drivers/gpu/drm/drm_atomic.c                       |     94 +-
+ drivers/gpu/drm/drm_atomic_helper.c                |     90 +-
+ drivers/gpu/drm/drm_blend.c                        |     45 +-
+ drivers/gpu/drm/drm_bridge.c                       |     33 +
+ drivers/gpu/drm/drm_color_mgmt.c                   |      9 +-
+ drivers/gpu/drm/drm_connector.c                    |     64 +
+ drivers/gpu/drm/drm_crtc_helper_internal.h         |     12 +
+ drivers/gpu/drm/drm_dp_mst_topology.c              |    215 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c                |     29 +-
+ drivers/gpu/drm/drm_fb_helper.c                    |      4 +-
+ drivers/gpu/drm/drm_file.c                         |     16 +-
+ drivers/gpu/drm/drm_gem.c                          |      6 +-
+ drivers/gpu/drm/drm_internal.h                     |     16 +-
+ drivers/gpu/drm/drm_ioctl.c                        |     12 +
+ drivers/gpu/drm/drm_irq.c                          |   1628 +-
+ drivers/gpu/drm/drm_plane_helper.c                 |     13 +-
+ drivers/gpu/drm/drm_prime.c                        |     30 +-
+ drivers/gpu/drm/drm_probe_helper.c                 |    105 +-
+ drivers/gpu/drm/drm_rect.c                         |     36 +-
+ drivers/gpu/drm/drm_syncobj.c                      |    453 +
+ drivers/gpu/drm/drm_vblank.c                       |   1648 +
+ drivers/gpu/drm/etnaviv/common.xml.h               |    150 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c              |      1 +
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h              |      1 +
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c              |     34 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c        |     11 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |     12 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |     30 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h              |      2 +
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c      |    218 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c         |     19 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c           |     50 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.h           |      1 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.c            |     18 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.h            |     14 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c            |      2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c           |     24 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c            |     11 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.c          |      5 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.h          |      1 -
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c           |     22 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c               |     13 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c              |     76 +-
+ drivers/gpu/drm/exynos/regs-mixer.h                |      7 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |     24 +-
+ drivers/gpu/drm/gma500/Makefile                    |      1 -
+ drivers/gpu/drm/gma500/mdfld_tpo_vid.c             |     53 +-
+ drivers/gpu/drm/hisilicon/hibmc/Makefile           |      1 -
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |      2 +-
+ drivers/gpu/drm/i2c/Makefile                       |      2 -
+ drivers/gpu/drm/i810/Makefile                      |      1 -
+ drivers/gpu/drm/i915/Kconfig.debug                 |     12 +
+ drivers/gpu/drm/i915/Makefile                      |     13 +-
+ drivers/gpu/drm/i915/dvo_ch7017.c                  |      4 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c                  |     10 +-
+ drivers/gpu/drm/i915/gvt/Makefile                  |      2 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c              |     56 +-
+ drivers/gpu/drm/i915/gvt/execlist.c                |     56 +-
+ drivers/gpu/drm/i915/gvt/firmware.c                |      9 +-
+ drivers/gpu/drm/i915/gvt/gtt.c                     |     15 +-
+ drivers/gpu/drm/i915/gvt/gvt.c                     |      6 +-
+ drivers/gpu/drm/i915/gvt/gvt.h                     |    100 +-
+ drivers/gpu/drm/i915/gvt/handlers.c                |    303 +-
+ drivers/gpu/drm/i915/gvt/interrupt.c               |     20 +-
+ drivers/gpu/drm/i915/gvt/mmio.c                    |    121 +-
+ drivers/gpu/drm/i915/gvt/mmio.h                    |     44 +-
+ drivers/gpu/drm/i915/gvt/mpt.h                     |      3 +-
+ drivers/gpu/drm/i915/gvt/render.c                  |     48 +-
+ drivers/gpu/drm/i915/gvt/render.h                  |      4 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c            |     27 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c               |     51 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h               |      4 +
+ drivers/gpu/drm/i915/gvt/trace.h                   |    178 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c                    |      9 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c             |     10 +-
+ drivers/gpu/drm/i915/i915_debugfs.c                |    341 +-
+ drivers/gpu/drm/i915/i915_drv.c                    |     73 +-
+ drivers/gpu/drm/i915/i915_drv.h                    |    439 +-
+ drivers/gpu/drm/i915/i915_gem.c                    |    371 +-
+ drivers/gpu/drm/i915/i915_gem.h                    |      2 +
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c         |     19 +-
+ drivers/gpu/drm/i915/i915_gem_clflush.c            |     23 +-
+ drivers/gpu/drm/i915/i915_gem_clflush.h            |      1 -
+ drivers/gpu/drm/i915/i915_gem_context.c            |    186 +-
+ drivers/gpu/drm/i915/i915_gem_context.h            |     26 +
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c             |     24 +
+ drivers/gpu/drm/i915/i915_gem_evict.c              |    119 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   2751 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c                |     66 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h                |      2 +
+ drivers/gpu/drm/i915/i915_gem_internal.c           |      4 +-
+ drivers/gpu/drm/i915/i915_gem_object.h             |     26 +-
+ drivers/gpu/drm/i915/i915_gem_request.c            |    187 +-
+ drivers/gpu/drm/i915/i915_gem_request.h            |     14 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c           |     94 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c             |      5 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.c           |     95 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.h           |     47 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c            |     32 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c              |     59 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c         |     94 +-
+ drivers/gpu/drm/i915/i915_irq.c                    |     96 +-
+ drivers/gpu/drm/i915/i915_oa_bdw.c                 |   5376 +
+ drivers/gpu/drm/i915/i915_oa_bdw.h                 |     40 +
+ drivers/gpu/drm/i915/i915_oa_bxt.c                 |   2690 +
+ drivers/gpu/drm/i915/i915_oa_bxt.h                 |     40 +
+ drivers/gpu/drm/i915/i915_oa_chv.c                 |   2873 +
+ drivers/gpu/drm/i915/i915_oa_chv.h                 |     40 +
+ drivers/gpu/drm/i915/i915_oa_glk.c                 |   2602 +
+ drivers/gpu/drm/i915/i915_oa_glk.h                 |     40 +
+ drivers/gpu/drm/i915/i915_oa_hsw.c                 |    263 +-
+ drivers/gpu/drm/i915/i915_oa_hsw.h                 |      4 +-
+ drivers/gpu/drm/i915/i915_oa_kblgt2.c              |   2991 +
+ drivers/gpu/drm/i915/i915_oa_kblgt2.h              |     40 +
+ drivers/gpu/drm/i915/i915_oa_kblgt3.c              |   3040 +
+ drivers/gpu/drm/i915/i915_oa_kblgt3.h              |     40 +
+ drivers/gpu/drm/i915/i915_oa_sklgt2.c              |   3479 +
+ drivers/gpu/drm/i915/i915_oa_sklgt2.h              |     40 +
+ drivers/gpu/drm/i915/i915_oa_sklgt3.c              |   3039 +
+ drivers/gpu/drm/i915/i915_oa_sklgt3.h              |     40 +
+ drivers/gpu/drm/i915/i915_oa_sklgt4.c              |   3093 +
+ drivers/gpu/drm/i915/i915_oa_sklgt4.h              |     40 +
+ drivers/gpu/drm/i915/i915_pci.c                    |     92 +-
+ drivers/gpu/drm/i915/i915_perf.c                   |   1473 +-
+ drivers/gpu/drm/i915/i915_reg.h                    |    317 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c               |     62 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h               |      1 -
+ drivers/gpu/drm/i915/i915_syncmap.c                |    412 +
+ drivers/gpu/drm/i915/i915_syncmap.h                |     38 +
+ drivers/gpu/drm/i915/i915_sysfs.c                  |     26 +-
+ drivers/gpu/drm/i915/i915_trace.h                  |     49 +
+ drivers/gpu/drm/i915/i915_utils.h                  |     39 +-
+ drivers/gpu/drm/i915/i915_vgpu.c                   |     44 +-
+ drivers/gpu/drm/i915/i915_vma.c                    |     28 +-
+ drivers/gpu/drm/i915/i915_vma.h                    |     20 +-
+ drivers/gpu/drm/i915/intel_atomic.c                |    137 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c          |     30 +-
+ drivers/gpu/drm/i915/intel_audio.c                 |     19 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c           |     84 +-
+ drivers/gpu/drm/i915/intel_cdclk.c                 |    371 +-
+ drivers/gpu/drm/i915/intel_crt.c                   |     10 +-
+ drivers/gpu/drm/i915/intel_csr.c                   |     17 +-
+ drivers/gpu/drm/i915/intel_ddi.c                   |    392 +-
+ drivers/gpu/drm/i915/intel_device_info.c           |     13 +-
+ drivers/gpu/drm/i915/intel_display.c               |   1089 +-
+ drivers/gpu/drm/i915/intel_dp.c                    |    550 +-
+ drivers/gpu/drm/i915/intel_dp_aux_backlight.c      |     58 +-
+ drivers/gpu/drm/i915/intel_dp_link_training.c      |     25 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c                |     63 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c              |    437 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.h              |      4 +
+ drivers/gpu/drm/i915/intel_drv.h                   |    146 +-
+ drivers/gpu/drm/i915/intel_dsi.c                   |    167 +-
+ drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c     |     22 +-
+ drivers/gpu/drm/i915/intel_dsi_vbt.c               |      8 +-
+ drivers/gpu/drm/i915/intel_dvo.c                   |      2 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c             |    317 +-
+ drivers/gpu/drm/i915/intel_fbc.c                   |      6 +-
+ drivers/gpu/drm/i915/intel_fbdev.c                 |      2 +-
+ drivers/gpu/drm/i915/intel_fifo_underrun.c         |      2 +-
+ drivers/gpu/drm/i915/intel_guc_ct.c                |    461 +
+ drivers/gpu/drm/i915/intel_guc_ct.h                |     86 +
+ drivers/gpu/drm/i915/intel_guc_fwif.h              |     47 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c            |     21 +-
+ drivers/gpu/drm/i915/intel_guc_log.c               |      6 +-
+ drivers/gpu/drm/i915/intel_gvt.c                   |     43 +-
+ drivers/gpu/drm/i915/intel_gvt.h                   |      5 +
+ drivers/gpu/drm/i915/intel_hangcheck.c             |      2 +-
+ drivers/gpu/drm/i915/intel_hdmi.c                  |    180 +-
+ drivers/gpu/drm/i915/intel_huc.c                   |     66 +-
+ drivers/gpu/drm/i915/intel_i2c.c                   |     15 +-
+ drivers/gpu/drm/i915/intel_lpe_audio.c             |     58 +-
+ drivers/gpu/drm/i915/intel_lrc.c                   |    414 +-
+ drivers/gpu/drm/i915/intel_lrc.h                   |      2 -
+ drivers/gpu/drm/i915/intel_lvds.c                  |     73 +-
+ drivers/gpu/drm/i915/intel_mocs.c                  |      2 +-
+ drivers/gpu/drm/i915/intel_opregion.c              |      2 +-
+ drivers/gpu/drm/i915/intel_overlay.c               |      1 -
+ drivers/gpu/drm/i915/intel_panel.c                 |    252 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c              |     30 +-
+ drivers/gpu/drm/i915/intel_pm.c                    |   1595 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c            |    300 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h            |     88 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c            |    316 +-
+ drivers/gpu/drm/i915/intel_sdvo.c                  |    570 +-
+ drivers/gpu/drm/i915/intel_sprite.c                |    144 +-
+ drivers/gpu/drm/i915/intel_tv.c                    |    208 +-
+ drivers/gpu/drm/i915/intel_uc.c                    |    158 +-
+ drivers/gpu/drm/i915/intel_uc.h                    |     35 +-
+ drivers/gpu/drm/i915/intel_uncore.c                |    486 +-
+ drivers/gpu/drm/i915/intel_uncore.h                |    170 +
+ drivers/gpu/drm/i915/selftests/huge_gem_object.c   |      4 +-
+ .../gpu/drm/i915/selftests/i915_gem_coherency.c    |     10 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |    100 +
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |      4 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_object.c   |      4 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_request.c  |      2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_timeline.c |    299 +
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h   |      3 +
+ drivers/gpu/drm/i915/selftests/i915_random.c       |     11 +
+ drivers/gpu/drm/i915/selftests/i915_random.h       |      2 +
+ drivers/gpu/drm/i915/selftests/i915_sw_fence.c     |    582 +
+ drivers/gpu/drm/i915/selftests/i915_syncmap.c      |    616 +
+ drivers/gpu/drm/i915/selftests/i915_vma.c          |     16 +-
+ drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |     12 +-
+ drivers/gpu/drm/i915/selftests/mock_context.c      |     12 +-
+ drivers/gpu/drm/i915/selftests/mock_engine.c       |     11 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c   |     12 +-
+ drivers/gpu/drm/i915/selftests/mock_timeline.c     |     45 +
+ drivers/gpu/drm/i915/selftests/mock_timeline.h     |     33 +
+ drivers/gpu/drm/i915/selftests/mock_uncore.c       |     46 +
+ drivers/gpu/drm/i915/selftests/mock_uncore.h       |     30 +
+ drivers/gpu/drm/imx/dw_hdmi-imx.c                  |     10 +-
+ drivers/gpu/drm/imx/imx-drm-core.c                 |      4 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c                  |      2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c            |      5 +-
+ drivers/gpu/drm/meson/meson_drv.c                  |      1 -
+ drivers/gpu/drm/meson/meson_dw_hdmi.c              |      5 +-
+ drivers/gpu/drm/mga/Makefile                       |      1 -
+ drivers/gpu/drm/mgag200/Makefile                   |      1 -
+ drivers/gpu/drm/mgag200/mgag200_ttm.c              |      3 +-
+ drivers/gpu/drm/msm/Kconfig                        |      1 +
+ drivers/gpu/drm/msm/Makefile                       |      2 +-
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h              |    267 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h              |     22 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |      4 +-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h              |     66 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c              |      4 +-
+ drivers/gpu/drm/msm/adreno/a5xx.xml.h              |   1371 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |    204 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.h              |      3 +
+ drivers/gpu/drm/msm/adreno/a5xx_power.c            |     14 +-
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |     51 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c         |      3 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c            |     23 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h            |      2 +-
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        |    368 +-
+ drivers/gpu/drm/msm/dsi/dsi.h                      |      6 +-
+ drivers/gpu/drm/msm/dsi/dsi.xml.h                  |     13 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c                 |     12 +-
+ drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |     26 +-
+ drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |     26 +-
+ drivers/gpu/drm/msm/edp/edp.h                      |      4 +-
+ drivers/gpu/drm/msm/edp/edp.xml.h                  |     26 +-
+ drivers/gpu/drm/msm/edp/edp_ctrl.c                 |      6 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.xml.h                |     68 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_audio.c              |      6 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |     70 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c           |      5 +
+ drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |     26 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h            |     26 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c           |     19 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c    |      6 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c    |      7 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c            |     17 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h            |      8 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c   |      6 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |     15 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h            |     14 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c    |      6 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c           |     16 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c        |      6 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            |     56 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h            |      4 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |     56 +-
+ drivers/gpu/drm/msm/mdp/mdp_common.xml.h           |     26 +-
+ drivers/gpu/drm/msm/msm_drv.c                      |     39 +-
+ drivers/gpu/drm/msm/msm_drv.h                      |     38 +-
+ drivers/gpu/drm/msm/msm_fb.c                       |     21 +-
+ drivers/gpu/drm/msm/msm_fbdev.c                    |     14 +-
+ drivers/gpu/drm/msm/msm_gem.c                      |    439 +-
+ drivers/gpu/drm/msm/msm_gem.h                      |     26 +-
+ drivers/gpu/drm/msm/msm_gem_shrinker.c             |     16 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c               |     19 +-
+ drivers/gpu/drm/msm/msm_gem_vma.c                  |     10 +-
+ drivers/gpu/drm/msm/msm_gpu.c                      |     27 +-
+ drivers/gpu/drm/msm/msm_gpu.h                      |     13 +-
+ drivers/gpu/drm/msm/msm_kms.h                      |      3 +
+ drivers/gpu/drm/msm/msm_rd.c                       |      4 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c               |      2 +-
+ drivers/gpu/drm/nouveau/Kbuild                     |      1 -
+ drivers/gpu/drm/nouveau/dispnv04/disp.h            |     16 +-
+ drivers/gpu/drm/nouveau/include/nvif/cl5070.h      |     39 +-
+ drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h |     10 +-
+ .../drm/nouveau/include/nvkm/subdev/bios/init.h    |     27 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/timer.h    |      1 -
+ drivers/gpu/drm/nouveau/nouveau_bios.c             |      3 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c        |     10 +
+ drivers/gpu/drm/nouveau/nouveau_display.c          |     39 +-
+ drivers/gpu/drm/nouveau/nouveau_display.h          |      8 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c              |     17 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h              |      2 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h          |      1 +
+ drivers/gpu/drm/nouveau/nouveau_hwmon.c            |    983 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c              |      2 +-
+ drivers/gpu/drm/nouveau/nouveau_vga.c              |      4 +
+ drivers/gpu/drm/nouveau/nv50_display.c             |    251 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |      6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c |     13 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild    |     24 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c    |    243 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/basenv50.c    |      3 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c    |      1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c    |     24 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h    |     14 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c    |      3 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c    |     65 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c |    140 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c      |    652 +
+ .../drm/nouveau/nvkm/engine/disp/{dport.h => dp.h} |     38 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c   |    401 -
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c     |     24 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c     |     25 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c   |    422 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c   |     21 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c   |     21 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c   |     21 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c   |     22 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c   |     21 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c   |     21 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c   |     24 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c   |     26 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c    |     75 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c    |     74 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c    |     66 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h    |     15 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c |     73 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c   |     74 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c   |     72 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c   |     74 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c    |    105 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h    |     56 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/headgf119.c   |     96 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/headnv04.c    |     74 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/headnv50.c    |     92 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c     |     72 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h     |    169 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c   |     43 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c   |     43 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c    |     31 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c    |    991 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h    |     76 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c    |      3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c    |    214 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h    |     55 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c  |    282 -
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h  |     76 -
+ .../gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c    |      3 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/piornv50.c    |    163 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h    |     28 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c   |     60 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c    |     54 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c    |    259 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c  |     38 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c  |    290 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c    |    203 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c    |     53 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c    |     49 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c    |    163 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c    |     69 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c    |     48 +
+ .../gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c    |     53 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c |    100 +-
+ .../gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c    |      5 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c    |    227 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c    |      6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c |     15 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c  |      7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c  |      7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c   |     12 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c    |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c   |      4 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c    |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c   |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c   |      9 -
+ drivers/gpu/drm/omapdrm/Makefile                   |      1 -
+ .../gpu/drm/omapdrm/displays/connector-analog-tv.c |     51 +-
+ drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |      3 -
+ drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |      3 -
+ drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |     10 -
+ drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |      4 -
+ drivers/gpu/drm/omapdrm/displays/panel-dpi.c       |     83 +-
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |     10 -
+ .../omapdrm/displays/panel-lgphilips-lb035q02.c    |      7 -
+ .../drm/omapdrm/displays/panel-nec-nl8048hl11.c    |      6 -
+ .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |      7 -
+ .../drm/omapdrm/displays/panel-sony-acx565akm.c    |     49 +-
+ .../drm/omapdrm/displays/panel-tpo-td028ttec1.c    |      5 -
+ .../drm/omapdrm/displays/panel-tpo-td043mtea1.c    |      6 -
+ drivers/gpu/drm/omapdrm/dss/Kconfig                |     13 -
+ drivers/gpu/drm/omapdrm/dss/Makefile               |      1 -
+ drivers/gpu/drm/omapdrm/dss/core.c                 |     41 -
+ drivers/gpu/drm/omapdrm/dss/dispc.c                |    707 +-
+ drivers/gpu/drm/omapdrm/dss/display.c              |     62 +-
+ drivers/gpu/drm/omapdrm/dss/dpi.c                  |    106 -
+ drivers/gpu/drm/omapdrm/dss/dsi.c                  |    118 +-
+ drivers/gpu/drm/omapdrm/dss/dss.c                  |     14 +-
+ drivers/gpu/drm/omapdrm/dss/dss.h                  |     11 -
+ drivers/gpu/drm/omapdrm/dss/dss_features.c         |    179 +-
+ drivers/gpu/drm/omapdrm/dss/dss_features.h         |      6 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c                |      8 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.c           |      9 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c                |      8 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c           |      9 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi_phy.c             |      9 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi_pll.c             |      9 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi_wp.c              |     12 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss.h              |    226 +-
+ drivers/gpu/drm/omapdrm/dss/output.c               |     13 -
+ drivers/gpu/drm/omapdrm/dss/rfbi.c                 |   1083 -
+ drivers/gpu/drm/omapdrm/dss/sdi.c                  |     61 -
+ drivers/gpu/drm/omapdrm/dss/venc.c                 |     53 +-
+ drivers/gpu/drm/omapdrm/dss/video-pll.c            |     20 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c                |     30 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c           |      2 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c                 |    195 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h                 |     41 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c                  |    203 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c               |     15 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c                 |    429 +-
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |     36 +-
+ drivers/gpu/drm/omapdrm/omap_irq.c                 |      8 +-
+ drivers/gpu/drm/omapdrm/omap_plane.c               |    140 +-
+ drivers/gpu/drm/panel/Kconfig                      |     13 +
+ drivers/gpu/drm/panel/Makefile                     |      1 +
+ drivers/gpu/drm/panel/panel-innolux-p079zca.c      |    340 +
+ drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c      |     64 +-
+ drivers/gpu/drm/panel/panel-simple.c               |     90 +
+ drivers/gpu/drm/pl111/Kconfig                      |     14 +
+ drivers/gpu/drm/pl111/Makefile                     |      7 +
+ drivers/gpu/drm/pl111/pl111_connector.c            |    127 +
+ drivers/gpu/drm/pl111/pl111_debugfs.c              |     55 +
+ drivers/gpu/drm/pl111/pl111_display.c              |    465 +
+ drivers/gpu/drm/pl111/pl111_drm.h                  |     67 +
+ drivers/gpu/drm/pl111/pl111_drv.c                  |    269 +
+ drivers/gpu/drm/qxl/Makefile                       |      2 -
+ drivers/gpu/drm/qxl/qxl_debugfs.c                  |      2 +-
+ drivers/gpu/drm/qxl/qxl_display.c                  |      9 +-
+ drivers/gpu/drm/qxl/qxl_drv.c                      |      6 +-
+ drivers/gpu/drm/qxl/qxl_drv.h                      |     18 +-
+ drivers/gpu/drm/qxl/qxl_fb.c                       |     11 +-
+ drivers/gpu/drm/qxl/qxl_gem.c                      |      5 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c                      |     10 +-
+ drivers/gpu/drm/r128/Makefile                      |      1 -
+ drivers/gpu/drm/radeon/Makefile                    |      2 +-
+ drivers/gpu/drm/radeon/btc_dpm.c                   |      2 +-
+ drivers/gpu/drm/radeon/ci_dpm.c                    |      2 +-
+ drivers/gpu/drm/radeon/ci_smc.c                    |      2 +-
+ drivers/gpu/drm/radeon/cik.c                       |     29 +-
+ drivers/gpu/drm/radeon/cypress_dpm.c               |      2 +-
+ drivers/gpu/drm/radeon/evergreen.c                 |    943 +-
+ drivers/gpu/drm/radeon/kv_dpm.c                    |      2 +-
+ drivers/gpu/drm/radeon/kv_smc.c                    |      2 +-
+ drivers/gpu/drm/radeon/ni_dpm.c                    |      2 +-
+ drivers/gpu/drm/radeon/r600_dpm.c                  |      2 +-
+ drivers/gpu/drm/radeon/radeon.h                    |     39 +-
+ drivers/gpu/drm/radeon/radeon_cs.c                 |     11 +-
+ drivers/gpu/drm/radeon/radeon_drv.c                |     28 +-
+ drivers/gpu/drm/radeon/radeon_gem.c                |      2 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c            |     35 +
+ drivers/gpu/drm/radeon/radeon_kfd.c                |     34 +-
+ drivers/gpu/drm/radeon/radeon_kms.c                |     62 +-
+ drivers/gpu/drm/radeon/radeon_mode.h               |      3 +
+ drivers/gpu/drm/radeon/radeon_ring.c               |      4 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c                |     10 +-
+ drivers/gpu/drm/radeon/radeon_vm.c                 |      4 +-
+ drivers/gpu/drm/radeon/rs780_dpm.c                 |      2 +-
+ drivers/gpu/drm/radeon/rv6xx_dpm.c                 |      2 +-
+ drivers/gpu/drm/radeon/rv730_dpm.c                 |      2 +-
+ drivers/gpu/drm/radeon/rv740_dpm.c                 |      2 +-
+ drivers/gpu/drm/radeon/rv770_dpm.c                 |      2 +-
+ drivers/gpu/drm/radeon/rv770_smc.c                 |      2 +-
+ drivers/gpu/drm/radeon/si.c                        |    655 +-
+ drivers/gpu/drm/radeon/si_dpm.c                    |      2 +-
+ drivers/gpu/drm/radeon/si_smc.c                    |      2 +-
+ drivers/gpu/drm/radeon/sumo_dpm.c                  |      2 +-
+ drivers/gpu/drm/radeon/sumo_smc.c                  |      2 +-
+ drivers/gpu/drm/radeon/trinity_dpm.c               |      2 +-
+ drivers/gpu/drm/radeon/trinity_smc.c               |      2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |     30 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |      1 +
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |     83 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.h              |      2 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c    |     14 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c        |      2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h        |      3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |     31 +-
+ drivers/gpu/drm/savage/Makefile                    |      1 -
+ drivers/gpu/drm/selftests/test-drm_mm.c            |     28 +
+ drivers/gpu/drm/sis/Makefile                       |      1 -
+ drivers/gpu/drm/sti/sti_compositor.c               |      2 +-
+ drivers/gpu/drm/sti/sti_cursor.c                   |      5 +-
+ drivers/gpu/drm/sti/sti_dvo.c                      |      3 +-
+ drivers/gpu/drm/sti/sti_gdp.c                      |      5 +-
+ drivers/gpu/drm/sti/sti_hda.c                      |      9 +-
+ drivers/gpu/drm/sti/sti_hdmi.c                     |     23 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c                    |      7 +-
+ drivers/gpu/drm/sti/sti_mixer.c                    |      3 +-
+ drivers/gpu/drm/sti/sti_tvout.c                    |      7 +-
+ drivers/gpu/drm/sti/sti_vid.c                      |      5 +-
+ drivers/gpu/drm/stm/Kconfig                        |     16 +
+ drivers/gpu/drm/stm/Makefile                       |      5 +
+ drivers/gpu/drm/stm/drv.c                          |    221 +
+ drivers/gpu/drm/stm/ltdc.c                         |   1158 +
+ drivers/gpu/drm/stm/ltdc.h                         |     40 +
+ drivers/gpu/drm/sun4i/Kconfig                      |     28 +
+ drivers/gpu/drm/sun4i/Makefile                     |     14 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c              |    122 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.h              |     15 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c                 |     32 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.h                 |      5 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c                  |     21 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.h                  |      5 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi.h                 |    157 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c         |    127 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |    501 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c        |    225 +
+ drivers/gpu/drm/sun4i/sun4i_layer.c                |     21 +-
+ drivers/gpu/drm/sun4i/sun4i_layer.h                |      6 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c                  |      3 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c                 |    142 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h                 |     10 +-
+ drivers/gpu/drm/sun4i/sun4i_tv.c                   |     12 +-
+ drivers/gpu/drm/sun4i/sun8i_layer.c                |    134 +
+ drivers/gpu/drm/sun4i/sun8i_layer.h                |     36 +
+ drivers/gpu/drm/sun4i/sun8i_mixer.c                |    414 +
+ drivers/gpu/drm/sun4i/sun8i_mixer.h                |    137 +
+ drivers/gpu/drm/sun4i/sunxi_engine.h               |     98 +
+ drivers/gpu/drm/tdfx/Makefile                      |      1 -
+ drivers/gpu/drm/tegra/dc.c                         |     92 +-
+ drivers/gpu/drm/tegra/drm.c                        |    123 +-
+ drivers/gpu/drm/tegra/drm.h                        |      1 +
+ drivers/gpu/drm/tegra/gem.c                        |      5 -
+ drivers/gpu/drm/tegra/gem.h                        |      5 +
+ drivers/gpu/drm/tegra/gr2d.c                       |     11 +-
+ drivers/gpu/drm/tegra/gr3d.c                       |      4 +-
+ drivers/gpu/drm/tegra/vic.c                        |      4 +-
+ drivers/gpu/drm/tilcdc/Makefile                    |      1 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c                |      3 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c                 |      7 +-
+ drivers/gpu/drm/ttm/Makefile                       |      1 -
+ drivers/gpu/drm/ttm/ttm_bo_vm.c                    |      6 +-
+ drivers/gpu/drm/ttm/ttm_tt.c                       |     13 +-
+ drivers/gpu/drm/udl/Makefile                       |      3 -
+ drivers/gpu/drm/udl/udl_dmabuf.c                   |      2 +-
+ drivers/gpu/drm/udl/udl_gem.c                      |      2 +-
+ drivers/gpu/drm/vc4/Kconfig                        |      4 +-
+ drivers/gpu/drm/vc4/Makefile                       |      3 +-
+ drivers/gpu/drm/vc4/vc4_bo.c                       |    116 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c                     |     54 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c                      |    180 +-
+ drivers/gpu/drm/vc4/vc4_drv.c                      |     10 +-
+ drivers/gpu/drm/vc4/vc4_drv.h                      |     82 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c                      |    294 +-
+ drivers/gpu/drm/vc4/vc4_fence.c                    |     56 +
+ drivers/gpu/drm/vc4/vc4_gem.c                      |    189 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c                     |    202 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c                      |      2 +-
+ drivers/gpu/drm/vc4/vc4_irq.c                      |     65 +-
+ drivers/gpu/drm/vc4/vc4_kms.c                      |    101 +-
+ drivers/gpu/drm/vc4/vc4_plane.c                    |     40 +-
+ drivers/gpu/drm/vc4/vc4_regs.h                     |     19 +
+ drivers/gpu/drm/vc4/vc4_render_cl.c                |      3 +-
+ drivers/gpu/drm/vc4/vc4_v3d.c                      |    185 +-
+ drivers/gpu/drm/vc4/vc4_validate.c                 |     57 +-
+ drivers/gpu/drm/vgem/Makefile                      |      1 -
+ drivers/gpu/drm/vgem/vgem_drv.c                    |    194 +-
+ drivers/gpu/drm/vgem/vgem_drv.h                    |      2 +
+ drivers/gpu/drm/via/Makefile                       |      1 -
+ drivers/gpu/drm/virtio/Makefile                    |      2 -
+ drivers/gpu/drm/virtio/virtgpu_debugfs.c           |      2 +-
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c           |      1 -
+ drivers/gpu/drm/virtio/virtgpu_drv.c               |      4 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h               |      8 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c             |     32 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c               |      4 +-
+ drivers/gpu/drm/virtio/virtgpu_ttm.c               |     10 +-
+ drivers/gpu/drm/vmwgfx/Makefile                    |      3 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c             |      3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c            |      3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c            |      3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |      4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c                |      2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c             |      3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |      3 +-
+ drivers/gpu/drm/zte/Makefile                       |      1 +
+ drivers/gpu/drm/zte/zx_common_regs.h               |     31 +
+ drivers/gpu/drm/zte/zx_drm_drv.c                   |      3 +-
+ drivers/gpu/drm/zte/zx_drm_drv.h                   |      1 +
+ drivers/gpu/drm/zte/zx_plane.c                     |      1 +
+ drivers/gpu/drm/zte/zx_plane_regs.h                |     18 -
+ drivers/gpu/drm/zte/zx_vga.c                       |    531 +
+ drivers/gpu/drm/zte/zx_vga_regs.h                  |     36 +
+ drivers/gpu/drm/zte/zx_vou.c                       |     36 +-
+ drivers/gpu/drm/zte/zx_vou_regs.h                  |     12 +-
+ drivers/gpu/host1x/bus.c                           |     75 +
+ drivers/gpu/host1x/cdma.h                          |      1 -
+ drivers/gpu/host1x/channel.c                       |    147 +-
+ drivers/gpu/host1x/channel.h                       |     21 +-
+ drivers/gpu/host1x/debug.c                         |     47 +-
+ drivers/gpu/host1x/dev.c                           |      7 +-
+ drivers/gpu/host1x/dev.h                           |      6 +-
+ drivers/gpu/host1x/hw/channel_hw.c                 |      4 -
+ drivers/gpu/host1x/job.c                           |    124 +-
+ drivers/gpu/host1x/job.h                           |     14 -
+ drivers/gpu/host1x/syncpt.c                        |     81 +-
+ drivers/gpu/ipu-v3/ipu-common.c                    |     39 +-
+ drivers/gpu/ipu-v3/ipu-cpmem.c                     |      6 +
+ drivers/gpu/ipu-v3/ipu-prg.c                       |      2 -
+ drivers/gpu/ipu-v3/ipu-prv.h                       |      9 +-
+ drivers/gpu/ipu-v3/ipu-vdi.c                       |      4 +-
+ drivers/media/platform/rcar-fcp.c                  |     17 +-
+ drivers/media/platform/vsp1/vsp1.h                 |      1 +
+ drivers/media/platform/vsp1/vsp1_dl.c              |     23 +-
+ drivers/media/platform/vsp1/vsp1_dl.h              |      2 +-
+ drivers/media/platform/vsp1/vsp1_drm.c             |     41 +
+ drivers/media/platform/vsp1/vsp1_drm.h             |     11 +
+ drivers/media/platform/vsp1/vsp1_drv.c             |      9 +
+ drivers/media/platform/vsp1/vsp1_pipe.c            |     13 +-
+ drivers/media/platform/vsp1/vsp1_video.c           |      2 +-
+ drivers/video/fbdev/omap2/omapfb/dss/core.c        |      2 -
+ include/drm/bridge/dw_hdmi.h                       |      2 +-
+ include/drm/drmP.h                                 |     43 +-
+ include/drm/drm_atomic.h                           |     97 +-
+ include/drm/drm_blend.h                            |     22 +-
+ include/drm/drm_bridge.h                           |     51 +-
+ include/drm/drm_color_mgmt.h                       |      2 +
+ include/drm/drm_connector.h                        |     40 +-
+ include/drm/drm_crtc.h                             |     66 +-
+ include/drm/drm_dp_helper.h                        |    168 +
+ include/drm/drm_dp_mst_helper.h                    |     26 +
+ include/drm/drm_drv.h                              |    109 +-
+ include/drm/drm_fb_cma_helper.h                    |      4 +
+ include/drm/drm_file.h                             |      6 +
+ include/drm/drm_gem_cma_helper.h                   |     17 +-
+ include/drm/drm_irq.h                              |    147 +-
+ include/drm/drm_mem_util.h                         |     78 -
+ include/drm/drm_modes.h                            |     17 +
+ include/drm/drm_modeset_helper_vtables.h           |    159 +-
+ include/drm/drm_os_linux.h                         |     14 +-
+ include/drm/drm_panel.h                            |      2 +
+ include/drm/drm_prime.h                            |      9 +
+ include/drm/drm_property.h                         |      2 +-
+ include/drm/drm_rect.h                             |     27 +
+ include/drm/drm_syncobj.h                          |     90 +
+ include/drm/drm_vblank.h                           |    181 +
+ include/drm/i915_pciids.h                          |     40 +
+ include/drm/intel_lpe_audio.h                      |     22 +-
+ include/drm/ttm/ttm_bo_driver.h                    |      9 +-
+ include/drm/ttm/ttm_execbuf_util.h                 |      3 +-
+ include/drm/ttm/ttm_lock.h                         |      3 +-
+ include/drm/ttm/ttm_object.h                       |      3 +-
+ include/linux/amba/clcd-regs.h                     |     86 +
+ include/linux/amba/clcd.h                          |     68 +-
+ include/linux/host1x.h                             |     38 +-
+ include/linux/platform_data/omapdss.h              |      1 -
+ include/linux/sync_file.h                          |     14 +-
+ include/media/rcar-fcp.h                           |      5 +
+ include/media/vsp1.h                               |     10 +
+ include/uapi/drm/amdgpu_drm.h                      |     35 +-
+ include/uapi/drm/drm.h                             |     26 +
+ include/uapi/drm/drm_fourcc.h                      |     23 +-
+ include/uapi/drm/drm_mode.h                        |     49 +-
+ include/uapi/drm/i915_drm.h                        |     61 +-
+ include/uapi/drm/msm_drm.h                         |      9 +-
+ include/uapi/drm/omap_drm.h                        |      4 +-
+ include/uapi/drm/vc4_drm.h                         |     16 +
+ include/video/exynos5433_decon.h                   |      1 +
+ include/video/imx-ipu-v3.h                         |      1 +
+ sound/x86/intel_hdmi_audio.c                       |    324 +-
+ sound/x86/intel_hdmi_audio.h                       |     20 +-
+ 900 files changed, 358927 insertions(+), 25468 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt
+ create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
+ create mode 100644 Documentation/gpu/pl111.rst
+ create mode 100644 Documentation/gpu/tegra.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/irqsrcs_dcn_1_0.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu10.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h
+ create mode 100644 drivers/gpu/drm/bridge/panel.c
+ create mode 100644 drivers/gpu/drm/drm_syncobj.c
+ create mode 100644 drivers/gpu/drm/drm_vblank.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_chv.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_chv.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_glk.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_glk.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.h
+ create mode 100644 drivers/gpu/drm/i915/i915_syncmap.c
+ create mode 100644 drivers/gpu/drm/i915/i915_syncmap.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_ct.c
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_ct.h
+ create mode 100644 drivers/gpu/drm/i915/intel_uncore.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_timeline.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_sw_fence.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_syncmap.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
+ rename drivers/gpu/drm/nouveau/nvkm/engine/disp/{dport.h => dp.h} (90%)
+ delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/headgf119.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/headnv04.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/headnv50.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/rfbi.c
+ create mode 100644 drivers/gpu/drm/panel/panel-innolux-p079zca.c
+ create mode 100644 drivers/gpu/drm/pl111/Kconfig
+ create mode 100644 drivers/gpu/drm/pl111/Makefile
+ create mode 100644 drivers/gpu/drm/pl111/pl111_connector.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_debugfs.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_display.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_drm.h
+ create mode 100644 drivers/gpu/drm/pl111/pl111_drv.c
+ create mode 100644 drivers/gpu/drm/stm/Kconfig
+ create mode 100644 drivers/gpu/drm/stm/Makefile
+ create mode 100644 drivers/gpu/drm/stm/drv.c
+ create mode 100644 drivers/gpu/drm/stm/ltdc.c
+ create mode 100644 drivers/gpu/drm/stm/ltdc.h
+ create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi.h
+ create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c
+ create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+ create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
+ create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c
+ create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h
+ create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.c
+ create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.h
+ create mode 100644 drivers/gpu/drm/sun4i/sunxi_engine.h
+ create mode 100644 drivers/gpu/drm/vc4/vc4_fence.c
+ create mode 100644 drivers/gpu/drm/zte/zx_common_regs.h
+ create mode 100644 drivers/gpu/drm/zte/zx_vga.c
+ create mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h
+ delete mode 100644 include/drm/drm_mem_util.h
+ create mode 100644 include/drm/drm_syncobj.h
+ create mode 100644 include/drm/drm_vblank.h
+ create mode 100644 include/linux/amba/clcd-regs.h
+Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (bdbbf7d619d1 drm/i915: Clear execbuf's vma backpointer upon release)
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++-
+ drivers/gpu/drm/i915/i915_reg.h            | 9 +++++++++
+ drivers/gpu/drm/i915/intel_ddi.c           | 7 +++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/for-linux-next (138b87fa43b6 drm: vblank: Fix vblank timestamp update)
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/bridge/panel.c              |  2 +-
+ drivers/gpu/drm/drm_vblank.c                |  2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h |  2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c |  5 ++-
+ include/drm/bridge/dw_hdmi.h                | 70 ++++++++++++++---------------
+ 5 files changed, 41 insertions(+), 40 deletions(-)
+Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (4a630fadbb29 drm/msm: Fix potential buffer overflow issue)
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation)
+$ git merge mali-dp/for-upstream/mali-dp
+Already up-to-date.
+Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
+$ git merge sunxi-drm/sunxi-drm/for-next
+Already up-to-date.
+Merging imx-drm/imx-drm/next (994fc62e1d04 drm/imx: lock scanout transfers for consecutive bursts)
+$ git merge imx-drm/imx-drm/next
+Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 42 insertions(+), 11 deletions(-)
+Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour)
+$ git merge etnaviv/etnaviv/next
+Already up-to-date.
+Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging regmap/for-next (2c25d66dc22d Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/Kconfig      |  11 +-
+ drivers/base/regmap/Makefile     |   4 +-
+ drivers/base/regmap/regcache.c   |   2 +
+ drivers/base/regmap/regmap-irq.c |  42 ++++---
+ drivers/base/regmap/regmap-w1.c  | 245 +++++++++++++++++++++++++++++++++++++++
+ include/linux/regmap.h           |  36 ++++++
+ 6 files changed, 321 insertions(+), 19 deletions(-)
+ create mode 100644 drivers/base/regmap/regmap-w1.c
+Merging sound/for-next (a5a041b6b50b ALSA: hda: constify attribute_group structures.)
+$ git merge sound/for-next
+Removing sound/atmel/abdac.c
+Merge made by the 'recursive' strategy.
+ .../sound/kernel-api/writing-an-alsa-driver.rst    |  111 ++-
+ drivers/dma/dw/Kconfig                             |    7 +-
+ drivers/dma/dw/core.c                              |  332 +------
+ drivers/dma/dw/regs.h                              |   50 +-
+ drivers/media/pci/solo6x10/solo6x10-g723.c         |   32 +-
+ .../vc04_services/bcm2835-audio/bcm2835-pcm.c      |    5 +-
+ drivers/usb/gadget/function/u_uac1.c               |    7 +-
+ include/linux/dma/dw.h                             |   21 -
+ include/sound/ak4113.h                             |   13 +-
+ include/sound/ak4114.h                             |   13 +-
+ include/sound/ak4117.h                             |   13 +-
+ include/sound/core.h                               |    6 +-
+ include/sound/emux_synth.h                         |    8 +-
+ include/sound/mixer_oss.h                          |    2 +-
+ include/sound/opl3.h                               |    8 +-
+ include/sound/pcm-indirect.h                       |   10 +-
+ include/sound/pcm.h                                |  144 +--
+ include/sound/rawmidi.h                            |    4 +-
+ include/uapi/sound/asound.h                        |    4 +-
+ sound/Kconfig                                      |    6 +-
+ sound/aoa/codecs/tas.c                             |   14 +-
+ sound/aoa/fabrics/layout.c                         |    8 +-
+ sound/atmel/Kconfig                                |   13 +-
+ sound/atmel/Makefile                               |    2 -
+ sound/atmel/abdac.c                                |  610 ------------
+ sound/atmel/ac97c.c                                |  447 ++-------
+ sound/core/Kconfig                                 |   59 +-
+ sound/core/Makefile                                |    3 +
+ sound/core/control.c                               |   70 +-
+ sound/core/ctljack.c                               |    2 +-
+ sound/core/info.c                                  |   12 +-
+ sound/core/info_oss.c                              |    1 -
+ sound/core/init.c                                  |    8 +-
+ sound/core/isadma.c                                |    3 -
+ sound/core/memalloc.c                              |   13 +-
+ sound/core/memory.c                                |    2 -
+ sound/core/misc.c                                  |    1 -
+ sound/core/oss/io.c                                |    4 +-
+ sound/core/oss/mixer_oss.c                         |    3 +-
+ sound/core/oss/pcm_oss.c                           |  101 +-
+ sound/core/oss/pcm_plugin.c                        |    5 +-
+ sound/core/oss/pcm_plugin.h                        |   10 +-
+ sound/core/pcm.c                                   |   37 +-
+ sound/core/pcm_compat.c                            |   13 +-
+ sound/core/pcm_drm_eld.c                           |    8 +-
+ sound/core/pcm_lib.c                               |  668 +++++--------
+ sound/core/pcm_local.h                             |   50 +
+ sound/core/pcm_memory.c                            |    6 -
+ sound/core/pcm_misc.c                              |   14 +-
+ sound/core/pcm_native.c                            | 1013 +++++++++++---------
+ sound/core/pcm_param_trace.h                       |  142 +++
+ sound/core/pcm_timer.c                             |   14 +-
+ sound/core/pcm_trace.h                             |   50 +-
+ sound/core/rawmidi.c                               |    4 +-
+ sound/core/seq/Kconfig                             |   68 +-
+ sound/core/seq/Makefile                            |   21 +-
+ sound/core/seq/oss/Makefile                        |    2 +-
+ sound/core/seq/seq_clientmgr.c                     |    8 -
+ sound/core/seq/seq_lock.c                          |    1 -
+ sound/core/seq/seq_memory.c                        |    2 -
+ sound/core/seq/seq_midi_emul.c                     |    9 +-
+ sound/core/seq/seq_midi_event.c                    |   21 +-
+ sound/core/seq/seq_ports.c                         |    2 -
+ sound/core/seq/seq_virmidi.c                       |    3 +-
+ sound/core/{seq => }/seq_device.c                  |    0
+ sound/core/sound.c                                 |    2 -
+ sound/core/sound_oss.c                             |    3 -
+ sound/core/timer.c                                 |  125 ++-
+ sound/drivers/Kconfig                              |   15 +
+ sound/drivers/dummy.c                              |   20 +-
+ sound/drivers/opl3/Makefile                        |    4 +-
+ sound/drivers/opl3/opl3_lib.c                      |    2 +-
+ sound/drivers/opl3/opl3_oss.c                      |   14 -
+ sound/drivers/opl3/opl3_seq.c                      |    4 +-
+ sound/drivers/opl3/opl3_voice.h                    |    5 +-
+ sound/drivers/opl4/opl4_lib.c                      |    4 +-
+ sound/drivers/opl4/opl4_local.h                    |    2 +-
+ sound/drivers/pcsp/pcsp_lib.c                      |    2 +-
+ sound/drivers/vx/vx_mixer.c                        |   24 +-
+ sound/drivers/vx/vx_pcm.c                          |    4 +-
+ sound/firewire/amdtp-am824.c                       |   71 +-
+ sound/firewire/amdtp-am824.h                       |    6 +-
+ sound/firewire/amdtp-stream.c                      |   38 +
+ sound/firewire/amdtp-stream.h                      |    1 +
+ sound/firewire/bebob/bebob_maudio.c                |    8 +-
+ sound/firewire/bebob/bebob_pcm.c                   |   41 +-
+ sound/firewire/dice/dice-pcm.c                     |   44 +-
+ sound/firewire/digi00x/amdtp-dot.c                 |   63 +-
+ sound/firewire/digi00x/digi00x-pcm.c               |   56 +-
+ sound/firewire/digi00x/digi00x.h                   |    1 -
+ sound/firewire/fireface/ff-midi.c                  |   22 +-
+ sound/firewire/fireface/ff-pcm.c                   |   83 +-
+ sound/firewire/fireworks/fireworks_pcm.c           |   41 +-
+ sound/firewire/motu/motu-pcm.c                     |   36 +-
+ sound/firewire/oxfw/oxfw-pcm.c                     |   40 +-
+ sound/firewire/tascam/amdtp-tascam.c               |   62 +-
+ sound/firewire/tascam/tascam-pcm.c                 |   58 +-
+ sound/firewire/tascam/tascam.h                     |    1 -
+ sound/hda/hdac_bus.c                               |    1 +
+ sound/hda/hdac_device.c                            |    1 +
+ sound/i2c/other/ak4113.c                           |   23 +-
+ sound/i2c/other/ak4114.c                           |   23 +-
+ sound/i2c/other/ak4117.c                           |   23 +-
+ sound/isa/Kconfig                                  |    8 +
+ sound/isa/cmi8328.c                                |    2 +-
+ sound/isa/cs423x/cs4236_lib.c                      |    4 +-
+ sound/isa/es1688/es1688_lib.c                      |    4 +-
+ sound/isa/es18xx.c                                 |    8 +-
+ sound/isa/gus/gus_main.c                           |    2 +-
+ sound/isa/gus/gus_pcm.c                            |  122 ++-
+ sound/isa/sb/emu8000.c                             |    2 +-
+ sound/isa/sb/emu8000_callback.c                    |    6 +-
+ sound/isa/sb/emu8000_pcm.c                         |  214 +++--
+ sound/isa/sb/sb16.c                                |    2 +-
+ sound/isa/sb/sb16_csp.c                            |    4 +-
+ sound/isa/sb/sb16_main.c                           |    2 +-
+ sound/isa/sb/sb8_main.c                            |    6 +-
+ sound/isa/sscape.c                                 |    2 +-
+ sound/isa/wss/wss_lib.c                            |    4 +-
+ sound/mips/hal2.c                                  |   38 +-
+ sound/mips/sgio2audio.c                            |   14 +-
+ sound/parisc/harmony.c                             |    6 +-
+ sound/pci/Kconfig                                  |    8 +
+ sound/pci/ali5451/ali5451.c                        |    4 +-
+ sound/pci/atiixp_modem.c                           |    4 +-
+ sound/pci/au88x0/au88x0_pcm.c                      |    4 +-
+ sound/pci/azt3328.c                                |    4 +-
+ sound/pci/bt87x.c                                  |    4 +-
+ sound/pci/cmipci.c                                 |   12 +-
+ sound/pci/cs4281.c                                 |    2 +-
+ sound/pci/cs46xx/cs46xx_lib.c                      |   14 +-
+ sound/pci/emu10k1/emu10k1.c                        |    2 +-
+ sound/pci/emu10k1/emufx.c                          |  127 +--
+ sound/pci/emu10k1/emupcm.c                         |   12 +-
+ sound/pci/ens1370.c                                |   16 +-
+ sound/pci/es1938.c                                 |   37 +-
+ sound/pci/fm801.c                                  |    8 +-
+ sound/pci/hda/hda_codec.c                          |  251 +----
+ sound/pci/hda/hda_controller.c                     |    3 +
+ sound/pci/hda/hda_generic.c                        |   46 +-
+ sound/pci/hda/hda_intel.c                          |   82 +-
+ sound/pci/hda/hda_local.h                          |   61 --
+ sound/pci/hda/hda_sysfs.c                          |    2 +-
+ sound/pci/hda/patch_hdmi.c                         |  104 +-
+ sound/pci/hda/patch_realtek.c                      |  257 ++++-
+ sound/pci/hda/patch_si3054.c                       |    4 +-
+ sound/pci/ice1712/ice1712.c                        |   10 +-
+ sound/pci/ice1712/ice1712.h                        |    2 +-
+ sound/pci/ice1712/ice1724.c                        |   10 +-
+ sound/pci/ice1712/juli.c                           |    6 +-
+ sound/pci/ice1712/maya44.c                         |    4 +-
+ sound/pci/ice1712/quartet.c                        |    6 +-
+ sound/pci/intel8x0.c                               |   12 +-
+ sound/pci/intel8x0m.c                              |    4 +-
+ sound/pci/korg1212/korg1212.c                      |  112 ++-
+ sound/pci/mixart/mixart_mixer.c                    |    6 +-
+ sound/pci/nm256/nm256.c                            |   61 +-
+ sound/pci/rme32.c                                  |   80 +-
+ sound/pci/rme96.c                                  |   74 +-
+ sound/pci/rme9652/hdsp.c                           |   75 +-
+ sound/pci/rme9652/hdspm.c                          |    4 +-
+ sound/pci/rme9652/rme9652.c                        |   75 +-
+ sound/pci/sonicvibes.c                             |    4 +-
+ sound/pci/via82xx.c                                |    4 +-
+ sound/pci/via82xx_modem.c                          |    4 +-
+ sound/pci/vx222/vx222.c                            |    4 +-
+ sound/pci/vx222/vx222.h                            |    2 +
+ sound/pci/vx222/vx222_ops.c                        |   26 +-
+ sound/pcmcia/vx/vxp_mixer.c                        |   14 +-
+ sound/pcmcia/vx/vxp_ops.c                          |   28 +-
+ sound/pcmcia/vx/vxpocket.c                         |    4 +-
+ sound/pcmcia/vx/vxpocket.h                         |    2 +
+ sound/ppc/awacs.c                                  |    4 +-
+ sound/ppc/beep.c                                   |    2 +-
+ sound/ppc/tumbler.c                                |    8 +-
+ sound/sh/aica.c                                    |    4 +-
+ sound/sh/sh_dac_audio.c                            |   54 +-
+ sound/soc/blackfin/bf5xx-ac97-pcm.c                |   27 +-
+ sound/soc/blackfin/bf5xx-i2s-pcm.c                 |   36 +-
+ sound/soc/sh/siu_dai.c                             |    4 +-
+ sound/soc/soc-pcm.c                                |    5 +-
+ sound/sparc/cs4231.c                               |    4 +-
+ sound/synth/Kconfig                                |    2 +
+ sound/synth/emux/Makefile                          |    8 +-
+ sound/synth/emux/emux.c                            |    6 +-
+ sound/synth/emux/emux_effect.c                     |    2 +-
+ sound/synth/emux/emux_oss.c                        |    4 -
+ sound/usb/Kconfig                                  |    2 +-
+ sound/usb/line6/driver.h                           |    2 +
+ sound/usb/line6/podhd.c                            |   27 +-
+ sound/usb/mixer_quirks.c                           |    2 +-
+ sound/usb/usx2y/us122l.c                           |   36 +-
+ sound/usb/usx2y/us122l.h                           |    2 +
+ 193 files changed, 3305 insertions(+), 4403 deletions(-)
+ delete mode 100644 sound/atmel/abdac.c
+ create mode 100644 sound/core/pcm_local.h
+ create mode 100644 sound/core/pcm_param_trace.h
+ rename sound/core/{seq => }/seq_device.c (100%)
+ create mode 100644 sound/synth/Kconfig
+Merging sound-asoc/for-next (3453c8631b55 Merge remote-tracking branches 'asoc/topic/tlv320dac31xx', 'asoc/topic/topology', 'asoc/topic/wm-adsp' and 'asoc/topic/zx-aud96p22' into asoc-next)
+$ git merge sound-asoc/for-next
+Resolved 'drivers/of/base.c' using previous resolution.
+Auto-merging drivers/of/base.c
+CONFLICT (content): Merge conflict in drivers/of/base.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e54a00770330] Merge remote-tracking branch 'sound-asoc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/renesas,dw-hdmi.txt    |   9 +-
+ .../devicetree/bindings/sound/audio-graph-card.txt | 124 +++
+ .../bindings/sound/audio-graph-scu-card.txt        | 122 +++
+ .../devicetree/bindings/sound/cs35l35.txt          |   3 +
+ .../devicetree/bindings/sound/renesas,rsnd.txt     |  37 +-
+ .../devicetree/bindings/sound/rockchip,pdm.txt     |  39 +
+ .../devicetree/bindings/sound/rockchip-spdif.txt   |   2 +
+ .../devicetree/bindings/sound/samsung,odroid.txt   |  15 +-
+ .../devicetree/bindings/sound/simple-scu-card.txt  |  67 +-
+ .../devicetree/bindings/sound/st,stm32-i2s.txt     |  62 ++
+ .../devicetree/bindings/sound/st,stm32-sai.txt     |  41 +-
+ .../devicetree/bindings/sound/st,stm32-spdifrx.txt |  56 ++
+ .../devicetree/bindings/sound/sun4i-codec.txt      |  11 +-
+ .../bindings/sound/sun8i-codec-analog.txt          |   1 +
+ .../devicetree/bindings/sound/zte,zx-aud96p22.txt  |  24 +
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c    |  21 +
+ drivers/of/base.c                                  |   2 +
+ include/linux/of_graph.h                           |  21 +
+ include/sound/cs35l35.h                            |   2 +
+ include/sound/designware_i2s.h                     |   1 +
+ include/sound/hdmi-codec.h                         |   9 +
+ include/sound/rt5645.h                             |   6 +-
+ include/sound/simple_card_utils.h                  |  43 +-
+ include/sound/soc-topology.h                       |   5 +
+ include/sound/soc.h                                |   3 +
+ include/uapi/sound/snd_sst_tokens.h                |   8 +-
+ sound/soc/atmel/atmel-pcm.h                        |   6 +-
+ sound/soc/atmel/tse850-pcm5142.c                   |   4 +-
+ sound/soc/codecs/Kconfig                           |  10 +
+ sound/soc/codecs/Makefile                          |   4 +
+ sound/soc/codecs/ak4613.c                          |  95 +-
+ sound/soc/codecs/cs35l34.c                         |   4 +-
+ sound/soc/codecs/cs35l35.c                         |  94 +-
+ sound/soc/codecs/cs35l35.h                         |   6 +
+ sound/soc/codecs/cs4271.c                          |   2 -
+ sound/soc/codecs/cs53l30.c                         |   2 +-
+ sound/soc/codecs/da7213.c                          |  37 +-
+ sound/soc/codecs/da7218.c                          |   2 +-
+ sound/soc/codecs/da7219-aad.c                      |  31 +-
+ sound/soc/codecs/da7219.c                          |  53 +-
+ sound/soc/codecs/da7219.h                          |   5 +-
+ sound/soc/codecs/es8316.c                          | 637 +++++++++++++
+ sound/soc/codecs/es8316.h                          | 129 +++
+ sound/soc/codecs/hdmi-codec.c                      |  92 +-
+ sound/soc/codecs/max9867.c                         |   2 +-
+ sound/soc/codecs/msm8916-wcd-analog.c              |   6 +-
+ sound/soc/codecs/nau8824.c                         |  52 ++
+ sound/soc/codecs/nau8824.h                         |  12 +
+ sound/soc/codecs/nau8825.c                         |  78 +-
+ sound/soc/codecs/nau8825.h                         |   1 +
+ sound/soc/codecs/rt5514.c                          |  37 +-
+ sound/soc/codecs/rt5514.h                          |   6 +
+ sound/soc/codecs/rt5645.c                          |  77 +-
+ sound/soc/codecs/rt5651.c                          |  44 +-
+ sound/soc/codecs/rt5663.c                          |   4 +-
+ sound/soc/codecs/rt5663.h                          |   4 +
+ sound/soc/codecs/rt5665.c                          | 151 ++--
+ sound/soc/codecs/rt5670.c                          |  25 +-
+ sound/soc/codecs/rt5677.c                          |  32 +-
+ sound/soc/codecs/sgtl5000.c                        |  89 ++
+ sound/soc/codecs/tlv320aic31xx.c                   |   2 +-
+ sound/soc/codecs/wm_adsp.c                         |   6 +-
+ sound/soc/codecs/zx_aud96p22.c                     | 403 +++++++++
+ sound/soc/davinci/davinci-mcasp.c                  |  12 +-
+ sound/soc/dwc/dwc-i2s.c                            |   6 +
+ sound/soc/fsl/mpc5200_dma.c                        |   1 -
+ sound/soc/generic/Kconfig                          |  17 +
+ sound/soc/generic/Makefile                         |   4 +
+ sound/soc/generic/audio-graph-card.c               | 292 ++++++
+ sound/soc/generic/audio-graph-scu-card.c           | 411 +++++++++
+ sound/soc/generic/simple-card-utils.c              | 198 +++-
+ sound/soc/generic/simple-card.c                    |  69 +-
+ sound/soc/generic/simple-scu-card.c                |  55 +-
+ sound/soc/hisilicon/hi6210-i2s.c                   |  11 +-
+ sound/soc/intel/Kconfig                            |  42 +
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   2 +-
+ sound/soc/intel/atom/sst/sst.c                     |  59 +-
+ sound/soc/intel/atom/sst/sst.h                     |  30 +-
+ sound/soc/intel/atom/sst/sst_acpi.c                | 232 +++--
+ sound/soc/intel/boards/Makefile                    |   6 +
+ sound/soc/intel/boards/bdw-rt5677.c                |  26 +
+ sound/soc/intel/boards/bxt_da7219_max98357a.c      |  26 +-
+ sound/soc/intel/boards/bxt_rt298.c                 |  19 +-
+ sound/soc/intel/boards/byt-max98090.c              |  24 +-
+ sound/soc/intel/boards/bytcht_es8316.c             | 300 +++++++
+ sound/soc/intel/boards/bytcht_nocodec.c            |   4 +-
+ sound/soc/intel/boards/bytcr_rt5651.c              |   4 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c       |  12 -
+ sound/soc/intel/boards/cht_bsw_rt5672.c            |  89 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c       | 687 ++++++++++++++
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c  | 640 +++++++++++++
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c    |  16 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c      |  16 +-
+ sound/soc/intel/boards/skl_rt286.c                 |  30 +-
+ sound/soc/intel/common/sst-acpi.h                  |  23 +
+ sound/soc/intel/common/sst-match-acpi.c            |  47 +-
+ sound/soc/intel/skylake/skl-messages.c             |  31 +-
+ sound/soc/intel/skylake/skl-topology.c             | 184 +++-
+ sound/soc/intel/skylake/skl-topology.h             |  21 +
+ sound/soc/intel/skylake/skl-tplg-interface.h       |   2 +
+ sound/soc/intel/skylake/skl.c                      | 113 ++-
+ sound/soc/mediatek/mt2701/mt2701-cs42448.c         |   2 +-
+ sound/soc/omap/mcbsp.c                             |  12 +-
+ sound/soc/pxa/Kconfig                              |   2 +-
+ sound/soc/rockchip/Kconfig                         |   9 +
+ sound/soc/rockchip/Makefile                        |   2 +
+ sound/soc/rockchip/rockchip_i2s.c                  |  41 +-
+ sound/soc/rockchip/rockchip_i2s.h                  |   3 +
+ sound/soc/rockchip/rockchip_pdm.c                  | 516 +++++++++++
+ sound/soc/rockchip/rockchip_pdm.h                  |  83 ++
+ sound/soc/rockchip/rockchip_spdif.c                |   4 +
+ sound/soc/samsung/s3c24xx_uda134x.c                |   2 +-
+ sound/soc/sh/Kconfig                               |   2 +-
+ sound/soc/sh/fsi.c                                 |  13 +-
+ sound/soc/sh/rcar/adg.c                            |  61 +-
+ sound/soc/sh/rcar/cmd.c                            |   3 +
+ sound/soc/sh/rcar/core.c                           | 492 +++++++---
+ sound/soc/sh/rcar/ctu.c                            |   6 +
+ sound/soc/sh/rcar/dma.c                            |  32 +-
+ sound/soc/sh/rcar/dvc.c                            |  12 +-
+ sound/soc/sh/rcar/gen.c                            |   2 +
+ sound/soc/sh/rcar/rsnd.h                           |  68 +-
+ sound/soc/sh/rcar/src.c                            |  20 +-
+ sound/soc/sh/rcar/ssi.c                            | 241 +++--
+ sound/soc/sh/rcar/ssiu.c                           |  37 +
+ sound/soc/soc-compress.c                           |   6 +-
+ sound/soc/soc-core.c                               |  86 +-
+ sound/soc/soc-topology.c                           |  24 +-
+ sound/soc/stm/Kconfig                              |  29 +-
+ sound/soc/stm/Makefile                             |  12 +-
+ sound/soc/stm/stm32_i2s.c                          | 946 +++++++++++++++++++
+ sound/soc/stm/stm32_sai.c                          |  15 +-
+ sound/soc/stm/stm32_sai.h                          |  73 +-
+ sound/soc/stm/stm32_sai_sub.c                      | 143 ++-
+ sound/soc/stm/stm32_spdifrx.c                      | 998 +++++++++++++++++++++
+ sound/soc/sunxi/sun4i-codec.c                      |  63 ++
+ sound/soc/sunxi/sun8i-codec-analog.c               | 145 ++-
+ sound/soc/zte/zx-i2s.c                             |  15 +-
+ 138 files changed, 9787 insertions(+), 1172 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt
+ create mode 100644 sound/soc/codecs/es8316.c
+ create mode 100644 sound/soc/codecs/es8316.h
+ create mode 100644 sound/soc/codecs/zx_aud96p22.c
+ create mode 100644 sound/soc/generic/audio-graph-card.c
+ create mode 100644 sound/soc/generic/audio-graph-scu-card.c
+ create mode 100644 sound/soc/intel/boards/bytcht_es8316.c
+ create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c
+ create mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+ create mode 100644 sound/soc/rockchip/rockchip_pdm.c
+ create mode 100644 sound/soc/rockchip/rockchip_pdm.h
+ create mode 100644 sound/soc/stm/stm32_i2s.c
+ create mode 100644 sound/soc/stm/stm32_spdifrx.c
+$ git am -3 ../patches/0001-of_graph-merge-fix-up-for-creating-of-drivers-of-pro.patch
+Applying: of_graph: merge fix up for creating of drivers/of/property.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/of/property.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 434059930179] Merge remote-tracking branch 'sound-asoc/for-next'
+ Date: Fri Jun 30 11:31:29 2017 +1000
+$ git am -3 ../patches/0001-ASoC-rt5670-fix-incompatible-pointer-type-of-set_sys.patch
+Applying: ASoC: rt5670: fix incompatible pointer type of set_sysclk
+$ git reset HEAD^
+Unstaged changes after reset:
+M	sound/soc/codecs/rt5670.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 4731345dd17e] Merge remote-tracking branch 'sound-asoc/for-next'
+ Date: Fri Jun 30 11:31:29 2017 +1000
+Merging modules/modules-next (96b5b19459b3 module: make the modinfo name const)
+$ git merge modules/modules-next
+Merge made by the 'recursive' strategy.
+ kernel/kmod.c         | 40 +++++++++++-------------
+ kernel/module.c       | 85 ++++++++++++++++++++++++++++++++-------------------
+ scripts/mod/modpost.c |  1 +
+ 3 files changed, 73 insertions(+), 53 deletions(-)
+Merging input/next (be19788c73d3 Input: xpad - sync supported devices with XBCD)
+$ git merge input/next
+Auto-merging include/linux/platform_data/tsc2007.h
+Auto-merging drivers/input/mouse/elantech.c
+Auto-merging drivers/input/misc/axp20x-pek.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/input/dlink,dir685-touchkeys.txt      |  21 +
+ .../bindings/input/touchscreen/st,stmfts.txt       |  43 ++
+ MAINTAINERS                                        |   6 +
+ arch/sh/boards/mach-ecovec24/setup.c               |   2 +-
+ drivers/input/input.c                              |  12 +-
+ drivers/input/joystick/xpad.c                      |  87 +++
+ drivers/input/keyboard/Kconfig                     |  11 +
+ drivers/input/keyboard/Makefile                    |   1 +
+ drivers/input/keyboard/dlink-dir685-touchkeys.c    | 155 ++++
+ drivers/input/keyboard/lm8323.c                    |   2 +-
+ drivers/input/keyboard/mcs_touchkey.c              |   2 +-
+ drivers/input/misc/axp20x-pek.c                    |  28 +
+ drivers/input/misc/xen-kbdfront.c                  |  22 +-
+ drivers/input/mouse/elan_i2c.h                     |   3 +-
+ drivers/input/mouse/elan_i2c_core.c                |  40 +-
+ drivers/input/mouse/elan_i2c_i2c.c                 |  71 +-
+ drivers/input/mouse/elan_i2c_smbus.c               |   9 +-
+ drivers/input/mouse/elantech.c                     |  11 +
+ drivers/input/rmi4/rmi_f34v7.c                     |  24 +-
+ drivers/input/sparse-keymap.c                      |  14 -
+ drivers/input/touchscreen/Kconfig                  |  11 +
+ drivers/input/touchscreen/Makefile                 |   1 +
+ drivers/input/touchscreen/mcs5000_ts.c             |   2 +-
+ drivers/input/touchscreen/mms114.c                 |   2 +-
+ drivers/input/touchscreen/s3c2410_ts.c             |   8 +-
+ drivers/input/touchscreen/stmfts.c                 | 822 +++++++++++++++++++++
+ drivers/input/touchscreen/tsc2007_core.c           |   2 +-
+ drivers/mfd/timberdale.c                           |   2 +-
+ include/linux/input/sparse-keymap.h                |   1 -
+ include/linux/{i2c => platform_data}/lm8323.h      |   0
+ include/linux/{i2c => platform_data}/mcs.h         |   0
+ include/linux/{i2c => platform_data}/mms114.h      |   0
+ include/linux/{i2c => platform_data}/tsc2007.h     |   2 +-
+ 33 files changed, 1346 insertions(+), 71 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/dlink,dir685-touchkeys.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/st,stmfts.txt
+ create mode 100644 drivers/input/keyboard/dlink-dir685-touchkeys.c
+ create mode 100644 drivers/input/touchscreen/stmfts.c
+ rename include/linux/{i2c => platform_data}/lm8323.h (100%)
+ rename include/linux/{i2c => platform_data}/mcs.h (100%)
+ rename include/linux/{i2c => platform_data}/mms114.h (100%)
+ rename include/linux/{i2c => platform_data}/tsc2007.h (94%)
+Merging block/for-next (a5de4e3e9ccc Merge branch 'for-4.13/block' into for-next)
+$ git merge block/for-next
+Resolved 'drivers/md/dm-io.c' using previous resolution.
+Resolved 'drivers/md/dm-raid1.c' using previous resolution.
+Resolved 'drivers/nvme/host/pci.c' using previous resolution.
+Resolved 'drivers/s390/block/scm_blk.c' using previous resolution.
+Resolved 'drivers/s390/block/scm_blk.h' using previous resolution.
+Recorded preimage for 'fs/block_dev.c'
+Resolved 'fs/btrfs/compression.c' using previous resolution.
+Resolved 'fs/btrfs/disk-io.c' using previous resolution.
+Resolved 'fs/btrfs/disk-io.h' using previous resolution.
+Resolved 'fs/btrfs/extent_io.c' using previous resolution.
+Resolved 'fs/btrfs/extent_io.h' using previous resolution.
+Resolved 'fs/btrfs/inode.c' using previous resolution.
+Resolved 'mm/filemap.c' using previous resolution.
+Auto-merging mm/filemap.c
+CONFLICT (content): Merge conflict in mm/filemap.c
+Auto-merging include/uapi/linux/fs.h
+Auto-merging include/uapi/linux/fcntl.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/bio.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/open.c
+Auto-merging fs/mpage.c
+Auto-merging fs/jfs/jfs_metapage.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/gfs2/incore.h
+Auto-merging fs/fcntl.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/file.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/scrub.c
+Auto-merging fs/btrfs/raid56.c
+Auto-merging fs/btrfs/inode.c
+CONFLICT (content): Merge conflict in fs/btrfs/inode.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/file-item.c
+Auto-merging fs/btrfs/extent_io.h
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h
+Auto-merging fs/btrfs/extent_io.c
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/disk-io.h
+CONFLICT (content): Merge conflict in fs/btrfs/disk-io.h
+Auto-merging fs/btrfs/disk-io.c
+CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging fs/btrfs/compression.h
+Auto-merging fs/btrfs/compression.c
+CONFLICT (content): Merge conflict in fs/btrfs/compression.c
+Auto-merging fs/btrfs/check-integrity.c
+Auto-merging fs/block_dev.c
+CONFLICT (content): Merge conflict in fs/block_dev.c
+Auto-merging drivers/s390/block/scm_blk.h
+CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.h
+Auto-merging drivers/s390/block/scm_blk.c
+CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.c
+Auto-merging drivers/s390/block/dasd.c
+Removing drivers/nvme/host/scsi.c
+Auto-merging drivers/nvme/host/pci.c
+CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
+Auto-merging drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-raid1.c
+CONFLICT (content): Merge conflict in drivers/md/dm-raid1.c
+Auto-merging drivers/md/dm-io.c
+CONFLICT (content): Merge conflict in drivers/md/dm-io.c
+Auto-merging drivers/md/dm-integrity.c
+Auto-merging block/bio.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/block_dev.c'.
+[master b3ce94320d6b] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biodoc.txt      |    2 +-
+ arch/s390/include/asm/eadm.h        |    6 +-
+ arch/um/drivers/ubd_kern.c          |    2 +-
+ block/badblocks.c                   |    1 +
+ block/bfq-iosched.c                 |   59 +-
+ block/bio-integrity.c               |    8 +-
+ block/bio.c                         |   85 +-
+ block/blk-core.c                    |  331 +++--
+ block/blk-exec.c                    |    4 +-
+ block/blk-flush.c                   |   16 +-
+ block/blk-integrity.c               |    4 +-
+ block/blk-map.c                     |    7 +-
+ block/blk-merge.c                   |   48 +-
+ block/blk-mq-cpumap.c               |   68 +-
+ block/blk-mq-debugfs.c              |  101 +-
+ block/blk-mq-sched.c                |  158 +--
+ block/blk-mq-sched.h                |   28 +-
+ block/blk-mq.c                      |  399 +++---
+ block/blk-mq.h                      |   11 -
+ block/blk-settings.c                |    5 -
+ block/blk-tag.c                     |   15 +-
+ block/blk-timeout.c                 |    4 +-
+ block/blk.h                         |   15 +
+ block/bounce.c                      |   47 +-
+ block/bsg-lib.c                     |    5 +-
+ block/bsg.c                         |   13 +-
+ block/cfq-iosched.c                 |    9 -
+ block/elevator.c                    |    1 +
+ block/genhd.c                       |    4 +-
+ block/ioprio.c                      |    3 +-
+ block/kyber-iosched.c               |   31 +-
+ block/scsi_ioctl.c                  |   13 +-
+ block/t10-pi.c                      |   32 +-
+ drivers/block/DAC960.c              |    2 +-
+ drivers/block/amiflop.c             |   10 +-
+ drivers/block/aoe/aoeblk.c          |    1 +
+ drivers/block/aoe/aoecmd.c          |   12 +-
+ drivers/block/aoe/aoedev.c          |    2 +-
+ drivers/block/ataflop.c             |   16 +-
+ drivers/block/brd.c                 |    1 -
+ drivers/block/cciss.c               |    4 +-
+ drivers/block/drbd/drbd_actlog.c    |    2 +-
+ drivers/block/drbd/drbd_bitmap.c    |    6 +-
+ drivers/block/drbd/drbd_int.h       |    5 +-
+ drivers/block/drbd/drbd_main.c      |   14 +-
+ drivers/block/drbd/drbd_nl.c        |    2 +-
+ drivers/block/drbd/drbd_receiver.c  |    6 +-
+ drivers/block/drbd/drbd_req.c       |    8 +-
+ drivers/block/drbd/drbd_req.h       |    2 +-
+ drivers/block/drbd/drbd_worker.c    |   16 +-
+ drivers/block/floppy.c              |    9 +-
+ drivers/block/loop.c                |   64 +-
+ drivers/block/loop.h                |    1 +
+ drivers/block/mtip32xx/mtip32xx.c   |   54 +-
+ drivers/block/mtip32xx/mtip32xx.h   |    2 +-
+ drivers/block/nbd.c                 |   44 +-
+ drivers/block/null_blk.c            |  125 +-
+ drivers/block/paride/pcd.c          |    9 +-
+ drivers/block/paride/pd.c           |    3 +-
+ drivers/block/paride/pf.c           |   19 +-
+ drivers/block/pktcdvd.c             |   40 +-
+ drivers/block/ps3disk.c             |   11 +-
+ drivers/block/ps3vram.c             |   16 +-
+ drivers/block/rbd.c                 |   28 +-
+ drivers/block/rsxx/dev.c            |   17 +-
+ drivers/block/rsxx/dma.c            |   13 +-
+ drivers/block/rsxx/rsxx_priv.h      |    2 +-
+ drivers/block/skd_main.c            |   32 +-
+ drivers/block/sunvdc.c              |    4 +-
+ drivers/block/swim.c                |    8 +-
+ drivers/block/swim3.c               |   29 +-
+ drivers/block/sx8.c                 |   20 +-
+ drivers/block/umem.c                |    4 +-
+ drivers/block/virtio_blk.c          |   23 +-
+ drivers/block/xen-blkback/blkback.c |   19 +-
+ drivers/block/xen-blkfront.c        |   81 +-
+ drivers/block/xsysace.c             |    9 +-
+ drivers/block/z2ram.c               |    4 +-
+ drivers/cdrom/cdrom.c               |    7 +-
+ drivers/cdrom/gdrom.c               |   10 +-
+ drivers/ide/ide-atapi.c             |   12 +-
+ drivers/ide/ide-cd.c                |   11 +-
+ drivers/ide/ide-cd_ioctl.c          |    1 -
+ drivers/ide/ide-devsets.c           |    1 -
+ drivers/ide/ide-disk.c              |    1 -
+ drivers/ide/ide-dma.c               |    2 +-
+ drivers/ide/ide-eh.c                |   16 +-
+ drivers/ide/ide-floppy.c            |    6 +-
+ drivers/ide/ide-io.c                |   10 +-
+ drivers/ide/ide-ioctls.c            |    2 -
+ drivers/ide/ide-park.c              |    2 -
+ drivers/ide/ide-pm.c                |    8 +-
+ drivers/ide/ide-probe.c             |    7 +-
+ drivers/ide/ide-tape.c              |    3 +-
+ drivers/ide/ide-taskfile.c          |    7 +-
+ drivers/ide/siimage.c               |    6 +-
+ drivers/lightnvm/core.c             |   13 +-
+ drivers/lightnvm/pblk-cache.c       |    8 +-
+ drivers/lightnvm/pblk-core.c        |  606 ++++++---
+ drivers/lightnvm/pblk-gc.c          |  468 ++++---
+ drivers/lightnvm/pblk-init.c        |  376 ++++--
+ drivers/lightnvm/pblk-map.c         |   75 +-
+ drivers/lightnvm/pblk-rb.c          |   79 +-
+ drivers/lightnvm/pblk-read.c        |   86 +-
+ drivers/lightnvm/pblk-recovery.c    |  130 +-
+ drivers/lightnvm/pblk-rl.c          |   90 +-
+ drivers/lightnvm/pblk-sysfs.c       |   94 +-
+ drivers/lightnvm/pblk-write.c       |  352 +++--
+ drivers/lightnvm/pblk.h             |  276 ++--
+ drivers/lightnvm/rrpc.c             |   10 +-
+ drivers/md/bcache/bcache.h          |    7 +-
+ drivers/md/bcache/btree.c           |    6 +-
+ drivers/md/bcache/debug.c           |    2 +-
+ drivers/md/bcache/io.c              |    6 +-
+ drivers/md/bcache/journal.c         |    2 +-
+ drivers/md/bcache/movinggc.c        |   10 +-
+ drivers/md/bcache/request.c         |   28 +-
+ drivers/md/bcache/request.h         |    2 +-
+ drivers/md/bcache/super.c           |   14 +-
+ drivers/md/bcache/writeback.c       |    4 +-
+ drivers/md/dm-bio-prison-v1.c       |    4 +-
+ drivers/md/dm-bio-prison-v1.h       |    2 +-
+ drivers/md/dm-bufio.c               |   28 +-
+ drivers/md/dm-cache-target.c        |   36 +-
+ drivers/md/dm-crypt.c               |   41 +-
+ drivers/md/dm-flakey.c              |   13 +-
+ drivers/md/dm-integrity.c           |   30 +-
+ drivers/md/dm-io.c                  |   13 +-
+ drivers/md/dm-log-writes.c          |   13 +-
+ drivers/md/dm-mpath.c               |   85 +-
+ drivers/md/dm-raid1.c               |   29 +-
+ drivers/md/dm-rq.c                  |   30 +-
+ drivers/md/dm-rq.h                  |    2 +-
+ drivers/md/dm-snap.c                |   15 +-
+ drivers/md/dm-stripe.c              |   17 +-
+ drivers/md/dm-target.c              |    2 +-
+ drivers/md/dm-thin.c                |   67 +-
+ drivers/md/dm-verity-target.c       |   16 +-
+ drivers/md/dm-zero.c                |    4 +-
+ drivers/md/dm.c                     |   88 +-
+ drivers/md/md.c                     |   14 +-
+ drivers/md/multipath.c              |   10 +-
+ drivers/md/raid1.c                  |   38 +-
+ drivers/md/raid10.c                 |   38 +-
+ drivers/md/raid5-cache.c            |    6 +-
+ drivers/md/raid5-ppl.c              |    4 +-
+ drivers/md/raid5.c                  |   24 +-
+ drivers/memstick/core/ms_block.c    |    7 +-
+ drivers/memstick/core/mspro_block.c |    8 +-
+ drivers/mmc/core/block.c            |   37 +-
+ drivers/mmc/core/queue.c            |    3 +-
+ drivers/mtd/mtd_blkdevs.c           |   31 +-
+ drivers/mtd/ubi/block.c             |    8 +-
+ drivers/nvdimm/blk.c                |    5 +-
+ drivers/nvdimm/btt.c                |    5 +-
+ drivers/nvdimm/pmem.c               |   29 +-
+ drivers/nvme/host/Kconfig           |   12 -
+ drivers/nvme/host/Makefile          |    1 -
+ drivers/nvme/host/core.c            |  525 ++++++--
+ drivers/nvme/host/fabrics.c         |   69 +-
+ drivers/nvme/host/fabrics.h         |    4 +-
+ drivers/nvme/host/fc.c              |  137 +-
+ drivers/nvme/host/lightnvm.c        |   18 +-
+ drivers/nvme/host/nvme.h            |   42 +-
+ drivers/nvme/host/pci.c             |  648 +++++----
+ drivers/nvme/host/rdma.c            |  212 ++-
+ drivers/nvme/host/scsi.c            | 2460 -----------------------------------
+ drivers/nvme/target/admin-cmd.c     |   65 +-
+ drivers/nvme/target/configfs.c      |   68 +
+ drivers/nvme/target/core.c          |    3 +-
+ drivers/nvme/target/discovery.c     |    4 +-
+ drivers/nvme/target/fc.c            |   10 +-
+ drivers/nvme/target/fcloop.c        |    2 -
+ drivers/nvme/target/io-cmd.c        |    4 +-
+ drivers/nvme/target/loop.c          |   67 +-
+ drivers/nvme/target/nvmet.h         |    1 +
+ drivers/nvme/target/rdma.c          |  102 +-
+ drivers/s390/block/dasd.c           |   36 +-
+ drivers/s390/block/dcssblk.c        |    2 +-
+ drivers/s390/block/scm_blk.c        |    8 +-
+ drivers/s390/block/scm_blk.h        |    4 +-
+ drivers/s390/block/xpram.c          |    2 +-
+ drivers/s390/cio/eadm_sch.c         |    6 +-
+ drivers/s390/cio/scm.c              |    2 +-
+ drivers/sbus/char/jsflash.c         |    5 +-
+ drivers/scsi/osd/osd_initiator.c    |   29 +-
+ drivers/scsi/osst.c                 |    3 +-
+ drivers/scsi/scsi_error.c           |    3 +-
+ drivers/scsi/scsi_lib.c             |  104 +-
+ drivers/scsi/scsi_transport_sas.c   |   10 +-
+ drivers/scsi/sg.c                   |    8 +-
+ drivers/scsi/st.c                   |    3 +-
+ drivers/target/target_core_iblock.c |   12 +-
+ drivers/target/target_core_pscsi.c  |    6 +-
+ fs/aio.c                            |   15 +-
+ fs/block_dev.c                      |   25 +-
+ fs/btrfs/btrfs_inode.h              |    3 +-
+ fs/btrfs/check-integrity.c          |    4 +-
+ fs/btrfs/compression.c              |   44 +-
+ fs/btrfs/compression.h              |    4 +-
+ fs/btrfs/ctree.h                    |    6 +-
+ fs/btrfs/disk-io.c                  |   52 +-
+ fs/btrfs/disk-io.h                  |    4 +-
+ fs/btrfs/extent_io.c                |   27 +-
+ fs/btrfs/extent_io.h                |    6 +-
+ fs/btrfs/file-item.c                |   14 +-
+ fs/btrfs/file.c                     |   33 +-
+ fs/btrfs/inode.c                    |   74 +-
+ fs/btrfs/raid56.c                   |   16 +-
+ fs/btrfs/scrub.c                    |   26 +-
+ fs/btrfs/volumes.c                  |   11 +-
+ fs/buffer.c                         |   15 +-
+ fs/crypto/bio.c                     |    2 +-
+ fs/direct-io.c                      |   25 +-
+ fs/ext4/file.c                      |   35 +-
+ fs/ext4/page-io.c                   |   15 +-
+ fs/ext4/readpage.c                  |    4 +-
+ fs/f2fs/data.c                      |   10 +-
+ fs/f2fs/segment.c                   |    2 +-
+ fs/fcntl.c                          |   67 +
+ fs/gfs2/incore.h                    |    1 -
+ fs/gfs2/lops.c                      |   10 +-
+ fs/gfs2/meta_io.c                   |    2 +-
+ fs/gfs2/ops_fstype.c                |    4 +-
+ fs/inode.c                          |    1 +
+ fs/iomap.c                          |   13 +-
+ fs/jfs/jfs_logmgr.c                 |    2 +-
+ fs/jfs/jfs_metapage.c               |    4 +-
+ fs/mpage.c                          |    4 +-
+ fs/nfs/blocklayout/blocklayout.c    |    4 +-
+ fs/nfsd/blocklayout.c               |    4 +-
+ fs/nilfs2/segbuf.c                  |    2 +-
+ fs/ocfs2/cluster/heartbeat.c        |    6 +-
+ fs/open.c                           |    1 +
+ fs/read_write.c                     |   12 +-
+ fs/xfs/xfs_aops.c                   |    9 +-
+ fs/xfs/xfs_buf.c                    |    7 +-
+ fs/xfs/xfs_file.c                   |   32 +-
+ fs/xfs/xfs_iomap.c                  |   22 +
+ fs/xfs/xfs_super.c                  |    3 +-
+ include/linux/bio.h                 |   21 +-
+ include/linux/blk-mq.h              |   28 +-
+ include/linux/blk_types.h           |   26 +-
+ include/linux/blkdev.h              |   72 +-
+ include/linux/device-mapper.h       |    4 +-
+ include/linux/elevator.h            |    7 +-
+ include/linux/fs.h                  |   74 +-
+ include/linux/ide.h                 |    6 +-
+ include/linux/iomap.h               |    1 +
+ include/linux/nvme.h                |  102 +-
+ include/linux/scatterlist.h         |    2 +
+ include/scsi/osd_initiator.h        |    2 +-
+ include/scsi/scsi_cmnd.h            |    1 +
+ include/scsi/scsi_request.h         |    2 +-
+ include/uapi/linux/aio_abi.h        |    2 +-
+ include/uapi/linux/dm-ioctl.h       |    4 +-
+ include/uapi/linux/fcntl.h          |   21 +
+ include/uapi/linux/fs.h             |    4 +
+ include/uapi/linux/loop.h           |    3 +
+ include/uapi/linux/nbd.h            |    4 +
+ kernel/power/swap.c                 |   14 +-
+ kernel/trace/blktrace.c             |    4 +-
+ lib/scatterlist.c                   |   35 +
+ mm/filemap.c                        |   64 +-
+ mm/page_io.c                        |    4 +-
+ 265 files changed, 5738 insertions(+), 6140 deletions(-)
+ delete mode 100644 drivers/nvme/host/scsi.c
+$ git am -3 ../patches/0001-s390-fix-up-for-blk-mq-switch-queue_rq-return-value-.patch
+Applying: s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/s390/block/scm_blk.c
+$ git add -A .
+$ git commit -v -a --amend
+[master ef467dc885aa] Merge remote-tracking branch 'block/for-next'
+ Date: Fri Jun 30 12:07:27 2017 +1000
+Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
+$ git merge lightnvm/for-next
+Already up-to-date.
+Merging device-mapper/for-next (0aefb813be29 dm thin: do not queue freed thin mapping for next stage processing)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/dm-zoned.txt |  144 ++
+ drivers/md/Kconfig                       |   17 +
+ drivers/md/Makefile                      |    2 +
+ drivers/md/dm-bio-prison-v1.c            |    2 +-
+ drivers/md/dm-bio-prison-v2.c            |    2 +-
+ drivers/md/dm-core.h                     |    3 +
+ drivers/md/dm-crypt.c                    |   21 +-
+ drivers/md/dm-flakey.c                   |   23 +-
+ drivers/md/dm-ioctl.c                    |  109 +-
+ drivers/md/dm-kcopyd.c                   |   65 +-
+ drivers/md/dm-linear.c                   |   18 +-
+ drivers/md/dm-table.c                    |  162 ++
+ drivers/md/dm-zoned-metadata.c           | 2509 ++++++++++++++++++++++++++++++
+ drivers/md/dm-zoned-reclaim.c            |  570 +++++++
+ drivers/md/dm-zoned-target.c             |  967 ++++++++++++
+ drivers/md/dm-zoned.h                    |  228 +++
+ drivers/md/dm.c                          |   97 +-
+ include/linux/device-mapper.h            |   79 +-
+ include/linux/dm-kcopyd.h                |    1 +
+ include/uapi/linux/dm-ioctl.h            |    4 +-
+ 20 files changed, 4948 insertions(+), 75 deletions(-)
+ create mode 100644 Documentation/device-mapper/dm-zoned.txt
+ create mode 100644 drivers/md/dm-zoned-metadata.c
+ create mode 100644 drivers/md/dm-zoned-reclaim.c
+ create mode 100644 drivers/md/dm-zoned-target.c
+ create mode 100644 drivers/md/dm-zoned.h
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/next (e47c0b96678c mmc: dw_mmc: remove the unnecessary slot variable)
+$ git merge mmc/next
+Resolved 'drivers/mmc/core/block.c' using previous resolution.
+Auto-merging drivers/mmc/host/tmio_mmc_core.c
+Auto-merging drivers/mmc/host/sdhci-pci-core.c
+Auto-merging drivers/mmc/host/renesas_sdhi_sys_dmac.c
+Auto-merging drivers/mmc/host/renesas_sdhi_core.c
+Auto-merging drivers/mmc/core/queue.c
+Auto-merging drivers/mmc/core/block.c
+CONFLICT (content): Merge conflict in drivers/mmc/core/block.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 32fe81eb268f] Merge remote-tracking branch 'mmc/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   5 +
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |   2 +-
+ MAINTAINERS                                        |   2 +-
+ arch/arm/boot/dts/omap3-overo-base.dtsi            |  11 -
+ drivers/mmc/core/Kconfig                           |  18 -
+ drivers/mmc/core/block.c                           | 269 +++++----
+ drivers/mmc/core/core.c                            | 214 +------
+ drivers/mmc/core/host.c                            |  74 +--
+ drivers/mmc/core/mmc.c                             |  18 +-
+ drivers/mmc/core/mmc_ops.c                         | 260 ++++++--
+ drivers/mmc/core/mmc_ops.h                         |   5 +-
+ drivers/mmc/core/mmc_test.c                        |   2 -
+ drivers/mmc/core/pwrseq.c                          |   8 +
+ drivers/mmc/core/pwrseq.h                          |   3 +
+ drivers/mmc/core/pwrseq_emmc.c                     |   2 +-
+ drivers/mmc/core/queue.c                           | 242 ++------
+ drivers/mmc/core/queue.h                           |  47 +-
+ drivers/mmc/core/sd.c                              |  22 +-
+ drivers/mmc/core/sdio.c                            |  24 +-
+ drivers/mmc/core/sdio_irq.c                        |  22 +-
+ drivers/mmc/core/sdio_ops.h                        |   2 +
+ drivers/mmc/core/slot-gpio.c                       |   2 +
+ drivers/mmc/host/Kconfig                           |  12 +-
+ drivers/mmc/host/Makefile                          |   4 +-
+ drivers/mmc/host/atmel-mci.c                       |  28 +-
+ drivers/mmc/host/bcm2835.c                         |  12 +-
+ drivers/mmc/host/cavium.c                          |   4 +-
+ drivers/mmc/host/dw_mmc-exynos.c                   |   4 +-
+ drivers/mmc/host/dw_mmc-rockchip.c                 |  48 +-
+ drivers/mmc/host/dw_mmc.c                          | 225 +++----
+ drivers/mmc/host/dw_mmc.h                          |   7 +-
+ drivers/mmc/host/mtk-sd.c                          |   2 +-
+ drivers/mmc/host/omap_hsmmc.c                      |  55 +-
+ drivers/mmc/host/pxamci.c                          |   6 +-
+ drivers/mmc/host/renesas_sdhi.h                    |  39 ++
+ .../host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} | 273 +++------
+ .../{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c}    | 186 +++++-
+ drivers/mmc/host/sdhci-acpi.c                      |   4 -
+ drivers/mmc/host/sdhci-brcmstb.c                   |   3 -
+ drivers/mmc/host/sdhci-esdhc-imx.c                 | 192 +++---
+ drivers/mmc/host/sdhci-esdhc.h                     |   1 +
+ drivers/mmc/host/sdhci-of-arasan.c                 |   2 +-
+ drivers/mmc/host/sdhci-pci-core.c                  | 668 ++++-----------------
+ drivers/mmc/host/sdhci-pci.h                       |  46 +-
+ drivers/mmc/host/sdricoh_cs.c                      |   3 -
+ drivers/mmc/host/tmio_mmc.c                        |  20 +-
+ drivers/mmc/host/tmio_mmc.h                        |  75 +--
+ .../mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c}   | 282 +++++----
+ drivers/mmc/host/vub300.c                          |   3 +-
+ include/linux/mfd/tmio.h                           |  35 +-
+ include/linux/mmc/card.h                           |   2 -
+ include/linux/mmc/host.h                           |   7 +-
+ 52 files changed, 1565 insertions(+), 1937 deletions(-)
+ create mode 100644 drivers/mmc/host/renesas_sdhi.h
+ rename drivers/mmc/host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} (65%)
+ rename drivers/mmc/host/{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} (55%)
+ rename drivers/mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} (89%)
+Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/kdb/kdb_io.c
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (7f053a6a7455 MD: fix a null dereference)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/multipath.c
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ drivers/md/faulty.c    |  5 +++--
+ drivers/md/linear.c    |  7 ++++---
+ drivers/md/md.c        | 51 +++++++++++++++++++++++++++++++++++++-------------
+ drivers/md/md.h        |  7 +++++--
+ drivers/md/multipath.c |  8 ++++----
+ drivers/md/raid0.c     |  7 ++++---
+ drivers/md/raid1.c     | 20 ++++++++++++--------
+ drivers/md/raid10.c    | 16 +++++++++-------
+ drivers/md/raid5.c     | 22 +++++++++++++---------
+ 9 files changed, 92 insertions(+), 51 deletions(-)
+$ git am -3 ../patches/0001-md-fix-up-for-blk-replace-bioset_create_nobvec-with-.patch
+Applying: md: fix up for "blk: replace bioset_create_nobvec() with a flags arg to bioset_create()"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/md/md.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 1875d9872688] Merge remote-tracking branch 'md/for-next'
+ Date: Fri Jun 30 12:23:03 2017 +1000
+Merging mfd/for-mfd-next (d905cd268c76 dt-bindings: vendor-prefixes: Add arctic to vendor prefix)
+$ git merge mfd/for-mfd-next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/arizona.txt  |   3 +-
+ .../devicetree/bindings/vendor-prefixes.txt        |   1 +
+ MAINTAINERS                                        |   4 +
+ drivers/mfd/Kconfig                                |  30 ++-
+ drivers/mfd/Makefile                               |   1 +
+ drivers/mfd/atmel-flexcom.c                        |   2 +-
+ drivers/mfd/axp20x.c                               |   3 +-
+ drivers/mfd/cros_ec.c                              |   2 +-
+ drivers/mfd/da9062-core.c                          |  12 --
+ drivers/mfd/exynos-lpass.c                         |   2 +-
+ drivers/mfd/fsl-imx25-tsadc.c                      |   7 +-
+ drivers/mfd/intel-lpss-pci.c                       |  24 +++
+ drivers/mfd/intel_quark_i2c_gpio.c                 |  49 +++--
+ drivers/mfd/intel_soc_pmic_chtwc.c                 | 230 +++++++++++++++++++++
+ drivers/mfd/ipaq-micro.c                           |   5 -
+ drivers/mfd/motorola-cpcap.c                       |  13 +-
+ drivers/mfd/palmas.c                               |   2 +-
+ drivers/mfd/qcom-spmi-pmic.c                       |   9 +-
+ drivers/mfd/rn5t618.c                              |   2 +
+ drivers/mfd/rtsx_pcr.c                             |  17 +-
+ drivers/mfd/smsc-ece1099.c                         |   3 +-
+ drivers/mfd/stm32-timers.c                         |  10 +-
+ drivers/mfd/tc6393xb.c                             |   4 +-
+ drivers/mfd/twl4030-irq.c                          |   4 +-
+ drivers/mfd/wm831x-core.c                          |  26 ++-
+ drivers/mfd/wm831x-i2c.c                           |   4 +
+ drivers/mfd/wm831x-spi.c                           |   4 +
+ include/linux/mfd/rtsx_pci.h                       |   5 +
+ 28 files changed, 379 insertions(+), 99 deletions(-)
+ create mode 100644 drivers/mfd/intel_soc_pmic_chtwc.c
+Merging backlight/for-backlight-next (7e715c2d9c27 backlight: Report error on failure)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/backlight.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+Merging battery/for-next (bfa953d336cd power: supply: sbs-battery: Don't needlessly set CAPACITY_MODE)
+$ git merge battery/for-next
+Auto-merging Documentation/devicetree/bindings/property-units.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-power-twl4030          |  17 -
+ .../devicetree/bindings/power/supply/battery.txt   |  57 ++
+ .../devicetree/bindings/power/supply/bq27xxx.txt   |  31 +-
+ .../bindings/power/supply/cpcap-battery.txt        |  31 +
+ .../bindings/power/supply/ltc3651-charger.txt      |  27 +
+ .../power/{ => supply}/max8903-charger.txt         |   0
+ .../supply}/maxim,max14656.txt                     |   0
+ .../devicetree/bindings/property-units.txt         |   2 +
+ Documentation/power/power_supply_class.txt         |  31 +-
+ drivers/power/reset/Kconfig                        |   4 +-
+ drivers/power/reset/at91-poweroff.c                |   2 +-
+ drivers/power/reset/at91-sama5d2_shdwc.c           |   2 +-
+ drivers/power/reset/reboot-mode.c                  |   2 +-
+ drivers/power/reset/syscon-reboot-mode.c           |   2 +-
+ drivers/power/supply/Kconfig                       |  26 +
+ drivers/power/supply/Makefile                      |   2 +
+ drivers/power/supply/axp20x_battery.c              |  88 ++-
+ drivers/power/supply/axp20x_usb_power.c            |   2 +-
+ drivers/power/supply/bq24735-charger.c             |   6 +-
+ drivers/power/supply/bq27xxx_battery.c             | 536 +++++++++++++-
+ drivers/power/supply/bq27xxx_battery_i2c.c         |  82 ++-
+ drivers/power/supply/cpcap-battery.c               | 808 +++++++++++++++++++++
+ drivers/power/supply/cpcap-charger.c               |  89 ++-
+ drivers/power/supply/ltc3651-charger.c             | 210 ++++++
+ drivers/power/supply/power_supply_core.c           |  83 ++-
+ drivers/power/supply/power_supply_sysfs.c          | 125 +++-
+ drivers/power/supply/sbs-battery.c                 |  29 +-
+ drivers/power/supply/twl4030_charger.c             |  97 +--
+ include/linux/power/bq27xxx_battery.h              |   6 +
+ include/linux/power_supply.h                       |  40 +-
+ .../power/reset => include/linux}/reboot-mode.h    |   0
+ 31 files changed, 2204 insertions(+), 233 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/supply/battery.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
+ rename Documentation/devicetree/bindings/power/{ => supply}/max8903-charger.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/maxim,max14656.txt (100%)
+ create mode 100644 drivers/power/supply/cpcap-battery.c
+ create mode 100644 drivers/power/supply/ltc3651-charger.c
+ rename {drivers/power/reset => include/linux}/reboot-mode.h (100%)
+Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (2d324eda8235 Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/tps65910.txt |   4 +
+ .../devicetree/bindings/regulator/regulator.txt    |   8 +
+ MAINTAINERS                                        |   6 +-
+ drivers/mfd/tps65910.c                             |  22 +-
+ drivers/regulator/Kconfig                          |  22 +-
+ drivers/regulator/Makefile                         |   2 +
+ drivers/regulator/axp20x-regulator.c               | 153 +++++++++--
+ drivers/regulator/bd9571mwv-regulator.c            |  12 +-
+ drivers/regulator/core.c                           |  19 +-
+ drivers/regulator/da9062-regulator.c               | 303 ++++++++++++++++++++-
+ drivers/regulator/hi6421-regulator.c               |   7 +
+ drivers/regulator/hi6421v530-regulator.c           | 214 +++++++++++++++
+ drivers/regulator/lp8755.c                         |  14 +-
+ drivers/regulator/lp87565-regulator.c              | 236 ++++++++++++++++
+ drivers/regulator/max8997-regulator.c              |   9 +-
+ drivers/regulator/of_regulator.c                   |  19 ++
+ drivers/regulator/palmas-regulator.c               |  20 +-
+ drivers/regulator/tps65910-regulator.c             |   5 +-
+ include/linux/mfd/axp20x.h                         |  37 +++
+ include/linux/mfd/palmas.h                         |   2 +
+ include/linux/mfd/tps65910.h                       |   2 +-
+ include/linux/regulator/machine.h                  |   6 +
+ 22 files changed, 1044 insertions(+), 78 deletions(-)
+ create mode 100644 drivers/regulator/hi6421v530-regulator.c
+ create mode 100644 drivers/regulator/lp87565-regulator.c
+Merging security/next (c4758fa59285 apparmor: put back designators in struct initialisers)
+$ git merge security/next
+Auto-merging security/selinux/hooks.c
+Auto-merging security/integrity/ima/ima_policy.c
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging fs/nfs/super.c
+Auto-merging drivers/infiniband/core/verbs.c
+Auto-merging drivers/infiniband/core/core_priv.h
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy            |    8 +-
+ Documentation/admin-guide/kernel-parameters.txt |   21 +-
+ drivers/char/tpm/st33zp24/i2c.c                 |    3 +-
+ drivers/char/tpm/st33zp24/spi.c                 |    3 +-
+ drivers/char/tpm/tpm-interface.c                |  118 +-
+ drivers/char/tpm/tpm-sysfs.c                    |    6 +-
+ drivers/char/tpm/tpm.h                          |   22 +-
+ drivers/char/tpm/tpm2-cmd.c                     |    2 +-
+ drivers/char/tpm/tpm_atmel.c                    |   12 +-
+ drivers/char/tpm/tpm_i2c_infineon.c             |   76 +-
+ drivers/char/tpm/tpm_infineon.c                 |    8 +-
+ drivers/char/tpm/tpm_tis.c                      |  175 +-
+ drivers/char/tpm/tpm_vtpm_proxy.c               |   69 +
+ drivers/char/tpm/tpmrm-dev.c                    |    2 +-
+ drivers/infiniband/core/Makefile                |    3 +-
+ drivers/infiniband/core/cache.c                 |   43 +-
+ drivers/infiniband/core/core_priv.h             |  115 ++
+ drivers/infiniband/core/device.c                |   86 +
+ drivers/infiniband/core/mad.c                   |   52 +-
+ drivers/infiniband/core/security.c              |  705 ++++++++
+ drivers/infiniband/core/uverbs_cmd.c            |   15 +-
+ drivers/infiniband/core/verbs.c                 |   27 +-
+ fs/nfs/super.c                                  |   17 +-
+ include/linux/ima.h                             |    6 +
+ include/linux/lsm_audit.h                       |   15 +
+ include/linux/lsm_hooks.h                       |   39 +-
+ include/linux/security.h                        |   70 +-
+ include/rdma/ib_mad.h                           |    4 +
+ include/rdma/ib_verbs.h                         |   49 +
+ include/uapi/linux/magic.h                      |    2 +
+ include/uapi/linux/vtpm_proxy.h                 |    4 +
+ kernel/seccomp.c                                |   16 +-
+ security/Kconfig                                |   11 +-
+ security/apparmor/Makefile                      |    8 +-
+ security/apparmor/apparmorfs.c                  | 1676 ++++++++++++++----
+ security/apparmor/audit.c                       |   27 +-
+ security/apparmor/capability.c                  |   61 +-
+ security/apparmor/context.c                     |   87 +-
+ security/apparmor/domain.c                      | 1393 ++++++++++-----
+ security/apparmor/file.c                        |  517 ++++--
+ security/apparmor/include/apparmor.h            |    6 +-
+ security/apparmor/include/apparmorfs.h          |   67 +-
+ security/apparmor/include/audit.h               |   17 +-
+ security/apparmor/include/capability.h          |    8 +-
+ security/apparmor/include/context.h             |  201 ++-
+ security/apparmor/include/domain.h              |   13 +-
+ security/apparmor/include/file.h                |  114 +-
+ security/apparmor/include/ipc.h                 |   16 +-
+ security/apparmor/include/label.h               |  441 +++++
+ security/apparmor/include/lib.h                 |  120 +-
+ security/apparmor/include/path.h                |    7 +-
+ security/apparmor/include/perms.h               |  155 ++
+ security/apparmor/include/policy.h              |  131 +-
+ security/apparmor/include/policy_ns.h           |   21 +
+ security/apparmor/include/policy_unpack.h       |   68 +-
+ security/apparmor/include/procattr.h            |    8 +-
+ security/apparmor/include/resource.h            |    6 +-
+ security/apparmor/ipc.c                         |  140 +-
+ security/apparmor/label.c                       | 2120 +++++++++++++++++++++++
+ security/apparmor/lib.c                         |  368 +++-
+ security/apparmor/lsm.c                         |  245 ++-
+ security/apparmor/path.c                        |  130 +-
+ security/apparmor/policy.c                      |  392 +++--
+ security/apparmor/policy_ns.c                   |   80 +-
+ security/apparmor/policy_unpack.c               |   96 +-
+ security/apparmor/procattr.c                    |   71 +-
+ security/apparmor/resource.c                    |  116 +-
+ security/inode.c                                |  144 +-
+ security/integrity/digsig_asymmetric.c          |    4 +-
+ security/integrity/iint.c                       |    2 +-
+ security/integrity/ima/Kconfig                  |   16 +-
+ security/integrity/ima/ima.h                    |   31 +-
+ security/integrity/ima/ima_appraise.c           |   16 +-
+ security/integrity/ima/ima_fs.c                 |   13 +-
+ security/integrity/ima/ima_policy.c             |  106 +-
+ security/integrity/ima/ima_queue.c              |    2 +-
+ security/integrity/ima/ima_template.c           |  124 +-
+ security/integrity/ima/ima_template_lib.c       |   61 +
+ security/integrity/ima/ima_template_lib.h       |    6 +
+ security/integrity/integrity.h                  |    7 +-
+ security/lsm_audit.c                            |   16 +
+ security/security.c                             |   74 +-
+ security/selinux/Makefile                       |    2 +-
+ security/selinux/hooks.c                        |  212 ++-
+ security/selinux/ibpkey.c                       |  245 +++
+ security/selinux/include/classmap.h             |    6 +-
+ security/selinux/include/ibpkey.h               |   31 +
+ security/selinux/include/objsec.h               |   11 +
+ security/selinux/include/security.h             |    9 +-
+ security/selinux/selinuxfs.c                    |   15 +-
+ security/selinux/ss/ebitmap.c                   |   26 +-
+ security/selinux/ss/ebitmap.h                   |    3 +
+ security/selinux/ss/policydb.c                  |  127 +-
+ security/selinux/ss/policydb.h                  |   27 +-
+ security/selinux/ss/services.c                  |  108 ++
+ security/selinux/ss/sidtab.c                    |   27 +-
+ security/smack/smack.h                          |    2 +-
+ security/smack/smack_access.c                   |   19 +-
+ security/smack/smack_lsm.c                      |    2 +-
+ security/smack/smack_netfilter.c                |   26 +-
+ tools/testing/selftests/seccomp/seccomp_bpf.c   |   51 +-
+ 101 files changed, 9904 insertions(+), 2397 deletions(-)
+ create mode 100644 drivers/infiniband/core/security.c
+ create mode 100644 security/apparmor/include/label.h
+ create mode 100644 security/apparmor/include/perms.h
+ create mode 100644 security/apparmor/label.c
+ create mode 100644 security/selinux/ibpkey.c
+ create mode 100644 security/selinux/include/ibpkey.h
+Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option)
+$ git merge integrity/next
+Already up-to-date.
+Merging keys/keys-next (3088c2ad40cf Merge remote-tracking branch 'origin/keys-fixes' into keys-next)
+$ git merge keys/keys-next
+Resolved 'security/keys/dh.c' using previous resolution.
+Auto-merging security/keys/dh.c
+CONFLICT (content): Merge conflict in security/keys/dh.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 83d45e24f89f] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+Merging selinux/next (6a3911837da0 selinux: enable genfscon labeling for tracefs)
+$ git merge selinux/next
+Already up-to-date.
+Merging tpmdd/next (0608454e2217 tpm: Issue a TPM2_Shutdown for TPM2 devices.)
+$ git merge tpmdd/next
+Auto-merging drivers/char/tpm/tpm_crb.c
+Merge made by the 'recursive' strategy.
+ drivers/base/core.c              |   6 +-
+ drivers/char/tpm/tpm-chip.c      |  34 +++++++++++
+ drivers/char/tpm/tpm-interface.c |  67 ++++++++++++++--------
+ drivers/char/tpm/tpm-sysfs.c     |   6 +-
+ drivers/char/tpm/tpm.h           |  10 ++--
+ drivers/char/tpm/tpm2-cmd.c      | 121 ++++++++++-----------------------------
+ drivers/char/tpm/tpm_crb.c       |   5 +-
+ drivers/char/tpm/tpm_tis.c       | 113 ++++++++++++++++++++++++++++++++++++
+ include/linux/device.h           |   2 +
+ 9 files changed, 240 insertions(+), 124 deletions(-)
+Merging watchdog/master (3a9aedb282ac watchdog: w83627hf: Add support for NCT6793D and NCT6795D)
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/da9062-wdt.txt    |  23 ++
+ .../devicetree/bindings/watchdog/renesas-wdt.txt   |   4 +-
+ .../devicetree/bindings/watchdog/st,stm32-iwdg.txt |  19 ++
+ drivers/watchdog/Kconfig                           |  38 +++-
+ drivers/watchdog/Makefile                          |   2 +
+ drivers/watchdog/f71808e_wdt.c                     |  27 ++-
+ drivers/watchdog/gpio_wdt.c                        |  73 ++----
+ drivers/watchdog/intel-mid_wdt.c                   |  17 +-
+ drivers/watchdog/orion_wdt.c                       |   2 +-
+ drivers/watchdog/rza_wdt.c                         | 199 ++++++++++++++++
+ drivers/watchdog/s3c2410_wdt.c                     |  58 +++--
+ drivers/watchdog/sama5d4_wdt.c                     |  19 +-
+ drivers/watchdog/stm32_iwdg.c                      | 253 +++++++++++++++++++++
+ drivers/watchdog/w83627hf_wdt.c                    |  15 +-
+ drivers/watchdog/watchdog_dev.c                    |  19 +-
+ 15 files changed, 650 insertions(+), 118 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt
+ create mode 100644 drivers/watchdog/rza_wdt.c
+ create mode 100644 drivers/watchdog/stm32_iwdg.c
+Merging iommu/next (6a7086431fa1 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next)
+$ git merge iommu/next
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/dma-iommu.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/acpi/arm64/iort.c
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/silicon-errata.txt             |   3 +
+ .../devicetree/bindings/iommu/arm,smmu-v3.txt      |  12 +
+ arch/x86/kernel/tboot.c                            |   2 +-
+ drivers/acpi/arm64/iort.c                          |  83 +++-
+ drivers/iommu/Kconfig                              |   6 +-
+ drivers/iommu/amd_iommu.c                          | 464 +++++++++++++--------
+ drivers/iommu/amd_iommu_init.c                     |  44 +-
+ drivers/iommu/amd_iommu_types.h                    |   3 +
+ drivers/iommu/arm-smmu-v3.c                        | 229 ++++++----
+ drivers/iommu/arm-smmu.c                           |  64 +--
+ drivers/iommu/dma-iommu.c                          |   2 +-
+ drivers/iommu/intel-iommu.c                        |  26 +-
+ drivers/iommu/intel-svm.c                          |  30 ++
+ drivers/iommu/intel_irq_remapping.c                |   4 +-
+ drivers/iommu/io-pgtable-arm-v7s.c                 | 183 +++++---
+ drivers/iommu/io-pgtable-arm.c                     | 189 ++++++---
+ drivers/iommu/io-pgtable.h                         |   6 +
+ drivers/iommu/iommu.c                              |  17 +-
+ drivers/iommu/iova.c                               |  30 +-
+ drivers/iommu/ipmmu-vmsa.c                         | 353 +++++++++++++---
+ drivers/iommu/omap-iommu.c                         |   2 +-
+ drivers/iommu/s390-iommu.c                         |  15 +-
+ include/linux/intel-svm.h                          |  20 +
+ 23 files changed, 1235 insertions(+), 552 deletions(-)
+Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (5d6dee80a1e9 vfio: New external user group/file match)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c |  4 ++--
+ drivers/vfio/vfio.c         | 48 +++++++++++++++++++++++++++++++++++++++++++--
+ include/linux/vfio.h        |  2 ++
+ virt/kvm/vfio.c             | 40 +++++++++++++++++++++++--------------
+ 4 files changed, 75 insertions(+), 19 deletions(-)
+Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (cd33f5f2cbfa audit: make sure we never skip the multicast broadcast)
+$ git merge audit/next
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit.c
+Merge made by the 'recursive' strategy.
+ kernel/audit.c   | 61 +++++++++++++++++++++++++++-----------------------------
+ kernel/audit.h   | 29 ++++++++++++++-------------
+ kernel/auditsc.c | 12 ++++++++---
+ 3 files changed, 53 insertions(+), 49 deletions(-)
+Merging devicetree/for-next (ce4fecf1fe15 vsprintf: Add %p extension "%pOF" for device tree)
+$ git merge devicetree/for-next
+Resolved 'Documentation/devicetree/bindings/net/ethernet.txt' using previous resolution.
+Auto-merging scripts/checkpatch.pl
+Auto-merging lib/vsprintf.c
+Auto-merging include/linux/of.h
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/of/base.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/net/ethernet.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ethernet.txt
+Auto-merging Documentation/devicetree/bindings/arm/cpus.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4518f3e9a052] Merge remote-tracking branch 'devicetree/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/cci.txt      |  15 +--
+ Documentation/devicetree/bindings/arm/cpus.txt     |  13 +-
+ .../devicetree/bindings/arm/idle-states.txt        |   4 +-
+ Documentation/devicetree/bindings/arm/l2c2x0.txt   |   4 +-
+ Documentation/devicetree/bindings/arm/topology.txt |   4 +-
+ .../devicetree/bindings/bus/simple-pm-bus.txt      |   2 +-
+ Documentation/devicetree/bindings/chosen.txt       |   3 +-
+ .../devicetree/bindings/common-properties.txt      |   2 +-
+ .../devicetree/bindings/crypto/fsl-sec4.txt        |   4 +-
+ .../devicetree/bindings/crypto/fsl-sec6.txt        |   4 +-
+ .../bindings/display/panel/display-timing.txt      |  16 +--
+ Documentation/devicetree/bindings/graph.txt        |  13 +-
+ .../devicetree/bindings/iio/proximity/as3935.txt   |   2 +
+ .../bindings/interrupt-controller/open-pic.txt     |   5 +-
+ Documentation/devicetree/bindings/net/ethernet.txt |   9 +-
+ .../{powerpc/fsl/fman.txt => net/fsl-fman.txt}     |   0
+ .../bindings/net/wireless/brcm,bcm43xx-fmac.txt    |   2 +-
+ .../devicetree/bindings/powerpc/fsl/cpus.txt       |   6 +-
+ .../devicetree/bindings/powerpc/fsl/l2cache.txt    |   2 +-
+ .../devicetree/bindings/powerpc/fsl/srio-rmu.txt   |   4 +-
+ .../devicetree/bindings/powerpc/fsl/srio.txt       |   3 +-
+ .../{brcm,ns-thermal => brcm,ns-thermal.txt}       |   0
+ .../devicetree/bindings/usb/exynos-usb.txt         |   4 +
+ .../devicetree/bindings/vendor-prefixes.txt        |   5 +
+ Documentation/devicetree/booting-without-of.txt    |   2 +-
+ Documentation/devicetree/overlay-notes.txt         |   8 +-
+ Documentation/devicetree/usage-model.txt           |   2 +-
+ Documentation/printk-formats.txt                   |  36 ++++++
+ Documentation/xtensa/mmu.txt                       |   6 +-
+ MAINTAINERS                                        |   1 +
+ drivers/of/address.c                               |   2 +-
+ drivers/of/base.c                                  |  36 +++---
+ drivers/of/dynamic.c                               |   2 +-
+ drivers/of/fdt.c                                   |   4 +-
+ drivers/of/irq.c                                   |   5 +-
+ drivers/of/of_private.h                            |   4 +-
+ drivers/of/overlay.c                               |   4 +
+ drivers/of/platform.c                              |   2 +-
+ drivers/of/resolver.c                              |  34 +-----
+ drivers/of/unittest-data/tests-platform.dtsi       |   4 +-
+ drivers/of/unittest.c                              |  58 +++++++++
+ include/linux/of.h                                 |   6 +
+ include/linux/of_fdt.h                             |   3 -
+ lib/vsprintf.c                                     | 136 +++++++++++++++++++++
+ scripts/checkpatch.pl                              |   2 +-
+ scripts/dtc/dtx_diff                               |   2 +-
+ 46 files changed, 359 insertions(+), 126 deletions(-)
+ rename Documentation/devicetree/bindings/{powerpc/fsl/fman.txt => net/fsl-fman.txt} (100%)
+ rename Documentation/devicetree/bindings/thermal/{brcm,ns-thermal => brcm,ns-thermal.txt} (100%)
+Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
+$ git merge mailbox/mailbox-for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/mailbox/qcom,apcs-kpss-global.txt     |  46 ++++++++
+ drivers/mailbox/Kconfig                            |   8 ++
+ drivers/mailbox/Makefile                           |   2 +
+ drivers/mailbox/mailbox.c                          |  16 ++-
+ drivers/mailbox/qcom-apcs-ipc-mailbox.c            | 129 +++++++++++++++++++++
+ 5 files changed, 195 insertions(+), 6 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
+ create mode 100644 drivers/mailbox/qcom-apcs-ipc-mailbox.c
+Merging spi/for-next (9e138741788f Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/st-ssc4' and 'spi/topic/stm32' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/sh-msiof.txt |    2 +
+ Documentation/devicetree/bindings/spi/spi-bus.txt  |   76 +-
+ .../devicetree/bindings/spi/spi-meson.txt          |   31 +
+ .../devicetree/bindings/spi/spi-mt65xx.txt         |    2 +
+ .../devicetree/bindings/spi/spi-stm32.txt          |   59 +
+ Documentation/spi/spi-summary                      |   27 +-
+ drivers/spi/Kconfig                                |   44 +-
+ drivers/spi/Makefile                               |    6 +
+ drivers/spi/spi-atmel.c                            |   30 +-
+ drivers/spi/spi-bcm63xx-hsspi.c                    |    1 +
+ drivers/spi/spi-bcm63xx.c                          |    4 +-
+ drivers/spi/spi-davinci.c                          |    9 +-
+ drivers/spi/spi-fsl-dspi.c                         |    3 +-
+ drivers/spi/spi-imx.c                              |   92 +-
+ drivers/spi/spi-loopback-test.c                    |   14 +-
+ drivers/spi/spi-meson-spicc.c                      |  619 +++++++++
+ drivers/spi/spi-mt65xx.c                           |   61 +-
+ drivers/spi/spi-omap2-mcspi.c                      |    3 -
+ drivers/spi/spi-orion.c                            |   10 +-
+ drivers/spi/spi-pxa2xx.c                           |   22 +
+ drivers/spi/spi-rockchip.c                         |   79 +-
+ drivers/spi/spi-sh-msiof.c                         |  111 +-
+ drivers/spi/spi-sirf.c                             |    2 +-
+ drivers/spi/spi-slave-system-control.c             |  154 +++
+ drivers/spi/spi-slave-time.c                       |  129 ++
+ drivers/spi/spi-st-ssc4.c                          |   38 +-
+ drivers/spi/spi-stm32.c                            | 1322 ++++++++++++++++++++
+ drivers/spi/spi.c                                  | 1220 ++++++++++--------
+ drivers/spi/spidev.c                               |   11 +-
+ include/linux/platform_data/spi-mt65xx.h           |    2 +
+ include/linux/pxa2xx_ssp.h                         |    1 +
+ include/linux/spi/sh_msiof.h                       |    6 +
+ include/linux/spi/spi.h                            |  217 ++--
+ include/trace/events/spi.h                         |   26 +-
+ 34 files changed, 3573 insertions(+), 860 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-stm32.txt
+ create mode 100644 drivers/spi/spi-meson-spicc.c
+ create mode 100644 drivers/spi/spi-slave-system-control.c
+ create mode 100644 drivers/spi/spi-slave-time.c
+ create mode 100644 drivers/spi/spi-stm32.c
+Merging tip/auto-latest (e45571dd9ccb Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Resolved 'arch/arm/include/uapi/asm/Kbuild' using previous resolution.
+Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution.
+Resolved 'drivers/acpi/apei/ghes.c' using previous resolution.
+Resolved 'kernel/irq/affinity.c' using previous resolution.
+Resolved 'net/bluetooth/bnep/core.c' using previous resolution.
+Resolved 'net/bluetooth/cmtp/core.c' using previous resolution.
+Resolved 'net/bluetooth/hidp/core.c' using previous resolution.
+Auto-merging tools/testing/selftests/rcutorture/configs/rcuperf/TINY
+Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
+Removing tools/lib/lockdep/uinclude/trace/events/lock.h
+Removing tools/lib/lockdep/uinclude/linux/stringify.h
+Removing tools/lib/lockdep/uinclude/linux/spinlock.h
+Removing tools/lib/lockdep/uinclude/linux/seq_file.h
+Removing tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+Removing tools/lib/lockdep/uinclude/linux/proc_fs.h
+Removing tools/lib/lockdep/uinclude/linux/prefetch.h
+Removing tools/lib/lockdep/uinclude/linux/poison.h
+Removing tools/lib/lockdep/uinclude/linux/mutex.h
+Removing tools/lib/lockdep/uinclude/linux/list.h
+Removing tools/lib/lockdep/uinclude/linux/linkage.h
+Removing tools/lib/lockdep/uinclude/linux/kernel.h
+Removing tools/lib/lockdep/uinclude/linux/interrupt.h
+Removing tools/lib/lockdep/uinclude/linux/hash.h
+Removing tools/lib/lockdep/uinclude/linux/gfp.h
+Removing tools/lib/lockdep/uinclude/linux/ftrace.h
+Removing tools/lib/lockdep/uinclude/linux/delay.h
+Removing tools/lib/lockdep/uinclude/linux/compiler.h
+Removing tools/lib/lockdep/uinclude/linux/bitops.h
+Removing tools/lib/lockdep/uinclude/asm/sections.h
+Removing tools/lib/lockdep/uinclude/asm/hweight.h
+Removing tools/lib/lockdep/uinclude/asm/hash.h
+Auto-merging tools/include/linux/rcu.h
+Auto-merging tools/include/linux/module.h
+Auto-merging tools/include/linux/lockdep.h
+Auto-merging tools/include/linux/kallsyms.h
+Auto-merging tools/include/linux/irqflags.h
+Auto-merging tools/include/linux/debug_locks.h
+Auto-merging sound/core/timer.c
+Auto-merging sound/core/seq/seq_memory.c
+Auto-merging sound/core/rawmidi.c
+Auto-merging sound/core/pcm_native.c
+Auto-merging sound/core/pcm_lib.c
+Auto-merging sound/core/oss/pcm_oss.c
+Auto-merging sound/core/init.c
+Auto-merging sound/core/control.c
+Auto-merging scripts/checkpatch.pl
+Auto-merging net/core/datagram.c
+Auto-merging net/bluetooth/hidp/core.c
+CONFLICT (content): Merge conflict in net/bluetooth/hidp/core.c
+Auto-merging net/bluetooth/cmtp/core.c
+CONFLICT (content): Merge conflict in net/bluetooth/cmtp/core.c
+Auto-merging net/bluetooth/bnep/core.c
+CONFLICT (content): Merge conflict in net/bluetooth/bnep/core.c
+Auto-merging mm/shmem.c
+Auto-merging mm/filemap.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/signal.c
+Removing kernel/rcu/tree_trace.c
+Removing kernel/rcu/srcu.c
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/irq/irqdesc.c
+Auto-merging kernel/irq/handle.c
+Auto-merging kernel/irq/chip.c
+Auto-merging kernel/irq/affinity.c
+CONFLICT (content): Merge conflict in kernel/irq/affinity.c
+Auto-merging kernel/futex.c
+Auto-merging kernel/events/core.c
+Auto-merging include/linux/vfio.h
+Auto-merging include/linux/sunrpc/sched.h
+Removing include/linux/srcuclassic.h
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/blk-mq.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+Removing include/asm-generic/siginfo.h
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_icache.c
+Auto-merging fs/nfs/nfs4proc.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/inode.c
+Auto-merging fs/eventfd.c
+Auto-merging fs/dax.c
+Auto-merging drivers/tty/synclink_gt.c
+Auto-merging drivers/ras/ras.c
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/pci/msi.c
+Auto-merging drivers/pci/host/vmd.c
+Auto-merging drivers/net/wireless/marvell/libertas/main.c
+Auto-merging drivers/net/wireless/cisco/airo.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/iommu/intel_irq_remapping.c
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/i915/i915_sw_fence.h
+Auto-merging drivers/gpu/drm/i915/i915_sw_fence.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_request.h
+Auto-merging drivers/cpufreq/cpufreq.c
+Auto-merging drivers/clocksource/timer-probe.c
+Removing drivers/clocksource/moxart_timer.c
+Removing drivers/clocksource/clkevt-probe.c
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+Removing drivers/char/mmtimer.c
+Auto-merging drivers/char/Kconfig
+Auto-merging drivers/bluetooth/btmrvl_main.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging drivers/acpi/apei/ghes.c
+CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c
+Auto-merging block/kyber-iosched.c
+Auto-merging block/blk-mq.c
+Removing arch/x86/ras/mce_amd_inj.c
+Removing arch/x86/ras/Makefile
+Auto-merging arch/x86/power/hibernate_64.c
+Removing arch/x86/mm/gup.c
+Auto-merging arch/x86/include/uapi/asm/hyperv.h
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/Makefile
+Auto-merging arch/unicore32/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
+Removing arch/sparc/include/asm/siginfo.h
+Removing arch/score/include/uapi/asm/siginfo.h
+Auto-merging arch/powerpc/platforms/powernv/subcore.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/Kconfig
+Removing arch/mn10300/include/uapi/asm/siginfo.h
+Auto-merging arch/mips/generic/init.c
+Auto-merging arch/microblaze/kernel/timer.c
+Removing arch/m32r/include/uapi/asm/siginfo.h
+Removing arch/ia64/include/asm/siginfo.h
+Auto-merging arch/arm64/kernel/vdso.c
+Auto-merging arch/arm64/kernel/insn.c
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mach-s3c64xx/Kconfig
+Auto-merging arch/arm/mach-rockchip/rockchip.c
+Auto-merging arch/arm/mach-omap2/timer.c
+Auto-merging arch/arm/mach-bcm/Kconfig
+Auto-merging arch/arm/include/uapi/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/arm/include/uapi/asm/Kbuild
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arc/kernel/setup.c
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Removing Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Removing Documentation/RCU/trace.txt
+CONFLICT (modify/delete): Documentation/DocBook/kernel-hacking.tmpl deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/DocBook/kernel-hacking.tmpl left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/DocBook/kernel-hacking.tmpl
+Documentation/DocBook/kernel-hacking.tmpl: needs merge
+rm 'Documentation/DocBook/kernel-hacking.tmpl'
+$ git commit -v -a
+[master 92b4c6dd197b] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/IRQ-domain.txt                       |   41 +-
+ Documentation/RCU/00-INDEX                         |    2 -
+ .../RCU/Design/Requirements/Requirements.html      |   34 +-
+ Documentation/RCU/checklist.txt                    |    8 +-
+ Documentation/RCU/trace.txt                        |  535 -----------
+ Documentation/admin-guide/kernel-parameters.txt    |   50 +-
+ Documentation/core-api/atomic_ops.rst              |    5 +
+ Documentation/dev-tools/sparse.rst                 |    6 -
+ .../interrupt-controller/allwinner,sunxi-nmi.txt   |    7 +-
+ .../interrupt-controller/aspeed,ast2400-i2c-ic.txt |   25 +
+ .../interrupt-controller/aspeed,ast2400-vic.txt    |    9 +-
+ .../bindings/interrupt-controller/marvell,gicp.txt |   27 +
+ .../bindings/interrupt-controller/marvell,icu.txt  |   51 +
+ .../devicetree/bindings/timer/faraday,fttmr010.txt |    6 +-
+ .../bindings/timer/moxa,moxart-timer.txt           |   19 -
+ Documentation/driver-model/devres.txt              |    2 +
+ Documentation/filesystems/autofs4.txt              |   12 +-
+ Documentation/kernel-per-CPU-kthreads.txt          |   31 +-
+ Documentation/memory-barriers.txt                  |    2 +-
+ Documentation/scheduler/sched-deadline.txt         |  168 ++++
+ Documentation/timers/NO_HZ.txt                     |   29 +-
+ Documentation/trace/ftrace.txt                     |    2 +-
+ Documentation/x86/x86_64/boot-options.txt          |    3 +-
+ MAINTAINERS                                        |   11 +-
+ arch/Kconfig                                       |    9 +
+ arch/arc/include/asm/Kbuild                        |    1 -
+ arch/arc/include/uapi/asm/Kbuild                   |    2 +
+ arch/arc/kernel/setup.c                            |    2 +-
+ arch/arm/Kconfig                                   |   29 +-
+ arch/arm/include/asm/Kbuild                        |    1 -
+ arch/arm/include/asm/dmi.h                         |   19 +
+ arch/arm/include/uapi/asm/Kbuild                   |    2 +
+ arch/arm/kernel/hw_breakpoint.c                    |   13 +-
+ arch/arm/kernel/patch.c                            |    2 +-
+ arch/arm/kernel/smp.c                              |    3 +-
+ arch/arm/kernel/smp_twd.c                          |    6 +-
+ arch/arm/kernel/time.c                             |    2 +-
+ arch/arm/mach-aspeed/Kconfig                       |    2 +-
+ arch/arm/mach-bcm/Kconfig                          |    2 +-
+ arch/arm/mach-clps711x/Kconfig                     |    2 +-
+ arch/arm/mach-mediatek/mediatek.c                  |    2 +-
+ arch/arm/mach-moxart/Kconfig                       |    2 +-
+ arch/arm/mach-omap2/timer.c                        |   10 +-
+ arch/arm/mach-rockchip/rockchip.c                  |    2 +-
+ arch/arm/mach-s3c24xx/Kconfig                      |    2 +-
+ arch/arm/mach-s3c64xx/Kconfig                      |    2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c           |    2 +-
+ arch/arm/mach-spear/spear13xx.c                    |    2 +-
+ arch/arm/mach-sunxi/sunxi.c                        |    2 +-
+ arch/arm/mach-u300/core.c                          |    2 +-
+ arch/arm/mach-zynq/common.c                        |    2 +-
+ arch/arm/probes/kprobes/core.c                     |    3 +-
+ arch/arm64/Kconfig                                 |    2 +-
+ arch/arm64/Kconfig.platforms                       |    4 +-
+ arch/arm64/include/asm/insn.h                      |    1 -
+ arch/arm64/kernel/efi.c                            |   15 -
+ arch/arm64/kernel/insn.c                           |    5 +-
+ arch/arm64/kernel/smp.c                            |    3 +-
+ arch/arm64/kernel/time.c                           |    2 +-
+ arch/arm64/kernel/vdso.c                           |    6 +-
+ arch/c6x/include/asm/Kbuild                        |    1 -
+ arch/c6x/include/uapi/asm/Kbuild                   |    1 +
+ arch/cris/include/asm/Kbuild                       |    1 -
+ arch/cris/include/uapi/asm/Kbuild                  |    2 +
+ arch/h8300/Kconfig                                 |    2 +-
+ arch/h8300/include/asm/Kbuild                      |    1 -
+ arch/h8300/include/uapi/asm/Kbuild                 |    2 +
+ arch/h8300/kernel/setup.c                          |    2 +-
+ arch/hexagon/include/asm/Kbuild                    |    1 -
+ arch/hexagon/include/uapi/asm/Kbuild               |    2 +
+ arch/ia64/include/asm/siginfo.h                    |   23 -
+ arch/ia64/include/uapi/asm/siginfo.h               |    1 -
+ arch/m32r/include/uapi/asm/Kbuild                  |    2 +
+ arch/m32r/include/uapi/asm/siginfo.h               |    6 -
+ arch/m68k/include/asm/Kbuild                       |    1 -
+ arch/m68k/include/uapi/asm/Kbuild                  |    1 +
+ arch/metag/kernel/smp.c                            |    3 +-
+ arch/microblaze/Kconfig                            |    2 +-
+ arch/microblaze/include/uapi/asm/Kbuild            |    1 +
+ arch/microblaze/kernel/setup.c                     |    2 +-
+ arch/microblaze/kernel/timer.c                     |    2 +-
+ arch/mips/generic/init.c                           |    2 +-
+ arch/mips/kernel/jump_label.c                      |    2 -
+ arch/mips/mti-malta/malta-time.c                   |    2 +-
+ arch/mips/pic32/pic32mzda/time.c                   |    2 +-
+ arch/mips/pistachio/time.c                         |    2 +-
+ arch/mips/ralink/Kconfig                           |    2 +-
+ arch/mips/ralink/cevt-rt3352.c                     |    2 +-
+ arch/mips/ralink/clk.c                             |    2 +-
+ arch/mips/ralink/timer-gic.c                       |    2 +-
+ arch/mips/xilfpga/time.c                           |    2 +-
+ arch/mn10300/include/uapi/asm/Kbuild               |    2 +
+ arch/mn10300/include/uapi/asm/siginfo.h            |    1 -
+ arch/nios2/Kconfig                                 |    2 +-
+ arch/nios2/include/asm/Kbuild                      |    1 -
+ arch/nios2/include/uapi/asm/Kbuild                 |    1 +
+ arch/nios2/kernel/time.c                           |    4 +-
+ arch/openrisc/include/asm/Kbuild                   |    1 -
+ arch/openrisc/include/uapi/asm/Kbuild              |    2 +
+ arch/powerpc/Kconfig                               |    2 +-
+ arch/powerpc/include/asm/topology.h                |    6 +
+ arch/powerpc/kernel/rtasd.c                        |    2 +-
+ arch/powerpc/kernel/smp.c                          |    2 +-
+ arch/powerpc/kvm/book3s_hv.c                       |   14 +-
+ arch/powerpc/mm/numa.c                             |   22 +-
+ arch/powerpc/platforms/powernv/subcore.c           |    7 +-
+ arch/s390/kernel/jump_label.c                      |    2 +-
+ arch/s390/kernel/kprobes.c                         |    4 +-
+ arch/s390/kernel/time.c                            |    6 +-
+ arch/score/include/uapi/asm/Kbuild                 |    2 +
+ arch/score/include/uapi/asm/siginfo.h              |    6 -
+ arch/sh/boards/Kconfig                             |    2 +-
+ arch/sh/boards/of-generic.c                        |    2 +-
+ arch/sh/include/asm/Kbuild                         |    1 -
+ arch/sh/include/uapi/asm/Kbuild                    |    2 +
+ arch/sparc/include/asm/siginfo.h                   |   13 -
+ arch/sparc/kernel/jump_label.c                     |    2 -
+ arch/tile/kernel/jump_label.c                      |    2 -
+ arch/tile/lib/atomic_asm_32.S                      |    3 +-
+ arch/unicore32/include/asm/Kbuild                  |    1 -
+ arch/unicore32/include/uapi/asm/Kbuild             |    1 +
+ arch/x86/Kconfig                                   |    9 +-
+ arch/x86/Makefile                                  |    2 -
+ arch/x86/boot/compressed/cmdline.c                 |    2 +-
+ arch/x86/boot/compressed/eboot.c                   |   73 +-
+ arch/x86/boot/compressed/head_64.S                 |   86 +-
+ arch/x86/boot/compressed/kaslr.c                   |  191 ++--
+ arch/x86/boot/compressed/pagetable.c               |    2 +-
+ arch/x86/boot/copy.S                               |   20 -
+ arch/x86/boot/string.c                             |    8 +
+ arch/x86/boot/string.h                             |    1 +
+ arch/x86/entry/entry_64.S                          |    3 +-
+ arch/x86/events/core.c                             |   28 +-
+ arch/x86/events/intel/core.c                       |   74 +-
+ arch/x86/events/intel/cqm.c                        |   16 +-
+ arch/x86/events/perf_event.h                       |    3 +
+ arch/x86/include/asm/amd_nb.h                      |    3 +-
+ arch/x86/include/asm/apic.h                        |   36 +-
+ arch/x86/include/asm/atomic.h                      |   13 -
+ arch/x86/include/asm/efi.h                         |    2 +-
+ arch/x86/include/asm/hardirq.h                     |    2 +-
+ arch/x86/include/asm/irq.h                         |    1 -
+ arch/x86/include/asm/irq_remapping.h               |    3 +-
+ arch/x86/include/asm/mce.h                         |    4 -
+ arch/x86/include/asm/mmu.h                         |    6 -
+ arch/x86/include/asm/mmu_context.h                 |   63 +-
+ arch/x86/include/asm/msr-index.h                   |    2 +
+ arch/x86/include/asm/paravirt.h                    |   10 +-
+ arch/x86/include/asm/paravirt_types.h              |    5 +-
+ arch/x86/include/asm/pgtable-3level.h              |   47 +
+ arch/x86/include/asm/pgtable.h                     |   55 +-
+ arch/x86/include/asm/pgtable_64.h                  |   22 +-
+ arch/x86/include/asm/processor-flags.h             |   36 +
+ arch/x86/include/asm/processor.h                   |   13 +
+ arch/x86/include/asm/setup.h                       |    1 -
+ arch/x86/include/asm/special_insns.h               |   10 +-
+ arch/x86/include/asm/timer.h                       |    8 +-
+ arch/x86/include/asm/tlbbatch.h                    |   14 +
+ arch/x86/include/asm/tlbflush.h                    |  114 +--
+ arch/x86/include/asm/uv/uv.h                       |   11 +-
+ arch/x86/include/uapi/asm/hyperv.h                 |   15 +-
+ arch/x86/include/uapi/asm/processor-flags.h        |    2 +
+ arch/x86/kernel/apic/apic.c                        |  115 ++-
+ arch/x86/kernel/apic/apic_flat_64.c                |    4 +-
+ arch/x86/kernel/apic/apic_noop.c                   |    2 +-
+ arch/x86/kernel/apic/apic_numachip.c               |    4 +-
+ arch/x86/kernel/apic/bigsmp_32.c                   |    2 +-
+ arch/x86/kernel/apic/htirq.c                       |   21 +-
+ arch/x86/kernel/apic/io_apic.c                     |   44 +-
+ arch/x86/kernel/apic/msi.c                         |   55 +-
+ arch/x86/kernel/apic/probe_32.c                    |    2 +-
+ arch/x86/kernel/apic/vector.c                      |   53 +-
+ arch/x86/kernel/apic/x2apic_cluster.c              |   36 +-
+ arch/x86/kernel/apic/x2apic_phys.c                 |    2 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c                 |   26 +-
+ arch/x86/kernel/cpu/mcheck/dev-mcelog.c            |   55 +-
+ arch/x86/kernel/cpu/mcheck/mce-inject.c            |  569 ++++++++++-
+ arch/x86/kernel/cpu/mcheck/mce-internal.h          |    6 +-
+ arch/x86/kernel/cpu/mcheck/mce.c                   |   17 +-
+ arch/x86/kernel/cpu/mcheck/mce_amd.c               |  273 +++---
+ arch/x86/kernel/cpu/microcode/amd.c                |    2 +-
+ arch/x86/kernel/cpu/microcode/core.c               |   11 +
+ arch/x86/kernel/cpu/microcode/intel.c              |   27 +-
+ arch/x86/kernel/cpu/mshyperv.c                     |   18 +-
+ arch/x86/kernel/cpu/mtrr/main.c                    |    2 -
+ arch/x86/kernel/espfix_64.c                        |    2 +-
+ arch/x86/kernel/head64.c                           |  145 ++-
+ arch/x86/kernel/head_64.S                          |  131 +--
+ arch/x86/kernel/hpet.c                             |    2 +-
+ arch/x86/kernel/irq.c                              |   78 +-
+ arch/x86/kernel/jump_label.c                       |    2 -
+ arch/x86/kernel/ldt.c                              |   56 +-
+ arch/x86/kernel/machine_kexec_64.c                 |    2 +-
+ arch/x86/kernel/nmi_selftest.c                     |    2 +-
+ arch/x86/kernel/paravirt.c                         |    2 +-
+ arch/x86/kernel/process_32.c                       |    2 +-
+ arch/x86/kernel/process_64.c                       |    4 +-
+ arch/x86/kernel/setup.c                            |    2 +-
+ arch/x86/kernel/smpboot.c                          |    3 +-
+ arch/x86/kernel/step.c                             |    2 +-
+ arch/x86/kernel/time.c                             |    2 +-
+ arch/x86/kernel/tsc.c                              |  210 ++--
+ arch/x86/kernel/tsc_sync.c                         |   21 +-
+ arch/x86/kvm/vmx.c                                 |   21 +-
+ arch/x86/math-emu/fpu_system.h                     |    2 +-
+ arch/x86/mm/Makefile                               |    2 +-
+ arch/x86/mm/dump_pagetables.c                      |    2 +-
+ arch/x86/mm/fault.c                                |   10 +-
+ arch/x86/mm/gup.c                                  |  496 ----------
+ arch/x86/mm/init.c                                 |    4 +-
+ arch/x86/mm/init_64.c                              |  116 ++-
+ arch/x86/mm/ioremap.c                              |    2 +-
+ arch/x86/mm/kasan_init_64.c                        |   12 +-
+ arch/x86/mm/kaslr.c                                |   81 +-
+ arch/x86/mm/mmap.c                                 |    3 -
+ arch/x86/mm/tlb.c                                  |  423 ++++-----
+ arch/x86/platform/efi/efi.c                        |    3 +-
+ arch/x86/platform/efi/efi_32.c                     |    9 +-
+ arch/x86/platform/efi/efi_64.c                     |    9 +-
+ arch/x86/platform/efi/quirks.c                     |  137 +++
+ arch/x86/platform/olpc/olpc-xo1-pm.c               |    2 +-
+ arch/x86/platform/uv/tlb_uv.c                      |   24 +-
+ arch/x86/platform/uv/uv_irq.c                      |   18 +-
+ arch/x86/power/cpu.c                               |    2 +-
+ arch/x86/power/hibernate_64.c                      |    3 +-
+ arch/x86/ras/Kconfig                               |   11 -
+ arch/x86/ras/Makefile                              |    2 -
+ arch/x86/ras/mce_amd_inj.c                         |  492 ----------
+ arch/x86/realmode/init.c                           |    2 +-
+ arch/x86/xen/apic.c                                |    2 +-
+ arch/x86/xen/efi.c                                 |   45 +-
+ arch/x86/xen/mmu_pv.c                              |   83 +-
+ arch/x86/xen/xen-pvh.S                             |    2 +-
+ arch/xtensa/include/asm/Kbuild                     |    1 -
+ arch/xtensa/include/uapi/asm/Kbuild                |    1 +
+ arch/xtensa/kernel/time.c                          |    2 +-
+ block/blk-mq.c                                     |    4 +-
+ block/blk-wbt.c                                    |    4 +-
+ block/kyber-iosched.c                              |   16 +-
+ drivers/acpi/apei/ghes.c                           |   39 +-
+ drivers/acpi/pci_root.c                            |    2 +-
+ drivers/acpi/processor_driver.c                    |    4 +-
+ drivers/acpi/processor_throttling.c                |   16 +-
+ drivers/base/node.c                                |    2 +-
+ drivers/base/platform-msi.c                        |    2 +-
+ drivers/bluetooth/btmrvl_main.c                    |    2 +-
+ drivers/char/Kconfig                               |    9 -
+ drivers/char/Makefile                              |    1 -
+ drivers/char/ipmi/ipmi_watchdog.c                  |    2 +-
+ drivers/char/mmtimer.c                             |  858 -----------------
+ drivers/clocksource/Kconfig                        |   80 +-
+ drivers/clocksource/Makefile                       |    5 +-
+ drivers/clocksource/arc_timer.c                    |    6 +-
+ drivers/clocksource/arm_arch_timer.c               |    8 +-
+ drivers/clocksource/arm_global_timer.c             |    2 +-
+ drivers/clocksource/armv7m_systick.c               |    2 +-
+ drivers/clocksource/asm9260_timer.c                |    2 +-
+ drivers/clocksource/bcm2835_timer.c                |    2 +-
+ drivers/clocksource/bcm_kona_timer.c               |    4 +-
+ drivers/clocksource/cadence_ttc_timer.c            |    2 +-
+ drivers/clocksource/clkevt-probe.c                 |   56 --
+ drivers/clocksource/clksrc-dbx500-prcmu.c          |    2 +-
+ drivers/clocksource/clksrc_st_lpc.c                |    2 +-
+ drivers/clocksource/clps711x-timer.c               |    4 +-
+ drivers/clocksource/dw_apb_timer_of.c              |    8 +-
+ drivers/clocksource/exynos_mct.c                   |    4 +-
+ drivers/clocksource/fsl_ftm_timer.c                |   10 +-
+ drivers/clocksource/h8300_timer16.c                |    2 +-
+ drivers/clocksource/h8300_timer8.c                 |    2 +-
+ drivers/clocksource/h8300_tpu.c                    |    2 +-
+ drivers/clocksource/jcore-pit.c                    |    2 +-
+ drivers/clocksource/meson6_timer.c                 |    2 +-
+ drivers/clocksource/mips-gic-timer.c               |    7 +-
+ drivers/clocksource/moxart_timer.c                 |  256 -----
+ drivers/clocksource/mps2-timer.c                   |    2 +-
+ drivers/clocksource/mtk_timer.c                    |    2 +-
+ drivers/clocksource/mxs_timer.c                    |    2 +-
+ drivers/clocksource/nomadik-mtu.c                  |    2 +-
+ drivers/clocksource/pxa_timer.c                    |    2 +-
+ drivers/clocksource/qcom-timer.c                   |    4 +-
+ drivers/clocksource/renesas-ostm.c                 |    2 +-
+ drivers/clocksource/rockchip_timer.c               |    4 +-
+ drivers/clocksource/samsung_pwm_timer.c            |   10 +-
+ drivers/clocksource/sun4i_timer.c                  |  173 ++--
+ drivers/clocksource/tango_xtal.c                   |    2 +-
+ drivers/clocksource/tcb_clksrc.c                   |  109 ++-
+ drivers/clocksource/tegra20_timer.c                |    4 +-
+ drivers/clocksource/time-armada-370-xp.c           |    6 +-
+ drivers/clocksource/time-efm32.c                   |    4 +-
+ drivers/clocksource/time-lpc32xx.c                 |    2 +-
+ drivers/clocksource/time-orion.c                   |    2 +-
+ drivers/clocksource/time-pistachio.c               |    2 +-
+ drivers/clocksource/timer-atlas7.c                 |    2 +-
+ drivers/clocksource/timer-atmel-pit.c              |    2 +-
+ drivers/clocksource/timer-atmel-st.c               |    2 +-
+ drivers/clocksource/timer-digicolor.c              |    2 +-
+ drivers/clocksource/timer-fttmr010.c               |  476 ++++++----
+ drivers/clocksource/timer-imx-gpt.c                |   24 +-
+ drivers/clocksource/timer-integrator-ap.c          |    2 +-
+ drivers/clocksource/timer-keystone.c               |    2 +-
+ drivers/clocksource/timer-nps.c                    |    6 +-
+ drivers/clocksource/timer-of.c                     |  171 ++++
+ drivers/clocksource/timer-of.h                     |   69 ++
+ drivers/clocksource/timer-oxnas-rps.c              |    4 +-
+ drivers/clocksource/timer-prima2.c                 |    2 +-
+ .../clocksource/{clksrc-probe.c => timer-probe.c}  |   20 +-
+ drivers/clocksource/timer-sp804.c                  |    4 +-
+ drivers/clocksource/timer-stm32.c                  |    2 +-
+ drivers/clocksource/timer-sun5i.c                  |    4 +-
+ drivers/clocksource/timer-ti-32k.c                 |    2 +-
+ drivers/clocksource/timer-u300.c                   |    2 +-
+ drivers/clocksource/versatile.c                    |    4 +-
+ drivers/clocksource/vf_pit_timer.c                 |    2 +-
+ drivers/clocksource/vt8500_timer.c                 |    2 +-
+ drivers/clocksource/zevio-timer.c                  |    2 +-
+ drivers/cpufreq/cpufreq.c                          |   21 +-
+ drivers/cpufreq/pasemi-cpufreq.c                   |    2 +-
+ drivers/cpuidle/cpuidle.c                          |    1 +
+ drivers/firmware/efi/Kconfig                       |    9 +
+ drivers/firmware/efi/arm-runtime.c                 |   16 +
+ drivers/firmware/efi/capsule-loader.c              |  117 +--
+ drivers/firmware/efi/capsule.c                     |   11 +-
+ drivers/firmware/efi/efi.c                         |    3 +-
+ drivers/firmware/efi/test/efi_test.c               |   11 +-
+ drivers/gpu/drm/i915/i915_gem_request.h            |    2 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c               |   35 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h               |    2 +-
+ drivers/gpu/drm/radeon/radeon.h                    |    2 +-
+ drivers/gpu/drm/radeon/radeon_fence.c              |    2 +-
+ drivers/gpu/vga/vgaarb.c                           |    2 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c      |   20 +-
+ drivers/hwtracing/coresight/coresight-etm4x.c      |   20 +-
+ drivers/infiniband/hw/i40iw/i40iw_main.c           |    2 +-
+ drivers/iommu/amd_iommu.c                          |   22 +-
+ drivers/iommu/intel-iommu.c                        |    4 +-
+ drivers/iommu/intel_irq_remapping.c                |   31 +-
+ drivers/iommu/of_iommu.c                           |    2 +-
+ drivers/irqchip/Kconfig                            |    6 +
+ drivers/irqchip/Makefile                           |    4 +-
+ drivers/irqchip/irq-armada-370-xp.c                |  148 ++-
+ drivers/irqchip/irq-aspeed-i2c-ic.c                |  115 +++
+ drivers/irqchip/irq-aspeed-vic.c                   |    5 +-
+ drivers/irqchip/irq-gic-v2m.c                      |    2 +-
+ drivers/irqchip/irq-gic-v3-its-pci-msi.c           |   35 +-
+ drivers/irqchip/irq-gic-v3-its-platform-msi.c      |    2 +-
+ drivers/irqchip/irq-gic-v3-its.c                   |  113 ++-
+ drivers/irqchip/irq-i8259.c                        |    2 +-
+ drivers/irqchip/irq-imx-gpcv2.c                    |    2 +-
+ drivers/irqchip/irq-mbigen.c                       |    2 +-
+ drivers/irqchip/irq-mips-cpu.c                     |    2 +-
+ drivers/irqchip/irq-mips-gic.c                     |    4 +-
+ drivers/irqchip/irq-mvebu-gicp.c                   |  279 ++++++
+ drivers/irqchip/irq-mvebu-gicp.h                   |   11 +
+ drivers/irqchip/irq-mvebu-icu.c                    |  289 ++++++
+ drivers/irqchip/irq-renesas-h8300h.c               |    2 +-
+ drivers/irqchip/irq-renesas-h8s.c                  |    2 +-
+ drivers/irqchip/irq-sunxi-nmi.c                    |   68 +-
+ drivers/irqchip/qcom-irq-combiner.c                |    7 +-
+ drivers/md/bcache/btree.h                          |    2 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_main.h |    4 +-
+ drivers/net/wireless/cisco/airo.c                  |    2 +-
+ .../net/wireless/intersil/hostap/hostap_ioctl.c    |    2 +-
+ drivers/net/wireless/marvell/libertas/main.c       |    2 +-
+ drivers/pci/host/vmd.c                             |    8 +-
+ drivers/pci/msi.c                                  |    2 +-
+ drivers/pci/pci-driver.c                           |   47 +-
+ drivers/ras/cec.c                                  |    2 +-
+ drivers/ras/ras.c                                  |    2 +-
+ drivers/rtc/rtc-imxdi.c                            |    2 +-
+ drivers/scsi/dpt/dpti_i2o.h                        |    2 +-
+ drivers/scsi/ips.c                                 |   12 +-
+ drivers/scsi/ips.h                                 |    4 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-msi.c            |    2 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    6 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    4 +-
+ drivers/staging/lustre/lnet/libcfs/debug.c         |    2 +-
+ drivers/staging/lustre/lnet/libcfs/tracefile.c     |    2 +-
+ drivers/staging/lustre/lnet/lnet/lib-eq.c          |    2 +-
+ drivers/staging/lustre/lnet/lnet/lib-socket.c      |    2 +-
+ drivers/staging/lustre/lustre/fid/fid_request.c    |    6 +-
+ drivers/staging/lustre/lustre/include/lustre_lib.h |    4 +-
+ drivers/staging/lustre/lustre/llite/lcommon_cl.c   |    2 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h    |    2 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c     |    2 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c |    6 +-
+ drivers/tty/synclink_gt.c                          |    2 +-
+ drivers/vfio/virqfd.c                              |    2 +-
+ drivers/vhost/vhost.c                              |    2 +-
+ drivers/vhost/vhost.h                              |    2 +-
+ drivers/xen/events/events_base.c                   |    6 +-
+ drivers/xen/manage.c                               |    1 +
+ drivers/xen/mcelog.c                               |    2 +
+ fs/autofs4/autofs_i.h                              |    2 +-
+ fs/autofs4/waitq.c                                 |   18 +-
+ fs/cachefiles/internal.h                           |    4 +-
+ fs/cachefiles/namei.c                              |    2 +-
+ fs/cachefiles/rdwr.c                               |    4 +-
+ fs/cifs/inode.c                                    |    1 +
+ fs/dax.c                                           |    4 +-
+ fs/eventfd.c                                       |    2 +-
+ fs/eventpoll.c                                     |   12 +-
+ fs/fs_pin.c                                        |    4 +-
+ fs/inode.c                                         |    8 +-
+ fs/jbd2/journal.c                                  |    4 +-
+ fs/nfs/internal.h                                  |    1 +
+ fs/nfs/nfs4proc.c                                  |    4 +-
+ fs/nilfs2/segment.c                                |    5 +-
+ fs/orangefs/orangefs-bufmap.c                      |   12 +-
+ fs/reiserfs/journal.c                              |    2 +-
+ fs/select.c                                        |    4 +-
+ fs/signalfd.c                                      |    2 +-
+ fs/userfaultfd.c                                   |   30 +-
+ fs/xfs/xfs_icache.c                                |    4 +-
+ fs/xfs/xfs_inode.c                                 |    8 +-
+ include/asm-generic/siginfo.h                      |   22 -
+ include/asm-generic/vmlinux.lds.h                  |    9 +-
+ .../dt-bindings/interrupt-controller/mvebu-icu.h   |   15 +
+ include/linux/bcm47xx_nvram.h                      |    1 +
+ include/linux/blk-mq.h                             |    2 +-
+ include/linux/clockchips.h                         |    9 -
+ include/linux/clocksource.h                        |   16 +-
+ include/linux/compat.h                             |    8 +
+ include/linux/compiler.h                           |    4 -
+ include/linux/cpu.h                                |   36 +-
+ include/linux/cpuhotplug.h                         |   39 +
+ include/linux/cpumask.h                            |   28 +
+ include/linux/efi.h                                |   14 +-
+ include/linux/eventfd.h                            |    4 +-
+ include/linux/fs.h                                 |    2 +-
+ include/linux/hrtimer.h                            |    6 +-
+ include/linux/interrupt.h                          |    6 +
+ include/linux/irq.h                                |   89 ++
+ include/linux/irqdesc.h                            |    4 +
+ include/linux/irqdomain.h                          |   43 +-
+ include/linux/kernel.h                             |    6 +-
+ include/linux/kvm_irqfd.h                          |    2 +-
+ include/linux/llist.h                              |   19 +
+ include/linux/mm_types_task.h                      |   15 +-
+ include/linux/padata.h                             |    3 -
+ include/linux/pagemap.h                            |    2 +-
+ include/linux/pci.h                                |    1 +
+ include/linux/perf_event.h                         |    2 +
+ include/linux/poll.h                               |    2 +-
+ include/linux/posix-clock.h                        |   22 -
+ include/linux/posix-timers.h                       |  105 +-
+ include/linux/rcu_node_tree.h                      |    4 +
+ include/linux/rcu_segcblist.h                      |    4 +
+ include/linux/rcupdate.h                           |  318 +------
+ include/linux/rcutiny.h                            |  167 +---
+ include/linux/rcutree.h                            |   21 +-
+ include/linux/refcount.h                           |   42 +
+ include/linux/restart_block.h                      |   15 +-
+ include/linux/rtmutex.h                            |   25 +-
+ include/linux/sched.h                              |   32 +-
+ include/linux/sched/clock.h                        |   11 +-
+ include/linux/sched/nohz.h                         |    8 +-
+ include/linux/sched/task.h                         |    2 -
+ include/linux/signal.h                             |    7 +-
+ include/linux/spinlock.h                           |   20 +
+ include/linux/srcu.h                               |   25 +-
+ include/linux/srcuclassic.h                        |  115 ---
+ include/linux/srcutiny.h                           |   47 +-
+ include/linux/srcutree.h                           |   13 +-
+ include/linux/stop_machine.h                       |   26 +-
+ include/linux/sunrpc/sched.h                       |    2 +-
+ include/linux/timekeeper_internal.h                |    4 +-
+ include/linux/vfio.h                               |    2 +-
+ include/linux/vm_event_item.h                      |    2 -
+ include/linux/wait.h                               | 1000 ++++++++------------
+ include/linux/wait_bit.h                           |  261 +++++
+ include/net/af_unix.h                              |    2 +-
+ include/trace/events/rcu.h                         |    1 +
+ include/uapi/asm-generic/siginfo.h                 |   15 +-
+ include/uapi/linux/auto_fs.h                       |    4 +-
+ include/uapi/linux/auto_fs4.h                      |    4 +-
+ include/uapi/linux/sched.h                         |    1 +
+ include/uapi/linux/time.h                          |    6 +-
+ init/Kconfig                                       |  350 +------
+ init/main.c                                        |   27 +-
+ kernel/async.c                                     |    8 +-
+ kernel/compat.c                                    |  526 ++--------
+ kernel/cpu.c                                       |  242 ++---
+ kernel/events/core.c                               |  136 ++-
+ kernel/exit.c                                      |   17 +-
+ kernel/extable.c                                   |    2 +-
+ kernel/futex.c                                     |    2 +-
+ kernel/irq/Kconfig                                 |   18 +
+ kernel/irq/Makefile                                |    2 +
+ kernel/irq/affinity.c                              |   76 +-
+ kernel/irq/autoprobe.c                             |    4 +-
+ kernel/irq/chip.c                                  |  195 +++-
+ kernel/irq/cpuhotplug.c                            |  150 ++-
+ kernel/irq/debugfs.c                               |  213 +++++
+ kernel/irq/devres.c                                |   86 ++
+ kernel/irq/generic-chip.c                          |    7 +-
+ kernel/irq/handle.c                                |    2 +
+ kernel/irq/internals.h                             |  225 ++++-
+ kernel/irq/irqdesc.c                               |   36 +-
+ kernel/irq/irqdomain.c                             |  359 +++++--
+ kernel/irq/manage.c                                |  119 +--
+ kernel/irq/migration.c                             |   30 +
+ kernel/irq/msi.c                                   |   13 +-
+ kernel/irq/proc.c                                  |  110 ++-
+ kernel/irq/timings.c                               |  369 ++++++++
+ kernel/jump_label.c                                |   20 +-
+ kernel/kprobes.c                                   |   59 +-
+ kernel/locking/lockdep.c                           |  176 ++--
+ kernel/locking/rtmutex-debug.c                     |    6 +-
+ kernel/locking/rtmutex-debug.h                     |    2 +-
+ kernel/locking/rtmutex.c                           |   37 +-
+ kernel/locking/rtmutex.h                           |    2 +-
+ kernel/padata.c                                    |   43 +-
+ kernel/printk/printk.c                             |    2 +-
+ kernel/rcu/Kconfig                                 |  242 +++++
+ kernel/rcu/Kconfig.debug                           |   82 ++
+ kernel/rcu/Makefile                                |    2 -
+ kernel/rcu/rcu.h                                   |  277 ++++++
+ kernel/rcu/rcuperf.c                               |  129 ++-
+ kernel/rcu/rcutorture.c                            |   21 +-
+ kernel/rcu/srcu.c                                  |  661 -------------
+ kernel/rcu/srcutiny.c                              |   86 +-
+ kernel/rcu/srcutree.c                              |  187 ++--
+ kernel/rcu/tiny.c                                  |   54 +-
+ kernel/rcu/tiny_plugin.h                           |  123 ---
+ kernel/rcu/tree.c                                  |  195 ++--
+ kernel/rcu/tree.h                                  |  109 +--
+ kernel/rcu/tree_exp.h                              |    2 +-
+ kernel/rcu/tree_plugin.h                           |  573 ++---------
+ kernel/rcu/tree_trace.c                            |  494 ----------
+ kernel/rcu/update.c                                |   77 +-
+ kernel/sched/Makefile                              |    6 +-
+ kernel/sched/clock.c                               |  128 ++-
+ kernel/sched/completion.c                          |    2 +-
+ kernel/sched/core.c                                |  780 ++-------------
+ kernel/sched/deadline.c                            |  894 ++++++++++++++++-
+ kernel/sched/fair.c                                |  449 ++++-----
+ kernel/sched/features.h                            |    2 +-
+ kernel/sched/idle.c                                |    1 +
+ kernel/sched/loadavg.c                             |   51 +-
+ kernel/sched/rt.c                                  |  323 ++++++-
+ kernel/sched/sched.h                               |  113 ++-
+ kernel/sched/topology.c                            |  430 +++++++--
+ kernel/sched/wait.c                                |  441 ++-------
+ kernel/sched/wait_bit.c                            |  286 ++++++
+ kernel/signal.c                                    |    3 +-
+ kernel/smp.c                                       |   16 +-
+ kernel/stop_machine.c                              |   11 +-
+ kernel/time/Kconfig                                |   50 -
+ kernel/time/alarmtimer.c                           |  381 ++++----
+ kernel/time/clocksource.c                          |    3 +
+ kernel/time/hrtimer.c                              |  106 ++-
+ kernel/time/itimer.c                               |   46 +-
+ kernel/time/posix-clock.c                          |  117 +--
+ kernel/time/posix-cpu-timers.c                     |  147 ++-
+ kernel/time/posix-stubs.c                          |  112 ++-
+ kernel/time/posix-timers.c                         |  759 ++++++++++-----
+ kernel/time/posix-timers.h                         |   40 +
+ kernel/time/tick-sched.c                           |   74 +-
+ kernel/time/tick-sched.h                           |    2 +
+ kernel/time/time.c                                 |  106 ++-
+ kernel/time/timekeeping.c                          |   46 +-
+ kernel/time/timer.c                                |    2 +-
+ kernel/workqueue.c                                 |    4 +-
+ lib/Kconfig.debug                                  |  187 +---
+ lib/Makefile                                       |    3 -
+ lib/cpumask.c                                      |   32 +
+ lib/locking-selftest-rtmutex.h                     |   11 +
+ lib/locking-selftest.c                             |  133 ++-
+ lib/refcount.c                                     |    3 +
+ lib/smp_processor_id.c                             |    2 +-
+ mm/Kconfig                                         |    2 +-
+ mm/filemap.c                                       |   12 +-
+ mm/gup.c                                           |   10 +-
+ mm/memcontrol.c                                    |   10 +-
+ mm/mempool.c                                       |    2 +-
+ mm/rmap.c                                          |   16 +-
+ mm/shmem.c                                         |    6 +-
+ mm/vmscan.c                                        |    2 +-
+ net/9p/trans_fd.c                                  |    4 +-
+ net/bluetooth/hidp/core.c                          |    2 +-
+ net/core/datagram.c                                |    2 +-
+ net/unix/af_unix.c                                 |    4 +-
+ scripts/checkpatch.pl                              |   17 -
+ security/keys/internal.h                           |    1 +
+ sound/core/control.c                               |    2 +-
+ sound/core/hwdep.c                                 |    2 +-
+ sound/core/init.c                                  |    2 +-
+ sound/core/oss/pcm_oss.c                           |    4 +-
+ sound/core/pcm_lib.c                               |    2 +-
+ sound/core/pcm_native.c                            |    4 +-
+ sound/core/rawmidi.c                               |    8 +-
+ sound/core/seq/seq_fifo.c                          |    2 +-
+ sound/core/seq/seq_memory.c                        |    2 +-
+ sound/core/timer.c                                 |    2 +-
+ sound/isa/wavefront/wavefront_synth.c              |    2 +-
+ sound/pci/mixart/mixart_core.c                     |    4 +-
+ sound/pci/ymfpci/ymfpci_main.c                     |    2 +-
+ tools/Makefile                                     |    8 +-
+ tools/include/asm/sections.h                       |    4 +
+ tools/include/linux/bitops.h                       |   10 +
+ tools/include/linux/compiler-gcc.h                 |   10 +
+ tools/include/linux/compiler.h                     |   16 +
+ .../uinclude => include}/linux/debug_locks.h       |    3 +-
+ tools/include/linux/delay.h                        |    4 +
+ tools/include/linux/err.h                          |    5 +
+ tools/include/linux/ftrace.h                       |    4 +
+ tools/include/linux/gfp.h                          |    4 +
+ .../lockdep/uinclude => include}/linux/hardirq.h   |    0
+ tools/include/linux/interrupt.h                    |    4 +
+ .../lockdep/uinclude => include}/linux/irqflags.h  |    8 +-
+ tools/include/linux/jhash.h                        |  175 ++++
+ .../lockdep/uinclude => include}/linux/kallsyms.h  |    3 +-
+ .../uinclude => include}/linux/kern_levels.h       |    0
+ tools/include/linux/kernel.h                       |    4 +
+ .../lockdep/uinclude => include}/linux/kmemcheck.h |    0
+ tools/include/linux/linkage.h                      |    4 +
+ .../lockdep/uinclude => include}/linux/lockdep.h   |   34 +-
+ .../lockdep/uinclude => include}/linux/module.h    |    5 +
+ tools/include/linux/mutex.h                        |    4 +
+ tools/include/linux/proc_fs.h                      |    4 +
+ .../{lib/lockdep/uinclude => include}/linux/rcu.h  |    3 +
+ tools/include/linux/sched/clock.h                  |    4 +
+ tools/include/linux/sched/mm.h                     |    4 +
+ tools/include/linux/sched/task.h                   |    4 +
+ tools/include/linux/seq_file.h                     |    4 +
+ tools/include/linux/spinlock.h                     |   26 +
+ .../uinclude => include}/linux/stacktrace.h        |    0
+ tools/include/linux/unaligned/packed_struct.h      |   46 +
+ tools/include/trace/events/lock.h                  |    4 +
+ tools/lib/api/fs/fs.c                              |   30 +
+ tools/lib/api/fs/fs.h                              |    4 +
+ tools/lib/lockdep/Makefile                         |    9 +-
+ tools/lib/lockdep/lockdep.c                        |   19 +
+ tools/lib/lockdep/preload.c                        |    5 +-
+ tools/lib/lockdep/rbtree.c                         |    2 +-
+ tools/lib/lockdep/run_tests.sh                     |    8 +-
+ tools/lib/lockdep/uinclude/asm/hash.h              |    6 -
+ tools/lib/lockdep/uinclude/asm/hweight.h           |    3 -
+ tools/lib/lockdep/uinclude/asm/sections.h          |    3 -
+ tools/lib/lockdep/uinclude/linux/bitops.h          |    3 -
+ tools/lib/lockdep/uinclude/linux/compiler.h        |   10 -
+ tools/lib/lockdep/uinclude/linux/delay.h           |    3 -
+ tools/lib/lockdep/uinclude/linux/ftrace.h          |    3 -
+ tools/lib/lockdep/uinclude/linux/gfp.h             |    3 -
+ tools/lib/lockdep/uinclude/linux/hash.h            |    1 -
+ tools/lib/lockdep/uinclude/linux/interrupt.h       |    3 -
+ tools/lib/lockdep/uinclude/linux/kernel.h          |   47 -
+ tools/lib/lockdep/uinclude/linux/linkage.h         |    3 -
+ tools/lib/lockdep/uinclude/linux/list.h            |    1 -
+ tools/lib/lockdep/uinclude/linux/mutex.h           |    3 -
+ tools/lib/lockdep/uinclude/linux/poison.h          |    1 -
+ tools/lib/lockdep/uinclude/linux/prefetch.h        |    6 -
+ tools/lib/lockdep/uinclude/linux/proc_fs.h         |    3 -
+ .../lib/lockdep/uinclude/linux/rbtree_augmented.h  |    2 -
+ tools/lib/lockdep/uinclude/linux/seq_file.h        |    3 -
+ tools/lib/lockdep/uinclude/linux/spinlock.h        |   25 -
+ tools/lib/lockdep/uinclude/linux/stringify.h       |    7 -
+ tools/lib/lockdep/uinclude/trace/events/lock.h     |    3 -
+ tools/perf/Documentation/intel-pt.txt              |   36 +
+ tools/perf/Documentation/perf-ftrace.txt           |   33 +
+ tools/perf/Documentation/perf-script.txt           |   12 +-
+ tools/perf/Documentation/perf-stat.txt             |   14 +
+ tools/perf/Makefile.config                         |    2 +-
+ tools/perf/arch/arm/util/cs-etm.c                  |   29 +-
+ tools/perf/arch/powerpc/util/Build                 |    2 +
+ tools/perf/arch/powerpc/util/unwind-libdw.c        |   73 ++
+ tools/perf/arch/x86/util/intel-bts.c               |    4 -
+ tools/perf/arch/x86/util/intel-pt.c                |    9 +-
+ tools/perf/bench/numa.c                            |    2 +-
+ tools/perf/builtin-config.c                        |   67 +-
+ tools/perf/builtin-ftrace.c                        |  159 +++-
+ tools/perf/builtin-script.c                        |  148 ++-
+ tools/perf/builtin-stat.c                          |   49 +
+ tools/perf/builtin-top.c                           |    2 +-
+ tools/perf/jvmti/jvmti_agent.h                     |    2 -
+ tools/perf/jvmti/libjvmti.c                        |    5 +-
+ tools/perf/pmu-events/jevents.c                    |    4 -
+ tools/perf/tests/bp_signal.c                       |    3 +-
+ tools/perf/tests/bp_signal_overflow.c              |    3 +-
+ tools/perf/tests/bpf-script-test-prologue.c        |    9 +
+ tools/perf/tests/dwarf-unwind.c                    |   15 +-
+ tools/perf/ui/browsers/annotate.c                  |   54 +-
+ tools/perf/ui/gtk/annotate.c                       |    3 +-
+ tools/perf/util/annotate.c                         |   10 +-
+ tools/perf/util/annotate.h                         |    4 +-
+ tools/perf/util/cache.h                            |    3 +-
+ tools/perf/util/debug.h                            |   11 +-
+ tools/perf/util/evlist.h                           |    3 +-
+ tools/perf/util/evsel.c                            |   42 +-
+ tools/perf/util/genelf_debug.c                     |    5 +-
+ tools/perf/util/header.c                           |    3 +-
+ tools/perf/util/intel-bts.c                        |    2 -
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c  |  290 +++++-
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.h  |   13 +
+ tools/perf/util/intel-pt-decoder/intel-pt-log.h    |    4 +-
+ .../util/intel-pt-decoder/intel-pt-pkt-decoder.c   |  110 ++-
+ .../util/intel-pt-decoder/intel-pt-pkt-decoder.h   |    7 +
+ tools/perf/util/intel-pt.c                         |   23 +-
+ tools/perf/util/machine.c                          |   10 +-
+ tools/perf/util/pmu.h                              |    4 +-
+ tools/perf/util/probe-event.h                      |    4 +-
+ .../util/scripting-engines/trace-event-python.c    |    3 +-
+ tools/perf/util/session.c                          |    2 +-
+ tools/perf/util/stat-shadow.c                      |   33 +
+ tools/perf/util/stat.c                             |    2 +
+ tools/perf/util/stat.h                             |    2 +
+ tools/perf/util/strbuf.h                           |    4 +-
+ tools/perf/util/usage.c                            |    6 +-
+ tools/perf/util/util.c                             |   52 +-
+ tools/perf/util/util.h                             |   21 +-
+ .../selftests/rcutorture/bin/configcheck.sh        |    2 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh  |    2 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh      |    5 +-
+ .../selftests/rcutorture/configs/rcu/CFLIST        |    2 +
+ .../selftests/rcutorture/configs/rcu/SRCU-C.boot   |    1 +
+ .../selftests/rcutorture/configs/rcu/SRCU-N        |    2 +-
+ .../selftests/rcutorture/configs/rcu/SRCU-P        |    6 +-
+ .../selftests/rcutorture/configs/rcu/SRCU-t        |   10 +
+ .../selftests/rcutorture/configs/rcu/SRCU-t.boot   |    1 +
+ .../selftests/rcutorture/configs/rcu/SRCU-u        |    9 +
+ .../selftests/rcutorture/configs/rcu/SRCU-u.boot   |    1 +
+ .../selftests/rcutorture/configs/rcu/TINY02        |    5 +-
+ .../selftests/rcutorture/configs/rcu/TREE01        |    5 +-
+ .../selftests/rcutorture/configs/rcu/TREE01.boot   |    4 +
+ .../selftests/rcutorture/configs/rcu/TREE02        |    5 +-
+ .../selftests/rcutorture/configs/rcu/TREE03        |    4 -
+ .../selftests/rcutorture/configs/rcu/TREE03.boot   |    4 +
+ .../selftests/rcutorture/configs/rcu/TREE04        |    4 -
+ .../selftests/rcutorture/configs/rcu/TREE05        |    4 -
+ .../selftests/rcutorture/configs/rcu/TREE05.boot   |    3 +
+ .../selftests/rcutorture/configs/rcu/TREE06        |    4 +-
+ .../selftests/rcutorture/configs/rcu/TREE06.boot   |    3 +
+ .../selftests/rcutorture/configs/rcu/TREE07        |    6 -
+ .../selftests/rcutorture/configs/rcu/TREE08        |    1 -
+ .../selftests/rcutorture/configs/rcu/TREE08-T      |   21 -
+ .../selftests/rcutorture/configs/rcu/TREE08.boot   |    1 +
+ .../configs/{rcu/TREE02-T => rcuperf/TINY}         |   19 +-
+ .../selftests/rcutorture/configs/rcuperf/TREE      |    1 -
+ .../selftests/rcutorture/configs/rcuperf/TREE54    |    1 -
+ .../testing/selftests/rcutorture/doc/TINY_RCU.txt  |    1 -
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |   34 +-
+ .../rcutorture/formal/srcu-cbmc/modify_srcu.awk    |    2 +-
+ tools/testing/selftests/timers/Makefile            |    5 +-
+ tools/testing/selftests/timers/freq-step.c         |  268 ++++++
+ .../testing/selftests/timers/inconsistency-check.c |    4 +-
+ virt/kvm/eventfd.c                                 |    2 +-
+ 746 files changed, 15808 insertions(+), 13645 deletions(-)
+ delete mode 100644 Documentation/RCU/trace.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,gicp.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,icu.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
+ create mode 100644 arch/arm/include/asm/dmi.h
+ delete mode 100644 arch/ia64/include/asm/siginfo.h
+ delete mode 100644 arch/m32r/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/mn10300/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/score/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/sparc/include/asm/siginfo.h
+ create mode 100644 arch/x86/include/asm/tlbbatch.h
+ delete mode 100644 arch/x86/mm/gup.c
+ delete mode 100644 arch/x86/ras/Makefile
+ delete mode 100644 arch/x86/ras/mce_amd_inj.c
+ delete mode 100644 drivers/char/mmtimer.c
+ delete mode 100644 drivers/clocksource/clkevt-probe.c
+ delete mode 100644 drivers/clocksource/moxart_timer.c
+ create mode 100644 drivers/clocksource/timer-of.c
+ create mode 100644 drivers/clocksource/timer-of.h
+ rename drivers/clocksource/{clksrc-probe.c => timer-probe.c} (72%)
+ create mode 100644 drivers/irqchip/irq-aspeed-i2c-ic.c
+ create mode 100644 drivers/irqchip/irq-mvebu-gicp.c
+ create mode 100644 drivers/irqchip/irq-mvebu-gicp.h
+ create mode 100644 drivers/irqchip/irq-mvebu-icu.c
+ delete mode 100644 include/asm-generic/siginfo.h
+ create mode 100644 include/dt-bindings/interrupt-controller/mvebu-icu.h
+ delete mode 100644 include/linux/srcuclassic.h
+ create mode 100644 include/linux/wait_bit.h
+ create mode 100644 kernel/irq/debugfs.c
+ create mode 100644 kernel/irq/timings.c
+ create mode 100644 kernel/rcu/Kconfig
+ create mode 100644 kernel/rcu/Kconfig.debug
+ delete mode 100644 kernel/rcu/srcu.c
+ delete mode 100644 kernel/rcu/tree_trace.c
+ create mode 100644 kernel/sched/wait_bit.c
+ create mode 100644 kernel/time/posix-timers.h
+ create mode 100644 lib/locking-selftest-rtmutex.h
+ create mode 100644 tools/include/asm/sections.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/debug_locks.h (74%)
+ create mode 100644 tools/include/linux/delay.h
+ create mode 100644 tools/include/linux/ftrace.h
+ create mode 100644 tools/include/linux/gfp.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/hardirq.h (100%)
+ create mode 100644 tools/include/linux/interrupt.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/irqflags.h (84%)
+ create mode 100644 tools/include/linux/jhash.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/kallsyms.h (89%)
+ rename tools/{lib/lockdep/uinclude => include}/linux/kern_levels.h (100%)
+ rename tools/{lib/lockdep/uinclude => include}/linux/kmemcheck.h (100%)
+ create mode 100644 tools/include/linux/linkage.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/lockdep.h (63%)
+ rename tools/{lib/lockdep/uinclude => include}/linux/module.h (51%)
+ create mode 100644 tools/include/linux/mutex.h
+ create mode 100644 tools/include/linux/proc_fs.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/rcu.h (76%)
+ create mode 100644 tools/include/linux/sched/clock.h
+ create mode 100644 tools/include/linux/sched/mm.h
+ create mode 100644 tools/include/linux/sched/task.h
+ create mode 100644 tools/include/linux/seq_file.h
+ rename tools/{lib/lockdep/uinclude => include}/linux/stacktrace.h (100%)
+ create mode 100644 tools/include/linux/unaligned/packed_struct.h
+ create mode 100644 tools/include/trace/events/lock.h
+ delete mode 100644 tools/lib/lockdep/uinclude/asm/hash.h
+ delete mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
+ delete mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/list.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
+ delete mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
+ create mode 100644 tools/perf/arch/powerpc/util/unwind-libdw.c
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u.boot
+ delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
+ rename tools/testing/selftests/rcutorture/configs/{rcu/TREE02-T => rcuperf/TINY} (50%)
+ create mode 100644 tools/testing/selftests/timers/freq-step.c
+$ git am -3 ../patches/0001-sched-wait-fix-up-for-docs-rst-convert-kernel-hackin.patch
+Applying: sched/wait: fix up for "docs-rst: convert kernel-hacking to ReST"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	Documentation/kernel-hacking/hacking.rst
+$ git add -A .
+$ git commit -v -a --amend
+[master 39312c2a521e] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Fri Jun 30 13:01:49 2017 +1000
+Merging clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE)
+$ git merge clockevents/clockevents/next
+Resolved 'arch/arm/mach-moxart/Kconfig' using previous resolution.
+Resolved 'drivers/clocksource/Kconfig' using previous resolution.
+Resolved 'drivers/clocksource/Makefile' using previous resolution.
+Resolved 'drivers/clocksource/timer-fttmr010.c' using previous resolution.
+Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution.
+Auto-merging include/asm-generic/vmlinux.lds.h
+CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
+Auto-merging drivers/clocksource/timer-fttmr010.c
+CONFLICT (content): Merge conflict in drivers/clocksource/timer-fttmr010.c
+Auto-merging drivers/clocksource/Makefile
+CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
+Auto-merging arch/arm/mach-moxart/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-moxart/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d9f68ab59233] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (164c29244d4b EDAC, pnd2: Fix Apollo Lake DIMM detection)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/altera_edac.c   |  26 +-
+ drivers/edac/i5000_edac.c    |   6 +-
+ drivers/edac/i5400_edac.c    |   4 +-
+ drivers/edac/ie31200_edac.c  |  13 +-
+ drivers/edac/mce_amd.c       |   2 +-
+ drivers/edac/mv64x60_edac.c  |  88 +++---
+ drivers/edac/pnd2_edac.c     |  20 +-
+ drivers/edac/sb_edac.c       | 682 ++++++++++++++++++++-----------------------
+ drivers/edac/thunderx_edac.c |   2 +-
+ 9 files changed, 399 insertions(+), 444 deletions(-)
+Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date.
+Merging ftrace/for-next (681bec0367c2 tracing: Rename update the enum_map file)
+$ git merge ftrace/for-next
+Auto-merging kernel/module.c
+Auto-merging include/asm-generic/vmlinux.lds.h
+Merge made by the 'recursive' strategy.
+ arch/arm64/kvm/trace.h            |   2 +
+ include/asm-generic/vmlinux.lds.h |   6 +-
+ include/linux/module.h            |   4 +-
+ include/linux/tracepoint.h        |   7 +-
+ include/trace/events/xen.h        |  13 ++-
+ include/trace/trace_events.h      |  26 ++++-
+ kernel/module.c                   |   6 +-
+ kernel/trace/Kconfig              |  22 ++---
+ kernel/trace/trace.c              | 196 +++++++++++++++++++-------------------
+ kernel/trace/trace.h              |   4 +-
+ kernel/trace/trace_events.c       |  24 ++---
+ 11 files changed, 168 insertions(+), 142 deletions(-)
+Merging rcu/rcu/next (49729e9a4e67 torture: Fix typo suppressing CPU-hotplug statistics)
+$ git merge rcu/rcu/next
+Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
+Auto-merging kernel/sched/core.c
+Removing kernel/rcu/tiny_plugin.h
+Auto-merging kernel/exit.c
+Auto-merging kernel/cpu.c
+Auto-merging include/linux/sched.h
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/checklist.txt                    | 121 +++++++---
+ Documentation/RCU/rcu.txt                          |   9 +-
+ Documentation/RCU/rcubarrier.txt                   |   5 +
+ Documentation/RCU/torture.txt                      |  20 +-
+ Documentation/RCU/whatisRCU.txt                    |   5 +-
+ Documentation/admin-guide/kernel-parameters.txt    |   7 +-
+ arch/blackfin/kernel/module.c                      |  39 ++--
+ include/linux/init_task.h                          |   8 +-
+ include/linux/rcupdate.h                           |  15 +-
+ include/linux/rcutiny.h                            |   8 +-
+ include/linux/sched.h                              |   8 +-
+ include/linux/srcutiny.h                           |  13 ++
+ include/linux/srcutree.h                           |   3 +-
+ include/linux/swait.h                              |  55 +++++
+ include/trace/events/rcu.h                         |   7 +-
+ kernel/cpu.c                                       |   1 +
+ kernel/exit.c                                      |   7 +-
+ kernel/rcu/Kconfig                                 |   3 +-
+ kernel/rcu/rcu.h                                   | 128 ++---------
+ kernel/rcu/rcuperf.c                               |  17 +-
+ kernel/rcu/rcutorture.c                            |  67 +-----
+ kernel/rcu/srcutiny.c                              |   8 +
+ kernel/rcu/srcutree.c                              |  41 +++-
+ kernel/rcu/tiny.c                                  |   2 -
+ kernel/rcu/tiny_plugin.h                           |  47 ----
+ kernel/rcu/tree.c                                  | 253 +++++++++++----------
+ kernel/rcu/tree.h                                  |   2 +
+ kernel/rcu/tree_exp.h                              |   2 +-
+ kernel/rcu/tree_plugin.h                           | 196 ++++++++++------
+ kernel/rcu/update.c                                |  18 +-
+ kernel/sched/core.c                                |   1 +
+ kernel/torture.c                                   |   2 +-
+ .../selftests/rcutorture/bin/config_override.sh    |  61 +++++
+ .../testing/selftests/rcutorture/bin/functions.sh  |  27 ++-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh  |  11 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  58 ++---
+ tools/testing/selftests/rcutorture/bin/kvm.sh      |  34 ++-
+ .../selftests/rcutorture/configs/rcu/BUSTED.boot   |   2 +-
+ .../selftests/rcutorture/configs/rcu/SRCU-C.boot   |   1 -
+ .../selftests/rcutorture/configs/rcu/SRCU-u        |   3 +-
+ .../selftests/rcutorture/configs/rcu/TREE01.boot   |   2 +-
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |   2 +-
+ 42 files changed, 733 insertions(+), 586 deletions(-)
+ delete mode 100644 kernel/rcu/tiny_plugin.h
+ create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh
+ delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
+Merging kvm/linux-next (865279c53ca9 tools/kvm_stat: display guest list in pid/guest selection screens)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/emulate.c
+Auto-merging arch/x86/include/asm/msr-index.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/msr-index.h |   2 +
+ arch/x86/kvm/cpuid.h             |   8 +
+ arch/x86/kvm/emulate.c           |  82 +++---
+ arch/x86/kvm/svm.c               |   6 +-
+ arch/x86/kvm/vmx.c               |  15 +-
+ tools/kvm/kvm_stat/kvm_stat      | 558 +++++++++++++++++++++++----------------
+ tools/kvm/kvm_stat/kvm_stat.txt  |   6 +
+ 7 files changed, 391 insertions(+), 286 deletions(-)
+Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h)
+$ git merge kvm-arm/next
+Resolved 'Documentation/arm64/silicon-errata.txt' using previous resolution.
+Auto-merging virt/kvm/arm/mmu.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/include/asm/kvm_host.h
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm64/include/asm/esr.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/arm64/silicon-errata.txt
+CONFLICT (content): Merge conflict in Documentation/arm64/silicon-errata.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 83d7ca729759] Merge remote-tracking branch 'kvm-arm/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt |  12 +
+ Documentation/arm64/silicon-errata.txt          |   1 +
+ Documentation/virtual/kvm/devices/vcpu.txt      |  41 +-
+ Documentation/virtual/kvm/vcpu-requests.rst     | 307 +++++++++
+ arch/arm/include/asm/kvm_host.h                 |  28 +-
+ arch/arm/include/uapi/asm/kvm.h                 |   8 +
+ arch/arm/kvm/guest.c                            |  51 ++
+ arch/arm/kvm/handle_exit.c                      |   1 +
+ arch/arm/kvm/hyp/switch.c                       |   2 +
+ arch/arm/kvm/reset.c                            |  16 +-
+ arch/arm64/Kconfig                              |  11 +
+ arch/arm64/include/asm/arch_gicv3.h             |   2 +-
+ arch/arm64/include/asm/cpucaps.h                |   3 +-
+ arch/arm64/include/asm/cputype.h                |   2 +
+ arch/arm64/include/asm/esr.h                    |  24 +
+ arch/arm64/include/asm/kvm_host.h               |   6 +-
+ arch/arm64/include/asm/kvm_hyp.h                |   1 +
+ arch/arm64/include/asm/sysreg.h                 |  23 +-
+ arch/arm64/include/uapi/asm/kvm.h               |   3 +
+ arch/arm64/kernel/cpu_errata.c                  |  21 +
+ arch/arm64/kvm/guest.c                          |   9 +
+ arch/arm64/kvm/handle_exit.c                    |   1 +
+ arch/arm64/kvm/hyp/switch.c                     |  15 +
+ arch/arm64/kvm/reset.c                          |  16 +-
+ arch/arm64/kvm/sys_regs.c                       |  27 +-
+ arch/arm64/kvm/vgic-sys-reg-v3.c                |  45 +-
+ arch/mips/kvm/trap_emul.c                       |   2 +-
+ arch/mips/kvm/vz.c                              |   2 +-
+ arch/powerpc/include/asm/kvm_host.h             |   4 +-
+ arch/powerpc/kvm/booke.c                        |   2 +-
+ arch/powerpc/kvm/powerpc.c                      |   5 +-
+ arch/s390/include/asm/kvm_host.h                |   6 +-
+ arch/s390/kvm/kvm-s390.c                        |   2 +-
+ arch/x86/include/asm/kvm_host.h                 |  47 +-
+ arch/x86/kvm/x86.c                              |   4 +-
+ include/kvm/arm_arch_timer.h                    |   8 +-
+ include/kvm/arm_pmu.h                           |   6 +
+ include/kvm/arm_vgic.h                          |  14 +-
+ include/linux/irqchip/arm-gic-v3.h              |   6 +
+ include/linux/kvm_host.h                        |  12 +
+ virt/kvm/arm/aarch32.c                          |   2 +-
+ virt/kvm/arm/arch_timer.c                       | 139 +++-
+ virt/kvm/arm/arm.c                              |  82 ++-
+ virt/kvm/arm/hyp/vgic-v3-sr.c                   | 823 +++++++++++++++++++++++-
+ virt/kvm/arm/mmu.c                              |  23 +
+ virt/kvm/arm/pmu.c                              | 117 ++--
+ virt/kvm/arm/psci.c                             |   8 +-
+ virt/kvm/arm/vgic/vgic-irqfd.c                  |   2 +-
+ virt/kvm/arm/vgic/vgic-mmio-v2.c                |  24 +-
+ virt/kvm/arm/vgic/vgic-mmio-v3.c                |  22 +-
+ virt/kvm/arm/vgic/vgic-mmio.c                   |  68 +-
+ virt/kvm/arm/vgic/vgic-mmio.h                   |  12 +-
+ virt/kvm/arm/vgic/vgic-v3.c                     |  45 ++
+ virt/kvm/arm/vgic/vgic.c                        |  68 +-
+ 54 files changed, 1945 insertions(+), 286 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/vcpu-requests.rst
+Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
+$ git merge kvm-mips/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (da4ec555fd4c KVM: PPC: Book3S HV: Close race with testing for signals on guest entry)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kernel/mce.c
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/powerpc/include/asm/ppc-opcode.h
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt         |  37 +++
+ arch/powerpc/include/asm/kvm_book3s.h     |   1 -
+ arch/powerpc/include/asm/kvm_book3s_asm.h |   2 +-
+ arch/powerpc/include/asm/kvm_host.h       |   9 +-
+ arch/powerpc/include/asm/kvm_ppc.h        |   2 +
+ arch/powerpc/include/asm/ppc-opcode.h     |   2 +
+ arch/powerpc/include/uapi/asm/kvm.h       |   6 +
+ arch/powerpc/kernel/asm-offsets.c         |   3 +
+ arch/powerpc/kernel/mce.c                 |   1 +
+ arch/powerpc/kvm/book3s_hv.c              | 511 +++++++++++++++++++++++-------
+ arch/powerpc/kvm/book3s_hv_builtin.c      |   2 +-
+ arch/powerpc/kvm/book3s_hv_interrupts.S   |   8 +-
+ arch/powerpc/kvm/book3s_hv_ras.c          |  18 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S   | 156 +++++----
+ arch/powerpc/kvm/emulate.c                |   4 +-
+ arch/powerpc/kvm/powerpc.c                |  40 ++-
+ include/uapi/linux/kvm.h                  |   2 +
+ 17 files changed, 611 insertions(+), 193 deletions(-)
+Merging kvms390/next (d52cd2076eb2 KVM: s390: Inject machine check into the nested guest)
+$ git merge kvms390/next
+Resolved 'arch/s390/include/asm/kvm_host.h' using previous resolution.
+Resolved 'arch/s390/kvm/gaccess.c' using previous resolution.
+Resolved 'include/uapi/linux/kvm.h' using previous resolution.
+Auto-merging include/uapi/linux/kvm.h
+CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
+Auto-merging arch/s390/kvm/priv.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kvm/gaccess.c
+CONFLICT (content): Merge conflict in arch/s390/kvm/gaccess.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bd0f9ba1a959] Merge remote-tracking branch 'kvms390/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt               | 135 +++++++++
+ Documentation/virtual/kvm/devices/s390_flic.txt |  15 +
+ Documentation/virtual/kvm/devices/vm.txt        |  33 +++
+ arch/s390/include/asm/ctl_reg.h                 |   4 +-
+ arch/s390/include/asm/kvm_host.h                |  27 +-
+ arch/s390/include/asm/nmi.h                     |   6 +
+ arch/s390/include/uapi/asm/kvm.h                |  12 +
+ arch/s390/kvm/gaccess.c                         |  43 ++-
+ arch/s390/kvm/interrupt.c                       |  91 +++++-
+ arch/s390/kvm/kvm-s390.c                        | 371 +++++++++++++++++++++++-
+ arch/s390/kvm/kvm-s390.h                        |   2 +
+ arch/s390/kvm/priv.c                            | 103 ++++++-
+ arch/s390/kvm/vsie.c                            |  25 +-
+ include/uapi/linux/kvm.h                        |  33 +++
+ 14 files changed, 866 insertions(+), 34 deletions(-)
+Merging xen-tip/linux-next (a5d5f328b0e2 xen: allocate page for shared info page from low memory)
+$ git merge xen-tip/linux-next
+Resolved 'drivers/xen/events/events_base.c' using previous resolution.
+Auto-merging drivers/xen/manage.c
+Auto-merging drivers/xen/events/events_base.c
+CONFLICT (content): Merge conflict in drivers/xen/events/events_base.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ABI/testing/sysfs-hypervisor-xen
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 38217d84c92e] Merge remote-tracking branch 'xen-tip/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-hypervisor-xen      | 119 ++++++++++++++++
+ .../{sysfs-hypervisor-pmu => sysfs-hypervisor-xen} |  24 +++-
+ MAINTAINERS                                        |   2 +
+ arch/arm/include/asm/xen/events.h                  |   2 +-
+ arch/arm/xen/p2m.c                                 |  10 +-
+ arch/x86/include/asm/xen/hypercall.h               |   4 +-
+ arch/x86/xen/enlighten.c                           | 154 +++++++++++++++------
+ arch/x86/xen/enlighten_hvm.c                       |  64 +++++----
+ arch/x86/xen/enlighten_pv.c                        |  89 ++++++------
+ arch/x86/xen/smp.c                                 |  31 +++++
+ arch/x86/xen/smp.h                                 |   2 +
+ arch/x86/xen/smp_hvm.c                             |  14 +-
+ arch/x86/xen/smp_pv.c                              |   6 +-
+ arch/x86/xen/suspend_hvm.c                         |  11 +-
+ arch/x86/xen/xen-ops.h                             |   3 +-
+ drivers/xen/events/events_base.c                   |   6 +-
+ drivers/xen/evtchn.c                               |  34 ++++-
+ drivers/xen/manage.c                               |  12 +-
+ drivers/xen/sys-hypervisor.c                       |  62 +++++++++
+ drivers/xen/xenbus/xenbus_comms.c                  |  21 ++-
+ include/xen/arm/hypercall.h                        |   5 +-
+ include/xen/events.h                               |   1 +
+ include/xen/interface/version.h                    |  15 ++
+ include/xen/xen-ops.h                              |   2 +
+ 24 files changed, 532 insertions(+), 161 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-hypervisor-xen
+ rename Documentation/ABI/testing/{sysfs-hypervisor-pmu => sysfs-hypervisor-xen} (54%)
+Merging percpu/for-next (e3efe3db932b percpu: fix static checker warnings in pcpu_destroy_chunk)
+$ git merge percpu/for-next
+Auto-merging mm/Kconfig
+Auto-merging include/net/inet_frag.h
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/disk-io.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/disk-io.c             |  12 +--
+ fs/btrfs/extent_io.c           |   6 +-
+ fs/btrfs/inode.c               |   8 +-
+ fs/xfs/xfs_mount.c             |   4 +-
+ include/linux/backing-dev.h    |   2 +-
+ include/linux/blk-cgroup.h     |   6 +-
+ include/linux/mman.h           |   2 +-
+ include/linux/percpu_counter.h |   7 +-
+ include/net/inet_frag.h        |   4 +-
+ include/trace/events/percpu.h  | 125 +++++++++++++++++++++++
+ lib/flex_proportions.c         |   6 +-
+ lib/percpu_counter.c           |   4 +-
+ mm/Kconfig                     |   8 ++
+ mm/Makefile                    |   1 +
+ mm/percpu-internal.h           | 166 ++++++++++++++++++++++++++++++
+ mm/percpu-km.c                 |  11 +-
+ mm/percpu-stats.c              | 222 +++++++++++++++++++++++++++++++++++++++++
+ mm/percpu-vm.c                 |  12 ++-
+ mm/percpu.c                    |  85 +++++++++-------
+ 19 files changed, 621 insertions(+), 70 deletions(-)
+ create mode 100644 include/trace/events/percpu.h
+ create mode 100644 mm/percpu-internal.h
+ create mode 100644 mm/percpu-stats.c
+Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
+$ git merge workqueues/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging drivers-x86/for-next (baea2c0e8f13 platform/x86: fujitsu-laptop: rework debugging)
+$ git merge drivers-x86/for-next
+Auto-merging drivers/platform/x86/Makefile
+Auto-merging drivers/platform/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-platform-ideapad-laptop      |   8 +
+ drivers/platform/x86/Kconfig                       |  29 +-
+ drivers/platform/x86/Makefile                      |   2 +
+ drivers/platform/x86/acer-wmi.c                    |  15 +-
+ drivers/platform/x86/acerhdf.c                     |   2 +-
+ drivers/platform/x86/alienware-wmi.c               |   8 +-
+ drivers/platform/x86/dell-laptop.c                 |   6 +-
+ drivers/platform/x86/dell-rbtn.c                   |  31 +-
+ drivers/platform/x86/dell-wmi-led.c                |   2 +-
+ drivers/platform/x86/dell-wmi.c                    | 144 +++--
+ drivers/platform/x86/eeepc-laptop.c                |   2 +-
+ drivers/platform/x86/fujitsu-laptop.c              | 540 ++++++++--------
+ drivers/platform/x86/ideapad-laptop.c              |  58 +-
+ drivers/platform/x86/intel_cht_int33fe.c           |   8 +
+ drivers/platform/x86/intel_menlow.c                |   2 +-
+ drivers/platform/x86/intel_pmc_ipc.c               |   2 +-
+ drivers/platform/x86/msi-laptop.c                  |   4 +-
+ drivers/platform/x86/panasonic-laptop.c            |   4 -
+ drivers/platform/x86/peaq-wmi.c                    | 100 +++
+ drivers/platform/x86/samsung-laptop.c              |   6 +-
+ drivers/platform/x86/silead_dmi.c                  |  70 +++
+ drivers/platform/x86/sony-laptop.c                 |   6 +-
+ drivers/platform/x86/thinkpad_acpi.c               | 183 ++----
+ drivers/platform/x86/topstar-laptop.c              |   1 +
+ drivers/platform/x86/toshiba_acpi.c                |  11 +-
+ drivers/platform/x86/toshiba_haps.c                |   2 +-
+ drivers/platform/x86/wmi-bmof.c                    | 125 ++++
+ drivers/platform/x86/wmi.c                         | 686 +++++++++++++++++----
+ include/linux/wmi.h                                |  59 ++
+ 29 files changed, 1444 insertions(+), 672 deletions(-)
+ create mode 100644 drivers/platform/x86/peaq-wmi.c
+ create mode 100644 drivers/platform/x86/wmi-bmof.c
+ create mode 100644 include/linux/wmi.h
+Merging chrome-platform/for-next (5d6a312e8f99 platform/chrome: cros_ec_lightbar - hide unused PM functions)
+$ git merge chrome-platform/for-next
+Auto-merging drivers/mfd/cros_ec.c
+Merge made by the 'recursive' strategy.
+ drivers/mfd/cros_ec.c                      |  13 +-
+ drivers/platform/chrome/Kconfig            |  14 +-
+ drivers/platform/chrome/Makefile           |   7 +-
+ drivers/platform/chrome/cros_ec_debugfs.c  | 401 +++++++++++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_debugfs.h  |  27 ++
+ drivers/platform/chrome/cros_ec_dev.c      |  40 +++
+ drivers/platform/chrome/cros_ec_dev.h      |   6 +
+ drivers/platform/chrome/cros_ec_lightbar.c | 197 +++++++++++++-
+ drivers/platform/chrome/cros_ec_lpc.c      | 168 +++++++-----
+ drivers/platform/chrome/cros_ec_lpc_mec.c  | 140 ++++++++++
+ drivers/platform/chrome/cros_ec_lpc_reg.c  | 133 ++++++++++
+ drivers/platform/chrome/cros_ec_proto.c    | 116 ++++++++-
+ include/linux/mfd/cros_ec.h                |  19 +-
+ include/linux/mfd/cros_ec_commands.h       |  42 ++-
+ include/linux/mfd/cros_ec_lpc_mec.h        |  90 +++++++
+ include/linux/mfd/cros_ec_lpc_reg.h        |  61 +++++
+ 16 files changed, 1391 insertions(+), 83 deletions(-)
+ create mode 100644 drivers/platform/chrome/cros_ec_debugfs.c
+ create mode 100644 drivers/platform/chrome/cros_ec_debugfs.h
+ create mode 100644 drivers/platform/chrome/cros_ec_lpc_mec.c
+ create mode 100644 drivers/platform/chrome/cros_ec_lpc_reg.c
+ create mode 100644 include/linux/mfd/cros_ec_lpc_mec.h
+ create mode 100644 include/linux/mfd/cros_ec_lpc_reg.h
+Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/clients/nokia-modem.c       | 15 ++++++---------
+ drivers/hsi/controllers/omap_ssi_core.c | 10 ++++------
+ drivers/hsi/hsi_boardinfo.c             |  2 +-
+ drivers/hsi/hsi_core.c                  |  7 +++----
+ 4 files changed, 14 insertions(+), 20 deletions(-)