summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-09-05 19:21:42 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-09-05 19:21:42 +1000
commit0693c28cfc8e25f18c25b65a8942c026f1854a3c (patch)
tree1b42c3e2957232806f6a4ec89b66e33764bbc4db
parent3bb9fcccfbcb5ae317c720c9b06850cd0c62305d (diff)
downloadlinux-next-0693c28cfc8e25f18c25b65a8942c026f1854a3c.tar.gz
Add linux-next specific files for 20160905next-20160905
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s242
-rw-r--r--Next/Trees244
-rw-r--r--Next/merge.log8084
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 8575 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..2d8a498a0f68
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,242 @@
+Name SHA1
+---- ----
+origin c6935931c1894ff857616ff8549b61236a19148f
+fixes d3396e1e4ec4aa41ef563841e8ba511ae0589003
+kbuild-current d3e2773c4ede5c62d2a92dae20e3a09b1ca55b6e
+arc-current 3eab887a55424fc2c27553b7bfe32330df83f7b8
+arm-current da60626e7d02a4f385cae80e450afc8b07035368
+m68k-current 6bd80f372371a7b3f5ff13e4e8a560066299c001
+metag-fixes 97b1d23f7bcbee00a5b85bf2c022c612ea67429d
+powerpc-fixes 78a3e8889b4b6b99775ed954696ff3e017f5d19b
+sparc 4620a06e4b3c5d076feb9a42ab43dce77c385358
+net 6e1ce3c3451291142a57c4f3f6f999a29fb5b3bc
+ipsec 11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b
+netfilter c73c2484901139c28383b58eabcbf4d613e91518
+ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e
+wireless-drivers bb87f02b7e4ccdb614a83cbf840524de81e9b321
+mac80211 61aaa0e8c1c15d9e045f0577f046be50f2f571ab
+sound-current 6b1ca4bcadf9ef077cc5f03c6822ba276ed14902
+pci-current 6af7e4f77259ee946103387372cb159f2e99a6d4
+driver-core.current 17d0774f80681020eccc9638d925a23f1fc4f671
+tty.current c8d192428f52f244130b84650ad616df09f2b1e1
+usb.current 2c5575401e34de3d2fc90af1c95bc73435784093
+usb-gadget-fixes 6f8245b4e37c2072d3daea24e19dbc0162ffd22c
+usb-serial-fixes 40d9c32525cba79130612650b1abc47c0c0f19a8
+usb-chipidea-fixes c4e94174983a86c935be1537a73e496b778b0287
+staging.current eafe5cfe718926c1ed8b3dacd2191c189b3cdcd2
+char-misc.current ccdf3b888d87df1b914fedde91ed1848f0651c65
+input-current e3a888a4bff0bef0b256d55c58bc32c99fb44ece
+crypto-current 8b18e2359aff2ab810aba84cebffc9da07fef78f
+ide 797cee982eef9195736afc5e7f3b8f613c41d19a
+rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e
+vfio-fixes c8952a707556e04374d7b2fdb3a079d63ddf6f2f
+kselftest-fixes 29b4817d4018df78086157ea3a55c1d9424a7cfc
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26
+drm-intel-fixes 8a07fed44b126f48020f122b9e6bf05d8c48f281
+asm-generic b0da6d44157aa6e652de7634343708251ba64146
+arc f88c04c0f9b31dada354d25679b08065ffc43126
+arm 51b9a5bba0d4e90a1ac5ff86dd95f6f6a77aae89
+arm-perf 694d0d0bb2030d2e36df73e2d23d5770511dbc8d
+arm-soc 58118417d78886a2ad89954bc44990733f6fbbf5
+amlogic cbf216bf60bb131b8b258d6d6c704a8c44451885
+at91 0f59c948faed3715331c2648b46d6d0033d86f5c
+bcm2835 9336be5db24db7d1f55d57a8baf47032c2b18f8a
+berlin d433580f3b4ef47f16f418a9723c22a78680f931
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs aec3f02e6aa5ade4882fba54e49077552b3c251d
+keystone fb2a68db621a3710307363809b3d5929beed372f
+mvebu 23e115d66f985c2b8248157ac46783840c0639d8
+omap 91dda79fa02ce3e124af9822a438333f8d7ef604
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+qcom 4feeec0c6e6daf601e250d7e1cf2ac210730d8cc
+renesas 2593eca070b72dda27d34da07089478a21d0b3fd
+rockchip f6ac35a7b1cf9f943f41d7b54a45206abdc6cf90
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 1a695a905c18548062509178b98bc91e67510864
+samsung-krzk 9c2c94f84659d2274876e4c6db61fa6f869d7b08
+tegra 74e8115883f585eb6607e4dec9241f7b2cdab018
+arm64 a9be2ee09385387819ca22bf6522b2437334489e
+blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33
+c6x ca3060d39ae7a0964f8c123a4833029981e86476
+cris f9f3f864b5e8c09d7837d8980edba4ad52969819
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 986d80466712c0e8878c05328b5b5e7775c53003
+m68knommu bab9058f2048514bb8db75712a9aca3833f92bb8
+metag f5d163aad31e4ec30f7258e655503824a2b03d45
+microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa
+mips 82440d0d030d8c47ce44579a1bf61a26d28409f2
+nios2 65f836ae4de018092ba0f443a8da799fb467d660
+parisc-hd 523d939ef98fd712632d93a5a2b588e477a7565e
+powerpc 29b4817d4018df78086157ea3a55c1d9424a7cfc
+fsl 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 f5b55fa1f81d518925d68b50d2316850c525d1ad
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+sh e61c10e468a42512f5fad74c00b62af5cc19f65f
+tile 87d7993103fc7f3e51e1a586e89f0cd297ace975
+uml dad2232844073295c64e9cc2d734a0ade043e0f6
+unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22
+xtensa 9e8511ff7e3f18df7d202da06c9704d940fa68f9
+befs 58d08821eaa76ab54bab2da1808d0947980364f6
+btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave 79354fc603184885b50cf935b8b2085c2b3e0535
+ceph c0de9f5143b5fe9a9eefb808cbf9b9fbc8cfbe41
+cifs 8e1e83d236068525bf8416c336162056c512eced
+configfs 3dc3afadeb0403fd967b97ee282ab9053d36da2b
+ecryptfs 2bdcdbea80bd161467f1dc32b09ccc67ddeefdc0
+ext3 3cd0126dca82ecba8b2a6bf5aca91454da0a0776
+ext4 8913f343cdb568222c95afe3cad78aee1a4df56b
+f2fs 908b1928d64575b9666878deca7177955bf1697e
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 7244b9538994bdb60e94232677cbd78e135ebb11
+gfs2 23e5671a79be00b2f1c895aa93ff40fb75a4647e
+jfs 7cfcd8b79ab2472102d9229863e86ff208f959d4
+nfs 86a1679860babbacd61fc1e8c0c0f43641d5860d
+nfsd e2ce4e03e317a5ae432c3a82ad4fd912a6cfa5d2
+orangefs a21aae3bb15a1d08040bdcf5a73504c0da9f5080
+overlayfs 39345f37f131ec2750374a8d67f8bb9c55fe4a1e
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 17ce1eb0b64eb27d4f9180daae7495fa022c7b0d
+xfs ea78d80866ce375defb2fdd1c8a3aafec95e0f85
+file-locks d67fd44f697dff293d7cdc29af929241b669affe
+vfs-miklos d55af8a321bea4c084d43e3004ce4aa2eafe7e08
+vfs 3baf32898e1c88792fa7cadc88f601833bdae3da
+pci 503104ad2dc479902f61dfb94e38165d11b68243
+pstore e976e56423dc1cc01686861fc3e0c6c0ec8cd8b7
+hid ec3727c27e6be2b2071f40acd9c50dc74d588af8
+i2c d213a2198556b3188ea924bc9d5326e27af7c95e
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi 0deb6b2c087a9303386143963a6e6ce2bef08f04
+hwmon-staging 88c00316e51fd69ea8d78082a2662a8b018cfa75
+v4l-dvb b6aa39228966e0d3f0bc3306be1892f87792903a
+pm 05eb53caa024cb2271da1573b2318b8cf02b12a5
+idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca
+thermal 33f27e0f4801c450eff8a390484ef7c49ef89094
+thermal-soc 9a1d2bd3e7fd393b209cb8d66e24c04dca2d2ab4
+ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac
+dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9
+swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df
+slave-dma 7b6dd59ab93f2ca34a7b31474ff1521bc2d19cc8
+net-next 6f2a80276364f24734eb6b6d0fe1798598aeab90
+ipsec-next 35db57bbc4b7ab810bba6e6d6954a0faf5a842cf
+netfilter-next 779994fa3636d46848edb402fe7517968e036e6f
+ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421
+wireless-drivers-next 5856cd5b8dda5ee013a2b0abbab0552a6f14d72d
+bluetooth 4e9a68b81aeb26d745683c78a7cf1f79fdab2521
+mac80211-next abc3750c31320f36e230f88b235a90e0a35f7032
+rdma 64278fe89b729dddb8dbe5ea52220685f6103d1b
+rdma-leon 29b4817d4018df78086157ea3a55c1d9424a7cfc
+rdma-leon-test 694d0d0bb2030d2e36df73e2d23d5770511dbc8d
+mtd a93295a7e118b5c58391906e47183775b1eb7cb1
+l2-mtd a93295a7e118b5c58391906e47183775b1eb7cb1
+nand 13683057ec73c404ef7fba5032e71dfd1cc35d5c
+crypto 10faa8c0d6c3b22466f97713a9533824a2ea1c57
+drm 2b2fd56d7e92f134ecaae5c89e20f64dd0f95aa2
+drm-panel a42f6e3f8f0351abe91a97108e33083e6cfafc34
+drm-intel 4bb05040fd685c549e6550f09daffee6cde4c370
+drm-tegra 08ee01789eebf433c27e8b3eecc3ddbb5f7c4d51
+drm-misc 75ac49532a3cd44f2b22d88bab888ae92c411650
+drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb
+drm-msm 0a677125d0ff726ed3d75ab311cf54674bf512bc
+hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e
+mali-dp 59ba2422b4308b02438506d35d5042df5d42c249
+sunxi 1ed343e25f1096f451a81ab64a79ba49f2548c57
+kbuild 5c6f3225d00d06b2ca91c74644a7bfcfe826a935
+kspp 09dd109d8241cd570391d4488337b77a4525f24e
+kconfig 5bcba792bb304e8341217d759ec486969a3b4258
+regmap faa52daec60c170287989898327962308e5e702a
+sound 8c91d7d09e3cd52d5d409ba05e8eb9be0f6a2349
+sound-asoc efb915056f6ac6060994e0e3628945db30064525
+modules 49aadcf1b6f4240751921dad52e86c760d70a5f1
+input 694641616448a9c5b30b3a5e5f51da73cb3a0016
+block 99e6b87ec2102b10e190c92ea9560bafcb744f86
+lightnvm 191d684c5d4f478dcd225ea424b1a3e09f06ace2
+device-mapper edd1ea2a8a2549e4fe58e817d539445729491ecf
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc-uh 521676f0c083956fe5365b81d8a640b854c17334
+md 3fc30f2efaf920fdc0d42b6159a256fa61fd769a
+mfd c1b0a7e8a6a7c7414c33398b44e9664ba86d1348
+backlight 602553073892c18f723f8aa090153a23b1312a16
+battery 3b5dd3a49496220b35af83c96e3d2ff5716550ae
+omap_dss2 ee65e18206f5b430d71c39f72fa85a8d1f2b999d
+regulator 1d3bdb9956ec2f8327715af62d7873466aace350
+security 8ccc7d6bad84bebf1f1a6364d1fa04d3d7b575f6
+integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a
+keys ed51e44e914c634bfd8435037474ebb0b47db956
+selinux 7c686af071ade663d0995aa30b262495a6c68c88
+tpmdd a307518add9482ca71a4edd422d515f5f7144021
+watchdog 29b4817d4018df78086157ea3a55c1d9424a7cfc
+iommu 35ee9598972edfbf6e75206283be67fcba4ebbd4
+dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108
+vfio 8138dabbab269d9d6ba2ffa17aad03aff22cfdb6
+jc_docs 87171fb72995577c43ea932ff277c2151648da47
+trivial 34df117414d73cb56d128bf7016a4c151f95c313
+audit fa2bea2f5cca5b8d4a3e5520d2e8c0ede67ac108
+devicetree 5839783247f416901ea4571882cb81f8354c9d2a
+mailbox 5e608a027082ae426e100a582031e0ff40becc83
+spi bf816ffec593ce6051905a776524f64269be2ae6
+tip d6fac1a010071f7802b66c5d93d2925739fa19f9
+clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6
+edac 12f0721c5a70408e86257c5c99605cf743cd44c6
+edac-amd c91d907596cc44e8206b707e6be80f5489db4f40
+irqchip 0d91b806499a69d18d6aa4c995f2e51951793029
+ftrace 78aebca2c955c1c5aeb48e12645e13fe3c3461f2
+rcu f8e66fbaed0187803cfb9b492b6ee44ce7fca9a2
+kvm 694d0d0bb2030d2e36df73e2d23d5770511dbc8d
+kvm-arm 29b4817d4018df78086157ea3a55c1d9424a7cfc
+kvm-ppc c63517c2e3810071359af926f621c1f784388c3f
+kvm-ppc-paulus 4b3d173d0440d37534906b6d93c02dfb577c68ce
+kvms390 e845d24016c113f863e7232eb9c46df9b18fca74
+xen-tip d34c30cc1fa80f509500ff192ea6bc7d30671061
+percpu a67823c1ed1092160da94c31e6da5aeb35dca81c
+workqueues e4e98c460ad38c78498622a164fd5ef09a2dc9cb
+drivers-x86 fa1bc2a09f5f6c83eeb49686911565d9630ef054
+chrome-platform 31b764171cb545cc1f750c573eef713329936660
+hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
+leds 1f70cb4045cba47287fed3ba98dadc7187f13ef8
+ipmi 92cad0931b08226e71110380304ad28e12547dcb
+driver-core 2c507e464f791327c94d17a0137f00b4717744fc
+tty d2f5a7311bcaed681a41cb3419b8fe92a7b68bf5
+usb 3112fdde68fa4a3b0b3a3a738f9f32b4d62fdf05
+usb-gadget 15e4292a2d21e9997fdb2b8c014cc461b3f268f0
+usb-serial 61fc51366b395f1441c7cd3615fb18837a4fa2f8
+usb-chipidea-next 1d9aabecde2929c3e68661a1a6bf52a594c37bea
+staging aa652b1ccbd0d3a9cd4ecdec6d36935f78c838da
+char-misc 02baff325462cc7e81241b21959c5e62e7ca575e
+extcon 160a746f52055ee0f66f86f2828f8cf3c2ba1fa9
+cgroup 667430ec48e410070ae7074a893202fad3feec2d
+scsi 5b7dc017ee31d6f65600ec4063c351d1e4635171
+target-updates 291e3e51a34d2f546608bfd31f185151621135b7
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+libata 3e634d2984c4b3014f6ea9f695778b8c8e1b695f
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+pinctrl 4bd0641c2d73c48a9dc86e3c7c315cb75b6dd6ba
+vhost a77ec83a57890240c546df00ca5df1cdeedb1cc3
+remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e
+rpmsg f6ed8014183307586fae61b58abf7f7437e27f90
+gpio 0926ebf30f55bcf65e78fb7dc75f9d1ad4d6779c
+dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754
+pwm 53de7c26ded7f5e954bfc202dffc43c0dd165337
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns aeaa4a79ff6a5ed912b7362f206cf8576fca538b
+ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+clk e918a18d2eb36abb05614ccc866c82f6c3bfd666
+random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613
+aio b562e44f507e863c6792946e4e1b1449fbbac85d
+kselftest 29b4817d4018df78086157ea3a55c1d9424a7cfc
+y2038 549eb7b22e245064dcdc17380538718492f4ca9c
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d
+livepatching 2992ef29ae01af998399d55ed7c692a2505fb8af
+coresight 67c52cac0c2427af61590c1dbb993457574be00f
+rtc 34c7b3ac4ccb6a972f81a4102c8ef216ca1fb155
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm d8d378fa1a0c98ecb50ca52c9bf3bc14e25aa2d2
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+akpm-current c9e6ea80baf2d5ad9cff797112bc47deea73404e
+akpm f94dd2b6ac4f21b04e7f67747eb1a6493d32f76c
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..9d93089cb594
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,244 @@
+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://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+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
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-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://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next
+bcm2835 git git://github.com/anholt/linux.git#for-next
+berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next
+cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mvebu git git://git.infradead.org/linux-mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+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://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next
+h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next
+hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next
+ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next
+nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next
+mpc5xxx git git://git.denx.de/linux-denx-agust.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+sh git git://git.libc.org/linux-sh#for-next
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+unicore32 git git://github.com/gxt/linux.git#unicore32
+xtensa git git://github.com/czankel/xtensa-linux.git#for_next
+befs git git://github.com/luisbg/linux-befs.git#for-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next
+fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next
+v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next
+file-locks git git://git.samba.org/jlayton/linux.git#linux-next
+vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
+dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next
+rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next
+rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next
+mtd git git://git.infradead.org/mtd-2.6.git#master
+l2-mtd git git://git.infradead.org/l2-mtd.git#master
+nand git git://github.com/linux-nand/linux.git#nand/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://people.freedesktop.org/~airlied/linux.git#drm-next
+drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next
+drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc
+drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next
+drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next
+hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd
+mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next
+md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+selinux git git://git.infradead.org/users/pcmoore/selinux#next
+tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+vfio git git://github.com/awilliam/linux-vfio.git#next
+jc_docs git git://git.lwn.net/linux.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/pcmoore/audit#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next
+kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next
+ipmi git git://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
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-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
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-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
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next
+binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next
+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://github.com/andersson/remoteproc.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
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+aio git git://git.kvack.org/~bcrl/aio-next.git#master
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038
+luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next
+borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next
+coresight git git://git.linaro.org/kernel/coresight.git#next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc
+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 000000000000..bdc00c3d713c
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,8084 @@
+$ date -R
+Mon, 05 Sep 2016 10:37:34 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 4935e04ef431 Merge branch 'for-linus-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
+Merging origin/master (c6935931c189 Linux 4.8-rc5)
+$ git merge origin/master
+Updating 4935e04ef431..c6935931c189
+Fast-forward
+ .mailmap | 2 +
+ Documentation/ABI/stable/sysfs-devices | 2 +-
+ Documentation/PCI/MSI-HOWTO.txt | 24 +-
+ Documentation/PCI/pci.txt | 1 -
+ Documentation/arm64/silicon-errata.txt | 1 +
+ .../bindings/iio/adc/rockchip-saradc.txt | 7 +
+ Documentation/devicetree/bindings/serial/8250.txt | 19 --
+ .../devicetree/bindings/sound/omap-mcpdm.txt | 10 -
+ .../devicetree/bindings/thermal/thermal.txt | 10 +-
+ Documentation/filesystems/overlayfs.txt | 8 +-
+ Documentation/kernel-parameters.txt | 4 +
+ Documentation/networking/dsa/dsa.txt | 20 --
+ Documentation/powerpc/transactional_memory.txt | 2 +
+ Documentation/rapidio/mport_cdev.txt | 4 +
+ MAINTAINERS | 22 +-
+ Makefile | 2 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 2 +
+ arch/arm/boot/dts/rk3288.dtsi | 2 +
+ arch/arm/boot/dts/rk3xxx.dtsi | 2 +
+ arch/arm/kvm/mmu.c | 2 +-
+ arch/arm/mach-pxa/idp.c | 3 +-
+ arch/arm/mach-pxa/xcep.c | 3 +-
+ arch/arm/mach-realview/core.c | 3 +-
+ arch/arm/mach-sa1100/pleb.c | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +
+ arch/arm64/kernel/head.S | 3 +
+ arch/arm64/kvm/hyp/switch.c | 2 +-
+ arch/arm64/kvm/sys_regs.c | 10 +-
+ arch/arm64/mm/proc.S | 9 +
+ arch/blackfin/mach-bf561/boards/cm_bf561.c | 3 +-
+ arch/blackfin/mach-bf561/boards/ezkit.c | 3 +-
+ arch/mips/include/asm/page.h | 4 +-
+ arch/mips/kvm/mmu.c | 2 +-
+ arch/parisc/Kconfig | 1 -
+ arch/parisc/configs/c8000_defconfig | 1 -
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/parisc/include/asm/uaccess.h | 22 +-
+ arch/powerpc/include/asm/cputhreads.h | 1 +
+ arch/powerpc/include/asm/hmi.h | 2 +-
+ arch/powerpc/include/asm/paca.h | 12 +-
+ arch/powerpc/include/asm/pci-bridge.h | 1 +
+ arch/powerpc/kernel/Makefile | 2 +-
+ arch/powerpc/kernel/entry_64.S | 12 +-
+ arch/powerpc/kernel/exceptions-64s.S | 29 ++-
+ arch/powerpc/kernel/kprobes.c | 2 +-
+ arch/powerpc/kernel/pci-common.c | 36 +++
+ arch/powerpc/kernel/prom_init.c | 9 +-
+ arch/powerpc/kernel/signal_32.c | 14 ++
+ arch/powerpc/kernel/signal_64.c | 14 ++
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/traps.c | 3 +-
+ arch/powerpc/kvm/Makefile | 1 +
+ arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} | 0
+ arch/powerpc/mm/fault.c | 2 +-
+ arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 1 -
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 -
+ arch/powerpc/platforms/embedded6xx/holly.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-dump.c | 7 +-
+ arch/powerpc/platforms/powernv/opal-elog.c | 7 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 2 +-
+ arch/powerpc/platforms/pseries/pci.c | 4 +
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +-
+ arch/powerpc/sysdev/cpm1.c | 6 +-
+ arch/powerpc/sysdev/cpm_common.c | 3 +-
+ arch/powerpc/sysdev/fsl_rio.c | 2 +-
+ arch/s390/Kconfig | 1 -
+ arch/s390/configs/default_defconfig | 1 -
+ arch/s390/configs/gcov_defconfig | 1 -
+ arch/s390/configs/performance_defconfig | 1 -
+ arch/s390/defconfig | 1 -
+ arch/s390/include/asm/uaccess.h | 19 +-
+ arch/s390/kernel/setup.c | 6 +-
+ arch/tile/Kconfig | 1 -
+ arch/tile/include/asm/uaccess.h | 22 +-
+ arch/x86/Kconfig | 1 -
+ arch/x86/configs/tiny.config | 2 +
+ arch/x86/include/asm/uaccess.h | 69 +-----
+ arch/x86/kernel/apic/apic.c | 3 +
+ arch/x86/kernel/cpu/amd.c | 12 +
+ arch/x86/kernel/paravirt.c | 4 +-
+ arch/x86/kvm/vmx.c | 136 ++++++-----
+ arch/x86/mm/kaslr.c | 2 +-
+ arch/x86/pci/vmd.c | 10 +-
+ block/bio.c | 21 +-
+ block/blk-core.c | 4 +-
+ block/blk-merge.c | 55 +++--
+ block/blk-mq.c | 60 ++---
+ block/elevator.c | 2 +-
+ drivers/acpi/scan.c | 6 +-
+ drivers/ata/libahci.c | 2 +-
+ drivers/ata/pata_ninja32.c | 2 +-
+ drivers/base/power/runtime.c | 10 +-
+ drivers/block/floppy.c | 27 +--
+ drivers/block/xen-blkfront.c | 97 ++++----
+ drivers/char/hw_random/Kconfig | 2 +-
+ drivers/char/tpm/tpm2-cmd.c | 3 +-
+ drivers/clk/renesas/r8a7795-cpg-mssr.c | 9 +-
+ drivers/clk/rockchip/clk-rk3399.c | 11 +-
+ drivers/clk/sunxi-ng/ccu_common.c | 2 +-
+ drivers/clk/tegra/clk-tegra114.c | 4 +-
+ drivers/clocksource/pxa_timer.c | 2 +
+ drivers/clocksource/sun4i_timer.c | 9 +-
+ drivers/clocksource/time-pistachio.c | 8 +-
+ drivers/clocksource/timer-atmel-pit.c | 7 +
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +
+ drivers/crypto/qat/qat_common/qat_algs.c | 4 +-
+ drivers/crypto/vmx/aes_xts.c | 2 +-
+ drivers/dax/pmem.c | 3 +
+ drivers/dma/at_xdmac.c | 4 +-
+ drivers/dma/fsl_raid.c | 1 +
+ drivers/dma/img-mdc-dma.c | 4 +-
+ drivers/dma/pxa_dma.c | 11 +-
+ drivers/dma/sh/usb-dmac.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 +-
+ drivers/gpu/drm/drm_atomic.c | 6 +-
+ drivers/gpu/drm/drm_crtc.c | 3 +
+ drivers/gpu/drm/i915/i915_drv.h | 13 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 +-
+ drivers/gpu/drm/i915/i915_reg.h | 13 +
+ drivers/gpu/drm/i915/intel_csr.c | 8 +-
+ drivers/gpu/drm/i915/intel_display.c | 11 +
+ drivers/gpu/drm/i915/intel_drv.h | 3 +
+ drivers/gpu/drm/i915/intel_pm.c | 270 ++++++++++++++++++++-
+ drivers/gpu/drm/imx/imx-drm-core.c | 26 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 4 +
+ drivers/gpu/drm/imx/ipuv3-plane.c | 21 +-
+ drivers/gpu/drm/msm/msm_drv.h | 6 +
+ drivers/gpu/drm/msm/msm_gem.c | 9 +
+ drivers/gpu/drm/msm/msm_gem_submit.c | 30 ++-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 11 +
+ drivers/gpu/drm/qxl/qxl_fb.c | 4 +
+ drivers/gpu/drm/radeon/atombios_crtc.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-
+ drivers/gpu/drm/tegra/dsi.c | 43 +++-
+ drivers/gpu/drm/udl/udl_fb.c | 4 +
+ drivers/gpu/drm/vc4/vc4_drv.c | 6 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 9 +
+ drivers/gpu/drm/vc4/vc4_gem.c | 18 +-
+ drivers/gpu/drm/vc4/vc4_irq.c | 4 +-
+ drivers/gpu/host1x/mipi.c | 63 +++--
+ drivers/hwmon/it87.c | 1 +
+ drivers/iio/accel/Kconfig | 5 +-
+ drivers/iio/accel/bma220_spi.c | 2 +-
+ drivers/iio/accel/kxsd9.c | 1 +
+ drivers/iio/adc/Kconfig | 1 +
+ drivers/iio/adc/ad799x.c | 1 +
+ drivers/iio/adc/at91_adc.c | 4 +-
+ drivers/iio/adc/rockchip_saradc.c | 30 +++
+ drivers/iio/adc/ti-ads1015.c | 3 +-
+ drivers/iio/adc/ti_am335x_adc.c | 16 +-
+ drivers/iio/chemical/atlas-ph-sensor.c | 2 +-
+ drivers/iio/dac/stx104.c | 38 ++-
+ drivers/iio/humidity/Kconfig | 2 +
+ drivers/iio/humidity/am2315.c | 2 +-
+ drivers/iio/humidity/hdc100x.c | 27 +--
+ drivers/iio/industrialio-buffer.c | 23 +-
+ drivers/iio/light/Kconfig | 3 +-
+ drivers/iio/pressure/bmp280-core.c | 8 +-
+ drivers/iio/proximity/as3935.c | 2 +-
+ drivers/infiniband/core/cma.c | 18 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 6 +-
+ drivers/infiniband/hw/cxgb4/cq.c | 10 +-
+ drivers/infiniband/hw/cxgb4/t4.h | 5 +
+ drivers/infiniband/hw/hfi1/affinity.c | 21 +-
+ drivers/infiniband/hw/hfi1/debugfs.c | 14 +-
+ drivers/infiniband/hw/hfi1/driver.c | 11 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 4 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 20 +-
+ drivers/infiniband/hw/hfi1/init.c | 2 +-
+ drivers/infiniband/hw/hfi1/mad.c | 14 +-
+ drivers/infiniband/hw/hfi1/qp.c | 4 -
+ drivers/infiniband/hw/hfi1/qsfp.c | 32 ++-
+ drivers/infiniband/hw/hfi1/qsfp.h | 3 +
+ drivers/infiniband/hw/i40iw/i40iw.h | 4 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 26 +-
+ drivers/infiniband/hw/i40iw/i40iw_main.c | 4 +
+ drivers/infiniband/hw/i40iw/i40iw_utils.c | 5 +-
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 4 +-
+ drivers/infiniband/hw/mlx4/cq.c | 20 +-
+ drivers/infiniband/hw/mlx5/main.c | 1 -
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 14 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 12 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +-
+ drivers/infiniband/hw/qib/qib_debugfs.c | 12 +-
+ drivers/infiniband/hw/qib/qib_fs.c | 26 +-
+ drivers/infiniband/hw/qib/qib_qp.c | 4 -
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 3 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 3 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 2 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 9 +-
+ drivers/input/keyboard/tegra-kbc.c | 2 +-
+ drivers/input/rmi4/rmi_driver.c | 3 +-
+ drivers/input/serio/i8042.c | 1 +
+ drivers/input/touchscreen/ads7846.c | 1 -
+ drivers/input/touchscreen/silead.c | 2 +-
+ drivers/iommu/arm-smmu-v3.c | 7 +-
+ drivers/iommu/arm-smmu.c | 34 +--
+ drivers/iommu/io-pgtable-arm-v7s.c | 4 +-
+ drivers/irqchip/irq-gic-v3-its.c | 7 +-
+ drivers/irqchip/irq-gic-v3.c | 11 +-
+ drivers/irqchip/irq-gic.c | 7 +
+ drivers/irqchip/irq-mips-gic.c | 18 +-
+ drivers/macintosh/ams/ams-i2c.c | 1 -
+ drivers/macintosh/windfarm_pm112.c | 1 -
+ drivers/macintosh/windfarm_pm72.c | 1 -
+ drivers/macintosh/windfarm_rm31.c | 1 -
+ drivers/md/bcache/super.c | 14 +-
+ drivers/md/bitmap.c | 47 ++--
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-crypt.c | 9 +-
+ drivers/md/dm-flakey.c | 27 ++-
+ drivers/md/dm-log-writes.c | 10 +-
+ drivers/md/dm-log.c | 11 +-
+ drivers/md/md-cluster.c | 12 +-
+ drivers/md/md.c | 28 ++-
+ drivers/md/raid10.c | 13 +-
+ drivers/md/raid5.c | 64 +++--
+ drivers/misc/Kconfig | 10 -
+ drivers/misc/Makefile | 1 -
+ drivers/misc/bh1780gli.c | 259 --------------------
+ drivers/misc/cxl/vphb.c | 10 +-
+ drivers/misc/lkdtm_rodata.c | 2 +-
+ drivers/misc/mei/hw-me.c | 10 +-
+ drivers/misc/mei/pci-me.c | 4 +-
+ drivers/mmc/card/block.c | 5 +-
+ drivers/mmc/card/queue.c | 7 +-
+ drivers/mmc/card/queue.h | 4 +-
+ drivers/net/dsa/bcm_sf2.h | 2 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 8 +-
+ drivers/net/ethernet/atheros/alx/main.c | 2 +
+ drivers/net/ethernet/atheros/alx/reg.h | 1 +
+ drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nic_reg.h | 1 -
+ .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +-
+ drivers/net/ethernet/freescale/gianfar.c | 20 +-
+ drivers/net/ethernet/freescale/gianfar.h | 3 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 3 +-
+ drivers/net/ethernet/intel/i40e/i40e_client.c | 41 +++-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 1 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 85 ++++---
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 21 +-
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 21 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 93 ++++++-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 112 ++++-----
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 41 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 4 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 68 +++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 16 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 1 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 26 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 59 +++--
+ drivers/net/ethernet/mellanox/mlxsw/port.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 43 +++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 12 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 20 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 11 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 5 +-
+ drivers/net/ethernet/realtek/8139cp.c | 2 +-
+ drivers/net/ethernet/sfc/ef10.c | 3 +-
+ drivers/net/ethernet/smsc/smc91x.c | 7 +
+ drivers/net/ethernet/smsc/smc91x.h | 65 +++--
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 17 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 8 +-
+ drivers/net/phy/micrel.c | 2 +-
+ drivers/net/phy/phy.c | 6 +-
+ drivers/net/team/team_mode_loadbalance.c | 15 ++
+ drivers/net/tun.c | 6 +-
+ drivers/net/usb/kaweth.c | 10 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 4 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
+ drivers/nvme/host/Kconfig | 2 +-
+ drivers/nvme/host/core.c | 11 +-
+ drivers/nvme/host/fabrics.c | 23 +-
+ drivers/nvme/host/fabrics.h | 2 +-
+ drivers/nvme/host/rdma.c | 46 ++--
+ drivers/nvme/target/Kconfig | 2 +-
+ drivers/nvme/target/loop.c | 4 +-
+ drivers/nvme/target/rdma.c | 7 +-
+ drivers/pci/host-bridge.c | 1 +
+ drivers/pci/msi.c | 18 +-
+ drivers/pci/quirks.c | 7 +-
+ drivers/perf/arm_pmu.c | 3 +-
+ drivers/phy/phy-brcm-sata.c | 2 +-
+ drivers/phy/phy-sun4i-usb.c | 68 ++++--
+ drivers/phy/phy-sun9i-usb.c | 4 +-
+ drivers/platform/olpc/olpc-ec.c | 8 +-
+ drivers/platform/x86/intel_pmic_gpio.c | 8 +-
+ drivers/rapidio/devices/tsi721.c | 2 +-
+ drivers/scsi/wd719x.c | 2 +-
+ drivers/staging/comedi/drivers/adv_pci1760.c | 1 +
+ drivers/staging/comedi/drivers/comedi_test.c | 46 +---
+ drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
+ drivers/staging/comedi/drivers/dt2811.c | 4 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 12 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 43 ++--
+ drivers/staging/wilc1000/host_interface.c | 3 +-
+ drivers/staging/wilc1000/linux_wlan.c | 2 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +-
+ drivers/thermal/cpu_cooling.c | 21 +-
+ drivers/thermal/imx_thermal.c | 4 +-
+ drivers/thermal/int340x_thermal/int3406_thermal.c | 1 -
+ drivers/thunderbolt/nhi.c | 6 +
+ drivers/thunderbolt/switch.c | 4 +-
+ drivers/tty/serial/8250/8250.h | 35 +--
+ drivers/tty/serial/8250/8250_core.c | 9 -
+ drivers/tty/serial/8250/8250_fintek.c | 4 +-
+ drivers/tty/serial/8250/8250_mid.c | 3 +
+ drivers/tty/serial/8250/8250_omap.c | 31 +--
+ drivers/tty/serial/8250/8250_pci.c | 139 +++++++++++
+ drivers/tty/serial/8250/8250_port.c | 7 +-
+ drivers/tty/serial/8250/Kconfig | 1 -
+ drivers/usb/chipidea/udc.c | 7 +-
+ drivers/usb/core/config.c | 2 +-
+ drivers/usb/core/devio.c | 16 +-
+ drivers/usb/dwc2/core.h | 1 +
+ drivers/usb/dwc2/platform.c | 22 ++
+ drivers/usb/dwc3/core.c | 1 +
+ drivers/usb/dwc3/debug.h | 2 +-
+ drivers/usb/dwc3/dwc3-pci.c | 9 +-
+ drivers/usb/dwc3/gadget.c | 11 +-
+ drivers/usb/gadget/function/f_eem.c | 10 +-
+ drivers/usb/gadget/function/f_rndis.c | 3 +
+ drivers/usb/gadget/function/u_serial.c | 7 +-
+ drivers/usb/gadget/udc/core.c | 2 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c | 7 +-
+ drivers/usb/musb/musb_virthub.c | 7 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 2 +-
+ drivers/usb/serial/mos7720.c | 2 +-
+ drivers/usb/serial/mos7840.c | 4 +-
+ drivers/usb/serial/option.c | 9 +
+ fs/binfmt_elf.c | 2 +-
+ fs/block_dev.c | 5 +-
+ fs/btrfs/backref.c | 1 +
+ fs/btrfs/ctree.h | 5 +-
+ fs/btrfs/delayed-ref.c | 7 +-
+ fs/btrfs/disk-io.c | 56 ++++-
+ fs/btrfs/disk-io.h | 2 +
+ fs/btrfs/extent-tree.c | 195 +++++++--------
+ fs/btrfs/extent_io.h | 1 +
+ fs/btrfs/file.c | 28 ++-
+ fs/btrfs/inode-map.c | 3 +-
+ fs/btrfs/inode.c | 37 ++-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/btrfs/qgroup.c | 62 ++++-
+ fs/btrfs/qgroup.h | 36 ++-
+ fs/btrfs/relocation.c | 128 +++++++++-
+ fs/btrfs/root-tree.c | 27 ++-
+ fs/btrfs/send.c | 8 +-
+ fs/btrfs/super.c | 16 ++
+ fs/btrfs/transaction.c | 7 +-
+ fs/btrfs/tree-log.c | 21 +-
+ fs/btrfs/tree-log.h | 5 +-
+ fs/btrfs/volumes.c | 27 ++-
+ fs/devpts/inode.c | 3 +-
+ fs/dlm/debug_fs.c | 62 +++--
+ fs/ext4/inode.c | 2 -
+ fs/ext4/super.c | 18 +-
+ fs/ext4/xattr.c | 53 ++--
+ fs/ext4/xattr.h | 1 +
+ fs/iomap.c | 5 +-
+ fs/kernfs/file.c | 28 ++-
+ fs/nfs/blocklayout/blocklayout.c | 2 +-
+ fs/nfs/blocklayout/blocklayout.h | 3 +-
+ fs/nfs/blocklayout/extent_tree.c | 10 +-
+ fs/nfs/callback.c | 1 +
+ fs/nfs/callback_proc.c | 8 +-
+ fs/nfs/client.c | 10 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 45 ++--
+ fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
+ fs/nfs/flexfilelayout/flexfilelayoutdev.c | 23 +-
+ fs/nfs/internal.h | 5 +-
+ fs/nfs/nfs42proc.c | 34 ++-
+ fs/nfs/nfs4client.c | 5 +
+ fs/nfs/nfs4proc.c | 89 +++++--
+ fs/nfs/nfs4session.c | 53 ++++
+ fs/nfs/nfs4session.h | 7 +-
+ fs/nfs/pnfs.c | 2 +-
+ fs/nfs/super.c | 19 +-
+ fs/overlayfs/copy_up.c | 2 +
+ fs/overlayfs/dir.c | 58 ++++-
+ fs/overlayfs/inode.c | 108 ++++-----
+ fs/overlayfs/overlayfs.h | 17 +-
+ fs/overlayfs/readdir.c | 63 ++++-
+ fs/overlayfs/super.c | 93 +++++--
+ fs/proc/base.c | 7 +-
+ fs/seq_file.c | 4 +-
+ fs/sysfs/file.c | 8 +-
+ fs/xfs/libxfs/xfs_alloc.c | 2 +
+ fs/xfs/libxfs/xfs_btree.c | 14 +-
+ fs/xfs/libxfs/xfs_defer.c | 17 +-
+ fs/xfs/libxfs/xfs_defer.h | 2 +-
+ fs/xfs/libxfs/xfs_format.h | 6 +-
+ fs/xfs/libxfs/xfs_sb.c | 3 +-
+ fs/xfs/xfs_buf.c | 2 +-
+ fs/xfs/xfs_super.c | 9 +-
+ fs/xfs/xfs_trace.h | 2 +-
+ include/asm-generic/uaccess.h | 1 +
+ include/linux/acpi.h | 2 +-
+ include/linux/bio.h | 10 +-
+ include/linux/blkdev.h | 6 +-
+ include/linux/compiler-gcc.h | 10 +-
+ include/linux/fence.h | 2 -
+ include/linux/fs.h | 1 +
+ include/linux/host1x.h | 2 +
+ include/linux/iio/sw_trigger.h | 2 +-
+ include/linux/iomap.h | 8 +-
+ include/linux/irqchip/arm-gic-v3.h | 1 +
+ include/linux/mempolicy.h | 4 +
+ include/linux/mfd/da8xx-cfgchip.h | 153 ++++++++++++
+ include/linux/mfd/ti_am335x_tscadc.h | 8 +-
+ include/linux/mm.h | 1 +
+ include/linux/mmzone.h | 16 +-
+ include/linux/netfilter/nfnetlink_acct.h | 4 +-
+ include/linux/nvme.h | 2 +-
+ include/linux/pci.h | 19 +-
+ include/linux/serial_8250.h | 1 -
+ include/linux/smc91x.h | 10 +
+ include/linux/sysctl.h | 2 +
+ include/net/tcp.h | 2 +
+ include/rdma/ib_verbs.h | 11 +-
+ include/uapi/linux/atm_zatm.h | 1 +
+ include/uapi/linux/if_pppol2tp.h | 3 +-
+ include/uapi/linux/if_pppox.h | 3 +
+ include/uapi/linux/if_tunnel.h | 3 +
+ include/uapi/linux/ipx.h | 13 +-
+ include/uapi/linux/libc-compat.h | 26 ++
+ include/uapi/linux/openvswitch.h | 6 +-
+ kernel/audit_watch.c | 8 +-
+ kernel/configs/tiny.config | 8 +
+ kernel/cpuset.c | 15 ++
+ kernel/events/core.c | 2 +-
+ kernel/exit.c | 7 +-
+ kernel/fork.c | 37 ++-
+ kernel/irq/affinity.c | 2 +
+ kernel/irq/chip.c | 11 +
+ kernel/irq/manage.c | 8 +-
+ kernel/kexec_file.c | 3 +
+ kernel/printk/braille.c | 4 +-
+ kernel/printk/nmi.c | 38 +--
+ kernel/seccomp.c | 12 +-
+ kernel/sysctl.c | 45 +++-
+ kernel/time/tick-sched.c | 3 +-
+ kernel/time/timekeeping.c | 5 +-
+ kernel/time/timekeeping_debug.c | 9 +-
+ kernel/trace/blktrace.c | 2 +-
+ lib/Kconfig.debug | 18 --
+ lib/Makefile | 1 -
+ lib/rhashtable.c | 7 +-
+ lib/test_hash.c | 26 +-
+ lib/usercopy.c | 9 -
+ mm/Kconfig | 9 +-
+ mm/huge_memory.c | 7 +-
+ mm/memcontrol.c | 36 +--
+ mm/mempolicy.c | 17 ++
+ mm/page_alloc.c | 55 +----
+ mm/readahead.c | 9 +
+ mm/vmscan.c | 22 +-
+ net/bluetooth/af_bluetooth.c | 2 +-
+ net/bluetooth/hci_request.c | 2 +
+ net/bluetooth/hci_sock.c | 2 +-
+ net/bluetooth/l2cap_core.c | 8 +
+ net/bluetooth/l2cap_sock.c | 14 +-
+ net/ipv4/fib_trie.c | 4 +-
+ net/ipv4/ip_tunnel_core.c | 8 +-
+ net/ipv4/tcp.c | 2 -
+ net/ipv4/tcp_diag.c | 7 +-
+ net/ipv4/tcp_ipv4.c | 8 +-
+ net/ipv4/udp.c | 13 +-
+ net/ipv4/udplite.c | 1 -
+ net/ipv6/addrconf.c | 34 ++-
+ net/ipv6/tcp_ipv6.c | 8 +-
+ net/ipv6/udp.c | 1 -
+ net/ipv6/udplite.c | 1 -
+ net/l2tp/l2tp_ppp.c | 2 +-
+ net/netfilter/nf_conntrack_standalone.c | 4 +
+ net/netfilter/nfnetlink_acct.c | 17 +-
+ net/netfilter/nfnetlink_cttimeout.c | 16 +-
+ net/netfilter/nfnetlink_log.c | 1 +
+ net/netfilter/xt_TPROXY.c | 4 +
+ net/netfilter/xt_nfacct.c | 2 +-
+ net/sched/act_ife.c | 18 +-
+ net/sched/sch_generic.c | 9 +-
+ net/sctp/input.c | 11 +-
+ net/sctp/inqueue.c | 13 -
+ net/sctp/sctp_diag.c | 6 +-
+ net/sunrpc/clnt.c | 4 +-
+ net/tipc/udp_media.c | 5 +-
+ scripts/checkpatch.pl | 9 -
+ scripts/get_maintainer.pl | 4 +-
+ scripts/tags.sh | 1 -
+ sound/pci/hda/patch_realtek.c | 7 +-
+ sound/soc/atmel/atmel_ssc_dai.c | 5 +-
+ sound/soc/codecs/da7213.c | 4 +-
+ sound/soc/codecs/max98371.c | 1 +
+ sound/soc/codecs/nau8825.c | 78 +++---
+ sound/soc/codecs/wm2000.c | 2 +-
+ sound/soc/generic/Makefile | 6 +-
+ sound/soc/generic/simple-card-utils.c | 6 +
+ sound/soc/intel/skylake/skl-sst-utils.c | 5 +
+ sound/soc/intel/skylake/skl.c | 4 +-
+ sound/soc/omap/omap-abe-twl6040.c | 61 ++---
+ sound/soc/omap/omap-mcpdm.c | 22 +-
+ sound/soc/samsung/s3c24xx_uda134x.c | 7 +-
+ sound/soc/sh/rcar/src.c | 6 +-
+ sound/soc/soc-compress.c | 4 +-
+ sound/soc/soc-core.c | 5 +-
+ sound/soc/soc-dapm.c | 10 +
+ sound/usb/line6/pcm.c | 3 +-
+ sound/usb/line6/pod.c | 12 +-
+ tools/iio/iio_generic_buffer.c | 2 +-
+ tools/include/linux/string.h | 6 +-
+ tools/perf/util/evsel.c | 6 +-
+ tools/perf/util/unwind-libdw.c | 2 +-
+ tools/perf/util/unwind-libunwind-local.c | 2 +-
+ virt/kvm/arm/arch_timer.c | 11 +-
+ virt/kvm/arm/vgic/vgic-its.c | 158 ++++++++----
+ virt/kvm/arm/vgic/vgic-mmio-v3.c | 26 +-
+ virt/kvm/arm/vgic/vgic-v3.c | 8 +
+ virt/kvm/arm/vgic/vgic.c | 10 +-
+ virt/kvm/arm/vgic/vgic.h | 6 +
+ 539 files changed, 4893 insertions(+), 2731 deletions(-)
+ rename arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} (100%)
+ delete mode 100644 drivers/misc/bh1780gli.c
+ create mode 100644 include/linux/mfd/da8xx-cfgchip.h
+ delete mode 100644 lib/usercopy.c
+Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
+$ git merge kbuild-current/rc-fixes
+Merge made by the 'recursive' strategy.
+ scripts/package/builddeb | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (da60626e7d02 ARM: sa1100: clear reset status prior to reboot)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/kernel/hyp-stub.S | 13 +++++++++++++
+ arch/arm/mach-sa1100/clock.c | 5 +++--
+ arch/arm/mach-sa1100/generic.c | 4 ++++
+ arch/arm/mach-sa1100/generic.h | 2 ++
+ arch/arm/mm/proc-v7.S | 1 +
+ 5 files changed, 23 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (78a3e8889b4b powerpc: signals: Discard transaction state from signal frames)
+$ git merge powerpc-fixes/fixes
+Already up-to-date.
+Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (6e1ce3c34512 af_unix: split 'u->readlock' into two: 'iolock' and 'bindlock')
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/net/bonding/bond_main.c | 7 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 19 +-
+ drivers/net/ethernet/broadcom/tg3.c | 11 +-
+ drivers/net/ethernet/cavium/thunder/nic.h | 1 +
+ drivers/net/ethernet/cavium/thunder/nic_main.c | 11 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 20 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 64 ++++++-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 82 ++++----
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 22 ++-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 10 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 151 +++++++++------
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 28 ++-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 20 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 3 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 213 ++++++++++-----------
+ drivers/net/vxlan.c | 38 ++--
+ drivers/net/wireless/ath/ath9k/main.c | 9 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 26 +--
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 +-
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 3 +-
+ include/linux/netdevice.h | 1 +
+ include/net/af_unix.h | 2 +-
+ include/net/cfg80211.h | 9 +
+ include/net/netfilter/nft_meta.h | 4 +
+ include/net/netfilter/nft_reject.h | 4 +
+ net/bridge/br_input.c | 7 +-
+ net/bridge/br_multicast.c | 2 +-
+ net/bridge/netfilter/ebtables.c | 2 +
+ net/bridge/netfilter/nft_meta_bridge.c | 1 +
+ net/core/dev.c | 16 ++
+ net/core/flow_dissector.c | 6 +-
+ net/ipv4/devinet.c | 11 +-
+ net/ipv4/netfilter/nft_reject_ipv4.c | 1 +
+ net/ipv4/tcp_fastopen.c | 1 +
+ net/ipv6/addrconf.c | 16 +-
+ net/ipv6/ip6_tunnel.c | 2 +
+ net/ipv6/netfilter/nft_reject_ipv6.c | 1 +
+ net/kcm/kcmsock.c | 3 +-
+ net/l2tp/l2tp_core.c | 3 +
+ net/mac80211/tdls.c | 7 +-
+ net/netfilter/nf_tables_netdev.c | 1 -
+ net/netfilter/nfnetlink_acct.c | 6 +-
+ net/netfilter/nfnetlink_cttimeout.c | 49 +++--
+ net/netfilter/nft_meta.c | 17 +-
+ net/netfilter/nft_reject.c | 16 ++
+ net/netfilter/nft_reject_inet.c | 7 +-
+ net/tipc/name_distr.c | 8 +-
+ net/unix/af_unix.c | 111 +++++------
+ net/wireless/wext-core.c | 25 +--
+ 55 files changed, 655 insertions(+), 455 deletions(-)
+Merging ipsec/master (11d7a0bb95ea xfrm: Only add l3mdev oif to dst lookups)
+$ git merge ipsec/master
+Auto-merging net/ipv6/xfrm6_policy.c
+Auto-merging net/ipv4/xfrm4_policy.c
+Merge made by the 'recursive' strategy.
+ net/ipv4/xfrm4_policy.c | 2 +-
+ net/ipv6/xfrm6_input.c | 1 +
+ net/ipv6/xfrm6_policy.c | 2 +-
+ net/xfrm/xfrm_input.c | 14 +++++++-------
+ net/xfrm/xfrm_policy.c | 4 ++++
+ net/xfrm/xfrm_user.c | 13 ++++---------
+ 6 files changed, 18 insertions(+), 18 deletions(-)
+Merging netfilter/master (c73c24849011 netfilter: nf_tables_netdev: remove redundant ip_hdr assignment)
+$ git merge netfilter/master
+Already up-to-date.
+Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (bb87f02b7e4c Merge ath-current from ath.git)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (61aaa0e8c1c1 cfg80211: Add stub for cfg80211_get_station())
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (6b1ca4bcadf9 ALSA: fireworks: accessing to user space outside spinlock)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/timer.c | 18 +++++-
+ sound/firewire/fireworks/fireworks.h | 1 -
+ sound/firewire/fireworks/fireworks_hwdep.c | 71 +++++++++++++++++-------
+ sound/firewire/fireworks/fireworks_proc.c | 4 +-
+ sound/firewire/fireworks/fireworks_transaction.c | 5 +-
+ sound/firewire/tascam/tascam-hwdep.c | 33 ++++-------
+ sound/pci/hda/patch_realtek.c | 15 +++++
+ sound/usb/quirks.c | 1 +
+ 8 files changed, 99 insertions(+), 49 deletions(-)
+Merging pci-current/for-linus (6af7e4f77259 PCI: Mark Haswell Power Control Unit as having non-compliant BARs)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/x86/pci/fixup.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+Merging driver-core.current/driver-core-linus (17d0774f8068 sysfs: correctly handle read offset on PREALLOC attrs)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (c8d192428f52 serial: 8250: added acces i/o products quad and octal serial cards)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (2c5575401e34 usb: musb: Fix locking errors for host only mode)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (6f8245b4e37c usb: dwc3: gadget: always decrement by 1)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (40d9c32525cb USB: serial: option: add WeTelecom 0x6802 and 0x6803 products)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (c4e94174983a usb: chipidea: udc: don't touch DP when controller is in host mode)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging staging.current/staging-linus (eafe5cfe7189 Merge tag 'iio-fixes-for-4.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-linus)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (ccdf3b888d87 thunderbolt: Don't declare Falcon Ridge unsupported)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (e3a888a4bff0 Input: ads7846 - remove redundant regulator_disable call)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (8b18e2359aff crypto: caam - fix IV loading for authenc (giv)decryption)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ crypto/cryptd.c | 3 +-
+ drivers/crypto/caam/caamalg.c | 77 +++++++++++++++++++++----------------------
+ 2 files changed, 39 insertions(+), 41 deletions(-)
+Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
+$ git merge ide/master
+Already up-to-date.
+Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up-to-date.
+Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
+$ git merge ftrace-fixes/for-next-urgent
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (8a07fed44b12 drm/i915/dvo: Remove dangling call to drm_encoder_cleanup())
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/intel_dvo.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (f88c04c0f9b3 ARCv2: Support dynamic peripheral address space in HS38 rel 3.0 cores)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/boot/dts/abilis_tb100_dvk.dts | 1 +
+ arch/arc/boot/dts/abilis_tb101_dvk.dts | 1 +
+ arch/arc/boot/dts/axs101.dts | 1 +
+ arch/arc/boot/dts/axs103.dts | 1 +
+ arch/arc/boot/dts/axs103_idu.dts | 1 +
+ arch/arc/boot/dts/nsim_700.dts | 1 +
+ arch/arc/boot/dts/nsim_hs.dts | 1 +
+ arch/arc/boot/dts/nsim_hs_idu.dts | 1 +
+ arch/arc/boot/dts/nsimosci.dts | 1 +
+ arch/arc/boot/dts/nsimosci_hs.dts | 1 +
+ arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 +
+ arch/arc/boot/dts/vdk_hs38.dts | 1 +
+ arch/arc/boot/dts/vdk_hs38_smp.dts | 1 +
+ arch/arc/boot/dts/zebu_hs.dts | 69 ++++++++++++++++++++++++++
+ arch/arc/boot/dts/zebu_hs_idu.dts | 85 ++++++++++++++++++++++++++++++++
+ arch/arc/configs/zebu_hs_defconfig | 86 ++++++++++++++++++++++++++++++++
+ arch/arc/configs/zebu_hs_smp_defconfig | 89 ++++++++++++++++++++++++++++++++++
+ arch/arc/include/asm/arcregs.h | 10 +---
+ arch/arc/include/asm/cache.h | 2 +-
+ arch/arc/kernel/setup.c | 5 +-
+ arch/arc/mm/cache.c | 23 +++++++--
+ arch/arc/mm/ioremap.c | 2 +-
+ arch/arc/plat-sim/platform.c | 1 +
+ 23 files changed, 367 insertions(+), 18 deletions(-)
+ create mode 100644 arch/arc/boot/dts/zebu_hs.dts
+ create mode 100644 arch/arc/boot/dts/zebu_hs_idu.dts
+ create mode 100644 arch/arc/configs/zebu_hs_defconfig
+ create mode 100644 arch/arc/configs/zebu_hs_smp_defconfig
+Merging arm/for-next (51b9a5bba0d4 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Makefile | 1 -
+ arch/arm/boot/Makefile | 2 ++
+ arch/arm/include/asm/cacheflush.h | 17 -----------------
+ arch/arm/include/asm/cputype.h | 21 +++++++++++++++++++++
+ arch/arm/include/asm/flat.h | 5 +++--
+ arch/arm/include/asm/hw_breakpoint.h | 1 -
+ arch/arm/include/asm/memory.h | 15 +++------------
+ arch/arm/kernel/cpuidle.c | 2 +-
+ arch/arm/kernel/setup.c | 10 +++++-----
+ arch/arm/kernel/smp.c | 2 +-
+ arch/arm/kernel/vdso.c | 11 ++++++-----
+ arch/arm/lib/delay.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/hardware.h | 2 +-
+ arch/arm/mach-rpc/include/mach/hardware.h | 2 +-
+ arch/arm/mach-sa1100/include/mach/hardware.h | 20 +-------------------
+ arch/arm/mm/cache-l2x0.c | 5 ++---
+ arch/arm/mm/dma-mapping.c | 4 ++--
+ arch/arm/mm/mmu.c | 2 +-
+ drivers/amba/bus.c | 5 +++++
+ drivers/cpufreq/sa1110-cpufreq.c | 2 +-
+ fs/Kconfig.binfmt | 2 +-
+ 21 files changed, 58 insertions(+), 75 deletions(-)
+Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (58118417d788 arm-soc: document merges)
+$ git merge arm-soc/for-next
+Removing arch/arm/mach-realview/realview_pbx.c
+Removing arch/arm/mach-realview/realview_pba8.c
+Removing arch/arm/mach-realview/realview_pb11mp.c
+Removing arch/arm/mach-realview/realview_pb1176.c
+Removing arch/arm/mach-realview/realview_eb.c
+Removing arch/arm/mach-realview/platsmp.c
+Removing arch/arm/mach-realview/platform.h
+Removing arch/arm/mach-realview/irqs-pbx.h
+Removing arch/arm/mach-realview/irqs-pba8.h
+Removing arch/arm/mach-realview/irqs-pb11mp.h
+Removing arch/arm/mach-realview/irqs-pb1176.h
+Removing arch/arm/mach-realview/irqs-eb.h
+Removing arch/arm/mach-realview/hardware.h
+Removing arch/arm/mach-realview/core.h
+CONFLICT (modify/delete): arch/arm/mach-realview/core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-realview/core.c left in tree.
+Removing arch/arm/mach-realview/board-pbx.h
+Removing arch/arm/mach-realview/board-pba8.h
+Removing arch/arm/mach-realview/board-pb11mp.h
+Removing arch/arm/mach-realview/board-pb1176.h
+Removing arch/arm/mach-realview/board-eb.h
+Removing arch/arm/mach-omap2/board-rx51.h
+Removing arch/arm/mach-omap2/board-rx51.c
+Removing arch/arm/mach-omap2/board-rx51-video.c
+Removing arch/arm/mach-omap2/board-rx51-peripherals.c
+Removing arch/arm/mach-omap2/board-ldp.c
+Removing arch/arm/mach-clps711x/devices.h
+Removing arch/arm/mach-clps711x/devices.c
+Removing arch/arm/mach-clps711x/common.h
+Removing arch/arm/mach-clps711x/common.c
+Removing arch/arm/mach-clps711x/board-p720t.c
+Removing arch/arm/mach-clps711x/board-edb7211.c
+Removing arch/arm/mach-clps711x/board-clep7312.c
+Removing arch/arm/mach-clps711x/board-cdb89712.c
+Removing arch/arm/mach-clps711x/board-autcpu12.c
+Removing arch/arm/mach-clps711x/Makefile.boot
+Auto-merging MAINTAINERS
+Auto-merging .mailmap
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-realview/core.c
+arch/arm/mach-realview/core.c: needs merge
+rm 'arch/arm/mach-realview/core.c'
+$ git commit -v -a
+[master e5863c62d4b3] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 1 +
+ Documentation/arm/CCN.txt | 16 +-
+ .../devicetree/bindings/clock/st,stm32-rcc.txt | 42 +-
+ .../devicetree/bindings/reset/st,stm32-rcc.txt | 6 +
+ .../devicetree/bindings/reset/uniphier-reset.txt | 93 ++
+ MAINTAINERS | 17 +-
+ arch/arm/Kconfig | 3 +-
+ arch/arm/arm-soc-for-next-contents.txt | 64 +
+ arch/arm/boot/dts/am335x-baltos.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
+ arch/arm/boot/dts/armada-388-clearfog.dts | 8 +-
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 3 -
+ arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 +
+ arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +-
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 1 +
+ arch/arm/boot/dts/omap3-overo-base.dtsi | 4 +-
+ .../boot/dts/omap3-overo-chestnut43-common.dtsi | 2 -
+ arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 2 -
+ arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 3 -
+ arch/arm/boot/dts/stm32f429.dtsi | 1 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 2 +-
+ arch/arm/boot/dts/tegra114-roth.dts | 2 +-
+ arch/arm/boot/dts/tegra114-tn7.dts | 2 +-
+ arch/arm/configs/davinci_all_defconfig | 66 +-
+ arch/arm/configs/exynos_defconfig | 11 +-
+ arch/arm/configs/integrator_defconfig | 13 +-
+ arch/arm/configs/multi_v7_defconfig | 7 +-
+ arch/arm/configs/omap2plus_defconfig | 2 +-
+ arch/arm/configs/s3c2410_defconfig | 1 -
+ arch/arm/mach-clps711x/Makefile.boot | 0
+ arch/arm/mach-clps711x/board-autcpu12.c | 275 ----
+ arch/arm/mach-clps711x/board-cdb89712.c | 147 ---
+ arch/arm/mach-clps711x/board-clep7312.c | 45 -
+ arch/arm/mach-clps711x/board-edb7211.c | 188 ---
+ arch/arm/mach-clps711x/board-p720t.c | 373 ------
+ arch/arm/mach-clps711x/common.c | 65 -
+ arch/arm/mach-clps711x/common.h | 23 -
+ arch/arm/mach-clps711x/devices.c | 149 ---
+ arch/arm/mach-clps711x/devices.h | 12 -
+ arch/arm/mach-davinci/da850.c | 1 +
+ arch/arm/mach-davinci/da8xx-dt.c | 1 +
+ arch/arm/mach-exynos/Kconfig | 1 +
+ arch/arm/mach-exynos/exynos.c | 15 -
+ arch/arm/mach-exynos/include/mach/map.h | 5 -
+ arch/arm/mach-imx/mach-imx6ul.c | 1 +
+ arch/arm/mach-imx/pm-imx6.c | 2 +-
+ arch/arm/mach-omap1/board-h2-mmc.c | 2 +-
+ arch/arm/mach-omap1/board-h2.c | 2 +-
+ arch/arm/mach-omap1/board-h3-mmc.c | 2 +-
+ arch/arm/mach-omap1/board-h3.c | 2 +-
+ arch/arm/mach-omap1/board-htcherald.c | 4 +-
+ arch/arm/mach-omap1/board-innovator.c | 4 +-
+ arch/arm/mach-omap1/board-nokia770.c | 4 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c | 2 +-
+ arch/arm/mach-omap1/devices.c | 10 +-
+ arch/arm/mach-omap1/fb.c | 2 +-
+ arch/arm/mach-omap1/include/mach/usb.h | 2 +-
+ arch/arm/mach-omap1/mmc.h | 2 +-
+ arch/arm/mach-omap1/usb.c | 6 +-
+ arch/arm/mach-omap2/Kconfig | 12 -
+ arch/arm/mach-omap2/Makefile | 4 -
+ arch/arm/mach-omap2/board-flash.c | 10 +-
+ arch/arm/mach-omap2/board-flash.h | 11 +-
+ arch/arm/mach-omap2/board-ldp.c | 430 -------
+ arch/arm/mach-omap2/board-n8x0.c | 5 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 1312 --------------------
+ arch/arm/mach-omap2/board-rx51-video.c | 67 -
+ arch/arm/mach-omap2/board-rx51.c | 141 ---
+ arch/arm/mach-omap2/board-rx51.h | 11 -
+ arch/arm/mach-omap2/cm33xx.c | 6 -
+ arch/arm/mach-omap2/cminst44xx.c | 6 -
+ arch/arm/mach-omap2/common-board-devices.c | 3 +-
+ arch/arm/mach-omap2/devices.c | 7 +-
+ arch/arm/mach-omap2/drm.c | 2 +-
+ arch/arm/mach-omap2/fb.c | 2 +-
+ arch/arm/mach-omap2/gpmc-smsc911x.h | 2 +-
+ arch/arm/mach-omap2/hsmmc.c | 2 +-
+ arch/arm/mach-omap2/hsmmc.h | 2 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 8 +
+ arch/arm/mach-omap2/omap_hwmod.h | 4 +
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 +
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +
+ arch/arm/mach-omap2/twl-common.c | 3 +-
+ arch/arm/mach-realview/Kconfig | 72 +-
+ arch/arm/mach-realview/Makefile | 12 +-
+ arch/arm/mach-realview/board-eb.h | 94 --
+ arch/arm/mach-realview/board-pb1176.h | 81 --
+ arch/arm/mach-realview/board-pb11mp.h | 96 --
+ arch/arm/mach-realview/board-pba8.h | 71 --
+ arch/arm/mach-realview/board-pbx.h | 106 --
+ arch/arm/mach-realview/core.c | 405 ------
+ arch/arm/mach-realview/core.h | 58 -
+ arch/arm/mach-realview/hardware.h | 40 -
+ arch/arm/mach-realview/hotplug.h | 1 +
+ arch/arm/mach-realview/irqs-eb.h | 114 --
+ arch/arm/mach-realview/irqs-pb1176.h | 77 --
+ arch/arm/mach-realview/irqs-pb11mp.h | 97 --
+ arch/arm/mach-realview/irqs-pba8.h | 71 --
+ arch/arm/mach-realview/irqs-pbx.h | 87 --
+ arch/arm/mach-realview/platform.h | 247 ----
+ arch/arm/mach-realview/platsmp-dt.c | 3 +-
+ arch/arm/mach-realview/platsmp.c | 86 --
+ arch/arm/mach-realview/realview_eb.c | 492 --------
+ arch/arm/mach-realview/realview_pb1176.c | 395 ------
+ arch/arm/mach-realview/realview_pb11mp.c | 385 ------
+ arch/arm/mach-realview/realview_pba8.c | 307 -----
+ arch/arm/mach-realview/realview_pbx.c | 402 ------
+ arch/arm/mach-s3c24xx/common.c | 20 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 1 +
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 3 +-
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 4 -
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 +-
+ arch/arm64/boot/dts/broadcom/ns2.dtsi | 8 +-
+ arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 8 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 8 +-
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 +-
+ .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 8 +-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 +-
+ drivers/bus/arm-ccn.c | 112 +-
+ drivers/bus/vexpress-config.c | 1 +
+ drivers/firmware/arm_scpi.c | 5 +-
+ drivers/irqchip/Makefile | 2 +-
+ drivers/memory/omap-gpmc.c | 41 +-
+ drivers/mtd/maps/Kconfig | 2 +-
+ drivers/reset/Kconfig | 65 +
+ drivers/reset/Makefile | 20 +-
+ drivers/reset/core.c | 12 +-
+ drivers/reset/hisilicon/Kconfig | 3 +-
+ drivers/reset/reset-ath79.c | 1 +
+ drivers/reset/reset-socfpga.c | 19 +-
+ drivers/reset/reset-stm32.c | 108 ++
+ drivers/reset/reset-uniphier.c | 440 +++++++
+ include/dt-bindings/mfd/stm32f4-rcc.h | 98 ++
+ include/linux/omap-gpmc.h | 4 +-
+ 141 files changed, 1282 insertions(+), 7374 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/reset/st,stm32-rcc.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/uniphier-reset.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/mach-clps711x/Makefile.boot
+ delete mode 100644 arch/arm/mach-clps711x/board-autcpu12.c
+ delete mode 100644 arch/arm/mach-clps711x/board-cdb89712.c
+ delete mode 100644 arch/arm/mach-clps711x/board-clep7312.c
+ delete mode 100644 arch/arm/mach-clps711x/board-edb7211.c
+ delete mode 100644 arch/arm/mach-clps711x/board-p720t.c
+ delete mode 100644 arch/arm/mach-clps711x/common.c
+ delete mode 100644 arch/arm/mach-clps711x/common.h
+ delete mode 100644 arch/arm/mach-clps711x/devices.c
+ delete mode 100644 arch/arm/mach-clps711x/devices.h
+ delete mode 100644 arch/arm/mach-omap2/board-ldp.c
+ delete mode 100644 arch/arm/mach-omap2/board-rx51-peripherals.c
+ delete mode 100644 arch/arm/mach-omap2/board-rx51-video.c
+ delete mode 100644 arch/arm/mach-omap2/board-rx51.c
+ delete mode 100644 arch/arm/mach-omap2/board-rx51.h
+ delete mode 100644 arch/arm/mach-realview/board-eb.h
+ delete mode 100644 arch/arm/mach-realview/board-pb1176.h
+ delete mode 100644 arch/arm/mach-realview/board-pb11mp.h
+ delete mode 100644 arch/arm/mach-realview/board-pba8.h
+ delete mode 100644 arch/arm/mach-realview/board-pbx.h
+ delete mode 100644 arch/arm/mach-realview/core.c
+ delete mode 100644 arch/arm/mach-realview/core.h
+ delete mode 100644 arch/arm/mach-realview/hardware.h
+ create mode 100644 arch/arm/mach-realview/hotplug.h
+ delete mode 100644 arch/arm/mach-realview/irqs-eb.h
+ delete mode 100644 arch/arm/mach-realview/irqs-pb1176.h
+ delete mode 100644 arch/arm/mach-realview/irqs-pb11mp.h
+ delete mode 100644 arch/arm/mach-realview/irqs-pba8.h
+ delete mode 100644 arch/arm/mach-realview/irqs-pbx.h
+ delete mode 100644 arch/arm/mach-realview/platform.h
+ delete mode 100644 arch/arm/mach-realview/platsmp.c
+ delete mode 100644 arch/arm/mach-realview/realview_eb.c
+ delete mode 100644 arch/arm/mach-realview/realview_pb1176.c
+ delete mode 100644 arch/arm/mach-realview/realview_pb11mp.c
+ delete mode 100644 arch/arm/mach-realview/realview_pba8.c
+ delete mode 100644 arch/arm/mach-realview/realview_pbx.c
+ create mode 100644 drivers/reset/reset-stm32.c
+ create mode 100644 drivers/reset/reset-uniphier.c
+ create mode 100644 include/dt-bindings/mfd/stm32f4-rcc.h
+Merging amlogic/for-next (cbf216bf60bb Merge v4.8/mmc)
+$ git merge amlogic/for-next
+Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/amlogic,gxbb-aoclkc.txt | 45 +
+ .../bindings/firmware/meson/meson_sm.txt | 15 +
+ .../devicetree/bindings/media/meson-ir.txt | 5 +-
+ .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 +
+ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 39 +
+ MAINTAINERS | 1 +
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 80 ++
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 77 ++
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 6 +
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 169 +++-
+ arch/arm64/configs/defconfig | 5 +-
+ drivers/clk/meson/Makefile | 2 +-
+ drivers/clk/meson/gxbb-aoclk.c | 191 +++++
+ drivers/clk/meson/gxbb.c | 9 +
+ drivers/clk/meson/gxbb.h | 7 +-
+ drivers/firmware/Kconfig | 1 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/meson/Kconfig | 9 +
+ drivers/firmware/meson/Makefile | 1 +
+ drivers/firmware/meson/meson_sm.c | 248 ++++++
+ drivers/media/rc/meson-ir.c | 29 +-
+ drivers/mmc/host/Kconfig | 10 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/meson-gxbb.c | 916 +++++++++++++++++++++
+ drivers/nvmem/Kconfig | 10 +
+ drivers/nvmem/Makefile | 2 +
+ drivers/nvmem/meson-efuse.c | 93 +++
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 87 ++
+ include/dt-bindings/clock/gxbb-aoclkc.h | 66 ++
+ include/dt-bindings/clock/gxbb-clkc.h | 4 +
+ include/dt-bindings/reset/gxbb-aoclkc.h | 66 ++
+ include/linux/firmware/meson/meson_sm.h | 31 +
+ 32 files changed, 2243 insertions(+), 12 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
+ create mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt
+ create mode 100644 drivers/clk/meson/gxbb-aoclk.c
+ create mode 100644 drivers/firmware/meson/Kconfig
+ create mode 100644 drivers/firmware/meson/Makefile
+ create mode 100644 drivers/firmware/meson/meson_sm.c
+ create mode 100644 drivers/mmc/host/meson-gxbb.c
+ create mode 100644 drivers/nvmem/meson-efuse.c
+ create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h
+ create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h
+ create mode 100644 include/linux/firmware/meson/meson_sm.h
+Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
+$ git merge at91/at91-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
+$ git merge bcm2835/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 40 +++++++++++++++++
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 +
+ arch/arm/boot/dts/bcm283x-rpi-usb-host.dtsi | 3 ++
+ arch/arm/boot/dts/bcm283x.dtsi | 9 ++++
+ drivers/gpu/drm/vc4/vc4_crtc.c | 52 ++++++++++++++++------
+ drivers/gpu/drm/vc4/vc4_dpi.c | 11 +++++
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 29 +++++++++++-
+ 14 files changed, 141 insertions(+), 16 deletions(-)
+ create mode 100644 arch/arm/boot/dts/bcm2835-rpi-zero.dts
+ create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-host.dtsi
+Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/berlin2.dtsi | 2 --
+ arch/arm/boot/dts/berlin2q.dtsi | 2 --
+ arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++---
+ 3 files changed, 9 insertions(+), 7 deletions(-)
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (aec3f02e6aa5 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution.
+Removing arch/arm/mach-imx/mx1.h
+Removing arch/arm/mach-imx/mm-imx1.c
+Removing arch/arm/mach-imx/mach-scb9328.c
+Auto-merging arch/arm/mach-imx/mach-imx1.c
+Removing arch/arm/mach-imx/mach-apf9328.c
+Removing arch/arm/mach-imx/iomux-mx1.h
+Removing arch/arm/mach-imx/devices-imx1.h
+Auto-merging arch/arm/configs/multi_v7_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master aa696e91ce62] Merge remote-tracking branch 'imx-mxs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/technologic.txt | 6 +
+ arch/arm/boot/dts/Makefile | 7 +-
+ arch/arm/boot/dts/imx53.dtsi | 18 +
+ arch/arm/boot/dts/imx6dl-gw553x.dts | 55 +++
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 22 +-
+ arch/arm/boot/dts/imx6dl-ts4900.dts | 49 +++
+ arch/arm/boot/dts/imx6q-arm2.dts | 24 +-
+ arch/arm/boot/dts/imx6q-b450v3.dts | 16 +
+ arch/arm/boot/dts/imx6q-b650v3.dts | 9 +
+ arch/arm/boot/dts/imx6q-ba16.dtsi | 24 +-
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 70 +++
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 24 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 24 +-
+ arch/arm/boot/dts/imx6q-evi.dts | 28 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 24 +-
+ arch/arm/boot/dts/imx6q-gw553x.dts | 55 +++
+ arch/arm/boot/dts/imx6q-marsboard.dts | 24 +-
+ arch/arm/boot/dts/imx6q-novena.dts | 12 +-
+ arch/arm/boot/dts/imx6q-sbc6x.dts | 24 +-
+ arch/arm/boot/dts/imx6q-tbs2910.dts | 24 +-
+ arch/arm/boot/dts/imx6q-ts4900.dts | 53 +++
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 +-
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 39 +-
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 39 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 44 +-
+ arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 12 +
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 12 +
+ arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 433 +++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 12 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 36 +-
+ arch/arm/boot/dts/imx6qdl-rex.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 481 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 24 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +-
+ arch/arm/boot/dts/imx6sx-pinfunc.h | 14 +
+ arch/arm/boot/dts/imx6sx.dtsi | 15 +
+ arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 33 ++
+ arch/arm/boot/dts/imx6ul.dtsi | 3 +-
+ arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 4 -
+ arch/arm/boot/dts/imx7-colibri.dtsi | 61 ++-
+ arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
+ arch/arm/boot/dts/imx7d.dtsi | 42 +-
+ arch/arm/boot/dts/imx7s-warp.dts | 377 ++++++++++++++++
+ arch/arm/boot/dts/imx7s.dtsi | 364 +++++++++-------
+ arch/arm/configs/imx_v4_v5_defconfig | 3 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 17 +-
+ arch/arm/configs/multi_v4t_defconfig | 4 +-
+ arch/arm/configs/multi_v7_defconfig | 3 +
+ arch/arm/mach-imx/Kconfig | 50 +--
+ arch/arm/mach-imx/Makefile | 7 +-
+ arch/arm/mach-imx/common.h | 7 +-
+ arch/arm/mach-imx/cpuidle-imx6q.c | 2 +-
+ arch/arm/mach-imx/cpuidle-imx6sx.c | 11 +
+ arch/arm/mach-imx/devices-imx1.h | 30 --
+ arch/arm/mach-imx/devices/Makefile | 1 -
+ arch/arm/mach-imx/devices/devices-common.h | 12 -
+ arch/arm/mach-imx/devices/platform-imx-fb.c | 5 -
+ arch/arm/mach-imx/devices/platform-imx-i2c.c | 5 -
+ arch/arm/mach-imx/devices/platform-imx-uart.c | 37 --
+ arch/arm/mach-imx/devices/platform-spi_imx.c | 9 -
+ arch/arm/mach-imx/hardware.h | 1 -
+ arch/arm/mach-imx/iomux-mx1.h | 155 -------
+ arch/arm/mach-imx/iomux-mx3.h | 34 --
+ arch/arm/mach-imx/mach-apf9328.c | 148 -------
+ arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} | 23 +-
+ arch/arm/mach-imx/mach-imx6ul.c | 3 +
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 +-
+ arch/arm/mach-imx/mach-pcm037.c | 2 +-
+ arch/arm/mach-imx/mach-scb9328.c | 143 ------
+ arch/arm/mach-imx/mm-imx1.c | 67 ---
+ arch/arm/mach-imx/mx1.h | 172 --------
+ arch/arm/mach-imx/pm-imx6.c | 8 +-
+ arch/arm/mach-mxs/mach-mxs.c | 77 ----
+ drivers/clk/imx/clk-imx1.c | 46 +-
+ 82 files changed, 2489 insertions(+), 1514 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw553x.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-ts4900.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw553x.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-ts4900.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-ts4900.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7s-warp.dts
+ delete mode 100644 arch/arm/mach-imx/devices-imx1.h
+ delete mode 100644 arch/arm/mach-imx/iomux-mx1.h
+ delete mode 100644 arch/arm/mach-imx/mach-apf9328.c
+ rename arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} (63%)
+ delete mode 100644 arch/arm/mach-imx/mach-scb9328.c
+ delete mode 100644 arch/arm/mach-imx/mm-imx1.c
+ delete mode 100644 arch/arm/mach-imx/mx1.h
+Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
+$ git merge keystone/next
+Auto-merging arch/arm/boot/dts/keystone.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/keystone-k2e-evm.dts | 12 ++++++++++--
+ arch/arm/boot/dts/keystone-k2e.dtsi | 4 ++--
+ arch/arm/boot/dts/keystone-k2g.dtsi | 32 ++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/keystone-k2hk-evm.dts | 6 +++++-
+ arch/arm/boot/dts/keystone-k2l-evm.dts | 6 +++++-
+ arch/arm/boot/dts/keystone.dtsi | 4 ++--
+ arch/arm/configs/keystone_defconfig | 1 +
+ 7 files changed, 57 insertions(+), 8 deletions(-)
+Merging mvebu/for-next (23e115d66f98 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/marvell/armada-39x.txt | 15 +-
+ arch/arm/boot/dts/armada-370-db.dts | 29 +--
+ .../dts/armada-370-seagate-personal-cloud.dtsi | 40 ++--
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 112 +++++-----
+ arch/arm/boot/dts/armada-370-xp.dtsi | 56 +++--
+ arch/arm/boot/dts/armada-370.dtsi | 34 ++-
+ arch/arm/boot/dts/armada-385-db-ap.dts | 58 +++--
+ arch/arm/boot/dts/armada-385-linksys.dtsi | 9 +-
+ arch/arm/boot/dts/armada-388-clearfog.dts | 48 ++--
+ arch/arm/boot/dts/armada-388-db.dts | 25 ++-
+ arch/arm/boot/dts/armada-388-gp.dts | 30 +--
+ arch/arm/boot/dts/armada-388-rd.dts | 25 ++-
+ arch/arm/boot/dts/armada-38x.dtsi | 57 +++--
+ arch/arm/boot/dts/armada-390-db.dts | 175 +++++++++++++++
+ arch/arm/boot/dts/armada-390.dtsi | 3 +
+ arch/arm/boot/dts/armada-395-gp.dts | 163 ++++++++++++++
+ arch/arm/boot/dts/armada-395.dtsi | 76 +++++++
+ arch/arm/boot/dts/armada-398-db.dts | 56 +++--
+ arch/arm/boot/dts/armada-398.dtsi | 10 +-
+ arch/arm/boot/dts/armada-39x.dtsi | 126 ++++++++---
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 24 +-
+ arch/arm/boot/dts/armada-xp-db.dts | 24 +-
+ arch/arm/boot/dts/armada-xp-gp.dts | 24 +-
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 24 +-
+ arch/arm/boot/dts/armada-xp-synology-ds414.dts | 112 +++++-----
+ arch/arm/boot/dts/armada-xp.dtsi | 31 +--
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 9 +-
+ arch/arm/configs/mvebu_v5_defconfig | 5 +-
+ arch/arm/configs/mvebu_v7_defconfig | 3 +
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 1 +
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 150 +++++++++++++
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 1 +
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 14 ++
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 246 +++++++++++++++++++++
+ arch/arm64/configs/defconfig | 2 +
+ 36 files changed, 1407 insertions(+), 411 deletions(-)
+ create mode 100644 arch/arm/boot/dts/armada-390-db.dts
+ create mode 100644 arch/arm/boot/dts/armada-395-gp.dts
+ create mode 100644 arch/arm/boot/dts/armada-395.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-db.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+Merging omap/for-next (91dda79fa02c Merge branch 'omap-for-v4.9/dt' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/omap/omap.txt | 6 ++
+ arch/arm/boot/dts/am335x-baltos.dtsi | 6 +-
+ arch/arm/boot/dts/am335x-base0033.dts | 4 +-
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 12 ++--
+ arch/arm/boot/dts/am335x-chilisom.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-cm-t335.dts | 8 +--
+ arch/arm/boot/dts/am335x-evm.dts | 16 +++---
+ arch/arm/boot/dts/am335x-evmsk.dts | 28 +++++-----
+ arch/arm/boot/dts/am335x-icev2.dts | 47 +++++++++-------
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 8 +--
+ arch/arm/boot/dts/am335x-lxm.dts | 6 +-
+ arch/arm/boot/dts/am335x-nano.dts | 4 +-
+ arch/arm/boot/dts/am335x-pepper.dts | 18 +++---
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 4 +-
+ arch/arm/boot/dts/am335x-shc.dts | 16 +++---
+ arch/arm/boot/dts/am335x-sl50.dts | 15 +++--
+ arch/arm/boot/dts/am335x-wega.dtsi | 64 +++++++++++++++++++++-
+ arch/arm/boot/dts/am33xx.dtsi | 4 +-
+ arch/arm/boot/dts/am3517-craneboard.dts | 2 +-
+ arch/arm/boot/dts/am3517-evm.dts | 2 +-
+ arch/arm/boot/dts/am3517.dtsi | 2 +-
+ arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +-
+ arch/arm/boot/dts/am4372.dtsi | 10 +++-
+ arch/arm/boot/dts/am437x-cm-t43.dts | 6 --
+ arch/arm/boot/dts/am437x-gp-evm.dts | 21 ++++---
+ arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
+ arch/arm/boot/dts/am437x-sk-evm.dts | 45 +++++++++++----
+ arch/arm/boot/dts/am43x-epos-evm.dts | 11 +---
+ arch/arm/boot/dts/am572x-idk.dts | 2 +-
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 10 ++--
+ arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 4 +-
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 49 +++++++++++++++++
+ arch/arm/boot/dts/da850-evm.dts | 2 +-
+ arch/arm/boot/dts/dm8148-evm.dts | 4 +-
+ arch/arm/boot/dts/dm8148-t410.dts | 4 +-
+ arch/arm/boot/dts/dm814x.dtsi | 4 +-
+ arch/arm/boot/dts/dm8168-evm.dts | 4 +-
+ arch/arm/boot/dts/dm816x.dtsi | 4 +-
+ arch/arm/boot/dts/dra62x-j5eco-evm.dts | 4 +-
+ arch/arm/boot/dts/dra7-evm.dts | 14 ++---
+ arch/arm/boot/dts/dra7.dtsi | 10 ++--
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +-
+ arch/arm/boot/dts/dra72-evm-revc.dts | 2 +-
+ arch/arm/boot/dts/dra72-evm.dts | 2 +-
+ arch/arm/boot/dts/dra7xx-clocks.dtsi | 15 +++--
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 5 ++
+ arch/arm/boot/dts/omap2.dtsi | 4 +-
+ arch/arm/boot/dts/omap2420-h4.dts | 2 +-
+ arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap2430-sdp.dts | 2 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
+ arch/arm/boot/dts/omap3-beagle.dts | 2 +-
+ arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +-
+ arch/arm/boot/dts/omap3-evm.dts | 2 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-igep.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-ldp.dts | 2 +-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-n900.dts | 2 +-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 +-
+ arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-overo-base.dtsi | 6 ++
+ .../boot/dts/omap3-overo-chestnut43-common.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-pandora-common.dtsi | 10 ++--
+ arch/arm/boot/dts/omap3-sniper.dts | 2 +-
+ arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-zoom3.dts | 2 +-
+ arch/arm/boot/dts/omap3.dtsi | 6 +-
+ arch/arm/boot/dts/omap3430-sdp.dts | 2 +-
+ arch/arm/boot/dts/omap34xx.dtsi | 2 +-
+ arch/arm/boot/dts/omap36xx.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +-
+ arch/arm/boot/dts/omap4-duovero.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-kc1.dts | 2 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-sdp.dts | 2 +-
+ arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +-
+ arch/arm/boot/dts/omap4.dtsi | 4 +-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap5-cm-t54.dts | 4 +-
+ arch/arm/boot/dts/omap5-igep0050.dts | 2 +-
+ arch/arm/boot/dts/omap5-uevm.dts | 2 +-
+ arch/arm/boot/dts/omap5.dtsi | 2 -
+ 89 files changed, 402 insertions(+), 232 deletions(-)
+Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
+$ git merge omap-pending/for-next
+Already up-to-date.
+Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/qcom,gcc.txt | 16 ++
+ .../devicetree/bindings/mfd/qcom-pm8xxx.txt | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 39 +++
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 15 ++
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 180 +++++++++++--
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 103 ++++++++
+ arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 1 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 75 ++++--
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 262 +++++++++++++++++++
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 81 ++++--
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 139 ++++++++++
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 5 +
+ arch/arm/mach-qcom/Makefile | 1 -
+ arch/arm64/boot/dts/qcom/Makefile | 1 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 48 ++++
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 82 ++++++
+ arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 39 +++
+ .../boot/dts/qcom/apq8096-db820c.dts} | 24 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 88 +++++++
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 286 ++++++++++++++++++++-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 94 ++++++-
+ arch/arm64/configs/defconfig | 4 +
+ drivers/firmware/qcom_scm.c | 19 +-
+ drivers/rtc/rtc-pm8xxx.c | 1 +
+ drivers/soc/qcom/smd.c | 265 +++++++++++--------
+ drivers/soc/qcom/smem.c | 3 +-
+ include/linux/soc/qcom/smd.h | 29 ++-
+ 28 files changed, 1690 insertions(+), 212 deletions(-)
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi
+ rename arch/{arm/mach-qcom/board.c => arm64/boot/dts/qcom/apq8096-db820c.dts} (51%)
+ create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+Merging renesas/next (2593eca070b7 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9' and 'dt-for-v4.9' into next)
+$ git merge renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/shmobile.txt | 6 +
+ arch/arm/Kconfig.debug | 8 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/r7s72100-rskrza1.dts | 61 +++
+ arch/arm/boot/dts/r7s72100.dtsi | 22 +
+ arch/arm/boot/dts/r8a7790.dtsi | 23 -
+ arch/arm/boot/dts/r8a7791.dtsi | 18 -
+ arch/arm/boot/dts/r8a7792-blanche.dts | 264 ++++++++++
+ arch/arm/boot/dts/r8a7792-wheat.dts | 86 ++++
+ arch/arm/boot/dts/r8a7792.dtsi | 535 ++++++++++++++++++++-
+ arch/arm/boot/dts/r8a7794-alt.dts | 106 ++++
+ arch/arm/boot/dts/r8a7794-silk.dts | 70 +++
+ arch/arm/boot/dts/r8a7794.dtsi | 309 +++++++++++-
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 62 +--
+ arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 2 +-
+ arch/arm64/boot/dts/renesas/Makefile | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 137 ++++++
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 80 +++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 276 ++++++++++-
+ arch/arm64/configs/defconfig | 3 +
+ include/dt-bindings/clock/r7s72100-clock.h | 3 +
+ include/dt-bindings/clock/r8a7794-clock.h | 25 +
+ 24 files changed, 2009 insertions(+), 94 deletions(-)
+ create mode 100644 arch/arm/boot/dts/r7s72100-rskrza1.dts
+ create mode 100644 arch/arm/boot/dts/r8a7792-wheat.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
+Merging rockchip/for-next (f6ac35a7b1cf Merge branch 'v4.9-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi
+Auto-merging arch/arm/boot/dts/rk3xxx.dtsi
+Auto-merging arch/arm/boot/dts/rk3288.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/rockchip.txt | 12 +
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/rk3036.dtsi | 12 +-
+ arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 +
+ arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 +
+ arch/arm/boot/dts/rk3288-evb.dtsi | 45 ++-
+ arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++++++++
+ arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 310 ++++++++++++++++
+ arch/arm/boot/dts/rk3288-firefly-reload.dts | 403 +++++++++++++++++++++
+ arch/arm/boot/dts/rk3288.dtsi | 73 ++--
+ arch/arm/boot/dts/rk3xxx.dtsi | 12 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 1 +
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 382 +++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 +
+ arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 56 +++
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 353 +++++++++++++++++-
+ drivers/clk/rockchip/Makefile | 1 +
+ drivers/clk/rockchip/clk-ddr.c | 154 ++++++++
+ drivers/clk/rockchip/clk-pll.c | 4 +-
+ drivers/clk/rockchip/clk-rk3399.c | 56 ++-
+ drivers/clk/rockchip/clk-rockchip.c | 7 +-
+ drivers/clk/rockchip/clk.c | 11 +-
+ drivers/clk/rockchip/clk.h | 35 +-
+ drivers/soc/rockchip/pm_domains.c | 100 ++---
+ include/dt-bindings/clock/rk3399-cru.h | 3 +
+ include/dt-bindings/soc/rockchip,boot-mode.h | 15 +
+ include/soc/rockchip/rockchip_sip.h | 27 ++
+ 28 files changed, 2372 insertions(+), 103 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3288-fennec.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
+ create mode 100644 drivers/clk/rockchip/clk-ddr.c
+ create mode 100644 include/dt-bindings/soc/rockchip,boot-mode.h
+ create mode 100644 include/soc/rockchip/rockchip_sip.h
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (9c2c94f84659 Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Recorded preimage for 'arch/arm64/boot/dts/exynos/exynos7.dtsi'
+Auto-merging arch/arm64/boot/dts/exynos/exynos7.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/exynos/exynos7.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm64/boot/dts/exynos/exynos7.dtsi'.
+[master 06d01322542e] Merge remote-tracking branch 'samsung-krzk/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/display/exynos/exynos_hdmi.txt | 4 ++--
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/exynos3250-artik5.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos3250-monk.dts | 3 ++-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 3 ++-
+ arch/arm/boot/dts/exynos3250.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos4.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos4210-origen.dts | 3 ++-
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 3 ++-
+ arch/arm/boot/dts/exynos4210-trats.dts | 3 ++-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 5 +++--
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-odroidx2.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-origen.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-tiny4412.dts | 3 ++-
+ arch/arm/boot/dts/exynos4412-trats2.dts | 3 ++-
+ arch/arm/boot/dts/exynos4415.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos4x12.dtsi | 5 ++++-
+ arch/arm/boot/dts/exynos5.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 5 +++--
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +++--
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 5 +++--
+ arch/arm/boot/dts/exynos5250-spring.dts | 5 +++--
+ arch/arm/boot/dts/exynos5260-xyref5260.dts | 3 ++-
+ arch/arm/boot/dts/exynos5260.dtsi | 4 ++--
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 +++--
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 3 ++-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 +++++++++++++++-
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +++--
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 5 +++--
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 7 ++++---
+ arch/arm/boot/dts/exynos5440-sd5v1.dts | 6 ++++++
+ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 6 ++++++
+ arch/arm/boot/dts/exynos5440.dtsi | 3 ++-
+ arch/arm/boot/dts/exynos54xx.dtsi | 1 -
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +++--
+ arch/arm/mach-exynos/suspend.c | 6 ++++++
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +++++++++----
+ 41 files changed, 123 insertions(+), 53 deletions(-)
+Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
+$ git merge tegra/for-next
+Auto-merging arch/arm64/Kconfig.platforms
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/tegra114.dtsi | 8 +-
+ arch/arm64/Kconfig.platforms | 2 +
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 120 ++++++++++++++++++++++++++
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 79 +++++++++++++++--
+ drivers/bus/Kconfig | 6 +-
+ drivers/bus/tegra-aconnect.c | 22 +----
+ drivers/clk/tegra/clk-tegra-pmc.c | 2 +-
+ drivers/soc/tegra/pmc.c | 28 ++----
+ 8 files changed, 210 insertions(+), 57 deletions(-)
+Merging arm64/for-next/core (a9be2ee09385 arm64: head.S: document the use of callee saved registers)
+$ git merge arm64/for-next/core
+Recorded preimage for 'arch/arm64/kernel/head.S'
+Auto-merging arch/arm64/mm/proc.S
+Auto-merging arch/arm64/kernel/head.S
+CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
+Auto-merging arch/arm64/Kconfig.platforms
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm64/kernel/head.S'.
+[master 1b1fb219bdbc] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/Kconfig | 20 ++--
+ arch/arm64/Kconfig.debug | 10 --
+ arch/arm64/Kconfig.platforms | 1 -
+ arch/arm64/Makefile | 10 ++
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/acpi.h | 8 +-
+ arch/arm64/include/asm/cacheflush.h | 3 +-
+ arch/arm64/include/asm/cpufeature.h | 15 +--
+ arch/arm64/include/asm/hw_breakpoint.h | 2 -
+ arch/arm64/include/asm/pgtable-prot.h | 5 +-
+ arch/arm64/include/asm/pgtable.h | 20 +++-
+ arch/arm64/include/asm/processor.h | 2 -
+ arch/arm64/include/asm/sections.h | 30 +++++
+ arch/arm64/include/asm/suspend.h | 3 +
+ arch/arm64/include/asm/system_misc.h | 6 -
+ arch/arm64/include/asm/traps.h | 6 +-
+ arch/arm64/include/asm/virt.h | 9 +-
+ arch/arm64/kernel/Makefile | 2 +
+ arch/arm64/kernel/alternative.c | 7 +-
+ arch/arm64/kernel/cpu_ops.c | 3 +-
+ arch/arm64/kernel/cpufeature.c | 99 ++++++++--------
+ arch/arm64/kernel/debug-monitors.c | 36 ++----
+ arch/arm64/kernel/entry.S | 14 +--
+ arch/arm64/kernel/head.S | 200 ++++++++++++++++++---------------
+ arch/arm64/kernel/hibernate-asm.S | 4 +-
+ arch/arm64/kernel/hibernate.c | 118 +++++++++++++------
+ arch/arm64/kernel/hw_breakpoint.c | 48 +++-----
+ arch/arm64/kernel/insn.c | 2 +-
+ arch/arm64/kernel/kaslr.c | 3 +-
+ arch/arm64/kernel/perf_event.c | 6 +-
+ arch/arm64/kernel/probes/kprobes.c | 34 +++---
+ arch/arm64/kernel/setup.c | 11 +-
+ arch/arm64/kernel/signal.c | 36 ++++--
+ arch/arm64/kernel/sleep.S | 31 ++---
+ arch/arm64/kernel/smp_spin_table.c | 3 +-
+ arch/arm64/kernel/suspend.c | 10 +-
+ arch/arm64/kernel/vdso.c | 34 +++---
+ arch/arm64/kernel/vmlinux.lds.S | 19 ++++
+ arch/arm64/mm/cache.S | 82 +++++++-------
+ arch/arm64/mm/dma-mapping.c | 9 +-
+ arch/arm64/mm/fault.c | 5 +-
+ arch/arm64/mm/init.c | 5 +-
+ arch/arm64/mm/mmu.c | 3 +-
+ arch/arm64/mm/pageattr.c | 41 ++++++-
+ arch/arm64/mm/proc.S | 4 +
+ include/linux/cpu.h | 6 +-
+ include/linux/cpuhotplug.h | 2 +
+ kernel/cpu.c | 9 +-
+ mm/mmap.c | 5 +
+ 49 files changed, 590 insertions(+), 452 deletions(-)
+ create mode 100644 arch/arm64/include/asm/sections.h
+Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
+$ git merge blackfin/for-linus
+Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution.
+Auto-merging arch/blackfin/mach-common/pm.c
+CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0f04d2e19637] Merge remote-tracking branch 'blackfin/for-linus'
+$ git diff -M --stat --summary HEAD^..
+Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (986d80466712 m68k/defconfig: Update defconfigs for v4.8-rc1)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig | 3 +++
+ arch/m68k/configs/apollo_defconfig | 3 +++
+ arch/m68k/configs/atari_defconfig | 3 +++
+ arch/m68k/configs/bvme6000_defconfig | 3 +++
+ arch/m68k/configs/hp300_defconfig | 3 +++
+ arch/m68k/configs/mac_defconfig | 3 +++
+ arch/m68k/configs/multi_defconfig | 3 +++
+ arch/m68k/configs/mvme147_defconfig | 3 +++
+ arch/m68k/configs/mvme16x_defconfig | 3 +++
+ arch/m68k/configs/q40_defconfig | 3 +++
+ arch/m68k/configs/sun3_defconfig | 3 +++
+ arch/m68k/configs/sun3x_defconfig | 3 +++
+ 12 files changed, 36 insertions(+)
+Merging m68knommu/for-next (bab9058f2048 m68k: don't panic if no hardware FPU defined)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig | 1 -
+ arch/m68k/Kconfig.cpu | 6 ++++++
+ arch/m68k/coldfire/head.S | 8 +++----
+ arch/m68k/coldfire/m528x.c | 8 +++----
+ arch/m68k/coldfire/m53xx.c | 8 ++-----
+ arch/m68k/coldfire/m54xx.c | 40 +----------------------------------
+ arch/m68k/include/asm/m5441xsim.h | 4 ++++
+ arch/m68k/include/asm/m54xxacr.h | 2 +-
+ arch/m68k/include/asm/m54xxsim.h | 4 ++++
+ arch/m68k/include/asm/mcfmmu.h | 1 +
+ arch/m68k/include/asm/nettel.h | 2 +-
+ arch/m68k/include/uapi/asm/bootinfo.h | 1 +
+ arch/m68k/kernel/process.c | 4 ++--
+ arch/m68k/kernel/setup_mm.c | 5 +++--
+ arch/m68k/mm/mcfmmu.c | 31 ++++++++++++++++++++++++++-
+ 15 files changed, 64 insertions(+), 61 deletions(-)
+Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (82440d0d030d Merge branch '4.8-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/kernel/smp-gic.c
+Auto-merging arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mips/brcm/soc.txt | 4 +-
+ arch/mips/Kconfig | 13 ++
+ arch/mips/ath79/clock.c | 2 +-
+ arch/mips/bcm47xx/serial.c | 11 +-
+ arch/mips/bmips/Kconfig | 20 ++-
+ arch/mips/bmips/setup.c | 4 +-
+ arch/mips/boot/dts/brcm/Makefile | 36 +++---
+ .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 ++++
+ arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++++++++++++++
+ .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +++++++++++++++++
+ arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +++++++++++++++++++++
+ ...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 +
+ .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 ++++
+ arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++
+ arch/mips/cavium-octeon/setup.c | 38 +++---
+ arch/mips/configs/loongson1c_defconfig | 126 +++++++++++++++++++
+ arch/mips/configs/pistachio_defconfig | 2 -
+ arch/mips/include/asm/cpu-type.h | 3 +-
+ arch/mips/include/asm/cpu.h | 1 +
+ arch/mips/include/asm/mach-loongson32/irq.h | 41 ++++++-
+ arch/mips/include/asm/mach-loongson32/loongson1.h | 5 +
+ arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 ++++++
+ arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 ++++++++++
+ arch/mips/kernel/proc.c | 7 ++
+ arch/mips/kernel/setup.c | 7 ++
+ arch/mips/kernel/smp-gic.c | 66 ----------
+ arch/mips/kernel/smp-mt.c | 23 ----
+ arch/mips/kernel/uprobes.c | 2 +-
+ arch/mips/lantiq/xway/vmmc.c | 6 +-
+ arch/mips/lantiq/xway/xrx200_phy_fw.c | 12 +-
+ arch/mips/loongson32/Kconfig | 15 +++
+ arch/mips/loongson32/Makefile | 6 +
+ arch/mips/loongson32/Platform | 1 +
+ arch/mips/loongson32/common/irq.c | 55 ++++++++-
+ arch/mips/loongson32/common/platform.c | 19 +++
+ arch/mips/loongson32/common/setup.c | 4 +
+ arch/mips/loongson32/ls1c/Makefile | 5 +
+ arch/mips/loongson32/ls1c/board.c | 28 +++++
+ arch/mips/mm/init.c | 13 +-
+ arch/mips/pci/pci-mt7620.c | 1 -
+ arch/mips/ralink/timer.c | 28 ++---
+ 41 files changed, 1035 insertions(+), 186 deletions(-)
+ create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
+ create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi
+ create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
+ create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi
+ rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%)
+ create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
+ create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi
+ create mode 100644 arch/mips/configs/loongson1c_defconfig
+ delete mode 100644 arch/mips/kernel/smp-gic.c
+ create mode 100644 arch/mips/loongson32/ls1c/Makefile
+ create mode 100644 arch/mips/loongson32/ls1c/board.c
+Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
+$ git merge nios2/for-next
+Merge made by the 'recursive' strategy.
+ arch/nios2/include/asm/cpuinfo.h | 8 ++++----
+ arch/nios2/kernel/cpuinfo.c | 15 +++++----------
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+Merging parisc-hd/for-next (523d939ef98f Linux 4.7)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (29b4817d4018 Linux 4.8-rc1)
+$ git merge powerpc/next
+Already up-to-date.
+Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (f5b55fa1f81d RAID/s390: provide raid6 recovery optimization)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/crypto/aes_s390.c | 590 +++++++++++++--------------------
+ arch/s390/crypto/crc32-vx.c | 2 +-
+ arch/s390/crypto/des_s390.c | 330 ++++++++----------
+ arch/s390/crypto/ghash_s390.c | 20 +-
+ arch/s390/crypto/prng.c | 99 ++----
+ arch/s390/crypto/sha1_s390.c | 2 +-
+ arch/s390/crypto/sha256_s390.c | 2 +-
+ arch/s390/crypto/sha512_s390.c | 2 +-
+ arch/s390/crypto/sha_common.c | 23 +-
+ arch/s390/include/asm/cpacf.h | 178 +++++-----
+ arch/s390/include/asm/facilities_src.h | 24 ++
+ arch/s390/include/asm/fpu/api.h | 32 +-
+ arch/s390/include/asm/lowcore.h | 3 +-
+ arch/s390/include/asm/mmu.h | 1 +
+ arch/s390/include/asm/mmu_context.h | 1 +
+ arch/s390/include/asm/pci.h | 4 +
+ arch/s390/include/asm/pgtable.h | 74 ++---
+ arch/s390/include/asm/tlbflush.h | 72 ++--
+ arch/s390/include/asm/vx-insn.h | 148 +++++++--
+ arch/s390/kernel/fpu.c | 317 +++++++-----------
+ arch/s390/kernel/nmi.c | 67 ++--
+ arch/s390/kernel/sysinfo.c | 2 +-
+ arch/s390/kernel/time.c | 86 +----
+ arch/s390/kvm/kvm-s390.c | 38 ++-
+ arch/s390/mm/gmap.c | 15 +
+ arch/s390/mm/pageattr.c | 4 +-
+ arch/s390/mm/pgtable.c | 18 +-
+ arch/s390/pci/pci.c | 9 +
+ drivers/s390/char/tape_3590.c | 11 +-
+ drivers/s390/cio/cio.h | 1 -
+ include/linux/raid/pq.h | 2 +
+ lib/raid6/.gitignore | 1 +
+ lib/raid6/Makefile | 6 +
+ lib/raid6/algos.c | 6 +
+ lib/raid6/recov_s390xc.c | 116 +++++++
+ lib/raid6/s390vx.uc | 168 ++++++++++
+ 36 files changed, 1235 insertions(+), 1239 deletions(-)
+ create mode 100644 lib/raid6/recov_s390xc.c
+ create mode 100644 lib/raid6/s390vx.uc
+Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
+$ git merge sh/for-next
+Already up-to-date.
+Merging tile/master (87d7993103fc tile/pci_gx: fix spelling mistake: "delievered" -> "delivered")
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/kernel/pci_gx.c | 2 +-
+ drivers/char/tile-srom.c | 28 +++++++++++++++-------------
+ 2 files changed, 16 insertions(+), 14 deletions(-)
+Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
+$ git merge unicore32/unicore32
+Merge made by the 'recursive' strategy.
+Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
+$ git merge xtensa/for_next
+Auto-merging arch/xtensa/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ Documentation/xtensa/mmu.txt | 173 ++++++++++++++++---
+ arch/xtensa/Kconfig | 90 ++++++++--
+ arch/xtensa/boot/boot-elf/boot.lds.S | 2 +-
+ arch/xtensa/boot/boot-elf/bootstrap.S | 7 +-
+ arch/xtensa/boot/boot-uboot/Makefile | 10 +-
+ arch/xtensa/include/asm/bitops.h | 2 +-
+ arch/xtensa/include/asm/cacheasm.h | 11 +-
+ arch/xtensa/include/asm/fixmap.h | 5 +
+ arch/xtensa/include/asm/highmem.h | 5 +
+ arch/xtensa/include/asm/initialize_mmu.h | 44 +++--
+ arch/xtensa/include/asm/kmem_layout.h | 74 ++++++++
+ arch/xtensa/include/asm/page.h | 27 ++-
+ arch/xtensa/include/asm/pgtable.h | 7 +-
+ arch/xtensa/include/asm/processor.h | 2 +-
+ arch/xtensa/include/asm/sysmem.h | 21 +--
+ arch/xtensa/include/asm/vectors.h | 67 +++-----
+ arch/xtensa/include/uapi/asm/types.h | 3 +-
+ arch/xtensa/include/uapi/asm/unistd.h | 15 +-
+ arch/xtensa/kernel/entry.S | 5 +-
+ arch/xtensa/kernel/head.S | 2 +-
+ arch/xtensa/kernel/setup.c | 48 +++---
+ arch/xtensa/kernel/vmlinux.lds.S | 4 -
+ arch/xtensa/mm/init.c | 279 +++----------------------------
+ 23 files changed, 448 insertions(+), 455 deletions(-)
+ create mode 100644 arch/xtensa/include/asm/kmem_layout.h
+Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+ fs/befs/befs.h | 19 +---
+ fs/befs/btree.c | 60 ++++++------
+ fs/befs/datastream.c | 253 +++++++++++++++++++++++++--------------------------
+ fs/befs/debug.c | 1 +
+ fs/befs/io.c | 26 +-----
+ fs/befs/io.h | 2 -
+ fs/befs/linuxvfs.c | 130 +++++++++++++-------------
+ fs/befs/super.c | 36 +++++---
+ 8 files changed, 244 insertions(+), 283 deletions(-)
+Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
+$ git merge btrfs/next
+Already up-to-date.
+Merging btrfs-kdave/for-next (79354fc60318 Btrfs: fix lockdep warning on deadlock against an inode's log mutex)
+$ git merge btrfs-kdave/for-next
+Recorded preimage for 'fs/btrfs/relocation.c'
+Recorded preimage for 'fs/btrfs/send.c'
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/send.c
+CONFLICT (content): Merge conflict in fs/btrfs/send.c
+Auto-merging fs/btrfs/relocation.c
+CONFLICT (content): Merge conflict in fs/btrfs/relocation.c
+Auto-merging fs/btrfs/raid56.c
+Auto-merging fs/btrfs/extent-tree.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/ctree.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/btrfs/relocation.c'.
+Recorded resolution for 'fs/btrfs/send.c'.
+[master 7aa1063453b7] Merge remote-tracking branch 'btrfs-kdave/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/disk-io.c | 13 ++++++-------
+ fs/btrfs/extent-tree.c | 42 ++++++++++++++++++++++++++++++++++--------
+ fs/btrfs/raid56.c | 5 ++++-
+ fs/btrfs/send.c | 38 +++++++++++++++++++++++++++-----------
+ fs/btrfs/volumes.c | 42 +++++++++++++++++++++---------------------
+ 6 files changed, 93 insertions(+), 49 deletions(-)
+Merging ceph/master (c0de9f5143b5 ceph: do not modify fi->frag in need_reset_readdir())
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/addr.c | 19 +++++++++----------
+ fs/ceph/dir.c | 2 +-
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root())
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsfs.c | 29 ++++++++++++-----------------
+ fs/cifs/cifsproto.h | 2 +-
+ fs/cifs/connect.c | 31 +++++++++++++++++++++++++++++--
+ 3 files changed, 42 insertions(+), 20 deletions(-)
+Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+Merging ext3/for_next (3cd0126dca82 quota: fill in Q_XGETQSTAT inode information for inactive quotas)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/ialloc.c | 5 +++++
+ fs/quota/quota.c | 18 ++++++++++++------
+ 2 files changed, 17 insertions(+), 6 deletions(-)
+Merging ext4/dev (8913f343cdb5 mbcache: fix to detect failure of register_shrinker)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/move_extent.c | 7 ++
+ fs/ext4/xattr.c | 340 ++++++++++++++++++++++++++------------------------
+ fs/mbcache.c | 6 +-
+ 3 files changed, 190 insertions(+), 163 deletions(-)
+Merging f2fs/dev (908b1928d645 f2fs: add roll-forward recovery process for encrypted dentry)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 1 +
+ fs/f2fs/checkpoint.c | 15 ++++
+ fs/f2fs/data.c | 20 ++++-
+ fs/f2fs/debug.c | 14 +++-
+ fs/f2fs/dir.c | 104 +++++++++++++----------
+ fs/f2fs/f2fs.h | 42 ++++++++--
+ fs/f2fs/file.c | 4 +-
+ fs/f2fs/gc.c | 52 +++++++-----
+ fs/f2fs/inline.c | 19 +++--
+ fs/f2fs/node.c | 2 -
+ fs/f2fs/recovery.c | 25 +++---
+ fs/f2fs/segment.c | 167 +++++++++++++++++++++++++++++++------
+ fs/f2fs/segment.h | 4 +-
+ fs/f2fs/super.c | 8 ++
+ fs/f2fs/xattr.c | 2 +
+ include/trace/events/f2fs.h | 18 ++--
+ 16 files changed, 360 insertions(+), 137 deletions(-)
+Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
+$ git merge freevxfs/for-next
+Already up-to-date.
+Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
+$ git merge fscache/fscache
+Already up-to-date.
+Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors())
+$ git merge fuse/for-next
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/btrfs/tree-log.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/ctree.h | 1 -
+ fs/btrfs/inode.c | 15 ---------------
+ fs/btrfs/tree-log.c | 4 ++--
+ fs/f2fs/node.c | 7 ++-----
+ 4 files changed, 4 insertions(+), 23 deletions(-)
+$ git am -3 ../patches/0001-btrfs-merge-fix-for-mm-export-filemap_check_errors-t.patch
+Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules"
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/btrfs/file.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 83ab24434481] Merge remote-tracking branch 'fuse/for-next'
+ Date: Mon Sep 5 11:54:08 2016 +1000
+Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 19 +++++++++++++------
+ fs/gfs2/bmap.c | 6 +++---
+ fs/gfs2/dir.c | 20 ++++++++++----------
+ fs/gfs2/glock.c | 2 +-
+ fs/gfs2/inode.h | 2 +-
+ fs/gfs2/meta_io.c | 35 +++++++++++++++++++----------------
+ fs/gfs2/ops_fstype.c | 8 ++++----
+ fs/gfs2/quota.c | 4 ++--
+ fs/gfs2/super.c | 2 +-
+ 9 files changed, 54 insertions(+), 44 deletions(-)
+Merging jfs/jfs-next (7cfcd8b79ab2 jfs: jump to error_out when filemap_{fdatawait, write_and_wait} fails)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/resize.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+Merging nfs/linux-next (86a1679860ba Merge tag 'md/4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (e2ce4e03e317 nfsd: eliminate cb_minorversion field)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/flexfilelayout.c | 1 +
+ fs/nfsd/nfs4callback.c | 7 +++----
+ fs/nfsd/nfs4layouts.c | 6 +++++-
+ fs/nfsd/pnfs.h | 1 +
+ fs/nfsd/state.h | 1 -
+ 5 files changed, 10 insertions(+), 6 deletions(-)
+Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
+$ git merge orangefs/for-next
+Merge made by the 'recursive' strategy.
+ fs/orangefs/downcall.h | 5 +-
+ fs/orangefs/file.c | 36 ++++++++++-
+ fs/orangefs/orangefs-cache.c | 4 +-
+ fs/orangefs/orangefs-dev-proto.h | 2 +-
+ fs/orangefs/orangefs-sysfs.c | 127 +++++++++++++++++++++++++++++++++++----
+ fs/orangefs/orangefs-utils.c | 2 +-
+ fs/orangefs/upcall.h | 12 +++-
+ 7 files changed, 167 insertions(+), 21 deletions(-)
+Merging overlayfs/overlayfs-next (39345f37f131 Revert "ovl: get_write_access() in truncate")
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.txt | 3 --
+ fs/inode.c | 38 +++++++++++++++++++----
+ fs/locks.c | 53 +++++++++++++++++++--------------
+ fs/namespace.c | 2 +-
+ fs/open.c | 17 +++++++++--
+ fs/overlayfs/inode.c | 21 -------------
+ fs/overlayfs/super.c | 2 +-
+ include/linux/dcache.h | 5 ++--
+ include/linux/fs.h | 16 ++++++++--
+ include/linux/fsnotify.h | 14 +++++----
+ include/uapi/linux/fs.h | 1 +
+ 11 files changed, 105 insertions(+), 67 deletions(-)
+Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (ea78d80866ce xfs: track log done items directly in the deferred pending work item)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
+$ git merge file-locks/linux-next
+Auto-merging fs/locks.c
+Merge made by the 'recursive' strategy.
+ fs/locks.c | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
+$ git merge vfs-miklos/next
+Auto-merging include/linux/fs.h
+Auto-merging fs/xfs/xfs_iops.c
+Auto-merging fs/overlayfs/overlayfs.h
+Auto-merging fs/overlayfs/dir.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/ceph/dir.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging drivers/staging/lustre/lustre/llite/namei.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/Locking | 8 ++------
+ Documentation/filesystems/directory-locking | 2 +-
+ Documentation/filesystems/porting | 4 ++++
+ Documentation/filesystems/vfs.txt | 9 ++-------
+ drivers/staging/lustre/lustre/llite/namei.c | 8 ++++++--
+ fs/9p/v9fs.h | 3 ++-
+ fs/9p/vfs_inode.c | 6 +++++-
+ fs/affs/affs.h | 3 ++-
+ fs/affs/namei.c | 6 +++++-
+ fs/afs/dir.c | 9 +++++++--
+ fs/bad_inode.c | 2 +-
+ fs/bfs/dir.c | 6 +++++-
+ fs/btrfs/inode.c | 2 +-
+ fs/cachefiles/namei.c | 3 +--
+ fs/ceph/dir.c | 6 +++++-
+ fs/cifs/cifsfs.c | 2 +-
+ fs/coda/dir.c | 6 +++++-
+ fs/debugfs/inode.c | 2 +-
+ fs/ecryptfs/inode.c | 6 +++++-
+ fs/exofs/namei.c | 8 ++++++--
+ fs/ext2/namei.c | 6 +++++-
+ fs/ext4/namei.c | 2 +-
+ fs/f2fs/namei.c | 2 +-
+ fs/fat/namei_msdos.c | 6 +++++-
+ fs/fat/namei_vfat.c | 6 +++++-
+ fs/fuse/dir.c | 2 +-
+ fs/gfs2/inode.c | 2 +-
+ fs/hfs/dir.c | 6 +++++-
+ fs/hfsplus/dir.c | 6 +++++-
+ fs/hostfs/hostfs_kern.c | 2 +-
+ fs/hpfs/namei.c | 6 +++++-
+ fs/jffs2/dir.c | 9 +++++++--
+ fs/jfs/namei.c | 5 ++++-
+ fs/kernfs/dir.c | 6 +++++-
+ fs/libfs.c | 6 +++++-
+ fs/logfs/dir.c | 6 +++++-
+ fs/minix/namei.c | 6 +++++-
+ fs/namei.c | 15 +++------------
+ fs/ncpfs/dir.c | 11 +++++++----
+ fs/nfs/dir.c | 6 +++++-
+ fs/nfs/internal.h | 3 ++-
+ fs/nilfs2/namei.c | 6 +++++-
+ fs/ocfs2/namei.c | 6 +++++-
+ fs/omfs/dir.c | 6 +++++-
+ fs/orangefs/namei.c | 6 +++++-
+ fs/overlayfs/dir.c | 2 +-
+ fs/overlayfs/overlayfs.h | 4 ++--
+ fs/reiserfs/namei.c | 6 +++++-
+ fs/sysv/namei.c | 6 +++++-
+ fs/ubifs/dir.c | 8 ++++++--
+ fs/udf/namei.c | 6 +++++-
+ fs/ufs/namei.c | 6 +++++-
+ fs/xfs/xfs_iops.c | 4 ++--
+ include/linux/fs.h | 5 ++---
+ mm/shmem.c | 2 +-
+ security/tomoyo/realpath.c | 4 ++--
+ 56 files changed, 206 insertions(+), 91 deletions(-)
+Merging vfs/for-next (3baf32898e1c parisc: use %pD)
+$ git merge vfs/for-next
+Auto-merging fs/orangefs/namei.c
+Auto-merging fs/orangefs/file.c
+Merge made by the 'recursive' strategy.
+ arch/parisc/kernel/cache.c | 2 +-
+ drivers/gpu/drm/drm_debugfs.c | 4 +-
+ drivers/gpu/drm/msm/msm_perf.c | 4 +-
+ drivers/gpu/drm/msm/msm_rd.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 6 +--
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 16 ++++----
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +-
+ drivers/staging/lustre/lustre/llite/file.c | 4 +-
+ fs/orangefs/dir.c | 4 +-
+ fs/orangefs/file.c | 4 +-
+ fs/orangefs/inode.c | 12 +++---
+ fs/orangefs/namei.c | 44 +++++++++++-----------
+ fs/orangefs/orangefs-debugfs.c | 4 +-
+ 13 files changed, 53 insertions(+), 59 deletions(-)
+Merging pci/next (503104ad2dc4 Merge branches 'pci/host-aardvark', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar' and 'pci/host-tegra' into next)
+$ git merge pci/next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/quirks.c
+Merge made by the 'recursive' strategy.
+ drivers/pci/host/pci-aardvark.c | 4 +-
+ drivers/pci/host/pci-dra7xx.c | 31 +------
+ drivers/pci/host/pci-exynos.c | 7 +-
+ drivers/pci/host/pci-host-common.c | 7 +-
+ drivers/pci/host/pci-hyperv.c | 3 +-
+ drivers/pci/host/pci-imx6.c | 9 +-
+ drivers/pci/host/pci-keystone.c | 5 +-
+ drivers/pci/host/pci-tegra.c | 47 +++++------
+ drivers/pci/host/pcie-altera-msi.c | 10 +--
+ drivers/pci/host/pcie-altera.c | 12 ++-
+ drivers/pci/host/pcie-designware.c | 5 --
+ drivers/pci/host/pcie-qcom.c | 28 ++-----
+ drivers/pci/host/pcie-rcar.c | 10 +--
+ drivers/pci/host/pcie-spear13xx.c | 11 +--
+ drivers/pci/host/pcie-xilinx-nwl.c | 53 +-----------
+ drivers/pci/host/pcie-xilinx.c | 53 +-----------
+ drivers/pci/hotplug/cpci_hotplug.h | 2 -
+ drivers/pci/hotplug/cpci_hotplug_core.c | 10 ---
+ drivers/pci/hotplug/pci_hotplug_core.c | 18 ++--
+ drivers/pci/hotplug/pciehp_core.c | 20 ++---
+ drivers/pci/pci.h | 6 ++
+ drivers/pci/pcie/Kconfig | 11 +++
+ drivers/pci/pcie/Makefile | 1 +
+ drivers/pci/pcie/aer/aerdrv.c | 18 +---
+ drivers/pci/pcie/pcie-dpc.c | 18 +---
+ drivers/pci/pcie/pme.c | 16 +---
+ drivers/pci/pcie/portdrv_pci.c | 17 +---
+ drivers/pci/pcie/ptm.c | 142 ++++++++++++++++++++++++++++++++
+ drivers/pci/probe.c | 3 +
+ drivers/pci/quirks.c | 1 +
+ include/linux/pci.h | 13 +++
+ include/uapi/linux/pci_regs.h | 12 ++-
+ 32 files changed, 269 insertions(+), 334 deletions(-)
+ create mode 100644 drivers/pci/pcie/ptm.c
+Merging pstore/for-next/pstore (e976e56423dc ramoops: use persistent_ram_free() instead of kfree() for freeing prz)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (ec3727c27e6b Merge branch 'for-4.9/intel-ish' into for-next)
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-wacom | 5 +
+ Documentation/hid/intel-ish-hid.txt | 454 +++++++++
+ MAINTAINERS | 7 +
+ drivers/hid/Kconfig | 3 +
+ drivers/hid/Makefile | 2 +
+ drivers/hid/hid-core.c | 5 +-
+ drivers/hid/hid-ids.h | 2 +
+ drivers/hid/hid-input.c | 1 +
+ drivers/hid/hid-microsoft.c | 2 +
+ drivers/hid/hid-saitek.c | 2 +
+ drivers/hid/hid-sensor-hub.c | 4 +
+ drivers/hid/hid-sony.c | 6 +-
+ drivers/hid/intel-ish-hid/Kconfig | 17 +
+ drivers/hid/intel-ish-hid/Makefile | 22 +
+ drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h | 220 ++++
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 71 ++
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 881 ++++++++++++++++
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 322 ++++++
+ drivers/hid/intel-ish-hid/ipc/utils.h | 64 ++
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 978 ++++++++++++++++++
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 246 +++++
+ drivers/hid/intel-ish-hid/ishtp-hid.h | 182 ++++
+ drivers/hid/intel-ish-hid/ishtp/bus.c | 788 ++++++++++++++
+ drivers/hid/intel-ish-hid/ishtp/bus.h | 114 +++
+ drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 257 +++++
+ drivers/hid/intel-ish-hid/ishtp/client.c | 1054 +++++++++++++++++++
+ drivers/hid/intel-ish-hid/ishtp/client.h | 182 ++++
+ drivers/hid/intel-ish-hid/ishtp/dma-if.c | 175 ++++
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 1032 +++++++++++++++++++
+ drivers/hid/intel-ish-hid/ishtp/hbm.h | 321 ++++++
+ drivers/hid/intel-ish-hid/ishtp/init.c | 115 +++
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 277 +++++
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hid/wacom.h | 96 +-
+ drivers/hid/wacom_sys.c | 1187 ++++++++++++++++------
+ drivers/hid/wacom_wac.c | 435 +++++---
+ drivers/hid/wacom_wac.h | 22 +-
+ include/trace/events/intel_ish.h | 30 +
+ include/uapi/linux/input.h | 1 +
+ 39 files changed, 9066 insertions(+), 517 deletions(-)
+ create mode 100644 Documentation/hid/intel-ish-hid.txt
+ create mode 100644 drivers/hid/intel-ish-hid/Kconfig
+ create mode 100644 drivers/hid/intel-ish-hid/Makefile
+ create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h
+ create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish.h
+ create mode 100644 drivers/hid/intel-ish-hid/ipc/ipc.c
+ create mode 100644 drivers/hid/intel-ish-hid/ipc/pci-ish.c
+ create mode 100644 drivers/hid/intel-ish-hid/ipc/utils.h
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid-client.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.h
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.h
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/client-buffers.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.h
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/dma-if.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.h
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/init.c
+ create mode 100644 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h
+ create mode 100644 include/trace/events/intel_ish.h
+Merging i2c/i2c/for-next (d213a2198556 Merge branch 'i2c/for-4.9' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Auto-merging drivers/i2c/busses/i2c-octeon-core.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/i2c/i2c-arb-gpio-challenge.txt | 8 +-
+ Documentation/devicetree/bindings/i2c/i2c-arb.txt | 35 +
+ Documentation/devicetree/bindings/i2c/i2c-gate.txt | 41 +
+ Documentation/devicetree/bindings/i2c/i2c-mux.txt | 23 +-
+ .../devicetree/bindings/i2c/nxp,pca9541.txt | 29 +
+ MAINTAINERS | 10 +
+ drivers/gpu/drm/drm_dp_helper.c | 10 +-
+ drivers/i2c/busses/Kconfig | 11 +
+ drivers/i2c/busses/Makefile | 3 +
+ drivers/i2c/busses/i2c-amd756.c | 5 +-
+ drivers/i2c/busses/i2c-at91.c | 2 -
+ drivers/i2c/busses/i2c-axxia.c | 8 +-
+ drivers/i2c/busses/i2c-bcm-iproc.c | 8 +-
+ drivers/i2c/busses/i2c-bcm-kona.c | 6 +-
+ drivers/i2c/busses/i2c-bfin-twi.c | 4 +-
+ drivers/i2c/busses/i2c-brcmstb.c | 4 +-
+ drivers/i2c/busses/i2c-cadence.c | 4 +-
+ drivers/i2c/busses/i2c-cpm.c | 4 +-
+ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +-
+ drivers/i2c/busses/i2c-davinci.c | 4 +-
+ drivers/i2c/busses/i2c-designware-core.c | 196 ++--
+ drivers/i2c/busses/i2c-designware-core.h | 12 +
+ drivers/i2c/busses/i2c-designware-platdrv.c | 43 +-
+ drivers/i2c/busses/i2c-diolan-u2c.c | 4 +-
+ drivers/i2c/busses/i2c-dln2.c | 4 +-
+ drivers/i2c/busses/i2c-efm32.c | 1 -
+ drivers/i2c/busses/i2c-exynos5.c | 4 +-
+ drivers/i2c/busses/i2c-hix5hd2.c | 4 +-
+ drivers/i2c/busses/i2c-i801.c | 1 -
+ drivers/i2c/busses/i2c-ibm_iic.c | 4 +-
+ drivers/i2c/busses/i2c-img-scb.c | 4 +-
+ drivers/i2c/busses/i2c-imx.c | 4 +-
+ drivers/i2c/busses/i2c-isch.c | 4 +-
+ drivers/i2c/busses/i2c-ismt.c | 4 +-
+ drivers/i2c/busses/i2c-jz4780.c | 4 +-
+ drivers/i2c/busses/i2c-lpc2k.c | 4 +-
+ drivers/i2c/busses/i2c-meson.c | 1 -
+ drivers/i2c/busses/i2c-mpc.c | 4 +-
+ drivers/i2c/busses/i2c-mt65xx.c | 4 +-
+ drivers/i2c/busses/i2c-mxs.c | 1 -
+ drivers/i2c/busses/i2c-nforce2.c | 1 -
+ drivers/i2c/busses/i2c-nomadik.c | 4 +-
+ drivers/i2c/busses/i2c-ocores.c | 4 +-
+ .../i2c/busses/{i2c-octeon.c => i2c-octeon-core.c} | 1039 ++++++--------------
+ drivers/i2c/busses/i2c-octeon-core.h | 211 ++++
+ drivers/i2c/busses/i2c-octeon-platdrv.c | 286 ++++++
+ drivers/i2c/busses/i2c-omap.c | 4 +-
+ drivers/i2c/busses/i2c-piix4.c | 1 -
+ drivers/i2c/busses/i2c-pmcmsp.c | 4 +-
+ drivers/i2c/busses/i2c-pnx.c | 4 +-
+ drivers/i2c/busses/i2c-puv3.c | 5 +-
+ drivers/i2c/busses/i2c-pxa.c | 4 +-
+ drivers/i2c/busses/i2c-rcar.c | 6 +-
+ drivers/i2c/busses/i2c-riic.c | 4 +-
+ drivers/i2c/busses/i2c-rk3x.c | 4 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 1 -
+ drivers/i2c/busses/i2c-sh7760.c | 4 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 3 +-
+ drivers/i2c/busses/i2c-sirf.c | 4 +-
+ drivers/i2c/busses/i2c-st.c | 4 +-
+ drivers/i2c/busses/i2c-stu300.c | 5 +-
+ drivers/i2c/busses/i2c-tegra.c | 197 ++--
+ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 259 +++++
+ drivers/i2c/busses/i2c-uniphier-f.c | 5 -
+ drivers/i2c/busses/i2c-uniphier.c | 5 -
+ drivers/i2c/busses/i2c-wmt.c | 4 +-
+ drivers/i2c/busses/i2c-xgene-slimpro.c | 1 -
+ drivers/i2c/busses/i2c-xiic.c | 1 -
+ drivers/i2c/busses/i2c-xlp9xx.c | 4 +-
+ drivers/i2c/busses/i2c-xlr.c | 4 +-
+ drivers/i2c/i2c-core.c | 237 +++--
+ drivers/i2c/i2c-mux.c | 73 +-
+ drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +-
+ drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 +
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 11 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 46 +-
+ drivers/misc/eeprom/at24.c | 15 +-
+ include/linux/i2c-mux.h | 8 +-
+ include/linux/i2c.h | 46 +-
+ 79 files changed, 1869 insertions(+), 1182 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-gate.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pca9541.txt
+ rename drivers/i2c/busses/{i2c-octeon.c => i2c-octeon-core.c} (57%)
+ create mode 100644 drivers/i2c/busses/i2c-octeon-core.h
+ create mode 100644 drivers/i2c/busses/i2c-octeon-platdrv.c
+ create mode 100644 drivers/i2c/busses/i2c-thunderx-pcidrv.c
+Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-id.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+Merging hwmon-staging/hwmon-next (88c00316e51f hwmon: (it87) Drop useless comments)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/ltc4151.txt | 18 +
+ Documentation/hwmon/adt7470 | 17 +
+ Documentation/hwmon/hwmon-kernel-api.txt | 231 ++++++-
+ Documentation/hwmon/ucd9000 | 12 +-
+ Documentation/hwmon/xgene-hwmon | 30 +
+ drivers/hwmon/Kconfig | 7 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/adt7411.c | 51 +-
+ drivers/hwmon/adt7470.c | 74 ++
+ drivers/hwmon/ftsteutates.c | 45 ++
+ drivers/hwmon/hwmon.c | 616 ++++++++++++++++-
+ drivers/hwmon/it87.c | 8 +-
+ drivers/hwmon/lm95241.c | 119 ++--
+ drivers/hwmon/ltc4151.c | 22 +-
+ drivers/hwmon/nct6775.c | 8 +-
+ drivers/hwmon/ntc_thermistor.c | 107 +--
+ drivers/hwmon/pmbus/Kconfig | 6 +-
+ drivers/hwmon/pmbus/pmbus.c | 20 +-
+ drivers/hwmon/pmbus/ucd9000.c | 3 +-
+ drivers/hwmon/scpi-hwmon.c | 1 -
+ drivers/hwmon/xgene-hwmon.c | 755 +++++++++++++++++++++
+ include/linux/hwmon.h | 342 ++++++++++
+ 22 files changed, 2310 insertions(+), 183 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt
+ create mode 100644 Documentation/hwmon/xgene-hwmon
+ create mode 100644 drivers/hwmon/xgene-hwmon.c
+Merging v4l-dvb/master (b6aa39228966 Merge tag 'v4.8-rc1' into patchwork)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ drivers/media/usb/cx231xx/cx231xx-core.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+Merging pm/linux-next (05eb53caa024 Merge branches 'pm-cpufreq' and 'pm-cpufreq-sched' into linux-next)
+$ git merge pm/linux-next
+Removing tools/power/acpi/os_specific/service_layers/oslibcfs.c
+Auto-merging include/linux/acpi.h
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/acpi-lid.txt | 96 ++++
+ drivers/acpi/acpi_apd.c | 21 +
+ drivers/acpi/acpi_lpss.c | 17 +
+ drivers/acpi/acpica/acapps.h | 10 +-
+ drivers/acpi/acpica/acevents.h | 3 +
+ drivers/acpi/acpica/acglobal.h | 2 +
+ drivers/acpi/acpica/aclocal.h | 2 +
+ drivers/acpi/acpica/actables.h | 3 +-
+ drivers/acpi/acpica/acutils.h | 36 +-
+ drivers/acpi/acpica/dbfileio.c | 20 +-
+ drivers/acpi/acpica/dbobject.c | 4 +-
+ drivers/acpi/acpica/dsutils.c | 17 +-
+ drivers/acpi/acpica/evgpe.c | 57 ++
+ drivers/acpi/acpica/evxfgpe.c | 43 ++
+ drivers/acpi/acpica/hwgpe.c | 23 +-
+ drivers/acpi/acpica/nsaccess.c | 6 +-
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/tbfadt.c | 10 +-
+ drivers/acpi/acpica/tbutils.c | 3 +-
+ drivers/acpi/acpica/tbxface.c | 4 +-
+ drivers/acpi/acpica/tbxfload.c | 4 +-
+ drivers/acpi/acpica/tbxfroot.c | 5 +-
+ drivers/acpi/acpica/utbuffer.c | 30 +-
+ drivers/acpi/acpica/utdebug.c | 61 ++-
+ drivers/acpi/acpica/utdecode.c | 2 +-
+ drivers/acpi/acpica/utinit.c | 2 +-
+ drivers/acpi/acpica/utpredef.c | 2 -
+ drivers/acpi/acpica/utprint.c | 105 +++-
+ drivers/acpi/acpica/uttrack.c | 4 +-
+ drivers/acpi/acpica/utxface.c | 2 +-
+ drivers/acpi/acpica/utxfinit.c | 6 +-
+ drivers/acpi/battery.c | 10 +-
+ drivers/acpi/button.c | 85 ++-
+ drivers/acpi/cppc_acpi.c | 600 ++++++++++++++++-----
+ drivers/acpi/ec.c | 230 ++++++--
+ drivers/acpi/internal.h | 4 +-
+ drivers/acpi/sleep.c | 6 +-
+ drivers/acpi/sysfs.c | 33 +-
+ drivers/acpi/tables.c | 15 +-
+ drivers/base/core.c | 1 +
+ drivers/base/power/domain.c | 4 +-
+ drivers/cpufreq/Kconfig | 5 +-
+ drivers/cpufreq/cppc_cpufreq.c | 1 +
+ drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
+ drivers/cpufreq/cpufreq.c | 4 -
+ drivers/cpufreq/cpufreq_governor.c | 2 +-
+ drivers/cpufreq/intel_pstate.c | 2 +-
+ drivers/cpufreq/scpi-cpufreq.c | 1 -
+ drivers/cpuidle/cpuidle-arm.c | 1 +
+ drivers/mailbox/pcc.c | 316 ++++++++---
+ drivers/pnp/isapnp/core.c | 5 +-
+ drivers/tty/serial/8250/8250_dw.c | 15 +-
+ include/acpi/acconfig.h | 4 +
+ include/acpi/acoutput.h | 6 +-
+ include/acpi/acpiosxf.h | 43 +-
+ include/acpi/acpixf.h | 37 +-
+ include/acpi/actbl.h | 164 +++---
+ include/acpi/actypes.h | 48 +-
+ include/acpi/cppc_acpi.h | 14 +-
+ include/acpi/platform/acenv.h | 90 ++--
+ include/acpi/platform/acenvex.h | 21 +-
+ include/acpi/platform/acgcc.h | 17 +-
+ include/acpi/platform/acgccex.h | 58 ++
+ include/acpi/platform/aclinux.h | 22 +-
+ include/acpi/platform/aclinuxex.h | 2 +-
+ include/linux/acpi.h | 7 +
+ include/linux/sched.h | 12 +-
+ kernel/sched/cpufreq.c | 2 +-
+ kernel/sched/cpufreq_schedutil.c | 69 +--
+ kernel/sched/deadline.c | 5 +-
+ kernel/sched/fair.c | 15 +-
+ kernel/sched/rt.c | 5 +-
+ kernel/sched/sched.h | 40 +-
+ tools/power/acpi/common/cmfsize.c | 13 +-
+ tools/power/acpi/common/getopt.c | 4 +-
+ .../acpi/os_specific/service_layers/oslibcfs.c | 217 --------
+ .../acpi/os_specific/service_layers/osunixxf.c | 3 -
+ tools/power/acpi/tools/acpidump/Makefile | 1 -
+ tools/power/acpi/tools/acpidump/acpidump.h | 12 +-
+ tools/power/acpi/tools/acpidump/apdump.c | 71 +--
+ tools/power/acpi/tools/acpidump/apfiles.c | 56 +-
+ tools/power/acpi/tools/acpidump/apmain.c | 33 +-
+ 82 files changed, 1960 insertions(+), 1074 deletions(-)
+ create mode 100644 Documentation/acpi/acpi-lid.txt
+ create mode 100644 include/acpi/platform/acgccex.h
+ delete mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c
+Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
+$ git merge idle/next
+Already up-to-date.
+Merging thermal/next (33f27e0f4801 Merge branches 'for-rc' and 'release' into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/qcom-tsens.txt | 21 ++
+ Documentation/thermal/sysfs-api.txt | 19 ++
+ drivers/thermal/Kconfig | 17 +-
+ drivers/thermal/Makefile | 2 +
+ drivers/thermal/devfreq_cooling.c | 2 +-
+ drivers/thermal/gov_bang_bang.c | 2 +-
+ drivers/thermal/of-thermal.c | 44 +--
+ drivers/thermal/qcom/Kconfig | 11 +
+ drivers/thermal/qcom/Makefile | 2 +
+ drivers/thermal/qcom/tsens-8916.c | 113 +++++++
+ drivers/thermal/qcom/tsens-8960.c | 292 ++++++++++++++++++
+ drivers/thermal/qcom/tsens-8974.c | 244 +++++++++++++++
+ drivers/thermal/qcom/tsens-8996.c | 84 ++++++
+ drivers/thermal/qcom/tsens-common.c | 141 +++++++++
+ drivers/thermal/qcom/tsens.c | 200 +++++++++++++
+ drivers/thermal/qcom/tsens.h | 94 ++++++
+ drivers/thermal/qoriq_thermal.c | 328 +++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 23 +-
+ drivers/thermal/rockchip_thermal.c | 104 +++++--
+ drivers/thermal/thermal_core.c | 85 ++++++
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +-
+ include/linux/thermal.h | 24 +-
+ 22 files changed, 1815 insertions(+), 62 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+ create mode 100644 drivers/thermal/qcom/Kconfig
+ create mode 100644 drivers/thermal/qcom/Makefile
+ create mode 100644 drivers/thermal/qcom/tsens-8916.c
+ create mode 100644 drivers/thermal/qcom/tsens-8960.c
+ create mode 100644 drivers/thermal/qcom/tsens-8974.c
+ create mode 100644 drivers/thermal/qcom/tsens-8996.c
+ create mode 100644 drivers/thermal/qcom/tsens-common.c
+ create mode 100644 drivers/thermal/qcom/tsens.c
+ create mode 100644 drivers/thermal/qcom/tsens.h
+ create mode 100644 drivers/thermal/qoriq_thermal.c
+Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
+$ git merge thermal-soc/next
+Resolved 'drivers/thermal/qcom/tsens-common.c' using previous resolution.
+Resolved 'drivers/thermal/qcom/tsens.c' using previous resolution.
+Resolved 'drivers/thermal/rockchip_thermal.c' using previous resolution.
+Resolved 'drivers/thermal/thermal_core.c' using previous resolution.
+Auto-merging include/linux/thermal.h
+Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+Auto-merging drivers/thermal/thermal_core.c
+CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
+Auto-merging drivers/thermal/rockchip_thermal.c
+CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
+Auto-merging drivers/thermal/rcar_thermal.c
+Auto-merging drivers/thermal/qcom/tsens.c
+CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens.c
+Auto-merging drivers/thermal/qcom/tsens-common.c
+CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens-common.c
+Auto-merging drivers/thermal/of-thermal.c
+Auto-merging drivers/thermal/imx_thermal.c
+Auto-merging drivers/thermal/Makefile
+Auto-merging drivers/acpi/thermal.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6e924366e265] Merge remote-tracking branch 'thermal-soc/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/acpi/thermal.c | 1 -
+ drivers/platform/x86/acerhdf.c | 1 -
+ drivers/thermal/Makefile | 3 +-
+ drivers/thermal/imx_thermal.c | 1 -
+ drivers/thermal/of-thermal.c | 5 -
+ drivers/thermal/rcar_thermal.c | 1 +
+ drivers/thermal/thermal_core.c | 1398 +++++---------------
+ drivers/thermal/thermal_core.h | 26 +
+ drivers/thermal/thermal_helpers.c | 174 +++
+ drivers/thermal/thermal_sysfs.c | 855 ++++++++++++
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 -
+ include/linux/thermal.h | 4 +-
+ 12 files changed, 1370 insertions(+), 1104 deletions(-)
+ create mode 100644 drivers/thermal/thermal_helpers.c
+ create mode 100644 drivers/thermal/thermal_sysfs.c
+$ git am -3 ../patches/0001-thermal-fix-up-for-fix-race-condition-when-updating-.patch
+Applying: thermal: fix up for "fix race condition when updating cooling device"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/thermal/thermal_helpers.c
+$ git add -A .
+$ git commit -v -a --amend
+[master a5e6373bcd41] Merge remote-tracking branch 'thermal-soc/next'
+ Date: Mon Sep 5 12:56:34 2016 +1000
+Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (7b6dd59ab93f Merge branch 'topic/unmap_cleanup' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
+ Documentation/dmaengine/provider.txt | 11 +
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/at_hdmac.c | 11 +-
+ drivers/dma/at_xdmac.c | 8 +-
+ drivers/dma/coh901318.c | 9 +-
+ drivers/dma/cppi41.c | 136 ++++++++++--
+ drivers/dma/dmaengine.c | 7 +
+ drivers/dma/dmaengine.h | 84 ++++++++
+ drivers/dma/dmatest.c | 17 +-
+ drivers/dma/dw/core.c | 14 +-
+ drivers/dma/ep93xx_dma.c | 10 +-
+ drivers/dma/fsl_raid.c | 10 +-
+ drivers/dma/fsldma.c | 8 +-
+ drivers/dma/imx-dma.c | 4 +-
+ drivers/dma/imx-sdma.c | 35 ++-
+ drivers/dma/ioat/dma.c | 213 ++++++++++++++++---
+ drivers/dma/ioat/init.c | 2 +-
+ drivers/dma/ioat/registers.h | 2 +
+ drivers/dma/iop-adma.c | 3 +-
+ drivers/dma/ipu/ipu_idmac.c | 18 +-
+ drivers/dma/k3dma.c | 215 +++++++++++++++----
+ drivers/dma/mic_x100_dma.c | 6 +-
+ drivers/dma/mmp_pdma.c | 14 +-
+ drivers/dma/mmp_tdma.c | 4 +-
+ drivers/dma/mpc512x_dma.c | 3 +-
+ drivers/dma/mv_xor.c | 7 +-
+ drivers/dma/mxs-dma.c | 3 +-
+ drivers/dma/nbpfaxi.c | 9 +-
+ drivers/dma/omap-dma.c | 234 ++++++++++++++++++---
+ drivers/dma/pch_dma.c | 7 +-
+ drivers/dma/pl330.c | 10 +-
+ drivers/dma/ppc4xx/adma.c | 7 +-
+ drivers/dma/qcom/hidma.c | 57 +++--
+ drivers/dma/qcom/hidma.h | 2 +-
+ drivers/dma/qcom/hidma_ll.c | 32 +--
+ drivers/dma/sh/rcar-dmac.c | 16 +-
+ drivers/dma/sh/shdma-base.c | 12 +-
+ drivers/dma/sirf-dma.c | 7 +-
+ drivers/dma/ste_dma40.c | 10 +-
+ drivers/dma/tegra20-apb-dma.c | 10 +-
+ drivers/dma/tegra210-adma.c | 14 +-
+ drivers/dma/timb_dma.c | 9 +-
+ drivers/dma/txx9dmac.c | 9 +-
+ drivers/dma/virt-dma.c | 17 +-
+ drivers/dma/xgene-dma.c | 6 +-
+ drivers/dma/xilinx/xilinx_dma.c | 10 +-
+ drivers/ntb/ntb_transport.c | 193 +++++++++++++----
+ include/linux/dmaengine.h | 16 ++
+ 49 files changed, 1153 insertions(+), 391 deletions(-)
+Merging net-next/master (6f2a80276364 Merge branch 'netns-opt')
+$ git merge net-next/master
+Recorded preimage for 'drivers/net/ethernet/mediatek/mtk_eth_soc.c'
+Auto-merging net/kcm/kcmsock.c
+Auto-merging net/ipv6/ip6_tunnel.c
+Auto-merging net/core/flow_dissector.c
+Auto-merging net/core/dev.c
+Auto-merging net/bridge/br_input.c
+Auto-merging include/linux/netdevice.h
+Auto-merging drivers/net/vxlan.c
+Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.h
+Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mediatek/mtk_eth_soc.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c
+Auto-merging drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+Auto-merging drivers/net/ethernet/cavium/thunder/nicvf_main.c
+Auto-merging drivers/net/ethernet/cavium/thunder/nic_main.c
+Auto-merging drivers/net/ethernet/cavium/thunder/nic.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/ethernet/mediatek/mtk_eth_soc.c'.
+[master a85f4735d5fb] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/net/apm-xgene-enet.txt | 3 +
+ .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 45 +-
+ Documentation/devicetree/bindings/net/macb.txt | 1 +
+ .../devicetree/bindings/net/qcom-emac.txt | 111 +
+ .../devicetree/bindings/net/rockchip-dwmac.txt | 8 +-
+ .../devicetree/bindings/net/stm32-dwmac.txt | 32 +
+ .../devicetree/bindings/net/xilinx_gmii2rgmii.txt | 35 +
+ Documentation/networking/00-INDEX | 2 +
+ Documentation/networking/batman-adv.txt | 17 +-
+ Documentation/networking/dsa/dsa.txt | 33 +-
+ Documentation/networking/ena.txt | 305 ++
+ Documentation/networking/ip-sysctl.txt | 45 +-
+ Documentation/networking/rxrpc.txt | 90 +-
+ Documentation/networking/strparser.txt | 136 +
+ Documentation/networking/switchdev.txt | 13 +-
+ MAINTAINERS | 16 +
+ arch/arm64/boot/dts/apm/apm-mustang.dts | 1 +
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +-
+ drivers/atm/fore200e.c | 6 +-
+ drivers/crypto/Kconfig | 2 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/chelsio/Kconfig | 19 +
+ drivers/crypto/chelsio/Makefile | 4 +
+ drivers/crypto/chelsio/chcr_algo.c | 1525 +++++++++
+ drivers/crypto/chelsio/chcr_algo.h | 471 +++
+ drivers/crypto/chelsio/chcr_core.c | 240 ++
+ drivers/crypto/chelsio/chcr_core.h | 80 +
+ drivers/crypto/chelsio/chcr_crypto.h | 203 ++
+ drivers/infiniband/hw/mlx5/cq.c | 110 +-
+ drivers/infiniband/hw/mlx5/main.c | 13 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +-
+ drivers/infiniband/hw/mlx5/mr.c | 184 +-
+ drivers/infiniband/hw/mlx5/qp.c | 189 +-
+ drivers/isdn/hardware/mISDN/avmfritz.c | 6 +-
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 24 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 2 +-
+ drivers/net/bonding/bond_main.c | 2 +-
+ drivers/net/can/usb/ems_usb.c | 9 +-
+ drivers/net/can/usb/esd_usb2.c | 3 -
+ drivers/net/can/usb/gs_usb.c | 9 +-
+ drivers/net/can/usb/kvaser_usb.c | 7 +-
+ drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +-
+ drivers/net/can/usb/usb_8dev.c | 5 +-
+ drivers/net/dsa/Kconfig | 1 +
+ drivers/net/dsa/b53/b53_common.c | 162 +-
+ drivers/net/dsa/b53/b53_mdio.c | 2 +-
+ drivers/net/dsa/b53/b53_mmap.c | 2 +-
+ drivers/net/dsa/b53/b53_priv.h | 10 +-
+ drivers/net/dsa/b53/b53_regs.h | 3 +
+ drivers/net/dsa/b53/b53_spi.c | 4 +-
+ drivers/net/dsa/b53/b53_srab.c | 2 +-
+ drivers/net/dsa/bcm_sf2.c | 1034 ++-----
+ drivers/net/dsa/bcm_sf2.h | 82 +-
+ drivers/net/dsa/bcm_sf2_regs.h | 122 -
+ drivers/net/dsa/mv88e6060.c | 17 +-
+ drivers/net/dsa/mv88e6xxx/Kconfig | 1 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 863 +++---
+ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 133 +-
+ drivers/net/ethernet/Kconfig | 1 +
+ drivers/net/ethernet/Makefile | 1 +
+ drivers/net/ethernet/adi/bfin_mac.c | 8 +-
+ drivers/net/ethernet/aeroflex/greth.c | 42 +-
+ drivers/net/ethernet/aeroflex/greth.h | 1 -
+ drivers/net/ethernet/agere/et131x.c | 2 +-
+ drivers/net/ethernet/amazon/Kconfig | 27 +
+ drivers/net/ethernet/amazon/Makefile | 5 +
+ drivers/net/ethernet/amazon/ena/Makefile | 7 +
+ drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 973 ++++++
+ drivers/net/ethernet/amazon/ena/ena_com.c | 2666 ++++++++++++++++
+ drivers/net/ethernet/amazon/ena/ena_com.h | 1038 +++++++
+ drivers/net/ethernet/amazon/ena/ena_common_defs.h | 48 +
+ drivers/net/ethernet/amazon/ena/ena_eth_com.c | 501 +++
+ drivers/net/ethernet/amazon/ena/ena_eth_com.h | 160 +
+ drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h | 416 +++
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 895 ++++++
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 3272 ++++++++++++++++++++
+ drivers/net/ethernet/amazon/ena/ena_netdev.h | 324 ++
+ drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h | 67 +
+ drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 133 +
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c | 8 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 5 +-
+ drivers/net/ethernet/apm/xgene/Kconfig | 1 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 17 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 10 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 14 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 73 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 59 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 +
+ drivers/net/ethernet/atheros/alx/main.c | 75 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 4 +-
+ drivers/net/ethernet/broadcom/bgmac-bcma.c | 19 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 28 +-
+ drivers/net/ethernet/broadcom/bgmac.h | 19 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 47 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 191 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 12 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 24 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 -
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 27 +-
+ drivers/net/ethernet/brocade/bna/bnad.h | 1 -
+ drivers/net/ethernet/cadence/macb.c | 95 +-
+ drivers/net/ethernet/cadence/macb.h | 14 +-
+ drivers/net/ethernet/cavium/Kconfig | 12 +-
+ drivers/net/ethernet/cavium/liquidio/Makefile | 24 +-
+ .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 1237 ++++++++
+ .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 59 +
+ .../net/ethernet/cavium/liquidio/cn23xx_pf_regs.h | 604 ++++
+ .../net/ethernet/cavium/liquidio/cn66xx_device.c | 45 +-
+ .../net/ethernet/cavium/liquidio/cn66xx_device.h | 7 +-
+ .../net/ethernet/cavium/liquidio/cn68xx_device.c | 1 -
+ drivers/net/ethernet/cavium/liquidio/lio_core.c | 266 ++
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 513 ++-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 1128 ++++---
+ .../net/ethernet/cavium/liquidio/liquidio_common.h | 34 +-
+ .../net/ethernet/cavium/liquidio/octeon_config.h | 59 +-
+ .../net/ethernet/cavium/liquidio/octeon_console.c | 117 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 352 ++-
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 114 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 46 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 2 +
+ drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +
+ drivers/net/ethernet/cavium/liquidio/octeon_main.h | 32 +-
+ .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 1 -
+ .../net/ethernet/cavium/liquidio/octeon_network.h | 12 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 35 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 6 +-
+ .../net/ethernet/cavium/liquidio/request_manager.c | 170 +-
+ .../ethernet/cavium/liquidio/response_manager.c | 9 +-
+ drivers/net/ethernet/cavium/thunder/Makefile | 1 +
+ drivers/net/ethernet/cavium/thunder/nic.h | 85 +-
+ drivers/net/ethernet/cavium/thunder/nic_main.c | 433 ++-
+ drivers/net/ethernet/cavium/thunder/nic_reg.h | 15 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 67 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 59 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 5 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 460 ++-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 33 +-
+ drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 235 ++
+ drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 117 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 432 ++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 554 ++++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 34 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 556 ++++
+ drivers/net/ethernet/chelsio/cxgb4/sched.h | 110 +
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 72 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 437 +++
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 164 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 26 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 63 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 4 +-
+ drivers/net/ethernet/dec/tulip/de4x5.h | 4 +-
+ drivers/net/ethernet/emulex/benet/be.h | 21 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 202 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 422 ++-
+ drivers/net/ethernet/freescale/fec_main.c | 6 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
+ drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +-
+ drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 100 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 30 +
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 36 +
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 12 +
+ drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 53 +-
+ drivers/net/ethernet/ibm/ibmvnic.h | 2 +
+ drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +
+ drivers/net/ethernet/intel/fm10k/fm10k_common.h | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 29 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 193 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 30 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 46 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e.h | 138 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 59 +-
+ drivers/net/ethernet/intel/i40e/i40e_client.c | 39 +-
+ drivers/net/ethernet/intel/i40e/i40e_client.h | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 258 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 162 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 59 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +-
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 58 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 26 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 55 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 5 +
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 4 +
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 1 +
+ drivers/net/ethernet/intel/igb/igb.h | 50 +
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 345 +++
+ drivers/net/ethernet/intel/igb/igb_main.c | 45 +
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 193 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 11 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 78 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 11 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 21 +-
+ drivers/net/ethernet/marvell/mvneta.c | 60 +-
+ drivers/net/ethernet/marvell/sky2.c | 2 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 101 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 31 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 290 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 109 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 50 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 34 -
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 23 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 52 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 80 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 98 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 232 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 8 +
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 118 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 43 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 602 ++++
+ drivers/net/ethernet/mellanox/mlx5/core/mad.c | 41 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 145 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 72 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 44 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 189 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 156 +-
+ drivers/net/ethernet/mellanox/mlx5/core/pd.c | 61 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 181 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 299 +-
+ drivers/net/ethernet/mellanox/mlx5/core/rl.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/srq.c | 49 +-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 183 +-
+ drivers/net/ethernet/mellanox/mlx5/core/uar.c | 67 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 94 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 29 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 180 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 +
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 128 +-
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 8 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 47 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 1 +
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 169 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1438 ++++++---
+ drivers/net/ethernet/qlogic/qed/qed_hw.c | 137 +-
+ drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 95 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 132 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 255 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.h | 7 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 162 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 157 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 50 +-
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 6 +
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 15 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 95 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 179 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.c | 231 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.h | 7 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 39 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 290 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 475 +--
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 7 +-
+ drivers/net/ethernet/qualcomm/Kconfig | 12 +
+ drivers/net/ethernet/qualcomm/Makefile | 2 +
+ drivers/net/ethernet/qualcomm/emac/Makefile | 7 +
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 1528 +++++++++
+ drivers/net/ethernet/qualcomm/emac/emac-mac.h | 248 ++
+ drivers/net/ethernet/qualcomm/emac/emac-phy.c | 204 ++
+ drivers/net/ethernet/qualcomm/emac/emac-phy.h | 33 +
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 721 +++++
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.h | 24 +
+ drivers/net/ethernet/qualcomm/emac/emac.c | 743 +++++
+ drivers/net/ethernet/qualcomm/emac/emac.h | 335 ++
+ drivers/net/ethernet/renesas/ravb.h | 1 -
+ drivers/net/ethernet/renesas/ravb_main.c | 123 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 43 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 1 -
+ drivers/net/ethernet/rocker/rocker_main.c | 2 +-
+ drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 -
+ drivers/net/ethernet/sfc/ef10.c | 247 +-
+ drivers/net/ethernet/sfc/efx.c | 96 +-
+ drivers/net/ethernet/sfc/efx.h | 2 +
+ drivers/net/ethernet/sfc/falcon.c | 9 +-
+ drivers/net/ethernet/sfc/farch.c | 3 +-
+ drivers/net/ethernet/sfc/mcdi.c | 5 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 530 +++-
+ drivers/net/ethernet/sfc/net_driver.h | 14 +-
+ drivers/net/ethernet/sfc/nic.c | 4 +-
+ drivers/net/ethernet/sfc/nic.h | 9 +-
+ drivers/net/ethernet/sfc/ptp.c | 2 +-
+ drivers/net/ethernet/sfc/selftest.c | 10 +-
+ drivers/net/ethernet/sfc/selftest.h | 2 +-
+ drivers/net/ethernet/sfc/siena.c | 14 +-
+ drivers/net/ethernet/sfc/workarounds.h | 4 +
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 254 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 193 ++
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2 +-
+ drivers/net/ethernet/ti/cpsw.c | 1306 ++++----
+ drivers/net/ethernet/ti/davinci_cpdma.c | 91 +-
+ drivers/net/ethernet/ti/davinci_cpdma.h | 13 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 22 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
+ drivers/net/fjes/fjes_main.c | 1 -
+ drivers/net/hyperv/hyperv_net.h | 31 +-
+ drivers/net/hyperv/netvsc.c | 414 ++-
+ drivers/net/hyperv/netvsc_drv.c | 223 +-
+ drivers/net/hyperv/rndis_filter.c | 41 +-
+ drivers/net/phy/Kconfig | 441 +--
+ drivers/net/phy/Makefile | 76 +-
+ drivers/net/phy/mscc.c | 161 +
+ drivers/net/phy/xilinx_gmii2rgmii.c | 112 +
+ drivers/net/ppp/ppp_generic.c | 63 +-
+ drivers/net/ppp/pptp.c | 64 +-
+ drivers/net/tun.c | 16 +-
+ drivers/net/usb/asix.h | 40 +-
+ drivers/net/usb/asix_common.c | 212 +-
+ drivers/net/usb/asix_devices.c | 450 ++-
+ drivers/net/usb/ax88172a.c | 29 +-
+ drivers/net/usb/hso.c | 20 +-
+ drivers/net/usb/lan78xx.c | 4 +-
+ drivers/net/usb/pegasus.c | 3 +-
+ drivers/net/usb/r8152.c | 13 +-
+ drivers/net/usb/usbnet.c | 5 +-
+ drivers/net/veth.c | 3 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 2 +-
+ drivers/net/vxlan.c | 17 +-
+ drivers/net/wan/fsl_ucc_hdlc.c | 2 +-
+ drivers/net/wan/sbni.c | 4 +-
+ drivers/net/wimax/i2400m/usb-notif.c | 1 -
+ drivers/net/wireless/ath/ar5523/ar5523.c | 9 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 +-
+ .../net/wireless/intersil/orinoco/orinoco_usb.c | 4 +-
+ drivers/net/wireless/marvell/libertas_tf/if_usb.c | 12 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c | 19 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +-
+ drivers/net/xen-netback/common.h | 4 +
+ drivers/net/xen-netback/hash.c | 81 +-
+ drivers/net/xen-netback/xenbus.c | 37 +-
+ drivers/staging/octeon/ethernet-mdio.c | 63 +-
+ drivers/staging/octeon/ethernet-rgmii.c | 2 +-
+ drivers/staging/octeon/ethernet.c | 12 +-
+ drivers/staging/octeon/octeon-ethernet.h | 1 -
+ fs/afs/cmservice.c | 168 +-
+ fs/afs/fsclient.c | 148 +-
+ fs/afs/internal.h | 38 +-
+ fs/afs/main.c | 1 +
+ fs/afs/rxrpc.c | 461 +--
+ fs/afs/server.c | 11 +-
+ fs/afs/vlclient.c | 7 +-
+ fs/proc/generic.c | 2 +
+ fs/proc/proc_net.c | 13 +
+ fs/proc/proc_sysctl.c | 5 +
+ include/linux/bcma/bcma.h | 3 +
+ include/linux/bcma/bcma_regs.h | 1 +
+ include/linux/bpf.h | 4 +
+ include/linux/cgroup.h | 23 +
+ include/linux/hyperv.h | 91 +-
+ include/linux/if_bridge.h | 1 +
+ include/linux/if_vlan.h | 1 +
+ include/linux/mlx5/cq.h | 6 +-
+ include/linux/mlx5/device.h | 441 +--
+ include/linux/mlx5/driver.h | 31 +-
+ include/linux/mlx5/fs.h | 6 +
+ include/linux/mlx5/mlx5_ifc.h | 297 +-
+ include/linux/mlx5/port.h | 40 +-
+ include/linux/mlx5/qp.h | 128 +-
+ include/linux/mlx5/vport.h | 2 +
+ include/linux/net.h | 6 +
+ include/linux/netdevice.h | 13 +-
+ include/linux/perf_event.h | 9 +
+ include/linux/qed/common_hsi.h | 355 ++-
+ include/linux/qed/eth_common.h | 155 +-
+ include/linux/qed/iscsi_common.h | 28 +-
+ include/linux/qed/qed_chain.h | 13 -
+ include/linux/qed/qed_eth_if.h | 3 +
+ include/linux/qed/qed_if.h | 23 +-
+ include/linux/qed/tcp_common.h | 16 +-
+ include/linux/rhashtable.h | 14 +-
+ include/linux/rtnetlink.h | 2 +-
+ include/linux/skbuff.h | 56 +-
+ include/linux/sysctl.h | 4 +
+ include/net/af_rxrpc.h | 47 +-
+ include/net/devlink.h | 1 -
+ include/net/dsa.h | 50 +-
+ include/net/flow_dissector.h | 14 +-
+ include/net/gre.h | 10 +-
+ include/net/kcm.h | 37 +-
+ include/net/lwtunnel.h | 44 +
+ include/net/netns/ipv4.h | 1 -
+ include/net/pkt_cls.h | 6 +-
+ include/net/pkt_sched.h | 4 +-
+ include/net/pptp.h | 23 +
+ include/net/sch_generic.h | 4 +-
+ include/net/sock.h | 13 +-
+ include/net/strparser.h | 142 +
+ include/net/switchdev.h | 12 +-
+ include/net/tc_act/tc_vlan.h | 1 +
+ include/net/tcp.h | 8 +-
+ include/net/udp.h | 1 +
+ include/trace/events/rxrpc.h | 95 +
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/batman_adv.h | 94 +
+ include/uapi/linux/bpf.h | 23 +
+ include/uapi/linux/bpf_perf_event.h | 18 +
+ include/uapi/linux/ethtool.h | 11 +-
+ include/uapi/linux/if_bridge.h | 2 +-
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/if_tunnel.h | 15 +-
+ include/uapi/linux/inet_diag.h | 6 +
+ include/uapi/linux/mii.h | 1 +
+ include/uapi/linux/pkt_cls.h | 3 +
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/tc_act/tc_vlan.h | 1 +
+ include/uapi/linux/tipc_netlink.h | 4 +
+ kernel/bpf/arraymap.c | 2 +-
+ kernel/bpf/verifier.c | 96 +-
+ kernel/events/core.c | 89 +-
+ kernel/trace/bpf_trace.c | 93 +
+ lib/rhashtable.c | 46 +-
+ net/Kconfig | 1 +
+ net/Makefile | 1 +
+ net/atm/mpc.c | 2 +-
+ net/batman-adv/Kconfig | 15 +-
+ net/batman-adv/Makefile | 4 +-
+ net/batman-adv/bat_algo.c | 70 +
+ net/batman-adv/bat_algo.h | 3 +
+ net/batman-adv/bat_iv_ogm.c | 837 ++++-
+ net/batman-adv/bat_v.c | 734 ++++-
+ net/batman-adv/bat_v_ogm.c | 5 +-
+ net/batman-adv/bridge_loop_avoidance.c | 348 ++-
+ net/batman-adv/bridge_loop_avoidance.h | 17 +-
+ net/batman-adv/debugfs.c | 18 +
+ net/batman-adv/debugfs.h | 2 +-
+ net/batman-adv/distributed-arp-table.c | 4 +-
+ net/batman-adv/gateway_client.c | 285 +-
+ net/batman-adv/gateway_client.h | 7 +
+ net/batman-adv/gateway_common.c | 5 +-
+ net/batman-adv/hard-interface.c | 84 +-
+ net/batman-adv/icmp_socket.h | 18 +-
+ net/batman-adv/main.c | 19 +-
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/multicast.c | 4 +-
+ net/batman-adv/netlink.c | 221 +-
+ net/batman-adv/netlink.h | 6 +
+ net/batman-adv/network-coding.c | 11 +-
+ net/batman-adv/originator.c | 172 +-
+ net/batman-adv/originator.h | 4 +
+ net/batman-adv/packet.h | 36 -
+ net/batman-adv/routing.c | 43 +-
+ net/batman-adv/send.c | 136 +-
+ net/batman-adv/send.h | 6 +
+ net/batman-adv/soft-interface.c | 51 +-
+ net/batman-adv/sysfs.c | 183 +-
+ net/batman-adv/translation-table.c | 556 +++-
+ net/batman-adv/translation-table.h | 7 +
+ net/batman-adv/tvlv.c | 9 +
+ net/batman-adv/types.h | 69 +-
+ net/bridge/Makefile | 2 +
+ net/bridge/br_device.c | 8 +-
+ net/bridge/br_fdb.c | 23 +-
+ net/bridge/br_forward.c | 10 +-
+ net/bridge/br_if.c | 12 +-
+ net/bridge/br_input.c | 42 +-
+ net/bridge/br_netlink.c | 132 +-
+ net/bridge/br_private.h | 46 +-
+ net/bridge/br_switchdev.c | 57 +
+ net/bridge/br_sysfs_if.c | 1 +
+ net/core/dev.c | 81 +-
+ net/core/drop_monitor.c | 2 +-
+ net/core/filter.c | 152 +-
+ net/core/flow_dissector.c | 164 +-
+ net/core/lwtunnel.c | 35 +
+ net/core/neighbour.c | 3 +-
+ net/core/net_namespace.c | 60 +-
+ net/core/rtnetlink.c | 107 +-
+ net/core/sock.c | 26 +-
+ net/dsa/dsa.c | 80 +-
+ net/dsa/dsa2.c | 18 +-
+ net/dsa/slave.c | 201 +-
+ net/ipv4/af_inet.c | 23 +-
+ net/ipv4/fib_frontend.c | 7 -
+ net/ipv4/fib_semantics.c | 3 +-
+ net/ipv4/fou.c | 2 +-
+ net/ipv4/igmp.c | 10 +
+ net/ipv4/inet_diag.c | 58 +-
+ net/ipv4/ip_output.c | 8 +
+ net/ipv4/ipconfig.c | 71 +-
+ net/ipv4/proc.c | 1 +
+ net/ipv4/route.c | 4 +-
+ net/ipv4/tcp.c | 23 +-
+ net/ipv4/tcp_input.c | 47 +-
+ net/ipv4/tcp_ipv4.c | 35 +-
+ net/ipv4/tcp_metrics.c | 2 +-
+ net/ipv4/tcp_output.c | 3 +-
+ net/ipv4/udp.c | 17 +-
+ net/ipv4/udp_diag.c | 79 +
+ net/ipv4/udplite.c | 1 -
+ net/ipv6/af_inet6.c | 2 +
+ net/ipv6/ila/ila_common.c | 1 -
+ net/ipv6/ila/ila_lwt.c | 2 +-
+ net/ipv6/ila/ila_xlat.c | 2 +-
+ net/ipv6/ip6_gre.c | 12 +-
+ net/ipv6/ip6_output.c | 8 +
+ net/ipv6/ip6_tunnel.c | 10 +-
+ net/ipv6/ip6_vti.c | 10 +-
+ net/ipv6/mcast.c | 10 +
+ net/ipv6/route.c | 4 +-
+ net/ipv6/sit.c | 12 +-
+ net/ipv6/tcp_ipv6.c | 19 +-
+ net/ipv6/udp.c | 13 +-
+ net/ipv6/udp_impl.h | 2 -
+ net/ipv6/udplite.c | 1 -
+ net/irda/af_irda.c | 3 -
+ net/kcm/Kconfig | 1 +
+ net/kcm/kcmproc.c | 58 +-
+ net/kcm/kcmsock.c | 483 +--
+ net/l2tp/l2tp_netlink.c | 2 +-
+ net/l2tp/l2tp_ppp.c | 20 +-
+ net/mac80211/driver-ops.h | 8 +-
+ net/mac80211/mesh_hwmp.c | 27 +-
+ net/mac80211/sta_info.c | 25 +-
+ net/mac80211/sta_info.h | 2 +
+ net/mac80211/tx.c | 28 +-
+ net/mpls/af_mpls.c | 5 -
+ net/mpls/mpls_gso.c | 40 +-
+ net/mpls/mpls_iptunnel.c | 13 +-
+ net/netlink/diag.c | 103 +-
+ net/netlink/genetlink.c | 4 +-
+ net/openvswitch/actions.c | 9 +-
+ net/openvswitch/conntrack.c | 2 +-
+ net/rds/ib.h | 1 +
+ net/rds/rds.h | 1 +
+ net/rxrpc/af_rxrpc.c | 35 +-
+ net/rxrpc/ar-internal.h | 305 +-
+ net/rxrpc/call_accept.c | 38 +-
+ net/rxrpc/call_event.c | 94 +-
+ net/rxrpc/call_object.c | 172 +-
+ net/rxrpc/conn_client.c | 913 +++++-
+ net/rxrpc/conn_event.c | 162 +-
+ net/rxrpc/conn_object.c | 123 +-
+ net/rxrpc/conn_service.c | 6 +
+ net/rxrpc/input.c | 150 +-
+ net/rxrpc/local_event.c | 1 +
+ net/rxrpc/output.c | 61 +-
+ net/rxrpc/peer_event.c | 25 +-
+ net/rxrpc/peer_object.c | 15 +
+ net/rxrpc/proc.c | 42 +-
+ net/rxrpc/recvmsg.c | 203 +-
+ net/rxrpc/rxkad.c | 4 +-
+ net/rxrpc/skbuff.c | 77 +-
+ net/rxrpc/sysctl.c | 33 +-
+ net/sched/act_vlan.c | 13 +-
+ net/sched/cls_basic.c | 12 +-
+ net/sched/cls_bpf.c | 27 +-
+ net/sched/cls_cgroup.c | 13 +-
+ net/sched/cls_flow.c | 26 +-
+ net/sched/cls_flower.c | 110 +-
+ net/sched/cls_fw.c | 18 +-
+ net/sched/cls_route.c | 14 +-
+ net/sched/cls_rsvp.h | 17 +-
+ net/sched/cls_tcindex.c | 90 +-
+ net/sched/cls_u32.c | 21 +-
+ net/sched/sch_api.c | 45 +-
+ net/sched/sch_generic.c | 8 +-
+ net/sched/sch_hfsc.c | 51 +-
+ net/sched/sch_mq.c | 2 +-
+ net/sched/sch_mqprio.c | 2 +-
+ net/strparser/Kconfig | 4 +
+ net/strparser/Makefile | 1 +
+ net/strparser/strparser.c | 510 +++
+ net/switchdev/switchdev.c | 97 +-
+ net/sysctl_net.c | 29 +-
+ net/tipc/bcast.c | 8 +-
+ net/tipc/bcast.h | 4 +-
+ net/tipc/bearer.c | 130 +-
+ net/tipc/bearer.h | 2 +
+ net/tipc/link.c | 149 +-
+ net/tipc/link.h | 6 +-
+ net/tipc/msg.h | 10 +
+ net/tipc/net.h | 2 +
+ net/tipc/netlink.c | 18 +
+ net/tipc/node.c | 95 +-
+ net/tipc/node.h | 12 +-
+ net/tipc/udp_media.c | 521 +++-
+ net/tipc/udp_media.h | 46 +
+ net/wireless/core.c | 6 +
+ net/wireless/nl80211.c | 94 +-
+ net/wireless/nl80211.h | 3 +
+ net/wireless/util.c | 2 +-
+ samples/bpf/Makefile | 14 +
+ samples/bpf/bpf_helpers.h | 16 +-
+ samples/bpf/bpf_load.c | 7 +-
+ samples/bpf/sampleip_kern.c | 38 +
+ samples/bpf/sampleip_user.c | 196 ++
+ samples/bpf/tcbpf2_kern.c | 191 ++
+ samples/bpf/test_current_task_under_cgroup_kern.c | 43 +
+ samples/bpf/test_current_task_under_cgroup_user.c | 145 +
+ samples/bpf/test_tunnel_bpf.sh | 127 +
+ samples/bpf/test_verifier.c | 114 +-
+ samples/bpf/trace_event_kern.c | 65 +
+ samples/bpf/trace_event_user.c | 213 ++
+ 626 files changed, 50029 insertions(+), 13132 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/qcom-emac.txt
+ create mode 100644 Documentation/devicetree/bindings/net/stm32-dwmac.txt
+ create mode 100644 Documentation/devicetree/bindings/net/xilinx_gmii2rgmii.txt
+ create mode 100644 Documentation/networking/ena.txt
+ create mode 100644 Documentation/networking/strparser.txt
+ create mode 100644 drivers/crypto/chelsio/Kconfig
+ create mode 100644 drivers/crypto/chelsio/Makefile
+ create mode 100644 drivers/crypto/chelsio/chcr_algo.c
+ create mode 100644 drivers/crypto/chelsio/chcr_algo.h
+ create mode 100644 drivers/crypto/chelsio/chcr_core.c
+ create mode 100644 drivers/crypto/chelsio/chcr_core.h
+ create mode 100644 drivers/crypto/chelsio/chcr_crypto.h
+ create mode 100644 drivers/net/ethernet/amazon/Kconfig
+ create mode 100644 drivers/net/ethernet/amazon/Makefile
+ create mode 100644 drivers/net/ethernet/amazon/ena/Makefile
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_admin_defs.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.c
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_common_defs.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.c
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_ethtool.c
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.c
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h
+ create mode 100644 drivers/net/ethernet/amazon/ena/ena_regs_defs.h
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
+ create mode 100644 drivers/net/ethernet/cavium/liquidio/lio_core.c
+ create mode 100644 drivers/net/ethernet/cavium/thunder/thunder_xcv.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/Makefile
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-mac.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-mac.h
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-phy.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-phy.h
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-sgmii.h
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+ create mode 100644 drivers/net/phy/mscc.c
+ create mode 100644 drivers/net/phy/xilinx_gmii2rgmii.c
+ create mode 100644 include/net/pptp.h
+ create mode 100644 include/net/strparser.h
+ create mode 100644 include/trace/events/rxrpc.h
+ create mode 100644 include/uapi/linux/bpf_perf_event.h
+ create mode 100644 net/bridge/br_switchdev.c
+ create mode 100644 net/strparser/Kconfig
+ create mode 100644 net/strparser/Makefile
+ create mode 100644 net/strparser/strparser.c
+ create mode 100644 net/tipc/udp_media.h
+ create mode 100644 samples/bpf/sampleip_kern.c
+ create mode 100644 samples/bpf/sampleip_user.c
+ create mode 100644 samples/bpf/tcbpf2_kern.c
+ create mode 100644 samples/bpf/test_current_task_under_cgroup_kern.c
+ create mode 100644 samples/bpf/test_current_task_under_cgroup_user.c
+ create mode 100755 samples/bpf/test_tunnel_bpf.sh
+ create mode 100644 samples/bpf/trace_event_kern.c
+ create mode 100644 samples/bpf/trace_event_user.c
+Merging ipsec-next/master (35db57bbc4b7 xfrm: state: remove per-netns gc task)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ include/net/netns/xfrm.h | 12 ++--
+ include/net/xfrm.h | 2 +-
+ net/xfrm/xfrm_policy.c | 145 ++++++++++++++++++++++++++++-------------------
+ net/xfrm/xfrm_replay.c | 6 +-
+ net/xfrm/xfrm_state.c | 121 +++++++++++++++++++++++++--------------
+ 5 files changed, 173 insertions(+), 113 deletions(-)
+Merging netfilter-next/master (779994fa3636 netfilter: log: Check param to avoid overflow in nf_log_set)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/nft_set_rbtree.c
+Auto-merging net/netfilter/nf_conntrack_standalone.c
+Auto-merging net/netfilter/nf_conntrack_netlink.c
+Removing net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+Auto-merging lib/rhashtable.c
+Auto-merging include/uapi/linux/netfilter/nf_tables.h
+Auto-merging include/linux/rhashtable.h
+Merge made by the 'recursive' strategy.
+ include/linux/rhashtable.h | 70 ++-
+ include/net/netfilter/nf_conntrack.h | 56 ++-
+ include/net/netfilter/nf_conntrack_core.h | 3 -
+ include/net/netfilter/nf_conntrack_ecache.h | 17 +-
+ include/net/netfilter/nf_conntrack_l4proto.h | 8 -
+ include/net/netfilter/nf_log.h | 3 +-
+ include/net/netfilter/nf_tables.h | 3 +-
+ include/net/netns/conntrack.h | 8 -
+ include/uapi/linux/netfilter/nf_tables.h | 65 ++-
+ lib/rhashtable.c | 10 +-
+ net/bridge/netfilter/nf_log_bridge.c | 3 +-
+ net/ipv4/netfilter/Kconfig | 11 -
+ net/ipv4/netfilter/Makefile | 5 -
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 70 ---
+ .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 492 ---------------------
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 39 +-
+ net/ipv4/netfilter/nf_dup_ipv4.c | 10 +-
+ net/ipv4/netfilter/nf_log_arp.c | 5 +-
+ net/ipv4/netfilter/nf_log_ipv4.c | 3 +-
+ net/ipv6/netfilter/nf_log_ipv6.c | 3 +-
+ net/netfilter/Kconfig | 22 +-
+ net/netfilter/Makefile | 7 +-
+ net/netfilter/ipvs/ip_vs_nfct.c | 7 +-
+ net/netfilter/nf_conntrack_core.c | 229 ++++++----
+ net/netfilter/nf_conntrack_ecache.c | 22 +-
+ net/netfilter/nf_conntrack_ftp.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 44 +-
+ net/netfilter/nf_conntrack_pptp.c | 3 +-
+ net/netfilter/nf_conntrack_proto.c | 81 +---
+ net/netfilter/nf_conntrack_proto_dccp.c | 3 +-
+ net/netfilter/nf_conntrack_proto_generic.c | 39 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 89 +---
+ net/netfilter/nf_conntrack_proto_tcp.c | 131 +-----
+ net/netfilter/nf_conntrack_proto_udp.c | 53 +--
+ net/netfilter/nf_conntrack_proto_udplite.c | 3 +-
+ net/netfilter/nf_conntrack_standalone.c | 3 +-
+ net/netfilter/nf_log.c | 8 +-
+ net/netfilter/nf_nat_core.c | 6 -
+ net/netfilter/nf_tables_api.c | 203 ++++++---
+ net/netfilter/nft_hash.c | 417 ++++-------------
+ net/netfilter/nft_numgen.c | 192 ++++++++
+ net/netfilter/nft_quota.c | 121 +++++
+ net/netfilter/nft_set_hash.c | 404 +++++++++++++++++
+ net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} | 12 +-
+ net/netfilter/xt_conntrack.c | 4 +-
+ net/netfilter/xt_physdev.c | 4 +-
+ 46 files changed, 1380 insertions(+), 1613 deletions(-)
+ delete mode 100644 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+ create mode 100644 net/netfilter/nft_numgen.c
+ create mode 100644 net/netfilter/nft_quota.c
+ create mode 100644 net/netfilter/nft_set_hash.c
+ rename net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} (97%)
+Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
+$ git merge ipvs-next/master
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging wireless-drivers-next/master (5856cd5b8dda rtlwifi/rtl8192de: Fix print format string)
+$ git merge wireless-drivers-next/master
+Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+Merge made by the 'recursive' strategy.
+ drivers/bcma/driver_chipcommon.c | 32 +-
+ drivers/net/wireless/ath/ath5k/debug.c | 6 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +-
+ .../broadcom/brcm80211/brcmfmac/tracepoint.c | 1 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 +
+ .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 83 +++--
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 15 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 19 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 31 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 12 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 18 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 26 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 342 +++++++++++++++++++--
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 38 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +--
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 45 ++-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 13 +-
+ .../net/wireless/intersil/hostap/hostap_ioctl.c | 20 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c | 27 +-
+ drivers/net/wireless/marvell/mwifiex/11n.h | 7 +-
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 78 ++++-
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 3 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 58 ++--
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 18 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 +
+ drivers/net/wireless/marvell/mwifiex/fw.h | 73 ++++-
+ drivers/net/wireless/marvell/mwifiex/join.c | 3 +-
+ drivers/net/wireless/marvell/mwifiex/main.c | 2 +
+ drivers/net/wireless/marvell/mwifiex/main.h | 2 +
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c | 16 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 61 ++--
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 134 +++++++-
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 144 ++++++++-
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c | 7 +-
+ drivers/net/wireless/marvell/mwifiex/util.c | 1 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 22 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 5 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 5 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 7 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 319 ++++++++++---------
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 60 ++++
+ drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
+ drivers/net/wireless/realtek/rtlwifi/regd.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 2 +-
+ drivers/net/wireless/ti/wl18xx/acx.c | 29 ++
+ drivers/net/wireless/ti/wl18xx/acx.h | 13 +
+ drivers/net/wireless/ti/wl18xx/event.c | 1 +
+ drivers/net/wireless/ti/wlcore/main.c | 1 -
+ drivers/net/wireless/ti/wlcore/spi.c | 2 +-
+ drivers/net/wireless/ti/wlcore/wlcore.h | 3 +
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 -
+ drivers/net/wireless/wl3501_cs.c | 7 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +-
+ 66 files changed, 1545 insertions(+), 434 deletions(-)
+Merging bluetooth/master (4e9a68b81aeb fakelb: fix schedule while atomic)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/Kconfig | 12 ++
+ drivers/bluetooth/Makefile | 1 +
+ drivers/bluetooth/bcm203x.c | 4 +-
+ drivers/bluetooth/btqcomsmd.c | 182 +++++++++++++++++++
+ drivers/bluetooth/btusb.c | 13 +-
+ drivers/bluetooth/hci_intel.c | 6 +-
+ drivers/bluetooth/hci_qca.c | 2 +-
+ drivers/net/ieee802154/fakelb.c | 14 +-
+ include/net/bluetooth/bluetooth.h | 4 +-
+ include/net/bluetooth/hci.h | 7 +-
+ include/net/bluetooth/hci_core.h | 10 +-
+ include/net/bluetooth/hci_mon.h | 4 +
+ include/net/bluetooth/mgmt.h | 18 ++
+ net/6lowpan/ndisc.c | 2 -
+ net/bluetooth/af_bluetooth.c | 15 +-
+ net/bluetooth/hci_request.c | 11 +-
+ net/bluetooth/hci_request.h | 5 +-
+ net/bluetooth/hci_sock.c | 363 +++++++++++++++++++++++++++++++++++++-
+ net/bluetooth/leds.c | 27 +++
+ net/bluetooth/leds.h | 10 ++
+ net/bluetooth/mgmt.c | 160 ++++++++++++-----
+ net/bluetooth/mgmt_util.c | 66 ++++++-
+ net/mac802154/iface.c | 1 +
+ net/mac802154/rx.c | 9 +-
+ 24 files changed, 858 insertions(+), 88 deletions(-)
+ create mode 100644 drivers/bluetooth/btqcomsmd.c
+Merging mac80211-next/master (abc3750c3132 mac80211: refactor monitor representation in sdata)
+$ git merge mac80211-next/master
+Auto-merging include/net/cfg80211.h
+Merge made by the 'recursive' strategy.
+ include/net/cfg80211.h | 3 ++-
+ net/mac80211/cfg.c | 8 ++++----
+ net/mac80211/driver-ops.c | 2 +-
+ net/mac80211/ieee80211_i.h | 6 +++++-
+ net/mac80211/iface.c | 16 ++++++++--------
+ net/mac80211/rx.c | 4 ++--
+ net/mac80211/status.c | 2 +-
+ net/mac80211/tx.c | 2 +-
+ net/mac80211/util.c | 2 +-
+ net/wireless/nl80211.c | 29 +++++++++++++++++++++++++++++
+ 10 files changed, 54 insertions(+), 20 deletions(-)
+Merging rdma/for-next (64278fe89b72 Merge branch 'hns-roce' into k.o/for-4.9)
+$ git merge rdma/for-next
+Auto-merging drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/infiniband/hisilicon-hns-roce.txt | 107 +
+ MAINTAINERS | 8 +
+ drivers/infiniband/Kconfig | 1 +
+ drivers/infiniband/hw/Makefile | 1 +
+ drivers/infiniband/hw/hns/Kconfig | 10 +
+ drivers/infiniband/hw/hns/Makefile | 8 +
+ drivers/infiniband/hw/hns/hns_roce_ah.c | 128 +
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 257 ++
+ drivers/infiniband/hw/hns/hns_roce_cmd.c | 368 +++
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 80 +
+ drivers/infiniband/hw/hns/hns_roce_common.h | 325 +++
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 446 ++++
+ drivers/infiniband/hw/hns/hns_roce_device.h | 734 +++++
+ drivers/infiniband/hw/hns/hns_roce_eq.c | 762 ++++++
+ drivers/infiniband/hw/hns/hns_roce_eq.h | 130 +
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 476 ++++
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 131 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2800 ++++++++++++++++++++
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 981 +++++++
+ drivers/infiniband/hw/hns/hns_roce_main.c | 1142 ++++++++
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 614 +++++
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 144 +
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 855 ++++++
+ drivers/infiniband/hw/hns/hns_roce_user.h | 53 +
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 17 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 47 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 9 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 53 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 3 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 4 +-
+ 30 files changed, 10653 insertions(+), 41 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
+ create mode 100644 drivers/infiniband/hw/hns/Kconfig
+ create mode 100644 drivers/infiniband/hw/hns/Makefile
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_ah.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_alloc.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_cmd.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_common.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_cq.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_device.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_eq.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_eq.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hem.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hem.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.h
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_main.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_mr.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_pd.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_qp.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_user.h
+Merging rdma-leon/rdma-next (29b4817d4018 Linux 4.8-rc1)
+$ git merge rdma-leon/rdma-next
+Already up-to-date.
+Merging rdma-leon-test/testing/rdma-next (694d0d0bb203 Linux 4.8-rc2)
+$ git merge rdma-leon-test/testing/rdma-next
+Already up-to-date.
+Merging mtd/master (a93295a7e118 mtd: nand: omap2: Don't call dma_release_channel() if dma_request_chan() failed)
+$ git merge mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/omap2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging l2-mtd/master (a93295a7e118 mtd: nand: omap2: Don't call dma_release_channel() if dma_request_chan() failed)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging nand/nand/next (13683057ec73 MAINTAINERS: Add maintainer entry for Ingenic JZ4780 NAND driver)
+$ git merge nand/nand/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ++
+ drivers/mtd/nand/Kconfig | 12 +--
+ drivers/mtd/nand/bf5xx_nand.c | 3 +-
+ drivers/mtd/nand/brcmnand/brcmnand.c | 15 ++-
+ drivers/mtd/nand/brcmnand/brcmnand.h | 13 ++-
+ drivers/mtd/nand/brcmnand/iproc_nand.c | 18 +++-
+ drivers/mtd/nand/docg4.c | 3 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 3 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 3 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 +-
+ drivers/mtd/nand/jz4780_nand.c | 3 +-
+ drivers/mtd/nand/nand_base.c | 30 +++---
+ drivers/mtd/nand/nand_bbt.c | 161 ++++++++++++++++++++++++---------
+ drivers/mtd/nand/nand_timings.c | 14 +--
+ drivers/mtd/nand/ndfc.c | 3 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 3 +-
+ drivers/mtd/nand/qcom_nandc.c | 3 +-
+ drivers/mtd/nand/s3c2410.c | 7 +-
+ drivers/mtd/nand/sh_flctl.c | 8 +-
+ drivers/mtd/nand/sunxi_nand.c | 3 +-
+ drivers/mtd/nand/txx9ndfmc.c | 3 +-
+ include/linux/mtd/nand.h | 7 ++
+ 22 files changed, 212 insertions(+), 112 deletions(-)
+Merging crypto/master (10faa8c0d6c3 crypto: FIPS - allow tests to be disabled in FIPS mode)
+$ git merge crypto/master
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/char/hw_random/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/crypto-API.tmpl | 38 +-
+ crypto/drbg.c | 31 +-
+ crypto/rsa_helper.c | 4 +-
+ crypto/testmgr.c | 19 +-
+ crypto/testmgr.h | 4 +
+ crypto/xor.c | 41 +-
+ crypto/xts.c | 2 +-
+ drivers/char/hw_random/Kconfig | 13 +
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/amd-rng.c | 150 +++--
+ drivers/char/hw_random/cavium-rng-vf.c | 99 +++
+ drivers/char/hw_random/cavium-rng.c | 94 +++
+ drivers/char/hw_random/meson-rng.c | 3 -
+ drivers/char/hw_random/omap3-rom-rng.c | 10 +-
+ drivers/char/hw_random/pic32-rng.c | 1 -
+ drivers/char/hw_random/st-rng.c | 3 -
+ drivers/char/hw_random/tx4939-rng.c | 11 +-
+ drivers/crypto/caam/caamhash.c | 540 ++++++++-------
+ drivers/crypto/caam/ctrl.c | 3 +
+ drivers/crypto/caam/intern.h | 1 -
+ drivers/crypto/caam/jr.c | 25 +-
+ drivers/crypto/ccp/Makefile | 1 +
+ drivers/crypto/ccp/ccp-crypto-sha.c | 18 +-
+ drivers/crypto/ccp/ccp-dev-v3.c | 177 ++---
+ drivers/crypto/ccp/ccp-dev-v5.c | 1011 +++++++++++++++++++++++++++++
+ drivers/crypto/ccp/ccp-dev.c | 60 +-
+ drivers/crypto/ccp/ccp-dev.h | 310 +++++++--
+ drivers/crypto/ccp/ccp-ops.c | 576 ++++++++--------
+ drivers/crypto/ccp/ccp-pci.c | 23 +-
+ drivers/crypto/img-hash.c | 108 ++-
+ drivers/crypto/ixp4xx_crypto.c | 9 +-
+ drivers/crypto/marvell/cesa.c | 1 +
+ drivers/crypto/marvell/hash.c | 44 +-
+ drivers/crypto/marvell/tdma.c | 1 +
+ drivers/crypto/mxc-scc.c | 4 +-
+ drivers/crypto/qat/qat_common/adf_admin.c | 20 +-
+ drivers/crypto/rockchip/rk3288_crypto.c | 6 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 6 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-core.c | 68 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 165 +++--
+ drivers/crypto/sunxi-ss/sun4i-ss.h | 2 +-
+ drivers/pci/quirks.c | 11 +
+ include/linux/ccp.h | 3 -
+ include/linux/hw_random.h | 4 +-
+ 44 files changed, 2741 insertions(+), 980 deletions(-)
+ create mode 100644 drivers/char/hw_random/cavium-rng-vf.c
+ create mode 100644 drivers/char/hw_random/cavium-rng.c
+ create mode 100644 drivers/crypto/ccp/ccp-dev-v5.c
+Merging drm/drm-next (2b2fd56d7e92 Revert "drm: make DRI1 drivers depend on BROKEN")
+$ git merge drm/drm-next
+Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu.h'
+Recorded preimage for 'drivers/gpu/drm/drm_crtc.c'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c'
+Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution.
+Auto-merging include/linux/fence.h
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
+Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c
+Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c
+Auto-merging drivers/gpu/drm/qxl/qxl_fb.c
+Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c
+Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_fbc.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_csr.c
+Auto-merging drivers/gpu/drm/i915/intel_audio.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Removing drivers/gpu/drm/i915/i915_gem_debug.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/gpu/drm/drm_dp_helper.c
+Auto-merging drivers/gpu/drm/drm_crtc_helper_internal.h
+Auto-merging drivers/gpu/drm/drm_crtc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/gpu/vgaarbiter.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu.h'.
+Recorded resolution for 'drivers/gpu/drm/drm_crtc.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'.
+[master 2774d74ab493] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/rockchip/rockchip-vop.txt | 4 +-
+ .../devicetree/bindings/display/tilcdc/tilcdc.txt | 4 +
+ Documentation/gpu/drm-internals.rst | 9 +-
+ Documentation/gpu/drm-kms-helpers.rst | 211 +-
+ Documentation/gpu/drm-kms.rst | 429 +-
+ Documentation/gpu/drm-mm.rst | 58 +-
+ Documentation/gpu/drm-uapi.rst | 70 +
+ Documentation/gpu/i915.rst | 3 +
+ Documentation/gpu/index.rst | 1 +
+ .../{vgaarbiter.txt => gpu/vgaarbiter.rst} | 161 +-
+ Documentation/sync_file.txt | 14 +
+ MAINTAINERS | 8 +
+ arch/x86/kernel/early-quirks.c | 9 +-
+ drivers/char/agp/intel-gtt.c | 2 +
+ drivers/dma-buf/dma-buf.c | 23 +
+ drivers/dma-buf/fence-array.c | 7 +-
+ drivers/dma-buf/reservation.c | 2 +-
+ drivers/dma-buf/sync_file.c | 204 +-
+ drivers/gpu/drm/Kconfig | 146 +-
+ drivers/gpu/drm/Makefile | 8 +-
+ drivers/gpu/drm/amd/amdgpu/Kconfig | 2 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 96 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 27 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 91 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 95 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 266 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 101 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 8 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 423 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 58 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 80 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 454 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 417 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 113 +-
+ drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 74 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 65 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 91 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 806 +++
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 628 +--
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 76 +-
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 113 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 195 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 121 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 160 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 293 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 438 +-
+ drivers/gpu/drm/amd/include/amd_shared.h | 6 +
+ .../gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 1 +
+ .../gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 1 +
+ .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 +
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 5 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 6 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 58 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 4 -
+ .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 7 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 64 +-
+ .../amd/powerplay/hwmgr/iceland_clockpowergating.c | 119 +
+ .../amd/powerplay/hwmgr/iceland_clockpowergating.h | 38 +
+ .../drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h | 41 +
+ .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c | 5692 ++++++++++++++++++++
+ .../gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h | 424 ++
+ .../drm/amd/powerplay/hwmgr/iceland_powertune.c | 490 ++
+ .../drm/amd/powerplay/hwmgr/iceland_powertune.h | 74 +
+ .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c | 595 ++
+ .../gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h | 58 +
+ .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 33 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 1 -
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 25 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 11 +-
+ .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c | 498 ++
+ .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.h | 22 +-
+ .../amd/powerplay/hwmgr/tonga_processpptables.c | 1 -
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 112 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu71.h | 510 ++
+ drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h | 631 +++
+ drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 3 +-
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 713 +++
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 64 +
+ .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 4 +
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 2 -
+ drivers/gpu/drm/arm/malidp_drv.c | 3 +-
+ drivers/gpu/drm/arm/malidp_drv.h | 2 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 20 +-
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ drivers/gpu/drm/armada/armada_fbdev.c | 1 -
+ drivers/gpu/drm/armada/armada_overlay.c | 2 +-
+ drivers/gpu/drm/ast/ast_fb.c | 1 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 26 +-
+ drivers/gpu/drm/bochs/bochs.h | 1 -
+ drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 182 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 8 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 51 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 34 +
+ drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c | 1 -
+ drivers/gpu/drm/bridge/dw-hdmi.c | 7 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
+ drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 -
+ drivers/gpu/drm/drm_agpsupport.c | 6 +-
+ drivers/gpu/drm/drm_atomic.c | 5 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 83 +-
+ drivers/gpu/drm/drm_auth.c | 2 +-
+ drivers/gpu/drm/drm_blend.c | 8 +-
+ drivers/gpu/drm/drm_bridge.c | 29 +-
+ drivers/gpu/drm/drm_bufs.c | 22 +-
+ drivers/gpu/drm/drm_connector.c | 1123 ++++
+ drivers/gpu/drm/drm_context.c | 24 +-
+ drivers/gpu/drm/drm_crtc.c | 3839 +------------
+ drivers/gpu/drm/drm_crtc_helper.c | 56 -
+ .../gpu/drm/drm_crtc_helper_internal.h | 36 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 132 +-
+ drivers/gpu/drm/drm_dma.c | 6 +-
+ drivers/gpu/drm/drm_dp_aux_dev.c | 19 +-
+ drivers/gpu/drm/drm_dp_helper.c | 17 +-
+ drivers/gpu/drm/drm_drv.c | 44 +-
+ drivers/gpu/drm/drm_edid.c | 25 +-
+ drivers/gpu/drm/drm_encoder.c | 232 +
+ drivers/gpu/drm/drm_fb_helper.c | 75 +-
+ drivers/gpu/drm/drm_fops.c | 6 +-
+ drivers/gpu/drm/drm_fourcc.c | 62 +-
+ drivers/gpu/drm/drm_framebuffer.c | 831 +++
+ drivers/gpu/drm/drm_ioc32.c | 1 +
+ drivers/gpu/drm/drm_ioctl.c | 17 +-
+ drivers/gpu/drm/drm_irq.c | 29 +-
+ drivers/gpu/drm/drm_kms_helper_common.c | 3 +-
+ drivers/gpu/drm/drm_lock.c | 4 +-
+ drivers/gpu/drm/drm_mm.c | 142 +-
+ drivers/gpu/drm/drm_mode_object.c | 437 ++
+ drivers/gpu/drm/drm_modes.c | 30 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 153 +
+ drivers/gpu/drm/drm_pci.c | 8 +-
+ drivers/gpu/drm/drm_plane_helper.c | 207 +-
+ drivers/gpu/drm/drm_probe_helper.c | 8 +-
+ drivers/gpu/drm/drm_property.c | 899 ++++
+ drivers/gpu/drm/drm_rect.c | 30 +-
+ drivers/gpu/drm/drm_scatter.c | 6 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 87 +-
+ drivers/gpu/drm/drm_vma_manager.c | 43 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 15 -
+ drivers/gpu/drm/gma500/accel_2d.c | 1 -
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 8 -
+ drivers/gpu/drm/gma500/framebuffer.c | 1 -
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 -
+ drivers/gpu/drm/gma500/opregion.c | 5 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 -
+ drivers/gpu/drm/gma500/psb_intel_modes.c | 1 -
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
+ drivers/gpu/drm/i810/i810_drv.c | 4 +-
+ drivers/gpu/drm/i915/Makefile | 9 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 381 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 534 +-
+ drivers/gpu/drm/i915/i915_drv.c | 90 +-
+ drivers/gpu/drm/i915/i915_drv.h | 992 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 3244 +++++------
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 34 +-
+ drivers/gpu/drm/i915/i915_gem_batch_pool.h | 6 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 239 +-
+ drivers/gpu/drm/i915/i915_gem_debug.c | 70 -
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 73 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 192 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 884 +--
+ drivers/gpu/drm/i915/i915_gem_fence.c | 477 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 755 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 238 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 132 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.h | 20 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 785 +++
+ drivers/gpu/drm/i915/i915_gem_request.h | 677 +++
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 46 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 112 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 74 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 839 +--
+ drivers/gpu/drm/i915/i915_guc_submission.c | 264 +-
+ drivers/gpu/drm/i915/i915_irq.c | 83 +-
+ drivers/gpu/drm/i915/i915_memcpy.c | 101 +
+ drivers/gpu/drm/i915/i915_mm.c | 84 +
+ drivers/gpu/drm/i915/i915_params.c | 6 +
+ drivers/gpu/drm/i915/i915_params.h | 1 +
+ drivers/gpu/drm/i915/i915_pci.c | 1 +
+ drivers/gpu/drm/i915/i915_reg.h | 171 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 41 -
+ drivers/gpu/drm/i915/i915_sysfs.c | 78 +-
+ drivers/gpu/drm/i915/i915_trace.h | 35 +-
+ drivers/gpu/drm/i915/i915_vgpu.c | 45 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 26 +-
+ drivers/gpu/drm/i915/intel_audio.c | 6 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 108 +-
+ drivers/gpu/drm/i915/intel_csr.c | 7 -
+ drivers/gpu/drm/i915/intel_ddi.c | 170 +-
+ drivers/gpu/drm/i915/intel_display.c | 1389 +++--
+ drivers/gpu/drm/i915/intel_dp.c | 316 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 4 +-
+ drivers/gpu/drm/i915/intel_drv.h | 90 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 323 ++
+ drivers/gpu/drm/i915/intel_fbc.c | 93 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 33 +-
+ drivers/gpu/drm/i915/intel_frontbuffer.c | 128 +-
+ drivers/gpu/drm/i915/intel_frontbuffer.h | 91 +
+ drivers/gpu/drm/i915/intel_guc.h | 19 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 5 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 66 +-
+ drivers/gpu/drm/i915/intel_hotplug.c | 4 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 968 +---
+ drivers/gpu/drm/i915/intel_lrc.h | 52 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 162 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 61 +-
+ drivers/gpu/drm/i915/intel_mocs.h | 2 +-
+ drivers/gpu/drm/i915/intel_modes.c | 1 -
+ drivers/gpu/drm/i915/intel_overlay.c | 235 +-
+ drivers/gpu/drm/i915/intel_pm.c | 413 +-
+ drivers/gpu/drm/i915/intel_psr.c | 26 +-
+ drivers/gpu/drm/i915/intel_renderstate.h | 16 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 1538 +++---
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 303 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 8 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 208 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 14 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 28 +-
+ drivers/gpu/drm/imx/imx-drm.h | 6 -
+ drivers/gpu/drm/imx/imx-ldb.c | 151 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +-
+ drivers/gpu/drm/imx/parallel-display.c | 10 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 49 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 151 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 18 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 19 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 120 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 15 +-
+ drivers/gpu/drm/mga/mga_drv.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 4 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 14 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 -
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 -
+ .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 -
+ .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 -
+ drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 8 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 14 +-
+ drivers/gpu/drm/omapdrm/omap_plane.c | 14 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 1 -
+ drivers/gpu/drm/qxl/qxl_ttm.c | 4 +-
+ drivers/gpu/drm/r128/r128_drv.c | 2 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 20 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 21 +-
+ drivers/gpu/drm/radeon/cik.c | 12 +-
+ drivers/gpu/drm/radeon/cikd.h | 1 +
+ drivers/gpu/drm/radeon/evergreen.c | 5 +-
+ drivers/gpu/drm/radeon/evergreend.h | 1 +
+ drivers/gpu/drm/radeon/ni.c | 2 +-
+ drivers/gpu/drm/radeon/nid.h | 1 +
+ drivers/gpu/drm/radeon/r600.c | 2 +-
+ drivers/gpu/drm/radeon/r600d.h | 1 +
+ drivers/gpu/drm/radeon/radeon.h | 1 +
+ drivers/gpu/drm/radeon/radeon_display.c | 89 +-
+ drivers/gpu/drm/radeon/radeon_dp_auxch.c | 1 -
+ drivers/gpu/drm/radeon/radeon_drv.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_i2c.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 7 +-
+ drivers/gpu/drm/radeon/radeon_uvd.c | 7 +-
+ drivers/gpu/drm/radeon/rv515.c | 3 +-
+ drivers/gpu/drm/radeon/rv770.c | 2 +-
+ drivers/gpu/drm/radeon/rv770d.h | 1 +
+ drivers/gpu/drm/radeon/si.c | 12 +-
+ drivers/gpu/drm/radeon/sid.h | 1 +
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +-
+ drivers/gpu/drm/rockchip/Makefile | 2 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 71 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 6 +
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 15 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 245 +
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 26 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 288 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 243 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 193 +
+ drivers/gpu/drm/savage/savage_drv.c | 2 +-
+ drivers/gpu/drm/savage/savage_state.c | 12 +-
+ drivers/gpu/drm/sis/sis_drv.c | 2 +-
+ drivers/gpu/drm/sti/sti_drv.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +-
+ drivers/gpu/drm/tdfx/tdfx_drv.c | 1 +
+ drivers/gpu/drm/tegra/dc.c | 17 -
+ drivers/gpu/drm/tegra/drm.c | 3 +-
+ drivers/gpu/drm/tilcdc/Makefile | 1 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 375 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 207 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 12 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 13 +-
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 132 +
+ drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 6 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 6 +
+ drivers/gpu/drm/udl/udl_connector.c | 3 -
+ drivers/gpu/drm/udl/udl_main.c | 25 +
+ drivers/gpu/drm/udl/udl_modeset.c | 2 -
+ drivers/gpu/drm/vc4/vc4_drv.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 2 -
+ drivers/gpu/drm/via/via_drv.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 13 +-
+ drivers/gpu/drm/vmwgfx/Kconfig | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 11 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 7 -
+ drivers/gpu/ipu-v3/ipu-common.c | 12 +-
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 13 +
+ drivers/gpu/ipu-v3/ipu-csi.c | 26 +-
+ drivers/gpu/ipu-v3/ipu-ic.c | 40 +-
+ drivers/gpu/ipu-v3/ipu-prv.h | 1 +
+ drivers/gpu/vga/vgaarb.c | 110 +-
+ drivers/staging/android/sync_debug.c | 12 +-
+ include/drm/bridge/analogix_dp.h | 3 +
+ include/drm/drmP.h | 137 +-
+ include/drm/drm_atomic_helper.h | 13 +-
+ include/drm/drm_connector.h | 747 +++
+ include/drm/drm_crtc.h | 1086 +---
+ include/drm/drm_crtc_helper.h | 6 +-
+ include/drm/drm_encoder.h | 227 +
+ include/drm/drm_fb_helper.h | 28 +-
+ include/drm/drm_fourcc.h | 3 +-
+ include/drm/drm_framebuffer.h | 250 +
+ include/drm/drm_gem.h | 4 +-
+ include/drm/drm_mm.h | 12 +
+ include/drm/drm_mode_object.h | 124 +
+ include/drm/drm_modes.h | 23 +-
+ include/drm/drm_modeset_helper.h | 36 +
+ include/drm/drm_modeset_helper_vtables.h | 57 +-
+ include/drm/drm_plane_helper.h | 9 +-
+ include/drm/drm_property.h | 294 +
+ include/drm/drm_simple_kms_helper.h | 11 +
+ include/drm/drm_vma_manager.h | 2 -
+ include/drm/i915_drm.h | 2 +-
+ include/drm/ttm/ttm_bo_driver.h | 7 +-
+ include/drm/ttm/ttm_memory.h | 1 +
+ include/linux/fence-array.h | 10 +
+ include/linux/fence.h | 2 +-
+ include/linux/io-mapping.h | 98 +-
+ include/linux/sync_file.h | 20 +-
+ include/linux/vgaarb.h | 128 +-
+ include/uapi/drm/amdgpu_drm.h | 6 +
+ include/uapi/drm/drm.h | 1 +
+ include/uapi/drm/drm_mode.h | 39 +-
+ include/uapi/drm/i915_drm.h | 58 +-
+ include/video/imx-ipu-v3.h | 18 +
+ 400 files changed, 34125 insertions(+), 17952 deletions(-)
+ rename Documentation/{vgaarbiter.txt => gpu/vgaarbiter.rst} (65%)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_clockpowergating.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_dyn_defaults.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_hwmgr.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_powertune.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/iceland_thermal.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h
+ create mode 100644 drivers/gpu/drm/drm_connector.c
+ rename include/drm/drm_dp_aux_dev.h => drivers/gpu/drm/drm_crtc_helper_internal.h (63%)
+ create mode 100644 drivers/gpu/drm/drm_encoder.c
+ create mode 100644 drivers/gpu/drm/drm_framebuffer.c
+ create mode 100644 drivers/gpu/drm/drm_mode_object.c
+ create mode 100644 drivers/gpu/drm/drm_modeset_helper.c
+ create mode 100644 drivers/gpu/drm/drm_property.c
+ delete mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_request.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_request.h
+ create mode 100644 drivers/gpu/drm/i915/i915_memcpy.c
+ create mode 100644 drivers/gpu/drm/i915/i915_mm.c
+ create mode 100644 drivers/gpu/drm/i915/intel_engine_cs.c
+ create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.h
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h
+ create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_plane.c
+ create mode 100644 include/drm/drm_connector.h
+ create mode 100644 include/drm/drm_encoder.h
+ create mode 100644 include/drm/drm_framebuffer.h
+ create mode 100644 include/drm/drm_mode_object.h
+ create mode 100644 include/drm/drm_modeset_helper.h
+ create mode 100644 include/drm/drm_property.h
+Merging drm-panel/drm/panel/for-next (a42f6e3f8f03 drm/panel: simple: Add delay timing for Sharp LQ123P1JX31)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_mipi_dsi.c | 63 ++++++++++++++++++++++++++++++++----
+ drivers/gpu/drm/panel/panel-simple.c | 5 +++
+ include/drm/drm_mipi_dsi.h | 6 +++-
+ 3 files changed, 66 insertions(+), 8 deletions(-)
+Merging drm-intel/for-linux-next (4bb05040fd68 drm/i915: debugfs/i915_gem_interrupt_info does not need struct_mutex)
+$ git merge drm-intel/for-linux-next
+Recorded preimage for 'drivers/gpu/drm/i915/intel_drv.h'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_pm.c'
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_dvo.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_audio.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/intel_drv.h'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_pm.c'.
+[master e0834f47f877] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/i915_debugfs.c | 997 ++++++++++++--------------
+ drivers/gpu/drm/i915/i915_drv.c | 258 +++----
+ drivers/gpu/drm/i915/i915_drv.h | 76 +-
+ drivers/gpu/drm/i915/i915_gem.c | 55 ++
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 104 ++-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 13 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 13 +
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 19 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 9 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 3 +-
+ drivers/gpu/drm/i915/i915_irq.c | 7 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 6 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 171 ++---
+ drivers/gpu/drm/i915/intel_audio.c | 57 +-
+ drivers/gpu/drm/i915/intel_color.c | 24 +-
+ drivers/gpu/drm/i915/intel_crt.c | 48 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 98 +--
+ drivers/gpu/drm/i915/intel_device_info.c | 140 ++--
+ drivers/gpu/drm/i915/intel_display.c | 523 ++++++++++----
+ drivers/gpu/drm/i915/intel_dp.c | 192 ++---
+ drivers/gpu/drm/i915/intel_dp_link_training.c | 11 +
+ drivers/gpu/drm/i915/intel_dp_mst.c | 92 +--
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +-
+ drivers/gpu/drm/i915/intel_drv.h | 58 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 40 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 27 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 6 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 3 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 3 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 75 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 134 ++--
+ drivers/gpu/drm/i915/intel_lrc.c | 14 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 52 +-
+ drivers/gpu/drm/i915/intel_panel.c | 40 +-
+ drivers/gpu/drm/i915/intel_pm.c | 237 ++----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 57 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 56 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 9 +
+ drivers/gpu/drm/i915/intel_tv.c | 15 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 9 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ 44 files changed, 2039 insertions(+), 1748 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/dc.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+Merging drm-misc/topic/drm-misc (75ac49532a3c drm/doc: Add a few words on validation with IGT)
+$ git merge drm-misc/topic/drm-misc
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/drm-uapi.rst | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
+$ git merge mali-dp/for-upstream/mali-dp
+Already up-to-date.
+Merging sunxi/sunxi/for-next (1ed343e25f10 Merge branches 'sunxi/clk-fixes-for-4.8', 'sunxi/drm-for-4.9' and 'sunxi/dt-for-4.9' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +-
+ arch/arm/boot/dts/Makefile | 6 +
+ arch/arm/boot/dts/axp209.dtsi | 6 +
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 4 -
+ .../boot/dts/sun5i-a13-empire-electronix-m712.dts | 51 +
+ arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 164 +--
+ arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 10 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 424 ++-----
+ arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 138 +--
+ arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 100 ++
+ .../boot/dts/sun6i-reference-design-tablet.dtsi | 193 +++
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 21 +
+ arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 192 +--
+ .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 42 +
+ .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 42 +
+ arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 18 +
+ arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 88 ++
+ arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 226 ++++
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 10 +
+ arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 178 +++
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 88 ++
+ .../boot/dts/sun8i-reference-design-tablet.dtsi | 26 +
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 29 +
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 29 +
+ arch/arm/boot/dts/sun9i-a80.dtsi | 14 +-
+ arch/arm/mach-sunxi/Kconfig | 1 +
+ arch/arm64/Kconfig.platforms | 2 +
+ drivers/clk/sunxi-ng/Kconfig | 10 +
+ drivers/clk/sunxi-ng/Makefile | 1 +
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 1235 ++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 72 ++
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 26 +-
+ drivers/clk/sunxi-ng/ccu_div.h | 2 +-
+ drivers/clk/sunxi-ng/ccu_mp.h | 2 +-
+ drivers/clk/sunxi-ng/ccu_mux.c | 56 +-
+ drivers/clk/sunxi-ng/ccu_mux.h | 46 +-
+ drivers/clk/sunxi-ng/ccu_nk.c | 6 +-
+ drivers/clk/sunxi-ng/ccu_nkm.c | 40 +-
+ drivers/clk/sunxi-ng/ccu_nkm.h | 23 +
+ drivers/clk/sunxi/clk-a10-pll2.c | 4 +-
+ drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 64 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 56 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 4 +
+ include/dt-bindings/clock/sun6i-a31-ccu.h | 187 +++
+ include/dt-bindings/reset/sun6i-a31-ccu.h | 106 ++
+ 48 files changed, 3148 insertions(+), 905 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts
+ create mode 100644 arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
+ create mode 100644 arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-a31.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun6i-a31.h
+ create mode 100644 include/dt-bindings/clock/sun6i-a31-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun6i-a31-ccu.h
+Merging kbuild/for-next (5c6f3225d00d kbuild: Regenerate genksyms lexer)
+$ git merge kbuild/for-next
+Removing arch/x86/um/ksyms.c
+Auto-merging arch/x86/lib/hweight.S
+Removing arch/x86/kernel/x8664_ksyms_64.c
+Removing arch/x86/kernel/i386_ksyms_32.c
+Auto-merging arch/x86/entry/entry_64.S
+Removing arch/sparc/lib/ksyms.c
+Removing arch/sparc/kernel/sparc_ksyms_64.c
+Removing arch/sparc/kernel/sparc_ksyms_32.c
+Removing arch/s390/kernel/s390_ksyms.c
+Removing arch/powerpc/lib/ppc_ksyms.c
+Auto-merging arch/powerpc/lib/checksum_32.S
+Auto-merging arch/powerpc/kernel/setup_32.c
+Removing arch/powerpc/kernel/ppc_ksyms_32.c
+Removing arch/powerpc/kernel/ppc_ksyms.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/kernel/Makefile
+Removing arch/m68k/kernel/m68k_ksyms.c
+Removing arch/arm/mach-imx/ssi-fiq-ksym.c
+Auto-merging arch/arm/mach-imx/Makefile
+Auto-merging arch/arm/lib/delay.c
+Removing arch/arm/kernel/armksyms.c
+Removing arch/alpha/kernel/alpha_ksyms.c
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/kernel/Makefile | 2 +-
+ arch/alpha/kernel/alpha_ksyms.c | 102 -------------------
+ arch/alpha/kernel/machvec_impl.h | 6 +-
+ arch/alpha/kernel/setup.c | 1 +
+ arch/alpha/lib/callback_srm.S | 5 +
+ arch/alpha/lib/checksum.c | 3 +
+ arch/alpha/lib/clear_page.S | 3 +-
+ arch/alpha/lib/clear_user.S | 2 +
+ arch/alpha/lib/copy_page.S | 3 +-
+ arch/alpha/lib/copy_user.S | 3 +
+ arch/alpha/lib/csum_ipv6_magic.S | 2 +
+ arch/alpha/lib/csum_partial_copy.c | 2 +
+ arch/alpha/lib/dec_and_lock.c | 2 +
+ arch/alpha/lib/divide.S | 3 +
+ arch/alpha/lib/ev6-clear_page.S | 3 +-
+ arch/alpha/lib/ev6-clear_user.S | 3 +-
+ arch/alpha/lib/ev6-copy_page.S | 3 +-
+ arch/alpha/lib/ev6-copy_user.S | 3 +-
+ arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 +
+ arch/alpha/lib/ev6-divide.S | 3 +
+ arch/alpha/lib/ev6-memchr.S | 3 +-
+ arch/alpha/lib/ev6-memcpy.S | 3 +-
+ arch/alpha/lib/ev6-memset.S | 7 +-
+ arch/alpha/lib/ev67-strcat.S | 3 +-
+ arch/alpha/lib/ev67-strchr.S | 3 +-
+ arch/alpha/lib/ev67-strlen.S | 3 +-
+ arch/alpha/lib/ev67-strncat.S | 3 +-
+ arch/alpha/lib/ev67-strrchr.S | 3 +-
+ arch/alpha/lib/fpreg.c | 7 ++
+ arch/alpha/lib/memchr.S | 3 +-
+ arch/alpha/lib/memcpy.c | 5 +-
+ arch/alpha/lib/memmove.S | 3 +-
+ arch/alpha/lib/memset.S | 7 +-
+ arch/alpha/lib/strcat.S | 2 +
+ arch/alpha/lib/strchr.S | 3 +-
+ arch/alpha/lib/strcpy.S | 3 +-
+ arch/alpha/lib/strlen.S | 3 +-
+ arch/alpha/lib/strncat.S | 3 +-
+ arch/alpha/lib/strncpy.S | 3 +-
+ arch/alpha/lib/strrchr.S | 3 +-
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/kernel/Makefile | 2 +-
+ arch/arm/kernel/armksyms.c | 183 ----------------------------------
+ arch/arm/kernel/entry-ftrace.S | 3 +
+ arch/arm/kernel/head.S | 3 +
+ arch/arm/kernel/smccc-call.S | 3 +
+ arch/arm/lib/ashldi3.S | 3 +
+ arch/arm/lib/ashrdi3.S | 3 +
+ arch/arm/lib/bitops.h | 5 +
+ arch/arm/lib/bswapsdi2.S | 3 +
+ arch/arm/lib/clear_user.S | 4 +
+ arch/arm/lib/copy_from_user.S | 2 +
+ arch/arm/lib/copy_page.S | 2 +
+ arch/arm/lib/copy_to_user.S | 4 +
+ arch/arm/lib/csumipv6.S | 3 +-
+ arch/arm/lib/csumpartial.S | 2 +
+ arch/arm/lib/csumpartialcopy.S | 1 +
+ arch/arm/lib/csumpartialcopygeneric.S | 2 +
+ arch/arm/lib/csumpartialcopyuser.S | 1 +
+ arch/arm/lib/delay.c | 2 +
+ arch/arm/lib/div64.S | 2 +
+ arch/arm/lib/findbit.S | 9 ++
+ arch/arm/lib/getuser.S | 9 ++
+ arch/arm/lib/io-readsb.S | 2 +
+ arch/arm/lib/io-readsl.S | 2 +
+ arch/arm/lib/io-readsw-armv3.S | 3 +-
+ arch/arm/lib/io-readsw-armv4.S | 2 +
+ arch/arm/lib/io-writesb.S | 2 +
+ arch/arm/lib/io-writesl.S | 2 +
+ arch/arm/lib/io-writesw-armv3.S | 2 +
+ arch/arm/lib/io-writesw-armv4.S | 2 +
+ arch/arm/lib/lib1funcs.S | 9 ++
+ arch/arm/lib/lshrdi3.S | 3 +
+ arch/arm/lib/memchr.S | 2 +
+ arch/arm/lib/memcpy.S | 3 +
+ arch/arm/lib/memmove.S | 2 +
+ arch/arm/lib/memset.S | 3 +
+ arch/arm/lib/memzero.S | 2 +
+ arch/arm/lib/muldi3.S | 3 +
+ arch/arm/lib/putuser.S | 5 +
+ arch/arm/lib/strchr.S | 2 +
+ arch/arm/lib/strrchr.S | 2 +
+ arch/arm/lib/uaccess_with_memcpy.c | 3 +
+ arch/arm/lib/ucmpdi2.S | 3 +
+ arch/arm/mach-imx/Makefile | 1 -
+ arch/arm/mach-imx/ssi-fiq-ksym.c | 20 ----
+ arch/arm/mach-imx/ssi-fiq.S | 7 +-
+ arch/ia64/hp/sim/boot/Makefile | 2 +-
+ arch/ia64/include/asm/export.h | 3 +
+ arch/ia64/kernel/entry.S | 3 +
+ arch/ia64/kernel/esi_stub.S | 2 +
+ arch/ia64/kernel/head.S | 2 +
+ arch/ia64/kernel/ia64_ksyms.c | 94 +----------------
+ arch/ia64/kernel/ivt.S | 2 +
+ arch/ia64/kernel/pal.S | 7 ++
+ arch/ia64/kernel/setup.c | 4 +
+ arch/ia64/lib/Makefile | 8 +-
+ arch/ia64/lib/clear_page.S | 2 +
+ arch/ia64/lib/clear_user.S | 2 +
+ arch/ia64/lib/copy_page.S | 2 +
+ arch/ia64/lib/copy_page_mck.S | 2 +
+ arch/ia64/lib/copy_user.S | 2 +
+ arch/ia64/lib/flush.S | 2 +
+ arch/ia64/lib/idiv32.S | 2 +
+ arch/ia64/lib/idiv64.S | 2 +
+ arch/ia64/lib/ip_fast_csum.S | 3 +
+ arch/ia64/lib/memcpy.S | 2 +
+ arch/ia64/lib/memcpy_mck.S | 3 +
+ arch/ia64/lib/memset.S | 2 +
+ arch/ia64/lib/strlen.S | 2 +
+ arch/ia64/lib/strlen_user.S | 2 +
+ arch/ia64/lib/strncpy_from_user.S | 2 +
+ arch/ia64/lib/strnlen_user.S | 2 +
+ arch/ia64/lib/xor.S | 5 +
+ arch/m68k/include/asm/export.h | 3 +
+ arch/m68k/kernel/Makefile | 2 +-
+ arch/m68k/kernel/m68k_ksyms.c | 32 ------
+ arch/m68k/lib/ashldi3.c | 4 +
+ arch/m68k/lib/ashrdi3.c | 4 +
+ arch/m68k/lib/divsi3.S | 3 +
+ arch/m68k/lib/lshrdi3.c | 4 +
+ arch/m68k/lib/modsi3.S | 3 +
+ arch/m68k/lib/muldi3.c | 4 +
+ arch/m68k/lib/mulsi3.S | 4 +-
+ arch/m68k/lib/udivsi3.S | 4 +-
+ arch/m68k/lib/umodsi3.S | 4 +-
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/kernel/Makefile | 4 -
+ arch/powerpc/kernel/entry_32.S | 2 +
+ arch/powerpc/kernel/entry_64.S | 3 +
+ arch/powerpc/kernel/epapr_hcalls.S | 2 +
+ arch/powerpc/kernel/fpu.S | 3 +
+ arch/powerpc/kernel/head_32.S | 5 +
+ arch/powerpc/kernel/head_40x.S | 2 +
+ arch/powerpc/kernel/head_44x.S | 2 +
+ arch/powerpc/kernel/head_64.S | 2 +
+ arch/powerpc/kernel/head_8xx.S | 2 +
+ arch/powerpc/kernel/head_fsl_booke.S | 2 +
+ arch/powerpc/kernel/misc.S | 2 +
+ arch/powerpc/kernel/misc_32.S | 11 ++
+ arch/powerpc/kernel/misc_64.S | 4 +
+ arch/powerpc/kernel/pci-common.c | 1 +
+ arch/powerpc/kernel/pci_32.c | 2 +
+ arch/powerpc/kernel/ppc_ksyms.c | 37 -------
+ arch/powerpc/kernel/ppc_ksyms_32.c | 60 -----------
+ arch/powerpc/kernel/setup_32.c | 6 ++
+ arch/powerpc/kernel/time.c | 1 +
+ arch/powerpc/kernel/vector.S | 3 +
+ arch/powerpc/lib/Makefile | 2 +-
+ arch/powerpc/lib/checksum_32.S | 3 +
+ arch/powerpc/lib/checksum_64.S | 3 +
+ arch/powerpc/lib/copy_32.S | 5 +
+ arch/powerpc/lib/copypage_64.S | 2 +
+ arch/powerpc/lib/copyuser_64.S | 2 +
+ arch/powerpc/lib/hweight_64.S | 5 +
+ arch/powerpc/lib/mem_64.S | 3 +
+ arch/powerpc/lib/memcmp_64.S | 2 +
+ arch/powerpc/lib/memcpy_64.S | 2 +
+ arch/powerpc/lib/ppc_ksyms.c | 29 ------
+ arch/powerpc/lib/string.S | 6 ++
+ arch/powerpc/lib/string_64.S | 2 +
+ arch/powerpc/mm/hash_low_32.S | 3 +
+ arch/powerpc/sysdev/dcr-low.S | 3 +
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/entry.S | 6 ++
+ arch/s390/kernel/mcount.S | 3 +
+ arch/s390/kernel/s390_ksyms.c | 15 ---
+ arch/s390/lib/mem.S | 3 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/string.h | 34 +++++++
+ arch/sparc/include/asm/string_32.h | 56 -----------
+ arch/sparc/include/asm/string_64.h | 44 --------
+ arch/sparc/kernel/Makefile | 2 +-
+ arch/sparc/kernel/entry.S | 3 +
+ arch/sparc/kernel/head_32.S | 3 +
+ arch/sparc/kernel/head_64.S | 7 +-
+ arch/sparc/kernel/helpers.S | 2 +
+ arch/sparc/kernel/hvcalls.S | 5 +
+ arch/sparc/kernel/sparc_ksyms.c | 12 +++
+ arch/sparc/kernel/sparc_ksyms_32.c | 31 ------
+ arch/sparc/kernel/sparc_ksyms_64.c | 53 ----------
+ arch/sparc/lib/Makefile | 1 -
+ arch/sparc/lib/U1memcpy.S | 2 +
+ arch/sparc/lib/VISsave.S | 2 +
+ arch/sparc/lib/ashldi3.S | 2 +
+ arch/sparc/lib/ashrdi3.S | 2 +
+ arch/sparc/lib/atomic_64.S | 16 ++-
+ arch/sparc/lib/bitops.S | 7 ++
+ arch/sparc/lib/blockops.S | 3 +
+ arch/sparc/lib/bzero.S | 4 +
+ arch/sparc/lib/checksum_32.S | 3 +
+ arch/sparc/lib/checksum_64.S | 2 +
+ arch/sparc/lib/clear_page.S | 3 +
+ arch/sparc/lib/copy_in_user.S | 2 +
+ arch/sparc/lib/copy_page.S | 2 +
+ arch/sparc/lib/copy_user.S | 2 +
+ arch/sparc/lib/csum_copy.S | 3 +
+ arch/sparc/lib/divdi3.S | 2 +
+ arch/sparc/lib/ffs.S | 3 +
+ arch/sparc/lib/hweight.S | 5 +
+ arch/sparc/lib/ipcsum.S | 2 +
+ arch/sparc/lib/ksyms.c | 174 --------------------------------
+ arch/sparc/lib/locks.S | 5 +
+ arch/sparc/lib/lshrdi3.S | 2 +
+ arch/sparc/lib/mcount.S | 2 +
+ arch/sparc/lib/memcmp.S | 2 +
+ arch/sparc/lib/memcpy.S | 86 +---------------
+ arch/sparc/lib/memmove.S | 2 +
+ arch/sparc/lib/memscan_32.S | 4 +
+ arch/sparc/lib/memscan_64.S | 4 +
+ arch/sparc/lib/memset.S | 3 +
+ arch/sparc/lib/muldi3.S | 2 +
+ arch/sparc/lib/strlen.S | 2 +
+ arch/sparc/lib/strncmp_32.S | 2 +
+ arch/sparc/lib/strncmp_64.S | 2 +
+ arch/sparc/lib/xor.S | 9 ++
+ arch/x86/entry/entry_32.S | 2 +
+ arch/x86/entry/entry_64.S | 2 +
+ arch/x86/entry/thunk_32.S | 3 +
+ arch/x86/entry/thunk_64.S | 3 +
+ arch/x86/include/asm/export.h | 4 +
+ arch/x86/kernel/Makefile | 4 +-
+ arch/x86/kernel/head_32.S | 2 +
+ arch/x86/kernel/head_64.S | 3 +
+ arch/x86/kernel/i386_ksyms_32.c | 47 ---------
+ arch/x86/kernel/mcount_64.S | 2 +
+ arch/x86/kernel/x8664_ksyms_64.c | 85 ----------------
+ arch/x86/lib/checksum_32.S | 3 +
+ arch/x86/lib/clear_page_64.S | 2 +
+ arch/x86/lib/cmpxchg8b_emu.S | 2 +
+ arch/x86/lib/copy_page_64.S | 2 +
+ arch/x86/lib/copy_user_64.S | 8 ++
+ arch/x86/lib/csum-partial_64.c | 1 +
+ arch/x86/lib/getuser.S | 5 +
+ arch/x86/lib/hweight.S | 3 +
+ arch/x86/lib/memcpy_64.S | 4 +
+ arch/x86/lib/memmove_64.S | 3 +
+ arch/x86/lib/memset_64.S | 3 +
+ arch/x86/lib/putuser.S | 5 +
+ arch/x86/lib/strstr_32.c | 3 +-
+ arch/x86/um/Makefile | 2 +-
+ arch/x86/um/checksum_32.S | 2 +
+ arch/x86/um/ksyms.c | 13 ---
+ include/asm-generic/export.h | 94 +++++++++++++++++
+ scripts/Makefile.build | 20 ++++
+ scripts/basic/fixdep.c | 86 ++++++----------
+ scripts/genksyms/lex.l | 35 ++++---
+ scripts/genksyms/lex.lex.c_shipped | 35 ++++---
+ 250 files changed, 860 insertions(+), 1315 deletions(-)
+ delete mode 100644 arch/alpha/kernel/alpha_ksyms.c
+ delete mode 100644 arch/arm/kernel/armksyms.c
+ delete mode 100644 arch/arm/mach-imx/ssi-fiq-ksym.c
+ create mode 100644 arch/ia64/include/asm/export.h
+ create mode 100644 arch/m68k/include/asm/export.h
+ delete mode 100644 arch/m68k/kernel/m68k_ksyms.c
+ delete mode 100644 arch/powerpc/kernel/ppc_ksyms.c
+ delete mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c
+ delete mode 100644 arch/powerpc/lib/ppc_ksyms.c
+ delete mode 100644 arch/s390/kernel/s390_ksyms.c
+ create mode 100644 arch/sparc/kernel/sparc_ksyms.c
+ delete mode 100644 arch/sparc/kernel/sparc_ksyms_32.c
+ delete mode 100644 arch/sparc/kernel/sparc_ksyms_64.c
+ delete mode 100644 arch/sparc/lib/ksyms.c
+ create mode 100644 arch/x86/include/asm/export.h
+ delete mode 100644 arch/x86/kernel/i386_ksyms_32.c
+ delete mode 100644 arch/x86/kernel/x8664_ksyms_64.c
+ delete mode 100644 arch/x86/um/ksyms.c
+ create mode 100644 include/asm-generic/export.h
+$ git am -3 ../patches/0001-Revert-ppc-move-exports-to-definitions.patch
+Applying: Revert "ppc: move exports to definitions"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/include/asm/Kbuild
+M arch/powerpc/kernel/Makefile
+M arch/powerpc/kernel/entry_32.S
+M arch/powerpc/kernel/entry_64.S
+M arch/powerpc/kernel/epapr_hcalls.S
+M arch/powerpc/kernel/fpu.S
+M arch/powerpc/kernel/head_32.S
+M arch/powerpc/kernel/head_40x.S
+M arch/powerpc/kernel/head_44x.S
+M arch/powerpc/kernel/head_64.S
+M arch/powerpc/kernel/head_8xx.S
+M arch/powerpc/kernel/head_fsl_booke.S
+M arch/powerpc/kernel/misc.S
+M arch/powerpc/kernel/misc_32.S
+M arch/powerpc/kernel/misc_64.S
+M arch/powerpc/kernel/pci-common.c
+M arch/powerpc/kernel/pci_32.c
+M arch/powerpc/kernel/setup_32.c
+M arch/powerpc/kernel/time.c
+M arch/powerpc/kernel/vector.S
+M arch/powerpc/lib/Makefile
+M arch/powerpc/lib/checksum_32.S
+M arch/powerpc/lib/checksum_64.S
+M arch/powerpc/lib/copy_32.S
+M arch/powerpc/lib/copypage_64.S
+M arch/powerpc/lib/copyuser_64.S
+M arch/powerpc/lib/hweight_64.S
+M arch/powerpc/lib/mem_64.S
+M arch/powerpc/lib/memcmp_64.S
+M arch/powerpc/lib/memcpy_64.S
+M arch/powerpc/lib/string.S
+M arch/powerpc/lib/string_64.S
+M arch/powerpc/mm/hash_low_32.S
+M arch/powerpc/sysdev/dcr-low.S
+$ git add -A .
+$ git commit -v -a --amend
+[master 349dcb7c4be6] Merge remote-tracking branch 'kbuild/for-next'
+ Date: Mon Sep 5 14:17:18 2016 +1000
+Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
+$ git merge kspp/for-next/kspp
+Auto-merging net/core/dev.c
+Auto-merging mm/page_alloc.c
+Auto-merging kernel/time/timer.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/compiler-gcc.h
+Auto-merging fs/namespace.c
+Auto-merging arch/powerpc/kernel/Makefile
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 5 +
+ arch/Kconfig | 18 +
+ arch/powerpc/kernel/Makefile | 5 +
+ block/blk-softirq.c | 2 +-
+ drivers/char/random.c | 4 +-
+ fs/namespace.c | 1 +
+ include/linux/compiler-gcc.h | 7 +
+ include/linux/compiler.h | 4 +
+ include/linux/fdtable.h | 2 +-
+ include/linux/genhd.h | 2 +-
+ include/linux/init.h | 5 +-
+ include/linux/random.h | 15 +-
+ init/main.c | 1 +
+ kernel/fork.c | 7 +-
+ kernel/rcu/tiny.c | 2 +-
+ kernel/rcu/tree.c | 2 +-
+ kernel/sched/fair.c | 2 +-
+ kernel/softirq.c | 4 +-
+ kernel/time/timer.c | 2 +-
+ lib/irq_poll.c | 2 +-
+ lib/random32.c | 2 +-
+ mm/page_alloc.c | 26 ++
+ net/core/dev.c | 4 +-
+ scripts/Makefile.gcc-plugins | 9 +-
+ scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++
+ 25 files changed, 750 insertions(+), 22 deletions(-)
+ create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c
+Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging regmap/for-next (faa52daec60c Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 1 +
+ drivers/base/regmap/regcache-rbtree.c | 38 ++++++++++++++++++++++++++---------
+ drivers/base/regmap/regcache.c | 5 +++--
+ drivers/base/regmap/regmap-debugfs.c | 16 ++++++++++++---
+ drivers/base/regmap/regmap.c | 25 +++++++++++++++++++++++
+ 5 files changed, 70 insertions(+), 15 deletions(-)
+Merging sound/for-next (8c91d7d09e3c ALSA: bt87x: constify snd_pcm_ops structures)
+$ git merge sound/for-next
+Auto-merging sound/usb/quirks.c
+Auto-merging sound/soc/intel/skylake/skl.c
+Auto-merging sound/pci/hda/hda_intel.c
+Auto-merging sound/firewire/bebob/bebob_yamaha_terratec.c
+Merge made by the 'recursive' strategy.
+ include/sound/hda_register.h | 36 +
+ include/sound/hdaudio.h | 13 +
+ include/sound/hdaudio_ext.h | 12 -
+ sound/aoa/fabrics/layout.c | 8 +
+ sound/aoa/soundbus/i2sbus/core.c | 2 +-
+ sound/core/compress_offload.c | 10 +-
+ sound/core/seq/seq_clientmgr.c | 722 +++++++++------------
+ sound/core/seq/seq_compat.c | 7 +-
+ sound/firewire/bebob/Makefile | 5 +-
+ sound/firewire/bebob/bebob.c | 8 +-
+ sound/firewire/bebob/bebob.h | 3 +-
+ sound/firewire/bebob/bebob_terratec.c | 31 -
+ .../{bebob_yamaha.c => bebob_yamaha_terratec.c} | 9 +-
+ sound/firewire/dice/dice-pcm.c | 4 +-
+ sound/firewire/digi00x/digi00x-pcm.c | 4 +-
+ sound/firewire/oxfw/oxfw-pcm.c | 4 +-
+ sound/firewire/tascam/tascam-pcm.c | 4 +-
+ sound/hda/ext/hdac_ext_controller.c | 91 +--
+ sound/hda/ext/hdac_ext_stream.c | 46 +-
+ sound/hda/hdac_controller.c | 75 +++
+ sound/pci/ad1889.c | 4 +-
+ sound/pci/als300.c | 4 +-
+ sound/pci/als4000.c | 4 +-
+ sound/pci/asihpi/asihpi.c | 4 +-
+ sound/pci/atiixp.c | 6 +-
+ sound/pci/atiixp_modem.c | 4 +-
+ sound/pci/aw2/aw2-alsa.c | 4 +-
+ sound/pci/azt3328.c | 6 +-
+ sound/pci/bt87x.c | 2 +-
+ sound/pci/ca0106/ca0106_main.c | 16 +-
+ sound/pci/cmipci.c | 10 +-
+ sound/pci/cs4281.c | 4 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 4 +-
+ sound/pci/cs46xx/dsp_spos.c | 2 +-
+ sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +-
+ sound/pci/ctxfi/ctpcm.c | 4 +-
+ sound/pci/emu10k1/emu10k1x.c | 4 +-
+ sound/pci/emu10k1/emupcm.c | 12 +-
+ sound/pci/emu10k1/p16v.c | 4 +-
+ sound/pci/ens1370.c | 6 +-
+ sound/pci/es1938.c | 4 +-
+ sound/pci/es1968.c | 4 +-
+ sound/pci/fm801.c | 4 +-
+ sound/pci/hda/hda_controller.c | 205 +++++-
+ sound/pci/hda/hda_controller.h | 3 +
+ sound/pci/hda/hda_intel.c | 17 +
+ sound/pci/ice1712/ice1712.c | 10 +-
+ sound/pci/ice1712/ice1724.c | 10 +-
+ sound/pci/korg1212/korg1212.c | 4 +-
+ sound/pci/lola/lola_pcm.c | 2 +-
+ sound/pci/lx6464es/lx6464es.c | 4 +-
+ sound/pci/maestro3.c | 4 +-
+ sound/pci/mixart/mixart.c | 4 +-
+ sound/pci/nm256/nm256.c | 4 +-
+ sound/pci/oxygen/oxygen_pcm.c | 12 +-
+ sound/pci/pcxhr/pcxhr.c | 2 +-
+ sound/pci/riptide/riptide.c | 4 +-
+ sound/pci/rme32.c | 16 +-
+ sound/pci/rme96.c | 8 +-
+ sound/pci/rme9652/hdsp.c | 4 +-
+ sound/pci/rme9652/hdspm.c | 4 +-
+ sound/pci/rme9652/rme9652.c | 4 +-
+ sound/pci/sonicvibes.c | 4 +-
+ sound/pci/trident/trident_main.c | 12 +-
+ sound/pci/via82xx.c | 10 +-
+ sound/pci/via82xx_modem.c | 4 +-
+ sound/pci/ymfpci/ymfpci_main.c | 10 +-
+ sound/soc/intel/skylake/skl-messages.c | 4 +-
+ sound/soc/intel/skylake/skl-pcm.c | 8 +-
+ sound/soc/intel/skylake/skl.c | 6 +-
+ sound/usb/caiaq/audio.c | 1 -
+ sound/usb/card.h | 2 +-
+ sound/usb/endpoint.c | 13 +-
+ sound/usb/format.c | 4 +-
+ sound/usb/quirks.c | 6 +
+ 75 files changed, 881 insertions(+), 738 deletions(-)
+ rename sound/firewire/bebob/{bebob_yamaha.c => bebob_yamaha_terratec.c} (85%)
+Merging sound-asoc/for-next (efb915056f6a Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/topology', 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/sh/rcar/rsrc-card.c
+Auto-merging arch/arm/mach-s3c24xx/mach-mini2440.c
+Removing Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/nau8810.txt | 16 +
+ .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 +
+ .../bindings/sound/renesas,rsrc-card.txt | 75 --
+ .../bindings/sound/rockchip,rk3399-gru-sound.txt | 15 +
+ Documentation/devicetree/bindings/sound/rt5659.txt | 3 +
+ .../devicetree/bindings/sound/simple-scu-card.txt | 110 +++
+ .../bindings/sound/sunxi,sun4i-spdif.txt | 3 +
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 19 +
+ include/sound/l3.h | 15 +-
+ include/sound/s3c24xx_uda134x.h | 1 -
+ include/sound/simple_card_utils.h | 35 +
+ include/sound/soc.h | 19 -
+ include/uapi/sound/Kbuild | 1 +
+ include/uapi/sound/asoc.h | 35 +-
+ include/uapi/sound/snd_sst_tokens.h | 214 +++++
+ sound/soc/atmel/atmel-classd.c | 6 +-
+ sound/soc/atmel/atmel-pdmic.c | 20 +-
+ sound/soc/codecs/88pm860x-codec.c | 14 +-
+ sound/soc/codecs/Kconfig | 5 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ab8500-codec.c | 24 +-
+ sound/soc/codecs/ac97.c | 10 +-
+ sound/soc/codecs/ad1836.c | 14 +-
+ sound/soc/codecs/ad193x.c | 14 +-
+ sound/soc/codecs/ad1980.c | 14 +-
+ sound/soc/codecs/ad73311.c | 10 +-
+ sound/soc/codecs/adau1373.c | 14 +-
+ sound/soc/codecs/adau1701.c | 15 +-
+ sound/soc/codecs/adau1761.c | 14 +-
+ sound/soc/codecs/adau1781.c | 14 +-
+ sound/soc/codecs/adau1977.c | 14 +-
+ sound/soc/codecs/adau7002.c | 10 +-
+ sound/soc/codecs/adav80x.c | 14 +-
+ sound/soc/codecs/ads117x.c | 10 +-
+ sound/soc/codecs/ak4104.c | 10 +-
+ sound/soc/codecs/ak4535.c | 14 +-
+ sound/soc/codecs/ak4554.c | 10 +-
+ sound/soc/codecs/ak4613.c | 14 +-
+ sound/soc/codecs/ak4641.c | 14 +-
+ sound/soc/codecs/ak4642.c | 14 +-
+ sound/soc/codecs/ak4671.c | 14 +-
+ sound/soc/codecs/ak5386.c | 10 +-
+ sound/soc/codecs/alc5632.c | 14 +-
+ sound/soc/codecs/arizona.c | 14 +-
+ sound/soc/codecs/bt-sco.c | 10 +-
+ sound/soc/codecs/cs35l32.c | 15 +-
+ sound/soc/codecs/cs35l33.c | 15 +-
+ sound/soc/codecs/cs4265.c | 15 +-
+ sound/soc/codecs/cs4270.c | 14 +-
+ sound/soc/codecs/cs4271.c | 14 +-
+ sound/soc/codecs/cs42l51.c | 14 +-
+ sound/soc/codecs/cs42l52.c | 15 +-
+ sound/soc/codecs/cs42l56.c | 15 +-
+ sound/soc/codecs/cs42l73.c | 19 +-
+ sound/soc/codecs/cs42xx8.c | 14 +-
+ sound/soc/codecs/cs4349.c | 15 +-
+ sound/soc/codecs/cs47l24.c | 24 +-
+ sound/soc/codecs/cs53l30.c | 23 +-
+ sound/soc/codecs/cx20442.c | 10 +-
+ sound/soc/codecs/da7210.c | 15 +-
+ sound/soc/codecs/da7213.c | 145 ++--
+ sound/soc/codecs/da7213.h | 12 +-
+ sound/soc/codecs/da7218.c | 49 +-
+ sound/soc/codecs/da7218.h | 2 -
+ sound/soc/codecs/da7219-aad.c | 18 +-
+ sound/soc/codecs/da7219.c | 33 +-
+ sound/soc/codecs/da732x.c | 14 +-
+ sound/soc/codecs/da9055.c | 15 +-
+ sound/soc/codecs/dmic.c | 10 +-
+ sound/soc/codecs/es8328.c | 14 +-
+ sound/soc/codecs/gtm601.c | 10 +-
+ sound/soc/codecs/hdac_hdmi.c | 2 +-
+ sound/soc/codecs/hdmi-codec.c | 79 +-
+ sound/soc/codecs/inno_rk3036.c | 14 +-
+ sound/soc/codecs/isabelle.c | 14 +-
+ sound/soc/codecs/jz4740.c | 14 +-
+ sound/soc/codecs/l3.c | 71 +-
+ sound/soc/codecs/lm49453.c | 14 +-
+ sound/soc/codecs/max98088.c | 14 +-
+ sound/soc/codecs/max98095.c | 14 +-
+ sound/soc/codecs/max98357a.c | 10 +-
+ sound/soc/codecs/max98371.c | 1 -
+ sound/soc/codecs/max9850.c | 14 +-
+ sound/soc/codecs/max9860.c | 14 +-
+ sound/soc/codecs/max9867.c | 14 +-
+ sound/soc/codecs/max98925.c | 14 +-
+ sound/soc/codecs/max98926.c | 14 +-
+ sound/soc/codecs/mc13783.c | 14 +-
+ sound/soc/codecs/ml26124.c | 14 +-
+ sound/soc/codecs/nau8810.c | 884 ++++++++++++++++++++
+ sound/soc/codecs/nau8810.h | 281 +++++++
+ sound/soc/codecs/nau8825.c | 14 +-
+ sound/soc/codecs/pcm1681.c | 14 +-
+ sound/soc/codecs/pcm179x.c | 14 +-
+ sound/soc/codecs/pcm3008.c | 10 +-
+ sound/soc/codecs/pcm3168a.c | 14 +-
+ sound/soc/codecs/pcm512x.c | 14 +-
+ sound/soc/codecs/rt286.c | 14 +-
+ sound/soc/codecs/rt298.c | 14 +-
+ sound/soc/codecs/rt5514.c | 14 +-
+ sound/soc/codecs/rt5616.c | 14 +-
+ sound/soc/codecs/rt5631.c | 14 +-
+ sound/soc/codecs/rt5640.c | 17 +-
+ sound/soc/codecs/rt5640.h | 1 +
+ sound/soc/codecs/rt5645.c | 14 +-
+ sound/soc/codecs/rt5651.c | 14 +-
+ sound/soc/codecs/rt5659.c | 41 +-
+ sound/soc/codecs/rt5659.h | 1 +
+ sound/soc/codecs/rt5670.c | 14 +-
+ sound/soc/codecs/rt5677.c | 14 +-
+ sound/soc/codecs/sgtl5000.c | 17 +-
+ sound/soc/codecs/si476x.c | 10 +-
+ sound/soc/codecs/sn95031.c | 14 +-
+ sound/soc/codecs/spdif_receiver.c | 10 +-
+ sound/soc/codecs/spdif_transmitter.c | 10 +-
+ sound/soc/codecs/ssm2518.c | 14 +-
+ sound/soc/codecs/ssm2602.c | 14 +-
+ sound/soc/codecs/ssm4567.c | 14 +-
+ sound/soc/codecs/sta32x.c | 14 +-
+ sound/soc/codecs/sta350.c | 14 +-
+ sound/soc/codecs/sta529.c | 6 +-
+ sound/soc/codecs/stac9766.c | 6 +-
+ sound/soc/codecs/sti-sas.c | 8 +-
+ sound/soc/codecs/tas2552.c | 14 +-
+ sound/soc/codecs/tas5086.c | 16 +-
+ sound/soc/codecs/tas571x.c | 14 +-
+ sound/soc/codecs/tas5720.c | 14 +-
+ sound/soc/codecs/tfa9879.c | 15 +-
+ sound/soc/codecs/tlv320aic23.c | 14 +-
+ sound/soc/codecs/tlv320aic26.c | 14 +-
+ sound/soc/codecs/tlv320aic31xx.c | 14 +-
+ sound/soc/codecs/tlv320aic32x4.c | 14 +-
+ sound/soc/codecs/tlv320aic3x.c | 14 +-
+ sound/soc/codecs/tlv320dac33.c | 14 +-
+ sound/soc/codecs/twl4030.c | 14 +-
+ sound/soc/codecs/twl6040.c | 14 +-
+ sound/soc/codecs/uda134x.c | 17 +-
+ sound/soc/codecs/uda1380.c | 14 +-
+ sound/soc/codecs/wl1273.c | 14 +-
+ sound/soc/codecs/wm0010.c | 12 +-
+ sound/soc/codecs/wm1250-ev1.c | 13 +-
+ sound/soc/codecs/wm2000.c | 16 +-
+ sound/soc/codecs/wm2200.c | 16 +-
+ sound/soc/codecs/wm5100.c | 16 +-
+ sound/soc/codecs/wm5102.c | 26 +-
+ sound/soc/codecs/wm5110.c | 26 +-
+ sound/soc/codecs/wm8350.c | 16 +-
+ sound/soc/codecs/wm8400.c | 16 +-
+ sound/soc/codecs/wm8510.c | 16 +-
+ sound/soc/codecs/wm8523.c | 16 +-
+ sound/soc/codecs/wm8580.c | 16 +-
+ sound/soc/codecs/wm8711.c | 16 +-
+ sound/soc/codecs/wm8727.c | 12 +-
+ sound/soc/codecs/wm8728.c | 16 +-
+ sound/soc/codecs/wm8731.c | 16 +-
+ sound/soc/codecs/wm8737.c | 16 +-
+ sound/soc/codecs/wm8741.c | 12 +-
+ sound/soc/codecs/wm8750.c | 16 +-
+ sound/soc/codecs/wm8753.c | 16 +-
+ sound/soc/codecs/wm8770.c | 16 +-
+ sound/soc/codecs/wm8776.c | 16 +-
+ sound/soc/codecs/wm8782.c | 12 +-
+ sound/soc/codecs/wm8804.c | 10 +-
+ sound/soc/codecs/wm8900.c | 16 +-
+ sound/soc/codecs/wm8903.c | 16 +-
+ sound/soc/codecs/wm8904.c | 2 +-
+ sound/soc/codecs/wm8940.c | 16 +-
+ sound/soc/codecs/wm8955.c | 16 +-
+ sound/soc/codecs/wm8960.c | 2 +-
+ sound/soc/codecs/wm8961.c | 16 +-
+ sound/soc/codecs/wm8962.c | 4 +-
+ sound/soc/codecs/wm8971.c | 16 +-
+ sound/soc/codecs/wm8974.c | 16 +-
+ sound/soc/codecs/wm8978.c | 16 +-
+ sound/soc/codecs/wm8983.c | 16 +-
+ sound/soc/codecs/wm8985.c | 16 +-
+ sound/soc/codecs/wm8988.c | 14 +-
+ sound/soc/codecs/wm8990.c | 16 +-
+ sound/soc/codecs/wm8991.c | 16 +-
+ sound/soc/codecs/wm8993.c | 2 +-
+ sound/soc/codecs/wm8994.c | 2 +-
+ sound/soc/codecs/wm8995.c | 14 +-
+ sound/soc/codecs/wm8996.c | 16 +-
+ sound/soc/codecs/wm8997.c | 16 +-
+ sound/soc/codecs/wm8998.c | 26 +-
+ sound/soc/codecs/wm9081.c | 16 +-
+ sound/soc/codecs/wm9090.c | 2 +-
+ sound/soc/codecs/wm9705.c | 16 +-
+ sound/soc/codecs/wm9712.c | 16 +-
+ sound/soc/codecs/wm9713.c | 16 +-
+ sound/soc/davinci/davinci-mcasp.c | 2 +-
+ sound/soc/dwc/designware_i2s.c | 2 -
+ sound/soc/fsl/fsl_asrc.c | 10 +-
+ sound/soc/fsl/fsl_esai.c | 6 +-
+ sound/soc/fsl/fsl_sai.c | 6 +-
+ sound/soc/generic/Kconfig | 8 +
+ sound/soc/generic/Makefile | 2 +
+ sound/soc/generic/simple-card-utils.c | 141 ++++
+ sound/soc/generic/simple-card.c | 273 ++-----
+ sound/soc/generic/simple-scu-card.c | 345 ++++++++
+ sound/soc/img/pistachio-internal-dac.c | 14 +-
+ sound/soc/intel/atom/sst-atom-controls.c | 32 +-
+ sound/soc/intel/atom/sst-atom-controls.h | 6 +
+ sound/soc/intel/atom/sst/sst.c | 5 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 82 +-
+ sound/soc/intel/atom/sst/sst_ipc.c | 3 +
+ sound/soc/intel/atom/sst/sst_pvt.c | 14 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 507 ++++++++++--
+ sound/soc/intel/skylake/bxt-sst.c | 114 ++-
+ sound/soc/intel/skylake/skl-messages.c | 39 +-
+ sound/soc/intel/skylake/skl-pcm.c | 49 +-
+ sound/soc/intel/skylake/skl-sst-dsp.h | 12 +-
+ sound/soc/intel/skylake/skl-sst-ipc.c | 29 +
+ sound/soc/intel/skylake/skl-sst-ipc.h | 12 +-
+ sound/soc/intel/skylake/skl-sst-utils.c | 24 +-
+ sound/soc/intel/skylake/skl-sst.c | 43 +-
+ sound/soc/intel/skylake/skl-topology.c | 886 ++++++++++++++++++---
+ sound/soc/intel/skylake/skl-topology.h | 4 +-
+ sound/soc/intel/skylake/skl-tplg-interface.h | 92 +--
+ sound/soc/intel/skylake/skl.h | 2 +
+ sound/soc/mediatek/common/mtk-afe-fe-dai.c | 5 +-
+ sound/soc/omap/mcbsp.c | 3 +-
+ sound/soc/omap/omap-abe-twl6040.c | 14 +-
+ sound/soc/omap/omap-pcm.c | 2 +-
+ sound/soc/qcom/lpass-platform.c | 14 +-
+ sound/soc/qcom/lpass.h | 2 +
+ sound/soc/rockchip/Kconfig | 12 +
+ sound/soc/rockchip/Makefile | 2 +
+ sound/soc/rockchip/rk3399_gru_sound.c | 374 +++++++++
+ sound/soc/samsung/ac97.c | 28 +-
+ sound/soc/samsung/dma.h | 20 +-
+ sound/soc/samsung/dmaengine.c | 31 -
+ sound/soc/samsung/i2s.c | 56 +-
+ sound/soc/samsung/idma.c | 1 -
+ sound/soc/samsung/pcm.c | 26 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 3 +-
+ sound/soc/samsung/s3c-i2s-v2.h | 4 +-
+ sound/soc/samsung/s3c2412-i2s.c | 24 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 24 +-
+ sound/soc/samsung/s3c24xx_uda134x.c | 134 +---
+ sound/soc/samsung/smdk_wm8580pcm.c | 1 -
+ sound/soc/samsung/smdk_wm8994pcm.c | 1 -
+ sound/soc/samsung/spdif.c | 12 +-
+ sound/soc/sh/Kconfig | 6 -
+ sound/soc/sh/rcar/Makefile | 3 -
+ sound/soc/sh/rcar/core.c | 2 +
+ sound/soc/sh/rcar/rsrc-card.c | 486 -----------
+ sound/soc/sh/rcar/ssi.c | 2 +-
+ sound/soc/soc-core.c | 15 +-
+ sound/soc/soc-dapm.c | 23 +-
+ sound/soc/soc-ops.c | 2 +-
+ sound/soc/soc-topology.c | 115 ++-
+ sound/soc/sunxi/Kconfig | 1 +
+ sound/soc/sunxi/sun4i-codec.c | 14 +-
+ sound/soc/sunxi/sun4i-spdif.c | 17 +-
+ sound/soc/tegra/Kconfig | 11 +
+ sound/soc/tegra/Makefile | 2 +
+ sound/soc/tegra/tegra_rt5640.c | 2 +-
+ sound/soc/tegra/tegra_sgtl5000.c | 212 +++++
+ sound/soc/ux500/ux500_msp_dai.c | 6 +-
+ 260 files changed, 6411 insertions(+), 2495 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt
+ create mode 100644 include/uapi/sound/snd_sst_tokens.h
+ create mode 100644 sound/soc/codecs/nau8810.c
+ create mode 100644 sound/soc/codecs/nau8810.h
+ create mode 100644 sound/soc/generic/simple-scu-card.c
+ create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c
+ delete mode 100644 sound/soc/sh/rcar/rsrc-card.c
+ create mode 100644 sound/soc/tegra/tegra_sgtl5000.c
+Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (694641616448 Input: add generic input driver to read encoded GPIO lines)
+$ git merge input/next
+Removing drivers/input/touchscreen/ft6236.c
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/misc/max77693-haptic.c
+Removing Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/adc-keys.txt | 49 ++++
+ .../devicetree/bindings/input/gpio-decoder.txt | 23 ++
+ .../bindings/input/touchscreen/edt-ft5x06.txt | 8 +
+ .../input/touchscreen/focaltech-ft6236.txt | 35 ---
+ arch/arm/mach-sa1100/jornada720.c | 6 +
+ drivers/input/keyboard/Kconfig | 15 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/adc-keys.c | 210 +++++++++++++
+ drivers/input/keyboard/jornada720_kbd.c | 58 +---
+ drivers/input/misc/Kconfig | 12 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/gpio_decoder.c | 137 +++++++++
+ drivers/input/misc/max77693-haptic.c | 4 +-
+ drivers/input/mouse/psmouse-base.c | 2 +-
+ drivers/input/tablet/pegasus_notetaker.c | 1 +
+ drivers/input/touchscreen/Kconfig | 13 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/edt-ft5x06.c | 8 +
+ drivers/input/touchscreen/elants_i2c.c | 31 +-
+ drivers/input/touchscreen/ft6236.c | 326 ---------------------
+ drivers/input/touchscreen/mc13783_ts.c | 24 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 13 +-
+ drivers/input/touchscreen/wm97xx-core.c | 2 +-
+ 23 files changed, 519 insertions(+), 461 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/adc-keys.txt
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-decoder.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
+ create mode 100644 drivers/input/keyboard/adc-keys.c
+ create mode 100644 drivers/input/misc/gpio_decoder.c
+ delete mode 100644 drivers/input/touchscreen/ft6236.c
+Merging block/for-next (99e6b87ec210 mtip32xx: mark symbols static where possible)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 8 +++++++-
+ block/blk-mq.c | 14 ++++++++------
+ drivers/block/mtip32xx/mtip32xx.c | 2 +-
+ include/linux/blk-mq.h | 11 ++++++-----
+ include/linux/blkdev.h | 2 +-
+ include/linux/workqueue.h | 1 +
+ kernel/workqueue.c | 40 +++++++++++++++++++++++++--------------
+ 7 files changed, 50 insertions(+), 28 deletions(-)
+Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
+$ git merge lightnvm/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging device-mapper/for-next (edd1ea2a8a25 dm bufio: remove use of deprecated create_singlethread_workqueue())
+$ git merge device-mapper/for-next
+Already up-to-date.
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc-uh/next (521676f0c083 mmc: tegra: Mark 64-bit DMA broken on Tegra124)
+$ git merge mmc-uh/next
+Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi
+Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 2 +
+ Documentation/devicetree/bindings/mmc/mmc.txt | 15 +-
+ .../devicetree/bindings/mmc/sunxi-mmc.txt | 6 +-
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 4 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 8 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 +-
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +-
+ arch/arm/boot/dts/sun8i-h3.dtsi | 6 +-
+ drivers/mmc/card/block.c | 27 +--
+ drivers/mmc/core/mmc.c | 9 +-
+ drivers/mmc/core/pwrseq_simple.c | 9 +
+ drivers/mmc/core/sd.c | 37 ++--
+ drivers/mmc/core/sdio_io.c | 47 ++++--
+ drivers/mmc/core/sdio_ops.c | 9 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 6 +-
+ drivers/mmc/host/dw_mmc-k3.c | 6 +
+ drivers/mmc/host/dw_mmc.c | 81 +++------
+ drivers/mmc/host/moxart-mmc.c | 5 +-
+ drivers/mmc/host/sdhci-bcm-kona.c | 6 +-
+ drivers/mmc/host/sdhci-brcmstb.c | 1 -
+ drivers/mmc/host/sdhci-esdhc-imx.c | 7 +-
+ drivers/mmc/host/sdhci-of-arasan.c | 109 ++++++++++--
+ drivers/mmc/host/sdhci-of-esdhc.c | 2 +-
+ drivers/mmc/host/sdhci-pci-core.c | 61 +++----
+ drivers/mmc/host/sdhci-pci.h | 1 -
+ drivers/mmc/host/sdhci-pltfm.c | 7 -
+ drivers/mmc/host/sdhci-tegra.c | 27 ++-
+ drivers/mmc/host/sdhci.c | 2 +-
+ drivers/mmc/host/sdhci.h | 1 -
+ drivers/mmc/host/sh_mobile_sdhi.c | 16 +-
+ drivers/mmc/host/sunxi-mmc.c | 188 +++++++++++++--------
+ drivers/mmc/host/tmio_mmc.h | 1 +
+ drivers/mmc/host/tmio_mmc_pio.c | 9 +-
+ drivers/mmc/host/vub300.c | 2 -
+ include/linux/mmc/card.h | 1 +
+ include/linux/mmc/dw_mmc.h | 2 +
+ 36 files changed, 452 insertions(+), 282 deletions(-)
+Merging md/for-next (3fc30f2efaf9 lib/raid6: Add AVX512 optimized xor_syndrome functions)
+$ git merge md/for-next
+Recorded preimage for 'include/linux/raid/pq.h'
+Auto-merging lib/raid6/algos.c
+Auto-merging lib/raid6/Makefile
+Auto-merging include/linux/raid/pq.h
+CONFLICT (content): Merge conflict in include/linux/raid/pq.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/raid/pq.h'.
+[master 8f5a3ac590e4] Merge remote-tracking branch 'md/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/Makefile | 5 +-
+ drivers/md/md-cluster.c | 99 ++++++---
+ drivers/md/md.c | 27 ++-
+ drivers/md/md.h | 5 +-
+ drivers/md/raid5-cache.c | 46 ++--
+ drivers/md/raid5.c | 10 +
+ include/linux/raid/pq.h | 4 +
+ lib/raid6/Makefile | 2 +-
+ lib/raid6/algos.c | 12 +
+ lib/raid6/avx512.c | 569 +++++++++++++++++++++++++++++++++++++++++++++++
+ lib/raid6/recov_avx512.c | 388 ++++++++++++++++++++++++++++++++
+ lib/raid6/test/Makefile | 5 +-
+ lib/raid6/x86.h | 10 +
+ 13 files changed, 1105 insertions(+), 77 deletions(-)
+ create mode 100644 lib/raid6/avx512.c
+ create mode 100644 lib/raid6/recov_avx512.c
+Merging mfd/for-mfd-next (c1b0a7e8a6a7 mfd: twl6040: The chip does not support bulk access)
+$ git merge mfd/for-mfd-next
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/ac100.txt | 54 ++
+ Documentation/devicetree/bindings/mfd/axp20x.txt | 28 +-
+ Documentation/devicetree/bindings/mfd/lp873x.txt | 59 ++
+ Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 15 +
+ Documentation/devicetree/bindings/mfd/rk808.txt | 37 +-
+ .../bindings/mfd/samsung,exynos5433-lpass.txt | 70 +++
+ Documentation/devicetree/bindings/mfd/stmpe.txt | 2 +-
+ drivers/gpio/Kconfig | 10 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-lp873x.c | 193 +++++++
+ drivers/gpio/gpio-stmpe.c | 167 ++++--
+ drivers/input/keyboard/cros_ec_keyb.c | 135 +----
+ drivers/mfd/Kconfig | 37 +-
+ drivers/mfd/Makefile | 5 +
+ drivers/mfd/ac100.c | 137 +++++
+ drivers/mfd/act8945a.c | 1 +
+ drivers/mfd/altera-a10sr.c | 2 +-
+ drivers/mfd/arizona-core.c | 15 +-
+ drivers/mfd/axp20x-rsb.c | 1 +
+ drivers/mfd/axp20x.c | 75 +++
+ drivers/mfd/cros_ec.c | 58 +-
+ drivers/mfd/da9052-core.c | 51 ++
+ drivers/mfd/da9063-core.c | 7 +-
+ drivers/mfd/da9063-i2c.c | 2 +-
+ drivers/mfd/da9063-irq.c | 2 +-
+ drivers/mfd/dm355evm_msp.c | 17 +-
+ drivers/mfd/exynos-lpass.c | 187 ++++++
+ drivers/mfd/intel-lpss-pci.c | 23 +
+ drivers/mfd/intel_soc_pmic_bxtwc.c | 23 +-
+ drivers/mfd/lp873x.c | 99 ++++
+ drivers/mfd/max14577.c | 4 +-
+ drivers/mfd/pm8921-core.c | 1 +
+ drivers/mfd/qcom_rpm.c | 72 +++
+ drivers/mfd/rk808.c | 226 +++++++-
+ drivers/mfd/rtsx_usb.c | 10 +-
+ drivers/mfd/stmpe-i2c.c | 2 +
+ drivers/mfd/stmpe.c | 161 +++++-
+ drivers/mfd/stmpe.h | 85 ++-
+ drivers/mfd/syscon.c | 7 +-
+ drivers/mfd/twl6040.c | 1 +
+ drivers/mfd/ucb1x00-core.c | 4 -
+ drivers/platform/chrome/cros_ec_proto.c | 92 +++
+ drivers/regulator/Kconfig | 6 +-
+ drivers/regulator/qcom_rpm-regulator.c | 66 +++
+ drivers/regulator/rk808-regulator.c | 143 ++++-
+ drivers/rtc/Kconfig | 14 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-ac100.c | 627 +++++++++++++++++++++
+ include/dt-bindings/mfd/qcom-rpm.h | 22 +
+ include/linux/mfd/88pm80x.h | 4 +-
+ include/linux/mfd/ac100.h | 178 ++++++
+ include/linux/mfd/axp20x.h | 60 ++
+ include/linux/mfd/cros_ec.h | 18 +
+ include/linux/mfd/cros_ec_commands.h | 34 ++
+ include/linux/mfd/da9063/core.h | 4 +-
+ include/linux/mfd/da9063/pdata.h | 4 +-
+ include/linux/mfd/da9063/registers.h | 4 +-
+ include/linux/mfd/lp873x.h | 269 +++++++++
+ include/linux/mfd/max14577-private.h | 2 +-
+ include/linux/mfd/max14577.h | 2 +-
+ include/linux/mfd/rk808.h | 154 ++++-
+ include/linux/mfd/stmpe.h | 21 +
+ include/linux/mfd/syscon/exynos5-pmu.h | 4 +-
+ 63 files changed, 3513 insertions(+), 302 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/ac100.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/lp873x.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt
+ create mode 100644 drivers/gpio/gpio-lp873x.c
+ create mode 100644 drivers/mfd/ac100.c
+ create mode 100644 drivers/mfd/exynos-lpass.c
+ create mode 100644 drivers/mfd/lp873x.c
+ create mode 100644 drivers/rtc/rtc-ac100.c
+ create mode 100644 include/linux/mfd/ac100.h
+ create mode 100644 include/linux/mfd/lp873x.h
+Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/for-next (3b5dd3a49496 power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect)
+$ git merge battery/for-next
+Auto-merging drivers/power/supply/z2_battery.c
+Auto-merging drivers/power/supply/wm97xx_battery.c
+Auto-merging drivers/power/supply/tps65217_charger.c
+Auto-merging drivers/power/supply/sbs-battery.c
+Auto-merging drivers/power/supply/pm2301_charger.c
+Auto-merging drivers/power/supply/max77693_charger.c
+Auto-merging drivers/power/supply/max14577_charger.c
+Auto-merging drivers/power/supply/ipaq_micro_battery.c
+Auto-merging drivers/power/supply/intel_mid_battery.c
+Auto-merging drivers/power/supply/ds2781_battery.c
+Auto-merging drivers/power/supply/ds2780_battery.c
+Auto-merging drivers/power/supply/ds2760_battery.c
+Auto-merging drivers/power/supply/bq27xxx_battery.c
+Auto-merging drivers/power/supply/bq24735-charger.c
+Auto-merging drivers/power/supply/axp288_fuel_gauge.c
+Auto-merging drivers/power/supply/axp288_charger.c
+Auto-merging drivers/power/supply/abx500_chargalg.c
+Auto-merging drivers/power/supply/ab8500_fg.c
+Auto-merging drivers/power/supply/ab8500_charger.c
+Auto-merging drivers/power/supply/ab8500_btemp.c
+Removing drivers/power/act8945a_charger.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/power/act8945a-charger.txt
+Merge made by the 'recursive' strategy.
+ CREDITS | 4 +
+ Documentation/ABI/testing/sysfs-class-power | 8 +-
+ .../devicetree/bindings/power/act8945a-charger.txt | 35 --
+ .../{power_supply => power/reset}/axxia-reset.txt | 0
+ .../reset}/imx-snvs-poweroff.txt | 0
+ .../{power_supply => power/reset}/msm-poweroff.txt | 0
+ .../reset}/qnap-poweroff.txt | 0
+ .../reset}/restart-poweroff.txt | 0
+ .../supply}/ab8500/btemp.txt | 0
+ .../supply}/ab8500/chargalg.txt | 0
+ .../supply}/ab8500/charger.txt | 0
+ .../{power_supply => power/supply}/ab8500/fg.txt | 0
+ .../bindings/power/supply/act8945a-charger.txt | 48 ++
+ .../supply}/axp20x_usb_power.txt | 0
+ .../bindings/power/{ => supply}/bq2415x.txt | 0
+ .../bindings/power/{ => supply}/bq24257.txt | 0
+ .../bindings/power/{ => supply}/bq25890.txt | 0
+ .../supply}/charger-manager.txt | 0
+ .../bindings/power/{ => supply}/da9150-charger.txt | 0
+ .../bindings/power/{ => supply}/da9150-fg.txt | 0
+ .../supply}/gpio-charger.txt | 0
+ .../bindings/power/{ => supply}/isp1704.txt | 0
+ .../supply}/lp8727_charger.txt | 0
+ .../bindings/power/{ => supply}/ltc2941.txt | 0
+ .../supply}/max17042_battery.txt | 0
+ .../supply}/max8925_batter.txt | 0
+ .../supply}/olpc_battery.txt | 0
+ .../supply}/power_supply.txt | 0
+ .../power/{ => supply}/qcom,coincell-charger.txt | 0
+ .../{power_supply => power/supply}/qcom_smbb.txt | 0
+ .../bindings/power/{ => supply}/rt9455_charger.txt | 0
+ .../bindings/power/{ => supply}/rx51-battery.txt | 0
+ .../supply}/sbs_sbs-battery.txt | 0
+ .../{power_supply => power/supply}/ti,bq24735.txt | 0
+ .../{power_supply => power/supply}/tps65090.txt | 0
+ .../supply}/tps65217_charger.txt | 0
+ .../bindings/power/{ => supply}/twl-charger.txt | 0
+ Documentation/driver-model/devres.txt | 4 +
+ Documentation/power/power_supply_class.txt | 4 +-
+ MAINTAINERS | 46 +-
+ drivers/power/Kconfig | 518 +---------------
+ drivers/power/Makefile | 75 +--
+ drivers/power/act8945a_charger.c | 359 -----------
+ drivers/power/reset/reboot-mode.c | 59 ++
+ drivers/power/reset/reboot-mode.h | 4 +
+ drivers/power/reset/syscon-reboot-mode.c | 12 +-
+ drivers/power/{ => supply}/88pm860x_battery.c | 0
+ drivers/power/{ => supply}/88pm860x_charger.c | 0
+ drivers/power/supply/Kconfig | 514 ++++++++++++++++
+ drivers/power/supply/Makefile | 74 +++
+ drivers/power/{ => supply}/ab8500_bmdata.c | 0
+ drivers/power/{ => supply}/ab8500_btemp.c | 2 +-
+ drivers/power/{ => supply}/ab8500_charger.c | 4 +-
+ drivers/power/{ => supply}/ab8500_fg.c | 2 +-
+ drivers/power/{ => supply}/abx500_chargalg.c | 4 +-
+ drivers/power/supply/act8945a_charger.c | 666 +++++++++++++++++++++
+ drivers/power/{ => supply}/apm_power.c | 0
+ drivers/power/{ => supply}/axp20x_usb_power.c | 0
+ drivers/power/{ => supply}/axp288_charger.c | 1 -
+ drivers/power/{ => supply}/axp288_fuel_gauge.c | 1 -
+ drivers/power/{ => supply}/bq2415x_charger.c | 0
+ drivers/power/{ => supply}/bq24190_charger.c | 0
+ drivers/power/{ => supply}/bq24257_charger.c | 0
+ drivers/power/{ => supply}/bq24735-charger.c | 6 +-
+ drivers/power/{ => supply}/bq25890_charger.c | 0
+ drivers/power/{ => supply}/bq27xxx_battery.c | 5 +-
+ drivers/power/{ => supply}/bq27xxx_battery_i2c.c | 0
+ drivers/power/{ => supply}/charger-manager.c | 0
+ drivers/power/{ => supply}/collie_battery.c | 0
+ drivers/power/{ => supply}/da9030_battery.c | 0
+ drivers/power/{ => supply}/da9052-battery.c | 0
+ drivers/power/{ => supply}/da9150-charger.c | 0
+ drivers/power/{ => supply}/da9150-fg.c | 0
+ drivers/power/{ => supply}/ds2760_battery.c | 7 +-
+ drivers/power/{ => supply}/ds2780_battery.c | 4 +-
+ drivers/power/{ => supply}/ds2781_battery.c | 4 +-
+ drivers/power/{ => supply}/ds2782_battery.c | 0
+ drivers/power/{ => supply}/generic-adc-battery.c | 0
+ drivers/power/{ => supply}/goldfish_battery.c | 0
+ drivers/power/{ => supply}/gpio-charger.c | 0
+ drivers/power/{ => supply}/intel_mid_battery.c | 3 +-
+ drivers/power/{ => supply}/ipaq_micro_battery.c | 2 +-
+ drivers/power/{ => supply}/isp1704_charger.c | 0
+ drivers/power/{ => supply}/jz4740-battery.c | 0
+ drivers/power/{ => supply}/lp8727_charger.c | 0
+ drivers/power/{ => supply}/lp8788-charger.c | 0
+ drivers/power/{ => supply}/ltc2941-battery-gauge.c | 0
+ drivers/power/{ => supply}/max14577_charger.c | 4 +-
+ drivers/power/{ => supply}/max17040_battery.c | 0
+ drivers/power/{ => supply}/max17042_battery.c | 0
+ drivers/power/{ => supply}/max77693_charger.c | 4 +-
+ drivers/power/{ => supply}/max8903_charger.c | 0
+ drivers/power/{ => supply}/max8925_power.c | 0
+ drivers/power/{ => supply}/max8997_charger.c | 0
+ drivers/power/{ => supply}/max8998_charger.c | 0
+ drivers/power/{ => supply}/olpc_battery.c | 0
+ drivers/power/{ => supply}/pcf50633-charger.c | 0
+ drivers/power/{ => supply}/pda_power.c | 0
+ drivers/power/{ => supply}/pm2301_charger.c | 3 +-
+ drivers/power/{ => supply}/pm2301_charger.h | 0
+ drivers/power/{ => supply}/pmu_battery.c | 0
+ drivers/power/{ => supply}/power_supply.h | 0
+ drivers/power/{ => supply}/power_supply_core.c | 0
+ drivers/power/{ => supply}/power_supply_leds.c | 0
+ drivers/power/{ => supply}/power_supply_sysfs.c | 0
+ drivers/power/{ => supply}/qcom_smbb.c | 0
+ drivers/power/{ => supply}/rt5033_battery.c | 0
+ drivers/power/{ => supply}/rt9455_charger.c | 0
+ drivers/power/{ => supply}/rx51_battery.c | 0
+ drivers/power/{ => supply}/s3c_adc_battery.c | 0
+ drivers/power/{ => supply}/sbs-battery.c | 149 ++---
+ drivers/power/{ => supply}/smb347-charger.c | 0
+ drivers/power/{ => supply}/test_power.c | 0
+ drivers/power/{ => supply}/tosa_battery.c | 0
+ drivers/power/{ => supply}/tps65090-charger.c | 0
+ drivers/power/{ => supply}/tps65217_charger.c | 40 +-
+ drivers/power/{ => supply}/twl4030_charger.c | 0
+ drivers/power/{ => supply}/twl4030_madc_battery.c | 0
+ drivers/power/{ => supply}/wm831x_backup.c | 0
+ drivers/power/{ => supply}/wm831x_power.c | 0
+ drivers/power/{ => supply}/wm8350_power.c | 0
+ drivers/power/{ => supply}/wm97xx_battery.c | 2 -
+ drivers/power/{ => supply}/z2_battery.c | 1 -
+ include/linux/power/sbs-battery.h | 4 -
+ 124 files changed, 1533 insertions(+), 1149 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/power/act8945a-charger.txt
+ rename Documentation/devicetree/bindings/{power_supply => power/reset}/axxia-reset.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/reset}/imx-snvs-poweroff.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/reset}/msm-poweroff.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/reset}/qnap-poweroff.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/reset}/restart-poweroff.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/btemp.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/chargalg.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/charger.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/fg.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/power/supply/act8945a-charger.txt
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/axp20x_usb_power.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/bq2415x.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/bq24257.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/bq25890.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/charger-manager.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/da9150-charger.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/da9150-fg.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/gpio-charger.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/isp1704.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/lp8727_charger.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/ltc2941.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/max17042_battery.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/max8925_batter.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/olpc_battery.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/power_supply.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/qcom,coincell-charger.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/qcom_smbb.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/rt9455_charger.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/rx51-battery.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/sbs_sbs-battery.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/ti,bq24735.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65090.txt (100%)
+ rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65217_charger.txt (100%)
+ rename Documentation/devicetree/bindings/power/{ => supply}/twl-charger.txt (100%)
+ delete mode 100644 drivers/power/act8945a_charger.c
+ rename drivers/power/{ => supply}/88pm860x_battery.c (100%)
+ rename drivers/power/{ => supply}/88pm860x_charger.c (100%)
+ create mode 100644 drivers/power/supply/Kconfig
+ create mode 100644 drivers/power/supply/Makefile
+ rename drivers/power/{ => supply}/ab8500_bmdata.c (100%)
+ rename drivers/power/{ => supply}/ab8500_btemp.c (99%)
+ rename drivers/power/{ => supply}/ab8500_charger.c (99%)
+ rename drivers/power/{ => supply}/ab8500_fg.c (99%)
+ rename drivers/power/{ => supply}/abx500_chargalg.c (99%)
+ create mode 100644 drivers/power/supply/act8945a_charger.c
+ rename drivers/power/{ => supply}/apm_power.c (100%)
+ rename drivers/power/{ => supply}/axp20x_usb_power.c (100%)
+ rename drivers/power/{ => supply}/axp288_charger.c (99%)
+ rename drivers/power/{ => supply}/axp288_fuel_gauge.c (99%)
+ rename drivers/power/{ => supply}/bq2415x_charger.c (100%)
+ rename drivers/power/{ => supply}/bq24190_charger.c (100%)
+ rename drivers/power/{ => supply}/bq24257_charger.c (100%)
+ rename drivers/power/{ => supply}/bq24735-charger.c (98%)
+ rename drivers/power/{ => supply}/bq25890_charger.c (100%)
+ rename drivers/power/{ => supply}/bq27xxx_battery.c (99%)
+ rename drivers/power/{ => supply}/bq27xxx_battery_i2c.c (100%)
+ rename drivers/power/{ => supply}/charger-manager.c (100%)
+ rename drivers/power/{ => supply}/collie_battery.c (100%)
+ rename drivers/power/{ => supply}/da9030_battery.c (100%)
+ rename drivers/power/{ => supply}/da9052-battery.c (100%)
+ rename drivers/power/{ => supply}/da9150-charger.c (100%)
+ rename drivers/power/{ => supply}/da9150-fg.c (100%)
+ rename drivers/power/{ => supply}/ds2760_battery.c (99%)
+ rename drivers/power/{ => supply}/ds2780_battery.c (99%)
+ rename drivers/power/{ => supply}/ds2781_battery.c (99%)
+ rename drivers/power/{ => supply}/ds2782_battery.c (100%)
+ rename drivers/power/{ => supply}/generic-adc-battery.c (100%)
+ rename drivers/power/{ => supply}/goldfish_battery.c (100%)
+ rename drivers/power/{ => supply}/gpio-charger.c (100%)
+ rename drivers/power/{ => supply}/intel_mid_battery.c (99%)
+ rename drivers/power/{ => supply}/ipaq_micro_battery.c (99%)
+ rename drivers/power/{ => supply}/isp1704_charger.c (100%)
+ rename drivers/power/{ => supply}/jz4740-battery.c (100%)
+ rename drivers/power/{ => supply}/lp8727_charger.c (100%)
+ rename drivers/power/{ => supply}/lp8788-charger.c (100%)
+ rename drivers/power/{ => supply}/ltc2941-battery-gauge.c (100%)
+ rename drivers/power/{ => supply}/max14577_charger.c (99%)
+ rename drivers/power/{ => supply}/max17040_battery.c (100%)
+ rename drivers/power/{ => supply}/max17042_battery.c (100%)
+ rename drivers/power/{ => supply}/max77693_charger.c (99%)
+ rename drivers/power/{ => supply}/max8903_charger.c (100%)
+ rename drivers/power/{ => supply}/max8925_power.c (100%)
+ rename drivers/power/{ => supply}/max8997_charger.c (100%)
+ rename drivers/power/{ => supply}/max8998_charger.c (100%)
+ rename drivers/power/{ => supply}/olpc_battery.c (100%)
+ rename drivers/power/{ => supply}/pcf50633-charger.c (100%)
+ rename drivers/power/{ => supply}/pda_power.c (100%)
+ rename drivers/power/{ => supply}/pm2301_charger.c (99%)
+ rename drivers/power/{ => supply}/pm2301_charger.h (100%)
+ rename drivers/power/{ => supply}/pmu_battery.c (100%)
+ rename drivers/power/{ => supply}/power_supply.h (100%)
+ rename drivers/power/{ => supply}/power_supply_core.c (100%)
+ rename drivers/power/{ => supply}/power_supply_leds.c (100%)
+ rename drivers/power/{ => supply}/power_supply_sysfs.c (100%)
+ rename drivers/power/{ => supply}/qcom_smbb.c (100%)
+ rename drivers/power/{ => supply}/rt5033_battery.c (100%)
+ rename drivers/power/{ => supply}/rt9455_charger.c (100%)
+ rename drivers/power/{ => supply}/rx51_battery.c (100%)
+ rename drivers/power/{ => supply}/s3c_adc_battery.c (100%)
+ rename drivers/power/{ => supply}/sbs-battery.c (90%)
+ rename drivers/power/{ => supply}/smb347-charger.c (100%)
+ rename drivers/power/{ => supply}/test_power.c (100%)
+ rename drivers/power/{ => supply}/tosa_battery.c (100%)
+ rename drivers/power/{ => supply}/tps65090-charger.c (100%)
+ rename drivers/power/{ => supply}/tps65217_charger.c (89%)
+ rename drivers/power/{ => supply}/twl4030_charger.c (100%)
+ rename drivers/power/{ => supply}/twl4030_madc_battery.c (100%)
+ rename drivers/power/{ => supply}/wm831x_backup.c (100%)
+ rename drivers/power/{ => supply}/wm831x_power.c (100%)
+ rename drivers/power/{ => supply}/wm8350_power.c (100%)
+ rename drivers/power/{ => supply}/wm97xx_battery.c (99%)
+ rename drivers/power/{ => supply}/z2_battery.c (99%)
+Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
+$ git merge omap_dss2/for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/fbdev/Kconfig | 6 +-
+ drivers/video/fbdev/Makefile | 1 +
+ drivers/video/fbdev/amba-clcd-nomadik.c | 259 ++++++++++++++
+ drivers/video/fbdev/amba-clcd-nomadik.h | 24 ++
+ drivers/video/fbdev/amba-clcd-versatile.c | 395 +++++++++++++++++++++
+ drivers/video/fbdev/amba-clcd-versatile.h | 17 +
+ drivers/video/fbdev/amba-clcd.c | 190 +++++++++-
+ drivers/video/fbdev/bfin_adv7393fb.c | 5 +-
+ drivers/video/fbdev/efifb.c | 6 +-
+ drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 9 +-
+ drivers/video/fbdev/mx3fb.c | 2 +-
+ drivers/video/fbdev/mxsfb.c | 9 +-
+ drivers/video/fbdev/omap/lcd_mipid.c | 9 +-
+ .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 14 +-
+ .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 7 +-
+ drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 8 -
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 8 -
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 8 -
+ drivers/video/fbdev/pxafb.c | 3 +-
+ drivers/video/fbdev/s3c2410fb.c | 2 +-
+ drivers/video/fbdev/s3c2410fb.h | 2 +-
+ include/linux/amba/clcd.h | 63 +++-
+ 22 files changed, 960 insertions(+), 87 deletions(-)
+ create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.c
+ create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.h
+ create mode 100644 drivers/video/fbdev/amba-clcd-versatile.h
+Merging regulator/for-next (1d3bdb9956ec Merge remote-tracking branches 'regulator/topic/tps65218' and 'regulator/topic/tps80031' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/regulator/rk808-regulator.c
+Auto-merging drivers/regulator/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/ltc3676.txt | 94 +++++
+ .../devicetree/bindings/regulator/regulator.txt | 2 +-
+ drivers/mfd/tps65218.c | 9 +
+ drivers/regulator/Kconfig | 10 +-
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/core.c | 6 +-
+ drivers/regulator/devres.c | 7 +-
+ drivers/regulator/hi6421-regulator.c | 3 +-
+ drivers/regulator/ltc3676.c | 420 +++++++++++++++++++++
+ drivers/regulator/max14577-regulator.c | 4 +-
+ drivers/regulator/max77693-regulator.c | 4 +-
+ drivers/regulator/qcom_smd-regulator.c | 30 +-
+ drivers/regulator/rk808-regulator.c | 3 +-
+ drivers/regulator/tps65218-regulator.c | 8 +
+ include/linux/mfd/tps65218.h | 6 +
+ include/linux/regulator/consumer.h | 3 -
+ 16 files changed, 575 insertions(+), 35 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/ltc3676.txt
+ create mode 100644 drivers/regulator/ltc3676.c
+Merging security/next (8ccc7d6bad84 seccomp: Remove 2-phase API documentation)
+$ git merge security/next
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 11 -----------
+ arch/um/kernel/skas/syscall.c | 10 +++-------
+ arch/x86/um/ptrace_32.c | 3 +++
+ arch/x86/um/ptrace_64.c | 4 ++++
+ include/linux/lsm_hooks.h | 1 -
+ include/linux/security.h | 1 -
+ 6 files changed, 10 insertions(+), 20 deletions(-)
+Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
+$ git merge integrity/next
+Merge made by the 'recursive' strategy.
+Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
+$ git merge keys/keys-next
+Merge made by the 'recursive' strategy.
+ Documentation/crypto/asymmetric-keys.txt | 26 ++-
+ Documentation/security/keys.txt | 217 ++++++++++++++++++++
+ certs/Kconfig | 18 ++
+ certs/Makefile | 6 +
+ certs/blacklist.c | 174 ++++++++++++++++
+ certs/blacklist.h | 3 +
+ certs/blacklist_hashes.c | 6 +
+ certs/blacklist_nohashes.c | 5 +
+ crypto/asymmetric_keys/Kconfig | 10 +
+ crypto/asymmetric_keys/Makefile | 13 ++
+ crypto/asymmetric_keys/asymmetric_keys.h | 3 +
+ crypto/asymmetric_keys/asymmetric_type.c | 59 +++++-
+ crypto/asymmetric_keys/pkcs7_parser.c | 1 +
+ crypto/asymmetric_keys/pkcs7_parser.h | 1 +
+ crypto/asymmetric_keys/pkcs7_verify.c | 32 ++-
+ crypto/asymmetric_keys/pkcs8.asn1 | 24 +++
+ crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++
+ crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++--
+ crypto/asymmetric_keys/signature.c | 95 +++++++++
+ crypto/asymmetric_keys/x509_cert_parser.c | 21 +-
+ crypto/asymmetric_keys/x509_parser.h | 1 +
+ crypto/asymmetric_keys/x509_public_key.c | 15 ++
+ include/crypto/public_key.h | 14 +-
+ include/keys/asymmetric-subtype.h | 9 +
+ include/keys/system_keyring.h | 12 ++
+ include/linux/key-type.h | 11 +
+ include/linux/keyctl.h | 46 +++++
+ include/uapi/linux/keyctl.h | 30 +++
+ security/keys/Makefile | 1 +
+ security/keys/compat.c | 18 ++
+ security/keys/internal.h | 39 ++++
+ security/keys/keyctl.c | 24 +++
+ security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++
+ 33 files changed, 1584 insertions(+), 52 deletions(-)
+ create mode 100644 certs/blacklist.c
+ create mode 100644 certs/blacklist.h
+ create mode 100644 certs/blacklist_hashes.c
+ create mode 100644 certs/blacklist_nohashes.c
+ create mode 100644 crypto/asymmetric_keys/pkcs8.asn1
+ create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c
+ create mode 100644 include/linux/keyctl.h
+ create mode 100644 security/keys/keyctl_pkey.c
+Merging selinux/next (7c686af071ad selinux: fix overflow and 0 length allocations)
+$ git merge selinux/next
+Auto-merging include/linux/security.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging fs/overlayfs/dir.c
+Auto-merging fs/overlayfs/copy_up.c
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/copy_up.c | 22 +++++++++
+ fs/overlayfs/dir.c | 10 +++++
+ include/linux/lsm_hooks.h | 36 +++++++++++++++
+ include/linux/security.h | 24 ++++++++++
+ security/lsm_audit.c | 4 +-
+ security/security.c | 27 +++++++++++
+ security/selinux/Kconfig | 38 ----------------
+ security/selinux/hooks.c | 90 ++++++++++++++++++++++++++++++-------
+ security/selinux/include/security.h | 4 --
+ security/selinux/ss/conditional.c | 2 +
+ security/selinux/ss/ebitmap.c | 3 ++
+ security/selinux/ss/policydb.c | 11 +++--
+ security/smack/smack_netfilter.c | 4 +-
+ 13 files changed, 210 insertions(+), 65 deletions(-)
+Merging tpmdd/next (a307518add94 Merge tag 'tpmdd-next-20160902' into next)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+Merging watchdog/master (29b4817d4018 Linux 4.8-rc1)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (35ee9598972e Merge branches 'iommu/fixes', 'x86/amd', 'arm/exynos' and 'arm/mediatek' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/amd_iommu.c | 3 ++-
+ drivers/iommu/exynos-iommu.c | 4 ++--
+ include/dt-bindings/memory/mt2701-larb-port.h | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (8138dabbab26 vfio/pci: Fix typos in comments)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci_config.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+Merging jc_docs/docs-next (87171fb72995 Merge branch 'doc/4.9' into docs-next)
+$ git merge jc_docs/docs-next
+Resolved 'Documentation/gpu/index.rst' using previous resolution.
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Removing Documentation/kmemcheck.txt
+Auto-merging Documentation/kernel-parameters.txt
+Removing Documentation/kasan.txt
+Auto-merging Documentation/gpu/index.rst
+CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
+Removing Documentation/gcov.txt
+Auto-merging Documentation/dev-tools/ubsan.rst
+Auto-merging Documentation/dev-tools/sparse.rst
+Auto-merging Documentation/dev-tools/kmemleak.rst
+Auto-merging Documentation/dev-tools/kcov.rst
+Auto-merging Documentation/dev-tools/gdb-kernel-debugging.rst
+Auto-merging Documentation/dev-tools/coccinelle.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9b49bc8e1ea7] Merge remote-tracking branch 'jc_docs/docs-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/CodingStyle | 28 +-
+ Documentation/DocBook/Makefile | 8 +
+ Documentation/Makefile.sphinx | 64 +-
+ Documentation/arm/sunxi/README | 11 +-
+ Documentation/clk.txt | 42 +-
+ Documentation/conf.py | 102 ++-
+ .../{coccinelle.txt => dev-tools/coccinelle.rst} | 359 +++++-----
+ Documentation/dev-tools/gcov.rst | 256 +++++++
+ .../gdb-kernel-debugging.rst} | 77 ++-
+ Documentation/dev-tools/kasan.rst | 173 +++++
+ Documentation/{kcov.txt => dev-tools/kcov.rst} | 84 +--
+ Documentation/dev-tools/kmemcheck.rst | 733 ++++++++++++++++++++
+ .../{kmemleak.txt => dev-tools/kmemleak.rst} | 93 +--
+ Documentation/{sparse.txt => dev-tools/sparse.rst} | 39 +-
+ Documentation/dev-tools/tools.rst | 25 +
+ Documentation/{ubsan.txt => dev-tools/ubsan.rst} | 42 +-
+ Documentation/docutils.conf | 7 +
+ Documentation/gcov.txt | 257 -------
+ Documentation/gpu/conf.py | 5 +
+ Documentation/gpu/index.rst | 7 +
+ Documentation/index.rst | 9 +-
+ Documentation/kasan.txt | 171 -----
+ Documentation/kbuild/kconfig-language.txt | 39 +-
+ Documentation/kernel-documentation.rst | 29 +
+ Documentation/kernel-parameters.txt | 22 +-
+ Documentation/kmemcheck.txt | 754 ---------------------
+ Documentation/kprobes.txt | 10 +
+ Documentation/media/Makefile | 3 +-
+ Documentation/media/conf.py | 10 +
+ Documentation/media/conf_nitpick.py | 93 +++
+ Documentation/media/index.rst | 19 +
+ Documentation/media/uapi/cec/cec-func-open.rst | 2 +-
+ Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 5 +-
+ Documentation/serial/serial-rs485.txt | 5 +-
+ Documentation/sphinx/cdomain.py | 102 +++
+ Documentation/sphinx/kernel-doc.py | 8 +
+ Documentation/sphinx/kernel_include.py | 7 +
+ Documentation/sphinx/load_config.py | 32 +
+ Documentation/sphinx/parse-headers.pl | 2 +-
+ Documentation/sphinx/rstFlatTable.py | 6 +
+ MAINTAINERS | 10 +-
+ Makefile | 2 +-
+ README | 8 +-
+ scripts/kernel-doc | 43 +-
+ 44 files changed, 2192 insertions(+), 1611 deletions(-)
+ rename Documentation/{coccinelle.txt => dev-tools/coccinelle.rst} (56%)
+ create mode 100644 Documentation/dev-tools/gcov.rst
+ rename Documentation/{gdb-kernel-debugging.txt => dev-tools/gdb-kernel-debugging.rst} (73%)
+ create mode 100644 Documentation/dev-tools/kasan.rst
+ rename Documentation/{kcov.txt => dev-tools/kcov.rst} (78%)
+ create mode 100644 Documentation/dev-tools/kmemcheck.rst
+ rename Documentation/{kmemleak.txt => dev-tools/kmemleak.rst} (73%)
+ rename Documentation/{sparse.txt => dev-tools/sparse.rst} (82%)
+ create mode 100644 Documentation/dev-tools/tools.rst
+ rename Documentation/{ubsan.txt => dev-tools/ubsan.rst} (78%)
+ create mode 100644 Documentation/docutils.conf
+ delete mode 100644 Documentation/gcov.txt
+ create mode 100644 Documentation/gpu/conf.py
+ delete mode 100644 Documentation/kasan.txt
+ delete mode 100644 Documentation/kmemcheck.txt
+ create mode 100644 Documentation/media/conf.py
+ create mode 100644 Documentation/media/conf_nitpick.py
+ create mode 100644 Documentation/media/index.rst
+ create mode 100644 Documentation/sphinx/cdomain.py
+ create mode 100644 Documentation/sphinx/load_config.py
+ mode change 100644 => 100755 Documentation/sphinx/rstFlatTable.py
+Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
+$ git merge audit/next
+Auto-merging security/lsm_audit.c
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit.c
+Merge made by the 'recursive' strategy.
+ kernel/audit.c | 8 +++++++-
+ kernel/auditsc.c | 12 ++++++------
+ security/lsm_audit.c | 4 ++--
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+Merging devicetree/for-next (5839783247f4 Documentation: devicetree: Fix max77693 spelling errors)
+$ git merge devicetree/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/max77693.txt | 12 ++++-----
+ .../bindings/net/wireless/esp,esp8089.txt | 31 ++++++++++++++++++++++
+ .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 5 ++--
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 29 +++++++++++---------
+ Documentation/devicetree/changesets.txt | 19 ++++---------
+ 6 files changed, 62 insertions(+), 36 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt
+Merging mailbox/mailbox-for-next (5e608a027082 Merge branch 'akpm' (patches from Andrew))
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (bf816ffec593 Merge remote-tracking branch 'spi/topic/xlp' into spi-next)
+$ git merge spi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/jcore,spi.txt | 34 +++
+ MAINTAINERS | 13 +-
+ drivers/spi/Kconfig | 16 +-
+ drivers/spi/Makefile | 3 +
+ drivers/spi/spi-cavium-thunderx.c | 120 +++++++++++
+ drivers/spi/spi-cavium.h | 3 +
+ drivers/spi/spi-fsl-dspi.c | 16 +-
+ drivers/spi/spi-fsl-espi.c | 140 +++----------
+ drivers/spi/spi-img-spfi.c | 2 -
+ drivers/spi/spi-jcore.c | 231 +++++++++++++++++++++
+ drivers/spi/spi-loopback-test.c | 2 +-
+ drivers/spi/spi-mt65xx.c | 1 -
+ drivers/spi/spi-pic32-sqi.c | 6 +-
+ drivers/spi/spi-pxa2xx-pci.c | 1 +
+ drivers/spi/spi-qup.c | 7 +-
+ drivers/spi/spi-rspi.c | 14 +-
+ drivers/spi/spi-sc18is602.c | 9 +
+ drivers/spi/spi-sh-msiof.c | 3 +
+ drivers/spi/spi-ti-qspi.c | 139 +++++++++++--
+ drivers/spi/spi-txx9.c | 6 +-
+ drivers/spi/spi-xlp.c | 13 +-
+ drivers/spi/spi.c | 27 ++-
+ include/linux/spi/spi.h | 25 ++-
+ tools/spi/spidev_test.c | 1 +
+ 24 files changed, 674 insertions(+), 158 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/jcore,spi.txt
+ create mode 100644 drivers/spi/spi-cavium-thunderx.c
+ create mode 100644 drivers/spi/spi-jcore.c
+Merging tip/auto-latest (d6fac1a01007 Merge branch 'x86/platform')
+$ git merge tip/auto-latest
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cpu.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/acpi.h
+Auto-merging fs/proc/base.c
+Auto-merging drivers/acpi/internal.h
+Auto-merging arch/x86/kernel/paravirt.c
+Auto-merging arch/x86/kernel/head_64.S
+Auto-merging arch/x86/kernel/head_32.S
+Auto-merging arch/x86/entry/entry_64.S
+Auto-merging arch/x86/entry/entry_32.S
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ko_KR/memory-barriers.txt | 3135 ++++++++++++++++++++
+ Documentation/memory-barriers.txt | 5 +-
+ Documentation/trace/ftrace-design.txt | 11 +
+ Documentation/trace/kprobetrace.txt | 9 +-
+ Documentation/trace/uprobetracer.txt | 9 +-
+ arch/Kconfig | 34 +
+ arch/arm/kernel/ftrace.c | 2 +-
+ arch/arm64/kernel/entry-ftrace.S | 2 +-
+ arch/arm64/kernel/ftrace.c | 2 +-
+ arch/blackfin/kernel/ftrace-entry.S | 4 +-
+ arch/blackfin/kernel/ftrace.c | 2 +-
+ arch/ia64/include/asm/thread_info.h | 2 +-
+ arch/microblaze/kernel/ftrace.c | 2 +-
+ arch/mips/kernel/ftrace.c | 4 +-
+ arch/parisc/kernel/ftrace.c | 2 +-
+ arch/powerpc/kernel/ftrace.c | 3 +-
+ arch/s390/kernel/ftrace.c | 3 +-
+ arch/sh/kernel/ftrace.c | 2 +-
+ arch/sparc/Kconfig | 1 -
+ arch/sparc/include/asm/ftrace.h | 4 +
+ arch/sparc/kernel/ftrace.c | 2 +-
+ arch/tile/kernel/ftrace.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/entry/entry_32.S | 68 +-
+ arch/x86/entry/entry_64.S | 81 +-
+ arch/x86/events/core.c | 24 +-
+ arch/x86/events/intel/core.c | 31 +-
+ arch/x86/events/intel/ds.c | 108 +-
+ arch/x86/events/intel/lbr.c | 70 +-
+ arch/x86/events/intel/rapl.c | 2 +
+ arch/x86/events/intel/uncore.c | 2 +
+ arch/x86/events/intel/uncore_snb.c | 2 +
+ arch/x86/events/perf_event.h | 13 +-
+ arch/x86/include/asm/desc.h | 2 +-
+ arch/x86/include/asm/fpu/xstate.h | 3 +-
+ arch/x86/include/asm/ftrace.h | 3 +
+ arch/x86/include/asm/kaslr.h | 1 +
+ arch/x86/include/asm/kdebug.h | 2 -
+ arch/x86/include/asm/pgtable_64_types.h | 4 +-
+ arch/x86/include/asm/processor.h | 13 +-
+ arch/x86/include/asm/realmode.h | 2 +-
+ arch/x86/include/asm/smp.h | 3 -
+ arch/x86/include/asm/stacktrace.h | 4 +-
+ arch/x86/include/asm/switch_to.h | 164 +-
+ arch/x86/include/asm/thread_info.h | 2 -
+ arch/x86/kernel/acpi/boot.c | 21 +-
+ arch/x86/kernel/acpi/sleep.c | 2 +-
+ arch/x86/kernel/apic/apic.c | 3 +-
+ arch/x86/kernel/apic/apic_flat_64.c | 6 +-
+ arch/x86/kernel/apic/apic_noop.c | 2 +-
+ arch/x86/kernel/apic/bigsmp_32.c | 2 +-
+ arch/x86/kernel/apic/msi.c | 2 +-
+ arch/x86/kernel/apic/probe_32.c | 4 +-
+ arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
+ arch/x86/kernel/apic/x2apic_phys.c | 2 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
+ arch/x86/kernel/asm-offsets.c | 6 +
+ arch/x86/kernel/asm-offsets_32.c | 5 +
+ arch/x86/kernel/asm-offsets_64.c | 5 +
+ arch/x86/kernel/cpu/common.c | 18 +-
+ arch/x86/kernel/cpu/mtrr/main.c | 4 +-
+ arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +-
+ arch/x86/kernel/dumpstack.c | 79 +-
+ arch/x86/kernel/dumpstack_64.c | 11 +-
+ arch/x86/kernel/ftrace.c | 2 +-
+ arch/x86/kernel/head_32.S | 8 +-
+ arch/x86/kernel/head_64.S | 12 +-
+ arch/x86/kernel/kgdb.c | 8 +-
+ arch/x86/kernel/ksysfs.c | 2 +-
+ arch/x86/kernel/kvmclock.c | 2 +-
+ arch/x86/kernel/mpparse.c | 3 +
+ arch/x86/kernel/paravirt.c | 2 +-
+ arch/x86/kernel/process.c | 14 +-
+ arch/x86/kernel/process_32.c | 31 +-
+ arch/x86/kernel/process_64.c | 21 +-
+ arch/x86/kernel/ptrace.c | 10 +-
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/kernel/setup.c | 7 +-
+ arch/x86/kernel/setup_percpu.c | 4 +-
+ arch/x86/kernel/smpboot.c | 17 +-
+ arch/x86/kernel/traps.c | 61 +
+ arch/x86/kernel/x86_init.c | 6 +-
+ arch/x86/kvm/svm.c | 2 +-
+ arch/x86/kvm/vmx.c | 2 +-
+ arch/x86/mm/amdtopology.c | 22 +-
+ arch/x86/mm/kaslr.c | 26 +-
+ arch/x86/mm/tlb.c | 15 +
+ arch/x86/pci/pcbios.c | 7 +-
+ arch/x86/platform/intel-mid/pwr.c | 6 +-
+ drivers/acpi/internal.h | 2 -
+ drivers/acpi/ioapic.c | 46 +-
+ drivers/acpi/pci_root.c | 12 +-
+ drivers/pci/setup-bus.c | 5 +-
+ fs/proc/base.c | 2 +-
+ include/linux/acpi.h | 6 +
+ include/linux/bitmap.h | 18 +
+ include/linux/ftrace.h | 17 +-
+ include/linux/percpu-rwsem.h | 84 +-
+ include/linux/perf_event.h | 24 +-
+ include/linux/rcu_sync.h | 1 +
+ include/linux/sched.h | 27 +-
+ kernel/cgroup.c | 6 +
+ kernel/cpu.c | 8 +
+ kernel/events/core.c | 97 +-
+ kernel/events/uprobes.c | 36 +-
+ kernel/fork.c | 96 +-
+ kernel/hung_task.c | 2 +-
+ kernel/locking/percpu-rwsem.c | 228 +-
+ kernel/locking/qspinlock_paravirt.h | 24 +-
+ kernel/locking/qspinlock_stat.h | 4 +-
+ kernel/locking/rwsem-xadd.c | 92 +-
+ kernel/rcu/sync.c | 14 +
+ kernel/sched/core.c | 76 +-
+ kernel/sched/cputime.c | 33 +-
+ kernel/sched/deadline.c | 22 +-
+ kernel/sched/fair.c | 118 +-
+ kernel/sched/sched.h | 3 +-
+ kernel/trace/Kconfig | 5 -
+ kernel/trace/trace.c | 24 +
+ kernel/trace/trace_functions_graph.c | 67 +-
+ kernel/trace/trace_kprobe.c | 4 +
+ kernel/trace/trace_probe.c | 30 +-
+ kernel/trace/trace_probe.h | 11 +-
+ kernel/trace/trace_uprobe.c | 4 +
+ lib/dma-debug.c | 36 +-
+ tools/include/linux/coresight-pmu.h | 39 +
+ tools/include/linux/time64.h | 12 +
+ tools/perf/Documentation/perf-config.txt | 4 +
+ tools/perf/Documentation/perf-probe.txt | 5 +-
+ tools/perf/MANIFEST | 2 +
+ tools/perf/Makefile.perf | 5 +-
+ tools/perf/bench/futex-requeue.c | 5 +-
+ tools/perf/bench/futex-wake-parallel.c | 5 +-
+ tools/perf/bench/futex-wake.c | 5 +-
+ tools/perf/bench/mem-functions.c | 3 +-
+ tools/perf/bench/numa.c | 53 +-
+ tools/perf/bench/sched-messaging.c | 5 +-
+ tools/perf/bench/sched-pipe.c | 9 +-
+ tools/perf/builtin-diff.c | 4 +-
+ tools/perf/builtin-kvm.c | 11 +-
+ tools/perf/builtin-record.c | 8 +-
+ tools/perf/builtin-report.c | 4 +
+ tools/perf/builtin-sched.c | 37 +-
+ tools/perf/builtin-script.c | 7 +-
+ tools/perf/builtin-stat.c | 19 +-
+ tools/perf/builtin-timechart.c | 13 +-
+ tools/perf/builtin-top.c | 3 +-
+ tools/perf/builtin-trace.c | 1 +
+ tools/perf/perf.h | 7 -
+ tools/perf/tests/backward-ring-buffer.c | 2 +-
+ tools/perf/tests/bpf.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 50 +-
+ tools/perf/ui/gtk/hists.c | 2 +-
+ tools/perf/ui/hist.c | 4 +-
+ tools/perf/ui/stdio/hist.c | 45 +-
+ tools/perf/util/annotate.c | 87 +-
+ tools/perf/util/bpf-loader.c | 2 +-
+ tools/perf/util/debug.c | 10 +-
+ tools/perf/util/header.c | 3 +-
+ tools/perf/util/hist.h | 3 +-
+ tools/perf/util/probe-file.c | 57 +
+ tools/perf/util/probe-file.h | 10 +
+ tools/perf/util/probe-finder.c | 19 +-
+ .../perf/util/scripting-engines/trace-event-perl.c | 5 +-
+ .../util/scripting-engines/trace-event-python.c | 5 +-
+ tools/perf/util/sort.c | 9 +-
+ tools/perf/util/sort.h | 2 +-
+ tools/perf/util/svghelper.c | 11 +-
+ tools/perf/util/util.c | 1 +
+ tools/perf/util/util.h | 4 -
+ 170 files changed, 5124 insertions(+), 1077 deletions(-)
+ create mode 100644 Documentation/ko_KR/memory-barriers.txt
+ create mode 100644 tools/include/linux/coresight-pmu.h
+ create mode 100644 tools/include/linux/time64.h
+Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
+$ git merge clockevents/clockevents/next
+Already up-to-date.
+Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (c91d907596cc EDAC, I3000: Orphan driver)
+$ git merge edac-amd/for-next
+Auto-merging drivers/edac/Makefile
+Auto-merging drivers/edac/Kconfig
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt
+Auto-merging CREDITS
+Merge made by the 'recursive' strategy.
+ CREDITS | 4 +
+ .../bindings/arm/altera/socfpga-eccmgr.txt | 98 +++
+ .../fsl/ddr.txt} | 2 +
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 16 +
+ arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 12 +
+ arch/arm64/Kconfig.platforms | 1 +
+ drivers/edac/Kconfig | 42 ++
+ drivers/edac/Makefile | 8 +-
+ drivers/edac/altera_edac.c | 330 +++++++++-
+ drivers/edac/altera_edac.h | 6 +-
+ drivers/edac/amd64_edac.c | 15 +-
+ drivers/edac/fsl_ddr_edac.c | 632 +++++++++++++++++++
+ drivers/edac/fsl_ddr_edac.h | 79 +++
+ drivers/edac/layerscape_edac.c | 73 +++
+ drivers/edac/mpc85xx_edac.c | 683 ++-------------------
+ drivers/edac/mpc85xx_edac.h | 66 --
+ drivers/edac/wq.c | 2 +-
+ 18 files changed, 1341 insertions(+), 731 deletions(-)
+ rename Documentation/devicetree/bindings/{powerpc/fsl/mem-ctrlr.txt => memory-controllers/fsl/ddr.txt} (86%)
+ create mode 100644 drivers/edac/fsl_ddr_edac.c
+ create mode 100644 drivers/edac/fsl_ddr_edac.h
+ create mode 100644 drivers/edac/layerscape_edac.c
+Merging irqchip/irqchip/for-next (0d91b806499a Merge branch 'irqchip/core' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Auto-merging drivers/irqchip/irq-mips-gic.c
+Auto-merging drivers/irqchip/Makefile
+Auto-merging arch/arm64/Kconfig.platforms
+Merge made by the 'recursive' strategy.
+ .../bindings/interrupt-controller/jcore,aic.txt | 26 +++
+ .../interrupt-controller/marvell,armada-8k-pic.txt | 25 +++
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/sh/Makefile | 2 +-
+ drivers/irqchip/Kconfig | 10 ++
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-jcore-aic.c | 95 ++++++++++
+ drivers/irqchip/irq-keystone.c | 2 +-
+ drivers/irqchip/irq-mips-gic.c | 7 +-
+ drivers/irqchip/irq-mvebu-pic.c | 197 +++++++++++++++++++++
+ 10 files changed, 359 insertions(+), 8 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/jcore,aic.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-8k-pic.txt
+ create mode 100644 drivers/irqchip/irq-jcore-aic.c
+ create mode 100644 drivers/irqchip/irq-mvebu-pic.c
+Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (f8e66fbaed01 rcu: Remove obsolete comment from __call_rcu())
+$ git merge rcu/rcu/next
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/cpu.c
+Merge made by the 'recursive' strategy.
+ .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++
+ .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++
+ .../Expedited-Grace-Periods.html | 476 ++++++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++
+ .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++
+ .../RCU/Design/Requirements/Requirements.html | 22 +
+ Documentation/RCU/torture.txt | 15 -
+ drivers/misc/lkdtm.h | 2 +
+ drivers/misc/lkdtm_bugs.c | 68 ++
+ drivers/misc/lkdtm_core.c | 2 +
+ include/linux/bug.h | 17 +
+ include/linux/list.h | 44 +-
+ include/linux/rculist.h | 8 +-
+ include/linux/rcupdate.h | 1 +
+ include/linux/torture.h | 2 +-
+ kernel/cpu.c | 1 +
+ kernel/rcu/Makefile | 3 +-
+ kernel/rcu/rcuperf.c | 7 +-
+ kernel/rcu/rcutorture.c | 62 +-
+ kernel/rcu/tree.c | 61 +-
+ kernel/rcu/tree.h | 1 +
+ kernel/rcu/tree_exp.h | 124 +--
+ kernel/rcu/tree_plugin.h | 1 +
+ kernel/rcu/tree_trace.c | 7 +-
+ kernel/rcu/update.c | 3 +-
+ kernel/rcu/waketorture.c | 537 +++++++++++++
+ kernel/sched/core.c | 7 +
+ kernel/torture.c | 27 +-
+ lib/Kconfig.debug | 32 +-
+ lib/list_debug.c | 99 +--
+ .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 +
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
+ .../selftests/rcutorture/configs/wake/CFLIST | 1 +
+ .../selftests/rcutorture/configs/wake/CFcommon | 2 +
+ tools/testing/selftests/rcutorture/configs/wake/SH | 19 +
+ .../selftests/rcutorture/configs/wake/SH.boot | 1 +
+ .../testing/selftests/rcutorture/configs/wake/STI | 19 +
+ .../selftests/rcutorture/configs/wake/STI.boot | 1 +
+ .../rcutorture/configs/wake/ver_functions.sh | 43 ++
+ 47 files changed, 5985 insertions(+), 240 deletions(-)
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg
+ create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg
+ create mode 100644 kernel/rcu/waketorture.c
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh
+Merging kvm/linux-next (694d0d0bb203 Linux 4.8-rc2)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/next (29b4817d4018 Linux 4.8-rc1)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvm-ppc-paulus/kvm-ppc-next (4b3d173d0440 KVM: PPC: Always select KVM_VFIO, plus Makefile cleanup)
+$ git merge kvm-ppc-paulus/kvm-ppc-next
+Auto-merging arch/powerpc/kvm/Makefile
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/kvm_host.h | 2 ++
+ arch/powerpc/kvm/Kconfig | 1 +
+ arch/powerpc/kvm/Makefile | 19 ++++++++-----------
+ arch/powerpc/kvm/book3s_xics.c | 2 ++
+ arch/powerpc/kvm/powerpc.c | 13 +++++++++++++
+ 5 files changed, 26 insertions(+), 11 deletions(-)
+Merging kvms390/next (e845d24016c1 KVM: s390: allow 255 VCPUs when sca entries aren't used)
+$ git merge kvms390/next
+Auto-merging arch/s390/kvm/kvm-s390.c
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/kvm_host.h | 2 +-
+ arch/s390/kernel/asm-offsets.c | 1 +
+ arch/s390/kvm/gaccess.c | 37 ++++++++-------
+ arch/s390/kvm/guestdbg.c | 28 +++++++-----
+ arch/s390/kvm/intercept.c | 1 +
+ arch/s390/kvm/interrupt.c | 98 ++++++++++++++++++++++++++++++----------
+ arch/s390/kvm/kvm-s390.c | 65 ++++++++++++--------------
+ arch/s390/kvm/kvm-s390.h | 14 ++++--
+ arch/s390/kvm/priv.c | 21 +++++++++
+ 9 files changed, 175 insertions(+), 92 deletions(-)
+Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ lib/percpu-refcount.c | 169 ++++++++++++++++++++++++++++----------------------
+ 1 file changed, 95 insertions(+), 74 deletions(-)
+Merging workqueues/for-next (e4e98c460ad3 Merge tag 'hwmon-for-linus-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/for-next (fa1bc2a09f5f platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function)
+$ git merge drivers-x86/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/toshiba_acpi.c | 257 +++++++++++++++++++++---------------
+ 1 file changed, 152 insertions(+), 105 deletions(-)
+Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ include/uapi/linux/hsi/hsi_char.h | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+Merging leds/for-next (1f70cb4045cb Documentation: move oneshot trigger attributes documentation to ABI)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-led | 3 +-
+ .../ABI/testing/sysfs-class-led-trigger-oneshot | 36 ++
+ Documentation/devicetree/bindings/leds/common.txt | 7 +
+ .../devicetree/bindings/leds/leds-bcm6328.txt | 2 +-
+ .../devicetree/bindings/leds/leds-bcm6358.txt | 2 +-
+ .../devicetree/bindings/leds/leds-gpio.txt | 9 +-
+ .../devicetree/bindings/leds/leds-is31fl319x.txt | 59 +++
+ .../devicetree/bindings/leds/leds-pm8058.txt | 67 +++
+ .../devicetree/bindings/leds/register-bit-led.txt | 9 +-
+ Documentation/leds/ledtrig-oneshot.txt | 20 +-
+ drivers/leds/Kconfig | 20 +
+ drivers/leds/Makefile | 2 +
+ drivers/leds/led-triggers.c | 18 +-
+ drivers/leds/leds-is31fl319x.c | 450 +++++++++++++++++++++
+ drivers/leds/leds-pm8058.c | 191 +++++++++
+ 15 files changed, 850 insertions(+), 45 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-oneshot
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-is31fl319x.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-pm8058.txt
+ create mode 100644 drivers/leds/leds-is31fl319x.c
+ create mode 100644 drivers/leds/leds-pm8058.c
+Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+Merging driver-core/driver-core-next (2c507e464f79 device core: Remove deprecated create_singlethread_workqueue)
+$ git merge driver-core/driver-core-next
+Auto-merging drivers/base/core.c
+Merge made by the 'recursive' strategy.
+ drivers/base/Kconfig | 10 ++++++++++
+ drivers/base/attribute_container.c | 2 +-
+ drivers/base/core.c | 39 ++++++++++++++++++++++++++++----------
+ drivers/base/cpu.c | 11 ++++++-----
+ drivers/base/dd.c | 33 +++++++++++++++++++++++---------
+ drivers/base/dma-coherent.c | 2 +-
+ drivers/base/dma-mapping.c | 11 +++++++----
+ drivers/base/platform.c | 7 +++----
+ drivers/base/soc.c | 9 ---------
+ fs/debugfs/internal.h | 4 ----
+ 10 files changed, 81 insertions(+), 47 deletions(-)
+Merging tty/tty-next (d2f5a7311bca dmaengine: hsu: refactor hsu_dma_do_irq() to return int)
+$ git merge tty/tty-next
+Recorded preimage for 'drivers/dma/imx-sdma.c'
+Auto-merging drivers/tty/serial/8250/Kconfig
+Auto-merging drivers/tty/serial/8250/8250_port.c
+Auto-merging drivers/tty/serial/8250/8250_pci.c
+Auto-merging drivers/tty/serial/8250/8250_mid.c
+Auto-merging drivers/tty/serial/8250/8250_dw.c
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/tty/serial/8250/8250.h
+Auto-merging drivers/dma/imx-sdma.c
+CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/dw/core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/dma/imx-sdma.c'.
+[master 120bd18c2d40] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/dma/dw/core.c | 39 +-
+ drivers/dma/dw/regs.h | 5 +-
+ drivers/dma/hsu/hsu.c | 9 +-
+ drivers/dma/hsu/pci.c | 6 +-
+ drivers/dma/imx-sdma.c | 54 +-
+ drivers/tty/serial/8250/8250.h | 5 +
+ drivers/tty/serial/8250/8250_core.c | 2 +-
+ drivers/tty/serial/8250/8250_dma.c | 14 +-
+ drivers/tty/serial/8250/8250_dw.c | 48 +-
+ drivers/tty/serial/8250/8250_lpss.c | 378 ++++++++++++++
+ drivers/tty/serial/8250/8250_mid.c | 8 +-
+ drivers/tty/serial/8250/8250_mtk.c | 6 +-
+ drivers/tty/serial/8250/8250_pci.c | 257 +--------
+ drivers/tty/serial/8250/8250_port.c | 37 +-
+ drivers/tty/serial/8250/Kconfig | 16 +-
+ drivers/tty/serial/8250/Makefile | 1 +
+ drivers/tty/serial/altera_jtaguart.c | 2 +-
+ drivers/tty/serial/altera_uart.c | 2 +-
+ drivers/tty/serial/amba-pl011.c | 59 ++-
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 51 +-
+ drivers/tty/serial/bcm63xx_uart.c | 2 +-
+ drivers/tty/serial/earlycon-arm-semihost.c | 3 +-
+ drivers/tty/serial/earlycon.c | 7 +-
+ drivers/tty/serial/fsl_lpuart.c | 814 +++++++++++++++++------------
+ drivers/tty/serial/imx.c | 192 ++++---
+ drivers/tty/serial/jsm/jsm_tty.c | 2 +-
+ drivers/tty/serial/max3100.c | 2 +-
+ drivers/tty/serial/men_z135_uart.c | 2 +-
+ drivers/tty/serial/mxs-auart.c | 2 +-
+ drivers/tty/serial/pch_uart.c | 2 +-
+ drivers/tty/serial/samsung.c | 2 +-
+ drivers/tty/serial/samsung.h | 2 +-
+ drivers/tty/serial/sc16is7xx.c | 20 +
+ drivers/tty/serial/serial_core.c | 138 ++---
+ drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/tty/serial/st-asc.c | 2 +-
+ drivers/tty/serial/timbuart.c | 2 +-
+ drivers/tty/serial/uartlite.c | 2 +-
+ drivers/tty/serial/vt8500_serial.c | 8 +-
+ drivers/tty/serial/xilinx_uartps.c | 2 +-
+ include/linux/amba/bus.h | 6 +
+ include/linux/amba/serial.h | 9 +
+ include/linux/atmel_serial.h | 1 +
+ include/linux/dma/dw.h | 5 +
+ include/linux/dma/hsu.h | 9 +-
+ include/linux/platform_data/dma-dw.h | 4 +
+ include/linux/serial_core.h | 2 +-
+ 48 files changed, 1332 insertions(+), 913 deletions(-)
+ create mode 100644 drivers/tty/serial/8250/8250_lpss.c
+Merging usb/usb-next (3112fdde68fa usb: gadget: use IS_ENABLED() instead of checking for built-in or module)
+$ git merge usb/usb-next
+Auto-merging include/linux/bcma/bcma_regs.h
+Auto-merging drivers/usb/renesas_usbhs/mod_gadget.c
+Auto-merging drivers/usb/gadget/udc/fsl_qe_udc.c
+Auto-merging drivers/media/usb/cx231xx/cx231xx-core.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/usb4604.txt | 19 ++
+ MAINTAINERS | 2 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 1 -
+ drivers/media/radio/si470x/radio-si470x-usb.c | 1 -
+ drivers/media/rc/imon.c | 13 +-
+ drivers/media/rc/redrat3.c | 4 +-
+ drivers/media/usb/airspy/airspy.c | 1 -
+ drivers/media/usb/as102/as102_usb_drv.c | 2 -
+ drivers/media/usb/au0828/au0828-video.c | 1 -
+ drivers/media/usb/cpia2/cpia2_usb.c | 1 -
+ drivers/media/usb/cx231xx/cx231xx-audio.c | 2 -
+ drivers/media/usb/cx231xx/cx231xx-core.c | 4 -
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 -
+ drivers/media/usb/dvb-usb/dib0700_core.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-audio.c | 1 -
+ drivers/media/usb/em28xx/em28xx-core.c | 1 -
+ drivers/media/usb/gspca/benq.c | 4 +-
+ drivers/media/usb/gspca/gspca.c | 4 +-
+ drivers/media/usb/gspca/konica.c | 4 +-
+ drivers/media/usb/hackrf/hackrf.c | 1 -
+ drivers/media/usb/hdpvr/hdpvr-video.c | 4 +-
+ drivers/media/usb/msi2500/msi2500.c | 1 -
+ drivers/media/usb/pwc/pwc-if.c | 1 -
+ drivers/media/usb/s2255/s2255drv.c | 9 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 4 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 1 -
+ drivers/media/usb/usbvision/usbvision-core.c | 5 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 4 +-
+ drivers/usb/atm/cxacru.c | 6 +-
+ drivers/usb/atm/speedtch.c | 1 -
+ drivers/usb/atm/ueagle-atm.c | 13 +-
+ drivers/usb/atm/usbatm.c | 8 +-
+ drivers/usb/class/cdc-wdm.c | 149 +++++++++--
+ drivers/usb/class/usbtmc.c | 8 +-
+ drivers/usb/common/ulpi.c | 5 +-
+ drivers/usb/core/Kconfig | 1 -
+ drivers/usb/core/Makefile | 3 +-
+ drivers/usb/core/hcd.c | 6 +-
+ drivers/usb/core/hub.c | 9 +-
+ drivers/usb/core/message.c | 5 +-
+ drivers/usb/core/of.c | 1 +
+ drivers/usb/core/otg_whitelist.h | 2 +-
+ drivers/usb/core/urb.c | 4 +-
+ drivers/usb/dwc2/gadget.c | 8 +-
+ drivers/usb/dwc2/hcd.c | 2 +-
+ drivers/usb/dwc3/Kconfig | 2 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c | 16 +-
+ drivers/usb/gadget/udc/goku_udc.c | 3 +-
+ drivers/usb/gadget/udc/omap_udc.c | 2 +-
+ drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
+ drivers/usb/host/bcma-hcd.c | 101 +++++++-
+ drivers/usb/host/ehci-platform.c | 2 +-
+ drivers/usb/host/fhci-hcd.c | 4 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 18 +-
+ drivers/usb/host/max3421-hcd.c | 8 +-
+ drivers/usb/host/ohci-at91.c | 69 ++++-
+ drivers/usb/host/ohci-omap.c | 1 -
+ drivers/usb/host/ohci-sa1111.c | 4 +-
+ drivers/usb/host/uhci-hcd.c | 5 +-
+ drivers/usb/host/whci/init.c | 2 +-
+ drivers/usb/host/xhci-tegra.c | 1 -
+ drivers/usb/host/xhci.c | 4 +-
+ drivers/usb/misc/Kconfig | 6 +
+ drivers/usb/misc/Makefile | 1 +
+ drivers/usb/misc/adutux.c | 21 +-
+ drivers/usb/misc/appledisplay.c | 17 +-
+ drivers/usb/misc/cypress_cy7c63.c | 5 +-
+ drivers/usb/misc/cytherm.c | 32 +--
+ drivers/usb/misc/ftdi-elan.c | 67 +----
+ drivers/usb/misc/idmouse.c | 1 -
+ drivers/usb/misc/iowarrior.c | 26 +-
+ drivers/usb/misc/ldusb.c | 28 +-
+ drivers/usb/misc/legousbtower.c | 24 +-
+ drivers/usb/misc/lvstest.c | 25 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 3 -
+ drivers/usb/misc/trancevibrator.c | 3 +-
+ drivers/usb/misc/usb4604.c | 175 +++++++++++++
+ drivers/usb/misc/usblcd.c | 9 +-
+ drivers/usb/misc/usbsevseg.c | 8 +-
+ drivers/usb/misc/uss720.c | 5 +-
+ drivers/usb/misc/yurex.c | 16 +-
+ drivers/usb/musb/am35x.c | 4 +-
+ drivers/usb/musb/da8xx.c | 4 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 6 +-
+ drivers/usb/renesas_usbhs/mod_host.c | 10 +-
+ drivers/usb/renesas_usbhs/pipe.c | 4 +-
+ drivers/usb/storage/alauda.c | 11 +-
+ drivers/usb/storage/sddr09.c | 14 +-
+ drivers/usb/storage/usb.c | 10 +-
+ drivers/usb/usb-skeleton.c | 14 +-
+ drivers/usb/usbip/Kconfig | 21 ++
+ drivers/usb/usbip/stub_rx.c | 1 -
+ drivers/usb/usbip/vhci.h | 54 +++-
+ drivers/usb/usbip/vhci_hcd.c | 285 ++++++++++++++-------
+ drivers/usb/usbip/vhci_rx.c | 21 +-
+ drivers/usb/usbip/vhci_sysfs.c | 296 +++++++++++++++++-----
+ drivers/usb/usbip/vudc_dev.c | 2 +-
+ drivers/usb/usbip/vudc_rx.c | 2 +-
+ drivers/usb/wusbcore/crypto.c | 4 +-
+ drivers/usb/wusbcore/security.c | 4 +-
+ drivers/usb/wusbcore/wa-nep.c | 9 +-
+ drivers/usb/wusbcore/wa-xfer.c | 4 +-
+ drivers/uwb/hwa-rc.c | 4 +-
+ drivers/watchdog/pcwd_usb.c | 4 +-
+ include/linux/bcma/bcma_regs.h | 1 +
+ include/linux/ulpi/driver.h | 6 +-
+ include/soc/at91/atmel-sfr.h | 14 +
+ 109 files changed, 1173 insertions(+), 694 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/usb4604.txt
+ create mode 100644 drivers/usb/misc/usb4604.c
+Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/keyspan_pda.c | 4 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 171 ++++++++++++----------------------
+ 2 files changed, 60 insertions(+), 115 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (1d9aabecde29 usb: chipidea: udc: Use direction flags consequently)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Auto-merging drivers/usb/chipidea/udc.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++
+ .../devicetree/bindings/usb/usbmisc-imx.txt | 1 +
+ drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
+ drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
+ drivers/usb/chipidea/udc.c | 31 ++++++++++------------
+ drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++----
+ 6 files changed, 38 insertions(+), 22 deletions(-)
+Merging staging/staging-next (aa652b1ccbd0 staging: octeon: Use IS_ENABLED() instead of checking for built-in or module)
+$ git merge staging/staging-next
+Auto-merging drivers/staging/wilc1000/linux_wlan.c
+Removing drivers/staging/unisys/visorbus/periodic_work.c
+Removing drivers/staging/unisys/include/periodic_work.h
+Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_FW.h
+Auto-merging drivers/staging/octeon/octeon-ethernet.h
+Auto-merging drivers/staging/octeon/ethernet.c
+Auto-merging drivers/staging/lustre/lustre/llite/namei.c
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Auto-merging drivers/staging/fsl-mc/include/mc-bus.h
+Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-msi.c
+Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-bus.c
+Auto-merging drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
+Auto-merging drivers/staging/comedi/drivers/dt2811.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+Auto-merging drivers/iio/light/Kconfig
+Auto-merging drivers/iio/humidity/Kconfig
+Auto-merging drivers/iio/chemical/atlas-ph-sensor.c
+Auto-merging drivers/iio/adc/Kconfig
+Auto-merging drivers/iio/accel/Kconfig
+Auto-merging drivers/dma-buf/sync_trace.h
+Auto-merging drivers/dma-buf/sync_debug.h
+Auto-merging drivers/dma-buf/sync_debug.c
+Auto-merging drivers/dma-buf/sw_sync.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Removing Documentation/devicetree/bindings/soc/mediatek/auxadc.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/trivial-devices.txt | 1 +
+ .../devicetree/bindings/iio/accel/dmard06.txt | 19 +
+ .../devicetree/bindings/iio/accel/kionix,kxsd9.txt | 22 +
+ .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 29 +
+ .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 16 +
+ .../bindings/iio/chemical/atlas,orp-sm.txt | 22 +
+ .../bindings/iio/magnetometer/ak8974.txt | 29 +
+ .../iio/temperature/maxim_thermocouple.txt | 21 +
+ .../devicetree/bindings/soc/mediatek/auxadc.txt | 21 -
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 14 +
+ drivers/android/binder.c | 7 +-
+ drivers/dma-buf/Kconfig | 13 +
+ drivers/dma-buf/Makefile | 1 +
+ drivers/{staging/android => dma-buf}/sw_sync.c | 37 +-
+ drivers/{staging/android => dma-buf}/sync_debug.c | 2 +-
+ drivers/{staging/android => dma-buf}/sync_debug.h | 2 +-
+ .../android/trace/sync.h => dma-buf/sync_trace.h} | 6 +-
+ drivers/iio/accel/Kconfig | 21 +
+ drivers/iio/accel/Makefile | 2 +
+ drivers/iio/accel/bma180.c | 9 +-
+ drivers/iio/accel/dmard06.c | 241 ++++
+ drivers/iio/accel/dmard09.c | 157 +++
+ drivers/iio/accel/kxcjk-1013.c | 1 +
+ drivers/iio/adc/Kconfig | 25 +
+ drivers/iio/adc/Makefile | 2 +
+ drivers/iio/adc/ad7298.c | 20 +-
+ drivers/iio/adc/ad7793.c | 10 +-
+ drivers/iio/adc/mt6577_auxadc.c | 291 +++++
+ drivers/iio/adc/nau7802.c | 2 +-
+ drivers/iio/adc/ti-adc161s626.c | 248 ++++
+ drivers/iio/buffer/industrialio-buffer-cb.c | 24 +-
+ drivers/iio/chemical/Kconfig | 1 +
+ drivers/iio/chemical/atlas-ph-sensor.c | 81 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 22 +-
+ drivers/iio/dac/Kconfig | 9 +
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/cio-dac.c | 144 +++
+ drivers/iio/humidity/Kconfig | 8 +-
+ drivers/iio/light/Kconfig | 6 +-
+ drivers/iio/light/us5182d.c | 2 +-
+ drivers/iio/light/vcnl4000.c | 72 +-
+ drivers/iio/magnetometer/Kconfig | 16 +-
+ drivers/iio/magnetometer/Makefile | 1 +
+ drivers/iio/magnetometer/ak8974.c | 863 +++++++++++++
+ drivers/iio/magnetometer/mag3110.c | 23 +-
+ drivers/iio/proximity/sx9500.c | 2 +-
+ drivers/iio/temperature/Kconfig | 16 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/maxim_thermocouple.c | 281 ++++
+ drivers/staging/android/Kconfig | 13 -
+ drivers/staging/android/Makefile | 1 -
+ drivers/staging/android/ion/ion.c | 177 +--
+ drivers/staging/android/ion/ion.h | 41 -
+ drivers/staging/android/ion/ion_carveout_heap.c | 33 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 29 +-
+ drivers/staging/android/ion/ion_cma_heap.c | 36 +-
+ drivers/staging/android/ion/ion_dummy_driver.c | 10 +-
+ drivers/staging/android/ion/ion_heap.c | 10 +-
+ drivers/staging/android/ion/ion_page_pool.c | 12 +-
+ drivers/staging/android/ion/ion_priv.h | 37 +-
+ drivers/staging/android/ion/ion_system_heap.c | 239 ++--
+ drivers/staging/android/ion/ion_test.c | 23 +-
+ drivers/staging/android/lowmemorykiller.c | 4 +-
+ drivers/staging/android/uapi/ion.h | 6 -
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c | 141 --
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 85 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 577 ++++-----
+ drivers/staging/comedi/drivers/das08_cs.c | 73 +-
+ drivers/staging/comedi/drivers/dt2811.c | 4 +-
+ drivers/staging/comedi/drivers/dt9812.c | 4 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 15 +-
+ drivers/staging/comedi/drivers/jr3_pci.h | 290 +++--
+ drivers/staging/comedi/drivers/ni_670x.c | 62 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 273 ++--
+ drivers/staging/comedi/drivers/ni_atmio.c | 176 ++-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 106 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 58 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 67 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 95 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 216 ++--
+ drivers/staging/comedi/drivers/ni_usb6501.c | 4 +-
+ drivers/staging/comedi/drivers/plx9080.h | 95 +-
+ drivers/staging/comedi/drivers/s626.c | 3 +-
+ drivers/staging/comedi/drivers/s626.h | 4 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 4 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 12 +-
+ drivers/staging/dgnc/dgnc_cls.c | 965 +++++++-------
+ drivers/staging/dgnc/dgnc_driver.c | 8 +-
+ drivers/staging/dgnc/dgnc_driver.h | 10 +-
+ drivers/staging/dgnc/dgnc_neo.c | 14 -
+ drivers/staging/dgnc/dgnc_tty.c | 68 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 4 +-
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 4 +-
+ drivers/staging/fbtft/fb_ili9320.c | 4 +-
+ drivers/staging/fbtft/fb_ili9325.c | 10 +-
+ drivers/staging/fbtft/fb_pcd8544.c | 4 +-
+ drivers/staging/fbtft/fb_s6d02a1.c | 14 +-
+ drivers/staging/fbtft/fb_s6d1121.c | 8 +-
+ drivers/staging/fbtft/fb_ssd1289.c | 10 +-
+ drivers/staging/fbtft/fb_ssd1306.c | 23 +-
+ drivers/staging/fbtft/fb_ssd1331.c | 40 +-
+ drivers/staging/fbtft/fb_ssd1351.c | 2 +-
+ drivers/staging/fbtft/fb_st7735r.c | 43 +-
+ drivers/staging/fbtft/fb_tls8204.c | 59 +-
+ drivers/staging/fbtft/fb_uc1611.c | 12 +-
+ drivers/staging/fbtft/fb_watterott.c | 8 +-
+ drivers/staging/fbtft/fbtft-bus.c | 3 +-
+ drivers/staging/fbtft/fbtft-core.c | 26 +-
+ drivers/staging/fbtft/fbtft.h | 26 +-
+ drivers/staging/fbtft/fbtft_device.c | 30 +-
+ drivers/staging/fsl-mc/bus/Makefile | 7 +-
+ drivers/staging/fsl-mc/bus/dpmcp.c | 1 +
+ drivers/staging/fsl-mc/bus/dpmng-cmd.h | 15 +-
+ drivers/staging/fsl-mc/bus/dpmng.c | 1 +
+ drivers/staging/fsl-mc/bus/dprc-cmd.h | 15 +-
+ drivers/staging/fsl-mc/bus/dprc-driver.c | 71 +-
+ drivers/staging/fsl-mc/bus/dprc.c | 1 +
+ .../bus/{mc-allocator.c => fsl-mc-allocator.c} | 206 +--
+ .../staging/fsl-mc/bus/{mc-bus.c => fsl-mc-bus.c} | 78 +-
+ .../staging/fsl-mc/bus/{mc-msi.c => fsl-mc-msi.c} | 4 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-private.h | 52 +
+ .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 6 +-
+ drivers/staging/fsl-mc/bus/mc-io.c | 320 +++++
+ drivers/staging/fsl-mc/bus/mc-sys.c | 155 +--
+ .../fsl-mc/include/{mc-private.h => mc-bus.h} | 91 +-
+ drivers/staging/fsl-mc/include/mc-sys.h | 15 -
+ drivers/staging/fsl-mc/include/mc.h | 13 -
+ drivers/staging/gdm724x/gdm_tty.c | 1 -
+ drivers/staging/gdm724x/gdm_usb.c | 8 +-
+ drivers/staging/gdm724x/netlink_k.c | 11 +-
+ drivers/staging/i4l/act2000/act2000_isa.c | 4 +-
+ drivers/staging/i4l/act2000/capi.c | 10 +-
+ drivers/staging/i4l/act2000/capi.h | 10 +-
+ drivers/staging/i4l/icn/icn.c | 186 +--
+ drivers/staging/i4l/pcbit/capi.c | 4 +-
+ drivers/staging/i4l/pcbit/drv.c | 16 +-
+ drivers/staging/i4l/pcbit/edss1.c | 7 +-
+ drivers/staging/i4l/pcbit/layer2.c | 8 +-
+ drivers/staging/iio/light/isl29018.c | 134 +-
+ drivers/staging/iio/light/isl29028.c | 103 +-
+ drivers/staging/iio/meter/ade7854.c | 40 +-
+ drivers/staging/ks7010/ks7010_sdio.c | 25 +-
+ drivers/staging/ks7010/ks_hostif.c | 18 +-
+ drivers/staging/ks7010/michael_mic.c | 20 +-
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 6 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 10 +-
+ .../lustre/include/linux/libcfs/libcfs_fail.h | 3 +
+ .../lustre/include/linux/libcfs/libcfs_private.h | 9 -
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 65 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 5 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 16 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 16 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 18 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 207 +--
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 -
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 8 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 44 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 207 +--
+ drivers/staging/lustre/lnet/libcfs/debug.c | 9 +-
+ drivers/staging/lustre/lnet/libcfs/fail.c | 6 +-
+ drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 2 -
+ .../lustre/lnet/libcfs/linux/linux-crypto.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/lib-md.c | 6 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 352 ++---
+ drivers/staging/lustre/lnet/lnet/lib-msg.c | 18 +-
+ drivers/staging/lustre/lnet/lnet/lib-socket.c | 21 +-
+ drivers/staging/lustre/lnet/lnet/lo.c | 39 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 10 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 15 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 4 +-
+ drivers/staging/lustre/lnet/selftest/rpc.c | 8 +-
+ drivers/staging/lustre/lustre/fld/fld_internal.h | 19 +
+ drivers/staging/lustre/lustre/fld/fld_request.c | 55 +-
+ drivers/staging/lustre/lustre/include/cl_object.h | 77 +-
+ .../staging/lustre/lustre/include/lprocfs_status.h | 6 +
+ drivers/staging/lustre/lustre/include/lu_object.h | 22 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 433 ++++---
+ .../lustre/lustre/include/lustre/lustre_ioctl.h | 412 ++++++
+ .../lustre/lustre/include/lustre/lustre_user.h | 77 +-
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 11 +-
+ .../lustre/lustre/include/lustre_dlm_flags.h | 36 +-
+ drivers/staging/lustre/lustre/include/lustre_fid.h | 32 +-
+ .../staging/lustre/lustre/include/lustre_handles.h | 3 +-
+ .../staging/lustre/lustre/include/lustre_import.h | 22 -
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 286 +----
+ .../staging/lustre/lustre/include/lustre_lite.h | 14 +-
+ drivers/staging/lustre/lustre/include/lustre_lmv.h | 121 ++
+ drivers/staging/lustre/lustre/include/lustre_log.h | 3 +-
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 23 +-
+ drivers/staging/lustre/lustre/include/lustre_mds.h | 3 -
+ .../lustre/lustre/include/lustre_req_layout.h | 3 -
+ drivers/staging/lustre/lustre/include/lustre_ver.h | 17 +-
+ drivers/staging/lustre/lustre/include/obd.h | 209 ++-
+ drivers/staging/lustre/lustre/include/obd_class.h | 149 ++-
+ .../staging/lustre/lustre/include/obd_support.h | 25 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 106 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 17 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 24 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 79 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 21 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 38 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 55 -
+ drivers/staging/lustre/lustre/llite/dir.c | 872 ++++++-------
+ drivers/staging/lustre/lustre/llite/file.c | 365 ++++--
+ drivers/staging/lustre/lustre/llite/lcommon_cl.c | 2 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 75 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 482 +++++--
+ drivers/staging/lustre/lustre/llite/llite_mmap.c | 6 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 69 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 123 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 193 ++-
+ drivers/staging/lustre/lustre/llite/rw.c | 13 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 9 +-
+ drivers/staging/lustre/lustre/llite/statahead.c | 98 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 4 +-
+ drivers/staging/lustre/lustre/llite/symlink.c | 12 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 6 -
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 6 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_page.c | 4 +-
+ drivers/staging/lustre/lustre/llite/vvp_req.c | 2 +
+ drivers/staging/lustre/lustre/llite/xattr.c | 320 +++--
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 24 +-
+ drivers/staging/lustre/lustre/lmv/lmv_intent.c | 371 ++++--
+ drivers/staging/lustre/lustre/lmv/lmv_internal.h | 133 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 1356 ++++++++++++++------
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 2 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c | 3 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 22 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 64 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 1 +
+ drivers/staging/lustre/lustre/lov/lov_page.c | 12 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +-
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 17 +-
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h | 33 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 207 ++-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 159 +--
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 17 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 654 ++++++++--
+ drivers/staging/lustre/lustre/obdclass/cl_io.c | 10 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 14 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 35 +-
+ drivers/staging/lustre/lustre/obdclass/debug.c | 4 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 140 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 3 +-
+ .../lustre/lustre/obdclass/linux/linux-obdo.c | 2 +-
+ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 5 +-
+ drivers/staging/lustre/lustre/obdclass/llog.c | 2 +-
+ drivers/staging/lustre/lustre/obdclass/llog_swab.c | 1 +
+ .../lustre/lustre/obdclass/lprocfs_status.c | 148 ++-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 125 +-
+ .../lustre/lustre/obdclass/lustre_handles.c | 6 +-
+ .../staging/lustre/lustre/obdclass/obd_config.c | 31 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 35 +-
+ drivers/staging/lustre/lustre/obdclass/obdo.c | 13 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
+ .../staging/lustre/lustre/obdecho/echo_internal.h | 4 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 10 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 143 +--
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_internal.h | 3 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 9 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 208 ++-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 112 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 18 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 17 -
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 3 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 104 +-
+ drivers/staging/lustre/lustre/ptlrpc/pers.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 11 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 32 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 42 +-
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 665 +++++-----
+ drivers/staging/media/lirc/lirc_imon.c | 9 +-
+ drivers/staging/media/lirc/lirc_sasem.c | 5 -
+ drivers/staging/most/aim-cdev/cdev.c | 24 +-
+ drivers/staging/most/aim-network/networking.c | 26 +-
+ drivers/staging/most/aim-v4l2/video.c | 117 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.c | 71 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.h | 3 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.c | 16 +-
+ drivers/staging/most/hdm-dim2/dim2_reg.h | 8 +-
+ drivers/staging/most/hdm-usb/hdm_usb.c | 290 ++---
+ drivers/staging/most/mostcore/core.c | 72 +-
+ drivers/staging/netlogic/xlr_net.c | 2 +-
+ drivers/staging/octeon-usb/Kconfig | 2 +-
+ drivers/staging/octeon/ethernet-rx.c | 184 ++-
+ drivers/staging/octeon/ethernet-util.h | 7 +-
+ drivers/staging/octeon/ethernet.c | 87 +-
+ drivers/staging/octeon/octeon-ethernet.h | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 65 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 16 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 99 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 245 +---
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 13 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 53 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 92 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 20 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 37 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 -
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 +
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 18 -
+ .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 29 -
+ drivers/staging/rtl8188eu/include/ieee80211.h | 229 +---
+ drivers/staging/rtl8188eu/include/odm.h | 16 -
+ drivers/staging/rtl8188eu/include/osdep_service.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 30 -
+ drivers/staging/rtl8188eu/include/rtw_ap.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 32 +-
+ drivers/staging/rtl8188eu/include/rtw_efuse.h | 12 -
+ drivers/staging/rtl8188eu/include/rtw_event.h | 21 +-
+ drivers/staging/rtl8188eu/include/rtw_ht.h | 9 +-
+ drivers/staging/rtl8188eu/include/rtw_ioctl.h | 15 -
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 8 +-
+ drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 17 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 7 -
+ drivers/staging/rtl8188eu/include/rtw_security.h | 6 -
+ drivers/staging/rtl8188eu/include/rtw_xmit.h | 8 -
+ drivers/staging/rtl8188eu/include/wifi.h | 30 -
+ drivers/staging/rtl8188eu/include/wlan_bssdef.h | 83 --
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 19 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 7 -
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 40 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 120 +-
+ drivers/staging/rtl8192e/rtl819x_Qos.h | 3 -
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 5 +
+ drivers/staging/rtl8192e/rtllib.h | 10 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 58 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 34 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 10 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
+ drivers/staging/rtl8192u/r8192U.h | 4 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 19 +-
+ drivers/staging/rtl8712/ieee80211.c | 25 +-
+ drivers/staging/rtl8712/os_intfs.c | 6 +-
+ drivers/staging/rtl8712/osdep_intf.h | 2 +-
+ drivers/staging/rtl8712/osdep_service.h | 7 -
+ drivers/staging/rtl8712/recv_linux.c | 1 -
+ drivers/staging/rtl8712/rtl8712_cmd.c | 14 +-
+ drivers/staging/rtl8712/rtl8712_recv.h | 1 -
+ drivers/staging/rtl8712/rtl871x_cmd.c | 54 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 4 +-
+ drivers/staging/rtl8712/rtl871x_pwrctrl.c | 24 +-
+ drivers/staging/rtl8712/rtl871x_pwrctrl.h | 7 +-
+ drivers/staging/rtl8712/usb_ops_linux.c | 92 +-
+ drivers/staging/rtl8712/xmit_linux.c | 17 +-
+ drivers/staging/rtl8723au/core/rtw_ieee80211.c | 80 +-
+ drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 11 +-
+ drivers/staging/rtl8723au/core/rtw_xmit.c | 4 -
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 4 +-
+ drivers/staging/rtl8723au/include/osdep_service.h | 1 -
+ drivers/staging/rtl8723au/include/rtw_io.h | 2 -
+ drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 3 +-
+ drivers/staging/rtl8723au/include/rtw_xmit.h | 5 -
+ drivers/staging/rtl8723au/os_dep/usb_intf.c | 11 +-
+ drivers/staging/rts5208/ms.c | 29 +-
+ drivers/staging/rts5208/ms.h | 1 -
+ drivers/staging/rts5208/rtsx.c | 49 +-
+ drivers/staging/rts5208/rtsx.h | 2 +-
+ drivers/staging/rts5208/rtsx_card.c | 1 -
+ drivers/staging/rts5208/rtsx_chip.h | 6 -
+ drivers/staging/rts5208/rtsx_scsi.c | 6 +-
+ drivers/staging/rts5208/rtsx_transport.h | 1 -
+ drivers/staging/rts5208/sd.c | 4 -
+ drivers/staging/rts5208/spi.h | 1 -
+ drivers/staging/rts5208/xd.c | 4 -
+ drivers/staging/slicoss/slic.h | 66 +-
+ drivers/staging/slicoss/slichw.h | 409 ++----
+ drivers/staging/slicoss/slicoss.c | 633 ++++-----
+ drivers/staging/sm750fb/ddk750_chip.c | 14 +-
+ drivers/staging/sm750fb/ddk750_display.c | 13 +-
+ drivers/staging/sm750fb/ddk750_dvi.c | 8 +-
+ drivers/staging/sm750fb/sm750_hw.c | 100 +-
+ drivers/staging/speakup/devsynth.c | 2 +-
+ drivers/staging/speakup/synth.c | 2 +-
+ drivers/staging/unisys/include/guestlinuxdebug.h | 4 +-
+ drivers/staging/unisys/include/periodic_work.h | 40 -
+ drivers/staging/unisys/include/visorbus.h | 80 +-
+ drivers/staging/unisys/visorbus/Makefile | 1 -
+ drivers/staging/unisys/visorbus/periodic_work.c | 204 ---
+ drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 65 +-
+ .../unisys/{include => visorbus}/vbushelper.h | 0
+ drivers/staging/unisys/visorbus/visorbus_main.c | 615 +++++----
+ drivers/staging/unisys/visorbus/visorbus_private.h | 73 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 269 ++--
+ drivers/staging/unisys/visorbus/visorchipset.c | 434 ++++---
+ drivers/staging/unisys/visorinput/visorinput.c | 141 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 2 +-
+ drivers/staging/vt6655/channel.c | 3 +-
+ drivers/staging/vt6655/device_main.c | 8 +-
+ drivers/staging/vt6655/power.c | 12 +-
+ drivers/staging/vt6655/rf.c | 19 +-
+ drivers/staging/vt6655/rxtx.c | 41 +-
+ drivers/staging/vt6656/baseband.h | 4 +-
+ drivers/staging/vt6656/card.c | 75 +-
+ drivers/staging/vt6656/dpc.c | 14 +-
+ drivers/staging/vt6656/dpc.h | 2 +-
+ drivers/staging/vt6656/main_usb.c | 12 +-
+ drivers/staging/vt6656/usbpipe.c | 5 +-
+ drivers/staging/wilc1000/TODO | 1 -
+ drivers/staging/wilc1000/linux_wlan.c | 1 -
+ drivers/staging/wilc1000/wilc_debugfs.c | 29 +-
+ drivers/staging/wilc1000/wilc_spi.c | 2 +-
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +-
+ drivers/staging/wilc1000/wilc_wlan.h | 2 +-
+ drivers/staging/wilc1000/wilc_wlan_if.h | 1 -
+ drivers/staging/wlan-ng/cfg80211.c | 85 +-
+ drivers/staging/wlan-ng/p80211metadef.h | 4 +
+ drivers/staging/wlan-ng/p80211req.c | 67 +-
+ drivers/staging/wlan-ng/prism2mib.c | 506 ++++----
+ drivers/staging/wlan-ng/prism2usb.c | 14 +-
+ include/linux/hid-sensor-hub.h | 1 +
+ include/linux/iio/consumer.h | 12 +
+ tools/iio/lsiio.c | 3 +-
+ 431 files changed, 15025 insertions(+), 12355 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard06.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8974.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim_thermocouple.txt
+ delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/auxadc.txt
+ rename drivers/{staging/android => dma-buf}/sw_sync.c (87%)
+ rename drivers/{staging/android => dma-buf}/sync_debug.c (99%)
+ rename drivers/{staging/android => dma-buf}/sync_debug.h (97%)
+ rename drivers/{staging/android/trace/sync.h => dma-buf/sync_trace.h} (84%)
+ create mode 100644 drivers/iio/accel/dmard06.c
+ create mode 100644 drivers/iio/accel/dmard09.c
+ create mode 100644 drivers/iio/adc/mt6577_auxadc.c
+ create mode 100644 drivers/iio/adc/ti-adc161s626.c
+ create mode 100644 drivers/iio/dac/cio-dac.c
+ create mode 100644 drivers/iio/magnetometer/ak8974.c
+ create mode 100644 drivers/iio/temperature/maxim_thermocouple.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+ rename drivers/staging/fsl-mc/bus/{mc-allocator.c => fsl-mc-allocator.c} (80%)
+ rename drivers/staging/fsl-mc/bus/{mc-bus.c => fsl-mc-bus.c} (93%)
+ rename drivers/staging/fsl-mc/bus/{mc-msi.c => fsl-mc-msi.c} (98%)
+ create mode 100644 drivers/staging/fsl-mc/bus/fsl-mc-private.h
+ create mode 100644 drivers/staging/fsl-mc/bus/mc-io.c
+ rename drivers/staging/fsl-mc/include/{mc-private.h => mc-bus.h} (53%)
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_lmv.h
+ delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_FW.h
+ delete mode 100644 drivers/staging/unisys/include/periodic_work.h
+ delete mode 100644 drivers/staging/unisys/visorbus/periodic_work.c
+ rename drivers/staging/unisys/{include => visorbus}/vbushelper.h (100%)
+Merging char-misc/char-misc-next (02baff325462 nvmem: rockchip-efuse: add rk3399-efuse support)
+$ git merge char-misc/char-misc-next
+Recorded preimage for 'include/linux/hyperv.h'
+Auto-merging include/linux/hyperv.h
+CONFLICT (content): Merge conflict in include/linux/hyperv.h
+Auto-merging drivers/vhost/test.c
+Auto-merging drivers/tty/serial/pch_uart.c
+Auto-merging drivers/misc/mei/pci-me.c
+Auto-merging drivers/misc/mei/hw-me.c
+Removing drivers/misc/bmp085.h
+Removing drivers/misc/bmp085.c
+Removing drivers/misc/bmp085-spi.c
+Removing drivers/misc/bmp085-i2c.c
+Auto-merging drivers/misc/Makefile
+Auto-merging drivers/misc/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/ABI/testing/sysfs-i2c-bmp085
+Auto-merging CREDITS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/hyperv.h'.
+[master 8f69aaf54424] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 5 +
+ Documentation/ABI/testing/sysfs-class-mic.txt | 2 +-
+ Documentation/ABI/testing/sysfs-i2c-bmp085 | 31 -
+ .../devicetree/bindings/nvmem/rockchip-efuse.txt | 13 +-
+ Documentation/vme_api.txt | 13 +-
+ MAINTAINERS | 4 +-
+ arch/arm/common/bL_switcher_dummy_if.c | 14 +-
+ arch/blackfin/mach-bf561/coreb.c | 13 +-
+ arch/um/drivers/harddog_kern.c | 25 +-
+ drivers/bluetooth/hci_vhci.c | 16 +-
+ drivers/char/bfin-otp.c | 40 +-
+ drivers/char/mem.c | 6 +
+ drivers/char/mwave/3780i.c | 64 +-
+ drivers/char/mwave/3780i.h | 8 +-
+ drivers/char/mwave/mwavedd.c | 42 +-
+ drivers/char/mwave/mwavedd.h | 14 +-
+ drivers/char/mwave/smapi.c | 4 +-
+ drivers/char/mwave/smapi.h | 6 +-
+ drivers/char/mwave/tp3780i.c | 52 +-
+ drivers/char/ppdev.c | 25 +-
+ drivers/char/snsc.c | 7 +-
+ drivers/char/xillybus/xillybus_core.c | 4 +-
+ drivers/hid/uhid.c | 13 +-
+ drivers/hv/channel.c | 148 +--
+ drivers/hv/channel_mgmt.c | 102 +-
+ drivers/hv/connection.c | 8 +-
+ drivers/hv/hv.c | 8 +-
+ drivers/hv/hv_balloon.c | 254 ++--
+ drivers/hv/hv_fcopy.c | 14 +-
+ drivers/hv/hv_kvp.c | 27 +-
+ drivers/hv/hv_snapshot.c | 109 +-
+ drivers/hv/hv_utils_transport.c | 15 +-
+ drivers/hv/hv_utils_transport.h | 4 +-
+ drivers/hv/hyperv_vmbus.h | 9 +-
+ drivers/hv/ring_buffer.c | 76 +-
+ drivers/hv/vmbus_drv.c | 8 +-
+ drivers/hwtracing/coresight/coresight-etb10.c | 28 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 153 ++-
+ drivers/hwtracing/coresight/coresight-etm-perf.h | 34 +
+ drivers/hwtracing/coresight/coresight-etm.h | 8 -
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 39 +-
+ .../hwtracing/coresight/coresight-etm4x-sysfs.c | 63 +-
+ drivers/hwtracing/coresight/coresight-etm4x.c | 419 +++++--
+ drivers/hwtracing/coresight/coresight-etm4x.h | 11 +-
+ drivers/hwtracing/coresight/coresight-funnel.c | 20 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 23 +-
+ .../coresight/coresight-replicator-qcom.c | 18 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 20 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 53 +-
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +-
+ drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 76 +-
+ drivers/hwtracing/coresight/coresight-tmc.h | 4 +-
+ drivers/hwtracing/coresight/coresight-tpiu.c | 18 +-
+ drivers/hwtracing/coresight/coresight.c | 29 +-
+ drivers/hwtracing/coresight/of_coresight.c | 3 +-
+ drivers/iio/pressure/Kconfig | 2 -
+ drivers/input/misc/uinput.c | 15 +-
+ drivers/lightnvm/core.c | 19 +-
+ drivers/mcb/Kconfig | 9 +
+ drivers/mcb/Makefile | 1 +
+ drivers/mcb/mcb-core.c | 17 -
+ drivers/mcb/mcb-internal.h | 9 +
+ drivers/mcb/mcb-lpc.c | 158 +++
+ drivers/mcb/mcb-parse.c | 126 +-
+ drivers/memory/of_memory.c | 1 +
+ drivers/misc/Kconfig | 28 -
+ drivers/misc/Makefile | 3 -
+ drivers/misc/bmp085-i2c.c | 83 --
+ drivers/misc/bmp085-spi.c | 79 --
+ drivers/misc/bmp085.c | 506 --------
+ drivers/misc/bmp085.h | 33 -
+ drivers/misc/genwqe/card_base.c | 15 +
+ drivers/misc/mei/amthif.c | 344 ++----
+ drivers/misc/mei/bus.c | 11 +-
+ drivers/misc/mei/client.c | 188 ++-
+ drivers/misc/mei/client.h | 7 +-
+ drivers/misc/mei/hbm.c | 46 +-
+ drivers/misc/mei/hw-me.c | 3 +
+ drivers/misc/mei/hw-txe.c | 3 +
+ drivers/misc/mei/interrupt.c | 52 +-
+ drivers/misc/mei/main.c | 58 +-
+ drivers/misc/mei/mei_dev.h | 30 +-
+ drivers/misc/mei/pci-me.c | 6 +
+ drivers/misc/mei/pci-txe.c | 7 +
+ drivers/misc/mic/scif/scif_dma.c | 6 +-
+ drivers/misc/mic/scif/scif_mmap.c | 4 +-
+ drivers/misc/pch_phub.c | 20 +-
+ drivers/misc/vmw_vmci/vmci_host.c | 14 +-
+ drivers/nvmem/rockchip-efuse.c | 133 +-
+ drivers/s390/char/sclp_ctl.c | 19 +-
+ drivers/tty/serial/Kconfig | 2 +-
+ drivers/tty/serial/pch_uart.c | 5 +
+ drivers/uio/uio_dmem_genirq.c | 2 +-
+ drivers/vhost/test.c | 13 +-
+ drivers/vme/bridges/Kconfig | 8 +
+ drivers/vme/bridges/Makefile | 1 +
+ drivers/vme/bridges/vme_ca91cx42.c | 8 +-
+ drivers/vme/bridges/vme_ca91cx42.h | 3 +-
+ drivers/vme/bridges/vme_fake.c | 1299 ++++++++++++++++++++
+ drivers/vme/bridges/vme_tsi148.c | 8 +-
+ drivers/vme/bridges/vme_tsi148.h | 3 +-
+ drivers/vme/vme.c | 31 +-
+ drivers/vme/vme_bridge.h | 3 +-
+ drivers/w1/slaves/w1_therm.c | 22 +-
+ drivers/w1/w1.c | 4 +-
+ include/linux/coresight.h | 5 +-
+ include/linux/hyperv.h | 61 +
+ include/linux/mcb.h | 22 +-
+ include/linux/miscdevice.h | 8 +
+ include/linux/vme.h | 2 +-
+ scripts/checkkconfigsymbols.py | 338 ++---
+ scripts/ver_linux | 260 ++--
+ tools/hv/hv_kvp_daemon.c | 2 +-
+ tools/hv/hv_vss_daemon.c | 3 +
+ 116 files changed, 3757 insertions(+), 2652 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-i2c-bmp085
+ create mode 100644 drivers/mcb/mcb-lpc.c
+ delete mode 100644 drivers/misc/bmp085-i2c.c
+ delete mode 100644 drivers/misc/bmp085-spi.c
+ delete mode 100644 drivers/misc/bmp085.c
+ delete mode 100644 drivers/misc/bmp085.h
+ create mode 100644 drivers/vme/bridges/vme_fake.c
+$ git am -3 ../patches/0001-Drivers-hv-ring_buffer-merge-fix-up-for-hv_netvsc-ma.patch
+Applying: Drivers: hv: ring_buffer: merge fix up for "hv_netvsc: make inline functions static"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/hyperv/netvsc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 656ee0f7142f] Merge remote-tracking branch 'char-misc/char-misc-next'
+ Date: Mon Sep 5 16:49:07 2016 +1000
+Merging extcon/extcon-next (160a746f5205 extcon: Use the extcon_set_state_sync() instead of deprecated functions)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon-adc-jack.c | 27 +-
+ drivers/extcon/extcon-arizona.c | 27 +-
+ drivers/extcon/extcon-axp288.c | 8 +-
+ drivers/extcon/extcon-gpio.c | 2 +-
+ drivers/extcon/extcon-max14577.c | 18 +-
+ drivers/extcon/extcon-max3355.c | 8 +-
+ drivers/extcon/extcon-max77693.c | 46 +-
+ drivers/extcon/extcon-max77843.c | 22 +-
+ drivers/extcon/extcon-max8997.c | 20 +-
+ drivers/extcon/extcon-palmas.c | 16 +-
+ drivers/extcon/extcon-rt8973a.c | 4 +-
+ drivers/extcon/extcon-sm5502.c | 4 +-
+ drivers/extcon/extcon-usb-gpio.c | 8 +-
+ drivers/extcon/extcon.c | 774 ++++++++++++++++++++++++++-------
+ include/linux/extcon.h | 181 +++++++-
+ include/linux/extcon/extcon-adc-jack.h | 4 +-
+ 16 files changed, 893 insertions(+), 276 deletions(-)
+Merging cgroup/for-next (667430ec48e4 Merge branch 'for-4.8-fixes' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/cgroup.c
+Auto-merging include/linux/cgroup.h
+Auto-merging fs/kernfs/dir.c
+Merge made by the 'recursive' strategy.
+ fs/kernfs/dir.c | 84 +++++-----------------
+ fs/sysfs/dir.c | 6 +-
+ include/linux/blk-cgroup.h | 11 +--
+ include/linux/cgroup.h | 9 ++-
+ include/linux/kernfs.h | 28 +++++---
+ include/trace/events/cgroup.h | 163 ++++++++++++++++++++++++++++++++++++++++++
+ kernel/cgroup.c | 73 ++++++++++++-------
+ kernel/cpuset.c | 12 ++--
+ kernel/sched/debug.c | 3 +-
+ 9 files changed, 263 insertions(+), 126 deletions(-)
+ create mode 100644 include/trace/events/cgroup.h
+Merging scsi/for-next (5b7dc017ee31 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/powerpc/cxlflash.txt | 44 +-
+ MAINTAINERS | 21 +-
+ drivers/s390/scsi/zfcp_dbf.c | 162 +-
+ drivers/s390/scsi/zfcp_dbf.h | 14 +-
+ drivers/s390/scsi/zfcp_erp.c | 12 +-
+ drivers/s390/scsi/zfcp_ext.h | 8 +-
+ drivers/s390/scsi/zfcp_fsf.c | 22 +-
+ drivers/s390/scsi/zfcp_fsf.h | 4 +-
+ drivers/s390/scsi/zfcp_scsi.c | 8 +-
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +-
+ drivers/scsi/be2iscsi/be.h | 15 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 1096 ++--
+ drivers/scsi/be2iscsi/be_cmds.h | 142 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 408 +-
+ drivers/scsi/be2iscsi/be_iscsi.h | 25 +-
+ drivers/scsi/be2iscsi/be_main.c | 2467 ++++-----
+ drivers/scsi/be2iscsi/be_main.h | 220 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 1492 +++---
+ drivers/scsi/be2iscsi/be_mgmt.h | 51 +-
+ drivers/scsi/constants.c | 5 +-
+ drivers/scsi/cxlflash/superpipe.c | 181 +-
+ drivers/scsi/cxlflash/superpipe.h | 3 +-
+ drivers/scsi/cxlflash/vlun.c | 13 +-
+ drivers/scsi/esas2r/esas2r_init.c | 4 -
+ drivers/scsi/esas2r/esas2r_main.c | 2 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 53 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 10 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 190 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 64 +
+ drivers/scsi/hosts.c | 12 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 11 +
+ drivers/scsi/ibmvscsi/ibmvfc.h | 1 +
+ drivers/scsi/ipr.c | 125 +-
+ drivers/scsi/ipr.h | 7 +-
+ drivers/scsi/libfc/fc_exch.c | 1 -
+ drivers/scsi/libfc/fc_rport.c | 26 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 11 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 259 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 24 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 7 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 49 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 169 +-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 28 +-
+ drivers/scsi/qla2xxx/qla_os.c | 12 +-
+ drivers/scsi/scsi_devinfo.c | 4 +
+ drivers/scsi/scsi_transport_sas.c | 16 -
+ drivers/scsi/ses.c | 2 +-
+ drivers/scsi/smartpqi/Kconfig | 50 +
+ drivers/scsi/smartpqi/Makefile | 3 +
+ drivers/scsi/smartpqi/smartpqi.h | 1133 +++++
+ drivers/scsi/smartpqi/smartpqi_init.c | 6306 ++++++++++++++++++++++++
+ drivers/scsi/smartpqi/smartpqi_sas_transport.c | 350 ++
+ drivers/scsi/smartpqi/smartpqi_sis.c | 394 ++
+ drivers/scsi/smartpqi/smartpqi_sis.h | 32 +
+ include/scsi/scsi_transport_sas.h | 5 +-
+ include/uapi/scsi/cxlflash_ioctl.h | 19 +-
+ 58 files changed, 12349 insertions(+), 3447 deletions(-)
+ create mode 100644 drivers/scsi/smartpqi/Kconfig
+ create mode 100644 drivers/scsi/smartpqi/Makefile
+ create mode 100644 drivers/scsi/smartpqi/smartpqi.h
+ create mode 100644 drivers/scsi/smartpqi/smartpqi_init.c
+ create mode 100644 drivers/scsi/smartpqi/smartpqi_sas_transport.c
+ create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.c
+ create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.h
+Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging libata/for-next (3e634d2984c4 Merge branch 'for-4.8-fixes' into for-next)
+$ git merge libata/for-next
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/stih407-family.dtsi | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +
+ drivers/ata/ahci_qoriq.c | 12 +-
+ drivers/ata/ahci_st.c | 4 +
+ drivers/ata/libahci.c | 2 +-
+ drivers/ata/libata-scsi.c | 288 ++++++++++++++++++++++---
+ include/linux/ata.h | 69 +++---
+ 8 files changed, 315 insertions(+), 69 deletions(-)
+Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
+$ git merge binfmt_misc/for-next
+Already up-to-date.
+Merging pinctrl/for-next (4bd0641c2d73 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Recorded preimage for 'drivers/pinctrl/meson/pinctrl-meson-gxbb.c'
+Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/pinctrl/meson/pinctrl-meson-gxbb.c'.
+[master 7a2015300c0d] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pinctrl/pinctrl-st.txt | 8 +-
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 5 +-
+ .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 5 +-
+ .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 +
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 24 +-
+ drivers/pinctrl/meson/pinctrl-meson.c | 222 +-
+ drivers/pinctrl/meson/pinctrl-meson.h | 52 +-
+ drivers/pinctrl/meson/pinctrl-meson8.c | 24 +-
+ drivers/pinctrl/meson/pinctrl-meson8b.c | 24 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 +-
+ drivers/pinctrl/pinctrl-palmas.c | 4 +-
+ drivers/pinctrl/pinctrl-pistachio.c | 12 +-
+ drivers/pinctrl/pinctrl-st.c | 17 -
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 +
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 6 +-
+ drivers/pinctrl/sh-pfc/Kconfig | 5 +
+ drivers/pinctrl/sh-pfc/Makefile | 1 +
+ drivers/pinctrl/sh-pfc/core.c | 6 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 2624 ++++++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 356 ++-
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 108 +-
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 12 +-
+ 24 files changed, 3204 insertions(+), 325 deletions(-)
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7792.c
+Merging vhost/linux-next (a77ec83a5789 vhost/scsi: fix reuse of &vq->iov[out] in response)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
+$ git merge remoteproc/for-next
+Merge made by the 'recursive' strategy.
+Merging rpmsg/for-next (f6ed80141833 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/remoteproc/qcom,wcnss-pil.txt | 132 +++++
+ drivers/remoteproc/Kconfig | 16 +
+ drivers/remoteproc/Makefile | 2 +
+ drivers/remoteproc/da8xx_remoteproc.c | 2 +-
+ drivers/remoteproc/omap_remoteproc.c | 5 +-
+ drivers/remoteproc/qcom_q6v5_pil.c | 4 +-
+ drivers/remoteproc/qcom_wcnss.c | 624 +++++++++++++++++++++
+ drivers/remoteproc/qcom_wcnss.h | 22 +
+ drivers/remoteproc/qcom_wcnss_iris.c | 188 +++++++
+ drivers/remoteproc/remoteproc_core.c | 185 +++---
+ drivers/remoteproc/remoteproc_debugfs.c | 20 +-
+ drivers/remoteproc/remoteproc_elf_loader.c | 6 +-
+ drivers/remoteproc/remoteproc_internal.h | 15 +-
+ drivers/remoteproc/remoteproc_virtio.c | 35 +-
+ drivers/remoteproc/wkup_m3_rproc.c | 2 +
+ drivers/rpmsg/virtio_rpmsg_bus.c | 70 +--
+ include/linux/platform_data/remoteproc-omap.h | 6 +-
+ include/linux/remoteproc.h | 9 +-
+ include/linux/rpmsg.h | 8 +-
+ samples/rpmsg/rpmsg_client_sample.c | 18 +-
+ 20 files changed, 1171 insertions(+), 198 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt
+ create mode 100644 drivers/remoteproc/qcom_wcnss.c
+ create mode 100644 drivers/remoteproc/qcom_wcnss.h
+ create mode 100644 drivers/remoteproc/qcom_wcnss_iris.c
+Merging gpio/for-next (0926ebf30f55 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Recorded preimage for 'arch/arm64/Kconfig.platforms'
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging arch/arm64/Kconfig.platforms
+CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
+Auto-merging arch/arm64/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/gpio/gpio-tps65086.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm64/Kconfig.platforms'.
+[master 945263a853cb] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/brcm,bcm6345-gpio.txt | 46 ++
+ .../devicetree/bindings/gpio/gpio-axp209.txt | 30 ++
+ .../devicetree/bindings/gpio/gpio-tps65086.txt | 16 -
+ .../devicetree/bindings/gpio/gpio-ts4900.txt | 30 ++
+ Documentation/gpio/board.txt | 6 +-
+ Documentation/gpio/gpio-legacy.txt | 16 +-
+ MAINTAINERS | 6 +
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/Kconfig.platforms | 12 +-
+ arch/blackfin/Kconfig | 2 +-
+ drivers/gpio/Kconfig | 60 ++-
+ drivers/gpio/Makefile | 4 +
+ drivers/gpio/gpio-axp209.c | 162 +++++++
+ drivers/gpio/gpio-gpio-mm.c | 267 ++++++++++++
+ drivers/gpio/gpio-mmio.c | 4 +
+ drivers/gpio/gpio-pca953x.c | 41 +-
+ drivers/gpio/gpio-ts4900.c | 190 +++++++++
+ drivers/gpio/gpio-wcove.c | 469 +++++++++++++++++++++
+ drivers/gpio/gpiolib.c | 12 +-
+ 19 files changed, 1297 insertions(+), 77 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-axp209.txt
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tps65086.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4900.txt
+ create mode 100644 drivers/gpio/gpio-axp209.c
+ create mode 100644 drivers/gpio/gpio-gpio-mm.c
+ create mode 100644 drivers/gpio/gpio-ts4900.c
+ create mode 100644 drivers/gpio/gpio-wcove.c
+Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
+$ git merge dma-buf/for-next
+Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
+Auto-merging drivers/dma-buf/Kconfig
+CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 44a954ceef85] Merge remote-tracking branch 'dma-buf/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (e918a18d2eb3 Merge branch 'clk-meson-gxbb' into clk-next)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/meson/meson8b.c
+Removing drivers/clk/clk-max77802.c
+Removing drivers/clk/clk-max-gen.h
+Removing drivers/clk/clk-max-gen.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/clock/qcom,gcc.txt
+Removing Documentation/devicetree/bindings/clock/maxim,max77802.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,bdpsys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,ethsys.txt | 22 +
+ .../bindings/arm/mediatek/mediatek,hifsys.txt | 24 +
+ .../bindings/arm/mediatek/mediatek,imgsys.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,mmsys.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 3 +-
+ .../bindings/arm/mediatek/mediatek,vdecsys.txt | 3 +-
+ .../devicetree/bindings/clock/arm-syscon-icst.txt | 34 +-
+ .../bindings/clock/armada3700-periph-clock.txt | 70 +
+ .../bindings/clock/armada3700-tbg-clock.txt | 27 +
+ .../bindings/clock/armada3700-xtal-clock.txt | 28 +
+ .../devicetree/bindings/clock/maxim,max77686.txt | 118 +-
+ .../devicetree/bindings/clock/maxim,max77802.txt | 44 -
+ .../bindings/clock/mvebu-gated-clock.txt | 2 +
+ .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
+ .../devicetree/bindings/clock/qcom,lcc.txt | 1 +
+ MAINTAINERS | 1 +
+ drivers/clk/Kconfig | 19 +-
+ drivers/clk/Makefile | 2 -
+ drivers/clk/axis/clk-artpec6.c | 4 +-
+ drivers/clk/bcm/clk-kona-setup.c | 76 +-
+ drivers/clk/bcm/clk-kona.c | 9 +-
+ drivers/clk/bcm/clk-kona.h | 7 +-
+ drivers/clk/berlin/berlin2-avpll.c | 12 +-
+ drivers/clk/berlin/berlin2-avpll.h | 8 +-
+ drivers/clk/berlin/berlin2-div.c | 4 +-
+ drivers/clk/berlin/berlin2-div.h | 4 +-
+ drivers/clk/berlin/berlin2-pll.c | 6 +-
+ drivers/clk/berlin/berlin2-pll.h | 9 +-
+ drivers/clk/berlin/bg2.c | 98 +-
+ drivers/clk/berlin/bg2q.c | 39 +-
+ drivers/clk/clk-asm9260.c | 31 +-
+ drivers/clk/clk-axi-clkgen.c | 12 +-
+ drivers/clk/clk-axm5516.c | 39 +-
+ drivers/clk/clk-cdce706.c | 40 +-
+ drivers/clk/clk-cdce925.c | 42 +-
+ drivers/clk/clk-clps711x.c | 78 +-
+ drivers/clk/clk-cs2000-cp.c | 16 +-
+ drivers/clk/clk-divider.c | 2 +-
+ drivers/clk/clk-efm32gg.c | 63 +-
+ drivers/clk/clk-fixed-factor.c | 74 +-
+ drivers/clk/clk-fixed-rate.c | 72 +-
+ drivers/clk/clk-ls1x.c | 69 +-
+ drivers/clk/clk-max-gen.c | 194 ---
+ drivers/clk/clk-max-gen.h | 32 -
+ drivers/clk/clk-max77686.c | 262 ++-
+ drivers/clk/clk-max77802.c | 96 --
+ drivers/clk/clk-mb86s7x.c | 16 +-
+ drivers/clk/clk-moxart.c | 22 +-
+ drivers/clk/clk-nspire.c | 19 +-
+ drivers/clk/clk-palmas.c | 12 +-
+ drivers/clk/clk-pwm.c | 9 +-
+ drivers/clk/clk-qoriq.c | 6 +-
+ drivers/clk/clk-rk808.c | 44 +-
+ drivers/clk/clk-scpi.c | 33 +-
+ drivers/clk/clk-si514.c | 11 +-
+ drivers/clk/clk-si5351.c | 71 +-
+ drivers/clk/clk-si570.c | 13 +-
+ drivers/clk/clk-twl6040.c | 87 +-
+ drivers/clk/clk-vt8500.c | 22 +-
+ drivers/clk/clk-wm831x.c | 21 +-
+ drivers/clk/clk.c | 49 +-
+ drivers/clk/h8300/clk-div.c | 10 +-
+ drivers/clk/h8300/clk-h8s2678.c | 12 +-
+ drivers/clk/imx/clk-imx7d.c | 117 +-
+ drivers/clk/imx/clk.h | 9 +
+ drivers/clk/mediatek/Kconfig | 21 +
+ drivers/clk/mediatek/Makefile | 6 +-
+ drivers/clk/mediatek/clk-gate.c | 2 +-
+ drivers/clk/mediatek/clk-mtk.c | 12 +-
+ drivers/clk/mediatek/clk-pll.c | 2 +-
+ drivers/clk/meson/Makefile | 2 +-
+ drivers/clk/meson/clkc.h | 2 +-
+ drivers/clk/meson/gxbb.c | 174 +-
+ drivers/clk/meson/gxbb.h | 6 +-
+ drivers/clk/meson/{meson8b-clkc.c => meson8b.c} | 293 +++-
+ drivers/clk/meson/meson8b.h | 151 ++
+ drivers/clk/microchip/clk-core.c | 6 +-
+ drivers/clk/microchip/clk-pic32mzda.c | 1 +
+ drivers/clk/mvebu/Kconfig | 3 +
+ drivers/clk/mvebu/Makefile | 3 +
+ drivers/clk/mvebu/armada-37xx-periph.c | 447 +++++
+ drivers/clk/mvebu/armada-37xx-tbg.c | 158 ++
+ drivers/clk/mvebu/armada-37xx-xtal.c | 91 ++
+ drivers/clk/mvebu/armada-39x.c | 2 +
+ drivers/clk/nxp/clk-lpc18xx-creg.c | 3 +-
+ drivers/clk/qcom/Kconfig | 19 +
+ drivers/clk/qcom/Makefile | 5 +-
+ drivers/clk/qcom/clk-regmap.c | 5 +-
+ drivers/clk/qcom/clk-regmap.h | 3 +-
+ drivers/clk/qcom/common.c | 58 +-
+ drivers/clk/qcom/gcc-ipq4019.c | 1 -
+ drivers/clk/qcom/gcc-mdm9615.c | 1727 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-msm8996.c | 15 +-
+ drivers/clk/qcom/lcc-mdm9615.c | 580 +++++++
+ drivers/clk/qcom/mmcc-msm8996.c | 18 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 25 +
+ drivers/clk/sunxi/clk-mod0.c | 3 +-
+ drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +-
+ drivers/clk/versatile/clk-icst.c | 310 +++-
+ include/dt-bindings/clock/gxbb-clkc.h | 3 +
+ include/dt-bindings/clock/maxim,max77620.h | 21 +
+ include/dt-bindings/clock/meson8b-clkc.h | 2 -
+ include/dt-bindings/clock/mt2701-clk.h | 486 ++++++
+ include/dt-bindings/clock/qcom,gcc-mdm9615.h | 327 ++++
+ include/dt-bindings/clock/qcom,gcc-msm8996.h | 3 +
+ include/dt-bindings/clock/qcom,lcc-mdm9615.h | 52 +
+ include/dt-bindings/clock/qcom,mmcc-msm8996.h | 1 +
+ include/dt-bindings/reset/mt2701-resets.h | 83 +
+ include/dt-bindings/reset/qcom,gcc-mdm9615.h | 136 ++
+ include/linux/clk-provider.h | 14 +-
+ 114 files changed, 6463 insertions(+), 1240 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,bdpsys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,hifsys.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/armada3700-xtal-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
+ delete mode 100644 drivers/clk/clk-max-gen.c
+ delete mode 100644 drivers/clk/clk-max-gen.h
+ delete mode 100644 drivers/clk/clk-max77802.c
+ create mode 100644 drivers/clk/mediatek/Kconfig
+ rename drivers/clk/meson/{meson8b-clkc.c => meson8b.c} (51%)
+ create mode 100644 drivers/clk/meson/meson8b.h
+ create mode 100644 drivers/clk/mvebu/armada-37xx-periph.c
+ create mode 100644 drivers/clk/mvebu/armada-37xx-tbg.c
+ create mode 100644 drivers/clk/mvebu/armada-37xx-xtal.c
+ create mode 100644 drivers/clk/qcom/gcc-mdm9615.c
+ create mode 100644 drivers/clk/qcom/lcc-mdm9615.c
+ create mode 100644 include/dt-bindings/clock/maxim,max77620.h
+ create mode 100644 include/dt-bindings/clock/mt2701-clk.h
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-mdm9615.h
+ create mode 100644 include/dt-bindings/clock/qcom,lcc-mdm9615.h
+ create mode 100644 include/dt-bindings/reset/mt2701-resets.h
+ create mode 100644 include/dt-bindings/reset/qcom,gcc-mdm9615.h
+Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
+$ git merge random/dev
+Already up-to-date.
+Merging aio/master (b562e44f507e Linux 4.5)
+$ git merge aio/master
+Already up-to-date.
+Merging kselftest/next (29b4817d4018 Linux 4.8-rc1)
+$ git merge kselftest/next
+Already up-to-date.
+Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
+$ git merge y2038/y2038
+Recorded preimage for 'fs/afs/main.c'
+Auto-merging fs/afs/main.c
+CONFLICT (content): Merge conflict in fs/afs/main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/afs/main.c'.
+[master 42a1af9b0078] Merge remote-tracking branch 'y2038/y2038'
+$ git diff -M --stat --summary HEAD^..
+ fs/afs/main.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
+$ git merge borntraeger/linux-next
+Already up-to-date.
+Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
+$ git merge livepatching/for-next
+Auto-merging arch/x86/kernel/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/livepatch/module-elf-format.txt | 20 +++++++--
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/livepatch.c | 65 +++++++++++++++++++++++++++
+ include/linux/livepatch.h | 3 ++
+ kernel/livepatch/core.c | 19 +++++---
+ kernel/module.c | 13 ++++--
+ 6 files changed, 107 insertions(+), 14 deletions(-)
+ create mode 100644 arch/x86/kernel/livepatch.c
+Merging coresight/next (67c52cac0c24 coresight: etm4x: adding configurable start/stop filtering)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (34c7b3ac4ccb rtc: constify rtc_class_ops structures)
+$ git merge rtc/rtc-next
+Removing drivers/rtc/rtc-isl12057.c
+Auto-merging drivers/rtc/Kconfig
+Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/trivial-devices.txt | 1 -
+ .../devicetree/bindings/rtc/dallas,ds1390.txt | 2 +-
+ drivers/rtc/Kconfig | 32 +-
+ drivers/rtc/Makefile | 1 -
+ drivers/rtc/rtc-ac100.c | 2 +
+ drivers/rtc/rtc-at32ap700x.c | 2 +-
+ drivers/rtc/rtc-bq32k.c | 16 +-
+ drivers/rtc/rtc-coh901331.c | 2 +-
+ drivers/rtc/rtc-davinci.c | 2 +-
+ drivers/rtc/rtc-digicolor.c | 2 +-
+ drivers/rtc/rtc-ds1302.c | 2 +-
+ drivers/rtc/rtc-ds1307.c | 54 +-
+ drivers/rtc/rtc-gemini.c | 2 +-
+ drivers/rtc/rtc-isl12057.c | 643 ---------------------
+ drivers/rtc/rtc-jz4740.c | 2 +-
+ drivers/rtc/rtc-mcp795.c | 2 +-
+ drivers/rtc/rtc-mt6397.c | 2 +-
+ drivers/rtc/rtc-nuc900.c | 2 +-
+ drivers/rtc/rtc-omap.c | 2 +-
+ drivers/rtc/rtc-palmas.c | 2 +-
+ drivers/rtc/rtc-pcf2123.c | 5 +-
+ drivers/rtc/rtc-pcf50633.c | 2 +-
+ drivers/rtc/rtc-pic32.c | 1 -
+ drivers/rtc/rtc-rx6110.c | 3 +-
+ drivers/rtc/rtc-rx8025.c | 2 +-
+ drivers/rtc/rtc-spear.c | 2 +-
+ drivers/rtc/rtc-stmp3xxx.c | 2 +-
+ drivers/rtc/rtc-sysfs.c | 4 +-
+ drivers/rtc/rtc-tegra.c | 2 +-
+ drivers/rtc/rtc-twl.c | 2 +-
+ 30 files changed, 104 insertions(+), 696 deletions(-)
+ delete mode 100644 drivers/rtc/rtc-isl12057.c
+Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
+$ git merge hwspinlock/for-next
+Already up-to-date.
+Merging nvdimm/libnvdimm-for-next (d8d378fa1a0c tools/testing/nvdimm: fix SIGTERM vs hotplug crash)
+$ git merge nvdimm/libnvdimm-for-next
+Already up-to-date.
+Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
+$ git merge dax-misc/dax-misc
+Already up-to-date.
+Merging akpm-current/current (c9e6ea80baf2 ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
+$ git merge --no-ff akpm-current/current
+Auto-merging sound/soc/intel/skylake/skl-sst-ipc.c
+Auto-merging mm/page_alloc.c
+Auto-merging kernel/workqueue.c
+Auto-merging kernel/fork.c
+Auto-merging init/main.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/random.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/cpu.h
+Auto-merging fs/proc/base.c
+Auto-merging drivers/tty/serial/sc16is7xx.c
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/char/random.c
+Auto-merging arch/xtensa/kernel/vmlinux.lds.S
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/include/asm/smp.h
+Auto-merging arch/powerpc/kernel/Makefile
+Auto-merging arch/mips/cavium-octeon/setup.c
+Auto-merging arch/arm64/kernel/vmlinux.lds.S
+Auto-merging arch/arm/kernel/smp.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-attributes.txt | 17 +
+ Documentation/RCU/lockdep-splat.txt | 2 +-
+ .../filesystems/autofs4-mount-control.txt | 71 ++-
+ Documentation/filesystems/autofs4.txt | 8 +-
+ Documentation/kernel-parameters.txt | 4 +
+ Kbuild | 12 +-
+ arch/alpha/kernel/vmlinux.lds.S | 1 +
+ arch/arc/kernel/vmlinux.lds.S | 1 +
+ arch/arm/include/asm/irq.h | 5 +-
+ arch/arm/include/asm/page.h | 2 +
+ arch/arm/kernel/process.c | 3 +-
+ arch/arm/kernel/smp.c | 13 +-
+ arch/arm/kernel/vmlinux-xip.lds.S | 1 +
+ arch/arm/kernel/vmlinux.lds.S | 1 +
+ arch/arm64/kernel/process.c | 8 +-
+ arch/arm64/kernel/vmlinux.lds.S | 1 +
+ arch/avr32/kernel/vmlinux.lds.S | 1 +
+ arch/blackfin/kernel/vmlinux.lds.S | 1 +
+ arch/c6x/kernel/vmlinux.lds.S | 1 +
+ arch/cris/kernel/vmlinux.lds.S | 1 +
+ arch/frv/kernel/vmlinux.lds.S | 1 +
+ arch/h8300/kernel/vmlinux.lds.S | 1 +
+ arch/hexagon/kernel/vmlinux.lds.S | 1 +
+ arch/ia64/kernel/Makefile | 8 +-
+ arch/ia64/kernel/vmlinux.lds.S | 1 +
+ arch/m32r/kernel/vmlinux.lds.S | 1 +
+ arch/m68k/kernel/vmlinux-nommu.lds | 1 +
+ arch/m68k/kernel/vmlinux-std.lds | 1 +
+ arch/m68k/kernel/vmlinux-sun3.lds | 1 +
+ arch/metag/kernel/vmlinux.lds.S | 1 +
+ arch/microblaze/kernel/vmlinux.lds.S | 1 +
+ arch/mips/cavium-octeon/setup.c | 14 +
+ arch/mips/include/asm/irq.h | 5 +-
+ arch/mips/include/asm/kexec.h | 1 +
+ arch/mips/kernel/crash.c | 18 +-
+ arch/mips/kernel/machine_kexec.c | 1 +
+ arch/mips/kernel/process.c | 11 +-
+ arch/mips/kernel/vmlinux.lds.S | 1 +
+ arch/mn10300/kernel/vmlinux.lds.S | 1 +
+ arch/nios2/kernel/vmlinux.lds.S | 1 +
+ arch/openrisc/kernel/vmlinux.lds.S | 1 +
+ arch/parisc/kernel/vmlinux.lds.S | 1 +
+ arch/powerpc/Kconfig | 15 +-
+ arch/powerpc/Makefile | 4 +
+ arch/powerpc/boot/string.S | 67 ++-
+ arch/powerpc/configs/powernv_defconfig | 2 +
+ arch/powerpc/configs/ppc64_defconfig | 2 +
+ arch/powerpc/configs/pseries_defconfig | 2 +
+ arch/powerpc/include/asm/debug.h | 2 +-
+ arch/powerpc/include/asm/elf_util.h | 92 +++
+ arch/powerpc/include/asm/kexec.h | 24 +-
+ arch/powerpc/include/asm/kexec_elf_64.h | 10 +
+ arch/powerpc/include/asm/machdep.h | 4 +-
+ arch/powerpc/include/asm/mmzone.h | 3 +
+ arch/powerpc/include/asm/module.h | 14 +-
+ arch/powerpc/include/asm/smp.h | 2 +-
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/powerpc/kernel/Makefile | 11 +-
+ arch/powerpc/kernel/elf_util.c | 476 +++++++++++++++
+ arch/powerpc/kernel/elf_util_64.c | 376 ++++++++++++
+ arch/powerpc/kernel/fadump.c | 5 +
+ arch/powerpc/kernel/head_64.S | 2 +-
+ arch/powerpc/kernel/iommu.c | 6 +-
+ arch/powerpc/kernel/kexec_elf_64.c | 282 +++++++++
+ arch/powerpc/kernel/machine_kexec_64.c | 660 +++++++++++++++++++++
+ arch/powerpc/kernel/misc_32.S | 2 +-
+ arch/powerpc/kernel/misc_64.S | 6 +-
+ arch/powerpc/kernel/module_64.c | 329 ++--------
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 4 +-
+ arch/powerpc/kernel/smp.c | 6 +-
+ arch/powerpc/kernel/traps.c | 2 +-
+ arch/powerpc/kernel/vmlinux.lds.S | 1 +
+ arch/powerpc/platforms/85xx/corenet_generic.c | 2 +-
+ arch/powerpc/platforms/85xx/smp.c | 8 +-
+ arch/powerpc/platforms/cell/spu_base.c | 2 +-
+ arch/powerpc/platforms/powernv/setup.c | 6 +-
+ arch/powerpc/platforms/ps3/setup.c | 4 +-
+ arch/powerpc/platforms/pseries/Makefile | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +-
+ arch/powerpc/purgatory/.gitignore | 2 +
+ arch/powerpc/purgatory/Makefile | 46 ++
+ arch/powerpc/purgatory/console-ppc64.c | 38 ++
+ arch/powerpc/purgatory/crashdump-ppc64.h | 42 ++
+ arch/powerpc/purgatory/crashdump_backup.c | 36 ++
+ arch/powerpc/purgatory/crtsavres.S | 5 +
+ arch/powerpc/purgatory/hvCall.S | 27 +
+ arch/powerpc/purgatory/hvCall.h | 8 +
+ arch/powerpc/purgatory/kexec-sha256.h | 11 +
+ arch/powerpc/purgatory/ppc64_asm.h | 20 +
+ arch/powerpc/purgatory/printf.c | 164 +++++
+ arch/powerpc/purgatory/purgatory-ppc64.c | 41 ++
+ arch/powerpc/purgatory/purgatory-ppc64.h | 6 +
+ arch/powerpc/purgatory/purgatory.c | 62 ++
+ arch/powerpc/purgatory/purgatory.h | 11 +
+ arch/powerpc/purgatory/sha256.c | 6 +
+ arch/powerpc/purgatory/sha256.h | 1 +
+ arch/powerpc/purgatory/string.S | 2 +
+ arch/powerpc/purgatory/v2wrap.S | 134 +++++
+ arch/s390/kernel/compat_linux.c | 4 +-
+ arch/s390/kernel/vmlinux.lds.S | 1 +
+ arch/score/kernel/vmlinux.lds.S | 1 +
+ arch/sh/kernel/vmlinux.lds.S | 1 +
+ arch/sparc/include/asm/irq_64.h | 5 +-
+ arch/sparc/kernel/process_64.c | 10 +-
+ arch/sparc/kernel/vmlinux.lds.S | 1 +
+ arch/tile/include/asm/irq.h | 5 +-
+ arch/tile/kernel/entry.S | 2 +-
+ arch/tile/kernel/pmc.c | 3 -
+ arch/tile/kernel/process.c | 73 +--
+ arch/tile/kernel/traps.c | 9 +-
+ arch/tile/kernel/vmlinux.lds.S | 1 +
+ arch/tile/mm/mmap.c | 3 +-
+ arch/um/Makefile | 2 +-
+ arch/um/kernel/dyn.lds.S | 1 +
+ arch/um/kernel/uml.lds.S | 1 +
+ arch/unicore32/kernel/process.c | 3 +-
+ arch/unicore32/kernel/vmlinux.lds.S | 1 +
+ arch/x86/include/asm/irq.h | 5 +-
+ arch/x86/include/asm/irqflags.h | 12 +-
+ arch/x86/include/asm/kexec.h | 1 +
+ arch/x86/include/asm/smp.h | 1 +
+ arch/x86/kernel/acpi/cstate.c | 2 +-
+ arch/x86/kernel/apic/hw_nmi.c | 18 +-
+ arch/x86/kernel/crash.c | 59 +-
+ arch/x86/kernel/e820.c | 2 +-
+ arch/x86/kernel/kexec-bzimage64.c | 48 +-
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/kernel/process.c | 7 +-
+ arch/x86/kernel/smp.c | 5 +
+ arch/x86/kernel/sys_x86_64.c | 5 +-
+ arch/x86/kernel/vmlinux.lds.S | 1 +
+ arch/x86/kvm/i8254.c | 14 +-
+ arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +-
+ arch/x86/um/user-offsets.c | 4 +-
+ arch/xtensa/kernel/vmlinux.lds.S | 3 +
+ block/genhd.c | 2 +-
+ crypto/crypto_engine.c | 16 +-
+ drivers/acpi/processor_idle.c | 5 +-
+ drivers/block/loop.c | 8 +-
+ drivers/char/random.c | 36 +-
+ drivers/cpuidle/driver.c | 5 +-
+ drivers/idle/intel_idle.c | 4 +-
+ drivers/infiniband/sw/rdmavt/cq.c | 10 +-
+ drivers/md/dm-rq.c | 6 +-
+ drivers/md/dm.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 6 +-
+ drivers/media/pci/ivtv/ivtv-irq.c | 2 +-
+ drivers/net/ethernet/microchip/encx24j600.c | 10 +-
+ drivers/nvme/host/pci.c | 3 +-
+ drivers/of/base.c | 2 +
+ drivers/rapidio/rio_cm.c | 15 +-
+ drivers/spi/spi.c | 18 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +-
+ drivers/tty/serial/sc16is7xx.c | 22 +-
+ fs/autofs4/autofs_i.h | 9 +-
+ fs/autofs4/dev-ioctl.c | 77 ++-
+ fs/autofs4/inode.c | 45 +-
+ fs/autofs4/root.c | 4 +-
+ fs/compat.c | 14 -
+ fs/dax.c | 2 +-
+ fs/ext2/file.c | 1 +
+ fs/ext4/file.c | 1 +
+ fs/nfsd/auth.c | 6 +-
+ fs/nfsd/nfs4state.c | 2 +-
+ fs/ocfs2/cluster/tcp.c | 2 +-
+ fs/ocfs2/dlm/dlmdomain.c | 2 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 2 +-
+ fs/ocfs2/super.c | 2 +-
+ fs/pipe.c | 166 +++---
+ fs/proc/array.c | 189 +++---
+ fs/proc/base.c | 52 +-
+ fs/proc/meminfo.c | 211 +++----
+ fs/proc/stat.c | 49 +-
+ fs/proc/task_mmu.c | 2 +-
+ fs/seq_file.c | 57 +-
+ fs/xfs/xfs_file.c | 1 +
+ include/asm-generic/vmlinux.lds.h | 6 +
+ include/linux/auto_dev-ioctl.h | 211 +------
+ include/linux/auto_fs.h | 1 -
+ include/linux/bitops.h | 36 +-
+ include/linux/bootmem.h | 9 +-
+ include/linux/compaction.h | 39 +-
+ include/linux/compat.h | 1 -
+ include/linux/console.h | 6 +
+ include/linux/cpu.h | 5 +
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/cred.h | 11 +-
+ include/linux/ctype.h | 5 +-
+ include/linux/dma-mapping.h | 5 +
+ include/linux/huge_mm.h | 15 +-
+ include/linux/ima.h | 12 +
+ include/linux/kbuild.h | 2 +-
+ include/linux/kernel.h | 48 +-
+ include/linux/kexec.h | 76 ++-
+ include/linux/kthread.h | 88 ++-
+ include/linux/memblock.h | 1 +
+ include/linux/memcontrol.h | 15 +
+ include/linux/mm.h | 9 +-
+ include/linux/mm_types.h | 2 -
+ include/linux/nmi.h | 31 +-
+ include/linux/oom.h | 46 +-
+ include/linux/page_ext.h | 8 +-
+ include/linux/page_owner.h | 2 +
+ include/linux/pagemap.h | 14 +
+ include/linux/radix-tree.h | 8 +
+ include/linux/random.h | 2 +-
+ include/linux/relay.h | 17 +-
+ include/linux/sched.h | 22 +-
+ include/linux/sem.h | 1 +
+ include/linux/seq_file.h | 4 +-
+ include/linux/swap.h | 11 +-
+ include/linux/writeback.h | 1 -
+ include/trace/events/compaction.h | 2 +-
+ include/trace/events/zsmalloc.h | 76 +++
+ include/uapi/linux/auto_dev-ioctl.h | 221 +++++++
+ include/uapi/linux/auto_fs.h | 1 +
+ init/main.c | 4 +
+ ipc/msg.c | 211 ++++---
+ ipc/sem.c | 138 +++--
+ kernel/configs/android-base.config | 1 -
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 8 +
+ kernel/groups.c | 67 +--
+ kernel/kexec_core.c | 98 +++
+ kernel/kexec_file.c | 226 ++++---
+ kernel/kexec_internal.h | 16 -
+ kernel/kthread.c | 577 +++++++++++++++---
+ kernel/panic.c | 47 +-
+ kernel/power/process.c | 17 +-
+ kernel/printk/printk.c | 13 +-
+ kernel/relay.c | 74 ++-
+ kernel/sched/idle.c | 13 +-
+ kernel/smpboot.c | 5 +
+ kernel/sysctl.c | 10 -
+ kernel/uid16.c | 4 +-
+ kernel/watchdog.c | 1 -
+ kernel/workqueue.c | 2 +-
+ lib/Kconfig | 7 +
+ lib/Makefile | 1 +
+ lib/crc64_ecma.c | 341 +++++++++++
+ lib/kstrtox.c | 6 +-
+ lib/nmi_backtrace.c | 42 +-
+ lib/stackdepot.c | 6 +
+ lib/strncpy_from_user.c | 2 +
+ mm/bootmem.c | 14 +-
+ mm/compaction.c | 154 +++--
+ mm/filemap.c | 4 +-
+ mm/huge_memory.c | 79 ++-
+ mm/internal.h | 2 +-
+ mm/memblock.c | 5 +
+ mm/memcontrol.c | 120 ++--
+ mm/memory.c | 13 +
+ mm/mempolicy.c | 2 +-
+ mm/mlock.c | 50 ++
+ mm/nobootmem.c | 10 +-
+ mm/oom_kill.c | 362 ++++++-----
+ mm/page-writeback.c | 34 +-
+ mm/page_alloc.c | 169 +++---
+ mm/page_ext.c | 45 +-
+ mm/page_owner.c | 158 ++++-
+ mm/slab.c | 43 +-
+ mm/slab.h | 1 +
+ mm/swap.c | 4 +-
+ mm/swap_state.c | 6 +-
+ mm/swapfile.c | 133 ++---
+ mm/vmacache.c | 8 +-
+ mm/vmalloc.c | 8 +-
+ mm/vmscan.c | 53 +-
+ mm/vmstat.c | 95 +--
+ mm/zsmalloc.c | 27 +-
+ net/ipv4/ping.c | 15 +-
+ net/sunrpc/auth_generic.c | 4 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.c | 2 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
+ net/sunrpc/auth_unix.c | 4 +-
+ net/sunrpc/svcauth_unix.c | 6 +-
+ scripts/checkpatch.pl | 216 ++++---
+ scripts/const_structs.checkpatch | 64 ++
+ scripts/mod/Makefile | 11 +-
+ scripts/mod/modpost.c | 2 +-
+ scripts/recordmcount.c | 1 +
+ scripts/recordmcount.pl | 1 +
+ scripts/spelling.txt | 1 -
+ security/integrity/ima/Kconfig | 12 +
+ security/integrity/ima/Makefile | 1 +
+ security/integrity/ima/ima.h | 28 +
+ security/integrity/ima/ima_crypto.c | 6 +-
+ security/integrity/ima/ima_fs.c | 30 +-
+ security/integrity/ima/ima_init.c | 2 +
+ security/integrity/ima/ima_kexec.c | 201 +++++++
+ security/integrity/ima/ima_main.c | 1 +
+ security/integrity/ima/ima_queue.c | 72 ++-
+ security/integrity/ima/ima_template.c | 289 ++++++++-
+ security/integrity/ima/ima_template_lib.c | 6 +-
+ sound/soc/intel/baytrail/sst-baytrail-ipc.c | 2 +-
+ sound/soc/intel/common/sst-ipc.c | 6 +-
+ sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +-
+ sound/soc/intel/skylake/skl-sst-ipc.c | 2 +-
+ tools/testing/radix-tree/Makefile | 3 +-
+ tools/testing/radix-tree/iteration_check.c | 180 ++++++
+ tools/testing/radix-tree/main.c | 1 +
+ tools/testing/radix-tree/regression1.c | 2 +-
+ tools/testing/radix-tree/test.h | 1 +
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 4 +
+ tools/testing/selftests/vm/mlock-intersect-test.c | 76 +++
+ tools/testing/selftests/vm/mlock2-tests.c | 21 +-
+ tools/testing/selftests/vm/mlock2.h | 20 +
+ 311 files changed, 7871 insertions(+), 2814 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/elf_util.h
+ create mode 100644 arch/powerpc/include/asm/kexec_elf_64.h
+ create mode 100644 arch/powerpc/kernel/elf_util.c
+ create mode 100644 arch/powerpc/kernel/elf_util_64.c
+ create mode 100644 arch/powerpc/kernel/kexec_elf_64.c
+ create mode 100644 arch/powerpc/purgatory/.gitignore
+ create mode 100644 arch/powerpc/purgatory/Makefile
+ create mode 100644 arch/powerpc/purgatory/console-ppc64.c
+ create mode 100644 arch/powerpc/purgatory/crashdump-ppc64.h
+ create mode 100644 arch/powerpc/purgatory/crashdump_backup.c
+ create mode 100644 arch/powerpc/purgatory/crtsavres.S
+ create mode 100644 arch/powerpc/purgatory/hvCall.S
+ create mode 100644 arch/powerpc/purgatory/hvCall.h
+ create mode 100644 arch/powerpc/purgatory/kexec-sha256.h
+ create mode 100644 arch/powerpc/purgatory/ppc64_asm.h
+ create mode 100644 arch/powerpc/purgatory/printf.c
+ create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.c
+ create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.h
+ create mode 100644 arch/powerpc/purgatory/purgatory.c
+ create mode 100644 arch/powerpc/purgatory/purgatory.h
+ create mode 100644 arch/powerpc/purgatory/sha256.c
+ create mode 100644 arch/powerpc/purgatory/sha256.h
+ create mode 100644 arch/powerpc/purgatory/string.S
+ create mode 100644 arch/powerpc/purgatory/v2wrap.S
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/trace/events/zsmalloc.h
+ create mode 100644 include/uapi/linux/auto_dev-ioctl.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 scripts/const_structs.checkpatch
+ create mode 100644 security/integrity/ima/ima_kexec.c
+ create mode 100644 tools/testing/radix-tree/iteration_check.c
+ create mode 100644 tools/testing/selftests/vm/mlock-intersect-test.c
+ create mode 100644 tools/testing/selftests/vm/mlock2.h
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
+Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
+Applying: kdump, vmcoreinfo: report memory sections virtual addresses
+Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
+Applying: scripts/tags.sh: enable code completion in VIM
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 8282b5778402...f94dd2b6ac4f akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (f94dd2b6ac4f scripts/tags.sh: enable code completion in VIM)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kmemleak.rst | 9 +++++
+ arch/x86/kernel/machine_kexec_64.c | 3 ++
+ drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-
+ include/linux/kexec.h | 6 ++++
+ include/linux/kmemleak.h | 18 ++++++++++
+ include/linux/mlx5/device.h | 2 --
+ mm/bootmem.c | 6 ++--
+ mm/cma.c | 2 +-
+ mm/kmemleak.c | 47 ++++++++++++++++++++++++++
+ mm/memblock.c | 8 ++---
+ mm/nobootmem.c | 2 +-
+ scripts/tags.sh | 3 +-
+ 12 files changed, 95 insertions(+), 14 deletions(-)
+$ git am -3 ../patches/0001-disable-KEXEC_FILE-on-powerpc-for-now.patch
+Applying: disable KEXEC_FILE on powerpc for now
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..6779ea062b4d
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,4 @@
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..1193794f41db
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20160905