Add linux-next specific files for 20141003

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..5165b6c
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,229 @@
+Name		SHA1
+----		----
+origin		b601ce0fe3aafadba21cd42eb3d63660010e2a2b
+fixes		b94d525e58dc9638dd3f98094cb468bcfb262039
+kbuild-current	7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
+arc-current	2ce7598c9a453e0acd0e07be7be3f5eb39608ebd
+arm-current	ad684dce87fac52738649e62b4afa25081b52a28
+m68k-current	4ed7800987b1b082f8fc98c5cb7eb20cf74280a8
+metag-fixes	ffe6902b66aaa4ca6694bc19639259c16d84ddb1
+mips-fixes	1795cd9b3a91d4b5473c97f491d63892442212ab
+powerpc-merge	396a34340cdf7373c00e3977db27d1a20ea65ebc
+powerpc-merge-mpe	7d59deb50aafbdc01b52aed209d202d827261cb0
+sparc		ca605b7dd740c8909408d67911d8ddd272c2b320
+net		50dddff3cb9af328dd42bafe3437c7f47e8b38a9
+ipsec		b8c203b2d2fc961bafd53b41d5396bbcdec55998
+sound-current	b7c2dc8e684a37d8f9544b9e528c050f2bb7ef47
+pci-current	7cbeb9f90db8e56856db7568520b735732d34d86
+wireless	f8adaf0ae978252c9f7e29e96aefcd8fcaf806ba
+driver-core.current	9e82bf014195d6f0054982c463575cdce24292be
+tty.current	9e82bf014195d6f0054982c463575cdce24292be
+usb.current	0f33be009b89d2268e94194dc4fd01a7851b6d51
+usb-gadget-fixes	0b93a4c838fa10370d72f86fe712426ac63804de
+usb-serial-fixes	dee80ad12d2b1b304286a707fde7ab05d1fc7bab
+staging.current	0f33be009b89d2268e94194dc4fd01a7851b6d51
+char-misc.current	9e82bf014195d6f0054982c463575cdce24292be
+input-current	3049683eafdbbbd7350b0e5ca02a2d8c026a3362
+md-current	d47648fcf0611812286f68131b40251c6fa54f5e
+crypto-current	7da4b29d496b1389d3a29b55d3668efecaa08ebd
+ide		a53dae49b2fea43d8f4ec5aeca0e288bbc8d6895
+dwmw2		5950f0803ca9d396ab79b7fe6789351f96e1d8d5
+devicetree-current	e66c98c7a0eacc33a9369a3ec086740044eb986c
+rr-fixes	f49819560f53b7f3a596a8ea2e6764dc86695b62
+vfio-fixes	239a87020b263fe7e70adc5803cb157955023d3c
+kselftest-fixes	ce6a144a0d01c6628496e4c0d18fbf3a0362cc67
+drm-intel-fixes	91e56499304f3d612053a9cf17f350868182c7d8
+asm-generic	f3670394c29ff3730638762c1760fd2f624e6d7b
+arc		517eefb5de443b0776923eab5476edf6b5f7026c
+arm		49e37117f8f635412ccd87f11999f1b616bb7040
+arm-perf	7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
+arm-soc		058bb16eb709b0ded8c4f2925b5d1ec67bfc1ad8
+bcm2835		fa389e220254c69ffae0d403eac4146171062d08
+berlin		8d4f3361e05cb9093a26e3fa63b930df1591256f
+cortex-m	f0d7515372ff0ea53fd66099533d3c8e0464cbbf
+ep93xx		bfb0709fd17b13498d99592bbe12c91130e35a55
+imx-mxs		2b2244a3e7c3d537f436a3580999b3032628d17d
+ixp4xx		19f949f52599ba7c3f67a5897ac6be14bfcb1200
+keystone	c9eaa447e77efe77b7fa4c953bd62de8297fd6c5
+msm		81cf1e061d001fab44dbaa85fc4fbfb6da6713a1
+mvebu		65a3bb88bb33cdddcdb1635708b27d895226502b
+renesas		cc38f02b87eff1ca129df87b6265aa0ff9220453
+samsung		a84aaa7556a5b2b1f041777904275525c065e4c5
+sunxi		429823087fec3d3138c72f2910d36d3d8d0733a7
+tegra		5599b91976479fb87ca3c3ade8a518e56c103b44
+arm64		7acf71d1a224b6e7a40a244d804cea1780a643ed
+blackfin	275f5a8573e7832d0cf344a1b29da357c7038870
+c6x		ae72758f1dd93bd367dc7719702f24a9bfb3bad9
+cris		cd065a010a97e3c330d1ded9af551664c9689b19
+hexagon		a9a44fdf329668125042055c569656aa83d8cccb
+ia64		0f33be009b89d2268e94194dc4fd01a7851b6d51
+m68k		fd4d453b64d409647c92de6395494b5dd82ce224
+m68knommu	e803d4bd31184b301a54352bb2c1a3fa93f80154
+metag		f93125ae17d1d259b5aba84016db260903822194
+microblaze	554336c714f4235eb9386a252989b411e9978b9f
+mips		31d6f57d3c65fd75c18ea9a3acebedc6cd60d656
+openrisc	548dafe880ad84d0accc0a5596c26e3348b103e1
+parisc		6c700d71f7faecb540b3fa4303edb5323a2768c1
+parisc-hd	7575e4d56f6fdd7fe54fb603615b51d82f066700
+powerpc		9e813308a5c18c58f9ccae1ec72ed4e14eaf9025
+powernv-cpuidle	0888839c5b62c44a55ac9d28acc273ba663c65ea
+powerpc-mpe	2013add4ce73c93ae2148969a9ec3ecc8b1e26fa
+fsl		cb0446c1b625326682ec4f9d1dd10779433646bc
+mpc5xxx		9e813308a5c18c58f9ccae1ec72ed4e14eaf9025
+s390		cfb0b24143b4f587ff3e3bd829f9f471285d097b
+sparc-next	619df5d2870b80696fd32521376560e0a4223e44
+tile		78410af51146796f783925009c8676a30d6c6d90
+uml		989e59fa41c5464ab77bf0bf82f32f721430544e
+unicore32	d670878e2c9adb86b37e42b0937b2d4825bd2b39
+xtensa		f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc
+btrfs		1d52c78afbbf80b58299e076a159617d6b42fe3c
+ceph		c27a3e4d667fdcad3db7b104f75659478e0c68d8
+cifs		1209bbdff2f6bbffa6eb5823033bbd7b8799a5e2
+configfs	b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs	04ec5f5c0022ee941615e304bc75853fe1bc94ba
+ext3		c53f755d339b5546600c316333140d5fe958941d
+ext4		c13e87d490d31f08cb91452aec787e1c531450bc
+f2fs		539debb4a31870404393a24d949681b07a1eb839
+fscache		1a8ed18fb7db48c916c2ccd484e04bd4dd737834
+fuse		d7afaec0b564f0609e116f562983b8e72fc3e9c9
+gfs2		19aeb5a65f1a6504fc665466c188241e7393d66f
+jfs		bb5e50aaa80564268f950d1b2f764455afbfea82
+logfs		339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs		b4b56796fe635484d049960ee06a6d435634ab16
+nfsd		34549ab09e62db9703811c6ed4715f2ffa1fd7fb
+omfs		976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs	6d565409503f4e1f74ac30de14e8c91a2b826cd8
+v9fs		f15844e0777fec936f87a87f97394f83911dacd3
+ubifs		443b39cdd5c37661bf681858b327418c3a5b9d76
+xfs		bdb119bb6e9d11ee7cd5a28503de060172c3db56
+file-locks	c68f11db3d2ffde88d8234a1454b5c0cf6c7540f
+vfs		bb4623448d402c8707dbec9dc2ac0977ef4193bd
+pci		5b750d4fb9055537430c4aa65445f0ced265893b
+hid		3fd9127d236cc19188c36dc26c7a3ab5a1612036
+i2c		6c97c9c1acfce89cce2f239f0325786f95aea848
+jdelvare-hwmon	c7208164e66f63e3ec1759b98087849286410741
+hwmon-staging	7ad8966f4f0a4606dfaba119ea4e2b3ac4c548ee
+v4l-dvb		6c239d99a592a511d5f79363e464352417e3c532
+kbuild		758cd932b2d51d44b374d36ecbad1eeb7da13b7d
+kconfig		95edca5c523c4b404dd60baa0a1bea0e4c38fd72
+libata		3a9262e50dba4d5e4bc299223224e1ef74c05c88
+pm		6f28c5c49468292c913cf2c53bd54c49577dc9a2
+idle		e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b
+apm		53675abbd1e54a30e621a9744bf9cce0712ddd6c
+cpupowerutils	f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal		dd634666793e51b43b703161302310326c259d50
+ieee1394	d584a66279949561418c82b12bb4c055e6c25836
+dlm		883854c5457a97190f7b0ee20f03bcd9664fc0c2
+swiotlb		8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8
+slave-dma	ade4a2a8e6e40fe18be1f83e5ea2e915692a0028
+dmaengine	fbeec99ad5c03060ba71c470ac373e24e23a80e0
+net-next	739e4a758e0e2930f4bcdddd244254bae8dd7499
+ipsec-next	689f1c9de2abbd76fda224d12cea5f43568a4335
+wireless-next	3f08e47291879fb047d7d4464d2beaedfea4eb63
+bluetooth	9c238ca8ec79c38ab22762b44aeaf7a42fc97b18
+infiniband	3bdad2d13fa62bcb59ca2506e74ce467ea436586
+mtd		b25046b1e5e3f1423434da77ccc859f2f779d1ce
+l2-mtd		32f1b7c8352fd33d41bcec3cfb054ccdcfd40a42
+crypto		be34c4ef693ff5c10f55606dbd656ddf0b4a8340
+drm		7a42e83d36d2d0a68622320900dc4e880b1d920a
+drm-panel	7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
+drm-intel	ebb69c95175609990af708ec90c46530f5a2c819
+drm-tegra	7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
+sound		0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb
+sound-asoc	74b6b7b77987f91eca5288dfe6580941ee9fe342
+modules		184c3fc3f52fb75800deb76deffb70907d1f76ea
+virtio		7ec62d421bdf29cb31101ae2689f7f3a9906289a
+input		042e1c79166b9250edd8262bea84e1703f27ad2e
+input-mt	5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52
+block		e9316e81a96b12997c4ae94ec11a657adcfc31d3
+device-mapper	43ab5fceb36004b8b67e0fe7e4415ac60fdd21e2
+embedded	4744b43431e8613f920c5cba88346756f53c5165
+firmware	6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia		80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc		11bc9381b277a65ea4b3fe994e658f4a78512139
+mmc-uh		89168b48991537bec2573b3b6a8841df74465b12
+kgdb		662bfa325be19ac98af0bc6b31fe142f09033301
+uclinux		6dbe51c251a327e012439c4772097a13df43c5b8
+md		86143256d2020d06657dc1765d985d92b2a769cb
+mfd		48b490d23ef5aaf65e16e194e0fd2578a9b6497f
+backlight	b6af73b42219aa6b253ef5c0020eff1019485ffc
+battery		a7ba749e01461a3802d22157fc0e6c4ecbe0dd32
+fbdev		718b90ac4c21c81f42b6db062ca0867f3cac7648
+viafb		838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2	2d605456431343886bc073ea126aeb7c64e07a57
+regulator	ad21edcdb2172c0d8f47f856867104e331525820
+security	c867d07e3c861e75509650b8a359351d634db93a
+integrity	1b68bdf9cded82d37e443a20c5ed47bbb084d5dc
+selinux		4093a8443941d7021c7f747474a87a56cf666270
+lblnet		d8ec26d7f8287f5788a494f56e8814210f0e64be
+watchdog	cf20f1450ea41fd3caf7a68323a4177083392978
+iommu		09b5269a1b3d47525d7c25efeb16f5407ef82ea2
+dwmw2-iommu	1860e379875dfe7271c649058aeddffe5afd9d0d
+vfio		93899a679fd6b2534b5c297d9316bae039ebcbe1
+osd		ce5d36aac26cc395fe3bc45525cdbad3644f01e5
+jc_docs		5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial		7bb38d57fd75f03753a5b362916c5bbde8290208
+audit		29075feaf1f55e6b1aa4054b44bc141e8d5eab0b
+fsnotify	1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06
+devicetree	a9ecdc0fdc54aa499604dbd43132988effcac9b4
+dt-rh		d22e9131187df5c220d435b02e7bf346202c00a8
+mailbox		168e92ba5ec744403dd362fb6f48af731c8c8a89
+spi		2a92065da0a03ce9572630f84f1d8cd1e9d35fe6
+tip		7fc22be52bdcfad277912c93e6c6b30558ffdf48
+clockevents	3252a646aa2cf706b2a26433a8bd9cb2e5dce410
+edac		50d1bb93672fa2f42cec6e06ce799fbe864f57e9
+edac-amd	a18c3f16a907b8977ef65fc8dd71ed3f7b751748
+irqchip		1633cd9aed67b21be44f6eb98c46a870c9efae13
+tiny		d45461ff03ad6ca6e15c0508d40355868a7390b6
+ftrace		7cbfb5eed9832e7c3ae58a17078f62396e7b55f8
+rcu		c98fed9fc6a7449affd941d8a8e9fcb0c72977d6
+uprobes		0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm		f439ed27f8b8b90d243ae15acb193d37f96eebe0
+kvm-arm		0496daa5cf99741ce8db82686b4c7446a37feabb
+kvm-ppc		8d0eff6385640a9e6eed0b0c09113794b2bb74e9
+oprofile	6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
+fw-nohz		74876a98a87a115254b3a66a14b27320b7f0acaa
+xen-tip		59119fad29543d2ef41032573a4819e83566dd50
+percpu		92f4f528666751919f49f3b9a829486c7a493eec
+workqueues	e09c2c295468476a239d13324ce9042ec4de05eb
+drivers-x86	557b4549714536b161522960a36f0aa7f527418c
+chrome-platform	5502486a2077e4280c618b82e8a77ed35932956f
+sysctl		4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap		f5b313a2bcd4c436560c044c726d9ad84a3e4bb3
+hsi		3fd276e9c0d75538c3b5ed96d0ce36d227fdca95
+leds		200861223d3ef3446b975d768fc4cef92e22aabb
+ipmi		662d1587162625323590815ce0dda42551cc74ac
+driver-core	bef59c5024be687ef4f228915af9961307a779ab
+tty		baeb7ef34952f523a129e5d1369aa42ecbe7f8c9
+usb		0043325495222139daa0696db736f67658dc7770
+usb-gadget	72a65a0d19c16de36e970ca6981732b5e8f7f4c4
+usb-serial	f8c0e057b4898055b24b44d03b837a15d8b93b37
+staging		77d966f4b02179ad0b7b12179fedbd12b0c4f735
+char-misc	480bd3c4ad30558dd26c16e3f8358e36522d9af0
+cgroup		55e8955e6ebafed973a107f5a190acfa1a01768f
+scsi		510dc0e4a3fc9b529be12a78a31b0f434f19dab2
+target-updates	7f2ea21b2c8d3e7fc192e92c9efce48942701d66
+target-merge	b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed
+writeback	f9b0e058cbd04ada76b13afffa7e1df830543c24
+hwspinlock	8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl		2cdef8f4e1ac28adc81326758a7767c18479a95d
+vhost		970379f59d81edf78a319f9cdc1234730bcbe6b2
+remoteproc	9a3c4145af32125c5ee39c0272662b47307a8323
+rpmsg		397944df3290ddc46dcc6a08cd71fb560700431b
+gpio		a092e19b688be88f7329bd05f90cb92ebe1a4f5b
+dma-mapping	b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7
+pwm		e2e08970100db03bb84fd4a72f9c35bfc18d595a
+dma-buf		101e31050bf174e5bcca72bdb9d0bd392aa4f966
+userns		a1998908ba46526ac5cbbb9aae610cb234bd9f33
+ktest		fee9d3e61d04422628a3d22ed5eb8370dcef259b
+signal		20b4fb485227404329e41ad15588afad3df23050
+clk		38bf3a79785f50ecad01e0ea60bf779507032984
+random		13aa93c70e716b597d2451abee5e9f0b140b831c
+lzo-update	42b775abafafdf811ef300e869a4e1480ef1cf95
+aio		668044a5d632e979ae3cf850f269f8dbbcb3c396
+llvmlinux	977104ece1568f2e2ad3f5fd8e55bd640e8ab55a
+documentation	b2dd83b377d390ab503420c9a5867df5741e273d
+kselftest	69e273c0b0a3c337a521d083374c918dc52c666f
+signal-cleanup	b9f0fb2d4a7a034ee24f0a3d596fb731eb9bba72
+akpm-current	833628771769063487eeab6ae24a0e14e2464271
+akpm		ddf678bf18b811bbec5c71c0e375ddf09e0bc5c9
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..e10a0df
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,231 @@
+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/mmarek/kbuild.git#rc-fixes
+arc-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current	git	git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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
+mips-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes
+powerpc-merge	git	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+powerpc-merge-mpe	git	git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#for-linus
+sparc		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+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
+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
+wireless	git	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master
+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
+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
+md-current	git	git://neil.brown.name/md#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
+dwmw2		git	git://git.infradead.org/users/dwmw2/random-2.6.git#master
+devicetree-current	git	git://git.secretlab.ca/git/linux#devicetree/merge
+rr-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes
+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
+drm-intel-fixes	git	git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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
+bcm2835		git	git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.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
+ep93xx		git	git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+imx-mxs		git	git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+ixp4xx		git	git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+keystone	git	git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+msm		git	git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
+mvebu		git	git://git.infradead.org/linux-mvebu.git#for-next
+renesas		git	git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung		git	git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+sunxi		git	git://git.kernel.org/pub/scm/linux/kernel/git/mripard/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
+blackfin	git	http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus
+c6x		git	git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next
+cris		git	git://www.jni.nu/cris.git#for-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
+openrisc	git	git://openrisc.net/jonas/linux#for-upstream
+parisc		git	git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.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/benh/powerpc.git#next
+powernv-cpuidle	git	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle
+powerpc-mpe	git	git://git.kernel.org/pub/scm/linux/kernel/git/mpe/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
+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#next
+unicore32	git	git://github.com/gxt/linux.git#unicore32
+xtensa		git	git://github.com/czankel/xtensa-linux.git#for_next
+btrfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#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.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-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
+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
+gfs2		git	git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master
+jfs		git	git://github.com/kleikamp/linux-shaggy.git#jfs-next
+logfs		git	git://github.com/prasad-joshi/logfs_upstream.git#master
+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
+omfs		git	git://github.com/bcopeland/omfs.git#for-next
+squashfs	git	git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master
+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/linux/kernel/git/dgc/linux-xfs.git#for-next
+file-locks	git	git://git.samba.org/jlayton/linux.git#linux-next
+vfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+pci		git	git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+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-3/jdelvare-hwmon/
+hwmon-staging	git	git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+v4l-dvb		git	git://linuxtv.org/mchehab/media-next.git#master
+kbuild		git	git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+kconfig		git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+libata		git	git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#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
+apm		git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next
+cpupowerutils	git	git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+thermal		git	git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.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
+slave-dma	git	git://git.infradead.org/users/vkoul/slave-dma.git#next
+dmaengine	git	git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#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
+wireless-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master
+bluetooth	git	git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+infiniband	git	git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.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
+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
+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/rusty/linux.git#modules-next
+virtio		git	git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input		git	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt	git	git://github.com/rydberg/linux.git#for-next
+block		git	git://git.kernel.dk/linux-block.git#for-next
+device-mapper	git	git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+embedded	git	git://git.infradead.org/embedded-2.6.git#master
+firmware	git	git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+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/cjb/mmc.git#mmc-next
+mmc-uh		git	git://git.linaro.org/people/ulf.hansson/mmc.git#next
+kgdb		git	git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+uclinux		git	git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
+md		git	git://neil.brown.name/md#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.infradead.org/battery-2.6.git#master
+fbdev		git	git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next
+viafb		git	git://github.com/schandinat/linux-2.6.git#viafb-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
+selinux		git	git://git.infradead.org/users/pcmoore/selinux#next
+lblnet		git	git://git.infradead.org/users/pcmoore/lblnet#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
+osd		git	git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs		git	git://git.lwn.net/linux-2.6.git#docs-next
+trivial		git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit		git	git://git.infradead.org/users/eparis/audit.git#master
+fsnotify	git	git://git.infradead.org/users/eparis/notify.git#for-next
+devicetree	git	git://git.secretlab.ca/git/linux#devicetree/next
+dt-rh		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
+tiny		git	git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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
+uprobes		git	git://github.com/srikard/linux.git#for-next
+kvm		git	git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm		git	git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-ppc		git	git://github.com/agraf/linux-2.6.git#kvm-ppc-next
+oprofile	git	git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+fw-nohz		git	git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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/olof/chrome-platform.git#for-next
+sysctl		git	git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master
+regmap		git	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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/cooloney/linux-leds.git#for-next
+ipmi		git	git://git.code.sf.net/p/openipmi/linux-ipmi#for-next
+driver-core	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+tty		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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
+staging		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-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
+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
+writeback	git	git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
+hwspinlock	git	git://github.com/ohadbc/hwspinlock-next.git#linux-next
+pinctrl		git	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+vhost		git	git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+remoteproc	git	git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next
+rpmsg		git	git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next
+gpio		git	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+dma-mapping	git	git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-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
+signal		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
+clk		git	git://git.linaro.org/people/mturquette/linux.git#clk-next
+random		git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+lzo-update	git	git://github.com/markus-oberhumer/linux.git#lzo-update
+aio		git	git://git.kvack.org/~bcrl/aio-next.git#master
+llvmlinux	git	git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next
+documentation	git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git#for-next
+kselftest	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+signal-cleanup	git	git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git#signal_v4
+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..e86e019
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,11640 @@
+$ date
+Friday 3 October  09:39:42 AEST 2014
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at a44f867247d5 Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
+Merging origin/master (b601ce0fe3aa Merge tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
+$ git merge origin/master
+Updating a44f867247d5..b601ce0fe3aa
+Fast-forward
+ MAINTAINERS                                        |  8 +-
+ drivers/media/usb/em28xx/em28xx-cards.c            |  1 +
+ drivers/net/ethernet/broadcom/bnx2.c               |  5 +-
+ drivers/net/ethernet/broadcom/tg3.c                |  3 +-
+ drivers/net/ethernet/cadence/macb.c                | 11 ---
+ drivers/net/ethernet/mellanox/mlx4/main.c          |  4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c   |  6 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |  2 -
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c  |  5 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c    | 10 +--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  | 11 ++-
+ drivers/net/hyperv/netvsc_drv.c                    |  3 +-
+ drivers/net/macvtap.c                              | 18 ++---
+ drivers/net/usb/r8152.c                            | 88 +++++++++++-----------
+ drivers/parisc/superio.c                           |  3 +-
+ include/net/ip6_fib.h                              |  5 +-
+ include/net/net_namespace.h                        | 20 +----
+ lib/rhashtable.c                                   |  8 +-
+ mm/huge_memory.c                                   |  7 +-
+ mm/migrate.c                                       |  5 +-
+ net/core/skbuff.c                                  |  3 +
+ net/ipv4/ip_tunnel.c                               | 11 ++-
+ net/ipv4/route.c                                   |  2 +-
+ net/ipv6/addrconf.c                                |  3 +-
+ net/ipv6/addrconf_core.c                           |  7 ++
+ net/ipv6/ip6_fib.c                                 | 20 +++++
+ net/ipv6/ip6_gre.c                                 |  3 +
+ net/ipv6/ip6_tunnel.c                              |  6 +-
+ net/ipv6/ip6_vti.c                                 |  6 +-
+ net/ipv6/route.c                                   |  4 -
+ net/netfilter/Kconfig                              |  1 +
+ net/netfilter/nfnetlink.c                          | 64 +++++++++++++++-
+ net/netfilter/nft_hash.c                           | 12 +--
+ net/netfilter/nft_rbtree.c                         |  2 -
+ net/sched/ematch.c                                 |  6 +-
+ sound/soc/codecs/rt286.c                           |  7 +-
+ sound/soc/codecs/ssm2602.c                         |  2 +-
+ sound/soc/fsl/fsl_ssi.c                            | 12 +--
+ sound/soc/soc-compress.c                           |  6 +-
+ sound/soc/soc-core.c                               |  2 +-
+ 40 files changed, 249 insertions(+), 153 deletions(-)
+Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset")
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (4ed7800987b1 m68k: Wire up memfd_create)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
+$ git merge mips-fixes/mips-fixes
+Already up-to-date.
+Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging powerpc-merge-mpe/for-linus (7d59deb50aaf powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create())
+$ git merge powerpc-merge-mpe/for-linus
+Already up-to-date.
+Merging sparc/master (ca605b7dd740 sparc64: Add vio_set_intr() to enable/disable Rx interrupts)
+$ git merge sparc/master
+Auto-merging drivers/net/ethernet/sun/sunvnet.c
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/dma-mapping.h    |   6 +-
+ arch/sparc/include/asm/hypervisor.h     |  11 +++
+ arch/sparc/include/asm/ldc.h            |   5 +-
+ arch/sparc/include/asm/spitfire.h       |   2 +
+ arch/sparc/include/asm/thread_info_64.h |   1 +
+ arch/sparc/include/asm/vio.h            |  60 ++++++++++--
+ arch/sparc/kernel/cpu.c                 |  12 +++
+ arch/sparc/kernel/cpumap.c              |   2 +
+ arch/sparc/kernel/ds.c                  |   4 +-
+ arch/sparc/kernel/head_64.S             |  12 +++
+ arch/sparc/kernel/hvapi.c               |   1 +
+ arch/sparc/kernel/hvcalls.S             |  16 +++
+ arch/sparc/kernel/ioport.c              |   5 +-
+ arch/sparc/kernel/ldc.c                 |  41 ++++----
+ arch/sparc/kernel/leon_kernel.c         |  31 +++++-
+ arch/sparc/kernel/pcr.c                 |  47 ++++++++-
+ arch/sparc/kernel/perf_event.c          |   3 +-
+ arch/sparc/kernel/setup_64.c            |  26 +++--
+ arch/sparc/kernel/sun4v_tlb_miss.S      |  35 ++++---
+ arch/sparc/kernel/traps_64.c            |  15 +--
+ arch/sparc/kernel/vio.c                 |  13 ++-
+ arch/sparc/kernel/viohs.c               |  18 +++-
+ arch/sparc/lib/memset.S                 |  18 +++-
+ arch/sparc/mm/fault_64.c                |   3 +
+ arch/sparc/mm/init_64.c                 |  54 ++++++++++-
+ arch/sparc/power/hibernate_asm.S        |   4 +-
+ drivers/block/sunvdc.c                  | 167 ++++++++++++++++++++++++--------
+ drivers/net/ethernet/sun/sunvnet.c      |   4 +-
+ 28 files changed, 486 insertions(+), 130 deletions(-)
+Merging net/master (50dddff3cb9a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge net/master
+Already up-to-date.
+Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (b7c2dc8e684a Merge tag 'asoc-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (7cbeb9f90db8 PCI: pciehp: Fix pcie_wait_cmd() timeout)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels())
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (9e82bf014195 Linux 3.17-rc5)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for Seluxit USB dongle)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/cp210x.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging staging.current/staging-linus (0f33be009b89 Linux 3.17-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (3049683eafdb Input: i8042 - fix Asus X450LCP touchpad detection)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (7da4b29d496b crypto: aesni - disable "by8" AVX CTR optimization)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL dereference in selftest removal code)
+$ git merge devicetree-current/devicetree/merge
+Merge made by the 'recursive' strategy.
+ drivers/of/selftest.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on all architectures)
+$ git merge kselftest-fixes/fixes
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/memfd/Makefile     | 21 -----------------
+ tools/testing/selftests/memfd/memfd_test.c | 36 ++++++++++++++----------------
+ 2 files changed, 17 insertions(+), 40 deletions(-)
+Merging drm-intel-fixes/for-linux-next-fixes (91e56499304f drm/i915: Flush the PTEs after updating them before suspend)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths")
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (517eefb5de44 ARC: unbork FPU save/restore)
+$ git merge arc/for-next
+Removing arch/arc/plat-arcfpga/include/plat/memmap.h
+Removing arch/arc/plat-arcfpga/include/plat/irq.h
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig                            |   6 +-
+ arch/arc/Makefile                           |  17 +-
+ arch/arc/boot/dts/angel4.dts                |   5 -
+ arch/arc/boot/dts/nsimosci.dts              |   7 +-
+ arch/arc/configs/fpga_defconfig             |   1 -
+ arch/arc/configs/fpga_noramfs_defconfig     |   1 -
+ arch/arc/configs/nsimosci_defconfig         |   1 -
+ arch/arc/include/asm/arcregs.h              |  77 +++++----
+ arch/arc/include/asm/atomic.h               |   4 -
+ arch/arc/include/asm/bitops.h               |   4 -
+ arch/arc/include/asm/bug.h                  |   7 +-
+ arch/arc/include/asm/cache.h                |   2 +-
+ arch/arc/include/asm/current.h              |   4 -
+ arch/arc/include/asm/entry.h                |  45 ++---
+ arch/arc/include/asm/irqflags.h             |   4 -
+ arch/arc/include/asm/kgdb.h                 |  32 ++--
+ arch/arc/include/asm/processor.h            |  13 +-
+ arch/arc/include/asm/setup.h                |   1 -
+ arch/arc/include/asm/smp.h                  |  10 +-
+ arch/arc/include/asm/string.h               |   3 -
+ arch/arc/include/asm/syscalls.h             |   4 -
+ arch/arc/include/asm/thread_info.h          |   4 -
+ arch/arc/include/asm/unaligned.h            |   2 +-
+ arch/arc/kernel/Makefile                    |   2 +-
+ arch/arc/kernel/disasm.c                    |   4 +-
+ arch/arc/kernel/head.S                      |  10 --
+ arch/arc/kernel/perf_event.c                |  21 ++-
+ arch/arc/kernel/setup.c                     | 245 +++++++++++++---------------
+ arch/arc/kernel/smp.c                       |   2 +-
+ arch/arc/mm/cache_arc700.c                  |  14 +-
+ arch/arc/mm/tlb.c                           |   8 +-
+ arch/arc/plat-arcfpga/Kconfig               |  13 +-
+ arch/arc/plat-arcfpga/include/plat/irq.h    |  27 ---
+ arch/arc/plat-arcfpga/include/plat/memmap.h |  29 ----
+ arch/arc/plat-arcfpga/platform.c            |  61 +------
+ arch/arc/plat-arcfpga/smp.c                 |   3 +-
+ arch/arc/plat-tb10x/Kconfig                 |   1 -
+ arch/arc/plat-tb10x/tb10x.c                 |  13 --
+ 38 files changed, 254 insertions(+), 453 deletions(-)
+ delete mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h
+ delete mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h
+Merging arm/for-next (49e37117f8f6 Merge branches 'fiq' (early part), 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Makefile                    |   2 +-
+ arch/arm/boot/bootp/Makefile         |   2 +
+ arch/arm/boot/compressed/Makefile    |   2 +
+ arch/arm/configs/ep93xx_defconfig    |   1 +
+ arch/arm/configs/versatile_defconfig |   1 +
+ arch/arm/crypto/sha1-armv7-neon.S    |  39 +++++++------
+ arch/arm/include/asm/ftrace.h        |   2 +-
+ arch/arm/include/asm/smp.h           |   6 --
+ arch/arm/include/asm/syscall.h       |   8 +--
+ arch/arm/kernel/atags_parse.c        |   2 +-
+ arch/arm/kernel/entry-armv.S         | 108 ++++++++++++++++++++++++++++++-----
+ arch/arm/kernel/entry-common.S       |   2 +-
+ arch/arm/kernel/entry-header.S       |  63 ++++++++++++++++++--
+ arch/arm/kernel/fiq.c                |  17 ++++--
+ arch/arm/kernel/hw_breakpoint.c      |  18 +++---
+ arch/arm/kernel/irq.c                |   4 +-
+ arch/arm/kernel/perf_event_cpu.c     |   4 +-
+ arch/arm/kernel/process.c            |  62 ++++++++++++++++----
+ arch/arm/kernel/return_address.c     |   9 ---
+ arch/arm/kernel/setup.c              |   8 ++-
+ arch/arm/kernel/smp.c                |  14 ++---
+ arch/arm/kernel/traps.c              |  26 ++++++++-
+ arch/arm/kernel/unwind.c             |  24 ++++----
+ arch/arm/mach-sa1100/Kconfig         |   2 +
+ arch/arm/mach-sa1100/h3xxx.c         |  15 +++++
+ arch/arm/mm/idmap.c                  |   2 +-
+ arch/arm/mm/mmu.c                    |   4 +-
+ arch/arm/mm/proc-v7.S                |   2 +-
+ crypto/Kconfig                       |   4 +-
+ kernel/gcov/Kconfig                  |   2 +-
+ 30 files changed, 338 insertions(+), 117 deletions(-)
+Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (058bb16eb709 arm-soc: document merges)
+$ git merge arm-soc/for-next
+Removing include/linux/platform_data/tegra_emc.h
+Removing arch/arm/mach-shmobile/r7s72100.h
+Removing arch/arm/mach-shmobile/clock-r7s72100.c
+Removing arch/arm/mach-shmobile/board-genmai.c
+Removing arch/arm/mach-shmobile/board-genmai-reference.c
+Removing arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+Auto-merging arch/arm/mach-s5pv210/regs-clock.h
+Removing arch/arm/mach-omap2/irq.c
+Removing arch/arm/mach-msm/board-mahimahi.c
+Removing arch/arm/mach-imx/pcm970-baseboard.c
+Removing arch/arm/mach-imx/mach-pcm038.c
+Removing arch/arm/mach-imx/mach-mxt_td60.c
+Removing arch/arm/mach-imx/mach-mx1ads.c
+Removing arch/arm/mach-imx/mach-cpuimx27.c
+Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+Removing arch/arm/mach-imx/board-pcm038.h
+Removing arch/arm/mach-exynos/include/mach/memory.h
+Removing arch/arm/mach-at91/board-rsi-ews.c
+Removing arch/arm/mach-at91/board-foxg20.c
+Removing arch/arm/mach-at91/at91sam9g45_reset.S
+Removing arch/arm/mach-at91/at91sam9_alt_reset.S
+Removing arch/arm/mach-at91/at91sam926x_time.c
+Removing arch/arm/mach-at91/at91_shdwc.h
+Removing arch/arm/mach-at91/at91_rstc.h
+Auto-merging arch/arm/configs/hisi_defconfig
+Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi
+Removing arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi
+Auto-merging arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
+Removing arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
+Removing arch/arm/boot/dts/exynos5250-cros-common.dtsi
+Auto-merging arch/arm/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Marvell/README                   |    4 +
+ .../bindings/arm/altera/socfpga-sdram-edac.txt     |   15 +
+ Documentation/devicetree/bindings/arm/amlogic.txt  |    8 +
+ .../devicetree/bindings/arm/atmel-at91.txt         |   45 +-
+ .../devicetree/bindings/arm/bcm/bcm63138.txt       |    9 +
+ .../devicetree/bindings/arm/cavium-thunder.txt     |   10 +
+ Documentation/devicetree/bindings/arm/cpus.txt     |    1 +
+ .../devicetree/bindings/arm/geniatech.txt          |    5 +
+ .../bindings/arm/hisilicon/hisilicon.txt           |   23 +
+ Documentation/devicetree/bindings/arm/mediatek.txt |    6 +
+ Documentation/devicetree/bindings/arm/omap/mpu.txt |    3 +
+ .../devicetree/bindings/arm/omap/omap.txt          |   12 +
+ Documentation/devicetree/bindings/arm/shmobile.txt |   71 +
+ .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt |   12 +
+ .../devicetree/bindings/clock/at91-clock.txt       |   14 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt     |    2 +
+ .../devicetree/bindings/i2c/trivial-devices.txt    |    2 +-
+ .../devicetree/bindings/leds/register-bit-led.txt  |   99 ++
+ .../devicetree/bindings/mailbox/omap-mailbox.txt   |  108 ++
+ .../bindings/memory-controllers/synopsys.txt       |   11 +
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.txt     |    4 +-
+ .../devicetree/bindings/regulator/da9210.txt       |    4 +-
+ .../devicetree/bindings/rtc/sun6i-rtc.txt          |   17 +
+ .../bindings/soc/ti/keystone-navigator-dma.txt     |  111 ++
+ .../bindings/soc/ti/keystone-navigator-qmss.txt    |  232 +++
+ .../devicetree/bindings/vendor-prefixes.txt        |    3 +
+ MAINTAINERS                                        |   60 +-
+ arch/arm/Kconfig                                   |   14 +
+ arch/arm/Kconfig.debug                             |   80 +-
+ arch/arm/Makefile                                  |    1 +
+ arch/arm/arm-soc-for-next-contents.txt             |  300 ++++
+ arch/arm/boot/dts/Makefile                         |   35 +-
+ arch/arm/boot/dts/am335x-bone-common.dtsi          |    8 +-
+ arch/arm/boot/dts/am335x-bone.dts                  |    5 +
+ arch/arm/boot/dts/am335x-boneblack.dts             |    5 +
+ arch/arm/boot/dts/am33xx.dtsi                      |   12 +-
+ arch/arm/boot/dts/am4372.dtsi                      |   13 +-
+ arch/arm/boot/dts/armada-370-db.dts                |    6 +
+ arch/arm/boot/dts/armada-370-mirabox.dts           |    6 +
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts     |   10 +-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts     |   12 +-
+ arch/arm/boot/dts/armada-370-rd.dts                |   47 +-
+ arch/arm/boot/dts/armada-370-xp.dtsi               |    4 +-
+ arch/arm/boot/dts/armada-370.dtsi                  |   23 +
+ arch/arm/boot/dts/armada-375.dtsi                  |    6 +
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |    6 +-
+ arch/arm/boot/dts/at91-sama5d4ek.dts               |  260 +++
+ arch/arm/boot/dts/at91sam9263.dtsi                 |   12 +-
+ arch/arm/boot/dts/at91sam9g20.dtsi                 |    4 +
+ arch/arm/boot/dts/at91sam9g45.dtsi                 |   47 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts             |    4 +
+ arch/arm/boot/dts/at91sam9n12.dtsi                 |    2 +
+ arch/arm/boot/dts/at91sam9n12ek.dts                |    2 +
+ arch/arm/boot/dts/at91sam9rl.dtsi                  |    4 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi                  |    4 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts                |    8 +-
+ arch/arm/boot/dts/bcm2835.dtsi                     |    1 +
+ arch/arm/boot/dts/bcm63138.dtsi                    |  134 ++
+ arch/arm/boot/dts/bcm963138dvt.dts                 |   30 +
+ arch/arm/boot/dts/cros-adc-thermistors.dtsi        |   44 +
+ arch/arm/boot/dts/da850-evm.dts                    |   72 +
+ arch/arm/boot/dts/da850.dtsi                       |   19 +
+ arch/arm/boot/dts/dra7-evm.dts                     |    2 +
+ arch/arm/boot/dts/dra7.dtsi                        |   25 +-
+ arch/arm/boot/dts/dra72-evm.dts                    |  120 ++
+ arch/arm/boot/dts/dra72x.dtsi                      |    5 +
+ arch/arm/boot/dts/dra74x.dtsi                      |    6 +
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |    8 +-
+ arch/arm/boot/dts/exynos4412-origen.dts            |    8 +-
+ arch/arm/boot/dts/exynos4412-trats2.dts            |    8 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts           |   22 +-
+ arch/arm/boot/dts/exynos5250-cros-common.dtsi      |  164 --
+ arch/arm/boot/dts/exynos5250-smdk5250.dts          |   18 +-
+ arch/arm/boot/dts/exynos5250-snow.dts              |  195 ++-
+ arch/arm/boot/dts/exynos5250.dtsi                  |   15 -
+ arch/arm/boot/dts/exynos5260-xyref5260.dts         |   18 +-
+ arch/arm/boot/dts/exynos5410-smdk5410.dts          |   18 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts      |   16 +-
+ arch/arm/boot/dts/exynos5420-peach-pit.dts         |  482 +++++-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts          |   16 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts          |  472 ++++-
+ arch/arm/boot/dts/hip04-d01.dts                    |   32 +
+ arch/arm/boot/dts/hip04.dtsi                       |  267 +++
+ arch/arm/boot/dts/imx1-ads.dts                     |  152 ++
+ arch/arm/boot/dts/imx1-apf9328.dts                 |  129 ++
+ arch/arm/boot/dts/imx1-pinfunc.h                   |  302 ++++
+ arch/arm/boot/dts/imx1.dtsi                        |  266 +++
+ arch/arm/boot/dts/imx23-evk.dts                    |    4 +-
+ arch/arm/boot/dts/imx25-pinfunc.h                  |   33 +-
+ arch/arm/boot/dts/imx25.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx27-apf27dev.dts               |   17 +
+ arch/arm/boot/dts/imx28-apf28dev.dts               |    4 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts             |    4 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts               |    4 +-
+ arch/arm/boot/dts/imx28-cfa10055.dts               |    4 +-
+ arch/arm/boot/dts/imx28-cfa10056.dts               |    4 +-
+ arch/arm/boot/dts/imx28-cfa10057.dts               |    4 +-
+ arch/arm/boot/dts/imx28-cfa10058.dts               |    4 +-
+ arch/arm/boot/dts/imx28-evk.dts                    |    4 +-
+ arch/arm/boot/dts/imx28-m28cu3.dts                 |    4 +-
+ arch/arm/boot/dts/imx28-m28evk.dts                 |    4 +-
+ arch/arm/boot/dts/imx28-tx28.dts                   |  107 +-
+ arch/arm/boot/dts/imx28.dtsi                       |   43 +
+ arch/arm/boot/dts/imx35.dtsi                       |    1 +
+ arch/arm/boot/dts/imx50.dtsi                       |    2 +
+ arch/arm/boot/dts/imx51.dtsi                       |    3 +
+ arch/arm/boot/dts/imx53-smd.dts                    |    2 +-
+ arch/arm/boot/dts/imx53.dtsi                       |    8 +
+ arch/arm/boot/dts/imx6dl-gw552x.dts                |   20 +
+ arch/arm/boot/dts/imx6dl-hummingboard.dts          |  203 +--
+ arch/arm/boot/dts/imx6q-gw5400-a.dts               |  203 +--
+ arch/arm/boot/dts/imx6q-gw552x.dts                 |   24 +
+ arch/arm/boot/dts/imx6q-hummingboard.dts           |   21 +
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              |  192 +--
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |  314 ++--
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |  338 ++--
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |  278 ++-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi              |  267 +++
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi        |  200 +++
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |   38 +
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    2 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   45 +-
+ arch/arm/boot/dts/imx6qdl.dtsi                     |   24 +-
+ arch/arm/boot/dts/imx6sl-evk.dts                   |  104 +-
+ arch/arm/boot/dts/imx6sl.dtsi                      |   31 +-
+ arch/arm/boot/dts/imx6sx-sdb.dts                   |   93 +
+ arch/arm/boot/dts/imx6sx.dtsi                      |    7 +-
+ arch/arm/boot/dts/k2e.dtsi                         |   13 +
+ arch/arm/boot/dts/k2hk.dtsi                        |   56 +
+ arch/arm/boot/dts/k2l.dtsi                         |   46 +
+ arch/arm/boot/dts/keystone.dtsi                    |   10 +-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts     |   16 +-
+ arch/arm/boot/dts/kirkwood-rd88f6281-a.dts         |   43 +
+ arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts        |   26 -
+ ...-rd88f6281-a1.dts => kirkwood-rd88f6281-z0.dts} |   18 +-
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi          |   27 +-
+ arch/arm/boot/dts/kirkwood.dtsi                    |    4 +-
+ arch/arm/boot/dts/meson.dtsi                       |  105 ++
+ arch/arm/boot/dts/meson6-atv1200.dts               |   66 +
+ arch/arm/boot/dts/meson6.dtsi                      |   78 +
+ arch/arm/boot/dts/mt6589-aquaris5.dts              |    5 +
+ arch/arm/boot/dts/mt6589.dtsi                      |    4 +-
+ arch/arm/boot/dts/omap2.dtsi                       |    1 -
+ arch/arm/boot/dts/omap2420-n810.dts                |    7 +
+ arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |    6 +
+ arch/arm/boot/dts/omap2420.dtsi                    |    8 +
+ arch/arm/boot/dts/omap2430.dtsi                    |    4 +
+ arch/arm/boot/dts/omap3-beagle-xm.dts              |    4 +-
+ .../boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} |  150 +-
+ arch/arm/boot/dts/omap3-gta04a3.dts                |   48 +
+ arch/arm/boot/dts/omap3-gta04a4.dts                |   13 +
+ arch/arm/boot/dts/omap3-gta04a5.dts                |   17 +
+ arch/arm/boot/dts/omap3-ha-common.dtsi             |   88 +
+ arch/arm/boot/dts/omap3-ha-lcd.dts                 |  165 ++
+ arch/arm/boot/dts/omap3-ha.dts                     |   28 +
+ arch/arm/boot/dts/omap3-ldp.dts                    |    5 +
+ arch/arm/boot/dts/omap3-n900.dts                   |   54 +-
+ .../boot/dts/omap3-overo-common-peripherals.dtsi   |    5 +-
+ arch/arm/boot/dts/omap3-tao3530.dtsi               |  337 ++++
+ arch/arm/boot/dts/omap3-thunder.dts                |  129 ++
+ arch/arm/boot/dts/omap3.dtsi                       |    8 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi          |    3 -
+ arch/arm/boot/dts/omap4-panda-es.dts               |    5 +
+ arch/arm/boot/dts/omap4-panda.dts                  |    5 +
+ arch/arm/boot/dts/omap4.dtsi                       |   15 +
+ arch/arm/boot/dts/omap5-cm-t54.dts                 |  272 ++-
+ arch/arm/boot/dts/omap5-sbc-t54.dts                |    8 +-
+ arch/arm/boot/dts/omap5.dtsi                       |   46 +-
+ arch/arm/boot/dts/pxa2xx.dtsi                      |    4 +-
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |   43 +
+ arch/arm/boot/dts/qcom-apq8064.dtsi                |  183 ++
+ arch/arm/boot/dts/qcom-apq8074-dragonboard.dts     |   21 +
+ arch/arm/boot/dts/qcom-apq8084-ifc6540.dts         |   23 +
+ arch/arm/boot/dts/qcom-apq8084-mtp.dts             |    6 +
+ arch/arm/boot/dts/qcom-apq8084.dtsi                |   51 +
+ arch/arm/boot/dts/qcom-ipq8064-ap148.dts           |   85 +
+ arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi           |    1 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi                |  250 +++
+ arch/arm/boot/dts/qcom-msm8660-surf.dts            |   42 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi                |   93 +
+ arch/arm/boot/dts/qcom-msm8960-cdp.dts             |   27 +
+ arch/arm/boot/dts/qcom-msm8960.dtsi                |   87 +
+ arch/arm/boot/dts/qcom-msm8974.dtsi                |   15 +-
+ arch/arm/boot/dts/r7s72100-genmai.dts              |    4 +
+ arch/arm/boot/dts/r7s72100.dtsi                    |   10 +
+ arch/arm/boot/dts/r8a73a4.dtsi                     |    6 +-
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts |  283 ---
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |  276 ++-
+ arch/arm/boot/dts/r8a7740.dtsi                     |  220 ++-
+ arch/arm/boot/dts/r8a7778.dtsi                     |    6 +
+ arch/arm/boot/dts/r8a7779-marzen.dts               |    4 +
+ arch/arm/boot/dts/r8a7779.dtsi                     |   58 +-
+ arch/arm/boot/dts/r8a7790-lager.dts                |   44 +-
+ arch/arm/boot/dts/r8a7790.dtsi                     |  159 +-
+ arch/arm/boot/dts/r8a7791-henninger.dts            |   35 +
+ arch/arm/boot/dts/r8a7791-koelsch.dts              |   41 +-
+ arch/arm/boot/dts/r8a7791.dtsi                     |  140 +-
+ arch/arm/boot/dts/r8a7794-alt.dts                  |   47 +
+ arch/arm/boot/dts/r8a7794.dtsi                     |  531 ++++++
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   15 +-
+ arch/arm/boot/dts/rk3066a.dtsi                     |   67 +
+ arch/arm/boot/dts/rk3188-radxarock.dts             |   68 +-
+ arch/arm/boot/dts/rk3188.dtsi                      |   69 +
+ arch/arm/boot/dts/rk3288-evb-act8846.dts           |   10 +-
+ arch/arm/boot/dts/rk3288-evb-rk808.dts             |  132 ++
+ arch/arm/boot/dts/rk3288-evb.dtsi                  |   87 +
+ arch/arm/boot/dts/rk3288.dtsi                      |  380 ++++
+ arch/arm/boot/dts/rk3xxx.dtsi                      |  109 +-
+ arch/arm/boot/dts/sama5d3.dtsi                     |   37 +-
+ arch/arm/boot/dts/sama5d3_can.dtsi                 |    2 +-
+ arch/arm/boot/dts/sama5d3xcm.dtsi                  |   30 +
+ arch/arm/boot/dts/sama5d3xmb.dtsi                  |    4 +
+ arch/arm/boot/dts/sama5d4.dtsi                     | 1240 +++++++++++++
+ arch/arm/boot/dts/sh7372.dtsi                      |    1 +
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |    8 +-
+ arch/arm/boot/dts/sh73a0.dtsi                      |   36 +-
+ arch/arm/boot/dts/socfpga.dtsi                     |   11 +
+ arch/arm/boot/dts/socfpga_arria5.dtsi              |   11 +-
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts         |    7 -
+ arch/arm/boot/dts/socfpga_cyclone5.dtsi            |   13 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts       |    4 +
+ arch/arm/boot/dts/socfpga_vt.dts                   |    9 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi                   |   19 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi                  |   17 +-
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts           |  130 ++
+ arch/arm/boot/dts/sun5i-a13.dtsi                   |   17 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi                   |   56 +-
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts        |  236 +++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |  137 ++
+ arch/arm/boot/dts/sun7i-a20.dtsi                   |  102 +-
+ arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts        |   41 +
+ arch/arm/boot/dts/sun8i-a23.dtsi                   |  237 ++-
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi     |    7 +
+ arch/arm/boot/dts/tegra114.dtsi                    |    5 +
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts          |   98 +-
+ arch/arm/boot/dts/tegra124-nyan-big.dts            | 1136 ++++++++++++
+ arch/arm/boot/dts/tegra124-venice2.dts             |   18 +-
+ arch/arm/boot/dts/tegra124.dtsi                    |  100 +-
+ arch/arm/boot/dts/tegra20.dtsi                     |    5 +
+ arch/arm/boot/dts/tegra30.dtsi                     |    5 +
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |   36 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi                |   36 +-
+ arch/arm/boot/dts/vexpress-v2p-ca9.dts             |   31 +
+ arch/arm/boot/dts/vf610-colibri-eval-v3.dts        |   46 +
+ .../dts/{vf610-colibri.dts => vf610-colibri.dtsi}  |   22 +-
+ arch/arm/boot/dts/vf610-twr.dts                    |   26 +-
+ arch/arm/boot/dts/vf610.dtsi                       |   60 +-
+ arch/arm/boot/dts/zynq-7000.dtsi                   |   19 +-
+ arch/arm/boot/dts/zynq-parallella.dts              |   27 +-
+ arch/arm/boot/dts/zynq-zc702.dts                   |   18 +-
+ arch/arm/boot/dts/zynq-zc706.dts                   |   12 +-
+ arch/arm/boot/dts/zynq-zed.dts                     |   14 +-
+ arch/arm/configs/ape6evm_defconfig                 |    9 +-
+ arch/arm/configs/at91_dt_defconfig                 |   35 +-
+ arch/arm/configs/at91sam9260_9g20_defconfig        |   13 +-
+ arch/arm/configs/at91sam9261_9g10_defconfig        |    5 +-
+ arch/arm/configs/at91sam9263_defconfig             |   13 +-
+ arch/arm/configs/at91sam9g45_defconfig             |   19 +-
+ arch/arm/configs/at91sam9rl_defconfig              |   19 +-
+ arch/arm/configs/bcm2835_defconfig                 |    1 +
+ arch/arm/configs/bcm_defconfig                     |    1 -
+ arch/arm/configs/bockw_defconfig                   |    3 +-
+ arch/arm/configs/clps711x_defconfig                |    4 +-
+ arch/arm/configs/ezx_defconfig                     |    1 -
+ .../configs/{hi3xxx_defconfig => hisi_defconfig}   |   13 +
+ arch/arm/configs/imote2_defconfig                  |    1 -
+ arch/arm/configs/imx_v4_v5_defconfig               |   16 +-
+ arch/arm/configs/imx_v6_v7_defconfig               |   10 +-
+ arch/arm/configs/koelsch_defconfig                 |   17 +
+ arch/arm/configs/kzm9g_defconfig                   |    1 +
+ arch/arm/configs/lager_defconfig                   |    8 +-
+ arch/arm/configs/lpc32xx_defconfig                 |    2 +
+ arch/arm/configs/marzen_defconfig                  |    1 +
+ arch/arm/configs/multi_v7_defconfig                |   40 +-
+ arch/arm/configs/mvebu_v7_defconfig                |   68 +-
+ arch/arm/configs/omap2plus_defconfig               |   79 +-
+ arch/arm/configs/pxa3xx_defconfig                  |    1 -
+ arch/arm/configs/qcom_defconfig                    |   14 +-
+ arch/arm/configs/sama5_defconfig                   |   19 +-
+ arch/arm/configs/shmobile_defconfig                |   16 +
+ arch/arm/configs/sunxi_defconfig                   |    4 +-
+ arch/arm/configs/tegra_defconfig                   |    5 +-
+ arch/arm/include/asm/mcpm.h                        |    5 +
+ arch/arm/include/debug/bcm63xx.S                   |   33 +
+ arch/arm/include/debug/meson.S                     |   35 +
+ arch/arm/mach-at91/Kconfig                         |   49 +-
+ arch/arm/mach-at91/Kconfig.non_dt                  |   18 +-
+ arch/arm/mach-at91/Makefile                        |    9 +-
+ arch/arm/mach-at91/at91_rstc.h                     |   53 -
+ arch/arm/mach-at91/at91_shdwc.h                    |   50 -
+ arch/arm/mach-at91/at91sam9260.c                   |   51 +-
+ arch/arm/mach-at91/at91sam9261.c                   |   51 +-
+ arch/arm/mach-at91/at91sam9263.c                   |   51 +-
+ arch/arm/mach-at91/at91sam926x_time.c              |  294 ----
+ arch/arm/mach-at91/at91sam9_alt_reset.S            |   40 -
+ arch/arm/mach-at91/at91sam9g45.c                   |   55 +-
+ arch/arm/mach-at91/at91sam9g45_reset.S             |   45 -
+ arch/arm/mach-at91/at91sam9rl.c                    |   51 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c             |    4 +-
+ arch/arm/mach-at91/board-cam60.c                   |    4 +-
+ arch/arm/mach-at91/board-cpu9krea.c                |    4 +-
+ arch/arm/mach-at91/board-dt-rm9200.c               |   13 -
+ arch/arm/mach-at91/board-dt-sam9.c                 |   23 -
+ arch/arm/mach-at91/board-dt-sama5.c                |   59 +-
+ arch/arm/mach-at91/board-flexibity.c               |    4 +-
+ arch/arm/mach-at91/board-foxg20.c                  |  272 ---
+ arch/arm/mach-at91/board-gsia18s.c                 |    2 +-
+ arch/arm/mach-at91/board-pcontrol-g20.c            |    2 +-
+ arch/arm/mach-at91/board-rsi-ews.c                 |  232 ---
+ arch/arm/mach-at91/board-sam9-l9260.c              |    4 +-
+ arch/arm/mach-at91/board-sam9260ek.c               |    5 +-
+ arch/arm/mach-at91/board-sam9261ek.c               |    7 +-
+ arch/arm/mach-at91/board-sam9263ek.c               |    5 +-
+ arch/arm/mach-at91/board-sam9g20ek.c               |    4 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c            |    5 +-
+ arch/arm/mach-at91/board-sam9rlek.c                |    5 +-
+ arch/arm/mach-at91/board-snapper9260.c             |    4 +-
+ arch/arm/mach-at91/board-stamp9g20.c               |    4 +-
+ arch/arm/mach-at91/clock.c                         |    1 +
+ arch/arm/mach-at91/generic.h                       |   19 +-
+ arch/arm/mach-at91/include/mach/cpu.h              |   22 +-
+ arch/arm/mach-at91/include/mach/debug-macro.S      |    5 +-
+ arch/arm/mach-at91/include/mach/hardware.h         |   23 +-
+ arch/arm/mach-at91/include/mach/sama5d4.h          |   33 +
+ arch/arm/mach-at91/include/mach/uncompress.h       |   21 +-
+ arch/arm/mach-at91/irq.c                           |  270 +--
+ arch/arm/mach-at91/pm.c                            |  104 +-
+ arch/arm/mach-at91/sama5d4.c                       |   64 +
+ arch/arm/mach-at91/setup.c                         |  273 ++-
+ arch/arm/mach-at91/soc.h                           |    7 +
+ arch/arm/mach-bcm/Kconfig                          |   17 +
+ arch/arm/mach-bcm/Makefile                         |    3 +
+ arch/arm/mach-bcm/bcm63xx.c                        |   27 +
+ arch/arm/mach-clps711x/board-edb7211.c             |   37 +-
+ arch/arm/mach-clps711x/common.c                    |  138 +-
+ arch/arm/mach-clps711x/common.h                    |    5 +
+ arch/arm/mach-clps711x/devices.c                   |   52 +-
+ arch/arm/mach-cns3xxx/cns3420vb.c                  |    1 +
+ arch/arm/mach-cns3xxx/core.c                       |    1 +
+ arch/arm/mach-cns3xxx/core.h                       |    6 +
+ arch/arm/mach-cns3xxx/pcie.c                       |   49 +-
+ arch/arm/mach-davinci/board-da850-evm.c            |   15 +
+ arch/arm/mach-davinci/da8xx-dt.c                   |    1 +
+ arch/arm/mach-exynos/include/mach/memory.h         |   26 -
+ arch/arm/mach-exynos/platsmp.c                     |    4 +-
+ arch/arm/mach-hisi/Kconfig                         |   11 +-
+ arch/arm/mach-hisi/Makefile                        |    3 +
+ arch/arm/mach-hisi/hisilicon.c                     |    9 +
+ arch/arm/mach-hisi/platmcpm.c                      |  386 +++++
+ arch/arm/mach-imx/Kconfig                          |  111 +-
+ arch/arm/mach-imx/Makefile                         |   10 +-
+ arch/arm/mach-imx/anatop.c                         |   13 +
+ arch/arm/mach-imx/board-pcm038.h                   |   36 -
+ arch/arm/mach-imx/clk-gate-exclusive.c             |   94 +
+ arch/arm/mach-imx/clk-imx6q.c                      |   99 +-
+ arch/arm/mach-imx/clk-imx6sl.c                     |  103 +-
+ arch/arm/mach-imx/clk-imx6sx.c                     |   63 +-
+ arch/arm/mach-imx/clk-pllv3.c                      |   37 -
+ arch/arm/mach-imx/clk-vf610.c                      |   21 +-
+ arch/arm/mach-imx/clk.h                            |    3 +
+ arch/arm/mach-imx/common.h                         |    2 -
+ arch/arm/mach-imx/cpuidle-imx6q.c                  |    4 -
+ arch/arm/mach-imx/eukrea-baseboards.h              |   10 +-
+ arch/arm/mach-imx/eukrea_mbimx27-baseboard.c       |  351 ----
+ arch/arm/mach-imx/imx1-dt.c                        |   26 +
+ arch/arm/mach-imx/iomux-imx31.c                    |    7 -
+ arch/arm/mach-imx/iomux-v1.c                       |    2 -
+ arch/arm/mach-imx/iomux-v3.c                       |    2 -
+ arch/arm/mach-imx/mach-armadillo5x0.c              |    2 +-
+ arch/arm/mach-imx/mach-cpuimx27.c                  |  321 ----
+ arch/arm/mach-imx/mach-imx6sx.c                    |    3 +
+ arch/arm/mach-imx/mach-mx1ads.c                    |  154 --
+ arch/arm/mach-imx/mach-mx31_3ds.c                  |    4 +-
+ arch/arm/mach-imx/mach-mx31lite.c                  |    2 +-
+ arch/arm/mach-imx/mach-mxt_td60.c                  |  273 ---
+ arch/arm/mach-imx/mach-pcm037.c                    |    4 +-
+ arch/arm/mach-imx/mach-pcm038.c                    |  358 ----
+ arch/arm/mach-imx/mxc.h                            |    2 +
+ arch/arm/mach-imx/pcm970-baseboard.c               |  231 ---
+ arch/arm/mach-imx/platsmp.c                        |   10 -
+ arch/arm/mach-imx/time.c                           |   31 +-
+ arch/arm/mach-integrator/impd1.c                   |   48 +
+ arch/arm/mach-lpc32xx/common.c                     |   29 +-
+ arch/arm/mach-meson/Kconfig                        |   13 +
+ arch/arm/mach-meson/Makefile                       |    1 +
+ arch/arm/mach-meson/meson.c                        |   27 +
+ arch/arm/mach-msm/board-mahimahi.c                 |   83 -
+ arch/arm/mach-msm/board-msm7x30.c                  |    2 +-
+ arch/arm/mach-msm/board-trout-gpio.c               |    2 +-
+ arch/arm/mach-msm/board-trout.c                    |    2 +-
+ arch/arm/mach-msm/io.c                             |    6 +-
+ arch/arm/mach-omap2/Kconfig                        |    6 +-
+ arch/arm/mach-omap2/Makefile                       |   15 +-
+ arch/arm/mach-omap2/board-3430sdp.c                |    1 -
+ arch/arm/mach-omap2/board-am3517crane.c            |    1 -
+ arch/arm/mach-omap2/board-am3517evm.c              |    1 -
+ arch/arm/mach-omap2/board-cm-t35.c                 |    2 -
+ arch/arm/mach-omap2/board-cm-t3517.c               |    1 -
+ arch/arm/mach-omap2/board-devkit8000.c             |    1 -
+ arch/arm/mach-omap2/board-generic.c                |   44 +-
+ arch/arm/mach-omap2/board-ldp.c                    |    1 -
+ arch/arm/mach-omap2/board-n8x0.c                   |   26 +-
+ arch/arm/mach-omap2/board-omap3beagle.c            |    1 -
+ arch/arm/mach-omap2/board-omap3logic.c             |    2 -
+ arch/arm/mach-omap2/board-omap3pandora.c           |    1 -
+ arch/arm/mach-omap2/board-omap3stalker.c           |    1 -
+ arch/arm/mach-omap2/board-omap3touchbook.c         |    1 -
+ arch/arm/mach-omap2/board-overo.c                  |    1 -
+ arch/arm/mach-omap2/board-rx51.c                   |    1 -
+ arch/arm/mach-omap2/common-board-devices.h         |    5 +
+ arch/arm/mach-omap2/common.h                       |   27 +-
+ arch/arm/mach-omap2/display.c                      |    2 +-
+ arch/arm/mach-omap2/gpmc.c                         |    2 +-
+ arch/arm/mach-omap2/hdq1w.c                        |    4 +-
+ arch/arm/mach-omap2/i2c.c                          |    2 +-
+ arch/arm/mach-omap2/io.c                           |   23 +-
+ arch/arm/mach-omap2/irq.c                          |  380 ----
+ arch/arm/mach-omap2/msdi.c                         |    4 +-
+ arch/arm/mach-omap2/mux.c                          |    2 +-
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c          |  106 +-
+ arch/arm/mach-omap2/omap-secure.h                  |    1 +
+ arch/arm/mach-omap2/omap-wakeupgen.c               |   20 +-
+ arch/arm/mach-omap2/omap-wakeupgen.h               |    1 +
+ arch/arm/mach-omap2/omap4-common.c                 |   22 +-
+ arch/arm/mach-omap2/omap_hwmod.c                   |   30 +-
+ arch/arm/mach-omap2/omap_hwmod.h                   |    4 +
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   12 +-
+ arch/arm/mach-omap2/pdata-quirks.c                 |   27 +-
+ arch/arm/mach-omap2/pm.h                           |    1 +
+ arch/arm/mach-omap2/pm34xx.c                       |    2 +-
+ arch/arm/mach-omap2/pm44xx.c                       |   57 +-
+ arch/arm/mach-omap2/powerdomain.c                  |   79 +-
+ arch/arm/mach-omap2/powerdomain.h                  |    4 +
+ arch/arm/mach-omap2/powerdomains54xx_data.c        |   12 +-
+ arch/arm/mach-omap2/powerdomains7xx_data.c         |   14 +-
+ arch/arm/mach-omap2/prm3xxx.c                      |   18 +
+ arch/arm/mach-omap2/prm44xx.c                      |   90 +-
+ arch/arm/mach-omap2/prm_common.c                   |    2 +-
+ arch/arm/mach-omap2/prminst44xx.c                  |   40 +-
+ arch/arm/mach-omap2/prminst44xx.h                  |    3 +
+ arch/arm/mach-omap2/smartreflex-class3.c           |    4 +-
+ arch/arm/mach-omap2/sr_device.c                    |    2 +-
+ arch/arm/mach-omap2/sram.c                         |   39 +-
+ arch/arm/mach-omap2/sram.h                         |    7 -
+ arch/arm/mach-omap2/timer.c                        |    6 +-
+ arch/arm/mach-omap2/vc.c                           |    2 +-
+ arch/arm/mach-omap2/voltage.c                      |   22 +-
+ arch/arm/mach-omap2/wd_timer.c                     |    4 +-
+ arch/arm/mach-orion5x/dns323-setup.c               |    8 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c     |    2 +-
+ arch/arm/mach-orion5x/ts209-setup.c                |    2 +-
+ arch/arm/mach-orion5x/ts409-setup.c                |    2 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c               |    4 +-
+ arch/arm/mach-pxa/devices.c                        |   42 +-
+ arch/arm/mach-pxa/devices.h                        |    3 +
+ arch/arm/mach-pxa/pxa3xx.c                         |   14 +-
+ arch/arm/mach-qcom/board.c                         |    2 +
+ arch/arm/mach-rockchip/Kconfig                     |    1 +
+ arch/arm/mach-s3c24xx/Kconfig                      |    2 -
+ arch/arm/mach-s3c24xx/common.c                     |    4 -
+ arch/arm/mach-s3c24xx/common.h                     |    5 -
+ .../mach-s3c24xx/include/mach/regs-s3c2443-clock.h |    2 -
+ arch/arm/mach-s3c24xx/mach-amlm5900.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-anubis.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-at2440evb.c             |    1 -
+ arch/arm/mach-s3c24xx/mach-bast.c                  |    1 -
+ arch/arm/mach-s3c24xx/mach-gta02.c                 |    1 -
+ arch/arm/mach-s3c24xx/mach-h1940.c                 |    1 -
+ arch/arm/mach-s3c24xx/mach-jive.c                  |    1 -
+ arch/arm/mach-s3c24xx/mach-mini2440.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-n30.c                   |    2 -
+ arch/arm/mach-s3c24xx/mach-nexcoder.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-osiris.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-otom.c                  |    1 -
+ arch/arm/mach-s3c24xx/mach-qt2410.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-rx1950.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-rx3715.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-s3c2416-dt.c            |    1 -
+ arch/arm/mach-s3c24xx/mach-smdk2410.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-smdk2413.c              |    3 -
+ arch/arm/mach-s3c24xx/mach-smdk2416.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-smdk2440.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-smdk2443.c              |    1 -
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    1 -
+ arch/arm/mach-s3c24xx/mach-vr1000.c                |    1 -
+ arch/arm/mach-s3c24xx/mach-vstms.c                 |    1 -
+ arch/arm/mach-s3c24xx/s3c2410.c                    |   13 -
+ arch/arm/mach-s3c24xx/s3c2412.c                    |   23 -
+ arch/arm/mach-s3c24xx/s3c2416.c                    |    8 -
+ arch/arm/mach-s3c24xx/s3c2443.c                    |    8 -
+ arch/arm/mach-s3c24xx/s3c244x.c                    |   12 -
+ arch/arm/mach-s5pv210/pm.c                         |    3 +-
+ .../mach-s5pv210/{include/mach => }/regs-clock.h   |    3 +-
+ arch/arm/mach-s5pv210/s5pv210.c                    |    2 +-
+ arch/arm/mach-shmobile/Kconfig                     |  118 +-
+ arch/arm/mach-shmobile/Makefile                    |   37 +-
+ arch/arm/mach-shmobile/Makefile.boot               |    2 -
+ arch/arm/mach-shmobile/board-ape6evm-reference.c   |    4 +-
+ arch/arm/mach-shmobile/board-ape6evm.c             |    3 +-
+ .../board-armadillo800eva-reference.c              |  198 ---
+ arch/arm/mach-shmobile/board-armadillo800eva.c     |    8 +-
+ arch/arm/mach-shmobile/board-bockw-reference.c     |    3 +-
+ arch/arm/mach-shmobile/board-bockw.c               |    2 +-
+ arch/arm/mach-shmobile/board-genmai-reference.c    |   55 -
+ arch/arm/mach-shmobile/board-genmai.c              |  161 --
+ arch/arm/mach-shmobile/board-koelsch-reference.c   |    2 -
+ arch/arm/mach-shmobile/board-kzm9g-reference.c     |    4 +-
+ arch/arm/mach-shmobile/board-kzm9g.c               |    2 +-
+ arch/arm/mach-shmobile/board-lager-reference.c     |    2 -
+ arch/arm/mach-shmobile/board-mackerel.c            |    3 +-
+ arch/arm/mach-shmobile/board-marzen-reference.c    |   12 +-
+ arch/arm/mach-shmobile/clock-r7s72100.c            |  231 ---
+ arch/arm/mach-shmobile/common.h                    |    2 -
+ arch/arm/mach-shmobile/dma-register.h              |    4 +-
+ arch/arm/mach-shmobile/intc.h                      |    5 +
+ arch/arm/mach-shmobile/irqs.h                      |    8 +-
+ arch/arm/mach-shmobile/pm-r8a7740.c                |   17 +-
+ arch/arm/mach-shmobile/pm-rcar.c                   |    4 -
+ arch/arm/mach-shmobile/pm-rmobile.c                |    2 -
+ arch/arm/mach-shmobile/pm-rmobile.h                |    4 +-
+ arch/arm/mach-shmobile/r7s72100.h                  |    7 -
+ arch/arm/mach-shmobile/r8a73a4.h                   |    1 -
+ arch/arm/mach-shmobile/r8a7740.h                   |    5 +-
+ arch/arm/mach-shmobile/r8a7779.h                   |    1 -
+ arch/arm/mach-shmobile/r8a7790.h                   |    1 -
+ arch/arm/mach-shmobile/r8a7791.h                   |    1 -
+ arch/arm/mach-shmobile/setup-r7s72100.c            |   24 +-
+ arch/arm/mach-shmobile/setup-r8a73a4.c             |   10 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c             |   60 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c             |    5 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c             |   20 +-
+ arch/arm/mach-shmobile/setup-r8a7790.c             |    7 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c             |    7 +-
+ arch/arm/mach-shmobile/setup-r8a7794.c             |   33 +
+ arch/arm/mach-shmobile/setup-sh7372.c              |    6 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c              |   21 +-
+ arch/arm/mach-shmobile/timer.c                     |   30 +-
+ arch/arm/mach-spear/Kconfig                        |    9 +-
+ arch/arm/mach-sunxi/sunxi.c                        |   76 -
+ arch/arm/mach-tegra/flowctrl.c                     |   44 +-
+ arch/arm/mach-tegra/flowctrl.h                     |    2 +
+ arch/arm/mach-tegra/tegra.c                        |    2 +
+ arch/arm/mach-vt8500/vt8500.c                      |    2 +-
+ arch/arm/mach-zynq/Makefile                        |    3 +-
+ arch/arm/mach-zynq/common.c                        |   11 +-
+ arch/arm/mach-zynq/common.h                        |   16 +-
+ arch/arm/mach-zynq/hotplug.c                       |   47 +-
+ arch/arm/mach-zynq/platsmp.c                       |   41 +-
+ arch/arm/mach-zynq/pm.c                            |   83 +
+ arch/arm/mach-zynq/slcr.c                          |   43 +-
+ arch/arm/plat-omap/dma.c                           |  737 +-------
+ arch/arm/plat-pxa/ssp.c                            |    1 +
+ arch/arm64/Kconfig                                 |    5 +
+ arch/arm64/boot/dts/Makefile                       |    1 +
+ arch/arm64/boot/dts/thunder-88xx.dts               |   67 +
+ arch/arm64/boot/dts/thunder-88xx.dtsi              |  401 +++++
+ arch/arm64/configs/defconfig                       |    1 +
+ drivers/Kconfig                                    |    2 +
+ drivers/ata/Kconfig                                |    2 +-
+ drivers/bus/arm-ccn.c                              |    5 +-
+ drivers/clk/at91/Makefile                          |    1 +
+ drivers/clk/at91/clk-h32mx.c                       |  123 ++
+ drivers/clk/at91/clk-system.c                      |    8 +-
+ drivers/clk/at91/pmc.c                             |    6 +
+ drivers/clk/at91/pmc.h                             |    5 +
+ drivers/clk/shmobile/Makefile                      |    1 +
+ drivers/clocksource/Kconfig                        |    4 +
+ drivers/clocksource/Makefile                       |    1 +
+ drivers/clocksource/tcb_clksrc.c                   |   15 +-
+ drivers/clocksource/timer-atmel-pit.c              |  296 ++++
+ drivers/cpufreq/Kconfig.arm                        |    4 +-
+ drivers/cpuidle/Kconfig.arm                        |    2 +-
+ drivers/cpuidle/cpuidle-zynq.c                     |   10 +-
+ drivers/edac/Kconfig                               |    9 +
+ drivers/edac/Makefile                              |    2 +
+ drivers/edac/altera_edac.c                         |  410 +++++
+ drivers/irqchip/Kconfig                            |    5 +
+ drivers/irqchip/Makefile                           |    1 +
+ drivers/irqchip/irq-omap-intc.c                    |  403 +++++
+ drivers/leds/Kconfig                               |   14 +-
+ drivers/leds/Makefile                              |    1 +
+ drivers/leds/leds-syscon.c                         |  166 ++
+ drivers/mailbox/omap-mailbox.c                     |  156 +-
+ drivers/memory/Kconfig                             |   10 +
+ drivers/memory/Makefile                            |    1 +
+ drivers/memory/atmel-sdramc.c                      |   98 ++
+ drivers/mfd/da9055-core.c                          |   26 +-
+ drivers/misc/atmel_tclib.c                         |  101 +-
+ drivers/power/reset/Kconfig                        |   42 +-
+ drivers/power/reset/Makefile                       |    3 +
+ drivers/power/reset/arm-versatile-reboot.c         |  111 ++
+ drivers/power/reset/at91-poweroff.c                |  156 ++
+ drivers/power/reset/at91-reset.c                   |  252 +++
+ drivers/pwm/pwm-atmel-tcb.c                        |    2 +-
+ drivers/rtc/Kconfig                                |   11 +-
+ drivers/rtc/Makefile                               |    1 +
+ drivers/rtc/rtc-sun6i.c                            |  447 +++++
+ drivers/soc/Kconfig                                |    2 +
+ drivers/soc/Makefile                               |    2 +
+ drivers/soc/ti/Kconfig                             |   31 +
+ drivers/soc/ti/Makefile                            |    5 +
+ drivers/soc/ti/knav_dma.c                          |  815 +++++++++
+ drivers/soc/ti/knav_qmss.h                         |  386 +++++
+ drivers/soc/ti/knav_qmss_acc.c                     |  591 +++++++
+ drivers/soc/ti/knav_qmss_queue.c                   | 1816 ++++++++++++++++++++
+ drivers/soc/versatile/Kconfig                      |   10 +
+ drivers/soc/versatile/Makefile                     |    1 +
+ drivers/soc/versatile/soc-realview.c               |  144 ++
+ drivers/thermal/Kconfig                            |    2 +-
+ drivers/watchdog/Kconfig                           |    2 +-
+ include/dt-bindings/clock/imx6qdl-clock.h          |   35 +-
+ include/dt-bindings/clock/imx6sl-clock.h           |   30 +-
+ include/dt-bindings/clock/imx6sx-clock.h           |   25 +-
+ include/dt-bindings/clock/r8a7740-clock.h          |   77 +
+ include/dt-bindings/clock/r8a7790-clock.h          |    1 +
+ include/dt-bindings/clock/r8a7791-clock.h          |    1 +
+ include/dt-bindings/clock/r8a7794-clock.h          |   80 +
+ include/dt-bindings/clock/vf610-clock.h            |    5 +-
+ include/linux/atmel_tc.h                           |   13 +-
+ include/linux/clk/at91_pmc.h                       |    1 +
+ include/linux/irqchip/irq-omap-intc.h              |   32 +
+ include/linux/omap-dma.h                           |   37 -
+ include/linux/platform_data/tegra_emc.h            |   34 -
+ include/linux/soc/ti/knav_dma.h                    |  175 ++
+ include/linux/soc/ti/knav_qmss.h                   |   90 +
+ 625 files changed, 26022 insertions(+), 9035 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm63138.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.txt
+ create mode 100644 Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/synopsys.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/sun6i-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-dma.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/at91-sama5d4ek.dts
+ create mode 100644 arch/arm/boot/dts/bcm63138.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm963138dvt.dts
+ create mode 100644 arch/arm/boot/dts/cros-adc-thermistors.dtsi
+ delete mode 100644 arch/arm/boot/dts/exynos5250-cros-common.dtsi
+ create mode 100644 arch/arm/boot/dts/hip04-d01.dts
+ create mode 100644 arch/arm/boot/dts/hip04.dtsi
+ create mode 100644 arch/arm/boot/dts/imx1-ads.dts
+ create mode 100644 arch/arm/boot/dts/imx1-apf9328.dts
+ create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx1.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw552x.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw552x.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-hummingboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
+ delete mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
+ rename arch/arm/boot/dts/{kirkwood-rd88f6281-a1.dts => kirkwood-rd88f6281-z0.dts} (57%)
+ create mode 100644 arch/arm/boot/dts/meson.dtsi
+ create mode 100644 arch/arm/boot/dts/meson6-atv1200.dts
+ create mode 100644 arch/arm/boot/dts/meson6.dtsi
+ rename arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} (67%)
+ create mode 100644 arch/arm/boot/dts/omap3-gta04a3.dts
+ create mode 100644 arch/arm/boot/dts/omap3-gta04a4.dts
+ create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts
+ create mode 100644 arch/arm/boot/dts/omap3-ha-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-ha-lcd.dts
+ create mode 100644 arch/arm/boot/dts/omap3-ha.dts
+ create mode 100644 arch/arm/boot/dts/omap3-tao3530.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-thunder.dts
+ create mode 100644 arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8064.dtsi
+ delete mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+ create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
+ create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d4.dtsi
+ create mode 100644 arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+ create mode 100644 arch/arm/boot/dts/tegra124-nyan-big.dts
+ create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts
+ rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (92%)
+ rename arch/arm/configs/{hi3xxx_defconfig => hisi_defconfig} (77%)
+ create mode 100644 arch/arm/include/debug/bcm63xx.S
+ create mode 100644 arch/arm/include/debug/meson.S
+ delete mode 100644 arch/arm/mach-at91/at91_rstc.h
+ delete mode 100644 arch/arm/mach-at91/at91_shdwc.h
+ delete mode 100644 arch/arm/mach-at91/at91sam926x_time.c
+ delete mode 100644 arch/arm/mach-at91/at91sam9_alt_reset.S
+ delete mode 100644 arch/arm/mach-at91/at91sam9g45_reset.S
+ delete mode 100644 arch/arm/mach-at91/board-foxg20.c
+ delete mode 100644 arch/arm/mach-at91/board-rsi-ews.c
+ create mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h
+ create mode 100644 arch/arm/mach-at91/sama5d4.c
+ create mode 100644 arch/arm/mach-bcm/bcm63xx.c
+ delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h
+ create mode 100644 arch/arm/mach-hisi/platmcpm.c
+ delete mode 100644 arch/arm/mach-imx/board-pcm038.h
+ create mode 100644 arch/arm/mach-imx/clk-gate-exclusive.c
+ delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+ create mode 100644 arch/arm/mach-imx/imx1-dt.c
+ delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c
+ delete mode 100644 arch/arm/mach-imx/mach-mx1ads.c
+ delete mode 100644 arch/arm/mach-imx/mach-mxt_td60.c
+ delete mode 100644 arch/arm/mach-imx/mach-pcm038.c
+ delete mode 100644 arch/arm/mach-imx/pcm970-baseboard.c
+ create mode 100644 arch/arm/mach-meson/Kconfig
+ create mode 100644 arch/arm/mach-meson/Makefile
+ create mode 100644 arch/arm/mach-meson/meson.c
+ delete mode 100644 arch/arm/mach-msm/board-mahimahi.c
+ delete mode 100644 arch/arm/mach-omap2/irq.c
+ rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%)
+ delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-genmai.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c
+ delete mode 100644 arch/arm/mach-shmobile/r7s72100.h
+ create mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
+ create mode 100644 arch/arm/mach-zynq/pm.c
+ create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
+ create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi
+ create mode 100644 drivers/clk/at91/clk-h32mx.c
+ create mode 100644 drivers/clocksource/timer-atmel-pit.c
+ create mode 100644 drivers/edac/altera_edac.c
+ create mode 100644 drivers/irqchip/irq-omap-intc.c
+ create mode 100644 drivers/leds/leds-syscon.c
+ create mode 100644 drivers/memory/atmel-sdramc.c
+ create mode 100644 drivers/power/reset/arm-versatile-reboot.c
+ create mode 100644 drivers/power/reset/at91-poweroff.c
+ create mode 100644 drivers/power/reset/at91-reset.c
+ create mode 100644 drivers/rtc/rtc-sun6i.c
+ create mode 100644 drivers/soc/ti/Kconfig
+ create mode 100644 drivers/soc/ti/Makefile
+ create mode 100644 drivers/soc/ti/knav_dma.c
+ create mode 100644 drivers/soc/ti/knav_qmss.h
+ create mode 100644 drivers/soc/ti/knav_qmss_acc.c
+ create mode 100644 drivers/soc/ti/knav_qmss_queue.c
+ create mode 100644 drivers/soc/versatile/Kconfig
+ create mode 100644 drivers/soc/versatile/Makefile
+ create mode 100644 drivers/soc/versatile/soc-realview.c
+ create mode 100644 include/dt-bindings/clock/r8a7740-clock.h
+ create mode 100644 include/dt-bindings/clock/r8a7794-clock.h
+ create mode 100644 include/linux/irqchip/irq-omap-intc.h
+ delete mode 100644 include/linux/platform_data/tegra_emc.h
+ create mode 100644 include/linux/soc/ti/knav_dma.h
+ create mode 100644 include/linux/soc/ti/knav_qmss.h
+Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (8d4f3361e05c Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/marvell,berlin.txt     |  10 ++
+ arch/arm/boot/dts/berlin2.dtsi                     |   1 +
+ arch/arm/boot/dts/berlin2cd.dtsi                   |   1 +
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |   8 ++
+ arch/arm/boot/dts/berlin2q.dtsi                    |  41 ++++++-
+ arch/arm/mach-berlin/Kconfig                       |   2 +
+ drivers/reset/Makefile                             |   1 +
+ drivers/reset/reset-berlin.c                       | 131 +++++++++++++++++++++
+ 8 files changed, 194 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/reset/reset-berlin.c
+Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC)
+$ git merge imx-mxs/for-next
+Already up-to-date.
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
+$ git merge keystone/next
+Already up-to-date.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/mvebu/armada-370.c |  8 +++++
+ drivers/clk/mvebu/armada-375.c |  4 +--
+ drivers/clk/mvebu/common.c     | 82 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/clk/mvebu/common.h     |  7 ++++
+ 4 files changed, 99 insertions(+), 2 deletions(-)
+Merging renesas/next (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/r8a7740.dtsi            | 14 ++++++++++----
+ arch/arm/mach-shmobile/clock-r8a7740.c    |  7 ++++++-
+ include/dt-bindings/clock/r8a7740-clock.h |  1 +
+ 3 files changed, 17 insertions(+), 5 deletions(-)
+Merging samsung/for-next (a84aaa7556a5 ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6)
+$ git merge samsung/for-next
+Resolved 'Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt' using previous resolution.
+Auto-merging drivers/clk/mvebu/common.h
+Auto-merging drivers/clk/mvebu/common.c
+Removing arch/arm/mach-exynos/hotplug.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master edee221b695a] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/firmware.txt                     |  28 +-
+ .../devicetree/bindings/clock/maxim,max77686.txt   |  16 +-
+ .../devicetree/bindings/clock/maxim,max77802.txt   |  44 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt     |   1 +
+ .../clock/renesas,rcar-gen2-cpg-clocks.txt         |   1 +
+ arch/arm/boot/dts/Makefile                         |   1 +
+ arch/arm/boot/dts/exynos3250.dtsi                  |  10 +
+ arch/arm/boot/dts/exynos4210.dtsi                  |  17 +
+ arch/arm/boot/dts/exynos4212.dtsi                  |  17 +
+ arch/arm/boot/dts/exynos4412-trats2.dts            | 352 +++++++-
+ arch/arm/boot/dts/exynos4412.dtsi                  |  29 +
+ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi          |  18 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts           | 907 ++++++++++-----------
+ arch/arm/boot/dts/exynos5250-smdk5250.dts          | 618 +++++++-------
+ arch/arm/boot/dts/exynos5250-snow.dts              | 266 +++---
+ arch/arm/boot/dts/exynos5250-spring.dts            | 536 ++++++++++++
+ arch/arm/boot/dts/exynos5250.dtsi                  |  16 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts      |   4 +
+ arch/arm/boot/dts/exynos5420-peach-pit.dts         |  15 +-
+ arch/arm/boot/dts/exynos5420.dtsi                  |   4 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts          |  15 +-
+ arch/arm/boot/dts/s3c6410-mini6410.dts             |   4 -
+ arch/arm/boot/dts/s3c64xx.dtsi                     |   1 -
+ arch/arm/configs/exynos_defconfig                  |  24 +-
+ arch/arm/include/asm/firmware.h                    |  10 +-
+ arch/arm/mach-exynos/Kconfig                       |   5 +
+ arch/arm/mach-exynos/Makefile                      |   9 +-
+ arch/arm/mach-exynos/common.h                      |  15 +-
+ arch/arm/mach-exynos/exynos.c                      |   7 +-
+ arch/arm/mach-exynos/firmware.c                    |  65 +-
+ arch/arm/mach-exynos/hotplug.c                     |  91 ---
+ arch/arm/mach-exynos/platsmp.c                     | 136 +++
+ arch/arm/mach-exynos/pm.c                          | 310 +------
+ arch/arm/mach-exynos/pmu.c                         |   1 +
+ arch/arm/mach-exynos/regs-pmu.h                    |   6 +
+ arch/arm/mach-exynos/sleep.S                       |  28 +
+ arch/arm/mach-exynos/smc.h                         |   4 +
+ arch/arm/mach-exynos/suspend.c                     | 356 ++++++++
+ arch/arm/mach-tegra/cpuidle-tegra114.c             |   2 +-
+ arch/arm/mm/proc-macros.S                          |   2 +-
+ arch/arm/plat-samsung/Kconfig                      |   5 +-
+ arch/arm/plat-samsung/Makefile                     |   1 +
+ arch/arm/plat-samsung/pm-debug.c                   |   1 +
+ drivers/clk/Kconfig                                |  11 +
+ drivers/clk/Makefile                               |   2 +
+ drivers/clk/at91/clk-pll.c                         | 160 ++--
+ drivers/clk/at91/clk-usb.c                         |  20 +-
+ drivers/clk/clk-fractional-divider.c               |   2 +-
+ drivers/clk/clk-max-gen.c                          | 192 +++++
+ drivers/clk/clk-max-gen.h                          |  32 +
+ drivers/clk/clk-max77686.c                         | 183 +----
+ drivers/clk/clk-max77802.c                         |  98 +++
+ drivers/clk/clk.c                                  |  73 +-
+ drivers/clk/mvebu/common.c                         |   9 +-
+ drivers/clk/mvebu/common.h                         |   2 +
+ drivers/clk/mvebu/kirkwood.c                       | 102 ++-
+ drivers/clk/rockchip/clk-rk3188.c                  |   8 +
+ drivers/clk/rockchip/clk-rk3288.c                  |   8 +
+ drivers/clk/rockchip/clk.c                         |  73 +-
+ drivers/clk/rockchip/clk.h                         |   1 +
+ drivers/clk/shmobile/clk-rcar-gen2.c               |   1 +
+ drivers/clk/zynq/clkc.c                            |  30 +-
+ drivers/clk/zynq/pll.c                             |   4 +-
+ drivers/cpufreq/kirkwood-cpufreq.c                 |  14 +-
+ include/dt-bindings/clock/maxim,max77686.h         |  23 +
+ include/dt-bindings/clock/maxim,max77802.h         |  22 +
+ include/linux/clk-private.h                        |   1 +
+ 67 files changed, 3394 insertions(+), 1675 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
+ create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts
+ delete mode 100644 arch/arm/mach-exynos/hotplug.c
+ create mode 100644 arch/arm/mach-exynos/suspend.c
+ create mode 100644 drivers/clk/clk-max-gen.c
+ create mode 100644 drivers/clk/clk-max-gen.h
+ create mode 100644 drivers/clk/clk-max77802.c
+ create mode 100644 include/dt-bindings/clock/maxim,max77686.h
+ create mode 100644 include/dt-bindings/clock/maxim,max77802.h
+Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi/clk-sunxi.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next)
+$ git merge tegra/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (7acf71d1a224 arm64: Fix typos in KGDB macros)
+$ git merge arm64/for-next/core
+Resolved 'Documentation/networking/filter.txt' using previous resolution.
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/networking/filter.txt
+CONFLICT (content): Merge conflict in Documentation/networking/filter.txt
+Auto-merging Documentation/devicetree/bindings/arm/cpus.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b3d8b076f41a] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/cpus.txt     |   8 +
+ .../devicetree/bindings/arm/idle-states.txt        | 679 +++++++++++++++++++++
+ Documentation/devicetree/bindings/arm/psci.txt     |  14 +-
+ Documentation/networking/filter.txt                |   6 +-
+ arch/arm64/Kconfig                                 |   7 +-
+ arch/arm64/Kconfig.debug                           |  11 +
+ arch/arm64/Makefile                                |   1 +
+ arch/arm64/include/asm/cacheflush.h                |   4 +
+ arch/arm64/include/asm/cachetype.h                 |  20 +
+ arch/arm64/include/asm/cpu_ops.h                   |   3 +
+ arch/arm64/include/asm/cpuidle.h                   |  13 +
+ arch/arm64/include/asm/debug-monitors.h            |  30 +-
+ arch/arm64/include/asm/dma-mapping.h               |   7 +
+ arch/arm64/include/asm/insn.h                      | 249 ++++++++
+ arch/arm64/include/asm/kgdb.h                      |   2 +-
+ arch/arm64/include/asm/percpu.h                    |   4 +-
+ arch/arm64/include/asm/pgtable.h                   |  33 +-
+ arch/arm64/include/asm/proc-fns.h                  |   2 +
+ arch/arm64/include/asm/suspend.h                   |   1 +
+ arch/arm64/include/asm/thread_info.h               |   9 +-
+ arch/arm64/kernel/Makefile                         |   1 +
+ arch/arm64/kernel/cpuidle.c                        |  31 +
+ arch/arm64/kernel/cpuinfo.c                        |  28 +-
+ arch/arm64/kernel/efi-stub.c                       |  16 +-
+ arch/arm64/kernel/entry.S                          |   1 -
+ arch/arm64/kernel/ftrace.c                         |  10 +-
+ arch/arm64/kernel/head.S                           |   6 +-
+ arch/arm64/kernel/insn.c                           | 671 +++++++++++++++++++-
+ arch/arm64/kernel/kgdb.c                           |   4 +-
+ arch/arm64/kernel/process.c                        |  30 +-
+ arch/arm64/kernel/psci.c                           | 104 ++++
+ arch/arm64/kernel/return_address.c                 |   3 +-
+ arch/arm64/kernel/setup.c                          |  11 +-
+ arch/arm64/kernel/sleep.S                          |  47 +-
+ arch/arm64/kernel/smp_spin_table.c                 |  22 +-
+ arch/arm64/kernel/stacktrace.c                     |   3 +-
+ arch/arm64/kernel/suspend.c                        |  48 +-
+ arch/arm64/kernel/traps.c                          |   3 +-
+ arch/arm64/mm/Makefile                             |   2 +-
+ arch/arm64/mm/dma-mapping.c                        |  31 -
+ arch/arm64/mm/init.c                               |   2 +-
+ arch/arm64/mm/mmu.c                                |   2 +-
+ arch/arm64/mm/pageattr.c                           |  97 +++
+ arch/arm64/mm/proc.S                               |  15 +
+ arch/arm64/net/Makefile                            |   4 +
+ arch/arm64/net/bpf_jit.h                           | 169 +++++
+ arch/arm64/net/bpf_jit_comp.c                      | 679 +++++++++++++++++++++
+ drivers/of/platform.c                              |   7 +-
+ 48 files changed, 2970 insertions(+), 180 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/idle-states.txt
+ create mode 100644 arch/arm64/include/asm/cpuidle.h
+ create mode 100644 arch/arm64/kernel/cpuidle.c
+ create mode 100644 arch/arm64/mm/pageattr.c
+ create mode 100644 arch/arm64/net/Makefile
+ create mode 100644 arch/arm64/net/bpf_jit.h
+ create mode 100644 arch/arm64/net/bpf_jit_comp.c
+Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
+$ git merge blackfin/for-linus
+Merge made by the 'recursive' strategy.
+ arch/blackfin/configs/BF518F-EZBRD_defconfig    |  1 -
+ arch/blackfin/configs/BF527-TLL6527M_defconfig  |  1 -
+ arch/blackfin/configs/BF533-EZKIT_defconfig     |  1 -
+ arch/blackfin/configs/BF533-STAMP_defconfig     |  1 -
+ arch/blackfin/configs/BF537-STAMP_defconfig     |  3 ++-
+ arch/blackfin/configs/BF538-EZKIT_defconfig     |  1 -
+ arch/blackfin/configs/BF561-ACVILON_defconfig   |  1 -
+ arch/blackfin/configs/BF561-EZKIT-SMP_defconfig |  1 -
+ arch/blackfin/configs/BF561-EZKIT_defconfig     |  1 -
+ arch/blackfin/configs/CM-BF527_defconfig        |  1 -
+ arch/blackfin/configs/CM-BF533_defconfig        |  1 -
+ arch/blackfin/configs/CM-BF537E_defconfig       |  1 -
+ arch/blackfin/configs/CM-BF537U_defconfig       |  1 -
+ arch/blackfin/configs/CM-BF548_defconfig        |  1 -
+ arch/blackfin/configs/CM-BF561_defconfig        |  1 -
+ arch/blackfin/configs/DNP5370_defconfig         |  1 -
+ arch/blackfin/configs/IP0X_defconfig            |  1 -
+ arch/blackfin/configs/PNAV-10_defconfig         |  1 -
+ arch/blackfin/configs/SRV1_defconfig            |  1 -
+ arch/blackfin/configs/TCM-BF518_defconfig       |  1 -
+ arch/blackfin/configs/TCM-BF537_defconfig       |  1 -
+ arch/blackfin/kernel/kgdb.c                     | 12 ++++--------
+ arch/blackfin/mach-bf609/boards/ezkit.c         |  8 ++++----
+ 23 files changed, 10 insertions(+), 33 deletions(-)
+Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (0f33be009b89 Linux 3.17-rc6)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (fd4d453b64d4 m68k: AMIGA_BUILTIN_SERIAL should depend on TTY)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.devices     | 2 +-
+ arch/m68k/atari/stram.c       | 1 +
+ arch/m68k/include/asm/io_mm.h | 9 ++++++++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR')
+$ git merge m68knommu/for-next
+Removing arch/m68k/platform/Makefile
+Auto-merging arch/m68k/coldfire/vectors.c
+Auto-merging arch/m68k/coldfire/m54xx.c
+Auto-merging arch/m68k/coldfire/m5407.c
+Auto-merging arch/m68k/coldfire/m5307.c
+Auto-merging arch/m68k/coldfire/m528x.c
+Auto-merging arch/m68k/coldfire/m527x.c
+Auto-merging arch/m68k/coldfire/m5272.c
+Auto-merging arch/m68k/coldfire/m525x.c
+Auto-merging arch/m68k/coldfire/m5249.c
+Auto-merging arch/m68k/coldfire/m523x.c
+Auto-merging arch/m68k/coldfire/m520x.c
+Auto-merging arch/m68k/coldfire/m5206.c
+Auto-merging arch/m68k/coldfire/intc-5272.c
+Auto-merging arch/m68k/coldfire/entry.S
+Auto-merging arch/m68k/68360/ints.c
+Auto-merging arch/m68k/68360/head-rom.S
+Auto-merging arch/m68k/68360/head-ram.S
+Auto-merging arch/m68k/68360/entry.S
+Auto-merging arch/m68k/68360/config.c
+Auto-merging arch/m68k/68360/Makefile
+Auto-merging arch/m68k/68000/entry.S
+Merge made by the 'recursive' strategy.
+ arch/m68k/{platform => }/68000/Makefile       |  0
+ arch/m68k/{platform => }/68000/bootlogo-vz.h  |  0
+ arch/m68k/{platform => }/68000/bootlogo.h     |  0
+ arch/m68k/{platform => }/68000/entry.S        |  2 +-
+ arch/m68k/{platform => }/68000/head.S         |  0
+ arch/m68k/{platform => }/68000/ints.c         |  0
+ arch/m68k/{platform => }/68000/m68328.c       |  0
+ arch/m68k/{platform => }/68000/m68EZ328.c     |  0
+ arch/m68k/{platform => }/68000/m68VZ328.c     |  0
+ arch/m68k/{platform => }/68000/romvec.S       |  0
+ arch/m68k/{platform => }/68000/timers.c       |  0
+ arch/m68k/{platform => }/68360/Makefile       |  2 +-
+ arch/m68k/{platform => }/68360/commproc.c     |  0
+ arch/m68k/{platform => }/68360/config.c       |  2 +-
+ arch/m68k/{platform => }/68360/entry.S        |  2 +-
+ arch/m68k/{platform => }/68360/head-ram.S     |  5 ++---
+ arch/m68k/{platform => }/68360/head-rom.S     |  5 ++---
+ arch/m68k/{platform => }/68360/ints.c         |  2 +-
+ arch/m68k/Makefile                            | 12 ++++++------
+ arch/m68k/{platform => }/coldfire/Makefile    |  0
+ arch/m68k/{platform => }/coldfire/cache.c     |  0
+ arch/m68k/{platform => }/coldfire/clk.c       |  0
+ arch/m68k/{platform => }/coldfire/device.c    |  0
+ arch/m68k/{platform => }/coldfire/dma.c       |  0
+ arch/m68k/{platform => }/coldfire/dma_timer.c |  0
+ arch/m68k/{platform => }/coldfire/entry.S     |  2 +-
+ arch/m68k/{platform => }/coldfire/firebee.c   |  0
+ arch/m68k/{platform => }/coldfire/gpio.c      |  0
+ arch/m68k/{platform => }/coldfire/head.S      |  0
+ arch/m68k/{platform => }/coldfire/intc-2.c    |  0
+ arch/m68k/{platform => }/coldfire/intc-5249.c |  0
+ arch/m68k/{platform => }/coldfire/intc-525x.c |  0
+ arch/m68k/{platform => }/coldfire/intc-5272.c |  2 +-
+ arch/m68k/{platform => }/coldfire/intc-simr.c |  0
+ arch/m68k/{platform => }/coldfire/intc.c      |  0
+ arch/m68k/{platform => }/coldfire/m5206.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m520x.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m523x.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m5249.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m525x.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m5272.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m527x.c     |  4 ++--
+ arch/m68k/{platform => }/coldfire/m528x.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m5307.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m53xx.c     |  0
+ arch/m68k/{platform => }/coldfire/m5407.c     |  2 +-
+ arch/m68k/{platform => }/coldfire/m5441x.c    |  0
+ arch/m68k/{platform => }/coldfire/m54xx.c     |  3 +--
+ arch/m68k/{platform => }/coldfire/mcf8390.c   |  0
+ arch/m68k/{platform => }/coldfire/nettel.c    |  0
+ arch/m68k/{platform => }/coldfire/pci.c       |  0
+ arch/m68k/{platform => }/coldfire/pit.c       |  0
+ arch/m68k/{platform => }/coldfire/reset.c     |  0
+ arch/m68k/{platform => }/coldfire/sltimers.c  |  0
+ arch/m68k/{platform => }/coldfire/timers.c    |  0
+ arch/m68k/{platform => }/coldfire/vectors.c   |  2 +-
+ arch/m68k/include/asm/io_no.h                 |  9 +++++++++
+ arch/m68k/include/asm/m54xxpci.h              |  2 +-
+ arch/m68k/platform/Makefile                   |  3 ---
+ 59 files changed, 40 insertions(+), 37 deletions(-)
+ rename arch/m68k/{platform => }/68000/Makefile (100%)
+ rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%)
+ rename arch/m68k/{platform => }/68000/bootlogo.h (100%)
+ rename arch/m68k/{platform => }/68000/entry.S (98%)
+ rename arch/m68k/{platform => }/68000/head.S (100%)
+ rename arch/m68k/{platform => }/68000/ints.c (100%)
+ rename arch/m68k/{platform => }/68000/m68328.c (100%)
+ rename arch/m68k/{platform => }/68000/m68EZ328.c (100%)
+ rename arch/m68k/{platform => }/68000/m68VZ328.c (100%)
+ rename arch/m68k/{platform => }/68000/romvec.S (100%)
+ rename arch/m68k/{platform => }/68000/timers.c (100%)
+ rename arch/m68k/{platform => }/68360/Makefile (81%)
+ rename arch/m68k/{platform => }/68360/commproc.c (100%)
+ rename arch/m68k/{platform => }/68360/config.c (98%)
+ rename arch/m68k/{platform => }/68360/entry.S (98%)
+ rename arch/m68k/{platform => }/68360/head-ram.S (99%)
+ rename arch/m68k/{platform => }/68360/head-rom.S (99%)
+ rename arch/m68k/{platform => }/68360/ints.c (98%)
+ rename arch/m68k/{platform => }/coldfire/Makefile (100%)
+ rename arch/m68k/{platform => }/coldfire/cache.c (100%)
+ rename arch/m68k/{platform => }/coldfire/clk.c (100%)
+ rename arch/m68k/{platform => }/coldfire/device.c (100%)
+ rename arch/m68k/{platform => }/coldfire/dma.c (100%)
+ rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%)
+ rename arch/m68k/{platform => }/coldfire/entry.S (98%)
+ rename arch/m68k/{platform => }/coldfire/firebee.c (100%)
+ rename arch/m68k/{platform => }/coldfire/gpio.c (100%)
+ rename arch/m68k/{platform => }/coldfire/head.S (100%)
+ rename arch/m68k/{platform => }/coldfire/intc-2.c (100%)
+ rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%)
+ rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%)
+ rename arch/m68k/{platform => }/coldfire/intc-5272.c (99%)
+ rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%)
+ rename arch/m68k/{platform => }/coldfire/intc.c (100%)
+ rename arch/m68k/{platform => }/coldfire/m5206.c (96%)
+ rename arch/m68k/{platform => }/coldfire/m520x.c (98%)
+ rename arch/m68k/{platform => }/coldfire/m523x.c (97%)
+ rename arch/m68k/{platform => }/coldfire/m5249.c (97%)
+ rename arch/m68k/{platform => }/coldfire/m525x.c (97%)
+ rename arch/m68k/{platform => }/coldfire/m5272.c (98%)
+ rename arch/m68k/{platform => }/coldfire/m527x.c (97%)
+ rename arch/m68k/{platform => }/coldfire/m528x.c (98%)
+ rename arch/m68k/{platform => }/coldfire/m5307.c (97%)
+ rename arch/m68k/{platform => }/coldfire/m53xx.c (100%)
+ rename arch/m68k/{platform => }/coldfire/m5407.c (95%)
+ rename arch/m68k/{platform => }/coldfire/m5441x.c (100%)
+ rename arch/m68k/{platform => }/coldfire/m54xx.c (97%)
+ rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%)
+ rename arch/m68k/{platform => }/coldfire/nettel.c (100%)
+ rename arch/m68k/{platform => }/coldfire/pci.c (100%)
+ rename arch/m68k/{platform => }/coldfire/pit.c (100%)
+ rename arch/m68k/{platform => }/coldfire/reset.c (100%)
+ rename arch/m68k/{platform => }/coldfire/sltimers.c (100%)
+ rename arch/m68k/{platform => }/coldfire/timers.c (100%)
+ rename arch/m68k/{platform => }/coldfire/vectors.c (96%)
+ delete mode 100644 arch/m68k/platform/Makefile
+Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/linkage.h | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove deprecated IRQF_DISABLED)
+$ git merge mips/mips-for-linux-next
+Auto-merging include/asm-generic/dma-contiguous.h
+Removing arch/mips/ralink/dts/Makefile
+Removing arch/mips/netlogic/dts/Makefile
+Removing arch/mips/lantiq/dts/Makefile
+Removing arch/mips/cavium-octeon/.gitignore
+Removing arch/arm64/include/asm/dma-contiguous.h
+Merge made by the 'recursive' strategy.
+ arch/arm64/include/asm/Kbuild                      |  1 +
+ arch/arm64/include/asm/dma-contiguous.h            | 28 ------------
+ arch/mips/Kconfig                                  |  6 +++
+ arch/mips/Makefile                                 | 11 +++++
+ arch/mips/alchemy/devboards/db1300.c               | 47 ++++++++++++++++++-
+ arch/mips/alchemy/devboards/db1550.c               |  9 ++--
+ arch/mips/alchemy/devboards/platform.c             |  3 ++
+ arch/mips/boot/.gitignore                          |  1 +
+ arch/mips/boot/dts/Makefile                        | 20 ++++++++
+ arch/mips/{lantiq => boot}/dts/danube.dtsi         |  0
+ arch/mips/{lantiq => boot}/dts/easy50712.dts       |  0
+ arch/mips/{ralink => boot}/dts/mt7620a.dtsi        |  0
+ arch/mips/{ralink => boot}/dts/mt7620a_eval.dts    |  0
+ .../{cavium-octeon => boot/dts}/octeon_3xxx.dts    |  0
+ .../{cavium-octeon => boot/dts}/octeon_68xx.dts    |  0
+ arch/mips/{ralink => boot}/dts/rt2880.dtsi         |  0
+ arch/mips/{ralink => boot}/dts/rt2880_eval.dts     |  0
+ arch/mips/{ralink => boot}/dts/rt3050.dtsi         |  0
+ arch/mips/{ralink => boot}/dts/rt3052_eval.dts     |  0
+ arch/mips/{ralink => boot}/dts/rt3883.dtsi         |  0
+ arch/mips/{ralink => boot}/dts/rt3883_eval.dts     |  0
+ arch/mips/{mti-sead3 => boot/dts}/sead3.dts        |  0
+ arch/mips/{netlogic => boot}/dts/xlp_evp.dts       |  0
+ arch/mips/{netlogic => boot}/dts/xlp_fvp.dts       |  0
+ arch/mips/{netlogic => boot}/dts/xlp_gvp.dts       |  0
+ arch/mips/{netlogic => boot}/dts/xlp_svp.dts       |  0
+ arch/mips/cavium-octeon/.gitignore                 |  2 -
+ arch/mips/cavium-octeon/Makefile                   | 10 ----
+ arch/mips/configs/sead3_defconfig                  |  2 +-
+ arch/mips/configs/sead3micro_defconfig             |  2 +-
+ arch/mips/include/asm/Kbuild                       |  1 +
+ arch/mips/include/asm/cpu-features.h               | 10 ++++
+ arch/mips/include/asm/cpu-info.h                   |  5 ++
+ .../asm/mach-au1x00/cpu-feature-overrides.h        | 12 +++++
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h |  1 +
+ .../asm/mach-loongson/cpu-feature-overrides.h      |  2 +
+ arch/mips/include/asm/pgtable-bits.h               | 44 ++++++++++++------
+ arch/mips/include/asm/pgtable.h                    | 10 ++++
+ arch/mips/include/uapi/asm/swab.h                  | 18 ++++++--
+ arch/mips/kernel/cpu-probe.c                       | 21 +++++++++
+ arch/mips/kernel/setup.c                           |  9 ++++
+ arch/mips/lantiq/Kconfig                           |  1 +
+ arch/mips/lantiq/Makefile                          |  2 -
+ arch/mips/lantiq/dts/Makefile                      |  1 -
+ arch/mips/lib/csum_partial.S                       | 10 +++-
+ arch/mips/mm/dma-default.c                         | 37 ++++++++++-----
+ arch/mips/mti-sead3/Makefile                       |  4 --
+ arch/mips/net/bpf_jit.c                            | 53 ++++++++--------------
+ arch/mips/netlogic/Kconfig                         |  4 ++
+ arch/mips/netlogic/Makefile                        |  1 -
+ arch/mips/netlogic/dts/Makefile                    |  4 --
+ arch/mips/ralink/Kconfig                           |  4 ++
+ arch/mips/ralink/Makefile                          |  2 -
+ arch/mips/ralink/dts/Makefile                      |  4 --
+ arch/mips/ralink/timer.c                           |  2 +-
+ arch/x86/include/asm/Kbuild                        |  1 +
+ .../asm => include/asm-generic}/dma-contiguous.h   |  7 +--
+ 57 files changed, 274 insertions(+), 138 deletions(-)
+ delete mode 100644 arch/arm64/include/asm/dma-contiguous.h
+ create mode 100644 arch/mips/boot/dts/Makefile
+ rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%)
+ rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%)
+ rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%)
+ rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%)
+ rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%)
+ rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%)
+ rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%)
+ rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%)
+ rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%)
+ rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%)
+ rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%)
+ rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%)
+ rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%)
+ rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%)
+ rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%)
+ rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%)
+ rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%)
+ delete mode 100644 arch/mips/cavium-octeon/.gitignore
+ delete mode 100644 arch/mips/lantiq/dts/Makefile
+ delete mode 100644 arch/mips/netlogic/dts/Makefile
+ delete mode 100644 arch/mips/ralink/dts/Makefile
+ rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%)
+Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (7575e4d56f6f Merge tag 'sound-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
+$ git merge powerpc/next
+Already up-to-date.
+Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
+$ git merge powernv-cpuidle/powernv-cpuidle
+Already up-to-date.
+Merging powerpc-mpe/next (2013add4ce73 powerpc/eeh: Show hex prefix for PE state sysfs)
+$ git merge powerpc-mpe/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig                               |   3 +-
+ arch/powerpc/Makefile                              |   1 +
+ arch/powerpc/boot/Makefile                         |   5 +
+ arch/powerpc/include/asm/bug.h                     |   1 -
+ arch/powerpc/include/asm/dma-mapping.h             |   1 +
+ arch/powerpc/include/asm/eeh.h                     |  39 +-
+ arch/powerpc/include/asm/hydra.h                   |   1 -
+ arch/powerpc/include/asm/irq.h                     |   5 -
+ arch/powerpc/include/asm/kexec.h                   |   1 -
+ arch/powerpc/include/asm/mmu-hash64.h              |   2 +
+ arch/powerpc/include/asm/opal.h                    |  43 +-
+ arch/powerpc/include/asm/page_64.h                 |   1 -
+ arch/powerpc/include/asm/pgtable-ppc32.h           |   2 -
+ arch/powerpc/include/asm/prom.h                    |   2 -
+ arch/powerpc/include/asm/rio.h                     |   1 -
+ arch/powerpc/include/asm/sstep.h                   |  62 ++
+ arch/powerpc/include/asm/tsi108.h                  |   4 -
+ arch/powerpc/include/asm/udbg.h                    |   1 -
+ arch/powerpc/include/asm/word-at-a-time.h          | 112 ++-
+ arch/powerpc/include/asm/xics.h                    |   1 +
+ arch/powerpc/kernel/Makefile                       |   3 +
+ arch/powerpc/kernel/dma.c                          |  14 +-
+ arch/powerpc/kernel/eeh.c                          | 269 ++++--
+ arch/powerpc/kernel/eeh_driver.c                   | 106 ++-
+ arch/powerpc/kernel/eeh_pe.c                       |  23 +-
+ arch/powerpc/kernel/eeh_sysfs.c                    |  41 +-
+ arch/powerpc/kernel/hw_breakpoint.c                |   2 +-
+ arch/powerpc/kernel/ibmebus.c                      |   2 +-
+ arch/powerpc/kernel/idle_power7.S                  |   2 +-
+ arch/powerpc/kernel/legacy_serial.c                |   2 +-
+ arch/powerpc/kernel/nvram_64.c                     |   2 +-
+ arch/powerpc/kernel/of_platform.c                  |   2 +-
+ arch/powerpc/kernel/pci-common.c                   |   2 +-
+ arch/powerpc/kernel/pci_of_scan.c                  |   2 +-
+ arch/powerpc/kernel/ppc_ksyms.c                    | 192 +---
+ arch/powerpc/kernel/ppc_ksyms_32.c                 |  61 ++
+ arch/powerpc/kernel/process.c                      |   2 +
+ arch/powerpc/kernel/prom.c                         |   9 +-
+ arch/powerpc/kernel/prom_init_check.sh             |  22 +-
+ arch/powerpc/kernel/ptrace.c                       |   2 +-
+ arch/powerpc/kernel/rtasd.c                        |   2 +-
+ arch/powerpc/kernel/setup-common.c                 |   3 +
+ arch/powerpc/kernel/setup_64.c                     |  30 +-
+ arch/powerpc/kernel/smp.c                          |  11 +-
+ arch/powerpc/kernel/time.c                         |   5 +-
+ arch/powerpc/lib/Makefile                          |   2 +-
+ arch/powerpc/lib/feature-fixups.c                  |   2 +-
+ arch/powerpc/lib/ppc_ksyms.c                       |  39 +
+ arch/powerpc/lib/sstep.c                           | 996 +++++++++++++--------
+ arch/powerpc/mm/hash_utils_64.c                    | 124 +--
+ arch/powerpc/mm/init_64.c                          |   3 -
+ arch/powerpc/mm/numa.c                             |  19 +-
+ arch/powerpc/mm/pgtable.c                          |   2 +-
+ arch/powerpc/mm/slice.c                            |   2 +
+ arch/powerpc/oprofile/backtrace.c                  |   1 +
+ arch/powerpc/perf/core-book3s.c                    |  18 +-
+ arch/powerpc/platforms/40x/ep405.c                 |   2 +-
+ arch/powerpc/platforms/40x/ppc40x_simple.c         |   2 +-
+ arch/powerpc/platforms/40x/virtex.c                |   2 +-
+ arch/powerpc/platforms/40x/walnut.c                |   2 +-
+ arch/powerpc/platforms/44x/Kconfig                 |   6 +-
+ arch/powerpc/platforms/44x/canyonlands.c           |   2 +-
+ arch/powerpc/platforms/44x/ebony.c                 |   2 +-
+ arch/powerpc/platforms/44x/iss4xx.c                |   2 +-
+ arch/powerpc/platforms/44x/ppc44x_simple.c         |   2 +-
+ arch/powerpc/platforms/44x/ppc476.c                |   2 +-
+ arch/powerpc/platforms/44x/sam440ep.c              |   2 +-
+ arch/powerpc/platforms/44x/virtex.c                |   2 +-
+ arch/powerpc/platforms/44x/warp.c                  |   2 +-
+ arch/powerpc/platforms/512x/mpc512x_shared.c       |   2 +-
+ arch/powerpc/platforms/52xx/lite5200.c             |   4 +-
+ arch/powerpc/platforms/52xx/media5200.c            |   2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_common.c       |  12 +-
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |   2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pic.c          |   4 +-
+ arch/powerpc/platforms/82xx/ep8248e.c              |   2 +-
+ arch/powerpc/platforms/82xx/km82xx.c               |   2 +-
+ arch/powerpc/platforms/82xx/mpc8272_ads.c          |   2 +-
+ arch/powerpc/platforms/82xx/pq2fads.c              |   2 +-
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c     |   2 +-
+ arch/powerpc/platforms/83xx/misc.c                 |   2 +-
+ arch/powerpc/platforms/83xx/mpc834x_itx.c          |   2 +-
+ arch/powerpc/platforms/83xx/suspend.c              |   4 +-
+ arch/powerpc/platforms/85xx/common.c               |   2 +-
+ arch/powerpc/platforms/85xx/ppa8548.c              |   2 +-
+ arch/powerpc/platforms/85xx/sgy_cts1000.c          |   4 +-
+ arch/powerpc/platforms/86xx/gef_ppc9a.c            |   2 +-
+ arch/powerpc/platforms/86xx/gef_sbc310.c           |   2 +-
+ arch/powerpc/platforms/86xx/gef_sbc610.c           |   2 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |   2 +-
+ arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |   2 +-
+ arch/powerpc/platforms/86xx/sbc8641d.c             |   2 +-
+ arch/powerpc/platforms/8xx/adder875.c              |   2 +-
+ arch/powerpc/platforms/8xx/ep88xc.c                |   2 +-
+ arch/powerpc/platforms/8xx/mpc86xads_setup.c       |   2 +-
+ arch/powerpc/platforms/8xx/mpc885ads_setup.c       |   2 +-
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c          |   2 +-
+ arch/powerpc/platforms/Kconfig.cputype             |   6 +
+ arch/powerpc/platforms/cell/celleb_pci.c           |   2 +-
+ arch/powerpc/platforms/cell/celleb_setup.c         |   2 +-
+ arch/powerpc/platforms/embedded6xx/gamecube.c      |   2 +-
+ arch/powerpc/platforms/embedded6xx/linkstation.c   |   2 +-
+ arch/powerpc/platforms/embedded6xx/mvme5100.c      |   2 +-
+ arch/powerpc/platforms/embedded6xx/storcenter.c    |   2 +-
+ arch/powerpc/platforms/embedded6xx/wii.c           |   2 +-
+ arch/powerpc/platforms/pasemi/gpio_mdio.c          |   2 +-
+ arch/powerpc/platforms/pasemi/setup.c              |   2 +-
+ arch/powerpc/platforms/powernv/eeh-ioda.c          | 226 ++++-
+ arch/powerpc/platforms/powernv/eeh-powernv.c       |  26 +
+ arch/powerpc/platforms/powernv/opal-dump.c         |  18 +-
+ arch/powerpc/platforms/powernv/opal-elog.c         |   4 +
+ arch/powerpc/platforms/powernv/opal-rtc.c          |  15 +-
+ arch/powerpc/platforms/powernv/opal-tracepoints.c  |   2 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S     |   2 +
+ arch/powerpc/platforms/powernv/pci-ioda.c          |  94 +-
+ arch/powerpc/platforms/powernv/pci.c               |  11 +
+ arch/powerpc/platforms/powernv/pci.h               |   4 +
+ arch/powerpc/platforms/powernv/powernv.h           |   6 +
+ arch/powerpc/platforms/powernv/setup.c             |  11 +-
+ arch/powerpc/platforms/powernv/smp.c               |   8 +-
+ arch/powerpc/platforms/powernv/subcore.c           |   1 +
+ arch/powerpc/platforms/pseries/cmm.c               |   1 -
+ arch/powerpc/platforms/pseries/dlpar.c             |  29 +-
+ arch/powerpc/platforms/pseries/eeh_pseries.c       |  40 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c       |  10 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c    |   1 +
+ arch/powerpc/platforms/pseries/lpar.c              |   4 +-
+ arch/powerpc/platforms/pseries/nvram.c             |  12 +-
+ arch/powerpc/platforms/pseries/pci.c               |   1 +
+ arch/powerpc/platforms/pseries/ras.c               |   2 +-
+ arch/powerpc/platforms/pseries/setup.c             |   2 +-
+ arch/powerpc/sysdev/axonram.c                      |   2 +-
+ arch/powerpc/sysdev/dcr.c                          |   1 +
+ arch/powerpc/sysdev/fsl_85xx_l2ctlr.c              |   2 +-
+ arch/powerpc/sysdev/mpic.c                         |   2 +-
+ arch/powerpc/sysdev/msi_bitmap.c                   |   6 +-
+ arch/powerpc/sysdev/mv64x60_dev.c                  |   2 +-
+ arch/powerpc/sysdev/pmi.c                          |   2 +-
+ arch/powerpc/sysdev/xics/icp-native.c              |  25 +
+ arch/powerpc/sysdev/xilinx_intc.c                  |   2 +-
+ arch/powerpc/sysdev/xilinx_pci.c                   |   2 +-
+ drivers/macintosh/adb.c                            |   5 +
+ drivers/macintosh/via-cuda.c                       |   2 +
+ tools/testing/selftests/powerpc/Makefile           |   2 +-
+ .../testing/selftests/powerpc/primitives/Makefile  |  17 +
+ .../selftests/powerpc/primitives/asm/asm-compat.h  |   1 +
+ .../selftests/powerpc/primitives/asm/ppc-opcode.h  |   0
+ .../powerpc/primitives/load_unaligned_zeropad.c    | 147 +++
+ .../selftests/powerpc/primitives/word-at-a-time.h  |   1 +
+ 149 files changed, 2176 insertions(+), 1010 deletions(-)
+ create mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c
+ create mode 100644 arch/powerpc/lib/ppc_ksyms.c
+ create mode 100644 tools/testing/selftests/powerpc/primitives/Makefile
+ create mode 120000 tools/testing/selftests/powerpc/primitives/asm/asm-compat.h
+ create mode 100644 tools/testing/selftests/powerpc/primitives/asm/ppc-opcode.h
+ create mode 100644 tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
+ create mode 120000 tools/testing/selftests/powerpc/primitives/word-at-a-time.h
+Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs")
+$ git merge fsl/next
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/kernel/dma.c
+Auto-merging arch/powerpc/include/asm/reg.h
+Auto-merging arch/powerpc/configs/corenet64_smp_defconfig
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/pci/fsl,pci.txt |  27 ++++
+ arch/powerpc/Kconfig                              |   4 +
+ arch/powerpc/boot/dts/fsl/t2081si-post.dtsi       |   4 +-
+ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi       |   4 +-
+ arch/powerpc/boot/dts/t1040rdb.dts                |  48 +++++++
+ arch/powerpc/boot/dts/t1042rdb.dts                |  48 +++++++
+ arch/powerpc/boot/dts/t1042rdb_pi.dts             |  57 ++++++++
+ arch/powerpc/boot/dts/t104xrdb.dtsi               | 156 ++++++++++++++++++++++
+ arch/powerpc/configs/corenet32_smp_defconfig      |   2 +
+ arch/powerpc/configs/corenet64_smp_defconfig      |  46 ++-----
+ arch/powerpc/configs/mpc85xx_defconfig            |   4 +-
+ arch/powerpc/configs/mpc85xx_smp_defconfig        |   4 +-
+ arch/powerpc/configs/mpc86xx_defconfig            |   3 +
+ arch/powerpc/include/asm/pgtable.h                |   3 +
+ arch/powerpc/include/asm/reg.h                    |   3 +-
+ arch/powerpc/kernel/dma-swiotlb.c                 |   8 +-
+ arch/powerpc/kernel/dma.c                         |  33 +++++
+ arch/powerpc/kernel/head_8xx.S                    | 150 ++++++++-------------
+ arch/powerpc/mm/mem.c                             |  68 +++++++++-
+ arch/powerpc/mm/numa.c                            |   8 --
+ arch/powerpc/platforms/85xx/Kconfig               |   2 +-
+ arch/powerpc/platforms/85xx/corenet_generic.c     |  14 ++
+ arch/powerpc/platforms/85xx/qemu_e500.c           |  10 ++
+ arch/powerpc/sysdev/fsl_msi.c                     |  95 ++++++-------
+ arch/powerpc/sysdev/fsl_msi.h                     |   4 +-
+ arch/powerpc/sysdev/fsl_pci.c                     |   3 +-
+ include/linux/fsl_ifc.h                           |   6 +-
+ 27 files changed, 610 insertions(+), 204 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/fsl,pci.txt
+ create mode 100644 arch/powerpc/boot/dts/t1040rdb.dts
+ create mode 100644 arch/powerpc/boot/dts/t1042rdb.dts
+ create mode 100644 arch/powerpc/boot/dts/t1042rdb_pi.dts
+ create mode 100644 arch/powerpc/boot/dts/t104xrdb.dtsi
+Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (cfb0b24143b4 s390/mm: make use of ipte range facility)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ Documentation/kprobes.txt               |   1 +
+ arch/s390/Kconfig                       |   5 +
+ arch/s390/Makefile                      |  17 +-
+ arch/s390/include/asm/barrier.h         |   6 +-
+ arch/s390/include/asm/ftrace.h          |   7 +-
+ arch/s390/include/asm/irq.h             |   1 +
+ arch/s390/include/asm/kprobes.h         |   4 +
+ arch/s390/include/asm/pgtable.h         |  25 ++-
+ arch/s390/include/asm/ptrace.h          |   6 +
+ arch/s390/include/asm/setup.h           |   3 -
+ arch/s390/include/asm/smp.h             |   2 -
+ arch/s390/include/asm/spinlock.h        | 135 +++++++++---
+ arch/s390/include/asm/spinlock_types.h  |   1 +
+ arch/s390/include/asm/thread_info.h     |   3 +
+ arch/s390/include/asm/uprobes.h         |  42 ++++
+ arch/s390/include/asm/vdso.h            |  18 +-
+ arch/s390/kernel/Makefile               |   5 +-
+ arch/s390/kernel/asm-offsets.c          |   7 +
+ arch/s390/kernel/early.c                |   2 -
+ arch/s390/kernel/entry.h                |   1 +
+ arch/s390/kernel/entry64.S              |  17 +-
+ arch/s390/kernel/ftrace.c               |  94 ++++++--
+ arch/s390/kernel/head.S                 |   2 +-
+ arch/s390/kernel/irq.c                  |   1 +
+ arch/s390/kernel/kprobes.c              | 159 +-------------
+ arch/s390/kernel/mcount.S               |   2 -
+ arch/s390/kernel/mcount64.S             |  64 ++++--
+ arch/s390/kernel/ptrace.c               |   5 +-
+ arch/s390/kernel/setup.c                |   4 +-
+ arch/s390/kernel/smp.c                  |   6 -
+ arch/s390/kernel/time.c                 |  13 ++
+ arch/s390/kernel/topology.c             |  18 +-
+ arch/s390/kernel/traps.c                |  33 ++-
+ arch/s390/kernel/uprobes.c              | 332 ++++++++++++++++++++++++++++
+ arch/s390/kernel/vdso32/clock_getres.S  |  11 +-
+ arch/s390/kernel/vdso32/clock_gettime.S |  32 ++-
+ arch/s390/kernel/vdso32/gettimeofday.S  |   4 +-
+ arch/s390/kernel/vdso64/clock_getres.S  |   8 +-
+ arch/s390/kernel/vdso64/clock_gettime.S |  32 ++-
+ arch/s390/kernel/vdso64/gettimeofday.S  |   4 +-
+ arch/s390/lib/Makefile                  |   2 +
+ arch/s390/lib/probes.c                  | 159 ++++++++++++++
+ arch/s390/lib/spinlock.c                | 105 +++++----
+ arch/s390/mm/dump_pagetables.c          |   5 +-
+ arch/s390/mm/hugetlbpage.c              |   2 +-
+ arch/s390/mm/pageattr.c                 |  38 +++-
+ arch/s390/mm/vmem.c                     |   8 +-
+ drivers/s390/char/Kconfig               |  13 ++
+ drivers/s390/char/Makefile              |   3 +
+ drivers/s390/char/diag_ftp.c            | 237 ++++++++++++++++++++
+ drivers/s390/char/diag_ftp.h            |  21 ++
+ drivers/s390/char/hmcdrv_cache.c        | 252 ++++++++++++++++++++++
+ drivers/s390/char/hmcdrv_cache.h        |  24 +++
+ drivers/s390/char/hmcdrv_dev.c          | 370 ++++++++++++++++++++++++++++++++
+ drivers/s390/char/hmcdrv_dev.h          |  14 ++
+ drivers/s390/char/hmcdrv_ftp.c          | 343 +++++++++++++++++++++++++++++
+ drivers/s390/char/hmcdrv_ftp.h          |  63 ++++++
+ drivers/s390/char/hmcdrv_mod.c          |  64 ++++++
+ drivers/s390/char/sclp.h                |   2 +
+ drivers/s390/char/sclp_diag.h           |  89 ++++++++
+ drivers/s390/char/sclp_early.c          |   2 +-
+ drivers/s390/char/sclp_ftp.c            | 275 ++++++++++++++++++++++++
+ drivers/s390/char/sclp_ftp.h            |  21 ++
+ drivers/s390/char/sclp_rw.c             |  13 +-
+ drivers/s390/char/sclp_vt220.c          |   4 -
+ drivers/s390/char/tape_char.c           |   4 +-
+ drivers/s390/crypto/ap_bus.c            |  14 +-
+ drivers/s390/crypto/ap_bus.h            |   6 +-
+ drivers/s390/crypto/zcrypt_api.c        |   7 +-
+ 69 files changed, 2891 insertions(+), 401 deletions(-)
+ create mode 100644 arch/s390/include/asm/uprobes.h
+ create mode 100644 arch/s390/kernel/uprobes.c
+ create mode 100644 arch/s390/lib/probes.c
+ create mode 100644 drivers/s390/char/diag_ftp.c
+ create mode 100644 drivers/s390/char/diag_ftp.h
+ create mode 100644 drivers/s390/char/hmcdrv_cache.c
+ create mode 100644 drivers/s390/char/hmcdrv_cache.h
+ create mode 100644 drivers/s390/char/hmcdrv_dev.c
+ create mode 100644 drivers/s390/char/hmcdrv_dev.h
+ create mode 100644 drivers/s390/char/hmcdrv_ftp.c
+ create mode 100644 drivers/s390/char/hmcdrv_ftp.h
+ create mode 100644 drivers/s390/char/hmcdrv_mod.c
+ create mode 100644 drivers/s390/char/sclp_diag.h
+ create mode 100644 drivers/s390/char/sclp_ftp.c
+ create mode 100644 drivers/s390/char/sclp_ftp.h
+Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/Kconfig                     |   1 +
+ arch/tile/gxio/mpipe.c                |  37 ++++++-
+ arch/tile/include/asm/sections.h      |   3 -
+ arch/tile/include/asm/vdso.h          |  20 ++--
+ arch/tile/include/uapi/arch/sim_def.h |  10 +-
+ arch/tile/kernel/time.c               |  61 ++++++++----
+ arch/tile/kernel/traps.c              |   2 +-
+ arch/tile/kernel/vdso/vdso.lds.S      |   2 +
+ arch/tile/kernel/vdso/vgettimeofday.c | 176 +++++++++++++++++++++++++---------
+ arch/tile/kernel/vmlinux.lds.S        |   2 -
+ arch/tile/mm/init.c                   |  12 +--
+ drivers/char/tile-srom.c              |  13 ++-
+ 12 files changed, 245 insertions(+), 94 deletions(-)
+Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
+$ git merge uml/next
+Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
+Removing arch/x86/um/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
+Auto-merging arch/um/os-Linux/skas/process.c
+Auto-merging arch/um/kernel/trap.c
+Removing arch/um/include/shared/skas_ptrace.h
+Removing arch/um/include/shared/skas/proc_mm.h
+Auto-merging arch/um/include/shared/os.h
+Auto-merging arch/um/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8f1b73bfb783] Merge remote-tracking branch 'uml/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/um/include/shared/os.h                 |   2 -
+ arch/um/include/shared/skas/proc_mm.h       |  44 ------
+ arch/um/include/shared/skas/skas.h          |   3 -
+ arch/um/include/shared/skas_ptrace.h        |  14 --
+ arch/um/kernel/ptrace.c                     |  32 ----
+ arch/um/kernel/reboot.c                     |  35 ++---
+ arch/um/kernel/skas/mmu.c                   |  68 +++------
+ arch/um/kernel/skas/process.c               |  27 ----
+ arch/um/kernel/trap.c                       |   2 +-
+ arch/um/kernel/um_arch.c                    |  10 --
+ arch/um/os-Linux/process.c                  |  16 --
+ arch/um/os-Linux/skas/mem.c                 | 100 ++----------
+ arch/um/os-Linux/skas/process.c             | 200 ++++++------------------
+ arch/um/os-Linux/start_up.c                 | 154 -------------------
+ arch/um/sys-ia64/sysdep/skas_ptrace.h       |  22 ---
+ arch/um/sys-ppc/shared/sysdep/skas_ptrace.h |  22 ---
+ arch/x86/um/ldt.c                           | 227 ++++++----------------------
+ arch/x86/um/shared/sysdep/faultinfo_32.h    |   3 -
+ arch/x86/um/shared/sysdep/faultinfo_64.h    |   3 -
+ arch/x86/um/shared/sysdep/skas_ptrace.h     |  22 ---
+ 20 files changed, 148 insertions(+), 858 deletions(-)
+ delete mode 100644 arch/um/include/shared/skas/proc_mm.h
+ delete mode 100644 arch/um/include/shared/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+ delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
+Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485)
+$ git merge xtensa/for_next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/include/uapi/asm/ioctls.h | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging btrfs/next (1d52c78afbbf Btrfs: try not to ENOSPC on log replay)
+$ git merge btrfs/next
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/tree-log.c
+Auto-merging fs/btrfs/btrfs_inode.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/async-thread.c           |   1 +
+ fs/btrfs/async-thread.h           |   1 +
+ fs/btrfs/backref.c                | 121 ++++++-
+ fs/btrfs/backref.h                |   3 +
+ fs/btrfs/btrfs_inode.h            |  16 +-
+ fs/btrfs/check-integrity.c        |  18 +-
+ fs/btrfs/compression.c            |  10 +-
+ fs/btrfs/ctree.c                  |  44 +--
+ fs/btrfs/ctree.h                  |  53 ++-
+ fs/btrfs/delayed-inode.c          |   8 +-
+ fs/btrfs/dev-replace.c            |  82 +++--
+ fs/btrfs/dir-item.c               |  12 +-
+ fs/btrfs/disk-io.c                | 129 ++++----
+ fs/btrfs/disk-io.h                |   3 +-
+ fs/btrfs/export.c                 |   4 +-
+ fs/btrfs/extent-tree.c            | 221 ++++++++++---
+ fs/btrfs/extent_io.c              | 341 +++++++++++--------
+ fs/btrfs/extent_io.h              |  41 ++-
+ fs/btrfs/file-item.c              |  30 +-
+ fs/btrfs/file.c                   | 147 ++++++---
+ fs/btrfs/free-space-cache.c       | 157 ++++++++-
+ fs/btrfs/hash.c                   |   4 +-
+ fs/btrfs/inode-item.c             |  12 +-
+ fs/btrfs/inode-map.c              |  68 ++--
+ fs/btrfs/inode.c                  | 635 +++++++++++++++++++++++++++--------
+ fs/btrfs/ioctl.c                  |  49 +--
+ fs/btrfs/lzo.c                    |   3 +-
+ fs/btrfs/orphan.c                 |   4 +-
+ fs/btrfs/print-tree.c             |   4 +-
+ fs/btrfs/qgroup.c                 |  20 +-
+ fs/btrfs/raid56.c                 |   8 +-
+ fs/btrfs/reada.c                  |   2 +-
+ fs/btrfs/relocation.c             |  22 +-
+ fs/btrfs/scrub.c                  |  50 ++-
+ fs/btrfs/send.c                   |  43 ++-
+ fs/btrfs/super.c                  |  24 +-
+ fs/btrfs/sysfs.c                  |  41 ++-
+ fs/btrfs/sysfs.h                  |  16 +-
+ fs/btrfs/tests/free-space-tests.c | 516 ++++++++++++++++++++++++++++-
+ fs/btrfs/transaction.c            |  10 +-
+ fs/btrfs/tree-log.c               | 259 ++++++++-------
+ fs/btrfs/tree-log.h               |   2 +
+ fs/btrfs/uuid-tree.c              |   1 -
+ fs/btrfs/volumes.c                | 672 ++++++++++++++++++++++++--------------
+ fs/btrfs/volumes.h                | 166 ++++++++--
+ fs/btrfs/xattr.c                  |   4 +-
+ fs/btrfs/zlib.c                   | 141 ++++----
+ include/trace/events/btrfs.h      |  85 ++++-
+ 48 files changed, 3071 insertions(+), 1232 deletions(-)
+Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (1209bbdff2f6 CIFS: Fix readpages retrying on reconnects)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/file.c         | 8 +-------
+ fs/cifs/smb1ops.c      | 2 +-
+ fs/cifs/smb2maperror.c | 2 ++
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (04ec5f5c0022 ecryptfs: remove unnecessary break after goto)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/inode.c
+Auto-merging fs/ecryptfs/file.c
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/file.c      |  4 ++--
+ fs/ecryptfs/inode.c     | 16 +++++++---------
+ fs/ecryptfs/keystore.c  |  2 --
+ fs/ecryptfs/messaging.c |  3 +--
+ 4 files changed, 10 insertions(+), 15 deletions(-)
+Merging ext3/for_next (c53f755d339b ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr())
+$ git merge ext3/for_next
+Auto-merging fs/ocfs2/super.c
+Merge made by the 'recursive' strategy.
+ fs/ext3/ext3.h          | 12 +++++++-----
+ fs/ext3/super.c         | 14 +++++++-------
+ fs/ocfs2/file.c         |  2 +-
+ fs/ocfs2/quota.h        |  5 ++++-
+ fs/ocfs2/quota_global.c |  4 ++--
+ fs/ocfs2/quota_local.c  | 33 +++++++++++++++++----------------
+ fs/ocfs2/super.c        | 30 +++++++++++++++++-------------
+ fs/reiserfs/reiserfs.h  |  5 ++++-
+ fs/reiserfs/super.c     | 16 ++++++++--------
+ fs/udf/file.c           |  9 ++++++++-
+ fs/udf/udftime.c        |  2 --
+ 11 files changed, 75 insertions(+), 57 deletions(-)
+Merging ext4/dev (c13e87d490d3 ext4: optimize block allocation on grow indepth)
+$ git merge ext4/dev
+Auto-merging fs/ext4/namei.c
+Auto-merging fs/buffer.c
+Merge made by the 'recursive' strategy.
+ fs/buffer.c                 |   48 +-
+ fs/ext4/balloc.c            |    3 +-
+ fs/ext4/dir.c               |    8 +-
+ fs/ext4/ext4.h              |   37 +-
+ fs/ext4/ext4_extents.h      |    1 +
+ fs/ext4/ext4_jbd2.c         |    4 +-
+ fs/ext4/ext4_jbd2.h         |    6 +-
+ fs/ext4/extents.c           |  613 +++++++++++++++++---------
+ fs/ext4/extents_status.c    |  200 ++++++++-
+ fs/ext4/extents_status.h    |   13 +-
+ fs/ext4/indirect.c          |   86 ++--
+ fs/ext4/inline.c            |    4 +-
+ fs/ext4/inode.c             |   93 ++--
+ fs/ext4/mballoc.c           |   15 +-
+ fs/ext4/migrate.c           |   11 +-
+ fs/ext4/move_extent.c       | 1009 +++++--------------------------------------
+ fs/ext4/namei.c             |  195 ++++-----
+ fs/ext4/super.c             |  223 +++++-----
+ fs/ext4/xattr.c             |   38 +-
+ fs/jbd/journal.c            |    2 +-
+ fs/jbd2/checkpoint.c        |  334 ++++++--------
+ fs/jbd2/journal.c           |   18 +-
+ fs/jbd2/recovery.c          |    1 +
+ include/linux/buffer_head.h |   47 +-
+ include/linux/jbd2.h        |    2 +-
+ include/linux/mm.h          |    8 +
+ include/trace/events/ext4.h |   59 ++-
+ mm/truncate.c               |   57 +++
+ 28 files changed, 1392 insertions(+), 1743 deletions(-)
+Merging f2fs/dev (539debb4a318 f2fs: support atomic_write feature for database)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs |   7 +
+ Documentation/filesystems/f2fs.txt      |  13 +-
+ fs/f2fs/checkpoint.c                    |  97 +++---
+ fs/f2fs/data.c                          |  73 +++--
+ fs/f2fs/debug.c                         |  20 +-
+ fs/f2fs/dir.c                           |  19 +-
+ fs/f2fs/f2fs.h                          | 159 +++++++---
+ fs/f2fs/file.c                          | 241 ++++++++++----
+ fs/f2fs/gc.c                            |  26 +-
+ fs/f2fs/inline.c                        |  20 +-
+ fs/f2fs/inode.c                         |  37 ++-
+ fs/f2fs/namei.c                         |  53 ++--
+ fs/f2fs/node.c                          | 460 +++++++++++++--------------
+ fs/f2fs/node.h                          |  57 ++--
+ fs/f2fs/recovery.c                      | 191 +++++++-----
+ fs/f2fs/segment.c                       | 537 +++++++++++++++++++++++---------
+ fs/f2fs/segment.h                       | 162 ++++++----
+ fs/f2fs/super.c                         |  47 ++-
+ fs/f2fs/xattr.c                         |   8 +-
+ include/linux/f2fs_fs.h                 |   6 +-
+ include/trace/events/f2fs.h             |  16 +-
+ 21 files changed, 1455 insertions(+), 794 deletions(-)
+Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
+$ git merge fscache/fscache
+Resolved 'fs/fscache/object.c' using previous resolution.
+Auto-merging fs/fscache/object.c
+CONFLICT (content): Merge conflict in fs/fscache/object.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 343d8ef0c996] Merge remote-tracking branch 'fscache/fscache'
+$ git diff -M --stat --summary HEAD^..
+Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master (19aeb5a65f1a GFS2: Make rename not save dirent location)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/dir.c   | 9 +++++++--
+ fs/gfs2/dir.h   | 1 +
+ fs/gfs2/inode.c | 7 ++++---
+ fs/gfs2/rgrp.c  | 8 ++++++++
+ fs/gfs2/rgrp.h  | 1 +
+ 5 files changed, 21 insertions(+), 5 deletions(-)
+Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (b4b56796fe63 Merge branch 'client-4.2' into linux-next)
+$ git merge nfs/linux-next
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging fs/nfs_common/grace.c
+Removing fs/nfs/blocklayout/extents.c
+Removing fs/nfs/blocklayout/blocklayoutdm.c
+Removing fs/nfs/blocklayout/blocklayoutdev.c
+Auto-merging fs/lockd/svc.c
+Merge made by the 'recursive' strategy.
+ fs/Kconfig                               |    6 +-
+ fs/lockd/Makefile                        |    3 +-
+ fs/lockd/mon.c                           |    6 +
+ fs/lockd/netns.h                         |    1 -
+ fs/lockd/procfs.c                        |   92 ++
+ fs/lockd/procfs.h                        |   28 +
+ fs/lockd/svc.c                           |   16 +-
+ fs/nfs/Makefile                          |    1 +
+ fs/nfs/blocklayout/Makefile              |    3 +-
+ fs/nfs/blocklayout/blocklayout.c         | 1386 +++++++++---------------------
+ fs/nfs/blocklayout/blocklayout.h         |  213 +++--
+ fs/nfs/blocklayout/blocklayoutdev.c      |  384 ---------
+ fs/nfs/blocklayout/blocklayoutdm.c       |  108 ---
+ fs/nfs/blocklayout/dev.c                 |  363 ++++++++
+ fs/nfs/blocklayout/extent_tree.c         |  602 +++++++++++++
+ fs/nfs/blocklayout/extents.c             |  908 -------------------
+ fs/nfs/blocklayout/rpc_pipefs.c          |  285 ++++++
+ fs/nfs/callback.c                        |    4 +-
+ fs/nfs/callback_proc.c                   |   23 +-
+ fs/nfs/client.c                          |    6 +-
+ fs/nfs/direct.c                          |   14 -
+ fs/nfs/file.c                            |   52 +-
+ fs/nfs/filelayout/filelayout.c           |   34 +-
+ fs/nfs/filelayout/filelayout.h           |    7 +-
+ fs/nfs/filelayout/filelayoutdev.c        |  108 +--
+ fs/nfs/fscache-index.c                   |    3 +-
+ fs/nfs/inode.c                           |    6 +-
+ fs/nfs/internal.h                        |    7 -
+ fs/nfs/nfs3_fs.h                         |   34 +
+ fs/nfs/nfs3acl.c                         |    1 +
+ fs/nfs/nfs3client.c                      |    1 +
+ fs/nfs/nfs3proc.c                        |    1 +
+ fs/nfs/nfs3super.c                       |    1 +
+ fs/nfs/nfs42.h                           |   14 +
+ fs/nfs/nfs42proc.c                       |   69 ++
+ fs/nfs/nfs42xdr.c                        |   98 +++
+ fs/nfs/nfs4_fs.h                         |    3 +
+ fs/nfs/nfs4file.c                        |   25 +
+ fs/nfs/nfs4proc.c                        |  142 ++-
+ fs/nfs/nfs4renewd.c                      |   12 +-
+ fs/nfs/nfs4state.c                       |   18 +-
+ fs/nfs/nfs4xdr.c                         |  186 +---
+ fs/nfs/objlayout/objio_osd.c             |  113 +--
+ fs/nfs/objlayout/objlayout.c             |   70 --
+ fs/nfs/objlayout/objlayout.h             |    5 -
+ fs/nfs/pagelist.c                        |    8 +
+ fs/nfs/pnfs.c                            |  105 ++-
+ fs/nfs/pnfs.h                            |   50 +-
+ fs/nfs/pnfs_dev.c                        |  150 +++-
+ fs/nfs/super.c                           |   11 -
+ fs/nfs/write.c                           |  150 ++--
+ fs/nfs_common/Makefile                   |    3 +-
+ fs/{lockd => nfs_common}/grace.c         |   68 +-
+ fs/nfsd/Kconfig                          |    4 +-
+ fs/nfsd/cache.h                          |    1 -
+ fs/nfsd/export.c                         |    1 +
+ fs/nfsd/nfs3proc.c                       |   13 +-
+ fs/nfsd/nfs4callback.c                   |  145 +---
+ fs/nfsd/nfs4idmap.c                      |   20 +-
+ fs/nfsd/nfs4proc.c                       |   49 ++
+ fs/nfsd/nfs4recover.c                    |  205 ++++-
+ fs/nfsd/nfs4state.c                      |  118 ++-
+ fs/nfsd/nfs4xdr.c                        |   75 +-
+ fs/nfsd/nfscache.c                       |  214 ++---
+ fs/nfsd/nfsctl.c                         |   45 +
+ fs/nfsd/nfsd.h                           |    2 +-
+ fs/nfsd/nfsfh.c                          |    6 +-
+ fs/nfsd/state.h                          |   28 +-
+ fs/nfsd/vfs.c                            |   37 +-
+ fs/nfsd/xdr4.h                           |   14 +
+ include/linux/nfs4.h                     |   29 +-
+ include/linux/nfs_fs.h                   |   41 -
+ include/linux/nfs_fs_sb.h                |    1 +
+ include/linux/nfs_xdr.h                  |   36 +-
+ include/linux/pagemap.h                  |   12 +-
+ include/linux/proc_fs.h                  |    2 +
+ include/linux/sunrpc/svc.h               |    1 -
+ include/linux/sunrpc/xprt.h              |    1 +
+ include/linux/wait.h                     |    5 +-
+ include/uapi/linux/nfsd/export.h         |    5 +-
+ kernel/sched/wait.c                      |   36 +
+ mm/filemap.c                             |   21 +-
+ net/sunrpc/clnt.c                        |    5 +
+ net/sunrpc/sched.c                       |    2 -
+ net/sunrpc/svc.c                         |    2 -
+ net/sunrpc/svc_xprt.c                    |   81 +-
+ net/sunrpc/svcsock.c                     |   25 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c |    2 +-
+ net/sunrpc/xprtrdma/transport.c          |    2 -
+ net/sunrpc/xprtrdma/xprt_rdma.h          |    7 +
+ net/sunrpc/xprtsock.c                    |  121 +--
+ 91 files changed, 3708 insertions(+), 3713 deletions(-)
+ create mode 100644 fs/lockd/procfs.c
+ create mode 100644 fs/lockd/procfs.h
+ delete mode 100644 fs/nfs/blocklayout/blocklayoutdev.c
+ delete mode 100644 fs/nfs/blocklayout/blocklayoutdm.c
+ create mode 100644 fs/nfs/blocklayout/dev.c
+ create mode 100644 fs/nfs/blocklayout/extent_tree.c
+ delete mode 100644 fs/nfs/blocklayout/extents.c
+ create mode 100644 fs/nfs/blocklayout/rpc_pipefs.c
+ create mode 100644 fs/nfs/nfs3_fs.h
+ create mode 100644 fs/nfs/nfs42.h
+ create mode 100644 fs/nfs/nfs42proc.c
+ create mode 100644 fs/nfs/nfs42xdr.c
+ rename fs/{lockd => nfs_common}/grace.c (50%)
+Merging nfsd/nfsd-next (34549ab09e62 nfsd: eliminate "to_delegation" define)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/nfs4callback.c | 5 +----
+ fs/nfsd/nfs4state.c    | 3 ---
+ fs/nfsd/state.h        | 3 +++
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (443b39cdd5c3 UBIFS: Fix trivial typo in power_cut_emulated())
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/block.c   | 36 +++++++++++++++++++++++++-----------
+ drivers/mtd/ubi/cdev.c    |  6 ++++--
+ drivers/mtd/ubi/eba.c     |  5 ++---
+ drivers/mtd/ubi/fastmap.c |  1 +
+ drivers/mtd/ubi/ubi.h     | 12 +++++++-----
+ drivers/mtd/ubi/wl.c      | 28 +++++++++++++++-------------
+ fs/ubifs/commit.c         |  8 +++-----
+ fs/ubifs/debug.c          |  6 +++---
+ fs/ubifs/journal.c        |  7 +++----
+ fs/ubifs/log.c            | 19 ++++++++++++++-----
+ 10 files changed, 77 insertions(+), 51 deletions(-)
+Merging xfs/for-next (bdb119bb6e9d Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next)
+$ git merge xfs/for-next
+Removing fs/xfs/time.h
+Merge made by the 'recursive' strategy.
+ fs/xfs/kmem.c                 |   1 -
+ fs/xfs/libxfs/xfs_alloc.c     |   4 +
+ fs/xfs/libxfs/xfs_bmap.c      | 365 ++++++++++++++--------
+ fs/xfs/libxfs/xfs_bmap.h      |   7 +-
+ fs/xfs/libxfs/xfs_da_btree.c  |   3 +-
+ fs/xfs/libxfs/xfs_da_format.c |   1 -
+ fs/xfs/libxfs/xfs_dir2.c      |  67 +---
+ fs/xfs/libxfs/xfs_dir2.h      |   2 +-
+ fs/xfs/libxfs/xfs_ialloc.c    |   7 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c  |  49 ++-
+ fs/xfs/libxfs/xfs_sb.c        |   7 +
+ fs/xfs/time.h                 |  36 ---
+ fs/xfs/xfs_aops.c             |  23 +-
+ fs/xfs/xfs_bmap_util.c        | 126 ++++----
+ fs/xfs/xfs_buf.c              | 355 +++++++++++-----------
+ fs/xfs/xfs_buf.h              |  15 +-
+ fs/xfs/xfs_buf_item.c         |  10 +-
+ fs/xfs/xfs_file.c             | 178 ++++-------
+ fs/xfs/xfs_fsops.c            |  11 +-
+ fs/xfs/xfs_globals.c          |   4 +
+ fs/xfs/xfs_icache.c           |   1 -
+ fs/xfs/xfs_inode.c            |  34 ++-
+ fs/xfs/xfs_inode.h            |   2 +-
+ fs/xfs/xfs_inode_item.c       |   2 +-
+ fs/xfs/xfs_ioctl.c            |  28 +-
+ fs/xfs/xfs_ioctl32.c          |   2 +
+ fs/xfs/xfs_ioctl32.h          |   3 +-
+ fs/xfs/xfs_iomap.c            |   4 +-
+ fs/xfs/xfs_iops.c             |  30 ++
+ fs/xfs/xfs_linux.h            |   6 +-
+ fs/xfs/xfs_log.c              |  59 ++--
+ fs/xfs/xfs_log_cil.c          |  47 ++-
+ fs/xfs/xfs_log_recover.c      | 689 ++++++++++++++++++++++--------------------
+ fs/xfs/xfs_mount.c            |  58 ++--
+ fs/xfs/xfs_mru_cache.c        |   3 +-
+ fs/xfs/xfs_qm.c               |   1 +
+ fs/xfs/xfs_rtalloc.c          |  85 +-----
+ fs/xfs/xfs_rtalloc.h          |   4 +
+ fs/xfs/xfs_super.c            |  39 ++-
+ fs/xfs/xfs_symlink.c          |   8 +-
+ fs/xfs/xfs_sysctl.h           |   5 +
+ fs/xfs/xfs_sysfs.c            |  74 +++++
+ fs/xfs/xfs_sysfs.h            |   1 +
+ fs/xfs/xfs_trace.h            |   3 +-
+ fs/xfs/xfs_trans_buf.c        |  16 +-
+ fs/xfs/xfs_trans_inode.c      |   2 +-
+ 46 files changed, 1302 insertions(+), 1175 deletions(-)
+ delete mode 100644 fs/xfs/time.h
+Merging file-locks/linux-next (c68f11db3d2f locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
+$ git merge file-locks/linux-next
+Resolved 'fs/locks.c' using previous resolution.
+Auto-merging net/socket.c
+Auto-merging fs/nfsd/state.h
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/file.c
+Auto-merging fs/locks.c
+CONFLICT (content): Merge conflict in fs/locks.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/cifs/cifsfs.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 55a5819b7fb9] Merge remote-tracking branch 'file-locks/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking |  11 +-
+ Documentation/filesystems/vfs.txt |   7 +-
+ drivers/net/tun.c                 |   4 +-
+ drivers/tty/tty_io.c              |   3 +-
+ fs/cifs/cifsfs.c                  |   7 +-
+ fs/dlm/plock.c                    |   8 +-
+ fs/fcntl.c                        |  21 +-
+ fs/gfs2/file.c                    |  22 +-
+ fs/libfs.c                        |  18 ++
+ fs/lockd/svclock.c                |  68 +-----
+ fs/locks.c                        | 444 +++++++++++++++++---------------------
+ fs/nfs/file.c                     |  13 +-
+ fs/nfs/internal.h                 |   1 -
+ fs/nfs/nfs4file.c                 |   2 +-
+ fs/nfsd/nfs4state.c               | 104 +++++----
+ fs/nfsd/state.h                   |   1 -
+ fs/notify/dnotify/dnotify.c       |   8 +-
+ include/linux/fs.h                |  59 ++---
+ include/linux/lockd/lockd.h       |   1 -
+ include/linux/security.h          |   8 +-
+ include/trace/events/filelock.h   |  14 +-
+ net/socket.c                      |   3 +-
+ security/capability.c             |   4 +-
+ security/security.c               |   2 +-
+ security/selinux/hooks.c          |   4 +-
+ security/smack/smack_lsm.c        |   3 +-
+ 26 files changed, 353 insertions(+), 487 deletions(-)
+Merging vfs/for-next (bb4623448d40 vfs: move getname() from callers to do_mount())
+$ git merge vfs/for-next
+Auto-merging mm/iov_iter.c
+Auto-merging kernel/printk/printk.c
+Auto-merging include/linux/uio.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/dcache.h
+Auto-merging fs/namei.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/ecryptfs/file.c
+Auto-merging fs/dcache.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cachefiles/rdwr.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging drivers/usb/gadget/function/f_fs.c
+Auto-merging Documentation/filesystems/vfs.txt
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/vfs.txt        |   2 +-
+ arch/alpha/kernel/osf_sys.c              |  23 ++-
+ arch/x86/ia32/ia32_aout.c                |  21 +--
+ drivers/block/rsxx/core.c                |  81 +++--------
+ drivers/bluetooth/hci_vhci.c             |  22 ++-
+ drivers/char/mem.c                       |  56 ++------
+ drivers/dma-buf/dma-buf.c                |   2 +-
+ drivers/gpu/drm/nouveau/nouveau_nvif.c   |   4 +-
+ drivers/gpu/drm/nouveau/nvif/driver.h    |   4 +-
+ drivers/gpu/drm/nouveau/nvif/object.h    |   6 +-
+ drivers/infiniband/hw/ipath/ipath_fs.c   |   1 -
+ drivers/infiniband/hw/qib/qib_fs.c       |   1 -
+ drivers/misc/carma/carma-fpga-program.c  |  30 +---
+ drivers/s390/char/vmlogrdr.c             |   1 -
+ drivers/staging/android/ashmem.c         |   2 +-
+ drivers/staging/android/ion/compat_ion.c |   2 +-
+ drivers/staging/android/logger.c         | 103 ++++---------
+ drivers/staging/vme/devices/vme_user.c   |  28 +---
+ drivers/usb/gadget/function/f_fs.c       |  24 ++--
+ drivers/usb/gadget/legacy/inode.c        |  26 ++--
+ fs/9p/fid.c                              |   4 +-
+ fs/9p/vfs_addr.c                         |   4 +-
+ fs/9p/vfs_dentry.c                       |   8 +-
+ fs/9p/vfs_dir.c                          |   4 +-
+ fs/9p/vfs_file.c                         |   8 +-
+ fs/9p/vfs_inode.c                        |  32 ++---
+ fs/9p/vfs_inode_dotl.c                   |   8 +-
+ fs/afs/dir.c                             |   5 -
+ fs/autofs4/expire.c                      |   6 -
+ fs/binfmt_aout.c                         |  25 +---
+ fs/binfmt_elf.c                          |  25 +---
+ fs/binfmt_elf_fdpic.c                    |  24 ++--
+ fs/btrfs/ioctl.c                         |   5 +-
+ fs/buffer.c                              |   5 +
+ fs/cachefiles/rdwr.c                     |  48 +++----
+ fs/ceph/dir.c                            |   1 -
+ fs/cifs/dir.c                            |  14 +-
+ fs/cifs/file.c                           |  12 +-
+ fs/cifs/inode.c                          |  12 +-
+ fs/cifs/readdir.c                        |   6 +-
+ fs/compat.c                              |  28 ++--
+ fs/dcache.c                              | 174 ++++++++--------------
+ fs/ecryptfs/file.c                       |   2 +-
+ fs/exec.c                                |  17 ++-
+ fs/file.c                                |   1 +
+ fs/fuse/dir.c                            |   7 +-
+ fs/gfs2/dentry.c                         |   3 -
+ fs/gfs2/inode.c                          |   5 +
+ fs/internal.h                            |   2 +-
+ fs/jffs2/jffs2_fs_sb.h                   |   2 -
+ fs/jffs2/wbuf.c                          |  17 +--
+ fs/jfs/super.c                           |   2 +-
+ fs/kernfs/dir.c                          |  11 --
+ fs/mount.h                               |  25 +++-
+ fs/namei.c                               |  22 +--
+ fs/namespace.c                           | 203 +++++++++++++++++++-------
+ fs/nfs/dir.c                             |   7 +-
+ fs/proc/base.c                           |  10 +-
+ fs/proc/fd.c                             |   2 -
+ fs/read_write.c                          |   2 +
+ fs/super.c                               |   2 +
+ include/linux/dcache.h                   |   3 +-
+ include/linux/fs.h                       |   5 +-
+ include/linux/uio.h                      |   3 +
+ kernel/printk/printk.c                   |  20 +--
+ mm/iov_iter.c                            | 240 +++++++++++++++++++++++++++++--
+ tools/perf/util/string.c                 |  90 ++++--------
+ 67 files changed, 771 insertions(+), 829 deletions(-)
+Merging pci/next (5b750d4fb905 Merge branch 'pci/host-xgene' into next)
+$ git merge pci/next
+Auto-merging kernel/resource.c
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/probe.c
+Removing drivers/pci/hotplug/pcihp_slot.c
+Auto-merging drivers/pci/hotplug/pciehp_hpc.c
+Auto-merging drivers/pci/hotplug/acpiphp_glue.c
+Auto-merging drivers/pci/host/Kconfig
+Auto-merging drivers/net/vmxnet3/vmxnet3_int.h
+Auto-merging arch/powerpc/sysdev/fsl_msi.c
+Auto-merging arch/powerpc/platforms/powernv/pci.c
+Auto-merging arch/arm64/kernel/Makefile
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/Kbuild
+Auto-merging arch/arm64/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-pci            |  10 +
+ .../devicetree/bindings/pci/designware-pcie.txt    |   3 +
+ .../bindings/pci/nvidia,tegra20-pcie.txt           |  25 +-
+ .../devicetree/bindings/pci/pci-keystone.txt       |  63 ++
+ .../devicetree/bindings/pci/xgene-pci.txt          |  57 ++
+ .../devicetree/bindings/pci/xilinx-pcie.txt        |  62 ++
+ Documentation/driver-model/devres.txt              |   2 +
+ MAINTAINERS                                        |  15 +
+ arch/arm/boot/dts/spear1310.dtsi                   |  18 +-
+ arch/arm/boot/dts/spear1340.dtsi                   |   6 +-
+ arch/arm/include/asm/io.h                          |   1 +
+ arch/arm/mach-integrator/pci_v3.c                  |  23 +-
+ arch/arm64/Kconfig                                 |  22 +-
+ arch/arm64/boot/dts/apm-mustang.dts                |   8 +
+ arch/arm64/boot/dts/apm-storm.dtsi                 | 165 ++++
+ arch/arm64/include/asm/Kbuild                      |   1 +
+ arch/arm64/include/asm/io.h                        |   3 +-
+ arch/arm64/include/asm/pci.h                       |  37 +
+ arch/arm64/include/asm/pgtable.h                   |   2 +
+ arch/arm64/kernel/Makefile                         |   1 +
+ arch/arm64/kernel/pci.c                            |  70 ++
+ arch/ia64/kernel/msi_ia64.c                        |   2 +-
+ arch/ia64/sn/kernel/msi_sn.c                       |   4 +-
+ arch/mips/pci/msi-octeon.c                         |   6 +-
+ arch/powerpc/include/asm/machdep.h                 |   2 -
+ arch/powerpc/kernel/msi.c                          |  12 +-
+ arch/powerpc/platforms/cell/axon_msi.c             |   9 -
+ arch/powerpc/platforms/powernv/pci.c               |  19 +-
+ arch/powerpc/platforms/pseries/msi.c               |  44 +-
+ arch/powerpc/sysdev/fsl_msi.c                      |  12 +-
+ arch/powerpc/sysdev/mpic_pasemi_msi.c              |  11 +-
+ arch/powerpc/sysdev/mpic_u3msi.c                   |  28 +-
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c              |  18 +-
+ arch/powerpc/sysdev/ppc4xx_msi.c                   |  19 +-
+ arch/x86/pci/common.c                              |  20 +-
+ arch/x86/pci/mmconfig-shared.c                     |  40 +-
+ arch/x86/pci/pcbios.c                              |   8 +-
+ drivers/gpu/drm/vmwgfx/svga_reg.h                  |   1 -
+ drivers/irqchip/irq-armada-370-xp.c                |  14 +-
+ drivers/misc/vmw_vmci/vmci_guest.c                 |   1 -
+ drivers/net/vmxnet3/vmxnet3_int.h                  |   1 -
+ drivers/of/address.c                               | 154 ++++
+ drivers/of/of_pci.c                                | 142 +++
+ drivers/pci/host/Kconfig                           |  28 +
+ drivers/pci/host/Makefile                          |   3 +
+ drivers/pci/host/pci-imx6.c                        |  13 +-
+ drivers/pci/host/pci-keystone-dw.c                 | 516 +++++++++++
+ drivers/pci/host/pci-keystone.c                    | 415 +++++++++
+ drivers/pci/host/pci-keystone.h                    |  58 ++
+ drivers/pci/host/pci-mvebu.c                       |   6 +-
+ drivers/pci/host/pci-tegra.c                       | 277 +++++-
+ drivers/pci/host/pci-xgene.c                       | 659 ++++++++++++++
+ drivers/pci/host/pcie-designware.c                 | 268 +++---
+ drivers/pci/host/pcie-designware.h                 |  22 +-
+ drivers/pci/host/pcie-rcar.c                       |  21 +-
+ drivers/pci/host/pcie-spear13xx.c                  |   2 +-
+ drivers/pci/host/pcie-xilinx.c                     | 970 +++++++++++++++++++++
+ drivers/pci/hotplug/Makefile                       |   2 +-
+ drivers/pci/hotplug/acpi_pcihp.c                   | 254 +-----
+ drivers/pci/hotplug/acpiphp_glue.c                 |  11 +-
+ drivers/pci/hotplug/acpiphp_ibm.c                  |   2 +-
+ drivers/pci/hotplug/cpci_hotplug_core.c            |  13 +-
+ drivers/pci/hotplug/cpcihp_generic.c               |  28 +-
+ drivers/pci/hotplug/cpcihp_zt5550.c                |  44 +-
+ drivers/pci/hotplug/cpqphp.h                       |   2 +-
+ drivers/pci/hotplug/cpqphp_core.c                  |   3 +-
+ drivers/pci/hotplug/cpqphp_ctrl.c                  |  19 +-
+ drivers/pci/hotplug/cpqphp_nvram.c                 |  13 +-
+ drivers/pci/hotplug/ibmphp_core.c                  |  19 +-
+ drivers/pci/hotplug/ibmphp_ebda.c                  |   3 +-
+ drivers/pci/hotplug/ibmphp_hpc.c                   |   3 +-
+ drivers/pci/hotplug/ibmphp_pci.c                   |   6 +-
+ drivers/pci/hotplug/ibmphp_res.c                   |  45 +-
+ drivers/pci/hotplug/pciehp.h                       |   2 +-
+ drivers/pci/hotplug/pciehp_core.c                  |   7 +
+ drivers/pci/hotplug/pciehp_hpc.c                   |  17 +-
+ drivers/pci/hotplug/pciehp_pci.c                   |   9 +-
+ drivers/pci/hotplug/pcihp_slot.c                   | 176 ----
+ drivers/pci/hotplug/shpchp_ctrl.c                  |  14 +-
+ drivers/pci/hotplug/shpchp_hpc.c                   |   5 +-
+ drivers/pci/hotplug/shpchp_pci.c                   |   8 +-
+ drivers/pci/iov.c                                  |   2 +-
+ drivers/pci/msi.c                                  |  75 +-
+ drivers/pci/pci-acpi.c                             | 276 +++++-
+ drivers/pci/pci-driver.c                           |   5 +-
+ drivers/pci/pci-sysfs.c                            |  41 +-
+ drivers/pci/pci.c                                  |  57 +-
+ drivers/pci/pcie/aer/aerdrv_errprint.c             |  11 +-
+ drivers/pci/pcie/portdrv_pci.c                     |  74 --
+ drivers/pci/probe.c                                | 167 +++-
+ drivers/pci/quirks.c                               | 112 +--
+ drivers/pci/search.c                               |  34 -
+ drivers/pci/setup-bus.c                            |   2 +-
+ drivers/scsi/vmw_pvscsi.h                          |   1 -
+ drivers/vfio/pci/vfio_pci_config.c                 |   2 +-
+ drivers/xen/xen-pciback/pci_stub.c                 |   4 +-
+ include/asm-generic/io.h                           |   2 +-
+ include/asm-generic/pgtable.h                      |   4 +
+ include/linux/aer.h                                |   2 +
+ include/linux/ioport.h                             |   5 +
+ include/linux/msi.h                                |   6 -
+ include/linux/of_address.h                         |  27 +-
+ include/linux/of_pci.h                             |  13 +
+ include/linux/pci.h                                |  60 +-
+ include/linux/pci_hotplug.h                        |   2 -
+ include/linux/pci_ids.h                            |   2 +
+ include/ras/ras_event.h                            |  48 +-
+ include/uapi/linux/pci_regs.h                      |   3 +-
+ kernel/resource.c                                  |  70 ++
+ virt/kvm/assigned-dev.c                            |   2 +-
+ virt/kvm/iommu.c                                   |   4 +-
+ 111 files changed, 4904 insertions(+), 1333 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/pci-keystone.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/xgene-pci.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/xilinx-pcie.txt
+ create mode 100644 arch/arm64/include/asm/pci.h
+ create mode 100644 arch/arm64/kernel/pci.c
+ create mode 100644 drivers/pci/host/pci-keystone-dw.c
+ create mode 100644 drivers/pci/host/pci-keystone.c
+ create mode 100644 drivers/pci/host/pci-keystone.h
+ create mode 100644 drivers/pci/host/pci-xgene.c
+ create mode 100644 drivers/pci/host/pcie-xilinx.c
+ delete mode 100644 drivers/pci/hotplug/pcihp_slot.c
+Merging hid/for-next (3fd9127d236c Merge branch 'for-3.18/uhid' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-hid-driver-gt683r      |  14 +
+ Documentation/hid/uhid.txt                         | 179 +++++-----
+ drivers/hid/Kconfig                                |  11 +
+ drivers/hid/Makefile                               |   1 +
+ drivers/hid/hid-core.c                             |   7 +-
+ drivers/hid/hid-holtek-mouse.c                     |   4 +
+ drivers/hid/hid-ids.h                              |   7 +
+ drivers/hid/hid-input.c                            |   6 +
+ drivers/hid/hid-logitech-dj.c                      |  35 +-
+ drivers/hid/hid-penmount.c                         |  49 +++
+ drivers/hid/hid-picolcd_core.c                     |   4 +-
+ drivers/hid/hid-rmi.c                              |  44 ++-
+ drivers/hid/hid-sony.c                             | 100 +++---
+ drivers/hid/hid-thingm.c                           |   6 +-
+ drivers/hid/uhid.c                                 | 394 ++++++++++++---------
+ drivers/hid/usbhid/hid-core.c                      |  60 ++--
+ drivers/hid/usbhid/hid-quirks.c                    |   3 +
+ drivers/hid/wacom.h                                |   6 +
+ drivers/hid/wacom_sys.c                            | 271 ++++++++++----
+ drivers/hid/wacom_wac.c                            | 312 ++++++++++++++++
+ drivers/hid/wacom_wac.h                            |  17 +
+ include/linux/hid.h                                |   3 +
+ include/uapi/linux/uhid.h                          | 120 +++++--
+ 23 files changed, 1187 insertions(+), 466 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r
+ create mode 100644 drivers/hid/hid-penmount.c
+Merging i2c/i2c/for-next (6c97c9c1acfc i2c: cros-ec-tunnel: Add of match table)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/i2c-cros-ec-tunnel.c      |  9 +++++++++
+ drivers/i2c/busses/i2c-designware-platdrv.c  | 29 ++++++++++++++++++++++++++--
+ drivers/i2c/busses/i2c-imx.c                 |  8 ++++++++
+ drivers/i2c/busses/i2c-ismt.c                |  2 +-
+ drivers/i2c/busses/i2c-rcar.c                | 21 ++++++++++----------
+ drivers/i2c/busses/i2c-rk3x.c                |  4 ++--
+ include/linux/platform_data/i2c-designware.h | 21 ++++++++++++++++++++
+ 7 files changed, 79 insertions(+), 15 deletions(-)
+ create mode 100644 include/linux/platform_data/i2c-designware.h
+Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (7ad8966f4f0a Merge tag 'mfd-hwmon-leds-watchdog-v3.18' into hwmon-next)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/watchdog/Kconfig
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/ntc_thermistor.txt   |   3 +
+ Documentation/hwmon/k10temp                        |   2 +-
+ Documentation/hwmon/menf21bmc                      |  50 +++++
+ MAINTAINERS                                        |   8 +
+ drivers/hwmon/Kconfig                              |  15 +-
+ drivers/hwmon/Makefile                             |   1 +
+ drivers/hwmon/ads1015.c                            |  21 +-
+ drivers/hwmon/da9052-hwmon.c                       |  54 +----
+ drivers/hwmon/da9055-hwmon.c                       |  52 +----
+ drivers/hwmon/k10temp.c                            | 157 +++++++-------
+ drivers/hwmon/menf21bmc_hwmon.c                    | 230 +++++++++++++++++++++
+ drivers/hwmon/ntc_thermistor.c                     |  25 +++
+ drivers/hwmon/smsc47b397.c                         |  51 +----
+ drivers/leds/Kconfig                               |   9 +
+ drivers/leds/Makefile                              |   1 +
+ drivers/leds/leds-menf21bmc.c                      | 131 ++++++++++++
+ drivers/mfd/Kconfig                                |  15 ++
+ drivers/mfd/Makefile                               |   1 +
+ drivers/mfd/menf21bmc.c                            | 132 ++++++++++++
+ drivers/watchdog/Kconfig                           |  10 +
+ drivers/watchdog/Makefile                          |   1 +
+ drivers/watchdog/menf21bmc_wdt.c                   | 203 ++++++++++++++++++
+ 22 files changed, 946 insertions(+), 226 deletions(-)
+ create mode 100644 Documentation/hwmon/menf21bmc
+ create mode 100644 drivers/hwmon/menf21bmc_hwmon.c
+ create mode 100644 drivers/leds/leds-menf21bmc.c
+ create mode 100644 drivers/mfd/menf21bmc.c
+ create mode 100644 drivers/watchdog/menf21bmc_wdt.c
+Merging v4l-dvb/master (6c239d99a592 Merge branch 'topic/si2165' into to_next)
+$ git merge v4l-dvb/master
+Removing drivers/staging/media/as102/as102_fe.c
+Auto-merging drivers/media/usb/as102/as10x_handle.h
+Auto-merging drivers/media/usb/as102/as10x_cmd_stream.c
+Auto-merging drivers/media/usb/as102/as10x_cmd_cfg.c
+Auto-merging drivers/media/usb/as102/as10x_cmd.h
+Auto-merging drivers/media/usb/as102/as10x_cmd.c
+Auto-merging drivers/media/usb/as102/as102_usb_drv.h
+Auto-merging drivers/media/usb/as102/as102_usb_drv.c
+Auto-merging drivers/media/usb/as102/as102_fw.h
+Auto-merging drivers/media/usb/as102/as102_fw.c
+Auto-merging drivers/media/usb/as102/as102_drv.h
+Auto-merging drivers/media/usb/as102/as102_drv.c
+Auto-merging drivers/media/usb/as102/Makefile
+Removing drivers/media/tuners/tuner_it913x_priv.h
+Removing drivers/media/tuners/tuner_it913x.c
+Auto-merging drivers/media/tuners/it913x.h
+Removing drivers/media/platform/vivi.c
+Removing drivers/media/platform/coda.c
+Auto-merging drivers/media/dvb-frontends/as102_fe_types.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/compat.xml         |    6 +
+ Documentation/DocBook/media/v4l/controls.xml       |   55 +
+ .../DocBook/media/v4l/pixfmt-packed-rgb.xml        |   52 +-
+ Documentation/DocBook/media/v4l/vidioc-dqevent.xml |    7 +-
+ Documentation/DocBook/media/v4l/vidioc-g-edid.xml  |   14 +-
+ .../DocBook/media/v4l/vidioc-subscribe-event.xml   |    2 +-
+ .../devicetree/bindings/media/hix5hd2-ir.txt       |   25 +
+ Documentation/dvb/get_dvb_firmware                 |   44 +-
+ Documentation/video4linux/vivid.txt                | 1111 ++++++
+ MAINTAINERS                                        |   28 +-
+ drivers/media/common/b2c2/flexcop.h                |    2 +-
+ drivers/media/common/saa7146/saa7146_fops.c        |    3 -
+ drivers/media/common/siano/sms-cards.c             |    6 +
+ drivers/media/common/siano/sms-cards.h             |    1 +
+ drivers/media/common/siano/smscoreapi.c            |    4 +-
+ drivers/media/dvb-core/dmxdev.c                    |    7 +-
+ drivers/media/dvb-core/dvb-usb-ids.h               |    2 +
+ drivers/media/dvb-core/dvb_frontend.c              |   45 +-
+ drivers/media/dvb-core/dvb_frontend.h              |    2 +
+ drivers/media/dvb-core/dvb_ringbuffer.c            |   26 +
+ drivers/media/dvb-core/dvb_ringbuffer.h            |    2 +
+ drivers/media/dvb-frontends/Kconfig                |   21 +
+ drivers/media/dvb-frontends/Makefile               |    4 +-
+ drivers/media/dvb-frontends/af9013.c               |   24 +-
+ drivers/media/dvb-frontends/af9033.c               |  757 ++--
+ drivers/media/dvb-frontends/af9033.h               |   58 +-
+ drivers/media/dvb-frontends/af9033_priv.h          |    1 +
+ drivers/media/dvb-frontends/as102_fe.c             |  480 +++
+ drivers/media/dvb-frontends/as102_fe.h             |   29 +
+ .../dvb-frontends/as102_fe_types.h}                |    6 -
+ drivers/media/dvb-frontends/bcm3510.c              |    6 +-
+ drivers/media/dvb-frontends/cxd2820r_c.c           |    4 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c        |    4 +-
+ drivers/media/dvb-frontends/cxd2820r_t.c           |    4 +-
+ drivers/media/dvb-frontends/dib7000p.c             |    2 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c        |   38 +-
+ drivers/media/dvb-frontends/drxd_hard.c            |    9 +-
+ drivers/media/dvb-frontends/drxk_hard.c            |   37 +-
+ drivers/media/dvb-frontends/m88ds3103.c            |  101 +-
+ drivers/media/dvb-frontends/m88ds3103.h            |   35 +-
+ drivers/media/dvb-frontends/mb86a16.c              |    6 +-
+ drivers/media/dvb-frontends/mb86a20s.c             |   14 +-
+ drivers/media/dvb-frontends/mt312.c                |    2 +-
+ drivers/media/dvb-frontends/or51211.c              |    2 +-
+ drivers/media/dvb-frontends/rtl2832.c              |    2 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c          |  118 +-
+ drivers/media/dvb-frontends/si2165.c               |  168 +-
+ drivers/media/dvb-frontends/si2165_priv.h          |    2 +-
+ drivers/media/dvb-frontends/si2168.c               |  131 +-
+ drivers/media/dvb-frontends/si2168.h               |    6 +
+ drivers/media/dvb-frontends/si2168_priv.h          |    2 +
+ drivers/media/dvb-frontends/si21xx.c               |    3 +
+ drivers/media/dvb-frontends/sp2.c                  |  441 +++
+ drivers/media/dvb-frontends/sp2.h                  |   53 +
+ drivers/media/dvb-frontends/sp2_priv.h             |   50 +
+ drivers/media/dvb-frontends/sp8870.c               |    3 +-
+ drivers/media/dvb-frontends/stv0367.c              |   12 +-
+ drivers/media/dvb-frontends/stv0900_core.c         |    7 +-
+ drivers/media/dvb-frontends/stv0900_sw.c           |    3 +-
+ drivers/media/dvb-frontends/tc90522.c              |  840 +++++
+ drivers/media/dvb-frontends/tc90522.h              |   42 +
+ drivers/media/dvb-frontends/tda10071.c             |    2 +-
+ drivers/media/dvb-frontends/zl10039.c              |    2 +-
+ drivers/media/firewire/firedtv-avc.c               |   10 +
+ drivers/media/i2c/adv7343_regs.h                   |    2 +-
+ drivers/media/i2c/adv7604.c                        |    2 +-
+ drivers/media/i2c/adv7842.c                        |    4 +-
+ drivers/media/i2c/cx25840/cx25840-ir.c             |    2 +-
+ drivers/media/i2c/lm3560.c                         |    4 +-
+ drivers/media/i2c/ov7670.c                         |   14 +-
+ drivers/media/i2c/s5k5baf.c                        |    2 +-
+ drivers/media/i2c/saa6752hs.c                      |    6 +-
+ drivers/media/i2c/smiapp/smiapp-core.c             |  143 +-
+ drivers/media/i2c/smiapp/smiapp.h                  |    4 +
+ drivers/media/i2c/soc_camera/mt9t112.c             |    4 +-
+ drivers/media/i2c/soc_camera/ov772x.c              |    5 +-
+ drivers/media/i2c/soc_camera/ov9740.c              |    4 +-
+ drivers/media/i2c/tda7432.c                        |    2 +-
+ drivers/media/i2c/tvp7002.c                        |   21 +-
+ drivers/media/i2c/vs6624.c                         |   14 +-
+ drivers/media/media-device.c                       |    6 +-
+ drivers/media/media-devnode.c                      |    3 +-
+ drivers/media/parport/pms.c                        |    7 +-
+ drivers/media/pci/Kconfig                          |    2 +
+ drivers/media/pci/Makefile                         |    3 +-
+ drivers/media/pci/bt8xx/bttv-driver.c              |    5 +-
+ drivers/media/pci/bt8xx/dst_ca.c                   |    4 +-
+ drivers/media/pci/cx18/cx18-alsa-pcm.c             |    2 +-
+ drivers/media/pci/cx18/cx18-firmware.c             |    6 +-
+ drivers/media/pci/cx18/cx18-queue.c                |    2 +-
+ drivers/media/pci/cx23885/Kconfig                  |    9 +-
+ drivers/media/pci/cx23885/Makefile                 |    1 -
+ drivers/media/pci/cx23885/altera-ci.c              |    8 +-
+ drivers/media/pci/cx23885/altera-ci.h              |    4 -
+ drivers/media/pci/cx23885/cimax2.c                 |    4 -
+ drivers/media/pci/cx23885/cimax2.h                 |    4 -
+ drivers/media/pci/cx23885/cx23885-417.c            |  503 +--
+ drivers/media/pci/cx23885/cx23885-alsa.c           |  109 +-
+ drivers/media/pci/cx23885/cx23885-av.c             |    5 -
+ drivers/media/pci/cx23885/cx23885-av.h             |    5 -
+ drivers/media/pci/cx23885/cx23885-cards.c          |   32 +-
+ drivers/media/pci/cx23885/cx23885-core.c           |  362 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c            |  323 +-
+ drivers/media/pci/cx23885/cx23885-f300.c           |    4 -
+ drivers/media/pci/cx23885/cx23885-i2c.c            |   12 -
+ drivers/media/pci/cx23885/cx23885-input.c          |    5 -
+ drivers/media/pci/cx23885/cx23885-input.h          |    5 -
+ drivers/media/pci/cx23885/cx23885-ioctl.c          |   10 +-
+ drivers/media/pci/cx23885/cx23885-ioctl.h          |    4 -
+ drivers/media/pci/cx23885/cx23885-ir.c             |    5 -
+ drivers/media/pci/cx23885/cx23885-ir.h             |    5 -
+ drivers/media/pci/cx23885/cx23885-reg.h            |    4 -
+ drivers/media/pci/cx23885/cx23885-vbi.c            |  284 +-
+ drivers/media/pci/cx23885/cx23885-video.c          | 1294 ++-----
+ drivers/media/pci/cx23885/cx23885-video.h          |    5 -
+ drivers/media/pci/cx23885/cx23885.h                |  136 +-
+ drivers/media/pci/cx23885/cx23888-ir.c             |    7 +-
+ drivers/media/pci/cx23885/cx23888-ir.h             |    5 -
+ drivers/media/pci/cx23885/netup-eeprom.c           |    4 -
+ drivers/media/pci/cx23885/netup-eeprom.h           |    4 -
+ drivers/media/pci/cx23885/netup-init.c             |    4 -
+ drivers/media/pci/cx23885/netup-init.h             |    4 -
+ drivers/media/pci/cx25821/cx25821-video-upstream.c |    5 +-
+ drivers/media/pci/cx88/cx88-cards.c                |  632 ++--
+ drivers/media/pci/cx88/cx88-video.c                |    3 -
+ drivers/media/pci/ddbridge/ddbridge-core.c         |   30 +-
+ drivers/media/pci/ddbridge/ddbridge.h              |   12 +-
+ drivers/media/pci/dm1105/dm1105.c                  |    2 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c             |    2 +-
+ drivers/media/pci/ivtv/ivtv-firmware.c             |    4 +-
+ drivers/media/pci/ivtv/ivtv-irq.c                  |   12 +-
+ drivers/media/pci/mantis/hopper_vp3028.c           |    2 +-
+ drivers/media/pci/mantis/mantis_common.h           |    2 +-
+ drivers/media/pci/mantis/mantis_vp1033.c           |    4 +-
+ drivers/media/pci/mantis/mantis_vp1034.c           |    2 +-
+ drivers/media/pci/mantis/mantis_vp1041.c           |    4 +-
+ drivers/media/pci/mantis/mantis_vp2033.c           |    4 +-
+ drivers/media/pci/mantis/mantis_vp2040.c           |    4 +-
+ drivers/media/pci/mantis/mantis_vp3030.c           |    4 +-
+ drivers/media/pci/ngene/ngene-cards.c              |    2 +-
+ drivers/media/pci/ngene/ngene-core.c               |   14 +-
+ drivers/media/pci/ngene/ngene-dvb.c                |    7 +-
+ drivers/media/pci/ngene/ngene.h                    |    2 +-
+ drivers/media/pci/pt3/Kconfig                      |   10 +
+ drivers/media/pci/pt3/Makefile                     |    8 +
+ drivers/media/pci/pt3/pt3.c                        |  876 +++++
+ drivers/media/pci/pt3/pt3.h                        |  186 +
+ drivers/media/pci/pt3/pt3_dma.c                    |  225 ++
+ drivers/media/pci/pt3/pt3_i2c.c                    |  240 ++
+ drivers/media/pci/saa7134/Kconfig                  |    8 +
+ drivers/media/pci/saa7134/Makefile                 |    2 +
+ drivers/media/pci/saa7134/saa7134-cards.c          |   29 +
+ drivers/media/pci/saa7134/saa7134-core.c           |   10 +-
+ drivers/media/pci/saa7134/saa7134-go7007.c         |  531 +++
+ drivers/media/pci/saa7134/saa7134-vbi.c            |    2 +-
+ drivers/media/pci/saa7134/saa7134-video.c          |    2 +-
+ drivers/media/pci/saa7134/saa7134.h                |    5 +
+ drivers/media/pci/saa7164/saa7164-api.c            |    3 +-
+ drivers/media/pci/saa7164/saa7164-core.c           |    6 +-
+ drivers/media/pci/solo6x10/Kconfig                 |    1 +
+ drivers/media/pci/solo6x10/solo6x10-disp.c         |    4 +-
+ drivers/media/pci/solo6x10/solo6x10-eeprom.c       |    8 +-
+ drivers/media/pci/solo6x10/solo6x10.h              |    4 +-
+ drivers/media/pci/sta2x11/Kconfig                  |    1 +
+ drivers/media/pci/sta2x11/sta2x11_vip.c            |    2 +-
+ drivers/media/pci/ttpci/Kconfig                    |    4 +
+ drivers/media/pci/ttpci/Makefile                   |    2 +-
+ drivers/media/pci/ttpci/av7110.c                   |    8 +-
+ drivers/media/pci/tw68/Kconfig                     |   10 +
+ drivers/media/pci/tw68/Makefile                    |    3 +
+ drivers/media/pci/tw68/tw68-core.c                 |  434 +++
+ drivers/media/pci/tw68/tw68-reg.h                  |  195 +
+ drivers/media/pci/tw68/tw68-risc.c                 |  230 ++
+ drivers/media/pci/tw68/tw68-video.c                | 1051 ++++++
+ drivers/media/pci/tw68/tw68.h                      |  231 ++
+ drivers/media/pci/zoran/zoran_device.c             |    2 +-
+ drivers/media/platform/Kconfig                     |   54 +-
+ drivers/media/platform/Makefile                    |    8 +-
+ drivers/media/platform/blackfin/Kconfig            |    1 +
+ drivers/media/platform/coda.c                      | 3933 --------------------
+ drivers/media/platform/coda/Makefile               |    3 +
+ drivers/media/platform/coda/coda-bit.c             | 1861 +++++++++
+ drivers/media/platform/coda/coda-common.c          | 2052 ++++++++++
+ drivers/media/platform/coda/coda-h264.c            |   37 +
+ drivers/media/platform/coda/coda.h                 |  287 ++
+ .../media/platform/{coda.h => coda/coda_regs.h}    |    0
+ drivers/media/platform/davinci/Kconfig             |   18 +-
+ drivers/media/platform/davinci/dm355_ccdc.c        |    2 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c       |   14 +-
+ drivers/media/platform/davinci/vpfe_capture.c      |   16 +-
+ drivers/media/platform/davinci/vpif.c              |    1 +
+ drivers/media/platform/davinci/vpif_capture.c      |   13 +-
+ drivers/media/platform/davinci/vpif_display.c      |   22 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c       |    6 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c        |    3 -
+ drivers/media/platform/exynos-gsc/gsc-regs.c       |    8 +-
+ drivers/media/platform/exynos4-is/Kconfig          |    5 +-
+ drivers/media/platform/exynos4-is/fimc-is-errno.c  |    4 +-
+ drivers/media/platform/exynos4-is/fimc-is-errno.h  |    4 +-
+ drivers/media/platform/exynos4-is/fimc-is-param.c  |    2 -
+ drivers/media/platform/exynos4-is/fimc-is.c        |   10 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c |    9 +-
+ drivers/media/platform/exynos4-is/media-dev.c      |    4 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c      |    3 +-
+ drivers/media/platform/marvell-ccic/Kconfig        |    2 +
+ drivers/media/platform/marvell-ccic/mcam-core.c    |    2 +-
+ drivers/media/platform/mx2_emmaprp.c               |    2 +-
+ drivers/media/platform/omap/Kconfig                |    2 +-
+ drivers/media/platform/omap/omap_vout.c            |   16 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c       |   10 +-
+ drivers/media/platform/omap/omap_vout_vrfb.h       |   18 +-
+ drivers/media/platform/omap3isp/cfa_coef_table.h   |   10 -
+ drivers/media/platform/omap3isp/gamma_table.h      |   10 -
+ drivers/media/platform/omap3isp/isp.c              |   20 +-
+ drivers/media/platform/omap3isp/isp.h              |   10 -
+ drivers/media/platform/omap3isp/ispccdc.c          |  424 ++-
+ drivers/media/platform/omap3isp/ispccdc.h          |   21 +-
+ drivers/media/platform/omap3isp/ispccp2.c          |   10 -
+ drivers/media/platform/omap3isp/ispccp2.h          |   10 -
+ drivers/media/platform/omap3isp/ispcsi2.c          |   10 -
+ drivers/media/platform/omap3isp/ispcsi2.h          |   10 -
+ drivers/media/platform/omap3isp/ispcsiphy.c        |   10 -
+ drivers/media/platform/omap3isp/ispcsiphy.h        |   10 -
+ drivers/media/platform/omap3isp/isph3a.h           |   10 -
+ drivers/media/platform/omap3isp/isph3a_aewb.c      |   10 -
+ drivers/media/platform/omap3isp/isph3a_af.c        |   10 -
+ drivers/media/platform/omap3isp/isphist.c          |   10 -
+ drivers/media/platform/omap3isp/isphist.h          |   10 -
+ drivers/media/platform/omap3isp/isppreview.c       |   10 -
+ drivers/media/platform/omap3isp/isppreview.h       |   10 -
+ drivers/media/platform/omap3isp/ispreg.h           |   20 +-
+ drivers/media/platform/omap3isp/ispresizer.c       |   80 +-
+ drivers/media/platform/omap3isp/ispresizer.h       |   13 +-
+ drivers/media/platform/omap3isp/ispstat.c          |   10 -
+ drivers/media/platform/omap3isp/ispstat.h          |   10 -
+ drivers/media/platform/omap3isp/ispvideo.c         |   59 +-
+ drivers/media/platform/omap3isp/ispvideo.h         |   12 +-
+ .../media/platform/omap3isp/luma_enhance_table.h   |   10 -
+ .../media/platform/omap3isp/noise_filter_table.h   |   10 -
+ drivers/media/platform/s3c-camif/camif-capture.c   |    4 +-
+ drivers/media/platform/s3c-camif/camif-regs.c      |    4 +-
+ drivers/media/platform/s5p-g2d/g2d.c               |    7 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c        |    2 +-
+ .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c   |    2 +
+ drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c  |   11 +-
+ drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c      |    6 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c           |   83 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c    |    1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c    |    1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |    6 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c      |   27 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_debug.h     |    6 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |   54 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   67 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c       |    4 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h       |  488 +--
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    |   31 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |  491 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c        |    2 +-
+ drivers/media/platform/s5p-tv/Kconfig              |    4 +-
+ drivers/media/platform/s5p-tv/hdmi_drv.c           |    2 +-
+ drivers/media/platform/s5p-tv/sdo_drv.c            |    2 +-
+ drivers/media/platform/s5p-tv/sii9234_drv.c        |    2 +-
+ drivers/media/platform/sh_veu.c                    |    4 +-
+ drivers/media/platform/soc_camera/Kconfig          |   16 +-
+ drivers/media/platform/soc_camera/atmel-isi.c      |   13 +-
+ drivers/media/platform/soc_camera/mx2_camera.c     |    5 +-
+ drivers/media/platform/soc_camera/pxa_camera.c     |    2 +-
+ drivers/media/platform/soc_camera/rcar_vin.c       |    4 +-
+ drivers/media/platform/soc_camera/soc_camera.c     |   21 +-
+ drivers/media/platform/ti-vpe/vpdma.c              |    4 +-
+ drivers/media/platform/ti-vpe/vpe.c                |   20 +-
+ drivers/media/platform/via-camera.c                |   13 +-
+ drivers/media/platform/vivi.c                      | 1542 --------
+ drivers/media/platform/vivid/Kconfig               |   19 +
+ drivers/media/platform/vivid/Makefile              |    6 +
+ drivers/media/platform/vivid/vivid-core.c          | 1390 +++++++
+ drivers/media/platform/vivid/vivid-core.h          |  520 +++
+ drivers/media/platform/vivid/vivid-ctrls.c         | 1502 ++++++++
+ drivers/media/platform/vivid/vivid-ctrls.h         |   34 +
+ drivers/media/platform/vivid/vivid-kthread-cap.c   |  886 +++++
+ drivers/media/platform/vivid/vivid-kthread-cap.h   |   26 +
+ drivers/media/platform/vivid/vivid-kthread-out.c   |  305 ++
+ drivers/media/platform/vivid/vivid-kthread-out.h   |   26 +
+ drivers/media/platform/vivid/vivid-osd.c           |  400 ++
+ drivers/media/platform/vivid/vivid-osd.h           |   27 +
+ drivers/media/platform/vivid/vivid-radio-common.c  |  189 +
+ drivers/media/platform/vivid/vivid-radio-common.h  |   40 +
+ drivers/media/platform/vivid/vivid-radio-rx.c      |  287 ++
+ drivers/media/platform/vivid/vivid-radio-rx.h      |   31 +
+ drivers/media/platform/vivid/vivid-radio-tx.c      |  141 +
+ drivers/media/platform/vivid/vivid-radio-tx.h      |   29 +
+ drivers/media/platform/vivid/vivid-rds-gen.c       |  166 +
+ drivers/media/platform/vivid/vivid-rds-gen.h       |   53 +
+ drivers/media/platform/vivid/vivid-sdr-cap.c       |  499 +++
+ drivers/media/platform/vivid/vivid-sdr-cap.h       |   34 +
+ drivers/media/platform/vivid/vivid-tpg-colors.c    |  310 ++
+ drivers/media/platform/vivid/vivid-tpg-colors.h    |   64 +
+ drivers/media/platform/vivid/vivid-tpg.c           | 1439 +++++++
+ drivers/media/platform/vivid/vivid-tpg.h           |  439 +++
+ drivers/media/platform/vivid/vivid-vbi-cap.c       |  371 ++
+ drivers/media/platform/vivid/vivid-vbi-cap.h       |   40 +
+ drivers/media/platform/vivid/vivid-vbi-gen.c       |  323 ++
+ drivers/media/platform/vivid/vivid-vbi-gen.h       |   33 +
+ drivers/media/platform/vivid/vivid-vbi-out.c       |  248 ++
+ drivers/media/platform/vivid/vivid-vbi-out.h       |   34 +
+ drivers/media/platform/vivid/vivid-vid-cap.c       | 1730 +++++++++
+ drivers/media/platform/vivid/vivid-vid-cap.h       |   71 +
+ drivers/media/platform/vivid/vivid-vid-common.c    |  571 +++
+ drivers/media/platform/vivid/vivid-vid-common.h    |   61 +
+ drivers/media/platform/vivid/vivid-vid-out.c       | 1146 ++++++
+ drivers/media/platform/vivid/vivid-vid-out.h       |   56 +
+ drivers/media/radio/radio-gemtek.c                 |    2 +-
+ drivers/media/radio/radio-sf16fmi.c                |    6 +-
+ drivers/media/radio/radio-sf16fmr2.c               |    4 +-
+ drivers/media/radio/radio-tea5764.c                |   12 +-
+ drivers/media/radio/si470x/radio-si470x-common.c   |    4 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c      |    4 +-
+ drivers/media/radio/wl128x/fmdrv_common.c          |   11 +-
+ drivers/media/radio/wl128x/fmdrv_rx.c              |   10 +-
+ drivers/media/radio/wl128x/fmdrv_tx.c              |    2 +-
+ drivers/media/rc/Kconfig                           |   15 +-
+ drivers/media/rc/Makefile                          |    1 +
+ drivers/media/rc/ene_ir.c                          |    2 +-
+ drivers/media/rc/fintek-cir.c                      |    6 +-
+ drivers/media/rc/img-ir/img-ir-hw.c                |    6 -
+ drivers/media/rc/img-ir/img-ir-hw.h                |    6 +
+ drivers/media/rc/imon.c                            |  304 +-
+ drivers/media/rc/ir-hix5hd2.c                      |  348 ++
+ drivers/media/rc/ite-cir.c                         |    3 +-
+ drivers/media/rc/keymaps/Makefile                  |    1 +
+ drivers/media/rc/keymaps/rc-dvbsky.c               |   78 +
+ drivers/media/rc/lirc_dev.c                        |   14 +-
+ drivers/media/rc/mceusb.c                          |   15 +-
+ drivers/media/rc/nuvoton-cir.c                     |    6 +-
+ drivers/media/rc/st_rc.c                           |   16 +-
+ drivers/media/rc/streamzap.c                       |    6 +-
+ drivers/media/tuners/Kconfig                       |   17 +
+ drivers/media/tuners/Makefile                      |    4 +-
+ drivers/media/tuners/e4000.c                       |   75 +-
+ drivers/media/tuners/it913x.c                      |  478 +++
+ drivers/media/tuners/{tuner_it913x.h => it913x.h}  |   41 +-
+ drivers/media/tuners/m88ts2022.c                   |  355 +-
+ drivers/media/tuners/m88ts2022_priv.h              |    5 +-
+ drivers/media/tuners/msi001.c                      |   56 +-
+ drivers/media/tuners/mt2060.c                      |    3 +-
+ drivers/media/tuners/mt2063.c                      |   26 +-
+ drivers/media/tuners/mxl301rf.c                    |  349 ++
+ drivers/media/tuners/mxl301rf.h                    |   26 +
+ drivers/media/tuners/mxl5005s.c                    |    3 +-
+ drivers/media/tuners/qm1d1c0042.c                  |  448 +++
+ drivers/media/tuners/qm1d1c0042.h                  |   37 +
+ drivers/media/tuners/si2157.c                      |   86 +-
+ drivers/media/tuners/si2157.h                      |    2 +-
+ drivers/media/tuners/si2157_priv.h                 |    3 +-
+ drivers/media/tuners/tda18212.c                    |  272 +-
+ drivers/media/tuners/tda18212.h                    |   19 +-
+ drivers/media/tuners/tda18271-common.c             |   19 +-
+ drivers/media/tuners/tda18271-priv.h               |    4 +-
+ drivers/media/tuners/tuner-xc2028.c                |   62 +-
+ drivers/media/tuners/tuner_it913x.c                |  453 ---
+ drivers/media/tuners/tuner_it913x_priv.h           |   78 -
+ drivers/media/tuners/xc4000.c                      |   62 +-
+ drivers/media/tuners/xc5000.c                      |  242 +-
+ drivers/media/usb/Kconfig                          |    4 +-
+ drivers/media/usb/Makefile                         |    4 +-
+ drivers/media/usb/airspy/airspy.c                  |  222 +-
+ drivers/{staging/media => media/usb}/as102/Kconfig |    0
+ .../{staging/media => media/usb}/as102/Makefile    |    3 +-
+ .../{staging/media => media/usb}/as102/as102_drv.c |  152 +-
+ .../{staging/media => media/usb}/as102/as102_drv.h |   26 +-
+ .../{staging/media => media/usb}/as102/as102_fw.c  |    4 -
+ .../{staging/media => media/usb}/as102/as102_fw.h  |    4 -
+ .../media => media/usb}/as102/as102_usb_drv.c      |   53 +-
+ .../media => media/usb}/as102/as102_usb_drv.h      |    4 -
+ .../{staging/media => media/usb}/as102/as10x_cmd.c |   23 +-
+ .../{staging/media => media/usb}/as102/as10x_cmd.h |  108 +-
+ .../media => media/usb}/as102/as10x_cmd_cfg.c      |    9 +-
+ .../media => media/usb}/as102/as10x_cmd_stream.c   |    4 -
+ .../media => media/usb}/as102/as10x_handle.h       |    7 +-
+ drivers/media/usb/au0828/au0828-cards.c            |   36 +-
+ drivers/media/usb/au0828/au0828-core.c             |   84 +-
+ drivers/media/usb/au0828/au0828-dvb.c              |  110 +-
+ drivers/media/usb/au0828/au0828-i2c.c              |   15 +-
+ drivers/media/usb/au0828/au0828-input.c            |   36 +-
+ drivers/media/usb/au0828/au0828-vbi.c              |    4 +-
+ drivers/media/usb/au0828/au0828-video.c            |   90 +-
+ drivers/media/usb/au0828/au0828.h                  |   34 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c         |   14 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c          |   10 +-
+ drivers/media/usb/cx231xx/cx231xx-core.c           |    2 +-
+ drivers/media/usb/cx231xx/cx231xx-dvb.c            |    8 +-
+ drivers/media/usb/dvb-usb-v2/Kconfig               |    7 +
+ drivers/media/usb/dvb-usb-v2/Makefile              |    3 +
+ drivers/media/usb/dvb-usb-v2/af9015.c              |    2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c              |  644 +++-
+ drivers/media/usb/dvb-usb-v2/af9035.h              |   12 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c              |  185 +-
+ drivers/media/usb/dvb-usb-v2/anysee.h              |    3 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    3 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        |   28 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c         |    2 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c              |  460 +++
+ drivers/media/usb/dvb-usb-v2/lmedm04.c             |    2 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c            |    8 +-
+ drivers/media/usb/dvb-usb/Kconfig                  |    2 +-
+ drivers/media/usb/dvb-usb/af9005.c                 |    2 +-
+ drivers/media/usb/dvb-usb/cxusb.c                  |  130 +-
+ drivers/media/usb/dvb-usb/cxusb.h                  |    4 +
+ drivers/media/usb/dvb-usb/dib0700_devices.c        |  383 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c          |   12 +-
+ drivers/media/usb/dvb-usb/dw2102.c                 |   14 +-
+ drivers/media/usb/dvb-usb/opera1.c                 |    4 +-
+ drivers/media/usb/dvb-usb/pctv452e.c               |    8 +-
+ drivers/media/usb/em28xx/em28xx-audio.c            |   10 +-
+ drivers/media/usb/em28xx/em28xx-cards.c            |   43 +-
+ drivers/media/usb/em28xx/em28xx-core.c             |   47 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c              |   37 +-
+ drivers/media/usb/em28xx/em28xx-input.c            |   29 +-
+ drivers/media/usb/em28xx/em28xx-vbi.c              |   11 -
+ drivers/media/usb/em28xx/em28xx-video.c            |   29 +-
+ drivers/media/usb/em28xx/em28xx.h                  |   19 +-
+ drivers/media/usb/go7007/go7007-usb.c              |    4 +-
+ drivers/media/usb/gspca/gspca.c                    |    5 +-
+ drivers/media/usb/gspca/gspca.h                    |    2 +-
+ drivers/media/usb/gspca/kinect.c                   |   12 +-
+ drivers/media/usb/gspca/sn9c20x.c                  |   12 +-
+ drivers/media/usb/hackrf/Kconfig                   |   10 +
+ drivers/media/usb/hackrf/Makefile                  |    1 +
+ drivers/media/usb/hackrf/hackrf.c                  | 1142 ++++++
+ drivers/media/usb/hdpvr/hdpvr-control.c            |   21 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c               |   27 +-
+ drivers/media/usb/msi2500/msi2500.c                |  174 +-
+ drivers/media/usb/pwc/pwc-v4l.c                    |    2 +-
+ drivers/media/usb/s2255/s2255drv.c                 |    2 +-
+ drivers/media/usb/siano/smsusb.c                   |    6 +-
+ drivers/media/usb/ttusb-dec/ttusbdecfe.c           |    3 +
+ drivers/media/usb/usbtv/Kconfig                    |    3 +-
+ drivers/media/usb/usbtv/Makefile                   |    3 +-
+ drivers/media/usb/usbtv/usbtv-audio.c              |  385 ++
+ drivers/media/usb/usbtv/usbtv-core.c               |   17 +-
+ drivers/media/usb/usbtv/usbtv-video.c              |   18 +-
+ drivers/media/usb/usbtv/usbtv.h                    |   21 +-
+ drivers/media/usb/uvc/uvc_ctrl.c                   |   60 +-
+ drivers/media/usb/uvc/uvc_driver.c                 |   20 +-
+ drivers/media/usb/uvc/uvc_v4l2.c                   |    1 +
+ drivers/media/usb/uvc/uvc_video.c                  |   10 +-
+ drivers/media/usb/uvc/uvcvideo.h                   |    5 +-
+ drivers/media/v4l2-core/tuner-core.c               |   10 +-
+ drivers/media/v4l2-core/v4l2-common.c              |    9 +-
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |   30 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c               |    6 +
+ drivers/media/v4l2-core/v4l2-dv-timings.c          |    3 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c               |    6 +-
+ drivers/media/v4l2-core/v4l2-subdev.c              |    9 +
+ drivers/media/v4l2-core/videobuf-core.c            |   11 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c          |    6 +-
+ drivers/media/v4l2-core/videobuf2-core.c           |   66 +-
+ drivers/staging/media/Kconfig                      |    2 -
+ drivers/staging/media/Makefile                     |    1 -
+ drivers/staging/media/as102/as102_fe.c             |  571 ---
+ drivers/staging/media/davinci_vpfe/Kconfig         |    1 +
+ drivers/staging/media/dt3155v4l/Kconfig            |    1 +
+ drivers/staging/media/lirc/lirc_imon.c             |    1 +
+ drivers/staging/media/lirc/lirc_sasem.c            |    1 +
+ drivers/staging/media/omap4iss/Kconfig             |    1 +
+ include/media/davinci/dm644x_ccdc.h                |    2 +-
+ include/media/omap3isp.h                           |    3 +
+ include/media/rc-map.h                             |    1 +
+ include/media/videobuf2-core.h                     |   15 +-
+ include/uapi/linux/Kbuild                          |    1 +
+ include/uapi/linux/smiapp.h                        |   29 +
+ include/uapi/linux/v4l2-controls.h                 |    6 +
+ include/uapi/linux/v4l2-dv-timings.h               |    9 -
+ include/uapi/linux/videodev2.h                     |   13 +-
+ 475 files changed, 36282 insertions(+), 13110 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
+ create mode 100644 Documentation/video4linux/vivid.txt
+ create mode 100644 drivers/media/dvb-frontends/as102_fe.c
+ create mode 100644 drivers/media/dvb-frontends/as102_fe.h
+ rename drivers/{staging/media/as102/as10x_types.h => media/dvb-frontends/as102_fe_types.h} (95%)
+ create mode 100644 drivers/media/dvb-frontends/sp2.c
+ create mode 100644 drivers/media/dvb-frontends/sp2.h
+ create mode 100644 drivers/media/dvb-frontends/sp2_priv.h
+ create mode 100644 drivers/media/dvb-frontends/tc90522.c
+ create mode 100644 drivers/media/dvb-frontends/tc90522.h
+ create mode 100644 drivers/media/pci/pt3/Kconfig
+ create mode 100644 drivers/media/pci/pt3/Makefile
+ create mode 100644 drivers/media/pci/pt3/pt3.c
+ create mode 100644 drivers/media/pci/pt3/pt3.h
+ create mode 100644 drivers/media/pci/pt3/pt3_dma.c
+ create mode 100644 drivers/media/pci/pt3/pt3_i2c.c
+ create mode 100644 drivers/media/pci/saa7134/saa7134-go7007.c
+ create mode 100644 drivers/media/pci/tw68/Kconfig
+ create mode 100644 drivers/media/pci/tw68/Makefile
+ create mode 100644 drivers/media/pci/tw68/tw68-core.c
+ create mode 100644 drivers/media/pci/tw68/tw68-reg.h
+ create mode 100644 drivers/media/pci/tw68/tw68-risc.c
+ create mode 100644 drivers/media/pci/tw68/tw68-video.c
+ create mode 100644 drivers/media/pci/tw68/tw68.h
+ delete mode 100644 drivers/media/platform/coda.c
+ create mode 100644 drivers/media/platform/coda/Makefile
+ create mode 100644 drivers/media/platform/coda/coda-bit.c
+ create mode 100644 drivers/media/platform/coda/coda-common.c
+ create mode 100644 drivers/media/platform/coda/coda-h264.c
+ create mode 100644 drivers/media/platform/coda/coda.h
+ rename drivers/media/platform/{coda.h => coda/coda_regs.h} (100%)
+ delete mode 100644 drivers/media/platform/vivi.c
+ create mode 100644 drivers/media/platform/vivid/Kconfig
+ create mode 100644 drivers/media/platform/vivid/Makefile
+ create mode 100644 drivers/media/platform/vivid/vivid-core.c
+ create mode 100644 drivers/media/platform/vivid/vivid-core.h
+ create mode 100644 drivers/media/platform/vivid/vivid-ctrls.c
+ create mode 100644 drivers/media/platform/vivid/vivid-ctrls.h
+ create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.c
+ create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.h
+ create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.c
+ create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.h
+ create mode 100644 drivers/media/platform/vivid/vivid-osd.c
+ create mode 100644 drivers/media/platform/vivid/vivid-osd.h
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-common.c
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-common.h
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.c
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.h
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.c
+ create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.h
+ create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.c
+ create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.h
+ create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.c
+ create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.h
+ create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.c
+ create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.h
+ create mode 100644 drivers/media/platform/vivid/vivid-tpg.c
+ create mode 100644 drivers/media/platform/vivid/vivid-tpg.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-common.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-common.h
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-out.c
+ create mode 100644 drivers/media/platform/vivid/vivid-vid-out.h
+ create mode 100644 drivers/media/rc/ir-hix5hd2.c
+ create mode 100644 drivers/media/rc/keymaps/rc-dvbsky.c
+ create mode 100644 drivers/media/tuners/it913x.c
+ rename drivers/media/tuners/{tuner_it913x.h => it913x.h} (67%)
+ create mode 100644 drivers/media/tuners/mxl301rf.c
+ create mode 100644 drivers/media/tuners/mxl301rf.h
+ create mode 100644 drivers/media/tuners/qm1d1c0042.c
+ create mode 100644 drivers/media/tuners/qm1d1c0042.h
+ delete mode 100644 drivers/media/tuners/tuner_it913x.c
+ delete mode 100644 drivers/media/tuners/tuner_it913x_priv.h
+ rename drivers/{staging/media => media/usb}/as102/Kconfig (100%)
+ rename drivers/{staging/media => media/usb}/as102/Makefile (65%)
+ rename drivers/{staging/media => media/usb}/as102/as102_drv.c (66%)
+ rename drivers/{staging/media => media/usb}/as102/as102_drv.h (75%)
+ rename drivers/{staging/media => media/usb}/as102/as102_fw.c (96%)
+ rename drivers/{staging/media => media/usb}/as102/as102_fw.h (83%)
+ rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.c (90%)
+ rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.h (90%)
+ rename drivers/{staging/media => media/usb}/as102/as10x_cmd.c (92%)
+ rename drivers/{staging/media => media/usb}/as102/as10x_cmd.h (89%)
+ rename drivers/{staging/media => media/usb}/as102/as10x_cmd_cfg.c (93%)
+ rename drivers/{staging/media => media/usb}/as102/as10x_cmd_stream.c (96%)
+ rename drivers/{staging/media => media/usb}/as102/as10x_handle.h (88%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvbsky.c
+ create mode 100644 drivers/media/usb/hackrf/Kconfig
+ create mode 100644 drivers/media/usb/hackrf/Makefile
+ create mode 100644 drivers/media/usb/hackrf/hackrf.c
+ create mode 100644 drivers/media/usb/usbtv/usbtv-audio.c
+ delete mode 100644 drivers/staging/media/as102/as102_fe.c
+ create mode 100644 include/uapi/linux/smiapp.h
+Merging kbuild/for-next (758cd932b2d5 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Resolved 'scripts/tags.sh' using previous resolution.
+Auto-merging scripts/tags.sh
+CONFLICT (content): Merge conflict in scripts/tags.sh
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/gcov/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4edb3e4cdfed] Merge remote-tracking branch 'kbuild/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kbuild/makefiles.txt          |  94 ++++++---------
+ Documentation/lto-build                     | 173 ++++++++++++++++++++++++++
+ Makefile                                    | 101 +++++++++-------
+ arch/x86/Kconfig                            |   2 +-
+ init/Kconfig                                |  73 +++++++++++
+ kernel/gcov/Kconfig                         |   2 +-
+ lib/Kconfig.debug                           |   2 +-
+ scripts/Makefile.build                      |  10 +-
+ scripts/Makefile.host                       |   6 +-
+ scripts/Makefile.lib                        |   9 ++
+ scripts/Makefile.lto                        |  84 +++++++++++++
+ scripts/Makefile.modpost                    |   7 +-
+ scripts/bootgraph.pl                        |   0
+ scripts/coccinelle/misc/simple_return.cocci | 180 ++++++++++++++++++++++++++++
+ scripts/export_report.pl                    |   0
+ scripts/gcc-goto.sh                         |   0
+ scripts/gcc-ld                              |   0
+ scripts/gcc-version.sh                      |   0
+ scripts/gcc-x86_32-has-stack-protector.sh   |   0
+ scripts/gcc-x86_64-has-stack-protector.sh   |   0
+ scripts/gen_initramfs_list.sh               |   0
+ scripts/headers_check.pl                    |   0
+ scripts/headers_install.sh                  |   0
+ scripts/kconfig/Makefile                    |  38 +-----
+ scripts/kconfig/lxdialog/check-lxdialog.sh  |   6 +-
+ scripts/kconfig/lxdialog/dialog.h           |   2 +-
+ scripts/kconfig/streamline_config.pl        |   0
+ scripts/link-vmlinux.sh                     |   2 +-
+ scripts/markup_oops.pl                      |   0
+ scripts/mkmakefile                          |   0
+ scripts/mksysmap                            |   0
+ scripts/package/builddeb                    |  24 ++--
+ scripts/package/buildtar                    |   0
+ scripts/profile2linkerlist.pl               |   0
+ scripts/rt-tester/rt-tester.py              |   0
+ scripts/selinux/install_policy.sh           |   0
+ scripts/tags.sh                             |  10 +-
+ scripts/tracing/draw_functrace.py           |   0
+ scripts/xz_wrap.sh                          |   0
+ 39 files changed, 649 insertions(+), 176 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.lto
+ mode change 100644 => 100755 scripts/bootgraph.pl
+ create mode 100644 scripts/coccinelle/misc/simple_return.cocci
+ mode change 100644 => 100755 scripts/export_report.pl
+ mode change 100644 => 100755 scripts/gcc-goto.sh
+ mode change 100644 => 100755 scripts/gcc-ld
+ mode change 100644 => 100755 scripts/gcc-version.sh
+ mode change 100644 => 100755 scripts/gcc-x86_32-has-stack-protector.sh
+ mode change 100644 => 100755 scripts/gcc-x86_64-has-stack-protector.sh
+ mode change 100644 => 100755 scripts/gen_initramfs_list.sh
+ mode change 100644 => 100755 scripts/headers_check.pl
+ mode change 100644 => 100755 scripts/headers_install.sh
+ mode change 100644 => 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
+ mode change 100644 => 100755 scripts/kconfig/streamline_config.pl
+ mode change 100644 => 100755 scripts/link-vmlinux.sh
+ mode change 100644 => 100755 scripts/markup_oops.pl
+ mode change 100644 => 100755 scripts/mkmakefile
+ mode change 100644 => 100755 scripts/mksysmap
+ mode change 100644 => 100755 scripts/package/builddeb
+ mode change 100644 => 100755 scripts/package/buildtar
+ mode change 100644 => 100755 scripts/profile2linkerlist.pl
+ mode change 100644 => 100755 scripts/rt-tester/rt-tester.py
+ mode change 100644 => 100755 scripts/selinux/install_policy.sh
+ mode change 100644 => 100755 scripts/tracing/draw_functrace.py
+ mode change 100644 => 100755 scripts/xz_wrap.sh
+Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (3a9262e50dba Merge branch 'for-3.18' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/qcom-sata.txt          | 48 ++++++++++++++++++++++
+ arch/blackfin/mach-bf537/boards/cm_bf537e.c        |  3 +-
+ arch/blackfin/mach-bf537/boards/cm_bf537u.c        |  3 +-
+ arch/blackfin/mach-bf537/boards/stamp.c            |  3 +-
+ arch/blackfin/mach-bf537/boards/tcm_bf537.c        |  3 +-
+ arch/blackfin/mach-bf561/boards/cm_bf561.c         |  3 +-
+ drivers/ata/ahci.c                                 | 20 ++++-----
+ drivers/ata/ahci.h                                 |  4 +-
+ drivers/ata/ahci_platform.c                        | 18 +-------
+ drivers/ata/ahci_xgene.c                           | 10 ++++-
+ drivers/ata/libahci_platform.c                     | 29 +------------
+ drivers/ata/libata-core.c                          | 37 +++++++----------
+ drivers/ata/libata-sff.c                           | 20 ++++-----
+ drivers/ata/pata_of_platform.c                     | 24 +++--------
+ drivers/ata/pata_platform.c                        |  4 +-
+ include/linux/ahci_platform.h                      | 13 ------
+ include/linux/ata_platform.h                       |  5 ---
+ include/linux/libata.h                             | 12 +++---
+ 18 files changed, 110 insertions(+), 149 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt
+Merging pm/linux-next (6f28c5c49468 Merge branch 'pm-devfreq' into linux-next)
+$ git merge pm/linux-next
+Auto-merging drivers/cpuidle/Kconfig.arm
+Auto-merging arch/arm/mach-shmobile/pm-rmobile.c
+Auto-merging arch/arm/mach-exynos/exynos.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/exynos/power_domain.txt           |  13 +-
+ .../devicetree/bindings/power/power_domain.txt     |  49 ++
+ .../bindings/power/rockchip-io-domain.txt          |  83 +++
+ Documentation/kernel-parameters.txt                |  10 +-
+ Documentation/power/suspend-and-interrupts.txt     | 123 ++++
+ MAINTAINERS                                        |   4 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  23 +
+ arch/arm/mach-exynos/exynos.c                      |   1 -
+ arch/arm/mach-exynos/pm_domains.c                  |  78 +-
+ arch/arm/mach-s3c64xx/common.c                     |   5 -
+ arch/arm/mach-s3c64xx/common.h                     |   7 -
+ arch/arm/mach-s3c64xx/mach-anw6410.c               |   1 -
+ arch/arm/mach-s3c64xx/mach-crag6410.c              |   1 -
+ arch/arm/mach-s3c64xx/mach-hmt.c                   |   1 -
+ arch/arm/mach-s3c64xx/mach-mini6410.c              |   1 -
+ arch/arm/mach-s3c64xx/mach-ncp.c                   |   1 -
+ arch/arm/mach-s3c64xx/mach-real6410.c              |   1 -
+ arch/arm/mach-s3c64xx/mach-smartq5.c               |   1 -
+ arch/arm/mach-s3c64xx/mach-smartq7.c               |   1 -
+ arch/arm/mach-s3c64xx/mach-smdk6400.c              |   1 -
+ arch/arm/mach-s3c64xx/mach-smdk6410.c              |   1 -
+ arch/arm/mach-s3c64xx/pm.c                         |   7 -
+ arch/arm/mach-shmobile/pm-r8a7779.c                |   1 -
+ arch/arm/mach-shmobile/pm-rmobile.c                |   1 -
+ arch/x86/kernel/apic/io_apic.c                     |   5 +
+ drivers/acpi/acpi_lpss.c                           | 167 ++---
+ drivers/acpi/acpi_pnp.c                            |   4 -
+ drivers/acpi/acpica/evxfgpe.c                      |  32 +
+ drivers/acpi/acpica/hwgpe.c                        |   8 +-
+ drivers/acpi/acpica/utresrc.c                      |   4 +-
+ drivers/acpi/battery.c                             |   2 +-
+ drivers/acpi/blacklist.c                           |  36 +-
+ drivers/acpi/device_pm.c                           |  71 +-
+ drivers/acpi/fan.c                                 |  18 +-
+ drivers/acpi/osl.c                                 |  12 +-
+ drivers/acpi/pci_root.c                            |  14 +
+ drivers/acpi/processor_core.c                      |   6 +-
+ drivers/acpi/sbs.c                                 |  80 +-
+ drivers/acpi/sleep.c                               |  16 +
+ drivers/acpi/utils.c                               |   1 -
+ drivers/acpi/video.c                               | 291 +-------
+ drivers/acpi/video_detect.c                        |   8 +
+ drivers/amba/bus.c                                 |  11 +-
+ drivers/base/platform.c                            |  16 +-
+ drivers/base/power/common.c                        |  52 ++
+ drivers/base/power/domain.c                        | 811 +++++++++++++--------
+ drivers/base/power/domain_governor.c               |   7 +-
+ drivers/base/power/main.c                          |   8 +-
+ drivers/base/power/sysfs.c                         |  24 +-
+ drivers/base/power/wakeup.c                        |  16 +-
+ drivers/base/syscore.c                             |   7 +-
+ drivers/cpufreq/cpufreq-cpu0.c                     | 259 +++++--
+ drivers/cpufreq/cpufreq.c                          |  15 +-
+ drivers/cpufreq/integrator-cpufreq.c               |   4 +-
+ drivers/cpufreq/pcc-cpufreq.c                      |   2 +-
+ drivers/cpufreq/powernv-cpufreq.c                  |  44 ++
+ drivers/cpuidle/Kconfig                            |   8 +
+ drivers/cpuidle/Kconfig.arm                        |   1 +
+ drivers/cpuidle/Kconfig.arm64                      |  14 +
+ drivers/cpuidle/Makefile                           |   5 +
+ drivers/cpuidle/cpuidle-arm64.c                    | 133 ++++
+ drivers/cpuidle/cpuidle-big_little.c               |  20 +
+ drivers/cpuidle/dt_idle_states.c                   | 213 ++++++
+ drivers/cpuidle/dt_idle_states.h                   |   7 +
+ drivers/cpuidle/governor.c                         |   2 +-
+ drivers/devfreq/Kconfig                            |   3 +-
+ drivers/devfreq/devfreq.c                          |   3 +
+ drivers/devfreq/exynos/exynos_ppmu.c               |   3 +
+ drivers/gpu/drm/i915/intel_opregion.c              |  16 +-
+ drivers/i2c/i2c-core.c                             |  14 +-
+ drivers/mmc/core/sdio_bus.c                        |   5 +-
+ drivers/pci/pcie/pme.c                             |  61 +-
+ drivers/platform/x86/fujitsu-laptop.c              |  16 +-
+ drivers/power/avs/Kconfig                          |   8 +
+ drivers/power/avs/Makefile                         |   1 +
+ drivers/power/avs/rockchip-io-domain.c             | 351 +++++++++
+ drivers/regulator/core.c                           |  63 +-
+ drivers/sh/pm_runtime.c                            |  11 -
+ drivers/spi/spi.c                                  |  13 +-
+ include/acpi/acnames.h                             |   4 +
+ include/acpi/acpixf.h                              |   3 +-
+ include/acpi/actbl1.h                              |  19 +-
+ include/acpi/actbl3.h                              |   9 +-
+ include/linux/acpi.h                               |   2 -
+ include/linux/cpufreq.h                            |   3 +
+ include/linux/interrupt.h                          |   5 -
+ include/linux/irq.h                                |   8 +
+ include/linux/irqdesc.h                            |  10 +
+ include/linux/pm.h                                 |   5 +
+ include/linux/pm_domain.h                          | 126 ++--
+ include/linux/regulator/consumer.h                 |  20 +
+ include/linux/suspend.h                            |   6 +
+ kernel/irq/chip.c                                  |  85 ++-
+ kernel/irq/internals.h                             |  16 +-
+ kernel/irq/manage.c                                |  32 +-
+ kernel/irq/pm.c                                    | 159 ++--
+ kernel/power/Kconfig                               |   4 +
+ kernel/power/process.c                             |   1 +
+ kernel/power/snapshot.c                            |  54 +-
+ kernel/power/suspend.c                             |  51 +-
+ kernel/power/suspend_test.c                        |  32 +-
+ 101 files changed, 2822 insertions(+), 1269 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/power_domain.txt
+ create mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.txt
+ create mode 100644 Documentation/power/suspend-and-interrupts.txt
+ create mode 100644 drivers/cpuidle/Kconfig.arm64
+ create mode 100644 drivers/cpuidle/cpuidle-arm64.c
+ create mode 100644 drivers/cpuidle/dt_idle_states.c
+ create mode 100644 drivers/cpuidle/dt_idle_states.h
+ create mode 100644 drivers/power/avs/rockchip-io-domain.c
+Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (dd634666793e Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next)
+$ git merge thermal/next
+Auto-merging drivers/thermal/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/imx-thermal.txt    |   5 +-
+ drivers/thermal/Kconfig                            |  10 ++
+ drivers/thermal/Makefile                           |   1 +
+ drivers/thermal/fair_share.c                       |  12 ++
+ drivers/thermal/gov_bang_bang.c                    | 131 +++++++++++++++++++++
+ drivers/thermal/imx_thermal.c                      |  91 ++++++++++++--
+ drivers/thermal/of-thermal.c                       |  12 ++
+ drivers/thermal/step_wise.c                        |   5 +-
+ drivers/thermal/thermal_core.c                     |  12 ++
+ drivers/thermal/thermal_core.h                     |   8 ++
+ include/trace/events/thermal.h                     |  83 +++++++++++++
+ 11 files changed, 355 insertions(+), 15 deletions(-)
+ create mode 100644 drivers/thermal/gov_bang_bang.c
+ create mode 100644 include/trace/events/thermal.h
+Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (ade4a2a8e6e4 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Auto-merging include/linux/platform_data/dma-dw.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/qcom_adm.txt |  62 +++++
+ .../devicetree/bindings/dma/xilinx/xilinx_dma.txt  |  65 +++++
+ Documentation/dmaengine.txt                        |   4 +-
+ MAINTAINERS                                        |   2 +-
+ arch/avr32/mach-at32ap/at32ap700x.c                |  19 +-
+ arch/avr32/mach-at32ap/include/mach/atmel-mci.h    |   2 +-
+ drivers/dma/Kconfig                                |   2 +-
+ drivers/dma/dmatest.c                              |   4 +-
+ drivers/dma/dw/core.c                              |  72 ++----
+ drivers/dma/dw/internal.h                          |  28 +--
+ drivers/dma/dw/pci.c                               |   4 +
+ drivers/dma/dw/platform.c                          |  86 ++++---
+ drivers/dma/dw/regs.h                              |  14 +-
+ drivers/dma/imx-sdma.c                             |  35 ++-
+ drivers/dma/mmp_tdma.c                             |  19 +-
+ drivers/dma/mv_xor.c                               | 268 ++++++++-------------
+ drivers/dma/mv_xor.h                               |  62 +++--
+ drivers/dma/sh/rcar-audmapp.c                      |  15 +-
+ drivers/dma/sun6i-dma.c                            |  23 --
+ drivers/dma/xilinx/xilinx_vdma.c                   |   1 -
+ drivers/spi/Kconfig                                |   2 +-
+ drivers/spi/spi-pxa2xx-dma.c                       |  15 +-
+ drivers/spi/spi-pxa2xx-pci.c                       | 122 ++++++++--
+ drivers/spi/spi-pxa2xx.c                           |   2 -
+ drivers/tty/serial/8250/8250.h                     |   6 +-
+ drivers/tty/serial/8250/8250_dw.c                  |   7 +-
+ drivers/tty/serial/8250/8250_pci.c                 |  78 +++++-
+ include/linux/dmaengine.h                          |   4 +-
+ .../linux/{dw_dmac.h => platform_data/dma-dw.h}    |  10 +-
+ include/linux/spi/pxa2xx_spi.h                     |   9 +-
+ include/sound/atmel-abdac.h                        |   2 +-
+ include/sound/atmel-ac97c.h                        |   2 +-
+ sound/atmel/abdac.c                                |   2 +-
+ sound/atmel/ac97c.c                                |   2 +-
+ sound/soc/pxa/mmp-pcm.c                            |   3 +-
+ 35 files changed, 592 insertions(+), 461 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/qcom_adm.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
+ rename include/linux/{dw_dmac.h => platform_data/dma-dw.h} (92%)
+Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
+$ git merge dmaengine/next
+Auto-merging drivers/dma/mv_xor.c
+Merge made by the 'recursive' strategy.
+ drivers/dma/ioat/dca.c    | 13 ++++----
+ drivers/dma/ioat/dma.c    |  2 +-
+ drivers/dma/ioat/dma_v3.c |  6 ++--
+ drivers/dma/mv_xor.c      | 80 +++++++++++++++++++++++++++++++++++++----------
+ 4 files changed, 74 insertions(+), 27 deletions(-)
+Merging net-next/master (739e4a758e0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge net-next/master
+Resolved 'arch/arm/boot/dts/berlin2q-marvell-dmp.dts' using previous resolution.
+Resolved 'arch/arm/boot/dts/rk3188-radxarock.dts' using previous resolution.
+Resolved 'arch/arm/boot/dts/rk3188.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/rk3xxx.dtsi' using previous resolution.
+Removing net/tipc/ref.h
+Removing net/tipc/ref.c
+Removing net/tipc/port.h
+Removing net/tipc/port.c
+Auto-merging net/socket.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/uapi/linux/Kbuild
+Removing include/rxrpc/types.h
+Removing include/linux/phonedev.h
+Removing include/linux/i82593.h
+Removing include/linux/cycx_x25.h
+Auto-merging drivers/net/ethernet/sun/sunvnet.c
+Auto-merging arch/sparc/kernel/ldc.c
+Auto-merging arch/mips/net/bpf_jit.c
+Auto-merging arch/arm/boot/dts/rk3xxx.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3xxx.dtsi
+Auto-merging arch/arm/boot/dts/rk3188.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi
+Auto-merging arch/arm/boot/dts/rk3188-radxarock.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188-radxarock.dts
+Auto-merging arch/arm/boot/dts/imx6sx.dtsi
+Auto-merging arch/arm/boot/dts/berlin2q.dtsi
+Auto-merging arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/networking/filter.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f5d76fe698a1] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/net/broadcom-mdio-unimac.txt          |   39 +
+ .../devicetree/bindings/net/broadcom-sf2.txt       |   78 +
+ .../devicetree/bindings/net/can/m_can.txt          |   67 +
+ .../devicetree/bindings/net/can/rcar_can.txt       |   43 +
+ Documentation/devicetree/bindings/net/cpsw.txt     |    6 +-
+ Documentation/devicetree/bindings/net/dsa/dsa.txt  |   17 +
+ .../devicetree/bindings/net/emac_rockchip.txt      |   50 +
+ Documentation/devicetree/bindings/net/fsl-fec.txt  |    6 +
+ .../devicetree/bindings/net/marvell-pxa168.txt     |   36 +
+ .../devicetree/bindings/net/meson-dwmac.txt        |   25 +
+ .../devicetree/bindings/net/qca-qca7000-spi.txt    |   47 +
+ .../devicetree/bindings/net/socfpga-dwmac.txt      |    4 +
+ Documentation/networking/dctcp.txt                 |   43 +
+ Documentation/networking/filter.txt                |  271 +-
+ Documentation/networking/ip-sysctl.txt             |   40 +-
+ Documentation/networking/pktgen.txt                |    3 +
+ Documentation/networking/timestamping.txt          |  368 +-
+ Documentation/networking/timestamping/Makefile     |   10 +-
+ .../networking/timestamping/txtimestamp.c          |  469 +++
+ Documentation/sysctl/net.txt                       |   16 +
+ MAINTAINERS                                        |   19 +-
+ arch/arm/boot/dts/am33xx.dtsi                      |    6 +
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |    4 +
+ arch/arm/boot/dts/berlin2q.dtsi                    |   17 +
+ arch/arm/boot/dts/imx6sx.dtsi                      |    2 +
+ arch/arm/boot/dts/rk3188-radxarock.dts             |   22 +
+ arch/arm/boot/dts/rk3188.dtsi                      |   22 +
+ arch/arm/boot/dts/rk3xxx.dtsi                      |   17 +
+ arch/arm/net/bpf_jit_32.c                          |   37 +-
+ arch/arm/net/bpf_jit_32.h                          |   14 +
+ arch/arm/plat-orion/common.c                       |    2 +-
+ arch/mips/bcm47xx/setup.c                          |    4 +
+ arch/mips/net/bpf_jit.c                            |   33 +-
+ arch/powerpc/net/bpf_jit_comp.c                    |    5 +-
+ arch/s390/net/bpf_jit_comp.c                       |   84 +-
+ arch/sparc/kernel/ldc.c                            |    2 +-
+ arch/sparc/net/bpf_jit_comp.c                      |   21 +-
+ arch/x86/net/bpf_jit_comp.c                        |  129 +-
+ arch/x86/syscalls/syscall_32.tbl                   |    1 +
+ arch/x86/syscalls/syscall_64.tbl                   |    1 +
+ drivers/bcma/Makefile                              |    1 +
+ drivers/bcma/bcma_private.h                        |    4 +
+ drivers/bcma/driver_chipcommon_b.c                 |   61 +
+ drivers/bcma/driver_mips.c                         |   62 +
+ drivers/bcma/host_pci.c                            |    3 +
+ drivers/bcma/host_soc.c                            |   18 +-
+ drivers/bcma/main.c                                |  100 +-
+ drivers/bcma/scan.c                                |   28 +-
+ drivers/bluetooth/ath3k.c                          |    2 +
+ drivers/bluetooth/bluecard_cs.c                    |   35 +-
+ drivers/bluetooth/bt3c_cs.c                        |   27 +-
+ drivers/bluetooth/btuart_cs.c                      |   27 +-
+ drivers/bluetooth/btusb.c                          |   10 +
+ drivers/bluetooth/dtl1_cs.c                        |   36 +-
+ drivers/bluetooth/hci_h5.c                         |    2 +-
+ drivers/isdn/gigaset/bas-gigaset.c                 |    2 +-
+ drivers/isdn/gigaset/usb-gigaset.c                 |    2 +-
+ drivers/isdn/mISDN/dsp_cmx.c                       |  109 +-
+ drivers/net/arcnet/arcnet.c                        |    2 +-
+ drivers/net/arcnet/com20020-pci.c                  |  369 +-
+ drivers/net/arcnet/com20020.c                      |   14 +
+ drivers/net/arcnet/com20020_cs.c                   |    4 -
+ drivers/net/bonding/bond_3ad.c                     |   90 +-
+ drivers/net/bonding/bond_3ad.h                     |    1 -
+ drivers/net/bonding/bond_alb.c                     |  254 +-
+ drivers/net/bonding/bond_alb.h                     |    2 -
+ drivers/net/bonding/bond_debugfs.c                 |    8 +-
+ drivers/net/bonding/bond_main.c                    |  430 +--
+ drivers/net/bonding/bond_netlink.c                 |   41 +-
+ drivers/net/bonding/bond_options.c                 |   39 +-
+ drivers/net/bonding/bond_procfs.c                  |   24 +-
+ drivers/net/bonding/bond_sysfs.c                   |   11 +-
+ drivers/net/bonding/bonding.h                      |   28 +-
+ drivers/net/can/Kconfig                            |    2 +
+ drivers/net/can/Makefile                           |    3 +-
+ drivers/net/can/c_can/Makefile                     |    2 -
+ drivers/net/can/cc770/Makefile                     |    2 -
+ drivers/net/can/dev.c                              |    3 +-
+ drivers/net/can/flexcan.c                          |  114 +-
+ drivers/net/can/m_can/Kconfig                      |    4 +
+ drivers/net/can/m_can/Makefile                     |    5 +
+ drivers/net/can/m_can/m_can.c                      | 1202 ++++++
+ drivers/net/can/mscan/Makefile                     |    2 -
+ drivers/net/can/rcar_can.c                         |   66 +-
+ drivers/net/can/sja1000/Makefile                   |    2 -
+ drivers/net/can/softing/Makefile                   |    2 -
+ drivers/net/can/spi/Makefile                       |    2 -
+ drivers/net/can/spi/mcp251x.c                      |   16 +-
+ drivers/net/can/usb/Makefile                       |    2 -
+ drivers/net/dsa/Kconfig                            |   20 +
+ drivers/net/dsa/Makefile                           |    4 +
+ drivers/net/dsa/bcm_sf2.c                          |  887 +++++
+ drivers/net/dsa/bcm_sf2.h                          |  147 +
+ drivers/net/dsa/bcm_sf2_regs.h                     |  231 ++
+ drivers/net/dsa/mv88e6060.c                        |   15 +-
+ drivers/net/dsa/mv88e6123_61_65.c                  |   10 +-
+ drivers/net/dsa/mv88e6131.c                        |    8 +-
+ drivers/net/dsa/mv88e6171.c                        |  411 +++
+ drivers/net/dsa/mv88e6xxx.c                        |   10 +-
+ drivers/net/dsa/mv88e6xxx.h                        |    1 +
+ drivers/net/ethernet/3com/3c509.c                  |    6 +-
+ drivers/net/ethernet/3com/3c515.c                  |   25 +-
+ drivers/net/ethernet/3com/3c59x.c                  |   27 +-
+ drivers/net/ethernet/Kconfig                       |    1 +
+ drivers/net/ethernet/Makefile                      |    1 +
+ drivers/net/ethernet/amd/au1000_eth.c              |    6 +-
+ drivers/net/ethernet/amd/nmclan_cs.c               |    2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-common.h        |   11 -
+ drivers/net/ethernet/amd/xgbe/xgbe-dcb.c           |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c       |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-desc.c          |    6 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c       |    2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c          |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-mdio.c          |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe-ptp.c           |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe.h               |    2 -
+ drivers/net/ethernet/arc/Kconfig                   |   18 +-
+ drivers/net/ethernet/arc/Makefile                  |    4 +-
+ drivers/net/ethernet/arc/emac.h                    |    8 +-
+ drivers/net/ethernet/arc/emac_arc.c                |   95 +
+ drivers/net/ethernet/arc/emac_main.c               |  129 +-
+ drivers/net/ethernet/arc/emac_mdio.c               |    7 +-
+ drivers/net/ethernet/arc/emac_rockchip.c           |  229 ++
+ drivers/net/ethernet/broadcom/Kconfig              |    1 +
+ drivers/net/ethernet/broadcom/b44.c                |    2 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c         |   18 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   93 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  140 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   19 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c    |    5 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h   |   14 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |   44 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h    |  222 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |  257 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   | 1048 +++++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |  178 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |  169 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   85 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |   48 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h  |    3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c  |   10 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c   |    9 -
+ drivers/net/ethernet/broadcom/cnic.c               |    6 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c     |   43 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h     |    1 +
+ drivers/net/ethernet/broadcom/genet/bcmmii.c       |   18 +-
+ drivers/net/ethernet/brocade/bna/bna_enet.c        |    9 +-
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c       |    4 +-
+ drivers/net/ethernet/cadence/macb.c                |    6 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    5 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   32 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c           |  210 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   27 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h         |    9 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |   20 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |  107 +-
+ drivers/net/ethernet/cisco/enic/enic.h             |    1 +
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c     |   39 +
+ drivers/net/ethernet/cisco/enic/enic_main.c        |   50 +-
+ drivers/net/ethernet/cisco/enic/vnic_dev.c         |    3 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c              |  152 +-
+ drivers/net/ethernet/ec_bhf.c                      |  101 +-
+ drivers/net/ethernet/emulex/benet/be.h             |   30 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c        |  182 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h        |   48 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c     |  173 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h          |   12 +
+ drivers/net/ethernet/emulex/benet/be_main.c        |  368 +-
+ drivers/net/ethernet/emulex/benet/be_roce.c        |    1 +
+ drivers/net/ethernet/freescale/fec.h               |  204 +-
+ drivers/net/ethernet/freescale/fec_main.c          | 1204 ++++--
+ drivers/net/ethernet/hp/hp100.c                    |    4 +-
+ drivers/net/ethernet/intel/Kconfig                 |   19 +
+ drivers/net/ethernet/intel/Makefile                |    1 +
+ drivers/net/ethernet/intel/e1000/e1000.h           |   19 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c   |  187 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c        |   78 -
+ drivers/net/ethernet/intel/e1000/e1000_hw.h        |    2 -
+ drivers/net/ethernet/intel/e1000/e1000_main.c      |  498 ++-
+ drivers/net/ethernet/intel/fm10k/Makefile          |   33 +
+ drivers/net/ethernet/intel/fm10k/fm10k.h           |  534 +++
+ drivers/net/ethernet/intel/fm10k/fm10k_common.c    |  534 +++
+ drivers/net/ethernet/intel/fm10k/fm10k_common.h    |   65 +
+ drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c     |  174 +
+ drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c   |  259 ++
+ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   | 1071 ++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_iov.c       |  536 +++
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c      | 1979 ++++++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       | 2125 +++++++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.h       |  307 ++
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    | 1431 ++++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c       | 2166 +++++++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c        | 1880 ++++++++++
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.h        |  135 +
+ drivers/net/ethernet/intel/fm10k/fm10k_ptp.c       |  463 +++
+ drivers/net/ethernet/intel/fm10k/fm10k_tlv.c       |  863 +++++
+ drivers/net/ethernet/intel/fm10k/fm10k_tlv.h       |  186 +
+ drivers/net/ethernet/intel/fm10k/fm10k_type.h      |  770 ++++
+ drivers/net/ethernet/intel/fm10k/fm10k_vf.c        |  578 +++
+ drivers/net/ethernet/intel/fm10k/fm10k_vf.h        |   78 +
+ drivers/net/ethernet/intel/i40e/i40e.h             |    9 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c      |    8 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c      |   10 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |    3 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |   70 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c        |  259 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h   |    6 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c        |   90 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h        |    1 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |   50 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h |    2 +-
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |    9 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c    |    8 +-
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h |    6 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |    8 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |    1 +
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c    |    2 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c       |   31 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h       |    4 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c       |   24 +-
+ drivers/net/ethernet/intel/igb/igb_main.c          |  204 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h           |  116 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |  160 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  310 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   14 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    7 +
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c       |    2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    1 -
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |    4 -
+ drivers/net/ethernet/intel/ixgbevf/vf.c            |   15 +
+ drivers/net/ethernet/marvell/Kconfig               |    2 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c          |  219 +-
+ drivers/net/ethernet/marvell/skge.c                |    6 +-
+ drivers/net/ethernet/marvell/sky2.c                |    2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c           |   14 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c       |   17 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    1 +
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c         |   23 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   29 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c            |   30 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c            |   47 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.h            |    2 +
+ drivers/net/ethernet/mellanox/mlx4/main.c          |  482 ++-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    3 +
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   10 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c     |    2 +-
+ drivers/net/ethernet/nvidia/forcedeth.c            |    2 +-
+ drivers/net/ethernet/packetengines/yellowfin.c     |    4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |    5 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    8 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |  218 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h    |    2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c  |  156 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c     |    2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c   |    6 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c     |    2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |   10 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c       |    4 +-
+ drivers/net/ethernet/qualcomm/Kconfig              |   30 +
+ drivers/net/ethernet/qualcomm/Makefile             |    6 +
+ drivers/net/ethernet/qualcomm/qca_7k.c             |  149 +
+ drivers/net/ethernet/qualcomm/qca_7k.h             |   72 +
+ drivers/net/ethernet/qualcomm/qca_debug.c          |  311 ++
+ drivers/net/ethernet/qualcomm/qca_debug.h          |   34 +
+ drivers/net/ethernet/qualcomm/qca_framing.c        |  156 +
+ drivers/net/ethernet/qualcomm/qca_framing.h        |  134 +
+ drivers/net/ethernet/qualcomm/qca_spi.c            |  993 +++++
+ drivers/net/ethernet/qualcomm/qca_spi.h            |  114 +
+ drivers/net/ethernet/realtek/r8169.c               |  814 +++-
+ drivers/net/ethernet/sfc/tx.c                      |    2 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig        |   10 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile       |    1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  |   67 +
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c    |   62 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    3 +
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |   18 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |    4 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    3 +
+ drivers/net/ethernet/sun/cassini.c                 |    2 +-
+ drivers/net/ethernet/sun/niu.c                     |    4 +-
+ drivers/net/ethernet/sun/sungem.c                  |   34 +-
+ drivers/net/ethernet/sun/sunvnet.c                 |  433 ++-
+ drivers/net/ethernet/sun/sunvnet.h                 |   20 +-
+ drivers/net/ethernet/ti/Kconfig                    |    2 +
+ drivers/net/ethernet/ti/cpmac.c                    |    1 -
+ drivers/net/ethernet/ti/cpsw-phy-sel.c             |    1 -
+ drivers/net/ethernet/ti/cpsw.c                     |  105 +-
+ drivers/net/ethernet/ti/cpsw.h                     |    1 +
+ drivers/net/ethernet/ti/davinci_emac.c             |    1 -
+ drivers/net/ethernet/ti/davinci_mdio.c             |    1 -
+ drivers/net/ethernet/tile/tilepro.c                |    8 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c        |    1 -
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    1 -
+ drivers/net/fddi/defxx.c                           |   64 +-
+ drivers/net/fddi/defxx.h                           |   12 +-
+ drivers/net/hyperv/hyperv_net.h                    |    4 +-
+ drivers/net/hyperv/netvsc.c                        |   22 +-
+ drivers/net/irda/vlsi_ir.c                         |    8 +-
+ drivers/net/macvlan.c                              |  304 +-
+ drivers/net/phy/Kconfig                            |   10 +-
+ drivers/net/phy/Makefile                           |    1 +
+ drivers/net/phy/amd-xgbe-phy.c                     |  168 +-
+ drivers/net/phy/bcm7xxx.c                          |  153 +-
+ drivers/net/phy/broadcom.c                         |  122 -
+ drivers/net/phy/dp83640.c                          |   35 +-
+ drivers/net/phy/fixed.c                            |   11 +
+ drivers/net/phy/mdio-bcm-unimac.c                  |  213 ++
+ drivers/net/phy/mdio_bus.c                         |    8 +-
+ drivers/net/phy/phy.c                              |   12 +-
+ drivers/net/phy/phy_device.c                       |    4 +-
+ drivers/net/sungem_phy.c                           |  304 +-
+ drivers/net/team/team.c                            |   44 +-
+ drivers/net/usb/r8152.c                            |  496 ++-
+ drivers/net/virtio_net.c                           |    9 +-
+ drivers/net/vxlan.c                                |   95 +-
+ drivers/net/wan/dlci.c                             |    6 +-
+ drivers/net/wireless/ath/ath.h                     |    3 +
+ drivers/net/wireless/ath/ath10k/Kconfig            |    1 +
+ drivers/net/wireless/ath/ath10k/Makefile           |    1 +
+ drivers/net/wireless/ath/ath10k/bmi.c              |   52 +-
+ drivers/net/wireless/ath/ath10k/ce.c               |  185 +-
+ drivers/net/wireless/ath/ath10k/ce.h               |   28 +-
+ drivers/net/wireless/ath/ath10k/core.c             |  246 +-
+ drivers/net/wireless/ath/ath10k/core.h             |   66 +-
+ drivers/net/wireless/ath/ath10k/debug.c            |  339 +-
+ drivers/net/wireless/ath/ath10k/debug.h            |   34 +-
+ drivers/net/wireless/ath/ath10k/htc.c              |  115 +-
+ drivers/net/wireless/ath/ath10k/htc.h              |    7 +-
+ drivers/net/wireless/ath/ath10k/htt.c              |    9 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c           |  171 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c           |   46 +-
+ drivers/net/wireless/ath/ath10k/hw.h               |    5 +-
+ drivers/net/wireless/ath/ath10k/mac.c              |  722 ++--
+ drivers/net/wireless/ath/ath10k/mac.h              |    6 +-
+ drivers/net/wireless/ath/ath10k/pci.c              | 1537 ++++----
+ drivers/net/wireless/ath/ath10k/pci.h              |  104 +-
+ drivers/net/wireless/ath/ath10k/spectral.c         |  561 +++
+ drivers/net/wireless/ath/ath10k/spectral.h         |   90 +
+ drivers/net/wireless/ath/ath10k/txrx.c             |   17 +-
+ drivers/net/wireless/ath/ath10k/wmi.c              | 1089 ++++--
+ drivers/net/wireless/ath/ath10k/wmi.h              |  699 +++-
+ drivers/net/wireless/ath/ath5k/attach.c            |    3 +-
+ drivers/net/wireless/ath/ath5k/base.c              |    2 +-
+ drivers/net/wireless/ath/ath5k/debug.c             |   97 +
+ drivers/net/wireless/ath/ath5k/led.c               |    1 +
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    2 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c         |    1 +
+ drivers/net/wireless/ath/ath6kl/init.c             |    2 +-
+ drivers/net/wireless/ath/ath6kl/main.c             |    2 +-
+ drivers/net/wireless/ath/ath6kl/sdio.c             |    1 +
+ drivers/net/wireless/ath/ath6kl/usb.c              |   21 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c              |   48 +-
+ drivers/net/wireless/ath/ath9k/Kconfig             |   18 +
+ drivers/net/wireless/ath/ath9k/Makefile            |    3 +
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    7 +
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    9 +
+ drivers/net/wireless/ath/ath9k/ath9k.h             |  157 +-
+ drivers/net/wireless/ath/ath9k/beacon.c            |   73 +-
+ drivers/net/wireless/ath/ath9k/channel.c           | 1439 ++++++--
+ drivers/net/wireless/ath/ath9k/debug.c             |   30 +-
+ drivers/net/wireless/ath/ath9k/dynack.c            |  351 ++
+ drivers/net/wireless/ath/ath9k/dynack.h            |  103 +
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    2 +
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c      |    2 +-
+ drivers/net/wireless/ath/ath9k/hw.c                |   22 +-
+ drivers/net/wireless/ath/ath9k/hw.h                |    7 +
+ drivers/net/wireless/ath/ath9k/init.c              |   90 +-
+ drivers/net/wireless/ath/ath9k/mac.h               |    1 +
+ drivers/net/wireless/ath/ath9k/main.c              |  631 ++--
+ drivers/net/wireless/ath/ath9k/recv.c              |   62 +-
+ drivers/net/wireless/ath/ath9k/spectral.h          |   71 +-
+ drivers/net/wireless/ath/ath9k/tx99.c              |    2 +-
+ drivers/net/wireless/ath/ath9k/wow.c               |    5 +-
+ drivers/net/wireless/ath/ath9k/xmit.c              |   12 +-
+ drivers/net/wireless/ath/carl9170/main.c           |   11 +-
+ drivers/net/wireless/ath/carl9170/tx.c             |    2 +-
+ drivers/net/wireless/ath/spectral_common.h         |  113 +
+ drivers/net/wireless/ath/wil6210/Kconfig           |    9 +
+ drivers/net/wireless/ath/wil6210/Makefile          |    3 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c        |  132 +-
+ drivers/net/wireless/ath/wil6210/debug.c           |   18 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c         |  389 +-
+ drivers/net/wireless/ath/wil6210/fw.c              |   45 +
+ drivers/net/wireless/ath/wil6210/fw.h              |  149 +
+ drivers/net/wireless/ath/wil6210/fw_inc.c          |  495 +++
+ drivers/net/wireless/ath/wil6210/interrupt.c       |   33 +-
+ drivers/net/wireless/ath/wil6210/main.c            |  207 +-
+ drivers/net/wireless/ath/wil6210/netdev.c          |   25 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c        |   46 +-
+ drivers/net/wireless/ath/wil6210/rx_reorder.c      |   29 +-
+ drivers/net/wireless/ath/wil6210/txrx.c            |   69 +-
+ drivers/net/wireless/ath/wil6210/txrx.h            |   11 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h         |   73 +-
+ drivers/net/wireless/ath/wil6210/wil_platform.c    |   49 +
+ drivers/net/wireless/ath/wil6210/wil_platform.h    |   34 +
+ .../net/wireless/ath/wil6210/wil_platform_msm.c    |  257 ++
+ .../net/wireless/ath/wil6210/wil_platform_msm.h    |   24 +
+ drivers/net/wireless/ath/wil6210/wmi.c             |   89 +-
+ drivers/net/wireless/ath/wil6210/wmi.h             |   22 +-
+ drivers/net/wireless/atmel_cs.c                    |   22 +-
+ drivers/net/wireless/b43/Makefile                  |    1 +
+ drivers/net/wireless/b43/b43.h                     |   27 +
+ drivers/net/wireless/b43/bus.c                     |   10 +
+ drivers/net/wireless/b43/bus.h                     |   15 +
+ drivers/net/wireless/b43/main.c                    |   88 +-
+ drivers/net/wireless/b43/main.h                    |    2 +
+ drivers/net/wireless/b43/phy_a.c                   |    4 +-
+ drivers/net/wireless/b43/phy_common.c              |   25 +-
+ drivers/net/wireless/b43/phy_g.c                   |    8 +-
+ drivers/net/wireless/b43/phy_ht.c                  |  225 +-
+ drivers/net/wireless/b43/phy_ht.h                  |    7 +-
+ drivers/net/wireless/b43/phy_lcn.c                 |   20 +-
+ drivers/net/wireless/b43/phy_lp.c                  |   20 +-
+ drivers/net/wireless/b43/phy_n.c                   |  130 +-
+ drivers/net/wireless/b43/phy_n.h                   |    4 +
+ drivers/net/wireless/b43/ppr.c                     |  199 +
+ drivers/net/wireless/b43/ppr.h                     |   45 +
+ drivers/net/wireless/b43/radio_2059.c              |  341 +-
+ drivers/net/wireless/b43/radio_2059.h              |   14 +
+ drivers/net/wireless/b43/tables_nphy.c             |  128 +-
+ drivers/net/wireless/b43/tables_nphy.h             |    2 +
+ drivers/net/wireless/b43/xmit.h                    |   22 +-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |    6 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |   18 +-
+ drivers/net/wireless/brcm80211/brcmsmac/dma.c      |   38 +-
+ .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  |  122 +-
+ .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c  |    6 +-
+ .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c    |    8 +-
+ drivers/net/wireless/cw1200/cw1200_spi.c           |    4 +-
+ drivers/net/wireless/hostap/hostap_proc.c          |    6 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c             |    6 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c           |    7 +-
+ drivers/net/wireless/iwlwifi/Kconfig               |   10 +
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c        |    4 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c              |    6 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c            |   17 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c            |   16 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h          |    6 +
+ drivers/net/wireless/iwlwifi/iwl-csr.h             |   12 +
+ drivers/net/wireless/iwlwifi/iwl-debug.h           |    2 +
+ drivers/net/wireless/iwlwifi/iwl-devtrace.c        |    7 -
+ drivers/net/wireless/iwlwifi/iwl-drv.c             |   12 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.h             |    2 +
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c    |    3 +
+ drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h   |    2 +
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h         |    2 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h              |    7 +
+ drivers/net/wireless/iwlwifi/iwl-io.c              |    2 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |    5 +
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h         |    2 +
+ drivers/net/wireless/iwlwifi/iwl-prph.h            |    3 +
+ drivers/net/wireless/iwlwifi/iwl-scd.h             |  118 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h           |   63 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile          |    2 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c            |    6 +
+ drivers/net/wireless/iwlwifi/mvm/coex_legacy.c     |    2 +
+ drivers/net/wireless/iwlwifi/mvm/constants.h       |   10 +
+ drivers/net/wireless/iwlwifi/mvm/d3.c              |    4 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c     |   10 +
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c         |   91 +
+ drivers/net/wireless/iwlwifi/mvm/debugfs.h         |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h     |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h       |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h      |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h          |   84 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c              |    9 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |  116 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  260 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h             |   71 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c             |    5 +-
+ drivers/net/wireless/iwlwifi/mvm/offloading.c      |    2 +
+ drivers/net/wireless/iwlwifi/mvm/ops.c             |   34 +-
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c        |    2 +
+ drivers/net/wireless/iwlwifi/mvm/power.c           |  210 +-
+ drivers/net/wireless/iwlwifi/mvm/quota.c           |   46 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c              |  134 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.h              |   10 +-
+ drivers/net/wireless/iwlwifi/mvm/rx.c              |   21 +
+ drivers/net/wireless/iwlwifi/mvm/scan.c            |   54 +-
+ drivers/net/wireless/iwlwifi/mvm/sf.c              |    6 +
+ drivers/net/wireless/iwlwifi/mvm/sta.c             |  106 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h             |   22 +-
+ drivers/net/wireless/iwlwifi/mvm/tdls.c            |  149 +
+ drivers/net/wireless/iwlwifi/mvm/testmode.h        |    2 +
+ drivers/net/wireless/iwlwifi/mvm/time-event.c      |   71 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.h      |   16 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c              |  322 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c              |    6 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c           |   23 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c            |    3 +
+ drivers/net/wireless/iwlwifi/pcie/internal.h       |   10 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c             |    3 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c          |    5 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c             |  145 +-
+ drivers/net/wireless/libertas/cfg.c                |    2 +
+ drivers/net/wireless/mac80211_hwsim.c              |    8 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c       |   14 +
+ drivers/net/wireless/mwifiex/cfg80211.c            |   18 +-
+ drivers/net/wireless/mwifiex/cmdevt.c              |   31 +-
+ drivers/net/wireless/mwifiex/decl.h                |    4 +-
+ drivers/net/wireless/mwifiex/fw.h                  |   17 +-
+ drivers/net/wireless/mwifiex/init.c                |   25 +-
+ drivers/net/wireless/mwifiex/main.c                |  191 +-
+ drivers/net/wireless/mwifiex/main.h                |   50 +-
+ drivers/net/wireless/mwifiex/pcie.c                |   37 +-
+ drivers/net/wireless/mwifiex/pcie.h                |    5 +-
+ drivers/net/wireless/mwifiex/scan.c                |  115 +-
+ drivers/net/wireless/mwifiex/sdio.c                |   28 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c             |    2 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c         |    4 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c           |   13 +-
+ drivers/net/wireless/mwifiex/tdls.c                |    4 +-
+ drivers/net/wireless/mwifiex/usb.c                 |    2 +-
+ drivers/net/wireless/mwifiex/util.c                |    2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c         |   38 +-
+ drivers/net/wireless/orinoco/scan.c                |   14 +-
+ drivers/net/wireless/p54/main.c                    |    3 +-
+ drivers/net/wireless/ray_cs.h                      |    5 +-
+ drivers/net/wireless/rayctl.h                      |    5 +-
+ drivers/net/wireless/rndis_wlan.c                  |   14 +-
+ drivers/net/wireless/rt2x00/rt2800.h               |    4 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c            |    6 +
+ .../net/wireless/rtlwifi/btcoexist/halbt_precomp.h |    6 +
+ .../wireless/rtlwifi/btcoexist/halbtc8192e2ant.c   | 3849 +++++++++++++++++++
+ .../wireless/rtlwifi/btcoexist/halbtc8192e2ant.h   |  185 +
+ .../wireless/rtlwifi/btcoexist/halbtc8723b1ant.c   | 3170 ++++++++++++++++
+ .../wireless/rtlwifi/btcoexist/halbtc8723b1ant.h   |  184 +
+ .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.c   |  550 +--
+ .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.h   |   31 +-
+ .../wireless/rtlwifi/btcoexist/halbtc8821a1ant.c   | 2970 +++++++++++++++
+ .../wireless/rtlwifi/btcoexist/halbtc8821a1ant.h   |  188 +
+ .../wireless/rtlwifi/btcoexist/halbtc8821a2ant.c   | 3879 ++++++++++++++++++++
+ .../wireless/rtlwifi/btcoexist/halbtc8821a2ant.h   |  205 ++
+ .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c  |   52 +-
+ .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h  |  122 +-
+ drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.c   |   27 +-
+ drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.h   |    6 +-
+ drivers/net/wireless/rtlwifi/pci.c                 |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c       |    8 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c   |    4 +-
+ drivers/net/wireless/rtlwifi/wifi.h                |   15 +-
+ drivers/net/wireless/ti/wl1251/spi.c               |    1 -
+ drivers/net/wireless/ti/wlcore/debug.h             |    2 +-
+ drivers/net/wireless/ti/wlcore/spi.c               |   20 +-
+ drivers/of/of_mdio.c                               |    2 +
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |    2 +-
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c  |    5 +-
+ drivers/staging/wlan-ng/cfg80211.c                 |    1 +
+ drivers/usb/gadget/function/f_ncm.c                |    8 +
+ drivers/usb/host/bcma-hcd.c                        |    2 +-
+ drivers/virtio/virtio_ring.c                       |  186 +-
+ include/linux/bcma/bcma.h                          |    4 +-
+ include/linux/bcma/bcma_driver_chipcommon.h        |    8 +
+ include/linux/bcma/bcma_regs.h                     |    5 +
+ include/linux/bcma/bcma_soc.h                      |    1 +
+ include/linux/bpf.h                                |  136 +
+ include/linux/brcmphy.h                            |  137 +-
+ include/linux/com20020.h                           |   29 +
+ include/linux/cycx_x25.h                           |  125 -
+ include/linux/dynamic_queue_limits.h               |   12 +-
+ include/linux/etherdevice.h                        |    1 +
+ include/linux/ethtool.h                            |    4 +
+ include/linux/filter.h                             |  196 +-
+ include/linux/i82593.h                             |  229 --
+ include/linux/ieee80211.h                          |   73 +-
+ include/linux/if_macvlan.h                         |    1 +
+ include/linux/igmp.h                               |    1 +
+ include/linux/mlx4/device.h                        |   15 +-
+ include/linux/netdevice.h                          |  204 +-
+ include/linux/netfilter/ipset/ip_set.h             |   60 +-
+ include/linux/netfilter/ipset/ip_set_list.h        |    1 +
+ include/linux/netfilter_bridge.h                   |   50 +-
+ include/linux/phonedev.h                           |   25 -
+ include/linux/phy.h                                |   27 +
+ include/linux/phy_fixed.h                          |   17 +-
+ include/linux/random.h                             |    4 +-
+ include/linux/rhashtable.h                         |    2 +
+ include/linux/rtnetlink.h                          |   10 +
+ include/linux/skbuff.h                             |  334 +-
+ include/linux/syscalls.h                           |    3 +-
+ include/linux/tcp.h                                |    2 +-
+ include/linux/udp.h                                |   16 +-
+ include/net/addrconf.h                             |    2 +-
+ include/net/ah.h                                   |    3 -
+ include/net/bluetooth/hci_core.h                   |   22 +-
+ include/net/bluetooth/l2cap.h                      |   35 +-
+ include/net/cfg80211.h                             |   69 +-
+ include/net/checksum.h                             |    4 +-
+ include/net/codel.h                                |    2 +-
+ include/net/dsa.h                                  |   95 +-
+ include/net/flow_keys.h                            |   16 +-
+ include/net/gen_stats.h                            |   15 +-
+ include/net/inet_connection_sock.h                 |    9 +
+ include/net/inetpeer.h                             |    1 -
+ include/net/ip.h                                   |   29 +-
+ include/net/ip6_checksum.h                         |    8 +
+ include/net/ip_fib.h                               |    5 +-
+ include/net/ip_tunnels.h                           |   19 +-
+ include/net/ip_vs.h                                |   15 +-
+ include/net/ipv6.h                                 |    4 +-
+ include/net/mac80211.h                             |   34 +-
+ include/net/mld.h                                  |    5 +-
+ include/net/neighbour.h                            |    2 +-
+ include/net/netfilter/ipv4/nf_nat_masquerade.h     |   14 +
+ include/net/netfilter/ipv4/nf_reject.h             |    2 +-
+ include/net/netfilter/ipv6/nf_nat_masquerade.h     |   10 +
+ include/net/netfilter/ipv6/nf_reject.h             |    2 +-
+ include/net/netfilter/nf_nat.h                     |   10 +-
+ include/net/netfilter/nf_nat_l3proto.h             |   75 +
+ include/net/netfilter/nf_tables.h                  |    2 +
+ include/net/netfilter/nft_masq.h                   |   16 +
+ include/net/netns/ipv4.h                           |    1 +
+ include/net/netns/xfrm.h                           |   14 +
+ include/net/pkt_cls.h                              |    8 +-
+ include/net/pkt_sched.h                            |    2 +-
+ include/net/sch_generic.h                          |  103 +-
+ include/net/snmp.h                                 |    8 +-
+ include/net/sock.h                                 |   16 +-
+ include/net/tcp.h                                  |   85 +-
+ include/net/udp.h                                  |   21 +-
+ include/net/udp_tunnel.h                           |   85 +-
+ include/net/xfrm.h                                 |    1 +
+ include/rxrpc/types.h                              |   41 -
+ include/uapi/asm-generic/unistd.h                  |    4 +-
+ include/uapi/linux/Kbuild                          |    1 +
+ include/uapi/linux/bpf.h                           |  155 +
+ include/uapi/linux/ethtool.h                       |   28 +
+ include/uapi/linux/fou.h                           |   32 +
+ include/uapi/linux/if_ether.h                      |    1 +
+ include/uapi/linux/if_link.h                       |   24 +
+ include/uapi/linux/if_tunnel.h                     |   16 +
+ include/uapi/linux/inet_diag.h                     |   13 +-
+ include/uapi/linux/ip_vs.h                         |    3 +
+ include/uapi/linux/netfilter/ipset/ip_set.h        |   12 +
+ include/uapi/linux/netfilter/nf_nat.h              |    5 +
+ include/uapi/linux/netfilter/nf_tables.h           |   38 +
+ include/uapi/linux/netfilter/nfnetlink_acct.h      |    8 +
+ include/uapi/linux/netfilter/xt_set.h              |   10 +
+ include/uapi/linux/netfilter_arp/arpt_mangle.h     |    2 +-
+ include/uapi/linux/nl80211.h                       |  116 +-
+ include/uapi/linux/openvswitch.h                   |   26 +
+ include/uapi/linux/xfrm.h                          |    7 +
+ kernel/bpf/Makefile                                |    6 +-
+ kernel/bpf/core.c                                  |  127 +-
+ kernel/bpf/syscall.c                               |  606 +++
+ kernel/bpf/test_stub.c                             |  116 +
+ kernel/bpf/verifier.c                              | 1923 ++++++++++
+ kernel/crash_dump.c                                |    1 +
+ kernel/seccomp.c                                   |    7 +-
+ kernel/sys_ni.c                                    |    3 +
+ lib/Kconfig.debug                                  |    3 +-
+ lib/random32.c                                     |   39 +-
+ lib/rhashtable.c                                   |   12 +-
+ lib/test_bpf.c                                     |   63 +-
+ net/Kconfig                                        |    7 +-
+ net/atm/clip.c                                     |    4 +-
+ net/atm/common.c                                   |    2 +-
+ net/atm/mpc.c                                      |    2 +-
+ net/bluetooth/6lowpan.c                            |   90 +-
+ net/bluetooth/amp.c                                |   13 +-
+ net/bluetooth/hci_conn.c                           |   49 +-
+ net/bluetooth/hci_core.c                           |  101 +-
+ net/bluetooth/hci_event.c                          |   44 +-
+ net/bluetooth/hidp/core.c                          |   10 +-
+ net/bluetooth/l2cap_core.c                         |  393 +-
+ net/bluetooth/l2cap_sock.c                         |   23 +-
+ net/bluetooth/mgmt.c                               |  161 +-
+ net/bluetooth/smp.c                                |  898 +++--
+ net/bluetooth/smp.h                                |   20 +-
+ net/bridge/Makefile                                |    4 +-
+ net/bridge/br.c                                    |   14 +-
+ net/bridge/br_device.c                             |    4 +-
+ net/bridge/br_forward.c                            |    2 +
+ net/bridge/br_if.c                                 |   17 +-
+ net/bridge/br_input.c                              |    1 +
+ net/bridge/br_multicast.c                          |    2 +-
+ net/bridge/br_netfilter.c                          |  116 +-
+ net/bridge/br_netlink.c                            |  116 +-
+ net/bridge/br_nf_core.c                            |   96 +
+ net/bridge/br_private.h                            |   13 +-
+ net/bridge/br_stp.c                                |   15 +-
+ net/bridge/br_stp_if.c                             |    4 +-
+ net/bridge/br_stp_timer.c                          |    4 +-
+ net/bridge/br_sysfs_br.c                           |    4 +-
+ net/bridge/netfilter/ebtables.c                    |   15 +
+ net/core/dev.c                                     |  416 ++-
+ net/core/dev_ioctl.c                               |    7 +-
+ net/core/ethtool.c                                 |   81 +
+ net/core/filter.c                                  |   45 +-
+ net/core/flow_dissector.c                          |  115 +-
+ net/core/gen_estimator.c                           |   29 +-
+ net/core/gen_stats.c                               |  112 +-
+ net/core/net_namespace.c                           |    2 +-
+ net/core/netpoll.c                                 |    7 +-
+ net/core/pktgen.c                                  |   76 +-
+ net/core/rtnetlink.c                               |   66 +-
+ net/core/secure_seq.c                              |    6 +-
+ net/core/skbuff.c                                  |  385 +-
+ net/core/sock.c                                    |  110 +-
+ net/core/timestamping.c                            |   43 +-
+ net/core/utils.c                                   |   12 +-
+ net/dccp/ccid.c                                    |    2 +-
+ net/dccp/ipv6.c                                    |    2 +-
+ net/dccp/proto.c                                   |    2 +-
+ net/decnet/af_decnet.c                             |    3 +-
+ net/decnet/dn_dev.c                                |    3 +-
+ net/decnet/dn_timer.c                              |    3 +-
+ net/dsa/Kconfig                                    |    3 +
+ net/dsa/Makefile                                   |    1 +
+ net/dsa/dsa.c                                      |  186 +-
+ net/dsa/dsa_priv.h                                 |   29 +-
+ net/dsa/slave.c                                    |  303 +-
+ net/dsa/tag_brcm.c                                 |  171 +
+ net/dsa/tag_dsa.c                                  |    9 +-
+ net/dsa/tag_edsa.c                                 |    9 +-
+ net/dsa/tag_trailer.c                              |    9 +-
+ net/ethernet/eth.c                                 |   34 +-
+ net/ieee802154/6lowpan_rtnl.c                      |    8 -
+ net/ieee802154/reassembly.c                        |    4 +-
+ net/ipv4/Kconfig                                   |   36 +-
+ net/ipv4/Makefile                                  |    2 +
+ net/ipv4/af_inet.c                                 |   47 +-
+ net/ipv4/ah4.c                                     |    2 -
+ net/ipv4/arp.c                                     |    6 +-
+ net/ipv4/cipso_ipv4.c                              |    2 +-
+ net/ipv4/fib_frontend.c                            |   14 +-
+ net/ipv4/fib_semantics.c                           |    8 +-
+ net/ipv4/fou.c                                     |  368 ++
+ net/ipv4/gre_demux.c                               |    9 +-
+ net/ipv4/gre_offload.c                             |   55 +-
+ net/ipv4/icmp.c                                    |   64 +-
+ net/ipv4/igmp.c                                    |   33 +-
+ net/ipv4/inet_hashtables.c                         |    2 +-
+ net/ipv4/inetpeer.c                                |   21 -
+ net/ipv4/ip_fragment.c                             |    4 +-
+ net/ipv4/ip_gre.c                                  |   92 +-
+ net/ipv4/ip_options.c                              |    6 +-
+ net/ipv4/ip_output.c                               |    8 +-
+ net/ipv4/ip_sockglue.c                             |   19 +-
+ net/ipv4/ip_tunnel.c                               |   91 +-
+ net/ipv4/ipconfig.c                                |    3 +-
+ net/ipv4/ipip.c                                    |   80 +-
+ net/ipv4/netfilter/Kconfig                         |   35 +-
+ net/ipv4/netfilter/Makefile                        |    2 +
+ net/ipv4/netfilter/ipt_CLUSTERIP.c                 |    2 +-
+ net/ipv4/netfilter/ipt_MASQUERADE.c                |  108 +-
+ net/ipv4/netfilter/iptable_nat.c                   |  233 +-
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c           |  199 +
+ net/ipv4/netfilter/nf_nat_masquerade_ipv4.c        |  153 +
+ net/ipv4/netfilter/nft_chain_nat_ipv4.c            |  157 +-
+ net/ipv4/netfilter/nft_masq_ipv4.c                 |   89 +
+ net/ipv4/ping.c                                    |    2 +-
+ net/ipv4/protocol.c                                |    1 +
+ net/ipv4/route.c                                   |   14 +-
+ net/ipv4/syncookies.c                              |    2 +-
+ net/ipv4/sysctl_net_ipv4.c                         |   40 +-
+ net/ipv4/tcp.c                                     |   36 +-
+ net/ipv4/tcp_bic.c                                 |   11 +-
+ net/ipv4/tcp_cong.c                                |   55 +-
+ net/ipv4/tcp_cubic.c                               |   18 +-
+ net/ipv4/tcp_dctcp.c                               |  344 ++
+ net/ipv4/tcp_diag.c                                |    5 +-
+ net/ipv4/tcp_fastopen.c                            |    2 +-
+ net/ipv4/tcp_highspeed.c                           |  145 +-
+ net/ipv4/tcp_htcp.c                                |    6 +-
+ net/ipv4/tcp_hybla.c                               |    1 -
+ net/ipv4/tcp_illinois.c                            |    3 +-
+ net/ipv4/tcp_input.c                               |  285 +-
+ net/ipv4/tcp_ipv4.c                                |   68 +-
+ net/ipv4/tcp_minisocks.c                           |   13 +-
+ net/ipv4/tcp_offload.c                             |   72 +-
+ net/ipv4/tcp_output.c                              |  124 +-
+ net/ipv4/tcp_probe.c                               |    6 +-
+ net/ipv4/tcp_scalable.c                            |    2 +-
+ net/ipv4/tcp_timer.c                               |   52 +-
+ net/ipv4/tcp_vegas.c                               |    3 -
+ net/ipv4/tcp_veno.c                                |    1 -
+ net/ipv4/tcp_westwood.c                            |   35 +-
+ net/ipv4/tcp_yeah.c                                |    9 +-
+ net/ipv4/udp.c                                     |   13 +-
+ net/ipv4/udp_offload.c                             |  170 +-
+ net/ipv4/udp_tunnel.c                              |  138 +-
+ net/ipv6/Makefile                                  |    4 +
+ net/ipv6/addrconf.c                                |   17 +-
+ net/ipv6/af_inet6.c                                |   18 +-
+ net/ipv6/ah6.c                                     |   23 +-
+ net/ipv6/anycast.c                                 |  108 +-
+ net/ipv6/datagram.c                                |   23 +-
+ net/ipv6/esp6.c                                    |   15 +-
+ net/ipv6/exthdrs.c                                 |    2 +-
+ net/ipv6/icmp.c                                    |   30 +-
+ net/ipv6/inet6_connection_sock.c                   |    6 +-
+ net/ipv6/inet6_hashtables.c                        |    7 +-
+ net/ipv6/ip6_flowlabel.c                           |   19 +-
+ net/ipv6/ip6_gre.c                                 |    8 +-
+ net/ipv6/ip6_icmp.c                                |    2 +-
+ net/ipv6/ip6_input.c                               |    6 +-
+ net/ipv6/ip6_offload.c                             |   34 +-
+ net/ipv6/ip6_output.c                              |   27 +-
+ net/ipv6/ip6_tunnel.c                              |   32 +-
+ net/ipv6/ip6_udp_tunnel.c                          |  107 +
+ net/ipv6/ip6mr.c                                   |    4 +-
+ net/ipv6/ipcomp6.c                                 |    6 +-
+ net/ipv6/ipv6_sockglue.c                           |   26 +-
+ net/ipv6/mcast.c                                   |  302 +-
+ net/ipv6/mip6.c                                    |   10 +-
+ net/ipv6/ndisc.c                                   |   17 +-
+ net/ipv6/netfilter/Kconfig                         |   39 +-
+ net/ipv6/netfilter/Makefile                        |    2 +
+ net/ipv6/netfilter/ip6t_MASQUERADE.c               |   76 +-
+ net/ipv6/netfilter/ip6table_nat.c                  |  233 +-
+ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c           |  199 +
+ net/ipv6/netfilter/nf_nat_masquerade_ipv6.c        |  120 +
+ net/ipv6/netfilter/nft_chain_nat_ipv6.c            |  165 +-
+ net/ipv6/netfilter/nft_masq_ipv6.c                 |   89 +
+ net/ipv6/output_core.c                             |    2 +-
+ net/ipv6/proc.c                                    |    2 +-
+ net/ipv6/protocol.c                                |    1 +
+ net/ipv6/raw.c                                     |    8 +-
+ net/ipv6/reassembly.c                              |   12 +-
+ net/ipv6/route.c                                   |   22 +-
+ net/ipv6/sit.c                                     |  121 +-
+ net/ipv6/syncookies.c                              |    4 +-
+ net/ipv6/sysctl_net_ipv6.c                         |   10 +
+ net/ipv6/tcp_ipv6.c                                |   32 +-
+ net/ipv6/tcpv6_offload.c                           |   69 +-
+ net/ipv6/tunnel6.c                                 |    4 +-
+ net/ipv6/udp.c                                     |   26 +-
+ net/ipv6/udp_offload.c                             |   91 +-
+ net/ipv6/xfrm6_input.c                             |    6 +-
+ net/ipv6/xfrm6_output.c                            |    1 -
+ net/ipv6/xfrm6_policy.c                            |   22 +-
+ net/ipv6/xfrm6_state.c                             |   14 +-
+ net/ipv6/xfrm6_tunnel.c                            |    4 +-
+ net/irda/irlan/irlan_common.c                      |    4 +-
+ net/iucv/iucv.c                                    |    9 +-
+ net/l2tp/l2tp_core.c                               |   24 +-
+ net/mac80211/agg-rx.c                              |    5 +-
+ net/mac80211/cfg.c                                 |  114 +-
+ net/mac80211/chan.c                                |  191 +-
+ net/mac80211/debugfs.c                             |    6 +-
+ net/mac80211/debugfs_netdev.c                      |    4 +-
+ net/mac80211/debugfs_sta.c                         |    4 +-
+ net/mac80211/driver-ops.h                          |    2 +-
+ net/mac80211/ibss.c                                |    3 +-
+ net/mac80211/ieee80211_i.h                         |    9 +-
+ net/mac80211/iface.c                               |   15 +-
+ net/mac80211/key.c                                 |   15 +-
+ net/mac80211/main.c                                |    1 +
+ net/mac80211/mesh_pathtbl.c                        |    4 +-
+ net/mac80211/mesh_plink.c                          |   14 +-
+ net/mac80211/mlme.c                                |  162 +-
+ net/mac80211/rc80211_minstrel.c                    |   98 +-
+ net/mac80211/rc80211_minstrel.h                    |   43 +-
+ net/mac80211/rc80211_minstrel_debugfs.c            |   19 +-
+ net/mac80211/rc80211_minstrel_ht.c                 |  303 +-
+ net/mac80211/rc80211_minstrel_ht.h                 |   41 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c         |   10 +-
+ net/mac80211/rx.c                                  |   13 +-
+ net/mac80211/scan.c                                |    3 +-
+ net/mac80211/sta_info.c                            |    5 +-
+ net/mac80211/sta_info.h                            |    9 +-
+ net/mac80211/status.c                              |   22 +-
+ net/mac80211/tdls.c                                |    7 +-
+ net/mac80211/trace.h                               |    4 +-
+ net/mac80211/tx.c                                  |   32 +-
+ net/mac80211/util.c                                |   26 +
+ net/mac80211/wme.c                                 |    5 +-
+ net/mac80211/wpa.c                                 |    7 +-
+ net/mac802154/rx.c                                 |    5 +-
+ net/mac802154/tx.c                                 |   15 +-
+ net/mac802154/wpan.c                               |   10 +-
+ net/mpls/mpls_gso.c                                |    7 -
+ net/netfilter/Kconfig                              |    9 +
+ net/netfilter/Makefile                             |    1 +
+ net/netfilter/ipset/Kconfig                        |    9 +
+ net/netfilter/ipset/Makefile                       |    1 +
+ net/netfilter/ipset/ip_set_bitmap_gen.h            |    4 +
+ net/netfilter/ipset/ip_set_bitmap_ip.c             |   15 +-
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c          |   15 +-
+ net/netfilter/ipset/ip_set_bitmap_port.c           |   15 +-
+ net/netfilter/ipset/ip_set_core.c                  |   53 +-
+ net/netfilter/ipset/ip_set_hash_gen.h              |   30 +-
+ net/netfilter/ipset/ip_set_hash_ip.c               |   22 +-
+ net/netfilter/ipset/ip_set_hash_ipmark.c           |   14 +-
+ net/netfilter/ipset/ip_set_hash_ipport.c           |   22 +-
+ net/netfilter/ipset/ip_set_hash_ipportip.c         |   22 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c        |   14 +-
+ net/netfilter/ipset/ip_set_hash_mac.c              |  173 +
+ net/netfilter/ipset/ip_set_hash_net.c              |   16 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c         |   16 +-
+ net/netfilter/ipset/ip_set_hash_netnet.c           |   29 +-
+ net/netfilter/ipset/ip_set_hash_netport.c          |   16 +-
+ net/netfilter/ipset/ip_set_hash_netportnet.c       |   22 +-
+ net/netfilter/ipset/ip_set_list_set.c              |   23 +-
+ net/netfilter/ipvs/Kconfig                         |   10 +
+ net/netfilter/ipvs/Makefile                        |    1 +
+ net/netfilter/ipvs/ip_vs_conn.c                    |   74 +-
+ net/netfilter/ipvs/ip_vs_core.c                    |   15 +-
+ net/netfilter/ipvs/ip_vs_ctl.c                     |  223 +-
+ net/netfilter/ipvs/ip_vs_dh.c                      |    2 +-
+ net/netfilter/ipvs/ip_vs_fo.c                      |   79 +
+ net/netfilter/ipvs/ip_vs_ftp.c                     |    6 +-
+ net/netfilter/ipvs/ip_vs_lblc.c                    |   12 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c                   |   12 +-
+ net/netfilter/ipvs/ip_vs_lc.c                      |    2 +-
+ net/netfilter/ipvs/ip_vs_nq.c                      |    3 +-
+ net/netfilter/ipvs/ip_vs_proto_sctp.c              |    2 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c               |    2 +-
+ net/netfilter/ipvs/ip_vs_rr.c                      |    2 +-
+ net/netfilter/ipvs/ip_vs_sed.c                     |    3 +-
+ net/netfilter/ipvs/ip_vs_sh.c                      |    8 +-
+ net/netfilter/ipvs/ip_vs_sync.c                    |   13 +-
+ net/netfilter/ipvs/ip_vs_wlc.c                     |    3 +-
+ net/netfilter/ipvs/ip_vs_wrr.c                     |    2 +-
+ net/netfilter/ipvs/ip_vs_xmit.c                    |  388 +-
+ net/netfilter/nf_conntrack_core.c                  |    4 +-
+ net/netfilter/nf_conntrack_expect.c                |    3 +-
+ net/netfilter/nf_conntrack_netlink.c               |    2 +-
+ net/netfilter/nf_conntrack_proto_generic.c         |   26 +-
+ net/netfilter/nf_conntrack_standalone.c            |    2 +-
+ net/netfilter/nf_nat_core.c                        |    5 +-
+ net/netfilter/nf_tables_api.c                      |  600 ++-
+ net/netfilter/nfnetlink.c                          |    6 +-
+ net/netfilter/nfnetlink_acct.c                     |   54 +
+ net/netfilter/nft_masq.c                           |   59 +
+ net/netfilter/nft_meta.c                           |   45 +
+ net/netfilter/nft_nat.c                            |   16 +
+ net/netfilter/x_tables.c                           |   30 +-
+ net/netfilter/xt_HMARK.c                           |    2 +-
+ net/netfilter/xt_RATEEST.c                         |    2 +-
+ net/netfilter/xt_cluster.c                         |    3 +-
+ net/netfilter/xt_connbytes.c                       |    2 +-
+ net/netfilter/xt_hashlimit.c                       |    4 +-
+ net/netfilter/xt_set.c                             |  191 +-
+ net/netfilter/xt_string.c                          |    1 -
+ net/openvswitch/actions.c                          |  258 +-
+ net/openvswitch/datapath.c                         |   52 +-
+ net/openvswitch/datapath.h                         |   23 +-
+ net/openvswitch/flow.c                             |   59 +-
+ net/openvswitch/flow.h                             |   10 +-
+ net/openvswitch/flow_netlink.c                     |   65 +-
+ net/openvswitch/flow_netlink.h                     |    4 +-
+ net/openvswitch/vport-gre.c                        |   23 +-
+ net/openvswitch/vport-vxlan.c                      |   21 +-
+ net/openvswitch/vport.c                            |   40 +-
+ net/openvswitch/vport.h                            |   11 +-
+ net/packet/af_packet.c                             |   12 +-
+ net/rose/rose_link.c                               |    3 +-
+ net/rxrpc/ar-error.c                               |   14 +-
+ net/rxrpc/ar-input.c                               |    9 +-
+ net/sched/act_api.c                                |    9 +-
+ net/sched/act_police.c                             |    6 +-
+ net/sched/cls_api.c                                |   32 +-
+ net/sched/cls_basic.c                              |   84 +-
+ net/sched/cls_bpf.c                                |   98 +-
+ net/sched/cls_cgroup.c                             |   79 +-
+ net/sched/cls_flow.c                               |  147 +-
+ net/sched/cls_fw.c                                 |  117 +-
+ net/sched/cls_route.c                              |  230 +-
+ net/sched/cls_rsvp.h                               |  208 +-
+ net/sched/cls_tcindex.c                            |  273 +-
+ net/sched/cls_u32.c                                |  407 +-
+ net/sched/sch_api.c                                |   58 +-
+ net/sched/sch_atm.c                                |   28 +-
+ net/sched/sch_cbq.c                                |   35 +-
+ net/sched/sch_choke.c                              |   29 +-
+ net/sched/sch_codel.c                              |    2 +-
+ net/sched/sch_drr.c                                |   27 +-
+ net/sched/sch_dsmark.c                             |   11 +-
+ net/sched/sch_fifo.c                               |    2 +-
+ net/sched/sch_fq.c                                 |    8 +-
+ net/sched/sch_fq_codel.c                           |   24 +-
+ net/sched/sch_generic.c                            |   34 +-
+ net/sched/sch_gred.c                               |    4 +-
+ net/sched/sch_hfsc.c                               |   32 +-
+ net/sched/sch_hhf.c                                |    8 +-
+ net/sched/sch_htb.c                                |   48 +-
+ net/sched/sch_ingress.c                            |   10 +-
+ net/sched/sch_mq.c                                 |    6 +-
+ net/sched/sch_mqprio.c                             |   20 +-
+ net/sched/sch_multiq.c                             |   17 +-
+ net/sched/sch_netem.c                              |   15 +-
+ net/sched/sch_pie.c                                |    2 +-
+ net/sched/sch_prio.c                               |   20 +-
+ net/sched/sch_qfq.c                                |   25 +-
+ net/sched/sch_red.c                                |    8 +-
+ net/sched/sch_sfb.c                                |   25 +-
+ net/sched/sch_sfq.c                                |   35 +-
+ net/sched/sch_tbf.c                                |   14 +-
+ net/sched/sch_teql.c                               |   18 +-
+ net/sctp/input.c                                   |    8 +-
+ net/sctp/protocol.c                                |    2 +-
+ net/socket.c                                       |    7 +-
+ net/tipc/Makefile                                  |    2 +-
+ net/tipc/bcast.c                                   |    8 +-
+ net/tipc/config.c                                  |    4 +-
+ net/tipc/core.c                                    |    9 +-
+ net/tipc/core.h                                    |    6 +-
+ net/tipc/link.c                                    |  120 +-
+ net/tipc/link.h                                    |    7 +-
+ net/tipc/msg.c                                     |   38 +-
+ net/tipc/msg.h                                     |    5 +
+ net/tipc/name_distr.c                              |  140 +-
+ net/tipc/name_distr.h                              |    1 +
+ net/tipc/name_table.c                              |    9 +-
+ net/tipc/net.c                                     |    3 +-
+ net/tipc/node.c                                    |   90 +
+ net/tipc/node.h                                    |    7 +-
+ net/tipc/port.c                                    |  514 ---
+ net/tipc/port.h                                    |  190 -
+ net/tipc/ref.c                                     |  266 --
+ net/tipc/ref.h                                     |   48 -
+ net/tipc/socket.c                                  |  884 ++++-
+ net/tipc/socket.h                                  |   55 +-
+ net/tipc/subscr.c                                  |    1 -
+ net/tipc/sysctl.c                                  |    7 +
+ net/wireless/chan.c                                |    1 +
+ net/wireless/core.c                                |   16 +-
+ net/wireless/ibss.c                                |    4 +-
+ net/wireless/mlme.c                                |    8 +-
+ net/wireless/nl80211.c                             |  249 +-
+ net/wireless/nl80211.h                             |    3 +-
+ net/wireless/rdev-ops.h                            |   31 +
+ net/wireless/reg.c                                 |   82 +-
+ net/wireless/scan.c                                |   22 +-
+ net/wireless/sme.c                                 |    6 +-
+ net/wireless/trace.h                               |   45 +
+ net/wireless/util.c                                |    3 +-
+ net/wireless/wext-compat.c                         |    2 +
+ net/wireless/wext-sme.c                            |    2 +-
+ net/xfrm/xfrm_hash.h                               |   76 +-
+ net/xfrm/xfrm_output.c                             |    6 +-
+ net/xfrm/xfrm_policy.c                             |  144 +-
+ net/xfrm/xfrm_state.c                              |   13 +-
+ net/xfrm/xfrm_user.c                               |   83 +-
+ samples/bpf/Makefile                               |   12 +
+ samples/bpf/libbpf.c                               |   94 +
+ samples/bpf/libbpf.h                               |  172 +
+ samples/bpf/test_verifier.c                        |  678 ++++
+ 1046 files changed, 78833 insertions(+), 18975 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-sf2.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt
+ create mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt
+ create mode 100644 Documentation/devicetree/bindings/net/marvell-pxa168.txt
+ create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
+ create mode 100644 Documentation/networking/dctcp.txt
+ create mode 100644 Documentation/networking/timestamping/txtimestamp.c
+ create mode 100644 drivers/bcma/driver_chipcommon_b.c
+ create mode 100644 drivers/net/can/m_can/Kconfig
+ create mode 100644 drivers/net/can/m_can/Makefile
+ create mode 100644 drivers/net/can/m_can/m_can.c
+ create mode 100644 drivers/net/dsa/bcm_sf2.c
+ create mode 100644 drivers/net/dsa/bcm_sf2.h
+ create mode 100644 drivers/net/dsa/bcm_sf2_regs.h
+ create mode 100644 drivers/net/dsa/mv88e6171.c
+ create mode 100644 drivers/net/ethernet/arc/emac_arc.c
+ create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/Makefile
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_common.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_common.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_main.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_mbx.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pf.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_ptp.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_tlv.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_type.h
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_vf.c
+ create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_vf.h
+ create mode 100644 drivers/net/ethernet/qualcomm/Kconfig
+ create mode 100644 drivers/net/ethernet/qualcomm/Makefile
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_7k.c
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_7k.h
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_debug.c
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_debug.h
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_framing.c
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_framing.h
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_spi.c
+ create mode 100644 drivers/net/ethernet/qualcomm/qca_spi.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+ create mode 100644 drivers/net/phy/mdio-bcm-unimac.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/spectral.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/spectral.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/dynack.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/dynack.h
+ create mode 100644 drivers/net/wireless/ath/spectral_common.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/fw.c
+ create mode 100644 drivers/net/wireless/ath/wil6210/fw.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/fw_inc.c
+ create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform.c
+ create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform_msm.c
+ create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform_msm.h
+ create mode 100644 drivers/net/wireless/b43/ppr.c
+ create mode 100644 drivers/net/wireless/b43/ppr.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-scd.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/tdls.c
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.h
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.h
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.h
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c
+ create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.h
+ create mode 100644 include/linux/bpf.h
+ delete mode 100644 include/linux/cycx_x25.h
+ delete mode 100644 include/linux/i82593.h
+ delete mode 100644 include/linux/phonedev.h
+ create mode 100644 include/net/netfilter/ipv4/nf_nat_masquerade.h
+ create mode 100644 include/net/netfilter/ipv6/nf_nat_masquerade.h
+ create mode 100644 include/net/netfilter/nft_masq.h
+ delete mode 100644 include/rxrpc/types.h
+ create mode 100644 include/uapi/linux/bpf.h
+ create mode 100644 include/uapi/linux/fou.h
+ create mode 100644 kernel/bpf/syscall.c
+ create mode 100644 kernel/bpf/test_stub.c
+ create mode 100644 kernel/bpf/verifier.c
+ create mode 100644 net/bridge/br_nf_core.c
+ create mode 100644 net/dsa/tag_brcm.c
+ create mode 100644 net/ipv4/fou.c
+ create mode 100644 net/ipv4/netfilter/nf_nat_masquerade_ipv4.c
+ create mode 100644 net/ipv4/netfilter/nft_masq_ipv4.c
+ create mode 100644 net/ipv4/tcp_dctcp.c
+ create mode 100644 net/ipv6/ip6_udp_tunnel.c
+ create mode 100644 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+ create mode 100644 net/ipv6/netfilter/nft_masq_ipv6.c
+ create mode 100644 net/netfilter/ipset/ip_set_hash_mac.c
+ create mode 100644 net/netfilter/ipvs/ip_vs_fo.c
+ create mode 100644 net/netfilter/nft_masq.c
+ delete mode 100644 net/tipc/port.c
+ delete mode 100644 net/tipc/port.h
+ delete mode 100644 net/tipc/ref.c
+ delete mode 100644 net/tipc/ref.h
+ create mode 100644 samples/bpf/Makefile
+ create mode 100644 samples/bpf/libbpf.c
+ create mode 100644 samples/bpf/libbpf.h
+ create mode 100644 samples/bpf/test_verifier.c
+Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_LEN)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-next/master (3f08e4729187 rtlwifi: Fix static checker warnings for various drivers)
+$ git merge wireless-next/master
+Removing drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h
+Removing drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
+Removing drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c
+Removing drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
+Removing drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
+Auto-merging drivers/net/wireless/rtlwifi/pwrseqcmd.h
+Auto-merging drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+Auto-merging drivers/net/wireless/ath/wil6210/wil6210.h
+Auto-merging drivers/net/wireless/ath/ath9k/main.c
+Auto-merging drivers/net/wireless/ath/ath5k/debug.c
+Removing drivers/net/wireless/ath/ath5k/ahb.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/bus/bcma.txt     |   32 +
+ .../devicetree/bindings/net/nfc/st21nfcb.txt       |    2 +-
+ .../devicetree/bindings/net/nfc/trf7970a.txt       |    8 +
+ MAINTAINERS                                        |    5 +-
+ drivers/bcma/bcma_private.h                        |   14 +
+ drivers/bcma/driver_gpio.c                         |    8 +-
+ drivers/bcma/host_soc.c                            |   81 +
+ drivers/bcma/main.c                                |   52 +-
+ drivers/bcma/scan.c                                |    8 +-
+ drivers/bluetooth/Kconfig                          |    4 +-
+ drivers/bluetooth/btmrvl_sdio.c                    |   36 +-
+ drivers/bluetooth/btusb.c                          |  515 ++-
+ drivers/net/ieee802154/mrf24j40.c                  |   19 +-
+ drivers/net/wireless/ath/Kconfig                   |    8 +
+ drivers/net/wireless/ath/Makefile                  |    4 +
+ drivers/net/wireless/ath/ath.h                     |    1 +
+ drivers/net/wireless/ath/ath10k/Kconfig            |    2 +-
+ drivers/net/wireless/ath/ath10k/Makefile           |    1 +
+ drivers/net/wireless/ath/ath10k/bmi.h              |    1 -
+ drivers/net/wireless/ath/ath10k/ce.c               |    2 -
+ drivers/net/wireless/ath/ath10k/ce.h               |   13 +-
+ drivers/net/wireless/ath/ath10k/core.c             |  106 +-
+ drivers/net/wireless/ath/ath10k/core.h             |   25 +-
+ drivers/net/wireless/ath/ath10k/debug.c            |  102 +-
+ drivers/net/wireless/ath/ath10k/debug.h            |   12 +
+ drivers/net/wireless/ath/ath10k/hif.h              |    1 -
+ drivers/net/wireless/ath/ath10k/htc.c              |   10 +-
+ drivers/net/wireless/ath/ath10k/htc.h              |    1 -
+ drivers/net/wireless/ath/ath10k/htt.c              |    2 +-
+ drivers/net/wireless/ath/ath10k/htt.h              |    3 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c           |   54 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c           |    2 -
+ drivers/net/wireless/ath/ath10k/hw.h               |    2 +
+ drivers/net/wireless/ath/ath10k/mac.c              |  192 +-
+ drivers/net/wireless/ath/ath10k/pci.c              |  183 +-
+ drivers/net/wireless/ath/ath10k/rx_desc.h          |    1 -
+ drivers/net/wireless/ath/ath10k/targaddrs.h        |    1 -
+ drivers/net/wireless/ath/ath10k/testmode.c         |  382 ++
+ drivers/net/wireless/ath/ath10k/testmode.h         |   46 +
+ drivers/net/wireless/ath/ath10k/testmode_i.h       |   70 +
+ drivers/net/wireless/ath/ath10k/trace.h            |  105 +-
+ drivers/net/wireless/ath/ath10k/txrx.c             |    2 +-
+ drivers/net/wireless/ath/ath10k/wmi.c              |  103 +-
+ drivers/net/wireless/ath/ath10k/wmi.h              |   33 +-
+ drivers/net/wireless/ath/ath5k/Kconfig             |   14 +-
+ drivers/net/wireless/ath/ath5k/Makefile            |    1 -
+ drivers/net/wireless/ath/ath5k/ahb.c               |  234 -
+ drivers/net/wireless/ath/ath5k/ath5k.h             |   28 -
+ drivers/net/wireless/ath/ath5k/base.c              |   14 -
+ drivers/net/wireless/ath/ath5k/debug.c             |    1 +
+ drivers/net/wireless/ath/ath5k/led.c               |    6 -
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c        |    9 +-
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c        |   26 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   28 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   24 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h             |   16 +-
+ drivers/net/wireless/ath/ath9k/channel.c           |   54 +-
+ drivers/net/wireless/ath/ath9k/dynack.c            |    2 +-
+ drivers/net/wireless/ath/ath9k/hw-ops.h            |    6 +
+ drivers/net/wireless/ath/ath9k/hw.c                |   29 +-
+ drivers/net/wireless/ath/ath9k/hw.h                |    1 +
+ drivers/net/wireless/ath/ath9k/mac.h               |    2 +-
+ drivers/net/wireless/ath/ath9k/main.c              |   79 +-
+ drivers/net/wireless/ath/ath9k/reg.h               |   15 +
+ drivers/net/wireless/ath/ath9k/xmit.c              |   29 +-
+ drivers/net/wireless/ath/main.c                    |    3 +
+ drivers/net/wireless/ath/trace.c                   |   20 +
+ drivers/net/wireless/ath/trace.h                   |   71 +
+ drivers/net/wireless/ath/wil6210/Makefile          |    2 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c        |    4 +
+ drivers/net/wireless/ath/wil6210/debugfs.c         |   67 +
+ drivers/net/wireless/ath/wil6210/ethtool.c         |  103 +
+ drivers/net/wireless/ath/wil6210/interrupt.c       |   12 +-
+ drivers/net/wireless/ath/wil6210/ioctl.c           |  173 +
+ drivers/net/wireless/ath/wil6210/main.c            |   72 +-
+ drivers/net/wireless/ath/wil6210/netdev.c          |   13 +
+ drivers/net/wireless/ath/wil6210/wil6210.h         |   21 +-
+ drivers/net/wireless/ath/wil6210/wmi.c             |    1 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |   11 +
+ drivers/net/wireless/brcm80211/brcmfmac/feature.c  |    2 +
+ drivers/net/wireless/brcm80211/brcmfmac/feature.h  |    3 +-
+ drivers/net/wireless/brcm80211/brcmfmac/flowring.c |    4 +-
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |   56 +
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |    2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c   |  133 +-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |    5 +-
+ drivers/net/wireless/brcm80211/brcmfmac/pcie.c     |   74 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |  114 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |    7 +-
+ drivers/net/wireless/brcm80211/include/defs.h      |    5 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c            |    2 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c             |   18 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h              |   17 +-
+ drivers/net/wireless/iwlwifi/mvm/constants.h       |    3 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c         |   25 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |    3 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h       |    2 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h          |   60 +
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |   20 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c        |   37 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h             |   43 +
+ drivers/net/wireless/iwlwifi/mvm/ops.c             |    3 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c              |  240 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.h              |    4 +
+ drivers/net/wireless/iwlwifi/mvm/rx.c              |   41 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c            |   79 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c             |   20 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h             |    2 +
+ drivers/net/wireless/iwlwifi/mvm/tt.c              |    2 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c              |   60 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c           |   46 +
+ drivers/net/wireless/iwlwifi/pcie/drv.c            |    4 +
+ drivers/net/wireless/iwlwifi/pcie/trans.c          |    2 +-
+ drivers/net/wireless/mwifiex/Kconfig               |    4 +-
+ drivers/net/wireless/mwifiex/init.c                |    1 -
+ drivers/net/wireless/mwifiex/main.c                |   11 +-
+ drivers/net/wireless/mwifiex/main.h                |    3 +-
+ drivers/net/wireless/mwifiex/pcie.c                |   25 +-
+ drivers/net/wireless/mwifiex/scan.c                |   33 +-
+ drivers/net/wireless/mwifiex/sdio.c                |   47 +-
+ drivers/net/wireless/mwifiex/sdio.h                |  114 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c             |    2 +-
+ drivers/net/wireless/rt2x00/rt2800.h               |    2 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c         |   28 +-
+ drivers/net/wireless/rtlwifi/Kconfig               |   29 +-
+ drivers/net/wireless/rtlwifi/Makefile              |    2 +
+ drivers/net/wireless/rtlwifi/base.c                |  661 ++-
+ drivers/net/wireless/rtlwifi/base.h                |   55 +-
+ .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c  |    2 +-
+ .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h  |    2 +-
+ drivers/net/wireless/rtlwifi/cam.c                 |   61 +-
+ drivers/net/wireless/rtlwifi/cam.h                 |   10 +-
+ drivers/net/wireless/rtlwifi/core.c                |  888 +++-
+ drivers/net/wireless/rtlwifi/core.h                |   11 +-
+ drivers/net/wireless/rtlwifi/debug.c               |   10 +-
+ drivers/net/wireless/rtlwifi/debug.h               |   11 +-
+ drivers/net/wireless/rtlwifi/efuse.c               |  228 +-
+ drivers/net/wireless/rtlwifi/efuse.h               |   17 +-
+ drivers/net/wireless/rtlwifi/pci.c                 |  853 ++--
+ drivers/net/wireless/rtlwifi/pci.h                 |   56 +-
+ drivers/net/wireless/rtlwifi/ps.c                  |  283 +-
+ drivers/net/wireless/rtlwifi/ps.h                  |   71 +-
+ .../wireless/rtlwifi/{rtl8723ae => }/pwrseqcmd.h   |    6 +-
+ drivers/net/wireless/rtlwifi/rc.c                  |   97 +-
+ drivers/net/wireless/rtlwifi/rc.h                  |    9 +-
+ drivers/net/wireless/rtlwifi/regd.c                |  108 +-
+ drivers/net/wireless/rtlwifi/regd.h                |   11 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/def.h       |   66 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.c        |  881 ++--
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.h        |   23 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/fw.c        |  259 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/fw.h        |   29 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/hw.c        | 1251 ++---
+ drivers/net/wireless/rtlwifi/rtl8188ee/led.c       |   49 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/led.h       |    4 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/phy.c       | 2151 +++++----
+ drivers/net/wireless/rtlwifi/rtl8188ee/phy.h       |   49 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c    |  100 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h    |  415 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c |  139 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h |   97 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/reg.h       | 2936 ++++++------
+ drivers/net/wireless/rtlwifi/rtl8188ee/rf.c        |  282 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/rf.h        |    7 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c        |   43 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.h        |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/table.c     |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/table.h     |   12 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/trx.c       |  443 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/trx.h       |   83 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |  447 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h  |   40 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |  815 ++--
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |   15 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/dm.h        |   64 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |   16 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.h        |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |    3 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.h       |  107 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    5 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |    8 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/def.h       |    3 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |   17 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |    3 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/phy.c       |    3 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    4 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |    1 +
+ drivers/net/wireless/rtlwifi/rtl8192de/fw.h        |   12 -
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c       |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/Makefile    |   19 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/def.h       |  101 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/dm.c        | 1263 +++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/dm.h        |  267 ++
+ drivers/net/wireless/rtlwifi/rtl8192ee/fw.c        |  906 ++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/fw.h        |  208 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/hw.c        | 2569 +++++++++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/hw.h        |   62 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/led.c       |  145 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/led.h       |   34 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/phy.c       | 3219 +++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/phy.h       |  153 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c    |  112 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h    |  340 ++
+ drivers/net/wireless/rtlwifi/rtl8192ee/reg.h       | 2231 +++++++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/rf.c        |  152 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/rf.h        |   36 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/sw.c        |  399 ++
+ drivers/net/wireless/rtlwifi/rtl8192ee/sw.h        |   33 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/table.c     |  882 ++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/table.h     |   45 +
+ drivers/net/wireless/rtlwifi/rtl8192ee/trx.c       | 1293 ++++++
+ drivers/net/wireless/rtlwifi/rtl8192ee/trx.h       |  860 ++++
+ drivers/net/wireless/rtlwifi/rtl8192se/fw.h        |    1 -
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |    4 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/btc.h       |    7 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/def.h       |  197 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.c        |  422 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.h        |   50 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/fw.c        |  255 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/fw.h        |   54 +-
+ .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c    |  414 +-
+ .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h    |   38 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c   | 1232 +++--
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h   |   66 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.c        | 1513 +++---
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.h        |   66 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/led.c       |   54 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/led.h       |   13 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.c       |  884 ++--
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.h       |   67 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c    |   93 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h    |  543 +--
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c |  129 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/reg.h       | 2718 +++++------
+ drivers/net/wireless/rtlwifi/rtl8723ae/rf.c        |  261 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/rf.h        |   18 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.c        |  222 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.h        |   12 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/table.c     |    8 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/table.h     |    8 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.c       |  460 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.h       |  325 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/def.h       |  178 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/dm.c        |  243 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/dm.h        |   30 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/fw.c        |  194 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/fw.h        |  200 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/hw.c        | 1320 +++---
+ drivers/net/wireless/rtlwifi/rtl8723be/hw.h        |    1 +
+ drivers/net/wireless/rtlwifi/rtl8723be/led.c       |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/phy.c       | 1783 ++++---
+ drivers/net/wireless/rtlwifi/rtl8723be/phy.h       |  110 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c    |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h    |  131 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c |  139 -
+ drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h |   95 -
+ drivers/net/wireless/rtlwifi/rtl8723be/reg.h       | 1135 ++---
+ drivers/net/wireless/rtlwifi/rtl8723be/rf.c        |  144 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c        |   42 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/table.c     | 1053 ++---
+ drivers/net/wireless/rtlwifi/rtl8723be/table.h     |    2 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/trx.c       |  314 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/trx.h       |   34 +-
+ .../net/wireless/rtlwifi/rtl8723com/dm_common.c    |   14 +-
+ .../net/wireless/rtlwifi/rtl8723com/fw_common.c    |   90 +-
+ .../net/wireless/rtlwifi/rtl8723com/fw_common.h    |   59 +-
+ .../net/wireless/rtlwifi/rtl8723com/phy_common.c   |   57 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/Makefile    |   19 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/def.h       |  450 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/dm.c        | 3019 ++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/dm.h        |  356 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/fw.c        | 1857 ++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/fw.h        |  351 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/hw.c        | 4218 +++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/hw.h        |   70 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/led.c       |  237 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/led.h       |   37 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/phy.c       | 4855 ++++++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/phy.h       |  259 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c    |  182 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h    |  738 +++
+ drivers/net/wireless/rtlwifi/rtl8821ae/reg.h       | 2464 ++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/rf.c        |  465 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/rf.h        |   43 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/sw.c        |  484 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/sw.h        |   34 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/table.c     | 4572 ++++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/table.h     |   60 +
+ drivers/net/wireless/rtlwifi/rtl8821ae/trx.c       | 1236 +++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/trx.h       |  620 +++
+ drivers/net/wireless/rtlwifi/stats.c               |   50 +-
+ drivers/net/wireless/rtlwifi/stats.h               |    7 +-
+ drivers/net/wireless/rtlwifi/usb.c                 |    4 +-
+ drivers/net/wireless/rtlwifi/wifi.h                |  238 +-
+ drivers/nfc/st21nfca/i2c.c                         |   34 +-
+ drivers/nfc/st21nfca/st21nfca.c                    |   59 +-
+ drivers/nfc/st21nfca/st21nfca.h                    |   21 -
+ drivers/nfc/st21nfca/st21nfca_dep.c                |   59 +-
+ drivers/nfc/st21nfcb/i2c.c                         |   67 +-
+ drivers/nfc/st21nfcb/ndlc.c                        |    6 +-
+ drivers/nfc/st21nfcb/ndlc.h                        |    4 +
+ drivers/nfc/st21nfcb/st21nfcb.c                    |   27 +-
+ drivers/nfc/st21nfcb/st21nfcb.h                    |    2 -
+ drivers/nfc/trf7970a.c                             | 1059 ++++-
+ include/linux/bcma/bcma.h                          |    2 +
+ include/net/bluetooth/bluetooth.h                  |    5 +-
+ include/net/bluetooth/hci.h                        |    1 +
+ include/net/bluetooth/hci_core.h                   |    1 -
+ include/net/nfc/nci.h                              |   16 +-
+ include/net/nfc/nci_core.h                         |    9 +-
+ include/uapi/linux/wil6210_uapi.h                  |   87 +
+ net/bluetooth/6lowpan.c                            |  145 +-
+ net/bluetooth/af_bluetooth.c                       |    3 +
+ net/bluetooth/hci_conn.c                           |   43 +-
+ net/bluetooth/hci_core.c                           |   21 +-
+ net/bluetooth/l2cap_core.c                         |   13 +-
+ net/bluetooth/lib.c                                |   14 +-
+ net/bluetooth/smp.c                                |    5 +-
+ net/ieee802154/6lowpan_rtnl.c                      |  125 +-
+ net/nfc/digital_dep.c                              |  101 +
+ net/nfc/nci/core.c                                 |   21 +-
+ net/nfc/nci/data.c                                 |    7 +-
+ net/nfc/nci/ntf.c                                  |   40 +-
+ 325 files changed, 63957 insertions(+), 17040 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/bus/bcma.txt
+ create mode 100644 drivers/net/wireless/ath/ath10k/testmode.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/testmode.h
+ create mode 100644 drivers/net/wireless/ath/ath10k/testmode_i.h
+ delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
+ create mode 100644 drivers/net/wireless/ath/trace.c
+ create mode 100644 drivers/net/wireless/ath/trace.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/ethtool.c
+ create mode 100644 drivers/net/wireless/ath/wil6210/ioctl.c
+ rename drivers/net/wireless/rtlwifi/{rtl8723ae => }/pwrseqcmd.h (92%)
+ delete mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
+ delete mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/Makefile
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/def.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/fw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/fw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/hw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/led.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/led.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/phy.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/phy.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/reg.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/rf.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/rf.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/sw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/table.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/table.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
+ delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c
+ delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
+ delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/Makefile
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/def.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/fw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/fw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/hw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/led.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/led.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/phy.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/phy.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/rf.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/rf.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/sw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/table.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/table.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/trx.h
+ create mode 100644 include/uapi/linux/wil6210_uapi.h
+Merging bluetooth/master (9c238ca8ec79 Bluetooth: 6lowpan: Check transmit errors for multicast packets)
+$ git merge bluetooth/master
+Already up-to-date.
+Merging infiniband/for-next (3bdad2d13fa6 Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (32f1b7c8352f mtd: move support for struct flash_platform_data into m25p80)
+$ git merge l2-mtd/master
+Auto-merging arch/arm/mach-omap2/gpmc.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/atmel-nand.txt         |   2 +
+ .../devicetree/bindings/mtd/mtd-physmap.txt        |   4 +-
+ MAINTAINERS                                        |   1 +
+ arch/arm/mach-omap2/gpmc.c                         |   2 +
+ drivers/mtd/bcm47xxpart.c                          |  11 +
+ drivers/mtd/chips/cfi_cmdset_0002.c                |   2 +
+ drivers/mtd/devices/Makefile                       |   1 -
+ drivers/mtd/devices/docg3.c                        |  26 +-
+ drivers/mtd/devices/m25p80.c                       |  22 +-
+ drivers/mtd/maps/Kconfig                           |   2 +-
+ drivers/mtd/maps/gpio-addr-flash.c                 |  42 +-
+ drivers/mtd/maps/pcmciamtd.c                       |   2 +-
+ drivers/mtd/maps/physmap_of.c                      |   6 +-
+ drivers/mtd/mtdchar.c                              |   3 +
+ drivers/mtd/mtdcore.c                              |  39 +-
+ drivers/mtd/mtdswap.c                              |   8 +-
+ drivers/mtd/nand/Makefile                          |   1 +
+ drivers/mtd/nand/atmel_nand.c                      |  96 ++--
+ drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c       |  57 ++-
+ drivers/mtd/nand/denali.c                          | 565 +++++++++++----------
+ drivers/mtd/nand/denali.h                          |  27 +-
+ drivers/mtd/nand/nand_base.c                       |  38 +-
+ drivers/mtd/nand/nand_bbt.c                        |  23 +-
+ drivers/mtd/nand/nand_ids.c                        |   4 +
+ drivers/mtd/nand/nand_timings.c                    |   2 +-
+ drivers/mtd/nand/nandsim.c                         |   2 +-
+ drivers/mtd/nand/ndfc.c                            |   3 +-
+ drivers/mtd/nand/omap2.c                           | 166 +++---
+ drivers/mtd/{devices/elm.c => nand/omap_elm.c}     |   0
+ drivers/mtd/nand/sm_common.h                       |   2 +-
+ drivers/mtd/sm_ftl.c                               |   2 +-
+ drivers/mtd/spi-nor/Kconfig                        |  14 +
+ drivers/mtd/spi-nor/spi-nor.c                      |  42 +-
+ drivers/mtd/tests/mtd_test.c                       |   4 +-
+ drivers/mtd/tests/nandbiterrs.c                    |   2 +-
+ drivers/mtd/tests/oobtest.c                        |   8 +-
+ drivers/mtd/tests/pagetest.c                       |   4 +-
+ drivers/mtd/tests/readtest.c                       |   2 +-
+ drivers/mtd/tests/speedtest.c                      |  14 +-
+ drivers/mtd/tests/subpagetest.c                    |  10 +-
+ include/linux/mtd/cfi.h                            |  22 +-
+ include/linux/mtd/nand.h                           |  12 +
+ include/linux/platform_data/elm.h                  |  16 +
+ include/linux/platform_data/mtd-nand-omap2.h       |   1 +
+ 44 files changed, 752 insertions(+), 560 deletions(-)
+ rename drivers/mtd/{devices/elm.c => nand/omap_elm.c} (100%)
+Merging crypto/master (be34c4ef693f crypto: sha - Handle unaligned input data in generic sha256 and sha512.)
+$ git merge crypto/master
+Resolved 'arch/arm64/boot/dts/apm-storm.dtsi' using previous resolution.
+Auto-merging include/linux/sched.h
+Auto-merging crypto/Kconfig
+Auto-merging arch/arm64/boot/dts/apm-storm.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm-storm.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1f9c819d8e78] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/rng/apm,rng.txt  |  17 +
+ arch/arm64/boot/dts/apm-storm.dtsi                 |  21 +
+ arch/x86/crypto/Makefile                           |   1 +
+ arch/x86/crypto/aes_ctrby8_avx-x86_64.S            |  20 +-
+ arch/x86/crypto/aesni-intel_glue.c                 |   4 +-
+ arch/x86/crypto/sha-mb/Makefile                    |  11 +
+ arch/x86/crypto/sha-mb/sha1_mb.c                   | 935 ++++++++++++++++++++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S    | 287 ++++++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S    | 327 +++++++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c     |  64 ++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S   | 228 +++++
+ arch/x86/crypto/sha-mb/sha1_x8_avx2.S              | 472 ++++++++++
+ arch/x86/crypto/sha-mb/sha_mb_ctx.h                | 136 +++
+ arch/x86/crypto/sha-mb/sha_mb_mgr.h                | 110 +++
+ crypto/Kconfig                                     |  30 +
+ crypto/Makefile                                    |   1 +
+ crypto/ahash.c                                     |  12 +-
+ crypto/algif_skcipher.c                            |   2 +-
+ crypto/drbg.c                                      | 130 +--
+ crypto/lz4.c                                       |   2 +-
+ crypto/lz4hc.c                                     |   2 +-
+ crypto/mcryptd.c                                   | 705 +++++++++++++++
+ crypto/sha256_generic.c                            |   3 +-
+ crypto/sha512_generic.c                            |   3 +-
+ crypto/testmgr.c                                   | 966 ++++++++++-----------
+ crypto/testmgr.h                                   |  66 ++
+ drivers/char/hw_random/Kconfig                     |  13 +
+ drivers/char/hw_random/Makefile                    |   1 +
+ drivers/char/hw_random/amd-rng.c                   |   4 +-
+ drivers/char/hw_random/geode-rng.c                 |   4 +-
+ drivers/char/hw_random/intel-rng.c                 |  13 +-
+ drivers/char/hw_random/pasemi-rng.c                |   2 +-
+ drivers/char/hw_random/pseries-rng.c               |   2 +-
+ drivers/char/hw_random/via-rng.c                   |   8 +-
+ drivers/char/hw_random/xgene-rng.c                 | 423 +++++++++
+ drivers/crypto/caam/caamhash.c                     |  28 +-
+ drivers/crypto/caam/ctrl.c                         | 138 +--
+ drivers/crypto/caam/intern.h                       |   9 +-
+ drivers/crypto/caam/regs.h                         |  51 +-
+ drivers/crypto/caam/sg_sw_sec4.h                   |  54 --
+ drivers/crypto/mv_cesa.h                           |   1 +
+ drivers/crypto/qat/qat_common/adf_ctl_drv.c        |   2 +-
+ .../crypto/qat/qat_common/adf_transport_internal.h |   2 +-
+ drivers/crypto/qat/qat_common/qat_algs.c           |  66 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_isr.c          |  14 +-
+ include/crypto/drbg.h                              |  19 +-
+ include/crypto/internal/hash.h                     |   9 +
+ include/crypto/mcryptd.h                           | 112 +++
+ include/linux/sched.h                              |   1 +
+ kernel/sched/core.c                                |  12 +
+ 50 files changed, 4706 insertions(+), 837 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rng/apm,rng.txt
+ create mode 100644 arch/x86/crypto/sha-mb/Makefile
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_mb.c
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S
+ create mode 100644 arch/x86/crypto/sha-mb/sha1_x8_avx2.S
+ create mode 100644 arch/x86/crypto/sha-mb/sha_mb_ctx.h
+ create mode 100644 arch/x86/crypto/sha-mb/sha_mb_mgr.h
+ create mode 100644 crypto/mcryptd.c
+ create mode 100644 drivers/char/hw_random/xgene-rng.c
+ create mode 100644 include/crypto/mcryptd.h
+Merging drm/drm-next (7a42e83d36d2 Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next)
+$ git merge drm/drm-next
+Removing include/drm/drm_usb.h
+Removing include/drm/drm_memory.h
+Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging drivers/gpu/drm/radeon/radeon_asic.h
+Auto-merging drivers/gpu/drm/radeon/radeon_asic.c
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/radeon/r600d.h
+Auto-merging drivers/gpu/drm/radeon/r600_dma.c
+Auto-merging drivers/gpu/drm/radeon/r600.c
+Auto-merging drivers/gpu/drm/radeon/r100.c
+Auto-merging drivers/gpu/drm/radeon/drm_buffer.c
+Auto-merging drivers/gpu/drm/radeon/cik_sdma.c
+Auto-merging drivers/gpu/drm/radeon/cik.c
+Removing drivers/gpu/drm/qxl/qxl_fence.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/nouveau/core/subdev/ltc/gm107.c
+Auto-merging drivers/gpu/drm/nouveau/core/subdev/ltc/gf100.c
+Auto-merging drivers/gpu/drm/nouveau/core/subdev/gpio/nv94.c
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_cmd_parser.c
+Removing drivers/gpu/drm/drm_usb.c
+Auto-merging arch/arm/mach-shmobile/board-lager-reference.c
+Auto-merging arch/arm/mach-shmobile/board-koelsch-reference.c
+Auto-merging arch/arm/boot/dts/exynos3250.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl                     |   16 +-
+ .../devicetree/bindings/drm/tilcdc/panel.txt       |    7 +
+ .../devicetree/bindings/panel/auo,b101xtn01.txt    |    7 +
+ .../devicetree/bindings/vendor-prefixes.txt        |    2 +
+ .../devicetree/bindings/video/adi,adv7123.txt      |   50 +
+ .../devicetree/bindings/video/exynos_dsim.txt      |    1 +
+ .../devicetree/bindings/video/renesas,du.txt       |   84 +
+ .../devicetree/bindings/video/samsung-fimd.txt     |    1 +
+ .../devicetree/bindings/video/thine,thc63lvdm83d   |   50 +
+ .../devicetree/bindings/video/vga-connector.txt    |   36 +
+ MAINTAINERS                                        |    2 +-
+ arch/arm/boot/dts/exynos3250.dtsi                  |   33 +
+ arch/arm/mach-shmobile/board-koelsch-reference.c   |   19 +-
+ arch/arm/mach-shmobile/board-koelsch.c             |   19 +-
+ arch/arm/mach-shmobile/board-lager-reference.c     |   19 +-
+ arch/arm/mach-shmobile/board-lager.c               |   19 +-
+ arch/arm/mach-shmobile/board-marzen.c              |   19 +-
+ drivers/gpu/drm/Kconfig                            |    8 +-
+ drivers/gpu/drm/Makefile                           |    5 +-
+ drivers/gpu/drm/armada/armada_drv.c                |    1 +
+ drivers/gpu/drm/armada/armada_gem.h                |    2 +
+ drivers/gpu/drm/ast/ast_dp501.c                    |   38 +-
+ drivers/gpu/drm/ast/ast_drv.c                      |    1 +
+ drivers/gpu/drm/ast/ast_drv.h                      |   12 +-
+ drivers/gpu/drm/ast/ast_fb.c                       |    3 +-
+ drivers/gpu/drm/ast/ast_main.c                     |   79 +-
+ drivers/gpu/drm/ast/ast_mode.c                     |   42 +-
+ drivers/gpu/drm/ast/ast_post.c                     |   23 +-
+ drivers/gpu/drm/ast/ast_tables.h                   |   38 +-
+ drivers/gpu/drm/ast/ast_ttm.c                      |   24 +-
+ drivers/gpu/drm/ati_pcigart.c                      |    2 +
+ drivers/gpu/drm/bochs/bochs.h                      |    4 +-
+ drivers/gpu/drm/bochs/bochs_drv.c                  |    1 +
+ drivers/gpu/drm/bochs/bochs_mm.c                   |   24 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.c                |    1 +
+ drivers/gpu/drm/cirrus/cirrus_drv.h                |    4 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    3 +-
+ drivers/gpu/drm/cirrus/cirrus_ttm.c                |   21 +-
+ drivers/gpu/drm/drm_agpsupport.c                   |    1 +
+ drivers/gpu/drm/drm_auth.c                         |    7 +
+ drivers/gpu/drm/drm_bufs.c                         |   94 +-
+ drivers/gpu/drm/drm_crtc.c                         |  394 +++--
+ drivers/gpu/drm/drm_debugfs.c                      |    3 +-
+ drivers/gpu/drm/drm_dma.c                          |   11 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c              |    3 +-
+ drivers/gpu/drm/drm_drv.c                          |   36 +-
+ drivers/gpu/drm/drm_edid.c                         |  119 +-
+ drivers/gpu/drm/drm_fb_helper.c                    |   85 +-
+ drivers/gpu/drm/drm_fops.c                         |   22 +-
+ drivers/gpu/drm/drm_gem.c                          |    6 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c               |    7 +-
+ drivers/gpu/drm/drm_info.c                         |   89 +-
+ drivers/gpu/drm/drm_internal.h                     |  132 ++
+ drivers/gpu/drm/drm_ioctl.c                        |  254 +--
+ drivers/gpu/drm/drm_irq.c                          |  463 ++++--
+ drivers/gpu/drm/drm_legacy.h                       |   62 +
+ drivers/gpu/drm/drm_lock.c                         |   36 +-
+ drivers/gpu/drm/drm_memory.c                       |   24 +-
+ drivers/gpu/drm/drm_mipi_dsi.c                     |    6 +
+ drivers/gpu/drm/drm_modes.c                        |    1 +
+ drivers/gpu/drm/drm_modeset_lock.c                 |  213 ++-
+ drivers/gpu/drm/drm_pci.c                          |   46 +-
+ drivers/gpu/drm/drm_platform.c                     |   38 +-
+ drivers/gpu/drm/drm_prime.c                        |    5 +-
+ drivers/gpu/drm/drm_probe_helper.c                 |   17 +
+ drivers/gpu/drm/drm_scatter.c                      |    9 +-
+ drivers/gpu/drm/drm_sysfs.c                        |    1 +
+ drivers/gpu/drm/drm_usb.c                          |   88 -
+ drivers/gpu/drm/drm_vm.c                           |   89 +-
+ drivers/gpu/drm/exynos/exynos_dp_core.c            |    8 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c           |   62 +-
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c            |    6 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c            |  104 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.h            |    1 -
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c            |   40 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.c             |    1 +
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |    4 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c           |   90 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c           |   55 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c            |  106 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.h            |   16 +-
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c            |    3 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c            |  453 ++---
+ drivers/gpu/drm/exynos/exynos_drm_ipp.h            |    4 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.c          |   19 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.h          |    3 +-
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c        |    3 +-
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c           |   19 -
+ drivers/gpu/drm/exynos/exynos_hdmi.c               |    4 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c              |    3 -
+ drivers/gpu/drm/gma500/cdv_intel_dp.c              |    4 +-
+ drivers/gpu/drm/gma500/framebuffer.c               |    3 +-
+ drivers/gpu/drm/gma500/gtt.h                       |    1 +
+ drivers/gpu/drm/gma500/intel_bios.c                |   16 +-
+ drivers/gpu/drm/gma500/psb_drv.c                   |    1 +
+ drivers/gpu/drm/i810/i810_dma.c                    |   16 +-
+ drivers/gpu/drm/i810/i810_drv.c                    |    3 +-
+ drivers/gpu/drm/i810/i810_drv.h                    |    2 +
+ drivers/gpu/drm/i915/Makefile                      |    1 +
+ drivers/gpu/drm/i915/dvo_ns2501.c                  |  560 ++++---
+ drivers/gpu/drm/i915/i915_cmd_parser.c             |    4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c                |  358 +++-
+ drivers/gpu/drm/i915/i915_dma.c                    |   31 +-
+ drivers/gpu/drm/i915/i915_drv.c                    |  192 ++-
+ drivers/gpu/drm/i915/i915_drv.h                    |  238 ++-
+ drivers/gpu/drm/i915/i915_gem.c                    |  236 ++-
+ drivers/gpu/drm/i915/i915_gem_context.c            |  216 +--
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c         |  227 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.c                |  291 ++--
+ drivers/gpu/drm/i915/i915_gem_gtt.h                |   32 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c       |   40 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.h       |   47 +
+ drivers/gpu/drm/i915/i915_gem_tiling.c             |   11 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c              |  196 ++-
+ drivers/gpu/drm/i915/i915_irq.c                    |  262 +--
+ drivers/gpu/drm/i915/i915_params.c                 |    6 +
+ drivers/gpu/drm/i915/i915_reg.h                    |  276 +++-
+ drivers/gpu/drm/i915/i915_sysfs.c                  |    2 +-
+ drivers/gpu/drm/i915/intel_bios.c                  |   29 +-
+ drivers/gpu/drm/i915/intel_bios.h                  |    3 +-
+ drivers/gpu/drm/i915/intel_ddi.c                   |  344 ++--
+ drivers/gpu/drm/i915/intel_display.c               | 1247 +++++++++-----
+ drivers/gpu/drm/i915/intel_dp.c                    | 1223 +++++++++-----
+ drivers/gpu/drm/i915/intel_drv.h                   |   38 +-
+ drivers/gpu/drm/i915/intel_dsi.c                   |   40 +-
+ drivers/gpu/drm/i915/intel_dsi.h                   |    2 +
+ drivers/gpu/drm/i915/intel_dsi_cmd.c               |    2 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c         |   38 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c               |   17 +-
+ drivers/gpu/drm/i915/intel_dvo.c                   |   11 +-
+ drivers/gpu/drm/i915/intel_fbdev.c                 |   83 +-
+ drivers/gpu/drm/i915/intel_hdmi.c                  |  168 +-
+ drivers/gpu/drm/i915/intel_lrc.c                   | 1745 ++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_lrc.h                   |  114 ++
+ drivers/gpu/drm/i915/intel_lvds.c                  |    3 +-
+ drivers/gpu/drm/i915/intel_panel.c                 |   29 +-
+ drivers/gpu/drm/i915/intel_pm.c                    | 1026 +++++++++---
+ drivers/gpu/drm/i915/intel_renderstate.h           |    8 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c            |  262 ++-
+ drivers/gpu/drm/i915/intel_ringbuffer.h            |   46 +-
+ drivers/gpu/drm/i915/intel_sprite.c                |  109 +-
+ drivers/gpu/drm/i915/intel_uncore.c                |    6 +-
+ drivers/gpu/drm/mga/mga_dma.c                      |   77 +-
+ drivers/gpu/drm/mga/mga_drv.c                      |    3 +-
+ drivers/gpu/drm/mga/mga_drv.h                      |    2 +
+ drivers/gpu/drm/mgag200/mgag200_drv.c              |    1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h              |    6 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c               |    3 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c             |   21 +-
+ drivers/gpu/drm/mgag200/mgag200_ttm.c              |   24 +-
+ drivers/gpu/drm/msm/Kconfig                        |    1 +
+ drivers/gpu/drm/msm/Makefile                       |    4 +
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h              |    6 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h              |   12 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |  214 +--
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |    6 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c         |  285 ++++
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  151 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h            |   17 +-
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        |   10 +-
+ drivers/gpu/drm/msm/dsi/dsi.xml.h                  |   10 +-
+ drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |   18 +-
+ drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |   10 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c                    |    4 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.xml.h                |   10 +-
+ drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |   10 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h            |  107 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c           |   21 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c    |    2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c            |   89 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h            |   63 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c   |  506 ++++++
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c |  151 ++
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c       |  172 ++
+ drivers/gpu/drm/msm/msm_drv.c                      |   38 +-
+ drivers/gpu/drm/msm/msm_drv.h                      |    3 +-
+ drivers/gpu/drm/msm/msm_gem_prime.c                |    5 +-
+ drivers/gpu/drm/msm/msm_gpu.h                      |    6 +-
+ drivers/gpu/drm/nouveau/Makefile                   |   12 +-
+ drivers/gpu/drm/nouveau/core/core/client.c         |    7 +-
+ drivers/gpu/drm/nouveau/core/core/event.c          |    2 +-
+ drivers/gpu/drm/nouveau/core/core/gpuobj.c         |    2 +-
+ drivers/gpu/drm/nouveau/core/core/ioctl.c          |    3 +-
+ drivers/gpu/drm/nouveau/core/core/mm.c             |   97 +-
+ drivers/gpu/drm/nouveau/core/core/notify.c         |    7 +-
+ drivers/gpu/drm/nouveau/core/engine/device/base.c  |    3 +-
+ drivers/gpu/drm/nouveau/core/engine/device/gm100.c |    9 +-
+ drivers/gpu/drm/nouveau/core/engine/device/nv50.c  |   37 +-
+ drivers/gpu/drm/nouveau/core/engine/device/nvc0.c  |   24 +-
+ drivers/gpu/drm/nouveau/core/engine/device/nve0.c  |    8 +
+ drivers/gpu/drm/nouveau/core/engine/disp/base.c    |    6 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/conn.c    |    4 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/gm107.c   |    6 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c |   15 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c |   20 +-
+ .../gpu/drm/nouveau/core/engine/disp/hdminvd0.c    |    3 -
+ .../gpu/drm/nouveau/core/engine/disp/hdminve0.c    |   83 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nv50.c    |  129 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/nv50.h    |   10 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nv84.c    |    4 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nv94.c    |    4 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nva0.c    |    4 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nva3.c    |    4 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c    |   80 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/nve0.c    |    6 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c    |    6 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c  |    4 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/priv.h    |    3 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/base.c    |    6 +-
+ .../gpu/drm/nouveau/core/engine/software/nv50.c    |    3 +-
+ drivers/gpu/drm/nouveau/core/include/core/client.h |    2 +-
+ drivers/gpu/drm/nouveau/core/include/core/device.h |    1 +
+ drivers/gpu/drm/nouveau/core/include/core/event.h  |    3 +-
+ drivers/gpu/drm/nouveau/core/include/core/mm.h     |   12 +-
+ drivers/gpu/drm/nouveau/core/include/core/notify.h |    5 +-
+ drivers/gpu/drm/nouveau/core/include/engine/fifo.h |    3 +-
+ drivers/gpu/drm/nouveau/core/include/subdev/bar.h  |    1 -
+ .../drm/nouveau/core/include/subdev/bios/M0205.h   |   32 +
+ .../drm/nouveau/core/include/subdev/bios/M0209.h   |   30 +
+ .../gpu/drm/nouveau/core/include/subdev/bios/fan.h |    8 +
+ .../drm/nouveau/core/include/subdev/bios/ramcfg.h  |  160 +-
+ .../drm/nouveau/core/include/subdev/bios/rammap.h  |    5 +-
+ .../drm/nouveau/core/include/subdev/bios/therm.h   |   10 +-
+ .../gpu/drm/nouveau/core/include/subdev/clock.h    |    1 +
+ drivers/gpu/drm/nouveau/core/include/subdev/fb.h   |    7 +-
+ .../drm/nouveau/core/include/subdev/fb/regsnv04.h  |   21 +
+ drivers/gpu/drm/nouveau/core/include/subdev/fuse.h |   30 +
+ drivers/gpu/drm/nouveau/core/include/subdev/gpio.h |    2 +-
+ drivers/gpu/drm/nouveau/core/include/subdev/pwr.h  |    3 +
+ .../gpu/drm/nouveau/core/include/subdev/therm.h    |    1 +
+ drivers/gpu/drm/nouveau/core/subdev/bar/base.c     |   38 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/M0205.c   |  136 ++
+ drivers/gpu/drm/nouveau/core/subdev/bios/M0209.c   |  137 ++
+ drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c     |    1 +
+ drivers/gpu/drm/nouveau/core/subdev/bios/fan.c     |   93 ++
+ drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c  |   74 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/timing.c  |    8 +
+ drivers/gpu/drm/nouveau/core/subdev/clock/base.c   |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c   |  303 +++-
+ drivers/gpu/drm/nouveau/core/subdev/clock/nva3.h   |   10 +-
+ drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c   |   37 +-
+ .../gpu/drm/nouveau/core/subdev/devinit/fbmem.h    |   18 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c     |    4 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c      |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/priv.h      |    1 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h    |   82 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnv04.c   |   17 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c   |   24 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c   |   96 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c   |    9 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c   |  490 ++++--
+ drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c     |   94 ++
+ drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c     |   47 +-
+ drivers/gpu/drm/nouveau/core/subdev/fuse/base.c    |   54 +
+ drivers/gpu/drm/nouveau/core/subdev/fuse/g80.c     |   81 +
+ drivers/gpu/drm/nouveau/core/subdev/fuse/gf100.c   |   83 +
+ drivers/gpu/drm/nouveau/core/subdev/fuse/gm107.c   |   66 +
+ drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h    |    9 +
+ drivers/gpu/drm/nouveau/core/subdev/gpio/base.c    |    3 +-
+ .../nouveau/core/subdev/gpio/{nv92.c => nv94.c}    |   12 +-
+ drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c    |    4 +-
+ drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h    |    4 +-
+ drivers/gpu/drm/nouveau/core/subdev/i2c/base.c     |    4 +-
+ drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/ltc/base.c     |    2 +-
+ drivers/gpu/drm/nouveau/core/subdev/ltc/gf100.c    |   39 +-
+ drivers/gpu/drm/nouveau/core/subdev/ltc/gm107.c    |    5 -
+ drivers/gpu/drm/nouveau/core/subdev/ltc/priv.h     |    2 +
+ drivers/gpu/drm/nouveau/core/subdev/pwr/base.c     |    2 +
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/arith.fuc  |   94 ++
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/kernel.fuc |  122 +-
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc |   20 +
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc   |  133 +-
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc  |    4 +
+ .../drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h    |  903 ++++++----
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc   |    4 +
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h | 1270 +++++++-------
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc   |    4 +
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h | 1300 ++++++++-------
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc   |    4 +
+ .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h |  869 ++++++----
+ drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/os.h   |   11 +-
+ drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c     |   58 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/fan.c    |    9 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c |    8 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/gm107.c  |   93 ++
+ drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c   |   38 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c   |    2 +
+ drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c   |    4 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/priv.h   |    3 +
+ drivers/gpu/drm/nouveau/core/subdev/vm/base.c      |    2 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c            |    2 +-
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c         |   15 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.c            |    2 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c               |  120 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h               |    9 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c             |    4 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.h             |    2 +
+ drivers/gpu/drm/nouveau/nouveau_connector.c        |    6 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.h        |    4 +
+ drivers/gpu/drm/nouveau/nouveau_display.c          |   29 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c              |   39 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.h              |    4 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    5 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.h            |    3 +
+ drivers/gpu/drm/nouveau/nouveau_fence.c            |  551 ++++--
+ drivers/gpu/drm/nouveau/nouveau_fence.h            |   29 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c              |  180 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h              |    2 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c            |   10 +-
+ drivers/gpu/drm/nouveau/nouveau_sysfs.c            |    2 +-
+ drivers/gpu/drm/nouveau/nouveau_sysfs.h            |    2 +
+ drivers/gpu/drm/nouveau/nouveau_ttm.c              |   11 +-
+ drivers/gpu/drm/nouveau/nv04_fence.c               |    8 +-
+ drivers/gpu/drm/nouveau/nv10_fence.c               |    8 +-
+ drivers/gpu/drm/nouveau/nv17_fence.c               |    6 +-
+ drivers/gpu/drm/nouveau/nv50_display.c             |   46 +-
+ drivers/gpu/drm/nouveau/nv50_fence.c               |    6 +-
+ drivers/gpu/drm/nouveau/nv84_fence.c               |   31 +-
+ drivers/gpu/drm/nouveau/nvif/class.h               |    9 +
+ drivers/gpu/drm/omapdrm/omap_drv.c                 |    1 +
+ drivers/gpu/drm/omapdrm/omap_drv.h                 |    1 +
+ drivers/gpu/drm/panel/panel-simple.c               |   27 +
+ drivers/gpu/drm/qxl/Makefile                       |    2 +-
+ drivers/gpu/drm/qxl/qxl_cmd.c                      |    7 -
+ drivers/gpu/drm/qxl/qxl_debugfs.c                  |   14 +-
+ drivers/gpu/drm/qxl/qxl_display.c                  |   49 +
+ drivers/gpu/drm/qxl/qxl_drv.c                      |   33 +-
+ drivers/gpu/drm/qxl/qxl_drv.h                      |   36 +-
+ drivers/gpu/drm/qxl/qxl_fb.c                       |    3 +-
+ drivers/gpu/drm/qxl/qxl_fence.c                    |   91 -
+ drivers/gpu/drm/qxl/qxl_kms.c                      |   17 +-
+ drivers/gpu/drm/qxl/qxl_object.c                   |   21 +-
+ drivers/gpu/drm/qxl/qxl_object.h                   |    6 +-
+ drivers/gpu/drm/qxl/qxl_prime.c                    |   72 +
+ drivers/gpu/drm/qxl/qxl_release.c                  |  174 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c                      |  103 +-
+ drivers/gpu/drm/r128/r128_cce.c                    |   24 +-
+ drivers/gpu/drm/r128/r128_drv.c                    |    3 +-
+ drivers/gpu/drm/r128/r128_drv.h                    |    3 +
+ drivers/gpu/drm/radeon/Makefile                    |    4 +-
+ drivers/gpu/drm/radeon/atombios_dp.c               |    4 +-
+ drivers/gpu/drm/radeon/cik.c                       |   31 +-
+ drivers/gpu/drm/radeon/cik_sdma.c                  |   25 +-
+ drivers/gpu/drm/{ => radeon}/drm_buffer.c          |    6 +-
+ .../drm => drivers/gpu/drm/radeon}/drm_buffer.h    |    0
+ drivers/gpu/drm/radeon/evergreen_dma.c             |   24 +-
+ drivers/gpu/drm/radeon/r100.c                      |   21 +-
+ drivers/gpu/drm/radeon/r200.c                      |   21 +-
+ drivers/gpu/drm/radeon/r300_cmdbuf.c               |    2 +-
+ drivers/gpu/drm/radeon/r600.c                      |  155 +-
+ drivers/gpu/drm/radeon/r600_cp.c                   |   26 +-
+ drivers/gpu/drm/radeon/r600_dma.c                  |   25 +-
+ drivers/gpu/drm/radeon/r600d.h                     |   41 +-
+ drivers/gpu/drm/radeon/radeon.h                    |  118 +-
+ drivers/gpu/drm/radeon/radeon_asic.c               |   25 +-
+ drivers/gpu/drm/radeon/radeon_asic.h               |   77 +-
+ drivers/gpu/drm/radeon/radeon_benchmark.c          |   30 +-
+ drivers/gpu/drm/radeon/radeon_cp.c                 |   46 +-
+ drivers/gpu/drm/radeon/radeon_cs.c                 |   53 +-
+ drivers/gpu/drm/radeon/radeon_device.c             |   61 +-
+ drivers/gpu/drm/radeon/radeon_display.c            |   13 +-
+ drivers/gpu/drm/radeon/radeon_drv.c                |   13 +-
+ drivers/gpu/drm/radeon/radeon_drv.h                |    2 +
+ drivers/gpu/drm/radeon/radeon_fb.c                 |    3 +-
+ drivers/gpu/drm/radeon/radeon_fence.c              |  472 ++++--
+ drivers/gpu/drm/radeon/radeon_gem.c                |  119 +-
+ drivers/gpu/drm/radeon/radeon_ib.c                 |    3 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c            |   33 +-
+ drivers/gpu/drm/radeon/radeon_kms.c                |    1 +
+ drivers/gpu/drm/radeon/radeon_mn.c                 |  274 +++
+ drivers/gpu/drm/radeon/radeon_object.c             |   98 +-
+ drivers/gpu/drm/radeon/radeon_pm.c                 |    2 +-
+ drivers/gpu/drm/radeon/radeon_prime.c              |   15 +-
+ drivers/gpu/drm/radeon/radeon_ring.c               |   21 -
+ drivers/gpu/drm/radeon/radeon_semaphore.c          |   38 +-
+ drivers/gpu/drm/radeon/radeon_state.c              |    2 +-
+ drivers/gpu/drm/radeon/radeon_test.c               |   24 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c                |  235 ++-
+ drivers/gpu/drm/radeon/radeon_uvd.c                |  156 +-
+ drivers/gpu/drm/radeon/radeon_vm.c                 |   19 +-
+ drivers/gpu/drm/radeon/rv770_dma.c                 |   25 +-
+ drivers/gpu/drm/radeon/si_dma.c                    |   25 +-
+ drivers/gpu/drm/radeon/uvd_v1_0.c                  |  107 +-
+ drivers/gpu/drm/radeon/uvd_v2_2.c                  |    4 +
+ drivers/gpu/drm/rcar-du/Kconfig                    |    1 +
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  173 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.h              |    4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |   13 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.h          |    5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_group.c            |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_group.h            |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c              |  233 ++-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.h              |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c          |   45 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h          |    5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c          |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h          |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c            |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.h            |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vgacon.c           |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vgacon.h           |    2 +-
+ drivers/gpu/drm/savage/savage_bci.c                |   39 +-
+ drivers/gpu/drm/savage/savage_drv.c                |    3 +-
+ drivers/gpu/drm/savage/savage_drv.h                |    2 +
+ drivers/gpu/drm/shmobile/shmob_drm_backlight.c     |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_backlight.h     |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h          |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c           |    3 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.h           |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c           |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.h           |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c         |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.h         |    2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_regs.h          |    2 +-
+ drivers/gpu/drm/sis/sis_drv.c                      |    3 +-
+ drivers/gpu/drm/sis/sis_drv.h                      |    2 +
+ drivers/gpu/drm/sis/sis_mm.c                       |    6 +-
+ drivers/gpu/drm/sti/sti_vtac.c                     |   12 +-
+ drivers/gpu/drm/tdfx/tdfx_drv.c                    |    4 +-
+ drivers/gpu/drm/tegra/dpaux.c                      |    4 +-
+ drivers/gpu/drm/tegra/gem.h                        |    1 +
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c                |   61 +-
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c              |   74 +-
+ drivers/gpu/drm/ttm/ttm_bo.c                       |  304 ++--
+ drivers/gpu/drm/ttm/ttm_bo_manager.c               |    9 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c                  |   48 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    8 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c             |  160 +-
+ drivers/gpu/drm/ttm/ttm_memory.c                   |    3 +-
+ drivers/gpu/drm/udl/Kconfig                        |    3 +-
+ drivers/gpu/drm/udl/udl_connector.c                |    4 +-
+ drivers/gpu/drm/udl/udl_drv.c                      |  102 +-
+ drivers/gpu/drm/udl/udl_drv.h                      |    2 +
+ drivers/gpu/drm/udl/udl_fb.c                       |    3 +-
+ drivers/gpu/drm/udl/udl_main.c                     |    8 +-
+ drivers/gpu/drm/via/via_dma.c                      |    4 +-
+ drivers/gpu/drm/via/via_drv.c                      |    3 +-
+ drivers/gpu/drm/via/via_drv.h                      |    2 +
+ drivers/gpu/drm/via/via_map.c                      |    6 +-
+ drivers/gpu/drm/via/via_mm.c                       |    6 +-
+ drivers/gpu/drm/via/via_verifier.c                 |    1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c             |  183 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c             |   22 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |   27 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  346 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h              |   35 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c               |   11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |    3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |   50 +-
+ drivers/gpu/ipu-v3/Makefile                        |    3 +-
+ drivers/gpu/ipu-v3/ipu-common.c                    |  916 +++++-----
+ drivers/gpu/ipu-v3/ipu-cpmem.c                     |  764 +++++++++
+ drivers/gpu/ipu-v3/ipu-csi.c                       |  741 +++++++++
+ drivers/gpu/ipu-v3/ipu-ic.c                        |  778 +++++++++
+ drivers/gpu/ipu-v3/ipu-prv.h                       |   44 +-
+ drivers/gpu/ipu-v3/ipu-smfc.c                      |  156 +-
+ drivers/staging/imx-drm/imx-drm-core.c             |    1 +
+ drivers/staging/imx-drm/ipuv3-plane.c              |   16 +-
+ drivers/video/fbdev/Kconfig                        |    4 +
+ drivers/video/fbdev/core/Makefile                  |    1 +
+ drivers/video/fbdev/core/fb_cmdline.c              |  110 ++
+ drivers/video/fbdev/core/fbmem.c                   |   92 --
+ drivers/video/fbdev/core/modedb.c                  |    3 -
+ include/drm/ati_pcigart.h                          |   30 +
+ include/drm/drmP.h                                 |  721 +-------
+ include/drm/drm_agpsupport.h                       |   26 +-
+ include/drm/drm_crtc.h                             |   30 +-
+ include/drm/drm_dp_helper.h                        |   16 +-
+ include/drm/drm_fb_helper.h                        |    1 -
+ include/drm/drm_gem.h                              |  183 ++
+ include/drm/drm_gem_cma_helper.h                   |    4 +-
+ include/drm/drm_legacy.h                           |  203 +++
+ include/drm/drm_memory.h                           |   59 -
+ include/drm/drm_mipi_dsi.h                         |    2 +
+ include/drm/drm_modeset_lock.h                     |   20 +-
+ include/drm/drm_usb.h                              |   15 -
+ include/drm/ttm/ttm_bo_api.h                       |   49 +-
+ include/drm/ttm/ttm_bo_driver.h                    |   32 +-
+ include/drm/ttm/ttm_execbuf_util.h                 |   24 +-
+ include/linux/platform_data/rcar-du.h              |    4 +-
+ include/uapi/drm/exynos_drm.h                      |   40 -
+ include/uapi/drm/radeon_drm.h                      |   23 +
+ include/uapi/drm/vmwgfx_drm.h                      |    2 +-
+ include/video/imx-ipu-v3.h                         |  326 ++--
+ 496 files changed, 24767 insertions(+), 11130 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/panel/auo,b101xtn01.txt
+ create mode 100644 Documentation/devicetree/bindings/video/adi,adv7123.txt
+ create mode 100644 Documentation/devicetree/bindings/video/renesas,du.txt
+ create mode 100644 Documentation/devicetree/bindings/video/thine,thc63lvdm83d
+ create mode 100644 Documentation/devicetree/bindings/video/vga-connector.txt
+ create mode 100644 drivers/gpu/drm/drm_internal.h
+ delete mode 100644 drivers/gpu/drm/drm_usb.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h
+ create mode 100644 drivers/gpu/drm/i915/intel_lrc.c
+ create mode 100644 drivers/gpu/drm/i915/intel_lrc.h
+ create mode 100644 drivers/gpu/drm/msm/adreno/adreno_device.c
+ create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c
+ create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
+ create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdminve0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0205.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0209.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/fan.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fb/regsnv04.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fuse.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/M0205.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/M0209.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/fan.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/base.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/g80.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/gf100.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/gm107.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h
+ rename drivers/gpu/drm/nouveau/core/subdev/gpio/{nv92.c => nv94.c} (88%)
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/arith.fuc
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/therm/gm107.c
+ delete mode 100644 drivers/gpu/drm/qxl/qxl_fence.c
+ create mode 100644 drivers/gpu/drm/qxl/qxl_prime.c
+ rename drivers/gpu/drm/{ => radeon}/drm_buffer.c (96%)
+ rename {include/drm => drivers/gpu/drm/radeon}/drm_buffer.h (100%)
+ create mode 100644 drivers/gpu/drm/radeon/radeon_mn.c
+ create mode 100644 drivers/gpu/ipu-v3/ipu-cpmem.c
+ create mode 100644 drivers/gpu/ipu-v3/ipu-csi.c
+ create mode 100644 drivers/gpu/ipu-v3/ipu-ic.c
+ create mode 100644 drivers/video/fbdev/core/fb_cmdline.c
+ create mode 100644 include/drm/ati_pcigart.h
+ create mode 100644 include/drm/drm_gem.h
+ create mode 100644 include/drm/drm_legacy.h
+ delete mode 100644 include/drm/drm_memory.h
+ delete mode 100644 include/drm/drm_usb.h
+Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (ebb69c951756 drm/i915: Enable pixel replicated modes on BDW and HSW.)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_debugfs.c     |  34 +----
+ drivers/gpu/drm/i915/i915_drv.c         |   2 -
+ drivers/gpu/drm/i915/i915_drv.h         |  28 +---
+ drivers/gpu/drm/i915/i915_gem.c         | 134 ++++++++++-------
+ drivers/gpu/drm/i915/i915_gem_evict.c   |   4 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c  |  13 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c |  31 ++--
+ drivers/gpu/drm/i915/i915_irq.c         |  21 ---
+ drivers/gpu/drm/i915/i915_reg.h         |  15 +-
+ drivers/gpu/drm/i915/intel_display.c    |  73 +++++++--
+ drivers/gpu/drm/i915/intel_dp.c         |  36 ++---
+ drivers/gpu/drm/i915/intel_hdmi.c       |   2 +-
+ drivers/gpu/drm/i915/intel_lrc.c        |  29 +++-
+ drivers/gpu/drm/i915/intel_pm.c         | 254 +++++++-------------------------
+ drivers/gpu/drm/i915/intel_ringbuffer.c |  20 +--
+ 15 files changed, 297 insertions(+), 399 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (7d1311b93e58 Linux 3.17-rc1)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging sound/for-next (0cae90a96c15 ALSA: ctxfi: pr_* replaced with dev_*)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_conexant.c
+Auto-merging sound/core/pcm_lib.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/writing-an-alsa-driver.tmpl |   28 +-
+ include/sound/pcm.h                               |   52 +-
+ include/sound/vx_core.h                           |    7 +-
+ include/uapi/sound/asound.h                       |    3 +-
+ sound/core/pcm.c                                  |    2 +
+ sound/core/pcm_lib.c                              |   10 +-
+ sound/core/pcm_misc.c                             |    4 +
+ sound/core/pcm_native.c                           |  136 ++-
+ sound/drivers/vx/vx_core.c                        |   49 +-
+ sound/drivers/vx/vx_mixer.c                       |   12 +-
+ sound/drivers/vx/vx_pcm.c                         |   68 +-
+ sound/drivers/vx/vx_uer.c                         |   23 +-
+ sound/pci/au88x0/au88x0.c                         |   22 +-
+ sound/pci/au88x0/au88x0_a3d.c                     |   10 +-
+ sound/pci/au88x0/au88x0_core.c                    |   76 +-
+ sound/pci/au88x0/au88x0_eq.c                      |    2 +-
+ sound/pci/au88x0/au88x0_game.c                    |    2 +-
+ sound/pci/au88x0/au88x0_mpu401.c                  |    2 +-
+ sound/pci/au88x0/au88x0_pcm.c                     |    8 +-
+ sound/pci/au88x0/au88x0_synth.c                   |   26 +-
+ sound/pci/ctxfi/ctamixer.c                        |   12 +-
+ sound/pci/ctxfi/ctamixer.h                        |    7 +-
+ sound/pci/ctxfi/ctatc.c                           |   52 +-
+ sound/pci/ctxfi/ctatc.h                           |    2 +-
+ sound/pci/ctxfi/ctdaio.c                          |   42 +-
+ sound/pci/ctxfi/ctdaio.h                          |    8 +-
+ sound/pci/ctxfi/cthardware.h                      |    4 +-
+ sound/pci/ctxfi/cthw20k1.c                        |   22 +-
+ sound/pci/ctxfi/cthw20k2.c                        |   39 +-
+ sound/pci/ctxfi/ctmixer.c                         |    8 +-
+ sound/pci/ctxfi/ctpcm.c                           |    9 +-
+ sound/pci/ctxfi/ctresource.c                      |   55 +-
+ sound/pci/ctxfi/ctresource.h                      |    9 +-
+ sound/pci/ctxfi/ctsrc.c                           |   18 +-
+ sound/pci/ctxfi/ctsrc.h                           |    7 +-
+ sound/pci/ctxfi/ctvmem.c                          |   14 +-
+ sound/pci/ctxfi/xfi.c                             |   17 +-
+ sound/pci/hda/hda_auto_parser.c                   |   21 +-
+ sound/pci/hda/hda_auto_parser.h                   |    1 +
+ sound/pci/hda/hda_codec.c                         |  135 +--
+ sound/pci/hda/hda_codec.h                         |    2 -
+ sound/pci/hda/hda_generic.c                       |   49 +-
+ sound/pci/hda/hda_generic.h                       |   19 +-
+ sound/pci/hda/hda_jack.c                          |   83 +-
+ sound/pci/hda/hda_jack.h                          |   44 +-
+ sound/pci/hda/hda_local.h                         |   14 +-
+ sound/pci/hda/hda_sysfs.c                         |    2 +-
+ sound/pci/hda/patch_ca0132.c                      |   74 +-
+ sound/pci/hda/patch_cirrus.c                      |    5 +-
+ sound/pci/hda/patch_conexant.c                    |   11 +-
+ sound/pci/hda/patch_hdmi.c                        |   18 +-
+ sound/pci/hda/patch_realtek.c                     | 1194 ++++++++++-----------
+ sound/pci/hda/patch_sigmatel.c                    |   91 +-
+ sound/pci/hda/patch_via.c                         |   30 +-
+ sound/pci/ice1712/ice1712.c                       |    2 +-
+ sound/pci/lx6464es/lx6464es.c                     |   43 +-
+ sound/pci/lx6464es/lx6464es.h                     |    9 +-
+ sound/pci/lx6464es/lx_core.c                      |  252 ++---
+ sound/pci/lx6464es/lx_core.h                      |    4 +-
+ sound/pci/mixart/mixart.c                         |   17 +-
+ sound/pci/mixart/mixart.h                         |   10 +-
+ sound/pci/mixart/mixart_core.c                    |   79 +-
+ sound/pci/mixart/mixart_core.h                    |    2 +-
+ sound/pci/oxygen/oxygen_pcm.c                     |   10 +
+ sound/pci/oxygen/virtuoso.c                       |    1 +
+ sound/pci/oxygen/xonar_pcm179x.c                  |  166 ++-
+ sound/pci/pcxhr/pcxhr.c                           |   43 +-
+ sound/pci/pcxhr/pcxhr.h                           |    8 +-
+ sound/pci/pcxhr/pcxhr_core.c                      |  102 +-
+ sound/pci/pcxhr/pcxhr_core.h                      |    2 +-
+ sound/pci/vx222/vx222.c                           |    5 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.c                |   13 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.h                |    5 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_core.c           |    8 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_irq.c            |   23 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c            |    5 +-
+ sound/pcmcia/vx/vxp_ops.c                         |   10 +-
+ sound/pcmcia/vx/vxpocket.c                        |   13 +-
+ sound/usb/midi.c                                  |   11 +
+ sound/usb/quirks.c                                |   16 +
+ 80 files changed, 1759 insertions(+), 1760 deletions(-)
+Merging sound-asoc/for-next (74b6b7b77987 Merge remote-tracking branches 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regmap/regmap.txt          |  47 ++
+ .../devicetree/bindings/sound/adi,ssm2602.txt      |  19 +
+ .../devicetree/bindings/sound/cs35l32.txt          |  62 ++
+ Documentation/devicetree/bindings/sound/es8328.txt |  38 ++
+ .../devicetree/bindings/sound/fsl,ssi.txt          |   8 +-
+ .../devicetree/bindings/sound/fsl-asoc-card.txt    |  82 +++
+ .../devicetree/bindings/sound/fsl-sai.txt          |  30 +-
+ .../devicetree/bindings/sound/imx-audio-es8328.txt |  60 ++
+ Documentation/devicetree/bindings/sound/rt5677.txt |  59 ++
+ .../devicetree/bindings/sound/ssm4567.txt          |  15 +
+ .../devicetree/bindings/vendor-prefixes.txt        |   1 +
+ drivers/base/regmap/regmap-i2c.c                   |   2 +
+ drivers/base/regmap/regmap-spi.c                   |   2 +
+ drivers/base/regmap/regmap.c                       |  74 +-
+ include/dt-bindings/sound/cs35l32.h                |  26 +
+ include/sound/rt5645.h                             |   3 +
+ include/sound/rt5677.h                             |  13 +-
+ include/sound/soc-dapm.h                           |   4 +-
+ include/sound/soc.h                                | 101 +--
+ include/trace/events/asoc.h                        |   6 +-
+ sound/soc/codecs/88pm860x-codec.c                  |   3 -
+ sound/soc/codecs/Kconfig                           |  35 +-
+ sound/soc/codecs/Makefile                          |  10 +
+ sound/soc/codecs/ab8500-codec.c                    |  73 +-
+ sound/soc/codecs/ac97.c                            |  15 -
+ sound/soc/codecs/adau1373.c                        |  21 -
+ sound/soc/codecs/adau1761.c                        |   2 +-
+ sound/soc/codecs/adau1781.c                        |   2 +-
+ sound/soc/codecs/adau17x1.c                        |   8 -
+ sound/soc/codecs/adau17x1.h                        |   1 -
+ sound/soc/codecs/adav80x.c                         |  23 +-
+ sound/soc/codecs/cs35l32.c                         | 631 +++++++++++++++++
+ sound/soc/codecs/cs35l32.h                         |  93 +++
+ sound/soc/codecs/cs4265.c                          |   1 +
+ sound/soc/codecs/cs42l52.c                         |  24 +-
+ sound/soc/codecs/cs42l56.c                         |  27 +-
+ sound/soc/codecs/cs42l73.c                         |  25 +-
+ sound/soc/codecs/da732x.c                          |  25 -
+ sound/soc/codecs/es8328-i2c.c                      |  60 ++
+ sound/soc/codecs/es8328-spi.c                      |  49 ++
+ sound/soc/codecs/es8328.c                          | 756 +++++++++++++++++++++
+ sound/soc/codecs/es8328.h                          | 314 +++++++++
+ sound/soc/codecs/jz4740.c                          |  30 +-
+ sound/soc/codecs/lm49453.c                         |  14 -
+ sound/soc/codecs/max98090.c                        | 146 +++-
+ sound/soc/codecs/max98090.h                        |  13 +-
+ sound/soc/codecs/ml26124.c                         |  24 +-
+ sound/soc/codecs/rt286.c                           |   2 +
+ sound/soc/codecs/rt5640.c                          |  49 +-
+ sound/soc/codecs/rt5640.h                          |   3 +
+ sound/soc/codecs/rt5645.c                          |  99 +++
+ sound/soc/codecs/rt5645.h                          |   5 +
+ sound/soc/codecs/rt5677.c                          | 327 ++++++++-
+ sound/soc/codecs/rt5677.h                          | 171 ++++-
+ sound/soc/codecs/sgtl5000.c                        |  30 +-
+ sound/soc/codecs/ssm2518.c                         |  13 -
+ sound/soc/codecs/ssm2602-i2c.c                     |   9 +
+ sound/soc/codecs/ssm2602-spi.c                     |   7 +
+ sound/soc/codecs/ssm2602.c                         |  39 +-
+ sound/soc/codecs/ssm4567.c                         | 343 ++++++++++
+ sound/soc/codecs/tas2552.c                         |  70 +-
+ sound/soc/codecs/tlv320aic31xx.c                   | 107 ++-
+ sound/soc/codecs/tlv320aic31xx.h                   |   3 +-
+ sound/soc/codecs/tlv320aic3x.c                     |  16 -
+ sound/soc/codecs/wm5100.c                          |   5 +-
+ sound/soc/codecs/wm8350.c                          |   2 +-
+ sound/soc/codecs/wm8741.c                          |   1 -
+ sound/soc/codecs/wm8753.c                          |   2 +-
+ sound/soc/codecs/wm8804.c                          |  19 -
+ sound/soc/codecs/wm8903.c                          |   6 +-
+ sound/soc/codecs/wm8962.c                          |   5 +-
+ sound/soc/codecs/wm8971.c                          |   2 +-
+ sound/soc/codecs/wm8994.c                          |  18 +-
+ sound/soc/codecs/wm8995.c                          |  19 -
+ sound/soc/codecs/wm8996.c                          |   6 +-
+ sound/soc/davinci/Kconfig                          |   3 +-
+ sound/soc/davinci/davinci-mcasp.c                  |  79 ++-
+ sound/soc/davinci/edma-pcm.c                       |   2 +
+ sound/soc/fsl/Kconfig                              |  26 +
+ sound/soc/fsl/Makefile                             |   4 +
+ sound/soc/fsl/fsl-asoc-card.c                      | 574 ++++++++++++++++
+ sound/soc/fsl/fsl_asrc.c                           |   6 +-
+ sound/soc/fsl/fsl_esai.c                           |  19 +-
+ sound/soc/fsl/fsl_esai.h                           |   8 +-
+ sound/soc/fsl/fsl_sai.c                            |  58 +-
+ sound/soc/fsl/fsl_sai.h                            |   8 +-
+ sound/soc/fsl/fsl_spdif.c                          |   5 +-
+ sound/soc/fsl/fsl_ssi.c                            |  89 ++-
+ sound/soc/fsl/imx-es8328.c                         | 232 +++++++
+ sound/soc/generic/simple-card.c                    | 153 +++--
+ sound/soc/intel/Makefile                           |   3 +-
+ sound/soc/intel/byt-max98090.c                     |   1 +
+ sound/soc/intel/byt-rt5640.c                       |  83 ++-
+ sound/soc/intel/sst-atom-controls.c                | 218 ++++++
+ sound/soc/intel/sst-atom-controls.h                | 416 +++++++++++-
+ sound/soc/intel/sst-haswell-pcm.c                  |  56 +-
+ sound/soc/intel/sst-mfld-platform-compress.c       |  38 +-
+ sound/soc/intel/sst-mfld-platform-pcm.c            | 106 +--
+ sound/soc/intel/sst-mfld-platform.h                |  58 +-
+ sound/soc/omap/rx51.c                              |   2 +-
+ sound/soc/rockchip/Kconfig                         |   3 +-
+ sound/soc/rockchip/Makefile                        |   2 +-
+ sound/soc/rockchip/rockchip_i2s.c                  |  28 +-
+ sound/soc/samsung/idma.c                           |   4 +-
+ sound/soc/samsung/odroidx2_max98090.c              |   4 +-
+ sound/soc/samsung/speyside.c                       |   6 +-
+ sound/soc/sh/fsi.c                                 |   7 +-
+ sound/soc/sh/rcar/core.c                           |   6 +-
+ sound/soc/sh/siu_pcm.c                             |   4 +-
+ sound/soc/sirf/sirf-usp.c                          |  24 +-
+ sound/soc/soc-core.c                               | 669 ++++++++----------
+ sound/soc/soc-dapm.c                               |  22 +-
+ sound/soc/soc-generic-dmaengine-pcm.c              |   4 +-
+ sound/soc/soc-io.c                                 |  28 -
+ sound/soc/txx9/txx9aclc.c                          |  14 +-
+ 115 files changed, 6172 insertions(+), 1355 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regmap/regmap.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2602.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs35l32.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/es8328.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rt5677.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ssm4567.txt
+ create mode 100644 include/dt-bindings/sound/cs35l32.h
+ create mode 100644 sound/soc/codecs/cs35l32.c
+ create mode 100644 sound/soc/codecs/cs35l32.h
+ create mode 100644 sound/soc/codecs/es8328-i2c.c
+ create mode 100644 sound/soc/codecs/es8328-spi.c
+ create mode 100644 sound/soc/codecs/es8328.c
+ create mode 100644 sound/soc/codecs/es8328.h
+ create mode 100644 sound/soc/codecs/ssm4567.c
+ create mode 100644 sound/soc/fsl/fsl-asoc-card.c
+ create mode 100644 sound/soc/fsl/imx-es8328.c
+ create mode 100644 sound/soc/intel/sst-atom-controls.c
+Merging modules/modules-next (184c3fc3f52f moduleparam: Resolve missing-field-initializer warning)
+$ git merge modules/modules-next
+Auto-merging init/Kconfig
+Auto-merging drivers/gpu/drm/i915/i915_params.c
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile                            | 15 +++++++++++
+ drivers/gpu/drm/i915/i915_params.c  |  8 +++---
+ drivers/tty/serial/8250/8250_core.c |  2 +-
+ include/linux/moduleparam.h         | 50 +++++++++++++++++++++++++++++--------
+ init/Kconfig                        | 43 +++++++++++++++++++++++++++++++
+ kernel/module.c                     |  2 +-
+ kernel/params.c                     | 17 ++++++++++---
+ scripts/Makefile.modinst            |  7 +++++-
+ scripts/Makefile.modsign            |  2 +-
+ scripts/mod/modpost.c               | 25 ++++++++++---------
+ security/apparmor/lsm.c             |  4 +--
+ 11 files changed, 139 insertions(+), 36 deletions(-)
+Merging virtio/virtio-next (7ec62d421bdf Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (042e1c79166b Input: soc_button_array - convert to platform bus)
+$ git merge input/next
+Auto-merging drivers/input/mouse/synaptics.c
+Auto-merging drivers/input/mouse/psmouse-base.c
+Auto-merging drivers/acpi/acpi_pnp.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/ti,drv260x.txt       |  50 ++
+ .../devicetree/bindings/input/ti,drv2667.txt       |  17 +
+ .../bindings/input/ti,palmas-pwrbutton.txt         |  36 +
+ drivers/acpi/acpi_pnp.c                            |   2 -
+ drivers/input/gameport/gameport.c                  |  41 +-
+ drivers/input/joystick/analog.c                    |  71 +-
+ drivers/input/joystick/xpad.c                      |  34 +
+ drivers/input/keyboard/cros_ec_keyb.c              |  92 +--
+ drivers/input/misc/Kconfig                         |  43 ++
+ drivers/input/misc/Makefile                        |   4 +
+ drivers/input/misc/drv260x.c                       | 741 +++++++++++++++++++++
+ drivers/input/misc/drv2667.c                       | 500 ++++++++++++++
+ drivers/input/misc/max77693-haptic.c               | 357 ++++++++++
+ drivers/input/misc/palmas-pwrbutton.c              | 332 +++++++++
+ drivers/input/misc/soc_button_array.c              |  60 +-
+ drivers/input/mouse/Makefile                       |   2 +-
+ drivers/input/mouse/focaltech.c                    |  52 ++
+ drivers/input/mouse/focaltech.h                    |  22 +
+ drivers/input/mouse/psmouse-base.c                 |  30 +
+ drivers/input/mouse/psmouse.h                      |   1 +
+ drivers/input/mouse/synaptics.c                    |  17 +-
+ include/dt-bindings/input/ti-drv260x.h             |  36 +
+ include/linux/mfd/max77693-private.h               |   9 +
+ include/linux/platform_data/drv260x-pdata.h        |  28 +
+ 24 files changed, 2468 insertions(+), 109 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/ti,drv260x.txt
+ create mode 100644 Documentation/devicetree/bindings/input/ti,drv2667.txt
+ create mode 100644 Documentation/devicetree/bindings/input/ti,palmas-pwrbutton.txt
+ create mode 100644 drivers/input/misc/drv260x.c
+ create mode 100644 drivers/input/misc/drv2667.c
+ create mode 100644 drivers/input/misc/max77693-haptic.c
+ create mode 100644 drivers/input/misc/palmas-pwrbutton.c
+ create mode 100644 drivers/input/mouse/focaltech.c
+ create mode 100644 drivers/input/mouse/focaltech.h
+ create mode 100644 include/dt-bindings/input/ti-drv260x.h
+ create mode 100644 include/linux/platform_data/drv260x-pdata.h
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging block/for-next (e9316e81a96b Merge branch 'for-3.18/drivers' into for-next)
+$ git merge block/for-next
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/block/rsxx/core.c
+Auto-merging block/blk-mq.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-block       |   8 +
+ Documentation/block/data-integrity.txt      |  54 +----
+ block/Kconfig                               |   1 +
+ block/Makefile                              |   4 +-
+ block/bio-integrity.c                       | 269 ++++++---------------
+ block/blk-cgroup.c                          |   2 -
+ block/blk-cgroup.h                          |   3 -
+ block/blk-core.c                            |  61 +++--
+ block/blk-flush.c                           | 147 +++++++----
+ block/blk-integrity.c                       | 103 +++++---
+ block/blk-merge.c                           |   6 +-
+ block/blk-mq-tag.c                          |  44 ++--
+ block/blk-mq.c                              | 361 ++++++++++++++--------------
+ block/blk-mq.h                              |   3 +-
+ block/blk-sysfs.c                           |   4 +-
+ block/blk-timeout.c                         |  15 +-
+ block/blk.h                                 |  37 ++-
+ block/bsg.c                                 |   9 +-
+ block/cfq-iosched.c                         |  10 +-
+ block/compat_ioctl.c                        |   4 -
+ block/ioctl.c                               |   4 -
+ block/partitions/mac.c                      |   8 +-
+ block/scsi_ioctl.c                          |  11 +-
+ block/t10-pi.c                              | 197 +++++++++++++++
+ drivers/block/drbd/drbd_actlog.c            |   4 +-
+ drivers/block/drbd/drbd_bitmap.c            |   6 +-
+ drivers/block/drbd/drbd_debugfs.c           |   2 +-
+ drivers/block/drbd/drbd_int.h               |  19 +-
+ drivers/block/drbd/drbd_interval.c          |  40 +--
+ drivers/block/drbd/drbd_main.c              |  28 +--
+ drivers/block/drbd/drbd_proc.c              |   4 +-
+ drivers/block/drbd/drbd_receiver.c          |  52 ++--
+ drivers/block/drbd/drbd_req.c               |   2 +-
+ drivers/block/drbd/drbd_state.c             |  18 +-
+ drivers/block/drbd/drbd_worker.c            |  51 ++--
+ drivers/block/hd.c                          |  12 +-
+ drivers/block/mtip32xx/mtip32xx.c           |   9 +-
+ drivers/block/null_blk.c                    |   7 +-
+ drivers/block/paride/pd.c                   |   2 +
+ drivers/block/pktcdvd.c                     |   2 +
+ drivers/block/rsxx/core.c                   |   2 +-
+ drivers/block/sx8.c                         |   2 +-
+ drivers/block/virtio_blk.c                  |   8 +-
+ drivers/block/xen-blkback/blkback.c         |   1 +
+ drivers/block/xen-blkback/xenbus.c          |   6 +-
+ drivers/block/xen-blkfront.c                |  12 +-
+ drivers/cdrom/cdrom.c                       |   4 +-
+ drivers/ide/ide-park.c                      |   2 +-
+ drivers/scsi/Kconfig                        |   1 -
+ drivers/scsi/device_handler/scsi_dh_alua.c  |   2 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c   |   2 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c |   4 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c  |   2 +-
+ drivers/scsi/osd/osd_initiator.c            |   4 +-
+ drivers/scsi/osst.c                         |   2 +-
+ drivers/scsi/scsi_error.c                   |   2 +
+ drivers/scsi/scsi_lib.c                     |  25 +-
+ drivers/scsi/sd.c                           |  73 +++---
+ drivers/scsi/sd.h                           |  66 ++++-
+ drivers/scsi/sd_dif.c                       | 353 ++++-----------------------
+ drivers/scsi/sg.c                           |   4 +-
+ drivers/scsi/st.c                           |   2 +-
+ drivers/target/target_core_pscsi.c          |   2 +-
+ fs/block_dev.c                              |  34 +--
+ fs/btrfs/disk-io.c                          |   2 +-
+ fs/xfs/xfs_buf.c                            |   2 -
+ include/linux/backing-dev.h                 |   4 -
+ include/linux/bio.h                         |  64 +++--
+ include/linux/blk-mq.h                      |  22 +-
+ include/linux/blk_types.h                   |  16 +-
+ include/linux/blkdev.h                      |  66 +++--
+ include/linux/crc-t10dif.h                  |   5 +-
+ include/linux/t10-pi.h                      |  22 ++
+ include/scsi/scsi_cmnd.h                    |  36 ++-
+ mm/backing-dev.c                            |  40 ++-
+ 75 files changed, 1252 insertions(+), 1265 deletions(-)
+ create mode 100644 block/t10-pi.c
+ create mode 100644 include/linux/t10-pi.h
+Merging device-mapper/for-next (43ab5fceb360 dm crypt: sort writes)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-bufio.c                  |   5 +-
+ drivers/md/dm-crypt.c                  | 368 +++++++++++++++++----------------
+ drivers/md/dm-ioctl.c                  |   2 +-
+ drivers/md/dm-log-userspace-transfer.c |   2 +-
+ drivers/md/dm-mpath.c                  |   4 +-
+ drivers/md/dm-raid.c                   |  61 +++++-
+ drivers/md/dm-table.c                  | 102 +++------
+ drivers/md/dm.c                        | 126 +++++++++++
+ drivers/md/dm.h                        |   5 +-
+ include/uapi/linux/dm-ioctl.h          |   4 +-
+ 10 files changed, 419 insertions(+), 260 deletions(-)
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging mmc-uh/next (89168b489915 mmc: core: restore detect line inversion semantics)
+$ git merge mmc-uh/next
+Auto-merging drivers/mmc/core/sdio_bus.c
+Auto-merging arch/arm/mach-shmobile/board-lager.c
+Auto-merging arch/arm/mach-shmobile/board-koelsch.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmc.txt      |   2 +
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   6 +-
+ Documentation/devicetree/bindings/mmc/tmio_mmc.txt |   3 +
+ MAINTAINERS                                        |   3 +-
+ arch/arm/mach-shmobile/board-koelsch.c             |   3 -
+ arch/arm/mach-shmobile/board-lager.c               |   2 -
+ drivers/mmc/card/block.c                           |  21 +-
+ drivers/mmc/card/queue.c                           |   6 +-
+ drivers/mmc/card/sdio_uart.c                       |   9 +-
+ drivers/mmc/core/core.c                            |  48 ++--
+ drivers/mmc/core/host.c                            |  96 ++++---
+ drivers/mmc/core/mmc.c                             | 263 +++++++++++-------
+ drivers/mmc/core/mmc_ops.c                         |  24 +-
+ drivers/mmc/core/mmc_ops.h                         |   1 +
+ drivers/mmc/core/sd.c                              |  41 +--
+ drivers/mmc/core/sdio.c                            |  19 +-
+ drivers/mmc/core/sdio_bus.c                        |   4 +-
+ drivers/mmc/core/sdio_irq.c                        |  11 +-
+ drivers/mmc/core/slot-gpio.c                       |  70 ++++-
+ drivers/mmc/host/Kconfig                           |  23 +-
+ drivers/mmc/host/Makefile                          |   2 +
+ drivers/mmc/host/atmel-mci.c                       |  55 ++--
+ drivers/mmc/host/au1xmmc.c                         |   5 +-
+ drivers/mmc/host/dw_mmc-pci.c                      |   3 -
+ drivers/mmc/host/dw_mmc-pltfm.c                    |  10 +-
+ drivers/mmc/host/dw_mmc-rockchip.c                 | 136 ++++++++++
+ drivers/mmc/host/dw_mmc.c                          | 297 +++++++++++++++------
+ drivers/mmc/host/dw_mmc.h                          |   5 +-
+ drivers/mmc/host/jz4740_mmc.c                      | 269 ++++++++++++++++++-
+ drivers/mmc/host/mmc_spi.c                         |   1 +
+ drivers/mmc/host/mmci.c                            | 115 +++++---
+ drivers/mmc/host/mmci_qcom_dml.c                   | 177 ++++++++++++
+ drivers/mmc/host/mmci_qcom_dml.h                   |  31 +++
+ drivers/mmc/host/moxart-mmc.c                      |   1 -
+ drivers/mmc/host/mxcmmc.c                          |   1 -
+ drivers/mmc/host/mxs-mmc.c                         |   1 -
+ drivers/mmc/host/omap.c                            |   1 -
+ drivers/mmc/host/omap_hsmmc.c                      |  15 +-
+ drivers/mmc/host/pxamci.c                          |   5 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c                  |   9 +-
+ drivers/mmc/host/rtsx_usb_sdmmc.c                  |   9 +-
+ drivers/mmc/host/s3cmci.c                          |   4 +-
+ drivers/mmc/host/sdhci-acpi.c                      |  71 ++++-
+ drivers/mmc/host/sdhci-bcm-kona.c                  |   1 -
+ drivers/mmc/host/sdhci-bcm2835.c                   |   1 -
+ drivers/mmc/host/sdhci-cns3xxx.c                   |   1 -
+ drivers/mmc/host/sdhci-dove.c                      |   1 -
+ drivers/mmc/host/sdhci-esdhc-imx.c                 |  21 +-
+ drivers/mmc/host/sdhci-msm.c                       |  27 +-
+ drivers/mmc/host/sdhci-of-arasan.c                 |   1 -
+ drivers/mmc/host/sdhci-of-esdhc.c                  |   1 -
+ drivers/mmc/host/sdhci-of-hlwd.c                   |   1 -
+ drivers/mmc/host/sdhci-pci.c                       |  44 ++-
+ drivers/mmc/host/sdhci-pci.h                       |   3 +
+ drivers/mmc/host/sdhci-pltfm.c                     |  10 +-
+ drivers/mmc/host/sdhci-pxav2.c                     |   1 -
+ drivers/mmc/host/sdhci-pxav3.c                     |   8 +-
+ drivers/mmc/host/sdhci-s3c.c                       |   5 +-
+ drivers/mmc/host/sdhci-sirf.c                      |  26 +-
+ drivers/mmc/host/sdhci-spear.c                     |   1 -
+ drivers/mmc/host/sdhci-tegra.c                     |   1 -
+ drivers/mmc/host/sdhci.c                           | 141 ++++++----
+ drivers/mmc/host/sdhci.h                           |   4 +
+ drivers/mmc/host/sh_mmcif.c                        |   1 -
+ drivers/mmc/host/sh_mobile_sdhi.c                  |  53 +++-
+ drivers/mmc/host/sunxi-mmc.c                       |   4 +-
+ drivers/mmc/host/tifm_sd.c                         |   4 +-
+ drivers/mmc/host/tmio_mmc.c                        |   7 +-
+ drivers/mmc/host/tmio_mmc.h                        |  31 +--
+ drivers/mmc/host/tmio_mmc_dma.c                    |   8 +-
+ drivers/mmc/host/tmio_mmc_pio.c                    | 294 ++++++++++++--------
+ drivers/mmc/host/wbsd.c                            |  21 +-
+ include/linux/atmel-mci.h                          |   2 +
+ include/linux/mfd/tmio.h                           |  25 ++
+ include/linux/mmc/card.h                           |  10 +-
+ include/linux/mmc/dw_mmc.h                         |   4 +-
+ include/linux/mmc/host.h                           |  12 +-
+ include/linux/mmc/mmc.h                            |   7 +
+ include/linux/mmc/sdhci.h                          |   1 +
+ include/linux/mmc/slot-gpio.h                      |   5 +-
+ 80 files changed, 1945 insertions(+), 721 deletions(-)
+ create mode 100644 drivers/mmc/host/dw_mmc-rockchip.c
+ create mode 100644 drivers/mmc/host/mmci_qcom_dml.c
+ create mode 100644 drivers/mmc/host/mmci_qcom_dml.h
+Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/debug_core.c | 43 +++++++++++++++++++++----------------------
+ 1 file changed, 21 insertions(+), 22 deletions(-)
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (86143256d202 md/bitmap: remove bev_logical_block_size rounding where not needed.)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/bitmap.c | 19 +++++++------------
+ drivers/md/md.c     | 15 ++++-----------
+ drivers/md/raid1.c  | 23 +++++++++++------------
+ drivers/md/raid10.c | 10 ++++++----
+ drivers/md/raid5.c  | 24 +++++++++++++++++++-----
+ 5 files changed, 47 insertions(+), 44 deletions(-)
+Merging mfd/for-mfd-next (48b490d23ef5 MAINTAINERS: Adds Andreas Werner to maintainers list for MEN F21BMC)
+$ git merge mfd/for-mfd-next
+Auto-merging include/linux/pci_ids.h
+Removing include/linux/mfd/ti_ssp.h
+Auto-merging include/linux/mfd/max77693-private.h
+Auto-merging drivers/mfd/twl4030-power.c
+Auto-merging drivers/mfd/htc-i2cpld.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-power        |  14 +
+ Documentation/acpi/enumeration.txt                 |  27 ++
+ Documentation/devicetree/bindings/mfd/arizona.txt  |   7 +
+ .../devicetree/bindings/mfd/atmel-gpbr.txt         |  15 +
+ Documentation/devicetree/bindings/mfd/hi6421.txt   |  38 +++
+ Documentation/devicetree/bindings/mfd/max14577.txt | 146 ++++++++
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.txt     |  64 ++++
+ .../mfd/{qcom,pm8xxx.txt => qcom-pm8xxx.txt}       |   1 +
+ Documentation/devicetree/bindings/mfd/rk808.txt    | 177 ++++++++++
+ Documentation/devicetree/bindings/mfd/rn5t618.txt  |  36 ++
+ Documentation/devicetree/bindings/mfd/stmpe.txt    |   1 +
+ .../devicetree/bindings/mfd/twl4030-power.txt      |   9 +-
+ MAINTAINERS                                        |   9 +
+ drivers/iio/common/st_sensors/st_sensors_core.c    |   5 +-
+ drivers/mfd/88pm860x-i2c.c                         |  66 +---
+ drivers/mfd/Kconfig                                |  56 +++-
+ drivers/mfd/Makefile                               |   4 +
+ drivers/mfd/arizona-core.c                         |  29 +-
+ drivers/mfd/arizona-irq.c                          |  14 +-
+ drivers/mfd/axp20x.c                               |  11 -
+ drivers/mfd/da9052-core.c                          |   2 +-
+ drivers/mfd/da9052-i2c.c                           |   7 -
+ drivers/mfd/da9052-spi.c                           |   7 +-
+ drivers/mfd/hi6421-pmic-core.c                     | 113 +++++++
+ drivers/mfd/htc-i2cpld.c                           |  44 +--
+ drivers/mfd/intel_soc_pmic_core.c                  |   2 +
+ drivers/mfd/lpc_ich.c                              |  17 +
+ drivers/mfd/lpc_sch.c                              | 211 +++++++-----
+ drivers/mfd/max14577.c                             | 103 +++++-
+ drivers/mfd/max77686.c                             |   2 +-
+ drivers/mfd/max77693.c                             |   5 +-
+ drivers/mfd/max8925-i2c.c                          |   2 +-
+ drivers/mfd/mc13xxx-core.c                         |   8 +
+ drivers/mfd/menelaus.c                             |  11 +-
+ drivers/mfd/mfd-core.c                             |  41 +++
+ drivers/mfd/pcf50633-core.c                        |  35 +-
+ drivers/mfd/qcom-spmi-pmic.c                       |  67 ++++
+ drivers/mfd/rk808.c                                | 275 +++++++++++++++
+ drivers/mfd/rn5t618.c                              | 134 ++++++++
+ drivers/mfd/rtsx_pcr.c                             |   2 +-
+ drivers/mfd/rtsx_usb.c                             |   2 +-
+ drivers/mfd/sm501.c                                |   2 +-
+ drivers/mfd/stmpe.c                                |  11 +-
+ drivers/mfd/ti_am335x_tscadc.c                     |  35 +-
+ drivers/mfd/tps65217.c                             |   2 +
+ drivers/mfd/tps65910.c                             |   5 +
+ drivers/mfd/twl4030-irq.c                          |   8 +-
+ drivers/mfd/twl4030-power.c                        |   3 +
+ drivers/mfd/twl6040.c                              |   1 +
+ drivers/mfd/wm5102-tables.c                        |  16 +-
+ drivers/mfd/wm5110-tables.c                        |  10 +-
+ drivers/mfd/wm8994-irq.c                           |   2 +
+ drivers/mfd/wm8994-regmap.c                        |   4 +
+ drivers/misc/ti-st/st_core.c                       |  11 +-
+ drivers/power/Kconfig                              |   5 +-
+ drivers/power/max14577_charger.c                   | 370 +++++++++++++++++++--
+ drivers/power/max17040_battery.c                   |   3 +-
+ drivers/regulator/max14577.c                       |  80 +----
+ include/dt-bindings/clock/rockchip,rk808.h         |  11 +
+ include/linux/mfd/arizona/registers.h              |  29 +-
+ include/linux/mfd/core.h                           |   3 +
+ include/linux/mfd/da9052/da9052.h                  |   2 +-
+ include/linux/mfd/davinci_voicecodec.h             |   2 +-
+ include/linux/mfd/hi6421-pmic.h                    |  41 +++
+ include/linux/mfd/max14577-private.h               |  95 ++++--
+ include/linux/mfd/max14577.h                       |  30 ++
+ include/linux/mfd/max77693-private.h               |  61 +++-
+ include/linux/mfd/max77693.h                       |  40 +++
+ include/linux/mfd/rk808.h                          | 196 +++++++++++
+ include/linux/mfd/rn5t618.h                        | 228 +++++++++++++
+ include/linux/mfd/ti_am335x_tscadc.h               |   1 +
+ include/linux/mfd/ti_ssp.h                         |  93 ------
+ include/linux/mfd/tps65217.h                       |   2 +
+ include/linux/pci_ids.h                            |   1 +
+ include/linux/ti_wilink_st.h                       |   2 +-
+ sound/soc/codecs/arizona.c                         |   2 +-
+ 76 files changed, 2695 insertions(+), 531 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/atmel-gpbr.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/hi6421.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
+ rename Documentation/devicetree/bindings/mfd/{qcom,pm8xxx.txt => qcom-pm8xxx.txt} (98%)
+ create mode 100644 Documentation/devicetree/bindings/mfd/rk808.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/rn5t618.txt
+ create mode 100644 drivers/mfd/hi6421-pmic-core.c
+ create mode 100644 drivers/mfd/qcom-spmi-pmic.c
+ create mode 100644 drivers/mfd/rk808.c
+ create mode 100644 drivers/mfd/rn5t618.c
+ create mode 100644 include/dt-bindings/clock/rockchip,rk808.h
+ create mode 100644 include/linux/mfd/hi6421-pmic.h
+ create mode 100644 include/linux/mfd/rk808.h
+ create mode 100644 include/linux/mfd/rn5t618.h
+ delete mode 100644 include/linux/mfd/ti_ssp.h
+Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations)
+$ git merge backlight/for-backlight-next
+Auto-merging drivers/video/backlight/pwm_bl.c
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/88pm860x_bl.c        |  1 -
+ drivers/video/backlight/aat2870_bl.c         |  1 -
+ drivers/video/backlight/adp5520_bl.c         |  2 +-
+ drivers/video/backlight/adp8860_bl.c         |  3 +++
+ drivers/video/backlight/adp8870_bl.c         |  4 ++++
+ drivers/video/backlight/ams369fg06.c         |  6 +++---
+ drivers/video/backlight/as3711_bl.c          |  1 -
+ drivers/video/backlight/corgi_lcd.c          |  1 +
+ drivers/video/backlight/cr_bllcd.c           |  1 +
+ drivers/video/backlight/da903x_bl.c          |  1 -
+ drivers/video/backlight/da9052_bl.c          |  1 -
+ drivers/video/backlight/ep93xx_bl.c          |  1 -
+ drivers/video/backlight/generic_bl.c         | 18 ------------------
+ drivers/video/backlight/gpio_backlight.c     |  1 -
+ drivers/video/backlight/ili922x.c            | 11 ++++++-----
+ drivers/video/backlight/jornada720_bl.c      |  6 +++---
+ drivers/video/backlight/jornada720_lcd.c     |  6 +-----
+ drivers/video/backlight/ld9040.c             |  6 +++---
+ drivers/video/backlight/lm3533_bl.c          |  1 -
+ drivers/video/backlight/lm3639_bl.c          |  2 --
+ drivers/video/backlight/lms501kf03.c         | 12 ++++++------
+ drivers/video/backlight/lp855x_bl.c          |  2 ++
+ drivers/video/backlight/lp8788_bl.c          |  1 -
+ drivers/video/backlight/max8925_bl.c         |  1 -
+ drivers/video/backlight/omap1_bl.c           |  1 +
+ drivers/video/backlight/ot200_bl.c           |  1 -
+ drivers/video/backlight/pandora_bl.c         |  1 -
+ drivers/video/backlight/pcf50633-backlight.c |  1 +
+ drivers/video/backlight/platform_lcd.c       |  1 -
+ drivers/video/backlight/pwm_bl.c             |  1 -
+ drivers/video/backlight/s6e63m0.c            | 12 ++++++------
+ drivers/video/backlight/tdo24m.c             |  2 ++
+ drivers/video/backlight/tps65217_bl.c        |  1 -
+ drivers/video/backlight/wm831x_bl.c          |  2 +-
+ 34 files changed, 45 insertions(+), 68 deletions(-)
+Merging battery/master (a7ba749e0146 Documentation: power: reset: Add documentation for generic SYSCON reboot driver)
+$ git merge battery/master
+Resolved 'drivers/power/reset/Kconfig' using previous resolution.
+Resolved 'drivers/power/reset/Makefile' using previous resolution.
+Auto-merging drivers/power/reset/Makefile
+CONFLICT (content): Merge conflict in drivers/power/reset/Makefile
+Auto-merging drivers/power/reset/Kconfig
+CONFLICT (content): Merge conflict in drivers/power/reset/Kconfig
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/arm/kernel/process.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bf5a0c5e2e78] Merge remote-tracking branch 'battery/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-restart.txt      |  54 +++
+ .../bindings/power/reset/ltc2952-poweroff.txt      |  26 ++
+ .../devicetree/bindings/power/reset/st-reset.txt   |  11 +
+ .../bindings/power/reset/syscon-reboot.txt         |  23 ++
+ Documentation/power/charger-manager.txt            |   2 +-
+ Documentation/power/power_supply_class.txt         |   6 +
+ arch/arm/kernel/process.c                          |  12 +-
+ arch/arm64/kernel/process.c                        |   3 +-
+ drivers/power/Kconfig                              |   2 +-
+ drivers/power/bq27x00_battery.c                    |  57 ++-
+ drivers/power/charger-manager.c                    |  16 +-
+ drivers/power/gpio-charger.c                       |   2 +-
+ drivers/power/max8925_power.c                      |   7 +-
+ drivers/power/power_supply_core.c                  | 100 +++---
+ drivers/power/power_supply_leds.c                  |  19 +-
+ drivers/power/power_supply_sysfs.c                 |  24 +-
+ drivers/power/reset/Kconfig                        |  27 ++
+ drivers/power/reset/Makefile                       |   4 +
+ drivers/power/reset/gpio-restart.c                 | 149 ++++++++
+ drivers/power/reset/ltc2952-poweroff.c             | 386 +++++++++++++++++++++
+ drivers/power/reset/msm-poweroff.c                 |  20 +-
+ drivers/power/reset/restart-poweroff.c             |   3 +-
+ drivers/power/reset/st-poweroff.c                  | 151 ++++++++
+ drivers/power/reset/syscon-reboot.c                |  96 +++++
+ drivers/power/reset/xgene-reboot.c                 |   2 +-
+ drivers/power/sbs-battery.c                        | 125 ++++++-
+ drivers/watchdog/alim7101_wdt.c                    |  42 ++-
+ drivers/watchdog/moxart_wdt.c                      |  32 +-
+ drivers/watchdog/sunxi_wdt.c                       |  31 +-
+ include/linux/power_supply.h                       |   8 +-
+ include/linux/reboot.h                             |   3 +
+ kernel/reboot.c                                    |  81 +++++
+ 32 files changed, 1377 insertions(+), 147 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-restart.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/st-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.txt
+ create mode 100644 drivers/power/reset/gpio-restart.c
+ create mode 100644 drivers/power/reset/ltc2952-poweroff.c
+ create mode 100644 drivers/power/reset/st-poweroff.c
+ create mode 100644 drivers/power/reset/syscon-reboot.c
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (2d6054564313 video/atmel_lcdfb: Introduce regulator support)
+$ git merge omap_dss2/for-next
+Auto-merging drivers/video/of_display_timing.c
+Auto-merging drivers/video/fbdev/atmel_lcdfb.c
+Auto-merging drivers/video/fbdev/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/video/atmel,lcdc.txt       |  3 ++
+ drivers/video/console/bitblit.c                    |  3 +-
+ drivers/video/console/fbcon_ccw.c                  |  3 +-
+ drivers/video/console/fbcon_cw.c                   |  3 +-
+ drivers/video/console/fbcon_ud.c                   |  3 +-
+ drivers/video/fbdev/Kconfig                        |  3 +-
+ drivers/video/fbdev/atmel_lcdfb.c                  | 20 +++++++
+ drivers/video/fbdev/aty/aty128fb.c                 | 63 +++++++++++++++++++---
+ drivers/video/fbdev/au1200fb.c                     |  1 -
+ drivers/video/fbdev/controlfb.c                    | 15 ++++--
+ drivers/video/fbdev/core/cfbcopyarea.c             | 13 +++--
+ drivers/video/fbdev/core/fbsysfs.c                 | 12 +----
+ drivers/video/fbdev/cyber2000fb.c                  | 16 +++---
+ drivers/video/fbdev/intelfb/intelfbhw.c            |  3 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c         | 52 +++++++++++++++---
+ drivers/video/fbdev/matrox/matroxfb_maven.c        | 20 +++----
+ drivers/video/fbdev/msm/msm_fb.c                   | 25 ++++++++-
+ drivers/video/fbdev/mx3fb.c                        |  2 +-
+ drivers/video/fbdev/omap2/dss/dispc-compat.c       |  9 ++--
+ drivers/video/fbdev/omap2/dss/dsi.c                | 10 +++-
+ drivers/video/fbdev/omap2/dss/manager-sysfs.c      | 16 +++---
+ drivers/video/fbdev/omap2/omapfb/omapfb-main.c     | 14 ++---
+ drivers/video/fbdev/pxafb.c                        | 20 +++----
+ drivers/video/fbdev/riva/riva_hw.c                 |  1 -
+ drivers/video/fbdev/sa1100fb.c                     | 18 ++++---
+ drivers/video/fbdev/sh_mobile_hdmi.c               | 44 ++++++++++++++-
+ drivers/video/fbdev/sis/init301.c                  |  2 +-
+ drivers/video/fbdev/sis/sis_main.c                 |  2 +-
+ drivers/video/fbdev/stifb.c                        |  4 +-
+ drivers/video/fbdev/udlfb.c                        |  7 +--
+ drivers/video/fbdev/valkyriefb.c                   | 14 +++--
+ drivers/video/fbdev/vermilion/vermilion.c          |  1 -
+ drivers/video/of_display_timing.c                  |  3 +-
+ 33 files changed, 302 insertions(+), 123 deletions(-)
+Merging regulator/for-next (ad21edcdb217 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next)
+$ git merge regulator/for-next
+Removing drivers/regulator/st-pwm.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/da9211.txt       |  63 ++
+ .../devicetree/bindings/regulator/fan53555.txt     |  23 +
+ .../devicetree/bindings/regulator/isl9305.txt      |  36 +
+ .../bindings/regulator/max1586-regulator.txt       |  28 +
+ .../devicetree/bindings/regulator/max77802.txt     |  53 ++
+ .../bindings/regulator/pwm-regulator.txt           |  27 +
+ .../bindings/regulator/sky81452-regulator.txt      |  16 +
+ .../devicetree/bindings/vendor-prefixes.txt        |   2 +
+ MAINTAINERS                                        |   1 +
+ drivers/regulator/Kconfig                          |  83 ++-
+ drivers/regulator/Makefile                         |   9 +-
+ drivers/regulator/as3711-regulator.c               |  61 +-
+ drivers/regulator/axp20x-regulator.c               |   2 +-
+ drivers/regulator/bcm590xx-regulator.c             |   8 -
+ drivers/regulator/core.c                           | 147 ++--
+ drivers/regulator/da9211-regulator.c               | 174 ++++-
+ drivers/regulator/da9211-regulator.h               |   7 +-
+ drivers/regulator/fan53555.c                       | 195 ++++-
+ drivers/regulator/hi6421-regulator.c               | 634 ++++++++++++++++
+ drivers/regulator/internal.h                       |  14 +
+ drivers/regulator/isl9305.c                        | 207 ++++++
+ drivers/regulator/ltc3589.c                        |   1 +
+ drivers/regulator/max1586.c                        |  81 ++-
+ drivers/regulator/max77802.c                       | 586 +++++++++++++++
+ drivers/regulator/mc13892-regulator.c              |  11 +-
+ drivers/regulator/of_regulator.c                   |  51 ++
+ drivers/regulator/pwm-regulator.c                  | 197 +++++
+ drivers/regulator/qcom_rpm-regulator.c             | 798 +++++++++++++++++++++
+ drivers/regulator/rk808-regulator.c                | 381 ++++++++++
+ drivers/regulator/rn5t618-regulator.c              | 143 ++++
+ drivers/regulator/s2mpa01.c                        | 144 ++--
+ drivers/regulator/s2mps11.c                        | 269 +++----
+ drivers/regulator/sky81452-regulator.c             | 130 ++++
+ drivers/regulator/st-pwm.c                         | 190 -----
+ drivers/regulator/tps65023-regulator.c             |   3 -
+ drivers/regulator/tps65217-regulator.c             | 114 +--
+ drivers/regulator/tps65910-regulator.c             |  13 +-
+ include/linux/mfd/samsung/core.h                   |  21 +
+ include/linux/mfd/samsung/s2mpa01.h                |  12 -
+ include/linux/mfd/samsung/s2mps11.h                |   9 -
+ include/linux/mfd/samsung/s2mps14.h                |  10 -
+ include/linux/platform_data/isl9305.h              |  30 +
+ include/linux/regulator/da9211.h                   |   9 +-
+ include/linux/regulator/driver.h                   |  12 +-
+ include/linux/regulator/max1586.h                  |   2 +-
+ 45 files changed, 4244 insertions(+), 763 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/da9211.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/fan53555.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/isl9305.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max1586-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max77802.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/sky81452-regulator.txt
+ create mode 100644 drivers/regulator/hi6421-regulator.c
+ create mode 100644 drivers/regulator/isl9305.c
+ create mode 100644 drivers/regulator/max77802.c
+ create mode 100644 drivers/regulator/pwm-regulator.c
+ create mode 100644 drivers/regulator/qcom_rpm-regulator.c
+ create mode 100644 drivers/regulator/rk808-regulator.c
+ create mode 100644 drivers/regulator/rn5t618-regulator.c
+ create mode 100644 drivers/regulator/sky81452-regulator.c
+ delete mode 100644 drivers/regulator/st-pwm.c
+ create mode 100644 include/linux/platform_data/isl9305.h
+Merging security/next (c867d07e3c86 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next)
+$ git merge security/next
+Resolved 'fs/nfsd/vfs.c' using previous resolution.
+Resolved 'security/smack/smack_lsm.c' using previous resolution.
+Auto-merging security/smack/smack_lsm.c
+CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
+Auto-merging security/selinux/netif.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/keys/request_key.c
+Auto-merging security/keys/key.c
+Auto-merging net/rxrpc/ar-key.c
+Auto-merging include/linux/security.h
+Auto-merging include/linux/kernel.h
+Auto-merging fs/nfsd/vfs.c
+CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
+Auto-merging fs/namei.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ba8702a2f438] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt       |   2 +-
+ Documentation/security/keys.txt           |  65 +++-
+ MAINTAINERS                               |   2 +
+ crypto/asymmetric_keys/asymmetric_keys.h  |   8 +-
+ crypto/asymmetric_keys/asymmetric_type.c  | 223 ++++++++----
+ crypto/asymmetric_keys/pkcs7_key_type.c   |   2 -
+ crypto/asymmetric_keys/pkcs7_parser.c     |  99 +++---
+ crypto/asymmetric_keys/pkcs7_parser.h     |   6 +-
+ crypto/asymmetric_keys/pkcs7_trust.c      |  87 +++--
+ crypto/asymmetric_keys/pkcs7_verify.c     | 102 ++++--
+ crypto/asymmetric_keys/signature.c        |   1 +
+ crypto/asymmetric_keys/x509_cert_parser.c |  55 +--
+ crypto/asymmetric_keys/x509_parser.h      |   6 +-
+ crypto/asymmetric_keys/x509_public_key.c  | 102 +++---
+ fs/cifs/cifs_spnego.c                     |   1 -
+ fs/cifs/cifsacl.c                         |   1 -
+ fs/namei.c                                |   2 +-
+ fs/nfs/idmap.c                            |   2 -
+ fs/nfsd/vfs.c                             |   2 +-
+ include/crypto/public_key.h               |   5 +-
+ include/keys/asymmetric-type.h            |  38 +++
+ include/keys/user-type.h                  |   1 -
+ include/linux/ima.h                       |   4 +-
+ include/linux/kernel.h                    |   1 +
+ include/linux/key-type.h                  |  34 +-
+ include/linux/security.h                  |   2 +-
+ lib/hexdump.c                             |  16 +
+ net/ceph/crypto.c                         |   1 -
+ net/dns_resolver/dns_key.c                |  18 +-
+ net/rxrpc/ar-key.c                        |   2 -
+ security/integrity/Kconfig                |  46 ++-
+ security/integrity/Makefile               |   6 +-
+ security/integrity/digsig_asymmetric.c    |   5 +-
+ security/integrity/evm/Kconfig            |   8 -
+ security/integrity/evm/evm_main.c         |  17 +-
+ security/integrity/ima/Kconfig            |   2 -
+ security/integrity/ima/ima.h              |  24 +-
+ security/integrity/ima/ima_api.c          |  10 +-
+ security/integrity/ima/ima_appraise.c     |  17 +-
+ security/integrity/ima/ima_crypto.c       |  20 +-
+ security/integrity/ima/ima_init.c         |  25 +-
+ security/integrity/ima/ima_main.c         | 123 +++----
+ security/integrity/ima/ima_policy.c       |  23 ++
+ security/integrity/ima/ima_template.c     |  30 +-
+ security/integrity/integrity.h            |   2 +-
+ security/keys/big_key.c                   |   2 -
+ security/keys/encrypted-keys/encrypted.c  |   1 -
+ security/keys/internal.h                  |  21 +-
+ security/keys/key.c                       |   2 +-
+ security/keys/keyctl.c                    |   2 +
+ security/keys/keyring.c                   |  58 ++--
+ security/keys/proc.c                      |   8 +-
+ security/keys/process_keys.c              |  13 +-
+ security/keys/request_key.c               |  21 +-
+ security/keys/request_key_auth.c          |  10 +-
+ security/keys/trusted.c                   |   1 -
+ security/keys/user_defined.c              |  14 -
+ security/selinux/hooks.c                  | 135 +++++---
+ security/selinux/include/netif.h          |   4 +-
+ security/selinux/include/objsec.h         |   2 +
+ security/selinux/netif.c                  |  43 +--
+ security/selinux/ss/services.c            |  14 +-
+ security/smack/Kconfig                    |  16 +
+ security/smack/smack.h                    |  39 +--
+ security/smack/smack_access.c             | 118 +++----
+ security/smack/smack_lsm.c                | 545 +++++++++++++++++++++---------
+ security/smack/smackfs.c                  |  76 +++--
+ 67 files changed, 1528 insertions(+), 865 deletions(-)
+Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files)
+$ git merge integrity/next
+Already up-to-date.
+Merging selinux/next (4093a8443941 selinux: normalize audit log formatting)
+$ git merge selinux/next
+Already up-to-date.
+Merging lblnet/next (d8ec26d7f828 Linux 3.13)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (cf20f1450ea4 Merge commit 'mfd-hwmon-leds-watchdog-v3.18')
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/cadence-wdt.txt   |  24 +
+ .../devicetree/bindings/watchdog/fsl-imx-wdt.txt   |   3 +-
+ .../devicetree/bindings/watchdog/qcom-wdt.txt      |  24 +
+ .../devicetree/bindings/watchdog/samsung-wdt.txt   |   1 +
+ drivers/watchdog/Kconfig                           |  41 ++
+ drivers/watchdog/Makefile                          |   4 +
+ drivers/watchdog/booke_wdt.c                       |  28 +-
+ drivers/watchdog/cadence_wdt.c                     | 516 +++++++++++++++++++++
+ drivers/watchdog/da9063_wdt.c                      | 191 ++++++++
+ drivers/watchdog/dw_wdt.c                          |   4 +-
+ drivers/watchdog/imx2_wdt.c                        |   6 -
+ drivers/watchdog/of_xilinx_wdt.c                   |   1 -
+ drivers/watchdog/qcom-wdt.c                        | 186 ++++++++
+ drivers/watchdog/rn5t618_wdt.c                     | 198 ++++++++
+ drivers/watchdog/s3c2410_wdt.c                     |  11 +
+ drivers/watchdog/stmp3xxx_rtc_wdt.c                |  24 +
+ drivers/watchdog/ts72xx_wdt.c                      |   6 +-
+ include/linux/watchdog.h                           |   9 +-
+ 18 files changed, 1233 insertions(+), 44 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/cadence-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
+ create mode 100644 drivers/watchdog/cadence_wdt.c
+ create mode 100644 drivers/watchdog/da9063_wdt.c
+ create mode 100644 drivers/watchdog/qcom-wdt.c
+ create mode 100644 drivers/watchdog/rn5t618_wdt.c
+Merging iommu/next (09b5269a1b3d Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
+$ git merge iommu/next
+Auto-merging virt/kvm/iommu.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/iommu/arm,smmu.txt         |   1 +
+ drivers/base/core.c                                |   3 +
+ drivers/infiniband/hw/usnic/usnic_uiom.c           |   2 +-
+ drivers/iommu/amd_iommu.c                          | 117 ++++++-----
+ drivers/iommu/amd_iommu_init.c                     |  21 +-
+ drivers/iommu/amd_iommu_types.h                    |  21 --
+ drivers/iommu/arm-smmu.c                           | 220 ++++++++++++---------
+ drivers/iommu/dmar.c                               |  25 ++-
+ drivers/iommu/exynos-iommu.c                       |  51 ++---
+ drivers/iommu/fsl_pamu_domain.c                    |   5 +-
+ drivers/iommu/intel-iommu.c                        |  16 +-
+ drivers/iommu/intel_irq_remapping.c                |   7 +-
+ drivers/iommu/iommu.c                              | 208 +++++++++++--------
+ drivers/iommu/irq_remapping.c                      |  11 +-
+ drivers/iommu/irq_remapping.h                      |   2 +-
+ drivers/iommu/msm_iommu.c                          |   7 +-
+ drivers/iommu/omap-iommu.c                         |  27 +--
+ drivers/iommu/omap-iommu.h                         |   1 -
+ drivers/iommu/tegra-gart.c                         |   9 +-
+ drivers/iommu/tegra-smmu.c                         |   9 +-
+ drivers/vfio/vfio_iommu_type1.c                    |   4 +-
+ include/linux/device.h                             |  11 +-
+ include/linux/dmar.h                               |   8 +-
+ include/linux/iommu.h                              |  25 ++-
+ virt/kvm/iommu.c                                   |   6 +-
+ 25 files changed, 461 insertions(+), 356 deletions(-)
+Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking)
+$ git merge vfio/next
+Auto-merging include/linux/iommu.h
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Auto-merging drivers/pci/msi.c
+Merge made by the 'recursive' strategy.
+ drivers/pci/msi.c                 |   2 +
+ drivers/vfio/pci/vfio_pci.c       | 136 ++++++++++++++++----------------------
+ drivers/vfio/pci/vfio_pci_intrs.c |  15 +++++
+ drivers/vfio/vfio_iommu_type1.c   |  30 +++++++--
+ drivers/vfio/vfio_spapr_eeh.c     |   2 +-
+ include/linux/iommu.h             |   1 +
+ include/uapi/linux/vfio.h         |   3 +
+ 7 files changed, 104 insertions(+), 85 deletions(-)
+Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (7bb38d57fd75 Remove MN10300_PROC_MN2WS0038)
+$ git merge trivial/for-next
+Resolved 'block/blk-core.c' using previous resolution.
+Auto-merging scripts/checkstack.pl
+Auto-merging net/netfilter/ipset/ip_set_core.c
+Auto-merging net/mac802154/wpan.c
+Auto-merging mm/filemap.c
+Auto-merging lib/rhashtable.c
+Auto-merging lib/idr.c
+Auto-merging lib/bitmap.c
+Auto-merging include/linux/percpu-refcount.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/gpio/driver.h
+Auto-merging fs/btrfs/tree-log.c
+Auto-merging drivers/video/backlight/88pm860x_bl.c
+Auto-merging drivers/platform/x86/Kconfig
+Auto-merging drivers/net/wireless/libertas/cfg.c
+Auto-merging drivers/net/ethernet/via/via-velocity.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/gpu/drm/i915/intel_bios.c
+Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c
+Auto-merging block/genhd.c
+Auto-merging block/blk-core.c
+CONFLICT (content): Merge conflict in block/blk-core.c
+Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
+Auto-merging arch/powerpc/platforms/powernv/opal.c
+Auto-merging arch/m68k/Kconfig.devices
+Auto-merging Documentation/devicetree/bindings/video/atmel,lcdc.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/net/stmmac.txt
+Auto-merging Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt
+Auto-merging Documentation/devicetree/bindings/clock/arm-integrator.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a2fec8c7d011] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-net           |  2 +-
+ Documentation/Changes                               | 21 +++++----------------
+ Documentation/CodingStyle                           |  2 +-
+ Documentation/applying-patches.txt                  |  2 +-
+ Documentation/block/null_blk.txt                    |  4 ++--
+ Documentation/block/queue-sysfs.txt                 |  6 +++---
+ .../devicetree/bindings/clock/arm-integrator.txt    |  2 +-
+ .../devicetree/bindings/crypto/fsl-sec6.txt         |  2 +-
+ .../devicetree/bindings/iio/adc/vf610-adc.txt       |  2 +-
+ Documentation/devicetree/bindings/mfd/s2mps11.txt   |  2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nand.txt |  6 +++---
+ .../devicetree/bindings/net/samsung-sxgbe.txt       |  2 +-
+ Documentation/devicetree/bindings/net/stmmac.txt    |  2 +-
+ .../devicetree/bindings/pci/host-generic-pci.txt    |  2 +-
+ .../devicetree/bindings/phy/phy-bindings.txt        |  2 +-
+ .../bindings/power_supply/charger-manager.txt       |  2 +-
+ .../devicetree/bindings/sound/st,sta350.txt         |  2 +-
+ .../devicetree/bindings/vendor-prefixes.txt         |  2 +-
+ .../devicetree/bindings/video/atmel,lcdc.txt        |  4 ++--
+ .../devicetree/bindings/video/fsl,imx-fb.txt        |  2 +-
+ Documentation/kmemleak.txt                          |  2 +-
+ Documentation/lockup-watchdogs.txt                  |  2 +-
+ Documentation/mips/AU1xxx_IDE.README                |  2 +-
+ Documentation/serial/serial-rs485.txt               |  2 +-
+ Documentation/serial/tty.txt                        |  4 ++--
+ arch/blackfin/Kconfig                               |  2 +-
+ arch/blackfin/mach-common/ints-priority.c           |  2 +-
+ arch/m68k/Kconfig.devices                           |  2 +-
+ arch/mips/cavium-octeon/Kconfig                     |  2 +-
+ arch/mips/lantiq/falcon/sysctrl.c                   |  2 +-
+ arch/mips/lantiq/xway/sysctrl.c                     |  2 +-
+ arch/mips/pci/pci-lantiq.c                          |  2 +-
+ arch/mn10300/Kconfig                                |  2 +-
+ arch/powerpc/boot/simpleboot.c                      |  2 +-
+ arch/powerpc/platforms/powernv/opal.c               |  2 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c     |  4 ++--
+ arch/score/Kconfig                                  |  3 ---
+ block/blk-core.c                                    |  4 ++--
+ block/genhd.c                                       |  2 +-
+ drivers/block/paride/pcd.c                          |  4 ++--
+ drivers/crypto/qat/qat_common/adf_ctl_drv.c         |  2 +-
+ drivers/gpu/drm/i915/intel_bios.c                   |  2 +-
+ drivers/i2c/busses/Kconfig                          |  2 +-
+ drivers/i2c/busses/i2c-s3c2410.c                    |  2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c         |  2 +-
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c       |  2 +-
+ drivers/irqchip/Kconfig                             |  2 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c    |  2 +-
+ drivers/misc/mei/pci-me.c                           |  4 ++--
+ drivers/misc/mei/pci-txe.c                          |  4 ++--
+ drivers/net/bonding/bond_sysfs_slave.c              |  2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c            |  4 ++--
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c  |  2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c      |  2 +-
+ drivers/net/ethernet/via/via-velocity.c             |  2 +-
+ drivers/net/wireless/libertas/cfg.c                 |  2 +-
+ drivers/net/wireless/libertas_tf/main.c             |  2 +-
+ drivers/platform/x86/Kconfig                        |  4 ++--
+ drivers/scsi/aic7xxx/Kconfig.aic79xx                |  2 +-
+ drivers/scsi/fnic/fnic_debugfs.c                    |  2 +-
+ drivers/scsi/fnic/fnic_trace.c                      |  2 +-
+ drivers/scsi/nsp32.c                                |  2 +-
+ drivers/scsi/pcmcia/nsp_cs.c                        |  2 +-
+ drivers/scsi/qla2xxx/qla_nx2.c                      |  2 +-
+ drivers/usb/host/Kconfig                            |  2 +-
+ drivers/video/backlight/88pm860x_bl.c               |  2 +-
+ fs/btrfs/tree-log.c                                 |  3 ++-
+ fs/stack.c                                          |  2 +-
+ include/linux/clk.h                                 |  2 +-
+ include/linux/gpio/driver.h                         |  4 ++--
+ include/linux/kfifo.h                               |  2 +-
+ include/linux/pagemap.h                             |  2 +-
+ include/linux/percpu-refcount.h                     |  2 +-
+ init/do_mounts.c                                    |  3 ++-
+ ipc/util.c                                          |  6 +++---
+ kernel/auditsc.c                                    |  2 +-
+ kernel/irq/devres.c                                 |  2 +-
+ lib/bitmap.c                                        |  4 ++--
+ lib/dma-debug.c                                     |  2 +-
+ lib/idr.c                                           |  2 +-
+ lib/rhashtable.c                                    |  4 ++--
+ lib/vsprintf.c                                      |  2 +-
+ mm/filemap.c                                        |  2 +-
+ net/mac802154/wpan.c                                |  2 +-
+ net/netfilter/ipset/ip_set_core.c                   |  2 +-
+ net/rds/af_rds.c                                    |  2 +-
+ samples/kprobes/jprobe_example.c                    |  9 ++++-----
+ scripts/checkstack.pl                               |  7 +++++--
+ scripts/sign-file                                   |  2 +-
+ security/inode.c                                    |  2 +-
+ 90 files changed, 121 insertions(+), 131 deletions(-)
+Merging audit/master (29075feaf1f5 next: openrisc: Fix build)
+$ git merge audit/master
+Resolved 'arch/arm64/kernel/ptrace.c' using previous resolution.
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/auditfilter.c
+Auto-merging kernel/audit.c
+Auto-merging include/uapi/linux/audit.h
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/um/kernel/ptrace.c
+Auto-merging arch/sparc/include/asm/thread_info_64.h
+Auto-merging arch/s390/kernel/ptrace.c
+Auto-merging arch/powerpc/kernel/ptrace.c
+Auto-merging arch/parisc/kernel/ptrace.c
+Auto-merging arch/mips/kernel/ptrace.c
+Auto-merging arch/mips/include/asm/syscall.h
+Auto-merging arch/arm64/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/ptrace.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 28eacaf0894a] Merge remote-tracking branch 'audit/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/syscall.h        | 11 +++++++++++
+ arch/alpha/kernel/ptrace.c              |  2 +-
+ arch/arm/kernel/ptrace.c                |  4 ++--
+ arch/arm64/kernel/ptrace.c              |  4 ++--
+ arch/ia64/include/asm/syscall.h         |  6 ++++++
+ arch/ia64/kernel/ptrace.c               |  2 +-
+ arch/microblaze/include/asm/syscall.h   |  5 +++++
+ arch/microblaze/kernel/ptrace.c         |  3 +--
+ arch/mips/include/asm/syscall.h         |  2 +-
+ arch/mips/kernel/ptrace.c               |  4 +---
+ arch/openrisc/include/asm/syscall.h     |  5 +++++
+ arch/openrisc/include/uapi/asm/elf.h    |  3 +--
+ arch/openrisc/kernel/ptrace.c           |  3 +--
+ arch/parisc/include/asm/syscall.h       | 11 +++++++++++
+ arch/parisc/kernel/ptrace.c             |  9 +++------
+ arch/powerpc/include/asm/syscall.h      |  6 ++++++
+ arch/powerpc/kernel/ptrace.c            |  7 ++-----
+ arch/s390/kernel/ptrace.c               |  4 +---
+ arch/sh/include/asm/syscall_32.h        | 10 ++++++++++
+ arch/sh/include/asm/syscall_64.h        | 14 ++++++++++++++
+ arch/sh/kernel/ptrace_32.c              | 14 +-------------
+ arch/sh/kernel/ptrace_64.c              | 17 +----------------
+ arch/sparc/include/asm/syscall.h        |  7 +++++++
+ arch/sparc/include/asm/thread_info_32.h |  2 ++
+ arch/sparc/include/asm/thread_info_64.h |  2 ++
+ arch/sparc/kernel/ptrace_64.c           |  9 ++-------
+ arch/um/kernel/ptrace.c                 |  3 +--
+ arch/x86/ia32/ia32entry.S               | 12 ++++++------
+ arch/x86/kernel/entry_32.S              | 11 +++++------
+ arch/x86/kernel/entry_64.S              | 11 +++++------
+ arch/x86/kernel/ptrace.c                |  8 ++------
+ arch/x86/um/asm/ptrace.h                |  4 ----
+ arch/x86/um/asm/syscall.h               | 15 +++++++++++++++
+ arch/xtensa/kernel/ptrace.c             |  2 +-
+ include/asm-generic/syscall.h           |  2 +-
+ include/linux/audit.h                   | 25 +++++++++++++++----------
+ include/uapi/linux/audit.h              | 14 +-------------
+ include/uapi/linux/elf-em.h             |  1 +
+ kernel/audit.c                          | 30 ++++++++++--------------------
+ kernel/audit.h                          |  1 -
+ kernel/audit_tree.c                     |  2 +-
+ kernel/audit_watch.c                    |  4 ++--
+ kernel/auditfilter.c                    | 33 ++++++++++++++++++++++-----------
+ kernel/auditsc.c                        | 28 +++++++++-------------------
+ 44 files changed, 197 insertions(+), 175 deletions(-)
+ create mode 100644 arch/alpha/include/asm/syscall.h
+ create mode 100644 arch/x86/um/asm/syscall.h
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea)
+$ git merge dt-rh/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.txt        |  5 ++
+ Documentation/devicetree/booting-without-of.txt    | 53 ++++++++++++++++++++++
+ 2 files changed, 58 insertions(+)
+Merging mailbox/mailbox-for-next (168e92ba5ec7 dt: mailbox: add generic bindings)
+$ git merge mailbox/mailbox-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mailbox/mailbox.txt        |  38 ++
+ Documentation/mailbox.txt                          | 122 ++++++
+ MAINTAINERS                                        |   8 +
+ arch/arm/mach-highbank/highbank.c                  |   2 +-
+ drivers/cpufreq/highbank-cpufreq.c                 |   2 +-
+ drivers/mailbox/Makefile                           |   4 +
+ drivers/mailbox/mailbox.c                          | 465 +++++++++++++++++++++
+ drivers/mailbox/pl320-ipc.c                        |   2 +-
+ include/linux/mailbox_client.h                     |  46 ++
+ include/linux/mailbox_controller.h                 | 133 ++++++
+ include/linux/{mailbox.h => pl320-ipc.h}           |   0
+ 11 files changed, 819 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/mailbox.txt
+ create mode 100644 Documentation/mailbox.txt
+ create mode 100644 drivers/mailbox/mailbox.c
+ create mode 100644 include/linux/mailbox_client.h
+ create mode 100644 include/linux/mailbox_controller.h
+ rename include/linux/{mailbox.h => pl320-ipc.h} (100%)
+Merging spi/for-next (2a92065da0a0 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof', 'spi/topic/sirf' and 'spi/topic/xilinx' into spi-next)
+$ git merge spi/for-next
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-pxa2xx-pci.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/fsl-imx-cspi.txt       |   5 +
+ Documentation/devicetree/bindings/spi/sh-msiof.txt |  23 +-
+ .../devicetree/bindings/spi/spi-davinci.txt        |  30 +++
+ .../devicetree/bindings/spi/spi-fsl-dspi.txt       |   7 +-
+ .../devicetree/bindings/spi/spi-orion.txt          |   2 +-
+ Documentation/devicetree/bindings/spi/spi-rspi.txt |  10 +-
+ Documentation/spi/spi-summary                      |   6 +-
+ drivers/spi/Kconfig                                |  17 +-
+ drivers/spi/Makefile                               |   1 +
+ drivers/spi/spi-bcm53xx.c                          | 299 +++++++++++++++++++++
+ drivers/spi/spi-bcm53xx.h                          |  72 +++++
+ drivers/spi/spi-cadence.c                          |   1 -
+ drivers/spi/spi-clps711x.c                         |  34 +--
+ drivers/spi/spi-davinci.c                          |  63 ++++-
+ drivers/spi/spi-dw-mid.c                           |  34 +--
+ drivers/spi/spi-dw-pci.c                           |  67 +++--
+ drivers/spi/spi-dw.c                               |  64 +++--
+ drivers/spi/spi-dw.h                               |   7 +-
+ drivers/spi/spi-ep93xx.c                           |   1 +
+ drivers/spi/spi-fsl-cpm.c                          |  14 +-
+ drivers/spi/spi-fsl-dspi.c                         |  22 +-
+ drivers/spi/spi-fsl-espi.c                         |  12 +-
+ drivers/spi/spi-fsl-lib.c                          |   6 +-
+ drivers/spi/spi-fsl-spi.c                          |  22 +-
+ drivers/spi/spi-imx.c                              | 286 +++++++++++++++++++-
+ drivers/spi/spi-mxs.c                              |   4 +-
+ drivers/spi/spi-omap-100k.c                        |   4 -
+ drivers/spi/spi-orion.c                            | 121 +++++++--
+ drivers/spi/spi-pl022.c                            |  64 ++++-
+ drivers/spi/spi-pxa2xx-pci.c                       |   1 -
+ drivers/spi/spi-rockchip.c                         |  15 +-
+ drivers/spi/spi-rspi.c                             |  55 ++--
+ drivers/spi/spi-sh-msiof.c                         |  51 ++--
+ drivers/spi/spi-sirf.c                             | 109 +++-----
+ drivers/spi/spi-tegra114.c                         |   9 +
+ drivers/spi/spi-tegra20-sflash.c                   |   3 +-
+ drivers/spi/spi-txx9.c                             |   2 +
+ drivers/spi/spi-xilinx.c                           |   1 -
+ drivers/spi/spi-xtensa-xtfpga.c                    |   1 +
+ drivers/spi/spi.c                                  |  45 ++--
+ include/linux/amba/bus.h                           |   5 +
+ 41 files changed, 1242 insertions(+), 353 deletions(-)
+ create mode 100644 drivers/spi/spi-bcm53xx.c
+ create mode 100644 drivers/spi/spi-bcm53xx.h
+Merging tip/auto-latest (7fc22be52bdc Merge branch 'x86/vdso')
+$ git merge tip/auto-latest
+Resolved 'arch/x86/kernel/entry_64.S' using previous resolution.
+Resolved 'arch/x86/kernel/ptrace.c' using previous resolution.
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/seccomp.c
+Auto-merging kernel/sched/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/wait.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/irqdesc.h
+Auto-merging fs/nfsd/nfs4recover.c
+CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdm.c left in tree.
+CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdev.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdev.c left in tree.
+Auto-merging fs/file.c
+Auto-merging drivers/md/dm-bufio.c
+Auto-merging drivers/irqchip/irq-armada-370-xp.c
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/gpu/drm/drm_modeset_lock.c
+Removing arch/x86/lib/rwlock.S
+Auto-merging arch/x86/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c
+Removing arch/x86/kernel/preempt.S
+Auto-merging arch/x86/kernel/entry_64.S
+CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S
+Removing arch/x86/include/asm/rwlock.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/ptrace.c
+Auto-merging arch/mips/kernel/ptrace.c
+Auto-merging arch/arm64/Kconfig
+CONFLICT (modify/delete): arch/arm/mach-omap2/irq.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-omap2/irq.c left in tree.
+Auto-merging arch/arm/kernel/ptrace.c
+Auto-merging arch/arm/kernel/irq.c
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arc/include/asm/atomic.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/locking/spinlocks.txt
+Auto-merging Documentation/locking/mutex-design.txt
+Auto-merging Documentation/locking/lockstat.txt
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/nfs/blocklayout/blocklayoutdev.c fs/nfs/blocklayout/blocklayoutdm.c arch/arm/mach-omap2/irq.c
+arch/arm/mach-omap2/irq.c: needs merge
+fs/nfs/blocklayout/blocklayoutdev.c: needs merge
+fs/nfs/blocklayout/blocklayoutdm.c: needs merge
+rm 'arch/arm/mach-omap2/irq.c'
+rm 'fs/nfs/blocklayout/blocklayoutdev.c'
+rm 'fs/nfs/blocklayout/blocklayoutdm.c'
+$ git commit -v -a
+[master 48194b23db32] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/00-INDEX                             |    2 +
+ Documentation/DocBook/kernel-locking.tmpl          |    2 +-
+ Documentation/RCU/stallwarn.txt                    |   33 +-
+ .../interrupt-controller/renesas,intc-irqpin.txt   |    8 +-
+ .../bindings/interrupt-controller/renesas,irqc.txt |   32 +
+ .../interrupt-controller/ti,keystone-irq.txt       |   36 +
+ Documentation/kernel-parameters.txt                |   68 +-
+ Documentation/{ => locking}/lockdep-design.txt     |    0
+ Documentation/{ => locking}/lockstat.txt           |    2 +-
+ Documentation/locking/locktorture.txt              |  142 +
+ Documentation/{ => locking}/mutex-design.txt       |    6 +-
+ Documentation/{ => locking}/rt-mutex-design.txt    |    0
+ Documentation/{ => locking}/rt-mutex.txt           |    0
+ Documentation/{ => locking}/spinlocks.txt          |   14 +-
+ Documentation/{ => locking}/ww-mutex-design.txt    |    0
+ Documentation/memory-barriers.txt                  |  128 +-
+ Documentation/scheduler/sched-deadline.txt         |  340 +-
+ Documentation/x86/x86_64/mm.txt                    |    2 +-
+ MAINTAINERS                                        |    5 +-
+ arch/Kconfig                                       |   11 +
+ arch/alpha/include/asm/atomic.h                    |  213 +-
+ arch/arc/include/asm/atomic.h                      |  184 +-
+ arch/arm/Kconfig                                   |    1 +
+ arch/arm/include/asm/atomic.h                      |  305 +-
+ arch/arm/kernel/irq.c                              |   19 +-
+ arch/arm/kernel/ptrace.c                           |    7 +-
+ arch/arm/kernel/topology.c                         |    4 +-
+ arch/arm/mach-imx/avic.c                           |    2 +-
+ arch/arm/mach-imx/tzic.c                           |    3 +-
+ arch/arm64/Kconfig                                 |    1 +
+ arch/arm64/include/asm/atomic.h                    |  197 +-
+ arch/arm64/include/asm/hardirq.h                   |    2 -
+ arch/arm64/kernel/irq.c                            |   27 -
+ arch/avr32/include/asm/atomic.h                    |  123 +-
+ arch/cris/arch-v10/drivers/sync_serial.c           |    1 -
+ arch/cris/arch-v32/drivers/sync_serial.c           |    1 -
+ arch/cris/include/asm/atomic.h                     |   57 +-
+ arch/hexagon/include/asm/atomic.h                  |   68 +-
+ arch/ia64/include/asm/atomic.h                     |  188 +-
+ arch/ia64/include/asm/processor.h                  |    1 -
+ arch/m32r/include/asm/atomic.h                     |  143 +-
+ arch/m68k/include/asm/atomic.h                     |  109 +-
+ arch/metag/include/asm/atomic_lnkget.h             |  121 +-
+ arch/metag/include/asm/atomic_lock1.h              |   76 +-
+ arch/mips/include/asm/atomic.h                     |  557 ++--
+ arch/mips/include/asm/processor.h                  |    6 -
+ arch/mips/kernel/ptrace.c                          |    2 +-
+ arch/mn10300/include/asm/atomic.h                  |  125 +-
+ arch/openrisc/Kconfig                              |    1 +
+ arch/openrisc/include/asm/irq.h                    |    1 -
+ arch/openrisc/kernel/irq.c                         |   12 -
+ arch/parisc/include/asm/atomic.h                   |  113 +-
+ arch/powerpc/include/asm/atomic.h                  |  198 +-
+ arch/powerpc/mm/fault.c                            |    5 +-
+ arch/s390/kernel/ptrace.c                          |    2 +-
+ arch/sh/include/asm/atomic-grb.h                   |  119 +-
+ arch/sh/include/asm/atomic-irq.h                   |   62 +-
+ arch/sh/include/asm/atomic-llsc.h                  |  101 +-
+ arch/sparc/include/asm/atomic_32.h                 |   17 +-
+ arch/sparc/include/asm/atomic_64.h                 |   45 +-
+ arch/sparc/kernel/smp_64.c                         |    2 +-
+ arch/sparc/lib/atomic32.c                          |   29 +-
+ arch/sparc/lib/atomic_64.S                         |  163 +-
+ arch/sparc/lib/ksyms.c                             |   25 +-
+ arch/um/drivers/random.c                           |    1 -
+ arch/x86/Kconfig                                   |   35 +-
+ arch/x86/Makefile                                  |    8 +-
+ arch/x86/boot/mkcpustr.c                           |    1 +
+ arch/x86/include/asm/atomic.h                      |   15 -
+ arch/x86/include/asm/calling.h                     |    6 +-
+ arch/x86/include/asm/cpufeature.h                  |   52 +-
+ arch/x86/include/asm/disabled-features.h           |   39 +
+ arch/x86/include/asm/fpu-internal.h                |    2 +-
+ arch/x86/include/asm/microcode_intel.h             |    2 +-
+ arch/x86/include/asm/numa.h                        |    1 -
+ arch/x86/include/asm/perf_event.h                  |    8 +
+ arch/x86/include/asm/pgtable_32.h                  |    3 -
+ arch/x86/include/asm/pgtable_64.h                  |    3 +-
+ arch/x86/include/asm/ptrace.h                      |    5 +
+ arch/x86/include/asm/rwlock.h                      |   49 -
+ arch/x86/include/asm/serial.h                      |   24 +-
+ arch/x86/include/asm/spinlock.h                    |   81 +-
+ arch/x86/include/asm/spinlock_types.h              |    4 -
+ arch/x86/include/uapi/asm/e820.h                   |    5 -
+ arch/x86/kernel/Makefile                           |    2 -
+ arch/x86/kernel/apic/x2apic_uv_x.c                 |    2 -
+ arch/x86/kernel/cpu/Makefile                       |    4 +-
+ arch/x86/kernel/cpu/common.c                       |   31 +-
+ arch/x86/kernel/cpu/intel.c                        |   15 +
+ arch/x86/kernel/cpu/mcheck/therm_throt.c           |    4 +-
+ arch/x86/kernel/cpu/microcode/amd_early.c          |    2 +-
+ arch/x86/kernel/cpu/microcode/intel.c              |    4 +-
+ arch/x86/kernel/cpu/microcode/intel_early.c        |   10 +-
+ arch/x86/kernel/cpu/mtrr/main.c                    |    6 +-
+ arch/x86/kernel/cpu/perf_event.c                   |   11 +-
+ arch/x86/kernel/cpu/perf_event.h                   |   49 +-
+ arch/x86/kernel/cpu/perf_event_intel.c             |  229 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c          |  185 +-
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c         |    8 +-
+ arch/x86/kernel/cpu/perf_event_intel_uncore.c      | 3293 +-------------------
+ arch/x86/kernel/cpu/perf_event_intel_uncore.h      |  439 +--
+ .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 1221 ++++++++
+ arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c  |  636 ++++
+ .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 2258 ++++++++++++++
+ arch/x86/kernel/e820.c                             |    7 +-
+ arch/x86/kernel/entry_64.S                         |   50 +-
+ arch/x86/kernel/iosf_mbi.c                         |   91 +
+ arch/x86/kernel/machine_kexec_32.c                 |    3 +-
+ arch/x86/kernel/pmc_atom.c                         |   11 +-
+ arch/x86/kernel/preempt.S                          |   25 -
+ arch/x86/kernel/process.c                          |   16 +-
+ arch/x86/kernel/process_32.c                       |    6 +-
+ arch/x86/kernel/process_64.c                       |    3 -
+ arch/x86/kernel/ptrace.c                           |  161 +-
+ arch/x86/kernel/quirks.c                           |   18 +
+ arch/x86/kernel/signal.c                           |    5 +
+ arch/x86/kernel/smpboot.c                          |  176 +-
+ arch/x86/kernel/vsyscall_64.c                      |    2 +-
+ arch/x86/kernel/xsave.c                            |    7 +-
+ arch/x86/lib/Makefile                              |    3 +-
+ arch/x86/lib/rwlock.S                              |   44 -
+ arch/x86/lib/thunk_32.S                            |   20 +-
+ arch/x86/lib/thunk_64.S                            |    7 +
+ arch/x86/mm/fault.c                                |    7 +-
+ arch/x86/mm/init_64.c                              |   36 +-
+ arch/x86/mm/numa.c                                 |   34 +-
+ arch/x86/mm/pgtable_32.c                           |   35 -
+ arch/x86/tools/relocs.c                            |    2 +-
+ arch/x86/vdso/vdso2c.h                             |   12 +-
+ arch/x86/xen/smp.c                                 |    2 +
+ arch/xtensa/include/asm/atomic.h                   |  233 +-
+ drivers/cpuidle/cpuidle.c                          |   15 +-
+ drivers/gpu/drm/drm_modeset_lock.c                 |    2 +-
+ drivers/gpu/vga/vgaarb.c                           |    1 -
+ drivers/irqchip/Kconfig                            |    7 +
+ drivers/irqchip/Makefile                           |    2 +
+ drivers/irqchip/irq-armada-370-xp.c                |   19 +-
+ drivers/irqchip/irq-atmel-aic.c                    |    4 +-
+ drivers/irqchip/irq-atmel-aic5.c                   |    4 +-
+ drivers/irqchip/irq-clps711x.c                     |   18 +-
+ drivers/irqchip/irq-gic-common.c                   |   15 +-
+ drivers/irqchip/irq-gic-v3.c                       |   13 +-
+ drivers/irqchip/irq-gic.c                          |   49 +-
+ drivers/irqchip/irq-hip04.c                        |  424 +++
+ drivers/irqchip/irq-keystone.c                     |  232 ++
+ drivers/irqchip/irq-mmp.c                          |   10 +-
+ drivers/irqchip/irq-mxs.c                          |    3 +-
+ drivers/irqchip/irq-or1k-pic.c                     |    4 +-
+ drivers/irqchip/irq-orion.c                        |    5 +-
+ drivers/irqchip/irq-renesas-intc-irqpin.c          |   85 +-
+ drivers/irqchip/irq-s3c24xx.c                      |    4 +-
+ drivers/irqchip/irq-sirfsoc.c                      |    6 +-
+ drivers/irqchip/irq-sun4i.c                        |    5 +-
+ drivers/irqchip/irq-versatile-fpga.c               |    2 +-
+ drivers/irqchip/irq-vic.c                          |    2 +-
+ drivers/irqchip/irq-vt8500.c                       |    5 +-
+ drivers/irqchip/irq-zevio.c                        |    3 +-
+ drivers/md/dm-bufio.c                              |    1 -
+ drivers/parisc/power.c                             |    1 -
+ drivers/s390/net/claw.c                            |    2 -
+ drivers/scsi/fcoe/fcoe.c                           |    1 -
+ drivers/scsi/qla2xxx/qla_os.c                      |    1 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    3 -
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    1 -
+ drivers/staging/lustre/lustre/libcfs/fail.c        |    1 -
+ drivers/tty/bfin_jtag_comm.c                       |    1 -
+ fs/afs/vlocation.c                                 |    1 -
+ fs/file.c                                          |    2 +-
+ fs/jfs/jfs_logmgr.c                                |    2 -
+ fs/jfs/jfs_txnmgr.c                                |    3 -
+ fs/nfsd/nfs4recover.c                              |    1 -
+ fs/timerfd.c                                       |    3 +-
+ include/asm-generic/atomic.h                       |  192 +-
+ include/asm-generic/atomic64.h                     |   20 +-
+ include/linux/atomic.h                             |   36 -
+ include/linux/bitops.h                             |   20 -
+ include/linux/cpu.h                                |    2 +
+ include/linux/init_task.h                          |   12 +-
+ include/linux/irqchip/arm-gic.h                    |   16 +
+ include/linux/irqdesc.h                            |   19 +
+ include/linux/jump_label.h                         |   17 +-
+ include/linux/lockdep.h                            |   13 +-
+ include/linux/mutex.h                              |    4 +-
+ include/linux/pci_ids.h                            |    2 +
+ include/linux/perf_event.h                         |   14 +-
+ include/linux/rcupdate.h                           |  106 +-
+ include/linux/rcutiny.h                            |    2 +-
+ include/linux/rwsem.h                              |    2 +-
+ include/linux/sched.h                              |   45 +-
+ include/linux/seccomp.h                            |   25 +-
+ include/linux/seqlock.h                            |   19 +
+ include/linux/smp.h                                |    2 +
+ include/linux/spinlock.h                           |    8 +-
+ include/linux/torture.h                            |    5 +-
+ include/linux/wait.h                               |   16 +-
+ include/trace/events/rcu.h                         |    3 +
+ init/Kconfig                                       |   14 +-
+ init/main.c                                        |    2 +
+ kernel/cpu.c                                       |   16 +-
+ kernel/events/callchain.c                          |    2 +-
+ kernel/events/core.c                               |  158 +-
+ kernel/exit.c                                      |   50 +-
+ kernel/fork.c                                      |   13 +-
+ kernel/irq/Kconfig                                 |    3 +
+ kernel/irq/irqdesc.c                               |   42 +
+ kernel/locking/lockdep.c                           |    6 +
+ kernel/locking/locktorture.c                       |  392 ++-
+ kernel/locking/mcs_spinlock.h                      |    3 -
+ kernel/locking/mutex.c                             |  416 +--
+ kernel/locking/mutex.h                             |    2 +-
+ kernel/locking/rtmutex.c                           |    2 +-
+ kernel/locking/rwsem-xadd.c                        |    7 +-
+ kernel/locking/semaphore.c                         |   12 +-
+ kernel/rcu/rcutorture.c                            |  278 +-
+ kernel/rcu/tiny.c                                  |   20 +-
+ kernel/rcu/tree.c                                  |  115 +-
+ kernel/rcu/tree.h                                  |   18 +-
+ kernel/rcu/tree_plugin.h                           |  404 ++-
+ kernel/rcu/update.c                                |  345 +-
+ kernel/sched/auto_group.c                          |    5 +-
+ kernel/sched/core.c                                |  298 +-
+ kernel/sched/cpudeadline.c                         |    4 +-
+ kernel/sched/cputime.c                             |   45 +-
+ kernel/sched/deadline.c                            |   33 +-
+ kernel/sched/debug.c                               |   13 +-
+ kernel/sched/fair.c                                |  464 +--
+ kernel/sched/idle.c                                |    6 +
+ kernel/sched/rt.c                                  |   21 +-
+ kernel/sched/sched.h                               |   80 +-
+ kernel/sched/stop_task.c                           |    2 +-
+ kernel/seccomp.c                                   |  252 +-
+ kernel/smp.c                                       |   22 +
+ kernel/softirq.c                                   |    2 +-
+ kernel/sys.c                                       |    2 -
+ kernel/sysctl.c                                    |    9 -
+ kernel/time/hrtimer.c                              |    1 -
+ kernel/time/posix-cpu-timers.c                     |   14 -
+ kernel/time/tick-sched.c                           |    8 +
+ kernel/torture.c                                   |   32 +-
+ kernel/trace/ring_buffer_benchmark.c               |    3 -
+ kernel/trace/trace_stack.c                         |    4 +-
+ kernel/watchdog.c                                  |   10 +-
+ lib/Kconfig.debug                                  |   16 +-
+ lib/atomic64.c                                     |   83 +-
+ lib/locking-selftest.c                             |   56 +-
+ mm/mlock.c                                         |    2 +-
+ mm/page_alloc.c                                    |    2 +
+ tools/lib/api/Makefile                             |    7 +-
+ tools/lib/api/fd/array.c                           |  127 +
+ tools/lib/api/fd/array.h                           |   46 +
+ tools/perf/.gitignore                              |    1 +
+ tools/perf/Documentation/perf-probe.txt            |    3 +
+ tools/perf/Documentation/perf-report.txt           |    5 +-
+ tools/perf/Documentation/perf-top.txt              |    9 +
+ tools/perf/Makefile.perf                           |   11 +-
+ tools/perf/arch/arm/tests/dwarf-unwind.c           |    1 +
+ tools/perf/arch/arm/util/unwind-libunwind.c        |    1 +
+ tools/perf/arch/arm64/include/perf_regs.h          |    2 +
+ tools/perf/arch/common.c                           |    9 +
+ tools/perf/arch/powerpc/Makefile                   |    2 +-
+ tools/perf/arch/powerpc/util/skip-callchain-idx.c  |    1 +
+ tools/perf/bench/sched-messaging.c                 |    2 +-
+ tools/perf/builtin-annotate.c                      |   77 +-
+ tools/perf/builtin-buildid-cache.c                 |   44 +-
+ tools/perf/builtin-diff.c                          |    6 +-
+ tools/perf/builtin-evlist.c                        |    2 +-
+ tools/perf/builtin-help.c                          |   20 +-
+ tools/perf/builtin-inject.c                        |   33 +-
+ tools/perf/builtin-kmem.c                          |   56 +-
+ tools/perf/builtin-kvm.c                           |   98 +-
+ tools/perf/builtin-lock.c                          |    7 +-
+ tools/perf/builtin-mem.c                           |    6 +-
+ tools/perf/builtin-probe.c                         |   10 +-
+ tools/perf/builtin-record.c                        |  146 +-
+ tools/perf/builtin-report.c                        |   23 +-
+ tools/perf/builtin-sched.c                         |    9 +-
+ tools/perf/builtin-script.c                        |   74 +-
+ tools/perf/builtin-stat.c                          |   11 +-
+ tools/perf/builtin-timechart.c                     |    8 +-
+ tools/perf/builtin-top.c                           |   87 +-
+ tools/perf/builtin-trace.c                         |   51 +-
+ tools/perf/config/Makefile                         |   52 +-
+ tools/perf/config/feature-checks/Makefile          |   18 +-
+ tools/perf/config/utilities.mak                    |    2 +-
+ tools/perf/perf-with-kcore.sh                      |  259 ++
+ tools/perf/perf.c                                  |   10 +-
+ tools/perf/perf.h                                  |    3 -
+ tools/perf/tests/builtin-test.c                    |   18 +-
+ tools/perf/tests/fdarray.c                         |  174 ++
+ tools/perf/tests/mmap-basic.c                      |    7 +-
+ tools/perf/tests/open-syscall-all-cpus.c           |    5 +-
+ tools/perf/tests/open-syscall-tp-fields.c          |    9 +-
+ tools/perf/tests/open-syscall.c                    |    3 +-
+ tools/perf/tests/perf-record.c                     |   15 +-
+ tools/perf/tests/pmu.c                             |    2 +-
+ tools/perf/tests/rdpmc.c                           |    6 +-
+ tools/perf/tests/sw-clock.c                        |    6 +-
+ tools/perf/tests/switch-tracking.c                 |  572 ++++
+ tools/perf/tests/task-exit.c                       |    8 +-
+ tools/perf/tests/tests.h                           |    3 +
+ tools/perf/ui/browsers/hists.c                     |  384 +--
+ tools/perf/ui/gtk/hists.c                          |   18 +-
+ tools/perf/ui/hist.c                               |  284 +-
+ tools/perf/ui/stdio/hist.c                         |    4 +-
+ tools/perf/util/annotate.c                         |   21 +-
+ tools/perf/util/cache.h                            |    1 +
+ tools/perf/util/callchain.c                        |  240 +-
+ tools/perf/util/callchain.h                        |    6 +-
+ tools/perf/util/cloexec.c                          |   35 +-
+ tools/perf/util/color.c                            |   16 +
+ tools/perf/util/color.h                            |    1 +
+ tools/perf/util/comm.c                             |    7 +-
+ tools/perf/util/comm.h                             |    6 +-
+ tools/perf/util/config.c                           |   40 +-
+ tools/perf/util/data.c                             |    8 +-
+ tools/perf/util/debug.c                            |   36 +-
+ tools/perf/util/debug.h                            |   11 +
+ tools/perf/util/dso.c                              |   36 +-
+ tools/perf/util/event.c                            |   14 +-
+ tools/perf/util/event.h                            |    2 +
+ tools/perf/util/evlist.c                           |  236 +-
+ tools/perf/util/evlist.h                           |   21 +-
+ tools/perf/util/evsel.c                            |   67 +-
+ tools/perf/util/evsel.h                            |    2 +
+ tools/perf/util/hist.c                             |   22 +
+ tools/perf/util/hist.h                             |   18 +-
+ tools/perf/util/kvm-stat.h                         |    1 -
+ tools/perf/util/machine.c                          |   71 +-
+ tools/perf/util/machine.h                          |   21 +
+ tools/perf/util/map.c                              |    1 +
+ tools/perf/util/ordered-events.c                   |  245 ++
+ tools/perf/util/ordered-events.h                   |   51 +
+ tools/perf/util/parse-events.c                     |   18 +-
+ tools/perf/util/parse-events.y                     |   10 +
+ tools/perf/util/pmu.c                              |   83 +-
+ tools/perf/util/pmu.h                              |   18 +-
+ tools/perf/util/probe-event.c                      |  178 +-
+ tools/perf/util/probe-event.h                      |    3 +-
+ tools/perf/util/probe-finder.c                     |   23 +-
+ tools/perf/util/python.c                           |    6 +-
+ tools/perf/util/record.c                           |   40 +-
+ tools/perf/util/run-command.c                      |    9 +-
+ .../perf/util/scripting-engines/trace-event-perl.c |    6 +
+ .../util/scripting-engines/trace-event-python.c    |  120 +-
+ tools/perf/util/session.c                          |  300 +-
+ tools/perf/util/session.h                          |   32 +-
+ tools/perf/util/sort.c                             |  119 +-
+ tools/perf/util/sort.h                             |    1 +
+ tools/perf/util/symbol-elf.c                       |   24 +-
+ tools/perf/util/symbol.c                           |   43 +-
+ tools/perf/util/symbol.h                           |   14 +-
+ tools/perf/util/thread.c                           |   24 +-
+ tools/perf/util/thread.h                           |   10 +-
+ tools/perf/util/tool.h                             |    2 +-
+ tools/perf/util/trace-event-scripting.c            |    7 +
+ tools/perf/util/trace-event.h                      |    1 +
+ tools/perf/util/util.c                             |   54 +-
+ tools/perf/util/util.h                             |   23 +-
+ .../selftests/rcutorture/bin/config2frag.sh        |    4 +-
+ .../selftests/rcutorture/bin/configcheck.sh        |    4 +-
+ .../testing/selftests/rcutorture/bin/configinit.sh |    4 +-
+ .../testing/selftests/rcutorture/bin/functions.sh  |   20 +
+ .../testing/selftests/rcutorture/bin/kvm-build.sh  |    2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-lock.sh   |    2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |    2 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh        |    2 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh     |    5 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh      |    6 +-
+ .../selftests/rcutorture/bin/parse-build.sh        |    5 +-
+ .../selftests/rcutorture/bin/parse-console.sh      |    9 +-
+ .../selftests/rcutorture/bin/parse-torture.sh      |    5 +-
+ .../selftests/rcutorture/configs/lock/CFLIST       |    2 +
+ .../selftests/rcutorture/configs/lock/LOCK02       |    6 +
+ .../selftests/rcutorture/configs/lock/LOCK02.boot  |    1 +
+ .../selftests/rcutorture/configs/lock/LOCK03       |    6 +
+ .../selftests/rcutorture/configs/lock/LOCK03.boot  |    1 +
+ .../rcutorture/configs/lock/ver_functions.sh       |    2 +-
+ .../selftests/rcutorture/configs/rcu/CFLIST        |    3 +
+ .../selftests/rcutorture/configs/rcu/TASKS01       |    9 +
+ .../selftests/rcutorture/configs/rcu/TASKS01.boot  |    1 +
+ .../selftests/rcutorture/configs/rcu/TASKS02       |    5 +
+ .../selftests/rcutorture/configs/rcu/TASKS02.boot  |    1 +
+ .../selftests/rcutorture/configs/rcu/TASKS03       |   13 +
+ .../selftests/rcutorture/configs/rcu/TASKS03.boot  |    1 +
+ .../selftests/rcutorture/configs/rcu/TREE01        |    4 +-
+ .../selftests/rcutorture/configs/rcu/TREE01.boot   |    2 +-
+ .../selftests/rcutorture/configs/rcu/TREE07        |    3 +-
+ .../selftests/rcutorture/configs/rcu/TREE07.boot   |    1 +
+ .../rcutorture/configs/rcu/ver_functions.sh        |    2 +-
+ tools/testing/selftests/rcutorture/doc/initrd.txt  |    1 +
+ 390 files changed, 15229 insertions(+), 9576 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,keystone-irq.txt
+ rename Documentation/{ => locking}/lockdep-design.txt (100%)
+ rename Documentation/{ => locking}/lockstat.txt (99%)
+ create mode 100644 Documentation/locking/locktorture.txt
+ rename Documentation/{ => locking}/mutex-design.txt (97%)
+ rename Documentation/{ => locking}/rt-mutex-design.txt (100%)
+ rename Documentation/{ => locking}/rt-mutex.txt (100%)
+ rename Documentation/{ => locking}/spinlocks.txt (98%)
+ rename Documentation/{ => locking}/ww-mutex-design.txt (100%)
+ create mode 100644 arch/x86/include/asm/disabled-features.h
+ delete mode 100644 arch/x86/include/asm/rwlock.h
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+ delete mode 100644 arch/x86/kernel/preempt.S
+ delete mode 100644 arch/x86/lib/rwlock.S
+ create mode 100644 drivers/irqchip/irq-hip04.c
+ create mode 100644 drivers/irqchip/irq-keystone.c
+ create mode 100644 tools/lib/api/fd/array.c
+ create mode 100644 tools/lib/api/fd/array.h
+ create mode 100644 tools/perf/perf-with-kcore.sh
+ create mode 100644 tools/perf/tests/fdarray.c
+ create mode 100644 tools/perf/tests/switch-tracking.c
+ create mode 100644 tools/perf/util/ordered-events.c
+ create mode 100644 tools/perf/util/ordered-events.h
+ mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh
+ mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/kvm.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK02.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK03
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK03.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS01.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS02.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS03
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS03.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot
+$ git am -3 ../patches/0001-pnfs-merge-fixup-for-sched-cleanup-of-set_current_st.patch
+Applying: pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUNNING)
+$ git reset HEAD^
+Unstaged changes after reset:
+M	fs/nfs/blocklayout/rpc_pipefs.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 21a0040d635f] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Fri Oct 3 13:50:15 2014 +1000
+$ git am -3 ../patches/0001-arm-omap-irq-fixup-for-new-handle_domain_irq-method.patch
+Applying: arm: omap: irq: fixup for new handle_domain_irq method
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/irqchip/irq-omap-intc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 570d79319dd9] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Fri Oct 3 13:50:15 2014 +1000
+Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible)
+$ git merge clockevents/clockevents/next
+Already up-to-date.
+Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (a18c3f16a907 mpc85xx_edac: Make L2 interrupt shared too)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c   | 146 ++++++++++++++++++++++++--------------------
+ drivers/edac/amd64_edac.h   |   5 --
+ drivers/edac/edac_core.h    |   2 +-
+ drivers/edac/edac_mc.c      |   2 +-
+ drivers/edac/mpc85xx_edac.c |   2 +-
+ drivers/edac/ppc4xx_edac.c  |   2 +-
+ 6 files changed, 84 insertions(+), 75 deletions(-)
+Merging irqchip/irqchip/for-next (1633cd9aed67 Merge branch 'irqchip/gic' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Auto-merging drivers/irqchip/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/interrupt-controller/atmel,aic.txt    |   2 +-
+ .../interrupt-controller/brcm,bcm7120-l2-intc.txt  |  86 ++++++++
+ drivers/irqchip/Makefile                           |   3 +-
+ drivers/irqchip/irq-atmel-aic5.c                   |  12 +-
+ drivers/irqchip/irq-bcm7120-l2.c                   | 219 +++++++++++++++++++++
+ drivers/irqchip/irq-gic-v3.c                       |  87 ++++++--
+ 6 files changed, 385 insertions(+), 24 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt
+ create mode 100644 drivers/irqchip/irq-bcm7120-l2.c
+Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next)
+$ git merge tiny/tiny/next
+Resolved 'arch/x86/boot/compressed/Makefile' using previous resolution.
+Auto-merging scripts/kconfig/Makefile
+Auto-merging kernel/sys_ni.c
+Auto-merging init/Kconfig
+Auto-merging arch/x86/kernel/cpu/common.c
+Auto-merging arch/x86/kernel/cpu/Makefile
+Auto-merging arch/x86/include/asm/cpufeature.h
+Auto-merging arch/x86/boot/compressed/aslr.c
+Auto-merging arch/x86/boot/compressed/Makefile
+CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile
+Auto-merging arch/x86/Makefile
+Auto-merging arch/x86/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f9a4d75b3217] Merge remote-tracking branch 'tiny/tiny/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/Kconfig                                | 12 +++++
+ arch/x86/Makefile                               |  7 ---
+ arch/x86/boot/Makefile                          |  7 ++-
+ arch/x86/boot/compressed/Makefile               | 17 ++++---
+ arch/x86/boot/compressed/aslr.c                 |  3 --
+ arch/x86/boot/compressed/early_serial_console.c |  4 --
+ arch/x86/boot/cpu.c                             | 68 +++++++++++++++----------
+ arch/x86/configs/tiny.config                    |  1 +
+ arch/x86/include/asm/cpufeature.h               |  7 +++
+ arch/x86/kernel/cpu/Makefile                    |  7 ++-
+ arch/x86/kernel/cpu/common.c                    |  4 +-
+ init/Kconfig                                    | 10 ++++
+ kernel/configs/tiny.config                      |  4 ++
+ kernel/sys_ni.c                                 |  3 ++
+ mm/Makefile                                     |  8 ++-
+ scripts/bloat-o-meter                           |  2 +
+ scripts/kconfig/Makefile                        | 19 +++++++
+ 17 files changed, 127 insertions(+), 56 deletions(-)
+ create mode 100644 arch/x86/configs/tiny.config
+ create mode 100644 kernel/configs/tiny.config
+Merging ftrace/for-next (7cbfb5eed983 Merge branch 'trace/ftrace/testing' into trace/for-next)
+$ git merge ftrace/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |   1 +
+ include/linux/ftrace.h                             |  10 +-
+ include/linux/tracepoint.h                         |  11 +
+ kernel/trace/ftrace.c                              | 416 ++++++++++++---------
+ kernel/trace/trace_selftest.c                      |   4 +
+ kernel/trace/trace_syscalls.c                      |   4 +-
+ tools/testing/selftests/Makefile                   |   1 +
+ tools/testing/selftests/ftrace/Makefile            |   7 +
+ tools/testing/selftests/ftrace/README              |  45 +++
+ tools/testing/selftests/ftrace/ftracetest          | 159 ++++++++
+ .../selftests/ftrace/test.d/00basic/basic1.tc      |   3 +
+ .../selftests/ftrace/test.d/00basic/basic2.tc      |   6 +
+ .../selftests/ftrace/test.d/00basic/basic3.tc      |   8 +
+ .../ftrace/test.d/kprobe/add_and_remove.tc         |  11 +
+ .../selftests/ftrace/test.d/kprobe/busy_check.tc   |  14 +
+ tools/testing/selftests/ftrace/test.d/template     |   4 +
+ 16 files changed, 526 insertions(+), 178 deletions(-)
+ create mode 100644 tools/testing/selftests/ftrace/Makefile
+ create mode 100644 tools/testing/selftests/ftrace/README
+ create mode 100755 tools/testing/selftests/ftrace/ftracetest
+ create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic1.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic2.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic3.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/template
+Merging rcu/rcu/next (c98fed9fc6a7 locktorture: Cleanup header usage)
+$ git merge rcu/rcu/next
+Merge made by the 'recursive' strategy.
+ Documentation/locking/locktorture.txt              |   5 +
+ kernel/locking/locktorture.c                       | 141 ++++++++++++++++++---
+ .../selftests/rcutorture/configs/lock/CFLIST       |   1 +
+ .../selftests/rcutorture/configs/lock/LOCK04       |   6 +
+ .../selftests/rcutorture/configs/lock/LOCK04.boot  |   1 +
+ 5 files changed, 137 insertions(+), 17 deletions(-)
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK04
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (f439ed27f8b8 kvm: do not handle APIC access page if in-kernel irqchip is not in use)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging include/linux/mm.h
+Auto-merging arch/x86/include/asm/cpufeature.h
+Auto-merging arch/s390/mm/vmem.c
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt              | 188 ++++---
+ Documentation/virtual/kvm/devices/arm-vgic.txt |  10 +
+ Documentation/virtual/kvm/mmu.txt              |  14 +
+ arch/arm/include/asm/kvm_emulate.h             |   5 +
+ arch/arm/include/asm/kvm_host.h                |  23 +-
+ arch/arm/include/asm/kvm_mmu.h                 |  11 -
+ arch/arm/include/uapi/asm/kvm.h                |   2 +
+ arch/arm/kvm/arm.c                             |  34 +-
+ arch/arm/kvm/coproc.c                          |   2 +-
+ arch/arm/kvm/guest.c                           |   2 +-
+ arch/arm/kvm/mmu.c                             |  40 +-
+ arch/arm64/include/asm/kvm_arm.h               |  13 +-
+ arch/arm64/include/asm/kvm_emulate.h           |   5 +
+ arch/arm64/include/asm/kvm_host.h              |  24 +-
+ arch/arm64/include/asm/kvm_mmu.h               |  18 +-
+ arch/arm64/include/uapi/asm/kvm.h              |   2 +
+ arch/arm64/kvm/guest.c                         |   2 +-
+ arch/arm64/kvm/sys_regs.c                      |   2 +-
+ arch/ia64/include/asm/kvm_host.h               |  15 +-
+ arch/ia64/kvm/kvm-ia64.c                       |  34 +-
+ arch/mips/include/asm/kvm_host.h               |  16 +-
+ arch/mips/kvm/mips.c                           |  40 +-
+ arch/powerpc/include/asm/kvm_asm.h             |  20 +-
+ arch/powerpc/include/asm/kvm_booke.h           |   7 +-
+ arch/powerpc/include/asm/kvm_host.h            |  24 +-
+ arch/powerpc/include/asm/kvm_ppc.h             |  13 +-
+ arch/powerpc/include/asm/reg_booke.h           |   2 +
+ arch/powerpc/include/uapi/asm/kvm.h            |   6 +
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S      |  12 +-
+ arch/powerpc/kernel/cputable.c                 |   5 +
+ arch/powerpc/kernel/exceptions-64e.S           |   4 +-
+ arch/powerpc/kernel/head_fsl_booke.S           |  26 +-
+ arch/powerpc/kvm/book3s.c                      | 162 ++----
+ arch/powerpc/kvm/book3s.h                      |   3 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c            |   4 +-
+ arch/powerpc/kvm/book3s_hv.c                   |  47 +-
+ arch/powerpc/kvm/book3s_hv_builtin.c           |   6 +
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S        |   3 +-
+ arch/powerpc/kvm/book3s_pr.c                   |   6 +-
+ arch/powerpc/kvm/booke.c                       | 287 +++++++---
+ arch/powerpc/kvm/booke.h                       |  40 +-
+ arch/powerpc/kvm/booke_emulate.c               | 163 ++++++
+ arch/powerpc/kvm/bookehv_interrupts.S          |  13 +-
+ arch/powerpc/kvm/e500.h                        |  20 +
+ arch/powerpc/kvm/e500_emulate.c                |  20 +
+ arch/powerpc/kvm/e500_mmu_host.c               |  20 +-
+ arch/powerpc/kvm/e500mc.c                      |  60 +-
+ arch/powerpc/kvm/emulate.c                     |  17 +-
+ arch/powerpc/kvm/emulate_loadstore.c           |   2 +-
+ arch/powerpc/kvm/powerpc.c                     | 134 +++--
+ arch/powerpc/platforms/Kconfig.cputype         |   6 +-
+ arch/s390/include/asm/kvm_host.h               |  34 +-
+ arch/s390/include/asm/pgalloc.h                |   8 +-
+ arch/s390/include/asm/pgtable.h                |  72 +--
+ arch/s390/include/asm/tlb.h                    |   2 +-
+ arch/s390/include/uapi/asm/kvm.h               |  10 +
+ arch/s390/kvm/diag.c                           |  28 +-
+ arch/s390/kvm/gaccess.c                        |   3 +-
+ arch/s390/kvm/interrupt.c                      | 152 ++---
+ arch/s390/kvm/kvm-s390.c                       | 179 +++---
+ arch/s390/kvm/kvm-s390.h                       |   6 +-
+ arch/s390/kvm/priv.c                           |  11 +-
+ arch/s390/mm/fault.c                           |  25 +-
+ arch/s390/mm/pgtable.c                         | 707 +++++++++++------------
+ arch/s390/mm/vmem.c                            |   2 +-
+ arch/x86/include/asm/cpufeature.h              |   1 +
+ arch/x86/include/asm/kvm_host.h                |  32 +-
+ arch/x86/include/asm/kvm_para.h                |  10 +-
+ arch/x86/kernel/cpu/amd.c                      |   7 +
+ arch/x86/kvm/cpuid.c                           |  31 +-
+ arch/x86/kvm/cpuid.h                           |  10 +-
+ arch/x86/kvm/emulate.c                         |  51 +-
+ arch/x86/kvm/lapic.c                           |  34 +-
+ arch/x86/kvm/mmu.c                             | 139 ++---
+ arch/x86/kvm/mmu.h                             |   5 +
+ arch/x86/kvm/paging_tmpl.h                     |  22 +-
+ arch/x86/kvm/pmu.c                             |  24 +-
+ arch/x86/kvm/svm.c                             |  40 +-
+ arch/x86/kvm/trace.h                           |  41 +-
+ arch/x86/kvm/vmx.c                             | 377 ++++++++++---
+ arch/x86/kvm/x86.c                             | 148 +++--
+ arch/x86/kvm/x86.h                             |  22 +-
+ drivers/iommu/amd_iommu_v2.c                   |   6 +-
+ include/kvm/arm_vgic.h                         | 112 +++-
+ include/linux/kvm_host.h                       |  31 +-
+ include/linux/kvm_types.h                      |  14 +
+ include/linux/mm.h                             |   1 +
+ include/linux/mmu_notifier.h                   |  24 +-
+ include/trace/events/kvm.h                     |  36 +-
+ include/uapi/linux/kvm.h                       |  28 +-
+ mm/gup.c                                       |   4 +
+ mm/mmu_notifier.c                              |   5 +-
+ mm/rmap.c                                      |   6 +-
+ virt/kvm/arm/vgic.c                            | 744 +++++++++++++++++++------
+ virt/kvm/async_pf.c                            |   4 +-
+ virt/kvm/eventfd.c                             |   4 +-
+ virt/kvm/ioapic.c                              |  46 +-
+ virt/kvm/ioapic.h                              |   2 +
+ virt/kvm/kvm_main.c                            | 192 +++++--
+ virt/kvm/vfio.c                                |  22 +-
+ virt/kvm/vfio.h                                |  13 +
+ 101 files changed, 3339 insertions(+), 1822 deletions(-)
+ create mode 100644 virt/kvm/vfio.h
+Merging kvm-arm/next (0496daa5cf99 arm/arm64: KVM: Report correct FSC for unsupported fault types)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (59119fad2954 xen-scsifront: don't deadlock if the ring becomes full)
+$ git merge xen-tip/linux-next
+Auto-merging drivers/scsi/Kconfig
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging arch/x86/mm/fault.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                          |    9 +
+ arch/x86/include/asm/pgtable_types.h |   11 +-
+ arch/x86/mm/fault.c                  |   22 +-
+ arch/x86/mm/init_32.c                |    2 +-
+ arch/x86/mm/init_64.c                |    2 +-
+ arch/x86/pci/i386.c                  |    2 -
+ arch/x86/xen/efi.c                   |    2 +
+ arch/x86/xen/enlighten.c             |    2 -
+ arch/x86/xen/mmu.c                   |   48 +-
+ arch/x86/xen/p2m.c                   |   23 +-
+ arch/x86/xen/p2m.h                   |   15 +
+ arch/x86/xen/setup.c                 |  370 ++++--
+ drivers/scsi/Kconfig                 |    9 +
+ drivers/scsi/Makefile                |    1 +
+ drivers/scsi/xen-scsifront.c         | 1025 ++++++++++++++++
+ drivers/xen/Kconfig                  |    9 +
+ drivers/xen/Makefile                 |    1 +
+ drivers/xen/efi.c                    |    2 +
+ drivers/xen/events/events_base.c     |    5 +-
+ drivers/xen/grant-table.c            |    2 +-
+ drivers/xen/xen-scsiback.c           | 2125 ++++++++++++++++++++++++++++++++++
+ include/xen/events.h                 |    2 +
+ include/xen/interface/io/vscsiif.h   |  229 ++++
+ 23 files changed, 3763 insertions(+), 155 deletions(-)
+ create mode 100644 arch/x86/xen/p2m.h
+ create mode 100644 drivers/scsi/xen-scsifront.c
+ create mode 100644 drivers/xen/xen-scsiback.c
+ create mode 100644 include/xen/interface/io/vscsiif.h
+Merging percpu/for-next (92f4f5286667 Merge branch 'for-3.18' into for-next)
+$ git merge percpu/for-next
+Resolved 'fs/ext4/super.c' using previous resolution.
+Auto-merging net/sctp/protocol.c
+Auto-merging net/ipv6/syncookies.c
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/ipv4/syncookies.c
+Auto-merging net/ipv4/route.c
+Auto-merging net/dccp/proto.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/dev.c
+Auto-merging mm/shmem.c
+Auto-merging mm/backing-dev.c
+Auto-merging kernel/watchdog.c
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/time/hrtimer.c
+Auto-merging kernel/softirq.c
+Auto-merging kernel/smp.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/irq/chip.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/events/callchain.c
+Auto-merging include/net/snmp.h
+Auto-merging include/linux/percpu-refcount.h
+Auto-merging include/linux/blk-mq.h
+Auto-merging fs/super.c
+Auto-merging fs/ext4/super.c
+CONFLICT (content): Merge conflict in fs/ext4/super.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/ext3/super.c
+Auto-merging fs/btrfs/extent-tree.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging drivers/net/ethernet/tile/tilepro.c
+Auto-merging drivers/irqchip/irq-gic.c
+Auto-merging block/blk-sysfs.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/x86/xen/enlighten.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/svm.c
+Auto-merging arch/x86/kvm/mmu.c
+Auto-merging arch/x86/kernel/cpu/perf_event_intel_lbr.c
+Auto-merging arch/x86/kernel/cpu/perf_event_intel_ds.c
+Auto-merging arch/x86/kernel/cpu/perf_event_intel.c
+Auto-merging arch/x86/kernel/cpu/perf_event.c
+Auto-merging arch/x86/kernel/cpu/common.c
+Auto-merging arch/tile/mm/init.c
+Auto-merging arch/tile/kernel/time.c
+Auto-merging arch/sparc/kernel/perf_event.c
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/s390/kernel/kprobes.c
+Auto-merging arch/s390/kernel/irq.c
+Auto-merging arch/s390/include/asm/irq.h
+Auto-merging arch/blackfin/mach-common/ints-priority.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cb8782d1b74c] Merge remote-tracking branch 'percpu/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/perf_event.c              |  16 +-
+ arch/alpha/kernel/time.c                    |   6 +-
+ arch/arm/kernel/smp_twd.c                   |  12 +-
+ arch/avr32/kernel/kprobes.c                 |   2 +-
+ arch/blackfin/include/asm/ipipe.h           |   2 +-
+ arch/blackfin/kernel/perf_event.c           |  10 +-
+ arch/blackfin/mach-common/ints-priority.c   |   8 +-
+ arch/blackfin/mach-common/smp.c             |   2 +-
+ arch/ia64/include/asm/hw_irq.h              |   2 +-
+ arch/ia64/include/asm/sn/arch.h             |   4 +-
+ arch/ia64/include/asm/sn/nodepda.h          |   2 +-
+ arch/ia64/include/asm/switch_to.h           |   2 +-
+ arch/ia64/include/asm/uv/uv_hub.h           |   2 +-
+ arch/ia64/kernel/irq.c                      |   2 +-
+ arch/ia64/kernel/irq_ia64.c                 |   4 +-
+ arch/ia64/kernel/kprobes.c                  |   6 +-
+ arch/ia64/kernel/mca.c                      |  16 +-
+ arch/ia64/kernel/process.c                  |   6 +-
+ arch/ia64/kernel/traps.c                    |   2 +-
+ arch/ia64/sn/kernel/setup.c                 |   2 +-
+ arch/ia64/sn/kernel/sn2/sn2_smp.c           |  28 +-
+ arch/metag/kernel/perf/perf_event.c         |  14 +-
+ arch/mips/cavium-octeon/octeon-irq.c        |  30 +-
+ arch/mips/include/asm/fpu_emulator.h        |  24 +-
+ arch/mips/kernel/kprobes.c                  |   6 +-
+ arch/mips/kernel/perf_event_mipsxx.c        |  14 +-
+ arch/mips/kernel/smp-bmips.c                |   2 +-
+ arch/mips/loongson/loongson-3/smp.c         |   6 +-
+ arch/powerpc/include/asm/cputime.h          |   6 +-
+ arch/s390/include/asm/cputime.h             |   2 +-
+ arch/s390/include/asm/irq.h                 |   2 +-
+ arch/s390/include/asm/percpu.h              |  16 +-
+ arch/s390/kernel/irq.c                      |   2 +-
+ arch/s390/kernel/kprobes.c                  |   8 +-
+ arch/s390/kernel/nmi.c                      |  10 +-
+ arch/s390/kernel/perf_cpum_cf.c             |  22 +-
+ arch/s390/kernel/perf_cpum_sf.c             |  16 +-
+ arch/s390/kernel/processor.c                |   4 +-
+ arch/s390/kernel/time.c                     |   6 +-
+ arch/s390/kernel/vtime.c                    |   2 +-
+ arch/s390/oprofile/hwsampler.c              |   2 +-
+ arch/sparc/include/asm/cpudata_32.h         |   2 +-
+ arch/sparc/include/asm/cpudata_64.h         |   2 +-
+ arch/sparc/kernel/kprobes.c                 |   6 +-
+ arch/sparc/kernel/leon_smp.c                |   2 +-
+ arch/sparc/kernel/nmi.c                     |  16 +-
+ arch/sparc/kernel/pci_sun4v.c               |   8 +-
+ arch/sparc/kernel/perf_event.c              |  26 +-
+ arch/sparc/kernel/sun4d_smp.c               |   2 +-
+ arch/sparc/kernel/time_64.c                 |   2 +-
+ arch/sparc/mm/tlb.c                         |   4 +-
+ arch/tile/include/asm/irqflags.h            |   4 +-
+ arch/tile/include/asm/mmu_context.h         |   6 +-
+ arch/tile/kernel/irq.c                      |  14 +-
+ arch/tile/kernel/messaging.c                |   4 +-
+ arch/tile/kernel/perf_event.c               |  12 +-
+ arch/tile/kernel/process.c                  |   2 +-
+ arch/tile/kernel/setup.c                    |   3 +-
+ arch/tile/kernel/single_step.c              |   4 +-
+ arch/tile/kernel/smp.c                      |   2 +-
+ arch/tile/kernel/smpboot.c                  |   6 +-
+ arch/tile/kernel/time.c                     |   8 +-
+ arch/tile/mm/highmem.c                      |   2 +-
+ arch/tile/mm/init.c                         |   4 +-
+ arch/x86/include/asm/debugreg.h             |   4 +-
+ arch/x86/include/asm/perf_event_p4.h        |   2 +-
+ arch/x86/include/asm/uv/uv_hub.h            |  12 +-
+ arch/x86/kernel/apb_timer.c                 |   4 +-
+ arch/x86/kernel/apic/apic.c                 |   4 +-
+ arch/x86/kernel/apic/x2apic_cluster.c       |   2 +-
+ arch/x86/kernel/cpu/common.c                |   6 +-
+ arch/x86/kernel/cpu/mcheck/mce-inject.c     |   6 +-
+ arch/x86/kernel/cpu/mcheck/mce.c            |  46 +--
+ arch/x86/kernel/cpu/mcheck/mce_amd.c        |   2 +-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c      |  22 +-
+ arch/x86/kernel/cpu/perf_event.c            |  22 +-
+ arch/x86/kernel/cpu/perf_event_amd.c        |   4 +-
+ arch/x86/kernel/cpu/perf_event_intel.c      |  18 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c   |  20 +-
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c  |  12 +-
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c |  12 +-
+ arch/x86/kernel/cpu/perf_event_knc.c        |   2 +-
+ arch/x86/kernel/cpu/perf_event_p4.c         |   6 +-
+ arch/x86/kernel/hw_breakpoint.c             |   8 +-
+ arch/x86/kernel/irq_64.c                    |   6 +-
+ arch/x86/kernel/kvm.c                       |  22 +-
+ arch/x86/kvm/mmu.c                          |   2 +-
+ arch/x86/kvm/svm.c                          |   6 +-
+ arch/x86/kvm/vmx.c                          |  10 +-
+ arch/x86/kvm/x86.c                          |   2 +-
+ arch/x86/mm/kmemcheck/kmemcheck.c           |  14 +-
+ arch/x86/oprofile/nmi_int.c                 |   8 +-
+ arch/x86/oprofile/op_model_p4.c             |   2 +-
+ arch/x86/platform/uv/uv_nmi.c               |  40 +--
+ arch/x86/platform/uv/uv_time.c              |   2 +-
+ arch/x86/xen/enlighten.c                    |   4 +-
+ arch/x86/xen/multicalls.c                   |   8 +-
+ arch/x86/xen/spinlock.c                     |   2 +-
+ arch/x86/xen/time.c                         |  10 +-
+ block/blk-mq-sysfs.c                        |   6 +
+ block/blk-mq.c                              |  18 +-
+ block/blk-sysfs.c                           |  11 +-
+ drivers/char/random.c                       |   2 +-
+ drivers/clocksource/dummy_timer.c           |   2 +-
+ drivers/clocksource/metag_generic.c         |   2 +-
+ drivers/clocksource/qcom-timer.c            |   2 +-
+ drivers/cpuidle/governors/ladder.c          |   4 +-
+ drivers/cpuidle/governors/menu.c            |   6 +-
+ drivers/irqchip/irq-gic.c                   |  10 +-
+ drivers/md/dm-stats.c                       |   2 +-
+ drivers/net/ethernet/tile/tilegx.c          |  22 +-
+ drivers/net/ethernet/tile/tilepro.c         |   8 +-
+ drivers/oprofile/cpu_buffer.c               |  10 +-
+ drivers/oprofile/timer_int.c                |   2 +-
+ drivers/s390/cio/ccwreq.c                   |   2 +-
+ drivers/s390/cio/chsc_sch.c                 |   2 +-
+ drivers/s390/cio/cio.c                      |   6 +-
+ drivers/s390/cio/device_fsm.c               |   4 +-
+ drivers/s390/cio/eadm_sch.c                 |   2 +-
+ drivers/target/target_core_tpg.c            |   3 +-
+ fs/aio.c                                    |   4 +-
+ fs/btrfs/disk-io.c                          |   8 +-
+ fs/btrfs/extent-tree.c                      |   2 +-
+ fs/ext2/super.c                             |   6 +-
+ fs/ext3/super.c                             |   6 +-
+ fs/ext4/mballoc.c                           |   2 +-
+ fs/ext4/super.c                             |  11 +-
+ fs/file_table.c                             |   2 +-
+ fs/quota/dquot.c                            |   2 +-
+ fs/super.c                                  |   3 +-
+ include/linux/blk-mq.h                      |   1 +
+ include/linux/cpumask.h                     |  11 +
+ include/linux/flex_proportions.h            |   5 +-
+ include/linux/kernel_stat.h                 |   4 +-
+ include/linux/percpu-defs.h                 |   3 -
+ include/linux/percpu-refcount.h             | 122 ++++---
+ include/linux/percpu.h                      |  13 +-
+ include/linux/percpu_counter.h              |  10 +-
+ include/linux/proportions.h                 |   5 +-
+ include/net/dst_ops.h                       |   2 +-
+ include/net/inet_frag.h                     |   2 +-
+ include/net/netfilter/nf_conntrack.h        |   2 +-
+ include/net/snmp.h                          |   6 +-
+ kernel/cgroup.c                             |   7 +-
+ kernel/events/callchain.c                   |   4 +-
+ kernel/events/core.c                        |  24 +-
+ kernel/irq/chip.c                           |   2 +-
+ kernel/irq_work.c                           |  12 +-
+ kernel/printk/printk.c                      |   4 +-
+ kernel/sched/clock.c                        |   2 +-
+ kernel/sched/deadline.c                     |   2 +-
+ kernel/sched/fair.c                         |   2 +-
+ kernel/sched/rt.c                           |   2 +-
+ kernel/sched/sched.h                        |   4 +-
+ kernel/smp.c                                |   6 +-
+ kernel/softirq.c                            |   4 +-
+ kernel/taskstats.c                          |   2 +-
+ kernel/time/hrtimer.c                       |  22 +-
+ kernel/time/tick-broadcast.c                |   2 +-
+ kernel/time/tick-common.c                   |   6 +-
+ kernel/time/tick-oneshot.c                  |   2 +-
+ kernel/time/tick-sched.c                    |  24 +-
+ kernel/time/timer.c                         |   2 +-
+ kernel/user-return-notifier.c               |   4 +-
+ kernel/watchdog.c                           |  12 +-
+ lib/flex_proportions.c                      |   8 +-
+ lib/percpu-refcount.c                       | 305 +++++++++++-----
+ lib/percpu_counter.c                        |  20 +-
+ lib/proportions.c                           |  10 +-
+ mm/backing-dev.c                            |   4 +-
+ mm/mmap.c                                   |   2 +-
+ mm/nommu.c                                  |   2 +-
+ mm/page-writeback.c                         |   2 +-
+ mm/percpu-km.c                              |  16 +-
+ mm/percpu-vm.c                              | 162 ++-------
+ mm/percpu.c                                 | 526 ++++++++++++++++++++++------
+ mm/shmem.c                                  |   2 +-
+ net/core/dev.c                              |  14 +-
+ net/core/drop_monitor.c                     |   2 +-
+ net/core/skbuff.c                           |   2 +-
+ net/dccp/proto.c                            |   2 +-
+ net/ipv4/route.c                            |   4 +-
+ net/ipv4/syncookies.c                       |   2 +-
+ net/ipv4/tcp.c                              |   6 +-
+ net/ipv4/tcp_memcontrol.c                   |   2 +-
+ net/ipv4/tcp_output.c                       |   2 +-
+ net/ipv6/syncookies.c                       |   2 +-
+ net/rds/ib_rdma.c                           |   2 +-
+ net/sctp/protocol.c                         |   2 +-
+ 189 files changed, 1440 insertions(+), 993 deletions(-)
+$ git am -3 ../patches/0001-percpu_counter-fix-for-ext4-updates.patch
+Applying: percpu_counter: fix for ext4 updates
+$ git reset HEAD^
+Unstaged changes after reset:
+M	fs/ext4/extents_status.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 0ac91bbd606e] Merge remote-tracking branch 'percpu/for-next'
+ Date: Fri Oct 3 14:40:44 2014 +1000
+Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue())
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/for-next (557b45497145 eeepc-laptop: clean up control flow in *_rfkill_notifier)
+$ git merge drivers-x86/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/eeepc-laptop.c  | 206 +++++++++++++++++-----------------
+ drivers/platform/x86/intel-rst.c     |  23 ++--
+ drivers/platform/x86/thinkpad_acpi.c |  44 ++++----
+ drivers/platform/x86/toshiba_acpi.c  | 211 ++++++++++++++++++++++++++++-------
+ 4 files changed, 307 insertions(+), 177 deletions(-)
+Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (f5b313a2bcd4 Merge remote-tracking branch 'regmap/topic/cache' into regmap-next)
+$ git merge regmap/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                          |  1 +
+ drivers/base/regmap/Kconfig          |  3 +++
+ drivers/base/regmap/internal.h       |  6 ++++--
+ drivers/base/regmap/regcache.c       | 13 +++++++++++--
+ drivers/base/regmap/regmap-debugfs.c |  8 ++++++--
+ drivers/base/regmap/regmap.c         | 30 +++++++++++++++++++-----------
+ 6 files changed, 44 insertions(+), 17 deletions(-)
+Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl())
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (200861223d3e led: remove use of gpiochip_remove() retval)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/led-class.c            | 23 +++++++++--------------
+ drivers/leds/led-core.c             | 19 ++++++++++++++++++-
+ drivers/leds/leds-gpio-register.c   |  5 ++++-
+ drivers/leds/leds-gpio.c            | 14 ++++++--------
+ drivers/leds/leds-lp3944.c          |  3 ++-
+ drivers/leds/leds-pca9532.c         | 10 ++--------
+ drivers/leds/leds-tca6507.c         |  7 ++-----
+ drivers/leds/trigger/ledtrig-gpio.c |  2 +-
+ include/linux/leds.h                | 16 +++++++++++++---
+ 9 files changed, 57 insertions(+), 42 deletions(-)
+Merging ipmi/for-next (662d15871626 ipmi: Clear drvdata when interface is removed)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/Kconfig                |  2 +-
+ drivers/char/ipmi/Kconfig           |  2 ++
+ drivers/char/ipmi/ipmi_msghandler.c | 15 +++++++++------
+ drivers/char/ipmi/ipmi_si_intf.c    | 12 +++++++++---
+ 4 files changed, 21 insertions(+), 10 deletions(-)
+Merging driver-core/driver-core-next (bef59c5024be devres: Improve devm_kasprintf()/kvasprintf() support)
+$ git merge driver-core/driver-core-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/base/core.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Merge made by the 'recursive' strategy.
+ Documentation/driver-model/devres.txt |   5 +
+ Documentation/sysfs-rules.txt         |  21 +++
+ MAINTAINERS                           |   7 +
+ drivers/base/Kconfig                  |  21 +++
+ drivers/base/Makefile                 |   1 +
+ drivers/base/attribute_container.c    |  14 +-
+ drivers/base/core.c                   |   9 ++
+ drivers/base/dd.c                     |   2 +-
+ drivers/base/devcoredump.c            | 265 ++++++++++++++++++++++++++++++++++
+ drivers/base/devres.c                 |  15 +-
+ drivers/base/firmware_class.c         |   3 +
+ include/linux/devcoredump.h           |  35 +++++
+ include/linux/device.h                |   4 +-
+ 13 files changed, 385 insertions(+), 17 deletions(-)
+ create mode 100644 drivers/base/devcoredump.c
+ create mode 100644 include/linux/devcoredump.h
+Merging tty/tty-next (baeb7ef34952 tty: serial: 8250: use 32bit variable for rpm_tx_active)
+$ git merge tty/tty-next
+Resolved 'drivers/tty/serial/8250/8250_pci.c' using previous resolution.
+Auto-merging include/linux/lockdep.h
+Auto-merging drivers/tty/tty_io.c
+Auto-merging drivers/tty/serial/8250/8250_pci.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_pci.c
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/tty/serial/8250/8250.h
+Auto-merging Documentation/kernel-parameters.txt
+Removing Documentation/devicetree/bindings/serial/via,vt8500-uart.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 650a409db8c4] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/serial/cirrus,clps711x-uart.txt       |   7 +-
+ .../devicetree/bindings/serial/mtk-uart.txt        |  22 +
+ .../devicetree/bindings/serial/of-serial.txt       |   2 +-
+ .../devicetree/bindings/serial/via,vt8500-uart.txt |  17 -
+ .../devicetree/bindings/serial/vt8500-uart.txt     |   3 +-
+ Documentation/kernel-parameters.txt                |  18 +
+ Documentation/serial/driver                        |   2 +
+ arch/alpha/include/uapi/asm/ioctls.h               |   2 +
+ arch/mips/include/uapi/asm/ioctls.h                |   2 +
+ arch/parisc/include/uapi/asm/ioctls.h              |   2 +
+ arch/sh/include/uapi/asm/ioctls.h                  |   2 +
+ arch/sparc/include/uapi/asm/ioctls.h               |   2 +
+ drivers/isdn/i4l/isdn_tty.c                        |   5 -
+ drivers/staging/dgnc/dgnc_driver.c                 |  13 -
+ drivers/tty/hvc/hvc_xen.c                          |   3 -
+ drivers/tty/metag_da.c                             |  14 +-
+ drivers/tty/moxa.c                                 |   2 +-
+ drivers/tty/n_tty.c                                |   8 +-
+ drivers/tty/nozomi.c                               |   6 +-
+ drivers/tty/pty.c                                  |  41 ++
+ drivers/tty/serial/8250/8250.h                     |   3 +
+ drivers/tty/serial/8250/8250_core.c                | 253 +++++++-
+ drivers/tty/serial/8250/8250_fintek.c              | 249 ++++++++
+ drivers/tty/serial/8250/8250_hp300.c               |   2 +-
+ drivers/tty/serial/8250/8250_mtk.c                 | 294 ++++++++++
+ drivers/tty/serial/8250/8250_pci.c                 |  34 +-
+ drivers/tty/serial/8250/Kconfig                    |  15 +
+ drivers/tty/serial/8250/Makefile                   |   2 +
+ drivers/tty/serial/Kconfig                         |  23 +-
+ drivers/tty/serial/Makefile                        |   1 +
+ drivers/tty/serial/altera_jtaguart.c               |   2 +-
+ drivers/tty/serial/altera_uart.c                   |   2 +-
+ drivers/tty/serial/amba-pl011.c                    |  54 +-
+ drivers/tty/serial/bfin_sport_uart.c               |   1 +
+ drivers/tty/serial/bfin_uart.c                     |  15 +-
+ drivers/tty/serial/clps711x.c                      |  32 +-
+ drivers/tty/serial/imx.c                           |  99 ++--
+ drivers/tty/serial/jsm/jsm.h                       |  10 +
+ drivers/tty/serial/jsm/jsm_driver.c                |  38 +-
+ drivers/tty/serial/kgdb_nmi.c                      |   5 +-
+ drivers/tty/serial/meson_uart.c                    | 634 +++++++++++++++++++++
+ drivers/tty/serial/mpc52xx_uart.c                  |  17 -
+ drivers/tty/serial/msm_serial.c                    | 122 ++--
+ drivers/tty/serial/mxs-auart.c                     |   2 +-
+ drivers/tty/serial/nwpserial.c                     |   1 +
+ drivers/tty/serial/of_serial.c                     |  31 +-
+ drivers/tty/serial/omap-serial.c                   |  34 +-
+ drivers/tty/serial/serial_core.c                   | 138 ++---
+ drivers/tty/serial/serial_mctrl_gpio.c             |   2 +-
+ drivers/tty/serial/st-asc.c                        |   8 +
+ drivers/tty/serial/sunhv.c                         |   3 +
+ drivers/tty/serial/sunsab.c                        |   5 +-
+ drivers/tty/serial/uartlite.c                      |   1 -
+ drivers/tty/serial/vr41xx_siu.c                    |   1 -
+ drivers/tty/serial/vt8500_serial.c                 | 136 ++++-
+ drivers/tty/serial/xilinx_uartps.c                 |  20 +-
+ drivers/tty/tty_io.c                               |  96 ++--
+ drivers/tty/tty_ioctl.c                            |  49 +-
+ drivers/tty/vt/keyboard.c                          | 166 +++---
+ drivers/usb/serial/digi_acceleport.c               |   7 +-
+ drivers/usb/serial/io_ti.c                         |   7 +-
+ drivers/usb/serial/ti_usb_3410_5052.c              |   7 +-
+ include/linux/lockdep.h                            |   5 +
+ include/linux/serial_8250.h                        |   6 +
+ include/linux/serial_core.h                        |  20 +-
+ include/linux/tty.h                                |  15 +-
+ include/linux/tty_driver.h                         |   4 +
+ include/uapi/linux/serial_core.h                   |   3 +
+ 68 files changed, 2297 insertions(+), 550 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/mtk-uart.txt
+ delete mode 100644 Documentation/devicetree/bindings/serial/via,vt8500-uart.txt
+ create mode 100644 drivers/tty/serial/8250/8250_fintek.c
+ create mode 100644 drivers/tty/serial/8250/8250_mtk.c
+ create mode 100644 drivers/tty/serial/meson_uart.c
+Merging usb/usb-next (004332549522 usb: hcd: add generic PHY support)
+$ git merge usb/usb-next
+Resolved 'drivers/usb/gadget/function/f_fs.c' using previous resolution.
+Auto-merging sound/usb/midi.c
+Removing include/linux/platform_data/samsung-usbphy.h
+Removing drivers/usb/serial/zte_ev.c
+Removing drivers/usb/phy/phy-samsung-usb3.c
+Removing drivers/usb/phy/phy-samsung-usb2.c
+Removing drivers/usb/phy/phy-samsung-usb.h
+Removing drivers/usb/phy/phy-samsung-usb.c
+Auto-merging drivers/usb/host/Kconfig
+Auto-merging drivers/usb/gadget/legacy/inode.c
+Auto-merging drivers/usb/gadget/function/f_fs.c
+CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_fs.c
+Auto-merging drivers/usb/common/common.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fbb0f8f3bfc8] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/configfs-usb-gadget-uac1 |   12 +
+ Documentation/ABI/testing/configfs-usb-gadget-uac2 |   12 +
+ Documentation/ABI/testing/sysfs-class-uwb_rc       |   13 +
+ Documentation/DocBook/usb.tmpl                     |    2 +-
+ .../devicetree/bindings/phy/phy-stih407-usb.txt    |   30 +
+ .../devicetree/bindings/phy/phy-stih41x-usb.txt    |   24 +
+ .../devicetree/bindings/phy/qcom-dwc3-usb-phy.txt  |   39 +
+ .../devicetree/bindings/phy/rcar-gen2-phy.txt      |   51 +
+ .../devicetree/bindings/phy/samsung-phy.txt        |    7 +-
+ .../devicetree/bindings/usb/ci-hdrc-imx.txt        |    2 +
+ Documentation/devicetree/bindings/usb/dwc2.txt     |    5 +
+ Documentation/devicetree/bindings/usb/dwc3-st.txt  |   68 +
+ Documentation/devicetree/bindings/usb/ehci-st.txt  |   39 +
+ Documentation/devicetree/bindings/usb/mxs-phy.txt  |    1 +
+ Documentation/devicetree/bindings/usb/ohci-st.txt  |   37 +
+ .../devicetree/bindings/usb/qcom,dwc3.txt          |   66 +
+ .../devicetree/bindings/usb/renesas_usbhs.txt      |   24 +
+ .../devicetree/bindings/usb/udc-xilinx.txt         |   18 +
+ Documentation/devicetree/bindings/usb/usb3503.txt  |    4 +-
+ .../devicetree/bindings/usb/usbmisc-imx.txt        |    1 +
+ Documentation/kernel-parameters.txt                |    4 +
+ Documentation/usb/WUSB-Design-overview.txt         |   23 +-
+ Documentation/usb/hotplug.txt                      |    2 +-
+ MAINTAINERS                                        |   16 +-
+ drivers/net/usb/usbnet.c                           |   14 +-
+ drivers/phy/Kconfig                                |   24 +
+ drivers/phy/Makefile                               |    3 +
+ drivers/phy/phy-bcm-kona-usb2.c                    |    1 -
+ drivers/phy/phy-berlin-sata.c                      |    1 -
+ drivers/phy/phy-exynos-dp-video.c                  |   80 +-
+ drivers/phy/phy-exynos-mipi-video.c                |    1 -
+ drivers/phy/phy-exynos5-usbdrd.c                   |    1 -
+ drivers/phy/phy-exynos5250-sata.c                  |    1 -
+ drivers/phy/phy-hix5hd2-sata.c                     |    1 -
+ drivers/phy/phy-miphy365x.c                        |    1 -
+ drivers/phy/phy-mvebu-sata.c                       |    3 +-
+ drivers/phy/phy-omap-control.c                     |    5 +-
+ drivers/phy/phy-omap-usb2.c                        |    9 +-
+ drivers/phy/phy-qcom-apq8064-sata.c                |    1 -
+ drivers/phy/phy-qcom-ipq806x-sata.c                |    1 -
+ drivers/phy/phy-rcar-gen2.c                        |  341 +++
+ drivers/phy/phy-samsung-usb2.c                     |    1 -
+ drivers/phy/phy-spear1310-miphy.c                  |   17 +-
+ drivers/phy/phy-spear1340-miphy.c                  |   17 +-
+ drivers/phy/phy-stih407-usb.c                      |  177 ++
+ drivers/phy/phy-stih41x-usb.c                      |  187 ++
+ drivers/phy/phy-sun4i-usb.c                        |    1 -
+ drivers/phy/phy-ti-pipe3.c                         |    6 +-
+ drivers/phy/phy-twl4030-usb.c                      |  125 +-
+ drivers/phy/phy-xgene.c                            |    1 -
+ drivers/usb/Kconfig                                |   10 +
+ drivers/usb/README                                 |    2 +-
+ drivers/usb/chipidea/ci.h                          |   14 +-
+ drivers/usb/chipidea/ci_hdrc_imx.c                 |    8 +
+ drivers/usb/chipidea/ci_hdrc_imx.h                 |    1 +
+ drivers/usb/chipidea/core.c                        |   14 +-
+ drivers/usb/chipidea/host.c                        |    3 +-
+ drivers/usb/chipidea/udc.c                         |    6 +-
+ drivers/usb/chipidea/usbmisc_imx.c                 |   52 +-
+ drivers/usb/common/Makefile                        |    5 +-
+ drivers/usb/common/{usb-common.c => common.c}      |   15 +
+ drivers/usb/common/led.c                           |   57 +
+ drivers/usb/core/Kconfig                           |   12 +-
+ drivers/usb/core/hcd.c                             |   76 +-
+ drivers/usb/core/hub.c                             |  431 ++--
+ drivers/usb/core/hub.h                             |    2 +-
+ drivers/usb/core/message.c                         |    4 +-
+ drivers/usb/core/otg_whitelist.h                   |   13 +-
+ drivers/usb/core/quirks.c                          |    8 +
+ drivers/usb/core/usb.h                             |    2 +-
+ drivers/usb/dwc2/core.c                            |   31 +-
+ drivers/usb/dwc2/core.h                            |    8 +
+ drivers/usb/dwc2/gadget.c                          |  138 +-
+ drivers/usb/dwc2/hcd.c                             |   42 +-
+ drivers/usb/dwc2/hcd.h                             |    4 +-
+ drivers/usb/dwc2/hcd_intr.c                        |   30 +-
+ drivers/usb/dwc2/hcd_queue.c                       |   16 +-
+ drivers/usb/dwc2/platform.c                        |   33 +
+ drivers/usb/dwc3/Kconfig                           |   17 +
+ drivers/usb/dwc3/Makefile                          |    7 +-
+ drivers/usb/dwc3/core.c                            |    9 +-
+ drivers/usb/dwc3/core.h                            |    4 +-
+ drivers/usb/dwc3/debug.c                           |   32 +
+ drivers/usb/dwc3/debug.h                           |  200 +-
+ drivers/usb/dwc3/dwc3-exynos.c                     |    4 +-
+ drivers/usb/dwc3/dwc3-keystone.c                   |    1 -
+ drivers/usb/dwc3/dwc3-omap.c                       |    4 +-
+ drivers/usb/dwc3/dwc3-pci.c                        |    4 +-
+ drivers/usb/dwc3/dwc3-qcom.c                       |  130 ++
+ drivers/usb/dwc3/dwc3-st.c                         |  367 ++++
+ drivers/usb/dwc3/ep0.c                             |   65 +-
+ drivers/usb/dwc3/gadget.c                          |  140 +-
+ drivers/usb/dwc3/gadget.h                          |   56 -
+ drivers/usb/dwc3/io.h                              |   30 +-
+ drivers/usb/dwc3/trace.c                           |   19 +
+ drivers/usb/dwc3/trace.h                           |  220 ++
+ drivers/usb/gadget/Kconfig                         |    9 +
+ drivers/usb/gadget/Makefile                        |    2 +-
+ drivers/usb/gadget/composite.c                     |    2 +-
+ drivers/usb/gadget/configfs.c                      |    1 +
+ drivers/usb/gadget/function/Makefile               |   10 +-
+ drivers/usb/gadget/function/f_acm.c                |   49 +-
+ drivers/usb/gadget/function/f_fs.c                 |   52 +-
+ drivers/usb/gadget/function/f_loopback.c           |    3 +-
+ drivers/usb/gadget/function/f_mass_storage.c       |   27 +-
+ drivers/usb/gadget/function/f_obex.c               |   28 +-
+ drivers/usb/gadget/function/f_serial.c             |   19 +-
+ drivers/usb/gadget/function/f_sourcesink.c         |  511 ++++-
+ drivers/usb/gadget/function/f_uac1.c               |  337 ++-
+ drivers/usb/gadget/function/f_uac2.c               |  520 +++--
+ drivers/usb/gadget/function/f_uvc.c                |  274 ++-
+ drivers/usb/gadget/function/f_uvc.h                |   13 +-
+ drivers/usb/gadget/function/g_zero.h               |   13 +-
+ drivers/usb/gadget/function/u_fs.h                 |    2 +
+ drivers/usb/gadget/function/u_serial.c             |   30 +-
+ drivers/usb/gadget/function/u_uac1.c               |   38 +-
+ drivers/usb/gadget/function/u_uac1.h               |   31 +-
+ drivers/usb/gadget/function/u_uac2.h               |   42 +
+ drivers/usb/gadget/function/u_uvc.h                |   39 +
+ drivers/usb/gadget/function/uvc.h                  |    4 +-
+ drivers/usb/gadget/function/uvc_queue.c            |   46 +-
+ drivers/usb/gadget/function/uvc_queue.h            |   33 +
+ drivers/usb/gadget/function/uvc_v4l2.c             |  329 +--
+ drivers/usb/gadget/function/uvc_v4l2.h             |   22 +
+ drivers/usb/gadget/function/uvc_video.c            |   48 +-
+ drivers/usb/gadget/function/uvc_video.h            |   24 +
+ drivers/usb/gadget/legacy/Kconfig                  |    3 +
+ drivers/usb/gadget/legacy/Makefile                 |    6 +-
+ drivers/usb/gadget/legacy/audio.c                  |  149 +-
+ drivers/usb/gadget/legacy/dbgp.c                   |    1 +
+ drivers/usb/gadget/legacy/inode.c                  |    1 +
+ drivers/usb/gadget/legacy/webcam.c                 |   75 +-
+ drivers/usb/gadget/legacy/zero.c                   |   21 +
+ drivers/usb/gadget/udc/Kconfig                     |   17 +-
+ drivers/usb/gadget/udc/Makefile                    |    1 +
+ drivers/usb/gadget/udc/amd5536udc.c                |    2 +-
+ drivers/usb/gadget/udc/at91_udc.c                  |    2 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c            |    4 +-
+ drivers/usb/gadget/udc/bcm63xx_udc.c               |    2 +-
+ drivers/usb/gadget/udc/dummy_hcd.c                 |   10 +-
+ drivers/usb/gadget/udc/fotg210-udc.c               |    2 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c                |    6 +-
+ drivers/usb/gadget/udc/fsl_udc_core.c              |    6 +-
+ drivers/usb/gadget/udc/fusb300_udc.c               |    2 +-
+ drivers/usb/gadget/udc/goku_udc.c                  |    2 +-
+ drivers/usb/gadget/udc/gr_udc.c                    |   83 +-
+ drivers/usb/gadget/udc/gr_udc.h                    |    7 +
+ drivers/usb/gadget/udc/lpc32xx_udc.c               |    2 +-
+ drivers/usb/gadget/udc/m66592-udc.c                |    2 +-
+ drivers/usb/gadget/udc/mv_u3d_core.c               |    8 +-
+ drivers/usb/gadget/udc/mv_udc_core.c               |    8 +-
+ drivers/usb/gadget/udc/net2272.c                   |    2 +-
+ drivers/usb/gadget/udc/net2280.c                   |    2 +-
+ drivers/usb/gadget/udc/omap_udc.c                  |    2 +-
+ drivers/usb/gadget/udc/pch_udc.c                   |    2 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c                |    2 +-
+ drivers/usb/gadget/udc/pxa27x_udc.c                |    2 +-
+ drivers/usb/gadget/udc/r8a66597-udc.c              |   12 +-
+ drivers/usb/gadget/udc/s3c-hsudc.c                 |    3 +-
+ drivers/usb/gadget/udc/s3c2410_udc.c               |    2 +-
+ drivers/usb/gadget/udc/udc-core.c                  |   51 +-
+ drivers/usb/gadget/udc/udc-xilinx.c                | 2180 ++++++++++++++++++++
+ drivers/usb/host/Kconfig                           |   20 +-
+ drivers/usb/host/Makefile                          |    2 +
+ drivers/usb/host/ehci-exynos.c                     |   66 +-
+ drivers/usb/host/ehci-fsl.c                        |   18 +-
+ drivers/usb/host/ehci-hcd.c                        |    2 +-
+ drivers/usb/host/ehci-hub.c                        |   10 +-
+ drivers/usb/host/ehci-msm.c                        |    4 +-
+ drivers/usb/host/ehci-st.c                         |  375 ++++
+ drivers/usb/host/ehci-tegra.c                      |   16 +-
+ drivers/usb/host/ehci-xilinx-of.c                  |    1 +
+ drivers/usb/host/fhci-hcd.c                        |    6 +-
+ drivers/usb/host/fotg210-hcd.c                     |    8 +-
+ drivers/usb/host/fusbh200-hcd.c                    |    8 +-
+ drivers/usb/host/isp1362-hcd.c                     |  103 +-
+ drivers/usb/host/isp1760-hcd.c                     |    6 +-
+ drivers/usb/host/ohci-exynos.c                     |   76 +-
+ drivers/usb/host/ohci-hcd.c                        |    6 +-
+ drivers/usb/host/ohci-hub.c                        |    4 +-
+ drivers/usb/host/ohci-omap.c                       |   22 +-
+ drivers/usb/host/ohci-st.c                         |  349 ++++
+ drivers/usb/host/oxu210hp-hcd.c                    |   10 +-
+ drivers/usb/host/sl811-hcd.c                       |    8 +-
+ drivers/usb/host/xhci-hub.c                        |   17 +-
+ drivers/usb/host/xhci-mem.c                        |    4 +-
+ drivers/usb/host/xhci-ring.c                       |  137 +-
+ drivers/usb/host/xhci.c                            |   15 +-
+ drivers/usb/host/xhci.h                            |    7 +-
+ drivers/usb/misc/lvstest.c                         |    8 +-
+ drivers/usb/misc/usb3503.c                         |    6 +-
+ drivers/usb/misc/usbtest.c                         |  115 +-
+ drivers/usb/misc/yurex.c                           |    8 +-
+ drivers/usb/musb/am35x.c                           |    1 +
+ drivers/usb/musb/musb_cppi41.c                     |    4 +-
+ drivers/usb/musb/musb_dsps.c                       |    2 +
+ drivers/usb/musb/musb_gadget.c                     |    2 +-
+ drivers/usb/musb/musb_regs.h                       |    2 +-
+ drivers/usb/musb/tusb6010.c                        |    2 +-
+ drivers/usb/phy/Kconfig                            |   16 -
+ drivers/usb/phy/Makefile                           |    2 -
+ drivers/usb/phy/phy-fsl-usb.c                      |    2 +-
+ drivers/usb/phy/phy-isp1301-omap.c                 |    2 +-
+ drivers/usb/phy/phy-msm-usb.c                      |   16 +-
+ drivers/usb/phy/phy-mxs-usb.c                      |    6 +
+ drivers/usb/phy/phy-samsung-usb.c                  |  241 ---
+ drivers/usb/phy/phy-samsung-usb.h                  |  349 ----
+ drivers/usb/phy/phy-samsung-usb2.c                 |  541 -----
+ drivers/usb/phy/phy-samsung-usb3.c                 |  350 ----
+ drivers/usb/phy/phy-twl6030-usb.c                  |    2 -
+ drivers/usb/renesas_usbhs/Kconfig                  |    1 +
+ drivers/usb/renesas_usbhs/common.c                 |   44 +
+ drivers/usb/renesas_usbhs/mod_gadget.c             |    2 +-
+ drivers/usb/serial/Kconfig                         |   10 +-
+ drivers/usb/serial/Makefile                        |    1 -
+ drivers/usb/serial/option.c                        |   11 +-
+ drivers/usb/serial/pl2303.c                        |   13 +-
+ drivers/usb/serial/usb-serial-simple.c             |   19 +-
+ drivers/usb/serial/xsens_mt.c                      |   25 +-
+ drivers/usb/serial/zte_ev.c                        |  305 ---
+ drivers/usb/storage/alauda.c                       |   11 +-
+ drivers/usb/storage/initializers.c                 |    2 +-
+ drivers/usb/storage/realtek_cr.c                   |    4 +-
+ drivers/usb/storage/scsiglue.c                     |    2 +-
+ drivers/usb/storage/sddr09.c                       |    3 +-
+ drivers/usb/storage/uas.c                          |  680 +++---
+ drivers/usb/storage/unusual_devs.h                 |   24 +-
+ drivers/usb/storage/unusual_uas.h                  |   45 +-
+ drivers/usb/storage/usb.c                          |   11 +-
+ drivers/usb/wusbcore/Kconfig                       |    2 +-
+ drivers/usb/wusbcore/crypto.c                      |    2 -
+ drivers/usb/wusbcore/devconnect.c                  |    6 +-
+ drivers/usb/wusbcore/security.c                    |   17 +-
+ drivers/usb/wusbcore/wa-hc.h                       |    2 +-
+ drivers/usb/wusbcore/wa-xfer.c                     |   17 +-
+ drivers/usb/wusbcore/wusbhc.h                      |    3 +
+ drivers/uwb/Kconfig                                |    1 -
+ drivers/uwb/driver.c                               |   11 +
+ drivers/uwb/lc-dev.c                               |   19 +-
+ drivers/uwb/lc-rc.c                                |   99 +
+ drivers/uwb/uwb-internal.h                         |    4 +-
+ include/linux/platform_data/samsung-usbphy.h       |   27 -
+ include/linux/usb.h                                |   12 +
+ include/linux/usb/chipidea.h                       |    1 +
+ include/linux/usb/gadget.h                         |   26 +-
+ include/linux/usb/hcd.h                            |    4 +-
+ include/linux/usb/of.h                             |    5 +
+ include/linux/usb/quirks.h                         |   22 +-
+ include/linux/usb_usual.h                          |    4 +
+ include/uapi/linux/usb/functionfs.h                |   19 +-
+ sound/usb/midi.c                                   |    2 +-
+ tools/usb/ffs-test.c                               |  126 +-
+ 252 files changed, 9368 insertions(+), 4359 deletions(-)
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac1
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac2
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-stih407-usb.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/dwc3-st.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/ehci-st.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/ohci-st.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/udc-xilinx.txt
+ create mode 100644 drivers/phy/phy-rcar-gen2.c
+ create mode 100644 drivers/phy/phy-stih407-usb.c
+ create mode 100644 drivers/phy/phy-stih41x-usb.c
+ rename drivers/usb/common/{usb-common.c => common.c} (90%)
+ create mode 100644 drivers/usb/common/led.c
+ create mode 100644 drivers/usb/dwc3/debug.c
+ create mode 100644 drivers/usb/dwc3/dwc3-qcom.c
+ create mode 100644 drivers/usb/dwc3/dwc3-st.c
+ create mode 100644 drivers/usb/dwc3/trace.c
+ create mode 100644 drivers/usb/dwc3/trace.h
+ create mode 100644 drivers/usb/gadget/function/u_uac2.h
+ create mode 100644 drivers/usb/gadget/function/u_uvc.h
+ create mode 100644 drivers/usb/gadget/function/uvc_v4l2.h
+ create mode 100644 drivers/usb/gadget/function/uvc_video.h
+ create mode 100644 drivers/usb/gadget/udc/udc-xilinx.c
+ create mode 100644 drivers/usb/host/ehci-st.c
+ create mode 100644 drivers/usb/host/ohci-st.c
+ delete mode 100644 drivers/usb/phy/phy-samsung-usb.c
+ delete mode 100644 drivers/usb/phy/phy-samsung-usb.h
+ delete mode 100644 drivers/usb/phy/phy-samsung-usb2.c
+ delete mode 100644 drivers/usb/phy/phy-samsung-usb3.c
+ delete mode 100644 drivers/usb/serial/zte_ev.c
+ delete mode 100644 include/linux/platform_data/samsung-usbphy.h
+Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer")
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging staging/staging-next (77d966f4b021 staging: emxx_udc: Use min_t instead of min)
+$ git merge staging/staging-next
+Removing drivers/staging/xillybus/TODO
+Auto-merging drivers/staging/vme/devices/vme_user.c
+Removing drivers/staging/unisys/include/timskmodutils.h
+Removing drivers/staging/unisys/include/commontypes.h
+Removing drivers/staging/rtl8821ae/wifi.h
+Removing drivers/staging/rtl8821ae/stats.h
+Removing drivers/staging/rtl8821ae/stats.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/trx.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/trx.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/table.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/table.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/sw.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/sw.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/rf.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/rf.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/reg.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/pwrseq.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/phy.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/phy.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/led.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/led.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/hw.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/hw.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/hal_btc.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/fw.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/fw.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/dm.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/dm.c
+Removing drivers/staging/rtl8821ae/rtl8821ae/def.h
+Removing drivers/staging/rtl8821ae/rtl8821ae/btc.h
+Removing drivers/staging/rtl8821ae/regd.h
+Removing drivers/staging/rtl8821ae/regd.c
+Removing drivers/staging/rtl8821ae/rc.c
+Removing drivers/staging/rtl8821ae/ps.h
+Removing drivers/staging/rtl8821ae/ps.c
+Removing drivers/staging/rtl8821ae/pci.h
+Removing drivers/staging/rtl8821ae/pci.c
+Removing drivers/staging/rtl8821ae/efuse.h
+Removing drivers/staging/rtl8821ae/efuse.c
+Removing drivers/staging/rtl8821ae/debug.h
+Removing drivers/staging/rtl8821ae/debug.c
+Removing drivers/staging/rtl8821ae/core.h
+Removing drivers/staging/rtl8821ae/core.c
+Removing drivers/staging/rtl8821ae/compat.h
+Removing drivers/staging/rtl8821ae/cam.h
+Removing drivers/staging/rtl8821ae/cam.c
+Removing drivers/staging/rtl8821ae/btcoexist/rtl_btc.h
+Removing drivers/staging/rtl8821ae/btcoexist/rtl_btc.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/halbt_precomp.h
+Removing drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.c
+Removing drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.h
+Removing drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c
+Removing drivers/staging/rtl8821ae/base.h
+Removing drivers/staging/rtl8821ae/base.c
+Removing drivers/staging/rtl8821ae/TODO
+Removing drivers/staging/rtl8821ae/Makefile
+Removing drivers/staging/rtl8821ae/Kconfig
+Auto-merging drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+Auto-merging drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+Removing drivers/staging/rtl8192ee/wifi.h
+Removing drivers/staging/rtl8192ee/stats.h
+Removing drivers/staging/rtl8192ee/stats.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/trx.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/trx.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/table.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/table.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/sw.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/sw.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/rf.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/rf.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/reg.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/pwrseq.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/pwrseq.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/phy.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/phy.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/led.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/led.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/hw.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/hw.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/fw.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/fw.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/dm.h
+Removing drivers/staging/rtl8192ee/rtl8192ee/dm.c
+Removing drivers/staging/rtl8192ee/rtl8192ee/def.h
+Removing drivers/staging/rtl8192ee/regd.h
+Removing drivers/staging/rtl8192ee/regd.c
+Removing drivers/staging/rtl8192ee/rc.h
+Removing drivers/staging/rtl8192ee/rc.c
+Removing drivers/staging/rtl8192ee/ps.h
+Removing drivers/staging/rtl8192ee/ps.c
+Removing drivers/staging/rtl8192ee/pci.h
+Removing drivers/staging/rtl8192ee/pci.c
+Removing drivers/staging/rtl8192ee/efuse.h
+Removing drivers/staging/rtl8192ee/efuse.c
+Removing drivers/staging/rtl8192ee/debug.h
+Removing drivers/staging/rtl8192ee/debug.c
+Removing drivers/staging/rtl8192ee/core.h
+Removing drivers/staging/rtl8192ee/core.c
+Removing drivers/staging/rtl8192ee/compat.h
+Removing drivers/staging/rtl8192ee/cam.h
+Removing drivers/staging/rtl8192ee/cam.c
+Removing drivers/staging/rtl8192ee/btcoexist/rtl_btc.h
+Removing drivers/staging/rtl8192ee/btcoexist/rtl_btc.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.h
+Removing drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.c
+Removing drivers/staging/rtl8192ee/btcoexist/halbt_precomp.h
+Removing drivers/staging/rtl8192ee/base.h
+Removing drivers/staging/rtl8192ee/base.c
+Removing drivers/staging/rtl8192ee/TODO
+Removing drivers/staging/rtl8192ee/Makefile
+Removing drivers/staging/rtl8192ee/Kconfig
+Removing drivers/staging/rtl8188eu/include/rtl8188e_rf.h
+Removing drivers/staging/rtl8188eu/include/odm_RegDefine11AC.h
+Removing drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h
+Auto-merging drivers/staging/rtl8188eu/include/fw.h
+Removing drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h
+Removing drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h
+Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h
+Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h
+Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h
+Removing drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h
+Removing drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c
+Removing drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c
+Auto-merging drivers/staging/rtl8188eu/hal/pwrseqcmd.c
+Auto-merging drivers/staging/rtl8188eu/hal/pwrseq.c
+Removing drivers/staging/rtl8188eu/hal/odm_debug.c
+Removing drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c
+Auto-merging drivers/staging/rtl8188eu/hal/bb_cfg.c
+Removing drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+Removing drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+Removing drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c
+Removing drivers/staging/nokia_h4p/nokia_uart.c
+Removing drivers/staging/nokia_h4p/nokia_fw.c
+Removing drivers/staging/nokia_h4p/nokia_fw-ti1273.c
+Removing drivers/staging/nokia_h4p/nokia_fw-csr.c
+Removing drivers/staging/nokia_h4p/nokia_fw-bcm.c
+Removing drivers/staging/nokia_h4p/nokia_core.c
+Removing drivers/staging/nokia_h4p/hci_h4p.h
+Removing drivers/staging/nokia_h4p/TODO
+Removing drivers/staging/nokia_h4p/Makefile
+Removing drivers/staging/nokia_h4p/Kconfig
+Auto-merging drivers/staging/media/lirc/lirc_sasem.c
+Auto-merging drivers/staging/media/lirc/lirc_imon.c
+Removing drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c
+Removing drivers/staging/lustre/lustre/obdecho/echo.c
+Removing drivers/staging/lustre/lustre/obdclass/mea.c
+Removing drivers/staging/lustre/lustre/obdclass/md_attrs.c
+Removing drivers/staging/lustre/lustre/obdclass/lu_ucred.c
+Auto-merging drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c
+Removing drivers/staging/lustre/lustre/obdclass/local_storage.h
+Removing drivers/staging/lustre/lustre/obdclass/local_storage.c
+Removing drivers/staging/lustre/lustre/obdclass/llog_test.c
+Removing drivers/staging/lustre/lustre/obdclass/llog_osd.c
+Removing drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
+Removing drivers/staging/lustre/lustre/obdclass/llog_ioctl.c
+Removing drivers/staging/lustre/lustre/obdclass/linkea.c
+Removing drivers/staging/lustre/lustre/obdclass/idmap.c
+Removing drivers/staging/lustre/lustre/mgc/libmgc.c
+Removing drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+Removing drivers/staging/lustre/lustre/lvfs/fsfilt.c
+Removing drivers/staging/lustre/lustre/lvfs/Makefile
+Removing drivers/staging/lustre/lustre/libcfs/upcall_cache.c
+Removing drivers/staging/lustre/lustre/libcfs/heap.c
+Removing drivers/staging/lustre/lustre/include/obd_ost.h
+Removing drivers/staging/lustre/lustre/include/md_object.h
+Removing drivers/staging/lustre/lustre/include/lvfs.h
+Removing drivers/staging/lustre/lustre/include/lustre_linkea.h
+Removing drivers/staging/lustre/lustre/include/lustre_idmap.h
+Removing drivers/staging/lustre/lustre/include/lustre_fsfilt.h
+Removing drivers/staging/lustre/lustre/include/linux/obd_support.h
+Removing drivers/staging/lustre/lustre/include/linux/obd_class.h
+Removing drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
+Removing drivers/staging/lustre/lustre/include/linux/lvfs.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_quota.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_net.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_log.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_lib.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_handles.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_dlm.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_common.h
+Removing drivers/staging/lustre/lustre/include/linux/lustre_acl.h
+Removing drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
+Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+Removing drivers/staging/lustre/include/linux/libcfs/lucache.h
+Removing drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+Removing drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+Removing drivers/staging/iio/frequency/ad9951.c
+Removing drivers/staging/iio/frequency/ad9910.c
+Removing drivers/staging/iio/frequency/ad9852.c
+Removing drivers/staging/iio/frequency/ad9850.c
+Removing drivers/staging/iio/frequency/ad5930.c
+Auto-merging drivers/staging/dgnc/dgnc_driver.c
+Removing drivers/staging/comedi/drivers/skel.c
+Removing drivers/staging/comedi/drivers/comedi_fc.c
+Auto-merging drivers/char/xillybus/xillybus_pcie.c
+Auto-merging drivers/char/xillybus/xillybus_of.c
+Auto-merging drivers/char/xillybus/xillybus_core.c
+Auto-merging drivers/char/xillybus/xillybus.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-bus-iio-accel-bmc150         |    7 +
+ .../ABI/testing/sysfs-bus-iio-gyro-bmg160          |    7 +
+ .../devicetree/bindings/arm/samsung/exynos-adc.txt |   18 +-
+ .../bindings/iio/adc/rockchip-saradc.txt           |   24 +
+ .../devicetree/bindings/iio/dac/max5821.txt        |   14 +
+ .../bindings/{staging => xillybus}/xillybus.txt    |    0
+ .../xillybus/README => Documentation/xillybus.txt  |    0
+ MAINTAINERS                                        |   28 +
+ drivers/char/Kconfig                               |    2 +
+ drivers/char/Makefile                              |    1 +
+ drivers/{staging => char}/xillybus/Kconfig         |    0
+ drivers/{staging => char}/xillybus/Makefile        |    0
+ drivers/{staging => char}/xillybus/xillybus.h      |    1 -
+ drivers/{staging => char}/xillybus/xillybus_core.c |  366 +-
+ drivers/{staging => char}/xillybus/xillybus_of.c   |    5 +-
+ drivers/{staging => char}/xillybus/xillybus_pcie.c |   16 +-
+ drivers/iio/accel/Kconfig                          |   24 +-
+ drivers/iio/accel/Makefile                         |    1 +
+ drivers/iio/accel/bma180.c                         |  476 +-
+ drivers/iio/accel/bmc150-accel.c                   | 1430 +++++
+ drivers/iio/accel/hid-sensor-accel-3d.c            |    1 -
+ drivers/iio/accel/kxcjk-1013.c                     |  873 +++-
+ drivers/iio/adc/Kconfig                            |   22 +-
+ drivers/iio/adc/Makefile                           |    2 +
+ drivers/iio/adc/at91_adc.c                         |    2 +-
+ drivers/iio/adc/exynos_adc.c                       |  138 +-
+ drivers/iio/adc/lp8788_adc.c                       |    1 -
+ drivers/iio/adc/rockchip_saradc.c                  |  316 ++
+ drivers/iio/adc/ti-adc128s052.c                    |  179 +
+ drivers/iio/adc/ti_am335x_adc.c                    |    1 -
+ drivers/iio/adc/twl4030-madc.c                     |    1 -
+ drivers/iio/adc/twl6030-gpadc.c                    |    1 -
+ drivers/iio/adc/vf610_adc.c                        |    1 -
+ drivers/iio/adc/viperboard_adc.c                   |    1 -
+ drivers/iio/adc/xilinx-xadc-core.c                 |    9 +-
+ drivers/iio/dac/Kconfig                            |    8 +
+ drivers/iio/dac/Makefile                           |    1 +
+ drivers/iio/dac/max5821.c                          |  405 ++
+ drivers/iio/gyro/Kconfig                           |   11 +
+ drivers/iio/gyro/Makefile                          |    1 +
+ drivers/iio/gyro/bmg160.c                          | 1228 +++++
+ drivers/iio/gyro/hid-sensor-gyro-3d.c              |    1 -
+ drivers/iio/humidity/dht11.c                       |    1 -
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |    3 +-
+ drivers/iio/industrialio-buffer.c                  |   63 +-
+ drivers/iio/light/Kconfig                          |   10 +
+ drivers/iio/light/Makefile                         |    1 +
+ drivers/iio/light/al3320a.c                        |  232 +
+ drivers/iio/light/hid-sensor-als.c                 |    1 -
+ drivers/iio/light/hid-sensor-prox.c                |    1 -
+ drivers/iio/light/lm3533-als.c                     |    1 -
+ drivers/iio/magnetometer/ak8975.c                  |   10 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c      |    8 +-
+ drivers/iio/orientation/hid-sensor-incl-3d.c       |    1 -
+ drivers/iio/orientation/hid-sensor-rotation.c      |    1 -
+ drivers/iio/pressure/hid-sensor-press.c            |    1 -
+ drivers/iio/trigger/iio-trig-interrupt.c           |    1 -
+ drivers/staging/Kconfig                            |    8 -
+ drivers/staging/Makefile                           |    4 -
+ drivers/staging/android/binder.c                   |   19 +-
+ drivers/staging/android/ion/ion.c                  |    2 +-
+ drivers/staging/android/ion/ion_carveout_heap.c    |    1 -
+ drivers/staging/android/ion/ion_chunk_heap.c       |    1 -
+ drivers/staging/android/ion/ion_dummy_driver.c     |    4 +-
+ drivers/staging/android/ion/ion_system_heap.c      |    1 -
+ drivers/staging/android/sw_sync.c                  |    9 +-
+ drivers/staging/android/sw_sync.h                  |    2 +-
+ drivers/staging/android/sync.c                     |    5 +-
+ drivers/staging/android/sync.h                     |    3 +-
+ drivers/staging/android/uapi/binder.h              |    2 +-
+ drivers/staging/bcm/Adapter.h                      |   47 +-
+ drivers/staging/bcm/Bcmchar.c                      | 2434 ++++-----
+ drivers/staging/bcm/Bcmnet.c                       |  101 +-
+ drivers/staging/bcm/HandleControlPacket.c          |    4 +-
+ drivers/staging/bcm/InterfaceIdleMode.c            |    7 +-
+ drivers/staging/bcm/InterfaceMacros.h              |    2 +-
+ drivers/staging/bcm/InterfaceMisc.h                |    2 +-
+ drivers/staging/bcm/Ioctl.h                        |   26 +-
+ drivers/staging/bcm/LeakyBucket.c                  |   81 +-
+ drivers/staging/bcm/headers.h                      |    2 +-
+ drivers/staging/bcm/sort.c                         |    4 +-
+ drivers/staging/bcm/vendorspecificextn.c           |   19 +-
+ drivers/staging/comedi/Kconfig                     |   75 +-
+ drivers/staging/comedi/comedi.h                    |   32 +-
+ drivers/staging/comedi/comedi_buf.c                |   66 +
+ drivers/staging/comedi/comedi_fops.c               |    4 +-
+ drivers/staging/comedi/comedi_pci.c                |   24 +
+ drivers/staging/comedi/comedidev.h                 |   27 +-
+ drivers/staging/comedi/drivers.c                   |  137 +
+ drivers/staging/comedi/drivers/8253.h              |    8 +-
+ drivers/staging/comedi/drivers/8255.c              |  198 +-
+ drivers/staging/comedi/drivers/8255.h              |   31 +-
+ drivers/staging/comedi/drivers/8255_pci.c          |   38 +-
+ drivers/staging/comedi/drivers/Makefile            |    6 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c |   20 +-
+ .../staging/comedi/drivers/addi-data/addi_common.h |    3 +-
+ .../staging/comedi/drivers/addi-data/addi_eeprom.c |   12 +-
+ .../comedi/drivers/addi-data/hwdrv_apci035.c       |    2 -
+ .../comedi/drivers/addi-data/hwdrv_apci1500.c      |  453 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  181 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c      |  383 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c      |    2 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c    |   12 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c    |    4 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c    |  133 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c    |    2 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c    |   48 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c    |    2 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c    |   54 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c    |   23 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c    |   37 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c       |   40 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c       |    2 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c       |    2 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c       |   32 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c       | 2106 ++++----
+ drivers/staging/comedi/drivers/adv_pci1710.c       |   22 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c       |    2 +-
+ drivers/staging/comedi/drivers/adv_pci1724.c       |    2 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c       |   23 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c       |   52 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c      |  121 +-
+ drivers/staging/comedi/drivers/amplc_dio200.h      |   34 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c   |  478 +-
+ drivers/staging/comedi/drivers/amplc_dio200_pci.c  |  167 +-
+ .../staging/comedi/drivers/amplc_pc236_common.c    |   14 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c      |  755 +--
+ drivers/staging/comedi/drivers/amplc_pci230.c      | 1224 ++---
+ drivers/staging/comedi/drivers/amplc_pci236.c      |    9 +-
+ drivers/staging/comedi/drivers/amplc_pci263.c      |    2 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c       |   44 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c         |   76 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c       |  221 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c         |   29 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c        |   78 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c        |   62 +-
+ drivers/staging/comedi/drivers/comedi_fc.c         |  132 -
+ drivers/staging/comedi/drivers/comedi_fc.h         |   40 +-
+ drivers/staging/comedi/drivers/comedi_parport.c    |    8 +-
+ drivers/staging/comedi/drivers/comedi_test.c       |   10 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c    |    2 +-
+ drivers/staging/comedi/drivers/dac02.c             |   33 +-
+ drivers/staging/comedi/drivers/daqboard2000.c      |   76 +-
+ drivers/staging/comedi/drivers/das08.c             |   85 +-
+ drivers/staging/comedi/drivers/das08.h             |    1 -
+ drivers/staging/comedi/drivers/das08_isa.c         |    2 +-
+ drivers/staging/comedi/drivers/das08_pci.c         |    2 +-
+ drivers/staging/comedi/drivers/das16.c             |   34 +-
+ drivers/staging/comedi/drivers/das16m1.c           |   10 +-
+ drivers/staging/comedi/drivers/das1800.c           |   28 +-
+ drivers/staging/comedi/drivers/das6402.c           |   16 +-
+ drivers/staging/comedi/drivers/das800.c            |   10 +-
+ drivers/staging/comedi/drivers/dmm32at.c           |   69 +-
+ drivers/staging/comedi/drivers/dt2801.c            |   38 +-
+ drivers/staging/comedi/drivers/dt2811.c            |   48 +-
+ drivers/staging/comedi/drivers/dt282x.c            |   57 +-
+ drivers/staging/comedi/drivers/dt3000.c            |   70 +-
+ drivers/staging/comedi/drivers/dt9812.c            |   27 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c      |    2 +-
+ drivers/staging/comedi/drivers/fl512.c             |   35 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c          |   51 +-
+ drivers/staging/comedi/drivers/icp_multi.c         |   67 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c        |   39 +-
+ drivers/staging/comedi/drivers/jr3_pci.c           |    2 +-
+ drivers/staging/comedi/drivers/ke_counter.c        |    2 +-
+ drivers/staging/comedi/drivers/me4000.c            |  101 +-
+ drivers/staging/comedi/drivers/me_daq.c            |   36 +-
+ drivers/staging/comedi/drivers/mf6x4.c             |   46 +-
+ drivers/staging/comedi/drivers/multiq3.c           |   46 +-
+ drivers/staging/comedi/drivers/ni_6527.c           |   11 +-
+ drivers/staging/comedi/drivers/ni_65xx.c           |   15 +-
+ drivers/staging/comedi/drivers/ni_660x.c           |    8 +-
+ drivers/staging/comedi/drivers/ni_670x.c           |   66 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c       |   24 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c          |   37 +-
+ drivers/staging/comedi/drivers/ni_atmio.c          |    2 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c       |   72 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c      |    2 +-
+ drivers/staging/comedi/drivers/ni_labpc.c          | 1378 +----
+ drivers/staging/comedi/drivers/ni_labpc_common.c   | 1387 +++++
+ drivers/staging/comedi/drivers/ni_labpc_isadma.c   |    2 +-
+ drivers/staging/comedi/drivers/ni_labpc_pci.c      |   11 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c     |  114 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c         |   17 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c         |    2 +-
+ drivers/staging/comedi/drivers/ni_stc.h            |    1 -
+ drivers/staging/comedi/drivers/ni_tiocmd.c         |    7 +-
+ drivers/staging/comedi/drivers/ni_usb6501.c        |  621 +++
+ drivers/staging/comedi/drivers/pcl711.c            |   42 +-
+ drivers/staging/comedi/drivers/pcl724.c            |   12 +-
+ drivers/staging/comedi/drivers/pcl726.c            |   43 +-
+ drivers/staging/comedi/drivers/pcl730.c            |    2 +-
+ drivers/staging/comedi/drivers/pcl812.c            |   46 +-
+ drivers/staging/comedi/drivers/pcl816.c            |    2 +-
+ drivers/staging/comedi/drivers/pcl818.c            |   41 +-
+ drivers/staging/comedi/drivers/pcm3724.c           |   27 +-
+ drivers/staging/comedi/drivers/pcmad.c             |    2 +-
+ drivers/staging/comedi/drivers/pcmda12.c           |   16 +-
+ drivers/staging/comedi/drivers/pcmmio.c            |   72 +-
+ drivers/staging/comedi/drivers/pcmuio.c            |   58 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c   |   11 +-
+ drivers/staging/comedi/drivers/rtd520.c            |   66 +-
+ drivers/staging/comedi/drivers/rti800.c            |   34 +-
+ drivers/staging/comedi/drivers/rti802.c            |   29 +-
+ drivers/staging/comedi/drivers/s526.c              |   43 +-
+ drivers/staging/comedi/drivers/s626.c              |  136 +-
+ drivers/staging/comedi/drivers/skel.c              |  726 ---
+ drivers/staging/comedi/drivers/usbdux.c            |   53 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c       |   54 +-
+ drivers/staging/comedi/drivers/vmk80xx.c           |    2 +-
+ drivers/staging/dgap/dgap.c                        |  650 +--
+ drivers/staging/dgap/dgap.h                        |   11 -
+ drivers/staging/dgnc/Makefile                      |    3 +-
+ drivers/staging/dgnc/TODO                          |    7 -
+ drivers/staging/dgnc/dgnc_cls.c                    |  223 +-
+ drivers/staging/dgnc/dgnc_driver.c                 |  359 +-
+ drivers/staging/dgnc/dgnc_driver.h                 |  115 +-
+ drivers/staging/dgnc/dgnc_mgmt.c                   |   55 +-
+ drivers/staging/dgnc/dgnc_neo.c                    |  329 +-
+ drivers/staging/dgnc/dgnc_sysfs.c                  |   44 +-
+ drivers/staging/dgnc/dgnc_tty.c                    |  622 +--
+ drivers/staging/dgnc/dgnc_tty.h                    |    2 +-
+ drivers/staging/dgnc/dgnc_types.h                  |    3 -
+ drivers/staging/dgnc/dgnc_utils.c                  |   70 +
+ drivers/staging/dgnc/dgnc_utils.h                  |    7 +
+ drivers/staging/dgnc/digi.h                        |   20 +-
+ drivers/staging/dgnc/dpacompat.h                   |    2 +-
+ drivers/staging/emxx_udc/emxx_udc.c                |  107 +-
+ drivers/staging/emxx_udc/emxx_udc.h                |    4 -
+ drivers/staging/et131x/README                      |    5 -
+ drivers/staging/et131x/et131x.c                    | 1132 +---
+ drivers/staging/et131x/et131x.h                    |  139 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |   27 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |   19 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   |    2 +-
+ .../staging/ft1000/ft1000-usb/ft1000_download.c    |   10 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |   85 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |    4 +-
+ drivers/staging/gdm724x/gdm_mux.c                  |    1 +
+ drivers/staging/gdm724x/gdm_usb.c                  |    7 +-
+ drivers/staging/gdm72xx/netlink_k.c                |   12 +-
+ drivers/staging/goldfish/goldfish_audio.c          |   24 +-
+ drivers/staging/goldfish/goldfish_nand.c           |   42 +-
+ drivers/staging/gs_fpgaboot/README                 |    3 +-
+ drivers/staging/gs_fpgaboot/io.c                   |  169 -
+ drivers/staging/iio/accel/adis16201_core.c         |    5 +-
+ drivers/staging/iio/accel/adis16203_core.c         |    2 +
+ drivers/staging/iio/accel/adis16204_core.c         |    1 +
+ drivers/staging/iio/accel/adis16209_core.c         |    1 +
+ drivers/staging/iio/accel/adis16220_core.c         |   17 +-
+ drivers/staging/iio/accel/adis16240_core.c         |    4 +-
+ drivers/staging/iio/accel/lis3l02dq_core.c         |    4 +
+ drivers/staging/iio/accel/lis3l02dq_ring.c         |    5 +-
+ drivers/staging/iio/accel/sca3000_core.c           |    4 +-
+ drivers/staging/iio/accel/sca3000_ring.c           |    2 +-
+ drivers/staging/iio/adc/Kconfig                    |    8 +
+ drivers/staging/iio/adc/ad7192.c                   |    2 +-
+ drivers/staging/iio/adc/ad7606_core.c              |    2 +-
+ drivers/staging/iio/adc/ad7816.c                   |   14 +-
+ drivers/staging/iio/adc/mxs-lradc.c                |   24 +-
+ drivers/staging/iio/addac/adt7316.c                |   58 +-
+ drivers/staging/iio/cdc/ad7150.c                   |   10 +-
+ drivers/staging/iio/frequency/Kconfig              |   35 -
+ drivers/staging/iio/frequency/Makefile             |    5 -
+ drivers/staging/iio/frequency/ad5930.c             |  140 -
+ drivers/staging/iio/frequency/ad9834.c             |    1 +
+ drivers/staging/iio/frequency/ad9850.c             |  120 -
+ drivers/staging/iio/frequency/ad9852.c             |  253 -
+ drivers/staging/iio/frequency/ad9910.c             |  371 --
+ drivers/staging/iio/frequency/ad9951.c             |  209 -
+ drivers/staging/iio/frequency/dds.h                |   18 +-
+ drivers/staging/iio/gyro/adis16060_core.c          |    1 +
+ drivers/staging/iio/iio_dummy_evgen.c              |    1 +
+ drivers/staging/iio/iio_dummy_evgen.h              |    5 +
+ drivers/staging/iio/iio_simple_dummy.h             |    4 +
+ drivers/staging/iio/iio_simple_dummy_buffer.c      |    1 +
+ drivers/staging/iio/iio_simple_dummy_events.c      |    1 +
+ drivers/staging/iio/impedance-analyzer/ad5933.c    |   11 +-
+ drivers/staging/iio/light/isl29018.c               |  217 +-
+ drivers/staging/iio/light/tsl2583.c                |    1 +
+ drivers/staging/iio/light/tsl2x7x.h                |    4 +-
+ drivers/staging/iio/light/tsl2x7x_core.c           |    2 +
+ drivers/staging/iio/magnetometer/hmc5843_core.c    |    6 +-
+ drivers/staging/iio/meter/ade7753.c                |    7 +-
+ drivers/staging/iio/meter/ade7754.c                |    2 +
+ drivers/staging/iio/meter/ade7758_core.c           |    4 +
+ drivers/staging/iio/meter/ade7759.c                |    3 +
+ drivers/staging/iio/meter/ade7854.h                |   16 +-
+ drivers/staging/iio/meter/meter.h                  |   48 +-
+ drivers/staging/iio/resolver/Kconfig               |    9 +
+ drivers/staging/iio/resolver/ad2s1210.c            |    8 +-
+ drivers/staging/iio/ring_hw.h                      |    5 +
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    3 +
+ drivers/staging/imx-drm/imx-drm-core.c             |   38 +-
+ drivers/staging/imx-drm/imx-hdmi.c                 |    3 +-
+ drivers/staging/imx-drm/imx-tve.c                  |    7 +-
+ drivers/staging/imx-drm/ipuv3-crtc.c               |    9 +-
+ drivers/staging/imx-drm/ipuv3-plane.c              |   29 +-
+ drivers/staging/imx-drm/parallel-display.c         |    5 +-
+ drivers/staging/line6/midibuf.c                    |   11 +-
+ drivers/staging/lustre/README.txt                  |   87 +
+ .../staging/lustre/include/linux/libcfs/libcfs.h   |    4 +-
+ .../lustre/include/linux/libcfs/libcfs_cpu.h       |    4 +-
+ .../lustre/include/linux/libcfs/libcfs_crypto.h    |    6 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h     |    8 +-
+ .../lustre/include/linux/libcfs/libcfs_fail.h      |    7 +-
+ .../lustre/include/linux/libcfs/libcfs_heap.h      |  200 -
+ .../lustre/include/linux/libcfs/libcfs_ioctl.h     |    3 +-
+ .../lustre/include/linux/libcfs/libcfs_prim.h      |    1 -
+ .../lustre/include/linux/libcfs/libcfs_private.h   |    3 +-
+ .../lustre/include/linux/libcfs/libcfs_time.h      |    2 +-
+ .../lustre/include/linux/libcfs/linux/libcfs.h     |    7 +-
+ .../lustre/include/linux/libcfs/linux/linux-time.h |    5 +-
+ .../include/linux/libcfs/linux/portals_compat25.h  |   81 -
+ .../staging/lustre/include/linux/libcfs/lucache.h  |  162 -
+ .../staging/lustre/include/linux/lnet/lib-lnet.h   |   16 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |    4 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   66 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    8 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |   24 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   45 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h  |    1 -
+ .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |   10 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_proto.c      |   15 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c        |    8 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c          |  254 +-
+ drivers/staging/lustre/lnet/lnet/config.c          |   59 +-
+ drivers/staging/lustre/lnet/lnet/lib-eq.c          |   17 +-
+ drivers/staging/lustre/lnet/lnet/lib-md.c          |   35 +-
+ drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
+ drivers/staging/lustre/lnet/lnet/router.c          |    2 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c     |   13 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c    |   10 +-
+ drivers/staging/lustre/lnet/selftest/console.c     |    4 +-
+ drivers/staging/lustre/lnet/selftest/framework.c   |    5 +-
+ drivers/staging/lustre/lustre/Makefile             |    2 +-
+ drivers/staging/lustre/lustre/fid/fid_request.c    |   24 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c      |    5 +-
+ drivers/staging/lustre/lustre/fld/fld_cache.c      |   17 +-
+ drivers/staging/lustre/lustre/fld/fld_internal.h   |    2 +-
+ drivers/staging/lustre/lustre/fld/fld_request.c    |   25 +-
+ drivers/staging/lustre/lustre/fld/lproc_fld.c      |    1 -
+ drivers/staging/lustre/lustre/include/cl_object.h  |    6 +-
+ .../staging/lustre/lustre/include/interval_tree.h  |    2 +-
+ drivers/staging/lustre/lustre/include/lclient.h    |   16 +-
+ .../lustre/lustre/include/linux/lprocfs_status.h   |   57 -
+ .../lustre/lustre/include/linux/lustre_acl.h       |   66 -
+ .../lustre/lustre/include/linux/lustre_common.h    |   22 -
+ .../lustre/lustre/include/linux/lustre_compat25.h  |   19 +-
+ .../lustre/lustre/include/linux/lustre_dlm.h       |   46 -
+ .../lustre/lustre/include/linux/lustre_fsfilt.h    |  171 -
+ .../lustre/lustre/include/linux/lustre_handles.h   |   52 -
+ .../lustre/lustre/include/linux/lustre_lib.h       |   85 -
+ .../lustre/lustre/include/linux/lustre_lite.h      |    1 -
+ .../lustre/lustre/include/linux/lustre_log.h       |   57 -
+ .../lustre/lustre/include/linux/lustre_net.h       |   49 -
+ .../lustre/lustre/include/linux/lustre_quota.h     |   46 -
+ drivers/staging/lustre/lustre/include/linux/lvfs.h |  134 -
+ .../lustre/lustre/include/linux/lvfs_linux.h       |   61 -
+ drivers/staging/lustre/lustre/include/linux/obd.h  |    2 +-
+ .../lustre/lustre/include/linux/obd_class.h        |   58 -
+ .../lustre/lustre/include/linux/obd_support.h      |   63 -
+ .../staging/lustre/lustre/include/lprocfs_status.h |   15 +-
+ drivers/staging/lustre/lustre/include/lu_object.h  |   10 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h      |  176 +-
+ .../lustre/lustre/include/lustre/lustre_user.h     |   32 +-
+ drivers/staging/lustre/lustre/include/lustre_acl.h |    9 +-
+ drivers/staging/lustre/lustre/include/lustre_cfg.h |    2 +-
+ .../staging/lustre/lustre/include/lustre_disk.h    |    2 +-
+ drivers/staging/lustre/lustre/include/lustre_dlm.h |    4 +-
+ .../staging/lustre/lustre/include/lustre_export.h  |    4 +-
+ drivers/staging/lustre/lustre/include/lustre_fid.h |    2 +-
+ drivers/staging/lustre/lustre/include/lustre_fld.h |    5 +-
+ .../staging/lustre/lustre/include/lustre_fsfilt.h  |   48 -
+ .../staging/lustre/lustre/include/lustre_handles.h |   10 +-
+ .../staging/lustre/lustre/include/lustre_idmap.h   |  104 -
+ .../staging/lustre/lustre/include/lustre_import.h  |   13 +-
+ .../lustre/include/{linux => }/lustre_intent.h     |    0
+ drivers/staging/lustre/lustre/include/lustre_lib.h |   27 +-
+ .../staging/lustre/lustre/include/lustre_linkea.h  |   57 -
+ .../staging/lustre/lustre/include/lustre_lite.h    |    3 +-
+ drivers/staging/lustre/lustre/include/lustre_log.h |   26 +-
+ drivers/staging/lustre/lustre/include/lustre_mdc.h |    2 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h |  289 +-
+ .../staging/lustre/lustre/include/lustre_quota.h   |    4 +-
+ drivers/staging/lustre/lustre/include/lustre_sec.h |    7 +-
+ drivers/staging/lustre/lustre/include/lustre_ver.h |    4 +-
+ drivers/staging/lustre/lustre/include/lvfs.h       |   57 -
+ drivers/staging/lustre/lustre/include/md_object.h  |  903 ----
+ drivers/staging/lustre/lustre/include/obd.h        |  177 +-
+ drivers/staging/lustre/lustre/include/obd_cksum.h  |    6 +-
+ drivers/staging/lustre/lustre/include/obd_class.h  |  343 +-
+ drivers/staging/lustre/lustre/include/obd_ost.h    |  100 -
+ .../staging/lustre/lustre/include/obd_support.h    |   19 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c |    4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |   86 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |  108 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |   34 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     |   16 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |  112 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   21 +-
+ drivers/staging/lustre/lustre/libcfs/Makefile      |    2 +-
+ drivers/staging/lustre/lustre/libcfs/debug.c       |   19 +-
+ drivers/staging/lustre/lustre/libcfs/hash.c        |   20 +-
+ drivers/staging/lustre/lustre/libcfs/heap.c        |  475 --
+ .../lustre/lustre/libcfs/linux/linux-debug.c       |    7 +-
+ .../lustre/lustre/libcfs/linux/linux-module.c      |   10 +-
+ .../lustre/lustre/libcfs/linux/linux-prim.c        |   20 +-
+ .../lustre/lustre/libcfs/linux/linux-proc.c        |   17 +-
+ .../lustre/lustre/libcfs/linux/linux-tcpip.c       |   10 +-
+ drivers/staging/lustre/lustre/libcfs/module.c      |   13 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c   |   12 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.h   |   10 +-
+ .../staging/lustre/lustre/libcfs/upcall_cache.c    |  449 --
+ drivers/staging/lustre/lustre/libcfs/workitem.c    |    4 +-
+ drivers/staging/lustre/lustre/llite/dcache.c       |    4 +-
+ drivers/staging/lustre/lustre/llite/dir.c          |  223 +-
+ drivers/staging/lustre/lustre/llite/file.c         |  377 +-
+ drivers/staging/lustre/lustre/llite/llite_capa.c   |    2 +-
+ drivers/staging/lustre/lustre/llite/llite_close.c  |   18 +-
+ .../staging/lustre/lustre/llite/llite_internal.h   |   22 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c    |  164 +-
+ drivers/staging/lustre/lustre/llite/llite_mmap.c   |   26 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c    |   16 +-
+ drivers/staging/lustre/lustre/llite/llite_rmtacl.c |    6 +-
+ drivers/staging/lustre/lustre/llite/lloop.c        |   58 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c  |   59 +-
+ drivers/staging/lustre/lustre/llite/namei.c        |   58 +-
+ drivers/staging/lustre/lustre/llite/remote_perm.c  |    8 +-
+ drivers/staging/lustre/lustre/llite/rw.c           |   22 +-
+ drivers/staging/lustre/lustre/llite/rw26.c         |    4 +-
+ drivers/staging/lustre/lustre/llite/statahead.c    |   85 +-
+ drivers/staging/lustre/lustre/llite/super25.c      |    3 +-
+ drivers/staging/lustre/lustre/llite/symlink.c      |   13 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c      |    4 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c       |   19 +-
+ drivers/staging/lustre/lustre/llite/xattr.c        |   53 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c  |   26 +-
+ drivers/staging/lustre/lustre/lmv/lmv_fld.c        |    2 +-
+ drivers/staging/lustre/lustre/lmv/lmv_intent.c     |   16 +-
+ drivers/staging/lustre/lustre/lmv/lmv_internal.h   |   14 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c        |  111 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    8 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h    |    4 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c         |    8 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h   |   71 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c         |    8 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c       |   24 +-
+ drivers/staging/lustre/lustre/lov/lov_merge.c      |   41 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c        |  721 +--
+ drivers/staging/lustre/lustre/lov/lov_object.c     |   13 +-
+ drivers/staging/lustre/lustre/lov/lov_offset.c     |   29 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c       |  199 +-
+ drivers/staging/lustre/lustre/lov/lov_page.c       |   14 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c       |   40 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c    |  882 +---
+ drivers/staging/lustre/lustre/lov/lovsub_dev.c     |    2 +-
+ drivers/staging/lustre/lustre/lvfs/Makefile        |    4 -
+ drivers/staging/lustre/lustre/lvfs/fsfilt.c        |  139 -
+ drivers/staging/lustre/lustre/lvfs/lvfs_linux.c    |  293 --
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c      |   10 +-
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h   |    4 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c        |   48 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   77 +-
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c      |   12 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c    |  566 +-
+ drivers/staging/lustre/lustre/mgc/libmgc.c         |  158 -
+ drivers/staging/lustre/lustre/mgc/mgc_request.c    |  360 +-
+ drivers/staging/lustre/lustre/obdclass/Makefile    |   15 +-
+ drivers/staging/lustre/lustre/obdclass/acl.c       |   27 +-
+ drivers/staging/lustre/lustre/obdclass/capa.c      |   23 +-
+ drivers/staging/lustre/lustre/obdclass/cl_io.c     |   11 +-
+ drivers/staging/lustre/lustre/obdclass/cl_lock.c   |    2 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c |  131 +-
+ drivers/staging/lustre/lustre/obdclass/debug.c     |    1 -
+ drivers/staging/lustre/lustre/obdclass/dt_object.c |   56 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c    |   49 +-
+ drivers/staging/lustre/lustre/obdclass/idmap.c     |  477 --
+ drivers/staging/lustre/lustre/obdclass/linkea.c    |  194 -
+ .../lustre/lustre/obdclass/linux/linux-module.c    |   10 +-
+ .../lustre/lustre/obdclass/linux/linux-obdo.c      |    8 +-
+ drivers/staging/lustre/lustre/obdclass/llog.c      |   89 +-
+ drivers/staging/lustre/lustre/obdclass/llog_cat.c  |   20 +-
+ .../staging/lustre/lustre/obdclass/llog_ioctl.c    |  418 --
+ drivers/staging/lustre/lustre/obdclass/llog_lvfs.c |  847 ---
+ drivers/staging/lustre/lustre/obdclass/llog_obd.c  |   25 -
+ drivers/staging/lustre/lustre/obdclass/llog_osd.c  | 1290 -----
+ drivers/staging/lustre/lustre/obdclass/llog_swab.c |   52 +-
+ drivers/staging/lustre/lustre/obdclass/llog_test.c | 1072 ----
+ .../staging/lustre/lustre/obdclass/local_storage.c |  894 ----
+ .../staging/lustre/lustre/obdclass/local_storage.h |   91 -
+ .../lvfs_lib.c => obdclass/lprocfs_counters.c}     |   63 +-
+ .../lustre/lustre/obdclass/lprocfs_status.c        |  147 +-
+ drivers/staging/lustre/lustre/obdclass/lu_ucred.c  |  107 -
+ .../lustre/lustre/obdclass/lustre_handles.c        |    2 +-
+ drivers/staging/lustre/lustre/obdclass/md_attrs.c  |  199 -
+ drivers/staging/lustre/lustre/obdclass/mea.c       |  112 -
+ .../staging/lustre/lustre/obdclass/obd_config.c    |  144 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c |   64 +-
+ drivers/staging/lustre/lustre/obdclass/obdo.c      |   78 +-
+ .../staging/lustre/lustre/obdclass/statfs_pack.c   |    2 +-
+ drivers/staging/lustre/lustre/obdecho/echo.c       |  671 ---
+ .../staging/lustre/lustre/obdecho/echo_client.c    | 1185 +----
+ drivers/staging/lustre/lustre/osc/lproc_osc.c      |    4 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c      |    2 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h    |    3 +-
+ drivers/staging/lustre/lustre/osc/osc_internal.h   |    8 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c         |    5 +-
+ drivers/staging/lustre/lustre/osc/osc_quota.c      |   12 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c    |  635 +--
+ drivers/staging/lustre/lustre/ptlrpc/client.c      |   56 +-
+ drivers/staging/lustre/lustre/ptlrpc/connection.c  |    6 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c      |    9 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c      |   72 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c      |    4 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_client.c |   80 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_net.c    |    2 -
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   61 +-
+ drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   27 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c         |   52 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c     |   40 -
+ drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c    |    2 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c    |    6 +-
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c      |    7 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |    2 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |   16 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |   26 +-
+ drivers/staging/lustre/lustre/ptlrpc/recover.c     |    9 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c         |   30 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |    4 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_config.c  |  333 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_null.c    |    3 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c     |   54 +-
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |   48 -
+ drivers/staging/media/cxd2099/cxd2099.c            |    3 +
+ drivers/staging/media/davinci_vpfe/dm365_isif.c    |    2 -
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c   |   14 +-
+ drivers/staging/media/lirc/lirc_bt829.c            |    9 +-
+ drivers/staging/media/lirc/lirc_imon.c             |   17 +-
+ drivers/staging/media/lirc/lirc_parallel.c         |    5 +-
+ drivers/staging/media/lirc/lirc_sasem.c            |    5 +-
+ drivers/staging/media/lirc/lirc_serial.c           |   13 +-
+ drivers/staging/media/lirc/lirc_sir.c              |    1 +
+ drivers/staging/media/lirc/lirc_zilog.c            |    9 +-
+ drivers/staging/media/omap24xx/omap24xxcam-dma.c   |   39 +-
+ drivers/staging/media/omap24xx/omap24xxcam.c       |   10 +-
+ drivers/staging/media/omap24xx/tcm825x.c           |    1 +
+ drivers/staging/media/omap4iss/iss_csi2.c          |    6 +-
+ drivers/staging/media/omap4iss/iss_ipipe.c         |    4 +-
+ drivers/staging/media/omap4iss/iss_ipipeif.c       |    3 +-
+ drivers/staging/media/omap4iss/iss_resizer.c       |    3 +-
+ drivers/staging/media/omap4iss/iss_video.c         |    1 +
+ drivers/staging/mt29f_spinand/mt29f_spinand.c      |   26 +-
+ drivers/staging/netlogic/TODO                      |    1 -
+ drivers/staging/netlogic/platform_net.c            |  212 +-
+ drivers/staging/netlogic/platform_net.h            |    7 +-
+ drivers/staging/netlogic/xlr_net.c                 |  299 +-
+ drivers/staging/netlogic/xlr_net.h                 |    8 +-
+ drivers/staging/nokia_h4p/Kconfig                  |    9 -
+ drivers/staging/nokia_h4p/Makefile                 |    6 -
+ drivers/staging/nokia_h4p/TODO                     |  132 -
+ drivers/staging/nokia_h4p/hci_h4p.h                |  222 -
+ drivers/staging/nokia_h4p/nokia_core.c             | 1207 -----
+ drivers/staging/nokia_h4p/nokia_fw-bcm.c           |  149 -
+ drivers/staging/nokia_h4p/nokia_fw-csr.c           |  149 -
+ drivers/staging/nokia_h4p/nokia_fw-ti1273.c        |  110 -
+ drivers/staging/nokia_h4p/nokia_fw.c               |  208 -
+ drivers/staging/nokia_h4p/nokia_uart.c             |  199 -
+ drivers/staging/octeon-usb/octeon-hcd.c            |   63 +-
+ drivers/staging/octeon/ethernet-rgmii.c            |   14 +-
+ drivers/staging/octeon/ethernet-rx.c               |    3 +-
+ drivers/staging/octeon/ethernet-sgmii.c            |    1 +
+ drivers/staging/octeon/ethernet-util.h             |    6 +-
+ drivers/staging/octeon/ethernet-xaui.c             |    1 +
+ drivers/staging/octeon/ethernet.c                  |   12 +-
+ drivers/staging/ozwpan/ozcdev.c                    |   36 +-
+ drivers/staging/ozwpan/ozeltbuf.c                  |  130 +-
+ drivers/staging/ozwpan/ozeltbuf.h                  |    7 +-
+ drivers/staging/ozwpan/ozhcd.c                     |  178 +-
+ drivers/staging/ozwpan/ozmain.c                    |    4 +-
+ drivers/staging/ozwpan/ozpd.c                      |  321 +-
+ drivers/staging/ozwpan/ozpd.h                      |    9 +-
+ drivers/staging/ozwpan/ozproto.c                   |   41 +-
+ drivers/staging/ozwpan/ozproto.h                   |   27 +-
+ drivers/staging/ozwpan/ozprotocol.h                |    2 -
+ drivers/staging/ozwpan/ozusbsvc.c                  |   32 +-
+ drivers/staging/ozwpan/ozusbsvc1.c                 |   16 +-
+ drivers/staging/rtl8188eu/Makefile                 |   18 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c           |    5 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c         |    2 +-
+ drivers/staging/rtl8188eu/core/rtw_iol.c           |  164 -
+ drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c  |  231 -
+ drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c   |  269 -
+ drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c     | 1467 ------
+ .../rtl8188eu/hal/{HalHWImg8188E_BB.c => bb_cfg.c} |  474 +-
+ drivers/staging/rtl8188eu/hal/fw.c                 |  236 +
+ drivers/staging/rtl8188eu/hal/hal_intf.c           |   26 -
+ drivers/staging/rtl8188eu/hal/mac_cfg.c            |  134 +
+ drivers/staging/rtl8188eu/hal/odm.c                |   82 +-
+ drivers/staging/rtl8188eu/hal/odm_HWConfig.c       |   38 +-
+ drivers/staging/rtl8188eu/hal/odm_RTL8188E.c       |  394 +-
+ drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c |  138 -
+ drivers/staging/rtl8188eu/hal/odm_debug.c          |   32 -
+ drivers/staging/rtl8188eu/hal/phy.c                | 1570 ++++++
+ .../rtl8188eu/hal/{Hal8188EPwrSeq.c => pwrseq.c}   |   48 +-
+ .../rtl8188eu/hal/{HalPwrSeqCmd.c => pwrseqcmd.c}  |   66 +-
+ drivers/staging/rtl8188eu/hal/rf.c                 |  318 ++
+ drivers/staging/rtl8188eu/hal/rf_cfg.c             |  320 ++
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |  401 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c    |  936 ----
+ drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c    |  527 --
+ drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c      |    1 +
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |   25 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    3 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c        |   79 +-
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h |   37 -
+ drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h |  176 -
+ .../staging/rtl8188eu/include/HalHWImg8188E_BB.h   |   44 -
+ .../staging/rtl8188eu/include/HalHWImg8188E_MAC.h  |   30 -
+ .../staging/rtl8188eu/include/HalHWImg8188E_RF.h   |   30 -
+ drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h |   61 -
+ drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h   |  128 -
+ drivers/staging/rtl8188eu/include/drv_types.h      |    7 -
+ .../{rtl8821ae/rc.h => rtl8188eu/include/fw.h}     |   42 +-
+ drivers/staging/rtl8188eu/include/hal_intf.h       |   15 -
+ drivers/staging/rtl8188eu/include/odm.h            |    9 -
+ drivers/staging/rtl8188eu/include/odm_HWConfig.h   |    6 -
+ drivers/staging/rtl8188eu/include/odm_RTL8188E.h   |   16 +-
+ .../staging/rtl8188eu/include/odm_RegConfig8188E.h |   43 -
+ .../staging/rtl8188eu/include/odm_RegDefine11AC.h  |   54 -
+ drivers/staging/rtl8188eu/include/odm_precomp.h    |    7 -
+ drivers/staging/rtl8188eu/include/phy.h            |   30 +
+ drivers/staging/rtl8188eu/include/pwrseq.h         |  341 ++
+ drivers/staging/rtl8188eu/include/pwrseqcmd.h      |   90 +
+ drivers/staging/rtl8188eu/include/rf.h             |   11 +
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h   |   52 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_rf.h    |   36 -
+ drivers/staging/rtl8188eu/include/rtw_efuse.h      |    1 -
+ drivers/staging/rtl8188eu/include/rtw_iol.h        |   54 -
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    7 +-
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c     |    9 +-
+ drivers/staging/rtl8192e/dot11d.c                  |    1 +
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c |   12 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c  |    8 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |   16 +
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |    1 +
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |   18 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |    4 +
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |   30 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |   19 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c         |    8 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |    8 +
+ drivers/staging/rtl8192e/rtl819x_BAProc.c          |   11 +-
+ drivers/staging/rtl8192e/rtl819x_HTProc.c          |   17 +-
+ drivers/staging/rtl8192e/rtl819x_TSProc.c          |   11 +-
+ drivers/staging/rtl8192e/rtllib.h                  |    5 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c       |   13 +-
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |    5 +
+ drivers/staging/rtl8192e/rtllib_crypt_wep.c        |    8 +-
+ drivers/staging/rtl8192e/rtllib_module.c           |    1 +
+ drivers/staging/rtl8192e/rtllib_rx.c               |   20 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c          |   39 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c       |    3 +-
+ drivers/staging/rtl8192e/rtllib_tx.c               |    7 +-
+ drivers/staging/rtl8192e/rtllib_wx.c               |    5 +
+ drivers/staging/rtl8192ee/Kconfig                  |   14 -
+ drivers/staging/rtl8192ee/Makefile                 |   40 -
+ drivers/staging/rtl8192ee/TODO                     |   12 -
+ drivers/staging/rtl8192ee/base.c                   | 1851 -------
+ drivers/staging/rtl8192ee/base.h                   |  163 -
+ .../staging/rtl8192ee/btcoexist/halbt_precomp.h    |   50 -
+ .../staging/rtl8192ee/btcoexist/halbtc8192e2ant.c  | 4110 ---------------
+ .../staging/rtl8192ee/btcoexist/halbtc8192e2ant.h  |  161 -
+ .../staging/rtl8192ee/btcoexist/halbtc8723b1ant.c  | 3146 -----------
+ .../staging/rtl8192ee/btcoexist/halbtc8723b1ant.h  |  160 -
+ .../staging/rtl8192ee/btcoexist/halbtc8723b2ant.c  | 3929 --------------
+ .../staging/rtl8192ee/btcoexist/halbtc8723b2ant.h  |  145 -
+ .../staging/rtl8192ee/btcoexist/halbtc8821a1ant.c  | 2780 ----------
+ .../staging/rtl8192ee/btcoexist/halbtc8821a1ant.h  |  158 -
+ .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c  | 3438 ------------
+ .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.h  |  179 -
+ drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c | 1297 -----
+ drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h |  537 --
+ drivers/staging/rtl8192ee/btcoexist/rtl_btc.c      |  194 -
+ drivers/staging/rtl8192ee/btcoexist/rtl_btc.h      |   62 -
+ drivers/staging/rtl8192ee/cam.c                    |  337 --
+ drivers/staging/rtl8192ee/cam.h                    |   52 -
+ drivers/staging/rtl8192ee/compat.h                 |   70 -
+ drivers/staging/rtl8192ee/core.c                   | 1600 ------
+ drivers/staging/rtl8192ee/core.h                   |   39 -
+ drivers/staging/rtl8192ee/debug.c                  |  978 ----
+ drivers/staging/rtl8192ee/debug.h                  |  221 -
+ drivers/staging/rtl8192ee/efuse.c                  | 1233 -----
+ drivers/staging/rtl8192ee/efuse.h                  |  127 -
+ drivers/staging/rtl8192ee/pci.c                    | 2384 ---------
+ drivers/staging/rtl8192ee/pci.h                    |  342 --
+ drivers/staging/rtl8192ee/ps.c                     |  983 ----
+ drivers/staging/rtl8192ee/ps.h                     |   52 -
+ drivers/staging/rtl8192ee/rc.c                     |  288 -
+ drivers/staging/rtl8192ee/rc.h                     |   47 -
+ drivers/staging/rtl8192ee/regd.c                   |  448 --
+ drivers/staging/rtl8192ee/regd.h                   |   63 -
+ drivers/staging/rtl8192ee/rtl8192ee/def.h          |  106 -
+ drivers/staging/rtl8192ee/rtl8192ee/dm.c           | 1258 -----
+ drivers/staging/rtl8192ee/rtl8192ee/dm.h           |  343 --
+ drivers/staging/rtl8192ee/rtl8192ee/fw.c           |  945 ----
+ drivers/staging/rtl8192ee/rtl8192ee/fw.h           |  213 -
+ drivers/staging/rtl8192ee/rtl8192ee/hw.c           | 2544 ---------
+ drivers/staging/rtl8192ee/rtl8192ee/hw.h           |   67 -
+ drivers/staging/rtl8192ee/rtl8192ee/led.c          |  134 -
+ drivers/staging/rtl8192ee/rtl8192ee/led.h          |   37 -
+ drivers/staging/rtl8192ee/rtl8192ee/phy.c          | 3282 ------------
+ drivers/staging/rtl8192ee/rtl8192ee/phy.h          |  154 -
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseq.c       |  108 -
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseq.h       |  355 --
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c    |  139 -
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.h    |   69 -
+ drivers/staging/rtl8192ee/rtl8192ee/reg.h          | 2240 --------
+ drivers/staging/rtl8192ee/rtl8192ee/rf.c           |  150 -
+ drivers/staging/rtl8192ee/rtl8192ee/rf.h           |   39 -
+ drivers/staging/rtl8192ee/rtl8192ee/sw.c           |  428 --
+ drivers/staging/rtl8192ee/rtl8192ee/sw.h           |   39 -
+ drivers/staging/rtl8192ee/rtl8192ee/table.c        |  882 ----
+ drivers/staging/rtl8192ee/rtl8192ee/table.h        |   48 -
+ drivers/staging/rtl8192ee/rtl8192ee/trx.c          | 1286 -----
+ drivers/staging/rtl8192ee/rtl8192ee/trx.h          |  877 ----
+ drivers/staging/rtl8192ee/stats.c                  |  290 -
+ drivers/staging/rtl8192ee/stats.h                  |   43 -
+ drivers/staging/rtl8192ee/wifi.h                   | 2644 ----------
+ drivers/staging/rtl8192u/Makefile                  |    3 -
+ drivers/staging/rtl8192u/copying                   |   10 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   41 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |    2 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   22 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   99 +-
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |    8 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c  |   12 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |   37 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h    |    2 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    |    4 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h   |    8 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c           |   52 +-
+ drivers/staging/rtl8192u/r8192U_core.c             | 1067 +---
+ drivers/staging/rtl8192u/r8192U_dm.c               |   24 +-
+ drivers/staging/rtl8192u/r8192U_hw.h               |    2 +-
+ drivers/staging/rtl8192u/r8192U_wx.c               |    5 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c         |   37 +-
+ drivers/staging/rtl8192u/r819xU_phyreg.h           |  189 +-
+ drivers/staging/rtl8712/hal_init.c                 |    7 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c              |    4 +-
+ drivers/staging/rtl8712/rtl8712_io.c               |   15 +-
+ drivers/staging/rtl8712/rtl8712_recv.c             |    2 +-
+ drivers/staging/rtl8712/rtl8712_xmit.c             |    3 +
+ drivers/staging/rtl8712/rtl871x_io.c               |    4 +-
+ drivers/staging/rtl8712/rtl871x_io.h               |    3 +-
+ drivers/staging/rtl8712/rtl871x_ioctl.h            |    2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |   16 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c             |    2 +-
+ drivers/staging/rtl8712/rtl871x_mp.c               |   16 +-
+ drivers/staging/rtl8712/rtl871x_mp.h               |    2 +-
+ drivers/staging/rtl8712/rtl871x_pwrctrl.c          |    2 +
+ drivers/staging/rtl8712/rtl871x_recv.c             |    6 +-
+ drivers/staging/rtl8712/rtl871x_security.c         |    1 -
+ drivers/staging/rtl8712/rtl871x_xmit.c             |   10 +-
+ drivers/staging/rtl8712/usb_intf.c                 |    7 +-
+ drivers/staging/rtl8712/usb_ops_linux.c            |    9 +-
+ drivers/staging/rtl8723au/core/rtw_ap.c            |   48 +-
+ drivers/staging/rtl8723au/core/rtw_cmd.c           |   14 +-
+ drivers/staging/rtl8723au/core/rtw_efuse.c         |   36 +-
+ drivers/staging/rtl8723au/core/rtw_ieee80211.c     |    4 +-
+ drivers/staging/rtl8723au/core/rtw_led.c           |    2 +-
+ drivers/staging/rtl8723au/core/rtw_mlme.c          |   77 +-
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |   40 +-
+ drivers/staging/rtl8723au/core/rtw_pwrctrl.c       |    8 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c          |   16 +-
+ drivers/staging/rtl8723au/core/rtw_security.c      |   14 +-
+ drivers/staging/rtl8723au/core/rtw_sreset.c        |    3 +-
+ drivers/staging/rtl8723au/core/rtw_wlan_util.c     |    4 +-
+ drivers/staging/rtl8723au/core/rtw_xmit.c          |    4 +-
+ drivers/staging/rtl8723au/hal/hal_com.c            |   12 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c        |   26 +-
+ drivers/staging/rtl8723au/include/ieee80211.h      |   16 +-
+ drivers/staging/rtl8723au/include/odm.h            |    2 +-
+ drivers/staging/rtl8723au/include/odm_HWConfig.h   |    4 +-
+ drivers/staging/rtl8723au/include/osdep_service.h  |    4 +-
+ drivers/staging/rtl8723au/include/rtl8723a_hal.h   |    4 -
+ drivers/staging/rtl8723au/include/rtl8723a_rf.h    |    4 +-
+ drivers/staging/rtl8723au/include/rtl8723a_spec.h  |    6 +-
+ drivers/staging/rtl8723au/include/rtw_cmd.h        |   12 +-
+ drivers/staging/rtl8723au/include/rtw_eeprom.h     |    2 +-
+ drivers/staging/rtl8723au/include/rtw_efuse.h      |    5 +-
+ drivers/staging/rtl8723au/include/rtw_io.h         |   20 +-
+ drivers/staging/rtl8723au/include/rtw_mlme_ext.h   |   10 +-
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c  |    6 +-
+ drivers/staging/rtl8821ae/Kconfig                  |   10 -
+ drivers/staging/rtl8821ae/Makefile                 |   35 -
+ drivers/staging/rtl8821ae/TODO                     |   10 -
+ drivers/staging/rtl8821ae/base.c                   | 1831 -------
+ drivers/staging/rtl8821ae/base.h                   |  159 -
+ .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c  | 3976 --------------
+ .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.h  |  205 -
+ .../staging/rtl8821ae/btcoexist/habtc8723a1ant.c   | 1614 ------
+ .../staging/rtl8821ae/btcoexist/habtc8723a1ant.h   |  176 -
+ .../staging/rtl8821ae/btcoexist/halbt_precomp.h    |   99 -
+ .../staging/rtl8821ae/btcoexist/halbtc8192e1ant.c  | 3891 --------------
+ .../staging/rtl8821ae/btcoexist/halbtc8192e1ant.h  |  226 -
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c  | 4118 ---------------
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.h  |  160 -
+ .../staging/rtl8821ae/btcoexist/halbtc8723a2ant.c  | 3780 -------------
+ .../staging/rtl8821ae/btcoexist/halbtc8723a2ant.h  |  179 -
+ .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.c  | 3892 --------------
+ .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.h  |  175 -
+ .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.c  | 4200 ---------------
+ .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.h  |  145 -
+ drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c | 1130 ----
+ drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h |  549 --
+ drivers/staging/rtl8821ae/btcoexist/rtl_btc.c      |  236 -
+ drivers/staging/rtl8821ae/btcoexist/rtl_btc.h      |   66 -
+ drivers/staging/rtl8821ae/cam.c                    |  345 --
+ drivers/staging/rtl8821ae/cam.h                    |   56 -
+ drivers/staging/rtl8821ae/compat.h                 |   68 -
+ drivers/staging/rtl8821ae/core.c                   | 1314 -----
+ drivers/staging/rtl8821ae/core.h                   |   43 -
+ drivers/staging/rtl8821ae/debug.c                  |  983 ----
+ drivers/staging/rtl8821ae/debug.h                  |  227 -
+ drivers/staging/rtl8821ae/efuse.c                  | 1283 -----
+ drivers/staging/rtl8821ae/efuse.h                  |  130 -
+ drivers/staging/rtl8821ae/pci.c                    | 2417 ---------
+ drivers/staging/rtl8821ae/pci.h                    |  348 --
+ drivers/staging/rtl8821ae/ps.c                     | 1001 ----
+ drivers/staging/rtl8821ae/ps.h                     |   55 -
+ drivers/staging/rtl8821ae/rc.c                     |  290 -
+ drivers/staging/rtl8821ae/regd.c                   |  451 --
+ drivers/staging/rtl8821ae/regd.h                   |   67 -
+ drivers/staging/rtl8821ae/rtl8821ae/btc.h          |   87 -
+ drivers/staging/rtl8821ae/rtl8821ae/def.h          |  442 --
+ drivers/staging/rtl8821ae/rtl8821ae/dm.c           | 3045 -----------
+ drivers/staging/rtl8821ae/rtl8821ae/dm.h           |  426 --
+ drivers/staging/rtl8821ae/rtl8821ae/fw.c           | 1349 -----
+ drivers/staging/rtl8821ae/rtl8821ae/fw.h           |  321 --
+ .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c   |  519 --
+ .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h   |  169 -
+ drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c      | 2054 --------
+ drivers/staging/rtl8821ae/rtl8821ae/hal_btc.h      |  160 -
+ drivers/staging/rtl8821ae/rtl8821ae/hw.c           | 3347 ------------
+ drivers/staging/rtl8821ae/rtl8821ae/hw.h           |   72 -
+ drivers/staging/rtl8821ae/rtl8821ae/led.c          |  239 -
+ drivers/staging/rtl8821ae/rtl8821ae/led.h          |   40 -
+ drivers/staging/rtl8821ae/rtl8821ae/phy.c          | 5525 --------------------
+ drivers/staging/rtl8821ae/rtl8821ae/phy.h          |  258 -
+ drivers/staging/rtl8821ae/rtl8821ae/pwrseq.c       |  199 -
+ drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h       |  413 --
+ drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c    |  140 -
+ drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.h    |   71 -
+ drivers/staging/rtl8821ae/rtl8821ae/reg.h          | 2428 ---------
+ drivers/staging/rtl8821ae/rtl8821ae/rf.c           |  464 --
+ drivers/staging/rtl8821ae/rtl8821ae/rf.h           |   46 -
+ drivers/staging/rtl8821ae/rtl8821ae/sw.c           |  478 --
+ drivers/staging/rtl8821ae/rtl8821ae/sw.h           |   39 -
+ drivers/staging/rtl8821ae/rtl8821ae/table.c        | 4002 --------------
+ drivers/staging/rtl8821ae/rtl8821ae/table.h        |   62 -
+ drivers/staging/rtl8821ae/rtl8821ae/trx.c          | 1005 ----
+ drivers/staging/rtl8821ae/rtl8821ae/trx.h          |  630 ---
+ drivers/staging/rtl8821ae/stats.c                  |  281 -
+ drivers/staging/rtl8821ae/stats.h                  |   46 -
+ drivers/staging/rtl8821ae/wifi.h                   | 2534 ---------
+ drivers/staging/rts5208/Kconfig                    |    7 -
+ drivers/staging/rts5208/general.c                  |    1 +
+ drivers/staging/rts5208/ms.c                       |   12 +-
+ drivers/staging/rts5208/rtsx.c                     |   13 +-
+ drivers/staging/rts5208/rtsx_card.h                |    4 +-
+ drivers/staging/rts5208/rtsx_chip.c                |   20 +-
+ drivers/staging/rts5208/rtsx_scsi.c                |   15 +-
+ drivers/staging/rts5208/sd.c                       |   17 +-
+ drivers/staging/rts5208/trace.h                    |    8 -
+ drivers/staging/skein/skein_block.c                |    2 +-
+ drivers/staging/slicoss/slicoss.c                  |    3 +-
+ drivers/staging/speakup/buffers.c                  |    1 -
+ drivers/staging/speakup/i18n.h                     |   28 +-
+ drivers/staging/speakup/keyhelp.c                  |    7 +-
+ drivers/staging/speakup/kobjects.c                 |    7 +-
+ drivers/staging/speakup/main.c                     |   46 +-
+ drivers/staging/speakup/selection.c                |    1 +
+ drivers/staging/speakup/serialio.c                 |    2 +
+ drivers/staging/speakup/serialio.h                 |    2 +-
+ drivers/staging/speakup/speakup_acntpc.c           |    3 +
+ drivers/staging/speakup/speakup_audptr.c           |    2 +
+ drivers/staging/speakup/speakup_decext.c           |    3 +-
+ drivers/staging/speakup/speakup_decpc.c            |    9 +-
+ drivers/staging/speakup/speakup_dectlk.c           |    2 +
+ drivers/staging/speakup/speakup_dtlk.c             |    5 +
+ drivers/staging/speakup/speakup_keypc.c            |    3 +
+ drivers/staging/speakup/speakup_ltlk.c             |    1 +
+ drivers/staging/speakup/speakup_soft.c             |    3 +
+ drivers/staging/speakup/speakup_spkout.c           |    1 +
+ drivers/staging/speakup/spk_types.h                |    4 +-
+ drivers/staging/speakup/spkguide.txt               |   36 +-
+ drivers/staging/speakup/synth.c                    |    9 +-
+ drivers/staging/speakup/thread.c                   |    1 +
+ drivers/staging/speakup/varhandlers.c              |    7 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    2 +
+ drivers/staging/unisys/channels/channel.c          |   12 +-
+ drivers/staging/unisys/channels/chanstub.c         |    4 +-
+ .../unisys/common-spar/include/channels/channel.h  |   59 +-
+ .../include/channels/controlframework.h            |    2 +-
+ .../include/channels/controlvmchannel.h            |    4 +-
+ .../common-spar/include/channels/diagchannel.h     |    2 +-
+ .../common-spar/include/channels/iochannel.h       |   47 +-
+ .../common-spar/include/channels/vbuschannel.h     |    1 -
+ .../include/controlvmcompletionstatus.h            |   16 +-
+ .../unisys/common-spar/include/iovmcall_gnuc.h     |   30 +-
+ .../unisys/common-spar/include/vbusdeviceinfo.h    |    3 +-
+ drivers/staging/unisys/include/commontypes.h       |   72 -
+ drivers/staging/unisys/include/guestlinuxdebug.h   |   10 +-
+ drivers/staging/unisys/include/periodic_work.h     |   22 +-
+ drivers/staging/unisys/include/timskmod.h          |  147 +-
+ drivers/staging/unisys/include/timskmodutils.h     |   77 -
+ drivers/staging/unisys/include/uisqueue.h          |   99 +-
+ drivers/staging/unisys/include/uisthread.h         |    3 -
+ drivers/staging/unisys/include/uisutils.h          |   46 +-
+ drivers/staging/unisys/include/uniklog.h           |    2 -
+ drivers/staging/unisys/include/vbushelper.h        |   28 +-
+ drivers/staging/unisys/uislib/Kconfig              |    2 +-
+ drivers/staging/unisys/uislib/uislib.c             |  451 +-
+ drivers/staging/unisys/uislib/uisqueue.c           |   69 +-
+ drivers/staging/unisys/uislib/uisthread.c          |    1 +
+ drivers/staging/unisys/uislib/uisutils.c           |   64 +-
+ drivers/staging/unisys/virthba/virthba.c           |   25 +-
+ drivers/staging/unisys/virtpci/virtpci.c           |   37 +-
+ drivers/staging/unisys/visorchannel/visorchannel.h |    1 -
+ .../unisys/visorchannel/visorchannel_funcs.c       |    7 +-
+ drivers/staging/unisys/visorchipset/Kconfig        |    2 +-
+ drivers/staging/unisys/visorchipset/file.c         |    5 +-
+ drivers/staging/unisys/visorchipset/parser.c       |    2 +
+ .../unisys/visorchipset/visorchipset_main.c        |   64 +-
+ drivers/staging/unisys/visorutil/Kconfig           |    2 +-
+ drivers/staging/unisys/visorutil/periodic_work.c   |  137 +-
+ drivers/staging/unisys/visorutil/procobjecttree.c  |    3 +-
+ drivers/staging/unisys/visorutil/visorkmodutils.c  |   40 -
+ drivers/staging/vme/devices/vme_pio2_gpio.c        |   14 +-
+ drivers/staging/vme/devices/vme_user.c             |    4 +-
+ drivers/staging/vt6655/80211hdr.h                  |    3 +-
+ drivers/staging/vt6655/80211mgr.c                  |   41 +-
+ drivers/staging/vt6655/80211mgr.h                  |   15 +-
+ drivers/staging/vt6655/aes_ccmp.c                  |    5 +-
+ drivers/staging/vt6655/baseband.c                  |  315 +-
+ drivers/staging/vt6655/baseband.h                  |   45 +-
+ drivers/staging/vt6655/bssdb.c                     |   99 +-
+ drivers/staging/vt6655/bssdb.h                     |    8 +-
+ drivers/staging/vt6655/card.c                      |  454 +-
+ drivers/staging/vt6655/card.h                      |   99 +-
+ drivers/staging/vt6655/channel.c                   |   17 +-
+ drivers/staging/vt6655/datarate.c                  |   15 +-
+ drivers/staging/vt6655/desc.h                      |  219 +-
+ drivers/staging/vt6655/device.h                    |   49 +-
+ drivers/staging/vt6655/device_cfg.h                |    3 -
+ drivers/staging/vt6655/device_main.c               |  530 +-
+ drivers/staging/vt6655/dpc.c                       |  172 +-
+ drivers/staging/vt6655/dpc.h                       |    2 +-
+ drivers/staging/vt6655/hostap.c                    |  186 +-
+ drivers/staging/vt6655/hostap.h                    |    4 +-
+ drivers/staging/vt6655/ioctl.c                     |   84 +-
+ drivers/staging/vt6655/ioctl.h                     |    2 +-
+ drivers/staging/vt6655/iowpa.h                     |    4 +-
+ drivers/staging/vt6655/iwctl.c                     |  164 +-
+ drivers/staging/vt6655/key.c                       |  144 +-
+ drivers/staging/vt6655/key.h                       |    8 +-
+ drivers/staging/vt6655/mac.c                       |   65 +-
+ drivers/staging/vt6655/mib.c                       |   54 +-
+ drivers/staging/vt6655/power.c                     |   35 +-
+ drivers/staging/vt6655/rf.c                        |    8 +-
+ drivers/staging/vt6655/rf.h                        |    8 +-
+ drivers/staging/vt6655/rxtx.c                      | 1128 ++--
+ drivers/staging/vt6655/rxtx.h                      |  166 +-
+ drivers/staging/vt6655/ttype.h                     |   27 -
+ drivers/staging/vt6655/upc.h                       |   39 +-
+ drivers/staging/vt6655/vntwifi.c                   |    4 -
+ drivers/staging/vt6655/wcmd.c                      |  155 +-
+ drivers/staging/vt6655/wcmd.h                      |    3 +-
+ drivers/staging/vt6655/wctl.c                      |    8 +-
+ drivers/staging/vt6655/wctl.h                      |    6 +-
+ drivers/staging/vt6655/wmgr.c                      |  387 +-
+ drivers/staging/vt6655/wmgr.h                      |    2 +-
+ drivers/staging/vt6655/wpa.c                       |   28 +-
+ drivers/staging/vt6655/wpa2.c                      |   20 +-
+ drivers/staging/vt6655/wpactl.c                    |  148 +-
+ drivers/staging/vt6655/wpactl.h                    |    6 +-
+ drivers/staging/vt6655/wroute.c                    |   14 +-
+ drivers/staging/vt6655/wroute.h                    |    3 +-
+ drivers/staging/vt6656/baseband.c                  |   20 +-
+ drivers/staging/vt6656/card.c                      |    3 +-
+ drivers/staging/vt6656/firmware.c                  |    5 +-
+ drivers/staging/vt6656/key.c                       |    5 +-
+ drivers/staging/vt6656/main_usb.c                  |    1 -
+ drivers/staging/vt6656/rf.c                        |    5 +-
+ drivers/staging/vt6656/rxtx.c                      |    9 +-
+ drivers/staging/vt6656/usbpipe.c                   |    5 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c              |   10 +-
+ drivers/staging/wlan-ng/p80211netdev.h             |   14 +-
+ drivers/staging/wlan-ng/prism2fw.c                 |   93 +-
+ drivers/staging/wlan-ng/prism2mgmt.c               |   19 +-
+ drivers/staging/wlan-ng/prism2mib.c                |   11 +-
+ drivers/staging/xgifb/XGI_main_26.c                |   10 +-
+ drivers/staging/xgifb/vb_init.c                    |   50 +-
+ drivers/staging/xgifb/vb_setmode.c                 |    3 +-
+ drivers/staging/xillybus/TODO                      |    5 -
+ 1008 files changed, 26961 insertions(+), 167687 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-accel-bmc150
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-gyro-bmg160
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/max5821.txt
+ rename Documentation/devicetree/bindings/{staging => xillybus}/xillybus.txt (100%)
+ rename drivers/staging/xillybus/README => Documentation/xillybus.txt (100%)
+ rename drivers/{staging => char}/xillybus/Kconfig (100%)
+ rename drivers/{staging => char}/xillybus/Makefile (100%)
+ rename drivers/{staging => char}/xillybus/xillybus.h (99%)
+ rename drivers/{staging => char}/xillybus/xillybus_core.c (90%)
+ rename drivers/{staging => char}/xillybus/xillybus_of.c (99%)
+ rename drivers/{staging => char}/xillybus/xillybus_pcie.c (97%)
+ create mode 100644 drivers/iio/accel/bmc150-accel.c
+ create mode 100644 drivers/iio/adc/rockchip_saradc.c
+ create mode 100644 drivers/iio/adc/ti-adc128s052.c
+ create mode 100644 drivers/iio/dac/max5821.c
+ create mode 100644 drivers/iio/gyro/bmg160.c
+ create mode 100644 drivers/iio/light/al3320a.c
+ delete mode 100644 drivers/staging/comedi/drivers/comedi_fc.c
+ create mode 100644 drivers/staging/comedi/drivers/ni_labpc_common.c
+ create mode 100644 drivers/staging/comedi/drivers/ni_usb6501.c
+ delete mode 100644 drivers/staging/comedi/drivers/skel.c
+ create mode 100644 drivers/staging/dgnc/dgnc_utils.c
+ create mode 100644 drivers/staging/dgnc/dgnc_utils.h
+ delete mode 100644 drivers/staging/iio/frequency/ad5930.c
+ delete mode 100644 drivers/staging/iio/frequency/ad9850.c
+ delete mode 100644 drivers/staging/iio/frequency/ad9852.c
+ delete mode 100644 drivers/staging/iio/frequency/ad9910.c
+ delete mode 100644 drivers/staging/iio/frequency/ad9951.c
+ create mode 100644 drivers/staging/lustre/README.txt
+ delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h
+ delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+ delete mode 100644 drivers/staging/lustre/include/linux/libcfs/lucache.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_acl.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_common.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lib.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd_class.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd_support.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre_fsfilt.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h
+ rename drivers/staging/lustre/lustre/include/{linux => }/lustre_intent.h (100%)
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lvfs.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/md_object.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h
+ delete mode 100644 drivers/staging/lustre/lustre/libcfs/heap.c
+ delete mode 100644 drivers/staging/lustre/lustre/libcfs/upcall_cache.c
+ delete mode 100644 drivers/staging/lustre/lustre/lvfs/Makefile
+ delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt.c
+ delete mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+ delete mode 100644 drivers/staging/lustre/lustre/mgc/libmgc.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h
+ rename drivers/staging/lustre/lustre/{lvfs/lvfs_lib.c => obdclass/lprocfs_counters.c} (70%)
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/md_attrs.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c
+ delete mode 100644 drivers/staging/lustre/lustre/obdecho/echo.c
+ delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c
+ delete mode 100644 drivers/staging/nokia_h4p/Kconfig
+ delete mode 100644 drivers/staging/nokia_h4p/Makefile
+ delete mode 100644 drivers/staging/nokia_h4p/TODO
+ delete mode 100644 drivers/staging/nokia_h4p/hci_h4p.h
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_core.c
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-bcm.c
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-csr.c
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-ti1273.c
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_fw.c
+ delete mode 100644 drivers/staging/nokia_h4p/nokia_uart.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+ rename drivers/staging/rtl8188eu/hal/{HalHWImg8188E_BB.c => bb_cfg.c} (54%)
+ create mode 100644 drivers/staging/rtl8188eu/hal/fw.c
+ create mode 100644 drivers/staging/rtl8188eu/hal/mac_cfg.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/odm_debug.c
+ create mode 100644 drivers/staging/rtl8188eu/hal/phy.c
+ rename drivers/staging/rtl8188eu/hal/{Hal8188EPwrSeq.c => pwrseq.c} (68%)
+ rename drivers/staging/rtl8188eu/hal/{HalPwrSeqCmd.c => pwrseqcmd.c} (60%)
+ create mode 100644 drivers/staging/rtl8188eu/hal/rf.c
+ create mode 100644 drivers/staging/rtl8188eu/hal/rf_cfg.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c
+ delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c
+ delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h
+ rename drivers/staging/{rtl8821ae/rc.h => rtl8188eu/include/fw.h} (67%)
+ delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegDefine11AC.h
+ create mode 100644 drivers/staging/rtl8188eu/include/phy.h
+ create mode 100644 drivers/staging/rtl8188eu/include/pwrseq.h
+ create mode 100644 drivers/staging/rtl8188eu/include/pwrseqcmd.h
+ create mode 100644 drivers/staging/rtl8188eu/include/rf.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_rf.h
+ delete mode 100644 drivers/staging/rtl8192ee/Kconfig
+ delete mode 100644 drivers/staging/rtl8192ee/Makefile
+ delete mode 100644 drivers/staging/rtl8192ee/TODO
+ delete mode 100644 drivers/staging/rtl8192ee/base.c
+ delete mode 100644 drivers/staging/rtl8192ee/base.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbt_precomp.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/rtl_btc.c
+ delete mode 100644 drivers/staging/rtl8192ee/btcoexist/rtl_btc.h
+ delete mode 100644 drivers/staging/rtl8192ee/cam.c
+ delete mode 100644 drivers/staging/rtl8192ee/cam.h
+ delete mode 100644 drivers/staging/rtl8192ee/compat.h
+ delete mode 100644 drivers/staging/rtl8192ee/core.c
+ delete mode 100644 drivers/staging/rtl8192ee/core.h
+ delete mode 100644 drivers/staging/rtl8192ee/debug.c
+ delete mode 100644 drivers/staging/rtl8192ee/debug.h
+ delete mode 100644 drivers/staging/rtl8192ee/efuse.c
+ delete mode 100644 drivers/staging/rtl8192ee/efuse.h
+ delete mode 100644 drivers/staging/rtl8192ee/pci.c
+ delete mode 100644 drivers/staging/rtl8192ee/pci.h
+ delete mode 100644 drivers/staging/rtl8192ee/ps.c
+ delete mode 100644 drivers/staging/rtl8192ee/ps.h
+ delete mode 100644 drivers/staging/rtl8192ee/rc.c
+ delete mode 100644 drivers/staging/rtl8192ee/rc.h
+ delete mode 100644 drivers/staging/rtl8192ee/regd.c
+ delete mode 100644 drivers/staging/rtl8192ee/regd.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/def.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/dm.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/dm.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/fw.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/fw.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/hw.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/hw.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/led.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/led.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/phy.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/phy.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseq.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseq.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/reg.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/rf.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/rf.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/sw.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/sw.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/table.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/table.h
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/trx.c
+ delete mode 100644 drivers/staging/rtl8192ee/rtl8192ee/trx.h
+ delete mode 100644 drivers/staging/rtl8192ee/stats.c
+ delete mode 100644 drivers/staging/rtl8192ee/stats.h
+ delete mode 100644 drivers/staging/rtl8192ee/wifi.h
+ delete mode 100644 drivers/staging/rtl8821ae/Kconfig
+ delete mode 100644 drivers/staging/rtl8821ae/Makefile
+ delete mode 100644 drivers/staging/rtl8821ae/TODO
+ delete mode 100644 drivers/staging/rtl8821ae/base.c
+ delete mode 100644 drivers/staging/rtl8821ae/base.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbt_precomp.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/rtl_btc.c
+ delete mode 100644 drivers/staging/rtl8821ae/btcoexist/rtl_btc.h
+ delete mode 100644 drivers/staging/rtl8821ae/cam.c
+ delete mode 100644 drivers/staging/rtl8821ae/cam.h
+ delete mode 100644 drivers/staging/rtl8821ae/compat.h
+ delete mode 100644 drivers/staging/rtl8821ae/core.c
+ delete mode 100644 drivers/staging/rtl8821ae/core.h
+ delete mode 100644 drivers/staging/rtl8821ae/debug.c
+ delete mode 100644 drivers/staging/rtl8821ae/debug.h
+ delete mode 100644 drivers/staging/rtl8821ae/efuse.c
+ delete mode 100644 drivers/staging/rtl8821ae/efuse.h
+ delete mode 100644 drivers/staging/rtl8821ae/pci.c
+ delete mode 100644 drivers/staging/rtl8821ae/pci.h
+ delete mode 100644 drivers/staging/rtl8821ae/ps.c
+ delete mode 100644 drivers/staging/rtl8821ae/ps.h
+ delete mode 100644 drivers/staging/rtl8821ae/rc.c
+ delete mode 100644 drivers/staging/rtl8821ae/regd.c
+ delete mode 100644 drivers/staging/rtl8821ae/regd.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/btc.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/def.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/dm.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/dm.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/fw.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/fw.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hal_btc.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hw.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/hw.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/led.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/led.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/phy.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/phy.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseq.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/reg.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/rf.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/rf.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/sw.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/sw.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/table.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/table.h
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/trx.c
+ delete mode 100644 drivers/staging/rtl8821ae/rtl8821ae/trx.h
+ delete mode 100644 drivers/staging/rtl8821ae/stats.c
+ delete mode 100644 drivers/staging/rtl8821ae/stats.h
+ delete mode 100644 drivers/staging/rtl8821ae/wifi.h
+ delete mode 100644 drivers/staging/unisys/include/commontypes.h
+ delete mode 100644 drivers/staging/unisys/include/timskmodutils.h
+ delete mode 100644 drivers/staging/xillybus/TODO
+Merging char-misc/char-misc-next (480bd3c4ad30 mei: mei_txe_fw_sts can be static)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/misc/mei/pci-txe.c
+Auto-merging drivers/misc/mei/pci-me.c
+Auto-merging drivers/extcon/extcon-sm5502.h
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/extcon/extcon-rt8973a.txt  |  25 +
+ .../devicetree/bindings/vendor-prefixes.txt        |   1 +
+ drivers/char/i8k.c                                 |  13 +
+ drivers/char/xilinx_hwicap/xilinx_hwicap.c         |   1 -
+ drivers/extcon/Kconfig                             |  13 +
+ drivers/extcon/Makefile                            |   1 +
+ drivers/extcon/extcon-gpio.c                       |  10 +-
+ drivers/extcon/extcon-max77693.c                   |  37 +-
+ drivers/extcon/extcon-rt8973a.c                    | 740 +++++++++++++++++++++
+ drivers/extcon/extcon-rt8973a.h                    | 203 ++++++
+ drivers/extcon/extcon-sm5502.c                     |  20 +-
+ .../sm5502.h => drivers/extcon/extcon-sm5502.h     |   5 -
+ drivers/hv/channel.c                               |  56 +-
+ drivers/hv/channel_mgmt.c                          |  21 +-
+ drivers/hv/connection.c                            |  17 +-
+ drivers/hv/hv.c                                    |  27 +-
+ drivers/hv/hyperv_vmbus.h                          |   4 +
+ drivers/hv/ring_buffer.c                           |   5 +
+ drivers/ipack/carriers/tpci200.c                   |   3 +-
+ drivers/ipack/devices/ipoctal.c                    |  69 +-
+ drivers/ipack/devices/ipoctal.h                    |   2 +-
+ drivers/ipack/ipack.c                              |   4 +-
+ drivers/misc/eeprom/eeprom.c                       |  23 +-
+ drivers/misc/genwqe/card_base.c                    |  38 +-
+ drivers/misc/genwqe/card_base.h                    |  21 +-
+ drivers/misc/genwqe/card_ddcb.c                    |  77 ++-
+ drivers/misc/genwqe/card_ddcb.h                    |   2 +-
+ drivers/misc/genwqe/card_debugfs.c                 |  10 +-
+ drivers/misc/genwqe/card_dev.c                     |  21 +-
+ drivers/misc/genwqe/card_sysfs.c                   |  11 +-
+ drivers/misc/genwqe/card_utils.c                   |   7 +-
+ drivers/misc/genwqe/genwqe_driver.h                |   4 +-
+ drivers/misc/lattice-ecp3-config.c                 |   1 +
+ drivers/misc/mei/amthif.c                          | 167 +++--
+ drivers/misc/mei/bus.c                             |  25 +-
+ drivers/misc/mei/client.c                          | 237 ++++---
+ drivers/misc/mei/client.h                          |  17 +-
+ drivers/misc/mei/debugfs.c                         |  70 +-
+ drivers/misc/mei/hbm.c                             | 567 +++++++++-------
+ drivers/misc/mei/hbm.h                             |  17 +-
+ drivers/misc/mei/hw-me.c                           | 194 ++++--
+ drivers/misc/mei/hw-me.h                           |  32 +-
+ drivers/misc/mei/hw-txe.c                          | 252 ++++---
+ drivers/misc/mei/hw-txe.h                          |   6 +-
+ drivers/misc/mei/hw.h                              |  74 ++-
+ drivers/misc/mei/init.c                            | 107 +--
+ drivers/misc/mei/interrupt.c                       |  96 ++-
+ drivers/misc/mei/main.c                            | 143 ++--
+ drivers/misc/mei/mei_dev.h                         | 279 +++++---
+ drivers/misc/mei/nfc.c                             |  77 +--
+ drivers/misc/mei/pci-me.c                          |  14 +-
+ drivers/misc/mei/pci-txe.c                         |  13 +-
+ drivers/misc/mei/wd.c                              |  59 +-
+ drivers/misc/spear13xx_pcie_gadget.c               |  98 +--
+ drivers/misc/vmw_vmci/vmci_datagram.c              |   3 +-
+ drivers/parport/parport_pc.c                       |  54 +-
+ include/linux/extcon/extcon-gpio.h                 |   4 +-
+ include/linux/ipack.h                              |  24 +-
+ include/linux/mei_cl_bus.h                         |   1 +
+ include/uapi/linux/genwqe/genwqe_card.h            |   2 +-
+ include/uapi/linux/hyperv.h                        |   2 +-
+ 61 files changed, 2788 insertions(+), 1338 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/extcon/extcon-rt8973a.txt
+ create mode 100644 drivers/extcon/extcon-rt8973a.c
+ create mode 100644 drivers/extcon/extcon-rt8973a.h
+ rename include/linux/extcon/sm5502.h => drivers/extcon/extcon-sm5502.h (97%)
+Merging cgroup/for-next (55e8955e6eba Merge branch 'for-3.18' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup.c
+Auto-merging fs/proc/base.c
+Merge made by the 'recursive' strategy.
+ fs/proc/base.c         |  39 ++---------
+ include/linux/cgroup.h |  26 ++-----
+ include/linux/cpuset.h |   3 +-
+ kernel/cgroup.c        | 184 ++++++++++++++-----------------------------------
+ kernel/cpuset.c        |  15 +---
+ kernel/events/core.c   |   7 +-
+ mm/memory-failure.c    |   2 +-
+ 7 files changed, 71 insertions(+), 205 deletions(-)
+Merging scsi/for-next (510dc0e4a3fc Merge branch 'fixes' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/usb/storage/usb.c
+Auto-merging drivers/scsi/st.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/nsp32.c
+Auto-merging drivers/scsi/fnic/fnic_trace.c
+Auto-merging drivers/scsi/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |   41 +
+ Documentation/scsi/ChangeLog.megaraid_sas          |   14 +
+ drivers/message/fusion/mptbase.c                   |    8 +-
+ drivers/message/fusion/mptctl.c                    |    7 +-
+ drivers/message/fusion/mptspi.c                    |    5 +
+ drivers/scsi/Kconfig                               |   11 +
+ drivers/scsi/aacraid/linit.c                       |    1 +
+ drivers/scsi/arcmsr/arcmsr.h                       |  146 +-
+ drivers/scsi/arcmsr/arcmsr_attr.c                  |  120 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c                   | 2326 ++++++++++++------
+ drivers/scsi/be2iscsi/be.h                         |    2 +-
+ drivers/scsi/be2iscsi/be_cmds.c                    |   40 +-
+ drivers/scsi/be2iscsi/be_cmds.h                    |   24 +-
+ drivers/scsi/be2iscsi/be_iscsi.c                   |   31 +-
+ drivers/scsi/be2iscsi/be_iscsi.h                   |    2 +-
+ drivers/scsi/be2iscsi/be_main.c                    |   42 +-
+ drivers/scsi/be2iscsi/be_main.h                    |    8 +-
+ drivers/scsi/be2iscsi/be_mgmt.c                    |   15 +-
+ drivers/scsi/be2iscsi/be_mgmt.h                    |    2 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c                    |   15 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c                   |    3 +
+ drivers/scsi/csiostor/csio_hw.h                    |    2 +-
+ drivers/scsi/csiostor/csio_isr.c                   |   24 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    2 +-
+ drivers/scsi/cxgbi/libcxgbi.c                      |   59 +-
+ drivers/scsi/cxgbi/libcxgbi.h                      |    3 +
+ drivers/scsi/dpt_i2o.c                             |    1 +
+ drivers/scsi/eata.c                                |    9 -
+ drivers/scsi/fcoe/fcoe_transport.c                 |   39 +-
+ drivers/scsi/fnic/fnic.h                           |    2 +-
+ drivers/scsi/fnic/fnic_fcs.c                       |    5 +-
+ drivers/scsi/fnic/fnic_trace.c                     |    5 +-
+ drivers/scsi/hpsa.c                                |   70 +-
+ drivers/scsi/ipr.c                                 |   10 +
+ drivers/scsi/ipr.h                                 |    1 +
+ drivers/scsi/iscsi_tcp.c                           |   10 +-
+ drivers/scsi/libfc/fc_libfc.c                      |    4 +-
+ drivers/scsi/libiscsi.c                            |    1 +
+ drivers/scsi/lpfc/lpfc_attr.c                      |    2 +-
+ drivers/scsi/lpfc/lpfc_bsg.c                       |   20 +-
+ drivers/scsi/lpfc/lpfc_crtn.h                      |    1 -
+ drivers/scsi/lpfc/lpfc_ct.c                        |   14 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c                   |    4 +-
+ drivers/scsi/lpfc/lpfc_disc.h                      |    6 +-
+ drivers/scsi/lpfc/lpfc_els.c                       |   33 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c                   |   53 +-
+ drivers/scsi/lpfc/lpfc_init.c                      |  225 +-
+ drivers/scsi/lpfc/lpfc_mbox.c                      |    6 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c                 |    2 +
+ drivers/scsi/lpfc/lpfc_scsi.c                      |   34 +-
+ drivers/scsi/lpfc/lpfc_sli.c                       |  247 +-
+ drivers/scsi/lpfc/lpfc_sli.h                       |    1 +
+ drivers/scsi/lpfc/lpfc_sli4.h                      |   20 +-
+ drivers/scsi/lpfc/lpfc_version.h                   |    2 +-
+ drivers/scsi/megaraid/megaraid_sas.h               |  161 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c          | 1099 ++++++---
+ drivers/scsi/megaraid/megaraid_sas_fp.c            |  327 ++-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c        |  439 +++-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h        |  105 +-
+ drivers/scsi/mpt2sas/Kconfig                       |    2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2.h                    |   12 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h               |   29 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_init.h               |    8 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_ioc.h                |   74 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_raid.h               |    8 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_sas.h                |    2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_tool.h               |   44 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_type.h               |    2 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c                |  328 ++-
+ drivers/scsi/mpt2sas/mpt2sas_base.h                |   28 +-
+ drivers/scsi/mpt2sas/mpt2sas_config.c              |    2 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c                 |    2 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.h                 |    2 +-
+ drivers/scsi/mpt2sas/mpt2sas_debug.h               |    2 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c               |  197 +-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c           |    2 +-
+ drivers/scsi/mpt3sas/Kconfig                       |    2 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h                    |    8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h               |   18 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_init.h               |    8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h                |   64 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_raid.h               |    8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_sas.h                |    8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h               |   45 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_type.h               |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c                |  287 ++-
+ drivers/scsi/mpt3sas/mpt3sas_base.h                |   49 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c              |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c                 |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.h                 |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_debug.h               |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c               |   78 +-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c           |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c        |    2 +-
+ drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h        |    2 +-
+ drivers/scsi/nsp32.c                               |    2 +-
+ drivers/scsi/pm8001/pm8001_ctl.c                   |    4 +-
+ drivers/scsi/pm8001/pm8001_hwi.c                   |    8 +
+ drivers/scsi/pmcraid.c                             |   14 +-
+ drivers/scsi/qla2xxx/qla_attr.c                    |   16 +-
+ drivers/scsi/qla2xxx/qla_bsg.c                     |    2 +-
+ drivers/scsi/qla2xxx/qla_dbg.c                     |   34 +-
+ drivers/scsi/qla2xxx/qla_def.h                     |  191 +-
+ drivers/scsi/qla2xxx/qla_fw.h                      |    8 +-
+ drivers/scsi/qla2xxx/qla_gbl.h                     |    9 +-
+ drivers/scsi/qla2xxx/qla_gs.c                      |  943 ++++++-
+ drivers/scsi/qla2xxx/qla_init.c                    |   41 +-
+ drivers/scsi/qla2xxx/qla_inline.h                  |    8 +
+ drivers/scsi/qla2xxx/qla_iocb.c                    |   17 +-
+ drivers/scsi/qla2xxx/qla_isr.c                     |  133 +-
+ drivers/scsi/qla2xxx/qla_mbx.c                     |   43 +-
+ drivers/scsi/qla2xxx/qla_mid.c                     |    2 +
+ drivers/scsi/qla2xxx/qla_mr.c                      |   16 +-
+ drivers/scsi/qla2xxx/qla_nx.c                      |    8 +-
+ drivers/scsi/qla2xxx/qla_os.c                      |  132 +-
+ drivers/scsi/qla2xxx/qla_sup.c                     |    7 +-
+ drivers/scsi/qla2xxx/qla_target.c                  |  693 ++++--
+ drivers/scsi/qla2xxx/qla_target.h                  |   31 +
+ drivers/scsi/qla2xxx/qla_tmpl.c                    |  106 +-
+ drivers/scsi/qla2xxx/qla_tmpl.h                    |    8 +
+ drivers/scsi/qla2xxx/qla_version.h                 |    2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c                 |   45 +-
+ drivers/scsi/scsi.c                                |   12 +-
+ drivers/scsi/scsi_debug.c                          |  136 +-
+ drivers/scsi/scsi_error.c                          |   27 +-
+ drivers/scsi/scsi_lib.c                            |   24 +-
+ drivers/scsi/scsi_scan.c                           |   26 +
+ drivers/scsi/scsi_sysfs.c                          |   17 +-
+ drivers/scsi/sd.c                                  |    8 +-
+ drivers/scsi/sr.c                                  |    2 +
+ drivers/scsi/st.c                                  |    2 +
+ drivers/scsi/storvsc_drv.c                         |   12 -
+ drivers/scsi/ufs/Kconfig                           |    2 +
+ drivers/scsi/ufs/ufs.h                             |  132 +-
+ drivers/scsi/ufs/ufshcd-pci.c                      |   55 +-
+ drivers/scsi/ufs/ufshcd-pltfrm.c                   |  291 ++-
+ drivers/scsi/ufs/ufshcd.c                          | 2592 ++++++++++++++++++--
+ drivers/scsi/ufs/ufshcd.h                          |  280 ++-
+ drivers/scsi/ufs/ufshci.h                          |    9 +-
+ drivers/scsi/ufs/unipro.h                          |   56 +
+ drivers/usb/storage/usb.c                          |    8 +
+ include/scsi/scsi.h                                |    1 +
+ include/scsi/scsi_device.h                         |    1 +
+ include/scsi/scsi_host.h                           |    6 +-
+ 144 files changed, 10430 insertions(+), 3038 deletions(-)
+Merging target-updates/for-next (7f2ea21b2c8d target/user: Fix up smatch warnings in tcmu_netlink_event)
+$ git merge target-updates/for-next
+Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution.
+Auto-merging include/uapi/linux/Kbuild
+Auto-merging drivers/target/target_core_tpg.c
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging drivers/target/target_core_configfs.c
+Auto-merging drivers/target/iscsi/iscsi_target_util.c
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.h
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
+Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 681e54cea3d0] Merge remote-tracking branch 'target-updates/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/target/tcmu-design.txt         |  378 +++++++++
+ drivers/infiniband/ulp/isert/ib_isert.c      |   10 +-
+ drivers/infiniband/ulp/isert/ib_isert.h      |    2 +-
+ drivers/scsi/qla2xxx/qla_target.c            |   35 +-
+ drivers/scsi/qla2xxx/qla_target.h            |   12 +-
+ drivers/target/Kconfig                       |    5 +
+ drivers/target/Makefile                      |    1 +
+ drivers/target/iscsi/iscsi_target.c          |    6 +-
+ drivers/target/iscsi/iscsi_target_configfs.c |   10 +-
+ drivers/target/iscsi/iscsi_target_erl0.c     |    6 +-
+ drivers/target/iscsi/iscsi_target_login.c    |    8 +-
+ drivers/target/iscsi/iscsi_target_util.c     |    5 +-
+ drivers/target/loopback/tcm_loop.c           |    6 +-
+ drivers/target/target_core_alua.c            |   33 +-
+ drivers/target/target_core_configfs.c        |   22 +-
+ drivers/target/target_core_device.c          |   27 +-
+ drivers/target/target_core_fabric_configfs.c |   13 +-
+ drivers/target/target_core_fabric_lib.c      |    6 +-
+ drivers/target/target_core_file.c            |    4 +-
+ drivers/target/target_core_internal.h        |    5 +-
+ drivers/target/target_core_pr.c              |   92 +-
+ drivers/target/target_core_pscsi.c           |   16 +-
+ drivers/target/target_core_sbc.c             |    2 +-
+ drivers/target/target_core_tmr.c             |   24 +-
+ drivers/target/target_core_tpg.c             |   45 +-
+ drivers/target/target_core_transport.c       |   27 +-
+ drivers/target/target_core_ua.c              |   15 +-
+ drivers/target/target_core_ua.h              |    1 +
+ drivers/target/target_core_user.c            | 1166 ++++++++++++++++++++++++++
+ drivers/target/tcm_fc/tfc_sess.c             |    2 +-
+ drivers/uio/uio.c                            |   12 -
+ include/linux/uio_driver.h                   |   12 +-
+ include/target/target_core_base.h            |   14 +
+ include/uapi/linux/Kbuild                    |    1 +
+ include/uapi/linux/target_core_user.h        |  142 ++++
+ 35 files changed, 1867 insertions(+), 298 deletions(-)
+ create mode 100644 Documentation/target/tcmu-design.txt
+ create mode 100644 drivers/target/target_core_user.c
+ create mode 100644 include/uapi/linux/target_core_user.h
+$ git revert 7f2ea21b2c8d
+[master a8f91f683f7b] Revert "target/user: Fix up smatch warnings in tcmu_netlink_event"
+ 1 file changed, 10 insertions(+), 13 deletions(-)
+Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (2cdef8f4e1ac pinctrl: specify bindings for pins and groups)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/pinctrl-tegra-xusb.c
+Auto-merging drivers/pinctrl/pinctrl-rockchip.c
+Auto-merging drivers/pinctrl/pinctrl-at91.c
+Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-vf610.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-mxs.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx6sx.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx6sl.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx6q.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx6dl.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx53.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx51.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx50.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx35.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx28.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx27.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx25.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx23.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx1-core.c
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx.h
+Auto-merging drivers/pinctrl/freescale/pinctrl-imx.c
+Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt        |   22 +-
+ .../bindings/pinctrl/nvidia,tegra124-pinmux.txt    |   14 +-
+ .../bindings/pinctrl/pinctrl-bindings.txt          |   50 +-
+ .../bindings/pinctrl/qcom,apq8064-pinctrl.txt      |    2 +-
+ .../bindings/pinctrl/qcom,apq8084-pinctrl.txt      |  179 +++
+ .../bindings/pinctrl/rockchip,pinctrl.txt          |    6 +-
+ .../bindings/pinctrl/ti,omap-pinctrl.txt           |   13 +
+ Documentation/pinctrl.txt                          |   14 +-
+ arch/arm/mach-at91/include/mach/at91_pio.h         |    6 +
+ drivers/pinctrl/Kconfig                            |  103 +-
+ drivers/pinctrl/Makefile                           |   23 +-
+ drivers/pinctrl/berlin/berlin.c                    |   29 +-
+ drivers/pinctrl/freescale/Kconfig                  |  108 ++
+ drivers/pinctrl/freescale/Makefile                 |   19 +
+ drivers/pinctrl/{ => freescale}/pinctrl-imx.c      |   17 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx.h      |    7 +-
+ .../pinctrl/{ => freescale}/pinctrl-imx1-core.c    |    8 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx1.c     |    0
+ drivers/pinctrl/{ => freescale}/pinctrl-imx1.h     |    0
+ drivers/pinctrl/freescale/pinctrl-imx21.c          |  342 ++++++
+ drivers/pinctrl/{ => freescale}/pinctrl-imx23.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx25.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx27.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx28.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx35.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx50.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx51.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx53.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx6dl.c   |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx6q.c    |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx6sl.c   |    3 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-imx6sx.c   |    2 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-mxs.c      |    8 +-
+ drivers/pinctrl/{ => freescale}/pinctrl-mxs.h      |    0
+ drivers/pinctrl/{ => freescale}/pinctrl-vf610.c    |    2 +-
+ drivers/pinctrl/mvebu/pinctrl-mvebu.c              |    6 +-
+ drivers/pinctrl/nomadik/pinctrl-abx500.c           |   99 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c          |  142 +--
+ drivers/pinctrl/pinctrl-adi2.c                     |    7 +-
+ drivers/pinctrl/pinctrl-as3722.c                   |    4 +-
+ drivers/pinctrl/pinctrl-at91.c                     |  212 +++-
+ drivers/pinctrl/pinctrl-bcm281xx.c                 |    8 +-
+ drivers/pinctrl/pinctrl-bcm2835.c                  |    4 +-
+ drivers/pinctrl/pinctrl-lantiq.c                   |    8 +-
+ drivers/pinctrl/pinctrl-palmas.c                   |    5 +-
+ drivers/pinctrl/pinctrl-rockchip.c                 |    6 +-
+ drivers/pinctrl/pinctrl-single.c                   |   18 +-
+ drivers/pinctrl/pinctrl-st.c                       |    7 +-
+ drivers/pinctrl/pinctrl-tb10x.c                    |    4 +-
+ drivers/pinctrl/pinctrl-tegra-xusb.c               |    8 +-
+ drivers/pinctrl/pinctrl-tegra.c                    |    7 +-
+ drivers/pinctrl/pinctrl-tegra114.c                 |    2 +-
+ drivers/pinctrl/pinctrl-tegra124.c                 |   69 +-
+ drivers/pinctrl/pinctrl-tegra20.c                  |    2 +-
+ drivers/pinctrl/pinctrl-tegra30.c                  |    2 +-
+ drivers/pinctrl/pinctrl-tz1090-pdc.c               |    7 +-
+ drivers/pinctrl/pinctrl-tz1090.c                   |    6 +-
+ drivers/pinctrl/pinctrl-u300.c                     |    6 +-
+ drivers/pinctrl/pinctrl-xway.c                     |    2 +
+ drivers/pinctrl/pinmux.c                           |   10 +-
+ drivers/pinctrl/qcom/Kconfig                       |    8 +
+ drivers/pinctrl/qcom/Makefile                      |    1 +
+ drivers/pinctrl/qcom/pinctrl-apq8064.c             |    9 +-
+ drivers/pinctrl/qcom/pinctrl-apq8084.c             | 1245 ++++++++++++++++++++
+ drivers/pinctrl/qcom/pinctrl-ipq8064.c             |    2 +
+ drivers/pinctrl/qcom/pinctrl-msm.c                 |   49 +-
+ drivers/pinctrl/qcom/pinctrl-msm.h                 |    3 +
+ drivers/pinctrl/qcom/pinctrl-msm8960.c             |    2 +
+ drivers/pinctrl/qcom/pinctrl-msm8x74.c             |    2 +
+ drivers/pinctrl/samsung/pinctrl-exynos5440.c       |    7 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c          |    7 +-
+ drivers/pinctrl/sh-pfc/core.c                      |   10 +-
+ drivers/pinctrl/sh-pfc/core.h                      |    1 -
+ drivers/pinctrl/sh-pfc/pfc-r8a73a4.c               |    4 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |    4 +-
+ drivers/pinctrl/sh-pfc/pfc-sh7372.c                |    4 +-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |   23 +-
+ drivers/pinctrl/sh-pfc/pinctrl.c                   |    6 +-
+ drivers/pinctrl/sh-pfc/sh_pfc.h                    |    1 -
+ drivers/pinctrl/sirf/pinctrl-atlas6.c              |  129 +-
+ drivers/pinctrl/sirf/pinctrl-prima2.c              |  173 ++-
+ drivers/pinctrl/sirf/pinctrl-sirf.c                |   72 +-
+ drivers/pinctrl/spear/pinctrl-spear.c              |    4 +-
+ drivers/pinctrl/spear/pinctrl-spear1310.c          |    2 +-
+ drivers/pinctrl/spear/pinctrl-spear1340.c          |    2 +-
+ drivers/pinctrl/spear/pinctrl-spear300.c           |    2 +-
+ drivers/pinctrl/spear/pinctrl-spear310.c           |    2 +-
+ drivers/pinctrl/spear/pinctrl-spear320.c           |    2 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c              |    8 +-
+ drivers/pinctrl/vt8500/pinctrl-wmt.c               |    8 +-
+ include/dt-bindings/pinctrl/at91.h                 |    5 +
+ include/dt-bindings/pinctrl/rockchip.h             |    2 +
+ include/linux/pinctrl/pinconf-generic.h            |    2 +-
+ include/linux/pinctrl/pinmux.h                     |    7 +-
+ 94 files changed, 2841 insertions(+), 615 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
+ create mode 100644 drivers/pinctrl/freescale/Kconfig
+ create mode 100644 drivers/pinctrl/freescale/Makefile
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx.c (97%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx.h (96%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx1-core.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx1.c (100%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx1.h (100%)
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx21.c
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx23.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx25.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx27.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx28.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx35.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx50.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx51.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx53.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx6dl.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx6q.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx6sl.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-imx6sx.c (99%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-mxs.c (98%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-mxs.h (100%)
+ rename drivers/pinctrl/{ => freescale}/pinctrl-vf610.c (99%)
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-apq8084.c
+Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
+$ git merge vhost/linux-next
+Resolved 'drivers/vhost/net.c' using previous resolution.
+Auto-merging drivers/vhost/net.c
+CONFLICT (content): Merge conflict in drivers/vhost/net.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eed80dbd023f] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (a092e19b688b gpio: pch: Build context save/restore only for PM)
+$ git merge gpio/for-next
+Resolved 'drivers/gpio/gpiolib.c' using previous resolution.
+Resolved 'drivers/pinctrl/qcom/pinctrl-msm.c' using previous resolution.
+Auto-merging include/linux/gpio/driver.h
+Auto-merging drivers/staging/vme/devices/vme_pio2_gpio.c
+Auto-merging drivers/pinctrl/sirf/pinctrl-sirf.c
+Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c
+Auto-merging drivers/pinctrl/samsung/pinctrl-exynos5440.c
+Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/qcom/pinctrl-msm.c
+Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/mfd/sm501.c
+Auto-merging drivers/mfd/htc-i2cpld.c
+Auto-merging drivers/media/dvb-frontends/cxd2820r_core.c
+Auto-merging drivers/gpio/gpiolib.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpiolib-acpi.c
+Auto-merging drivers/bcma/driver_gpio.c
+Auto-merging arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 849e0c838539] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-dsp-keystone.txt |  39 ++
+ .../devicetree/bindings/gpio/gpio-pca953x.txt      |  39 ++
+ .../devicetree/bindings/gpio/gpio-xgene.txt        |  22 ++
+ .../devicetree/bindings/gpio/mrvl-gpio.txt         |  15 +-
+ Documentation/gpio/driver.txt                      |   6 +-
+ arch/arm/common/scoop.c                            |  10 +-
+ arch/mips/txx9/generic/setup.c                     |   4 +-
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c     |   3 +-
+ arch/sh/boards/mach-x3proto/gpio.c                 |   6 +-
+ drivers/bcma/driver_gpio.c                         |   3 +-
+ drivers/gpio/Kconfig                               |  14 +-
+ drivers/gpio/Makefile                              |   1 +
+ drivers/gpio/gpio-adnp.c                           | 155 +++-----
+ drivers/gpio/gpio-bcm-kona.c                       |   2 +-
+ drivers/gpio/gpio-crystalcove.c                    |  28 +-
+ drivers/gpio/gpio-cs5535.c                         |   9 +-
+ drivers/gpio/gpio-dwapb.c                          | 410 +++++++++++++++++----
+ drivers/gpio/gpio-ks8695.c                         |  30 +-
+ drivers/gpio/gpio-mcp23s08.c                       |  64 ++--
+ drivers/gpio/gpio-omap.c                           |  33 +-
+ drivers/gpio/gpio-pca953x.c                        |  54 +--
+ drivers/gpio/gpio-pch.c                            |   2 +
+ drivers/gpio/gpio-samsung.c                        |  50 ---
+ drivers/gpio/gpio-stmpe.c                          |  99 ++++-
+ drivers/gpio/gpio-stp-xway.c                       |   2 +-
+ drivers/gpio/gpio-syscon.c                         |  94 ++++-
+ drivers/gpio/gpio-tc3589x.c                        |   5 +
+ drivers/gpio/gpio-xgene.c                          | 244 ++++++++++++
+ drivers/gpio/gpio-xilinx.c                         |  27 +-
+ drivers/gpio/gpio-zynq.c                           |  89 +++--
+ drivers/gpio/gpiolib-acpi.c                        |  30 +-
+ drivers/gpio/gpiolib.c                             |  90 +++--
+ drivers/hid/hid-cp2112.c                           |   6 +-
+ drivers/input/keyboard/adp5588-keys.c              |   4 +-
+ drivers/input/keyboard/adp5589-keys.c              |   4 +-
+ drivers/input/touchscreen/ad7879.c                 |  10 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c        |  10 +-
+ drivers/mfd/asic3.c                                |   3 +-
+ drivers/mfd/htc-i2cpld.c                           |   8 +-
+ drivers/mfd/sm501.c                                |  17 +-
+ drivers/mfd/tc6393xb.c                             |  13 +-
+ drivers/mfd/ucb1x00-core.c                         |   8 +-
+ drivers/pinctrl/Kconfig                            |   2 +-
+ drivers/pinctrl/nomadik/pinctrl-abx500.c           |  16 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c          |   2 +-
+ drivers/pinctrl/qcom/pinctrl-msm.c                 |  10 +-
+ drivers/pinctrl/samsung/pinctrl-exynos5440.c       |   6 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c          |  15 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.c                |   3 +-
+ drivers/platform/x86/intel_pmic_gpio.c             |   3 +-
+ drivers/ssb/driver_gpio.c                          |   3 +-
+ drivers/staging/vme/devices/vme_pio2_gpio.c        |   4 +-
+ drivers/tty/serial/max310x.c                       |  10 +-
+ drivers/tty/serial/sc16is7xx.c                     |  13 +-
+ drivers/video/fbdev/via/via-gpio.c                 |  10 +-
+ include/asm-generic/gpio.h                         |   2 +-
+ include/linux/gpio/driver.h                        |   8 +-
+ include/linux/platform_data/gpio-dwapb.h           |  32 ++
+ include/linux/spi/mcp23s08.h                       |  18 +
+ 59 files changed, 1289 insertions(+), 630 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-dsp-keystone.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xgene.txt
+ create mode 100644 drivers/gpio/gpio-xgene.c
+ create mode 100644 include/linux/platform_data/gpio-dwapb.h
+Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging arch/s390/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/dma-mapping.h       | 16 ----------------
+ arch/s390/Kconfig