summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Next/SHA1s254
-rw-r--r--Next/Trees256
-rw-r--r--Next/merge.log8750
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 9265 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..c689daa91fb9
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,254 @@
+Name SHA1
+---- ----
+origin 0263d4ebd94b36280608e296cba39b924b6e832b
+fixes 30066ce675d3af350bc5a53858991c0b518dda00
+kbuild-current c7858bf16c0b2cc62f475f31e6df28c3a68da1d6
+arc-current 7a308bb3016f57e5be11a677d15b821536419d36
+arm-current 90f92c631b210c1e97080b53a9d863783281a932
+m68k-current ad595b77c4a8553516a5d76c9ecf68a0ff13960e
+metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218
+powerpc-fixes 178f358208ceb8b38e5cff3f815e0db4a6a70a07
+sparc 5d0e7705774dd412a465896d08d59a81a345c1e4
+fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net ec221a17a638dec4d9b0ba3e5817113f249dd194
+ipsec 4e5da369df64628358e25ffedcf80ac43af3793d
+netfilter e5072053b09642b8ff417d47da05b84720aea3ee
+ipvs 045169816b31b10faed984b01c390db1b32ee4c1
+wireless-drivers bd19b5ab1da654de456e102250822ec06311d6ad
+mac80211 115865fa0826ed18ca04717cf72d0fe874c0fe7f
+sound-current 6cf4569ce3561dec560147e6051959d6896b23d1
+pci-current ea2a7fb1209332c5b5022d7f8b10cdacb8e4f2ab
+driver-core.current 49def1853334396f948dcb4cedb9347abb318df5
+tty.current 49def1853334396f948dcb4cedb9347abb318df5
+usb.current 488dc164914ff5ce5e913abd32048d28fc0d06b8
+usb-gadget-fixes efe357f4633a12ca89bdf9bbdd8aaf5a7a0cc3c0
+usb-serial-fixes 5d03a2fd2292e71936c4235885c35ccc3c94695b
+usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9
+phy 7ce7d89f48834cefece7804d38fc5d85382edf77
+staging.current 9579c4dc21292f375715d7acca439dac9855b3e9
+char-misc.current 49def1853334396f948dcb4cedb9347abb318df5
+input-current 3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c
+crypto-current 11e3b725cfc282efe9d4a354153e99d86a16af08
+ide da095587e6be858efd41490762cb952dffd6107a
+vfio-fixes 94a6fa899d2cb5ee76933406df32996576a562e4
+kselftest-fixes 7738789fba09108a28a5fb4739595d9a0a2f85fe
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29
+drm-intel-fixes 3bfdfdcbce2796ce75bf2d85fd8471858d702e5d
+drm-misc-fixes 7e9081c5aac73b8a0bc22e0b3e7a12c3e9cf5256
+kbuild fde42bfcd232fb1a46d844dbf486cb67cb910004
+asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c
+arc e5517c2a5a49ed5e99047008629f1cd60246ea0e
+arm 01c4a81b2c85cc1d8d14fe8705e397419cc3c47b
+arm-perf 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+arm-soc 73f9e92ed3d0673f1f26bdb41ffe73b331400475
+amlogic 61e787270fde25fc09147cbb070fc42fd5933191
+aspeed ab15e12960f12f8f9236c2d66c52fac8505f430c
+at91 3d928ca854123c7947859cb9b20ee85565344bbf
+bcm2835 8d6e1b09237b5773670b9dc43101a08fe0b6c07c
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs 1393f73bb898f2f15bdf47a6f48983d49aca9fb1
+keystone 9e07c85a01ec662fb1c2f0386a3bd11c17222a07
+mvebu cdc8c5c16f57f39cc0869d4cbe352c1b9a481bc4
+omap 618fc1a367cd60fa240361c283fb3dc68ba905f3
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+qcom 73cb27cef98f2867b2ff086e457fd047d95c2daf
+renesas b4f907b341801f949581d451a582debf89eb183b
+rockchip 0aab64671debcff285ecdf23ef4b316ad2a185c1
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 1001354ca34179f3db924eb66672442a173147dc
+samsung-krzk 4a8144f4d4702fe3ba24a57718433621d595043a
+tegra e8d16d40e269e187000fd543c3b4ca651cbcf967
+arm64 829d2bd1339220b742e5e61a5f1975eb6f74cad3
+clk 8076e04441f27ca8ca739b6c1847761a26e8d643
+blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33
+c6x ca3060d39ae7a0964f8c123a4833029981e86476
+cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k ad595b77c4a8553516a5d76c9ecf68a0ff13960e
+m68knommu d25c164fc0be3f6547ceb726389f9477f5d2fa2d
+metag f5d163aad31e4ec30f7258e655503824a2b03d45
+microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3
+mips 1d02d4bb23cc3b0a17791f4aac69c8b4c5699e60
+nios2 744606c76c4a3a73eb34d21f265013426426c4b5
+openrisc 5de769bbfdfcb53ef0dfdfcd5aa5d9e2459c5b8e
+parisc-hd 69973b830859bc6529a7a0468ba0d80ee5117826
+powerpc 7ce7d89f48834cefece7804d38fc5d85382edf77
+fsl baae856ebdeeaefbadd4a02cdb54b7c2277ff4dd
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 9437964885f84cd0c584e2d30ffbf7a5a84b77e4
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+sh e61c10e468a42512f5fad74c00b62af5cc19f65f
+tile 14e73e78ee982710292248536aa84cba41e974f4
+uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725
+unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa 30b507051dd1f79bbedce79cb37dc0ef31f5fb6c
+fscrypt a5d431eff2e0bb22156897435aa277ddc96074f7
+befs f7b75aaed5ef07cb8d70d964291877bf02181360
+btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave 640764eb528baecc94f5a04ec417537f7134cf04
+ceph 6df8c9d80a27cb587f61b4f06b57e248d8bc3f86
+cifs 81ddd8c0c5e1cb41184d66567140cb48c53eb3d1
+configfs e16769d4bca67218531505ad1a8365d227fedcf9
+ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3 70f16cef06b5bf72d50b8016e1188995eddc073a
+ext4 2b3864b32403c2d8e4e90c72aaafcf6493f0e9ee
+f2fs 888a724d144e400c3b4ea12a920d5dd1a9c6b1f6
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 210675270caa33253e4c33f3c5e657e7d6060812
+gfs2 b63f5e84826b3e1ae81e051a6a7c5a94b657aecb
+jfs 362ad5d58e9ae54d15abbe4822e626be907308fe
+nfs c929ea0b910355e1876c64431f3d5802f95b3d75
+nfsd 42e24662a806ca47a6692ec39029294b3528cc0c
+orangefs 04102c76a779f1c4cec4f0fb51cacc360117b522
+overlayfs 4c7d0c9cb713a28b133b265d595de2a93ee09712
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 1cb51a15b576ee325d527726afff40947218fd5e
+xfs 83d230eb5c638949350f4761acdfc0af5cb1bc00
+file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+vfs 59479ae85e43a364d3380f82b1ddd8d04d13bd31
+vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos b12826c5188e1a964a64eedd37a537dc202d6bb8
+printk 0e91b77060387275b6762c6688e3bddd1b808e2c
+pci 83a96ebd0efaf79538645c60c3939758a66be646
+pstore 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+hid 8098418ae7c3dfdbc764c096d20abed0e95dc748
+i2c 701dc207bf551d9fe6defa36e84a911e880398c3
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+hwmon-staging 2c72fa4f58822c8b60226351a21fec2fe9605729
+jc_docs 43d8808b0820df056e7cfc7cc374d5a20fd37546
+v4l-dvb 5dd2470bfddb0c27ee24bd9cc7340b88e67029c5
+fbdev a0a74270efaa1f312bfe579ae13dfd55222d7b5b
+pm 10e335ed42b3ef47273a48e9b165c437e51b0de1
+idle 306899f94804aece6d8fa8b4223ede3b48dbb59c
+thermal e4004621061fe846adbe7ea68d2dc5ccb2a729c6
+thermal-soc 4f47aff5201c018408f197d2ff43283a451f0547
+ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm aa9f1012858bc7f44368f1e4453c989d873b0860
+swiotlb f1225ee4c8fcf09afaa199b8b1f0450f38b8cd11
+net-next 264e6777f958d2b7b05619c65f89a1eaf5b4709e
+ipsec-next eb758c8864d49f5786432ce38fd8a72bdbbd10cf
+netfilter-next 1a28ad74ebd8f9d3c7eae0d781f72a6d30545e17
+ipvs-next 8d8e20e2d7bba8c50e64e0eca1cb83956f468e49
+wireless-drivers-next 106e0deca1ac6ac627a10617fe77a95200cb01a7
+bluetooth 0e40f4c9593ba2c7c30150ed669da97bd581c0cd
+mac80211-next 1331b62c97217459780e040e8a66bb609f2acd20
+rdma 5c37077fd025c0fa3aa3ab2e6b607d653a4fc604
+rdma-leon f3cbb454fed0ea842a4184805bc4fa7136183e3f
+rdma-leon-test a909d3e636995ba7c349e2ca5dbb528154d4ac30
+mtd 5bdee5496978c6738dd90869b54c0f30c0344ccf
+l2-mtd 5bdee5496978c6738dd90869b54c0f30c0344ccf
+nand 9018bf842d4ed09cf5745693f6b78861d7ebe239
+crypto 7dede913fc2ab9c0d3bff3a49e26fa9e858b0c13
+drm 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897
+drm-panel 327bc443416d5aeb37e27704b2d91d2f86b8c621
+drm-intel b976dc53ec43da887fb5731f2f7e1f770cec6074
+drm-tegra 585ee0f27ef7b8db46807b960388b7e58b60766d
+drm-misc 442ffefc0c3f6fa854dbda2e2d5e15473ad8f5a6
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm 2401a008461481387741bacf7318d13af2c2055f
+hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec
+mali-dp 95cc3a9501ffcfa49e9c4e9bbc4d0c0b8cea6989
+sunxi 9181f40cede22bff9bc7f26830a4562373f30d73
+kspp e9569a422c271d2448055015e683319079023335
+kconfig 5bcba792bb304e8341217d759ec486969a3b4258
+regmap bbbed19517040c8940e4fa49d399ccd049b0551b
+sound 9eb5d0e635ebe2f227d591e531d48c6f01c0dd78
+sound-asoc 64240ade1b71a5020eba597bcf3cbac8b3a77ad4
+modules 2fc42a1bbbc4ada8469a3076676d2422b3250bda
+input f719315b52b56c34d31c51c1926cea33a89cc9af
+block 79f6d4b7158020d232d11cfc9a7960bc716c62d6
+lightnvm fa3742367ee50ad021391d13681f16d753dd789d
+device-mapper ef548c551e72dbbdcc6d9ed7c7b3b01083fea8e2
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc 2ed14a2aac8a1db5b5fbc05e1c7f69f88548341b
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md c8fdae2770397976b9829c2ba11e4ad8de874b3c
+mfd 666114db60a6ec4fc398d24f08d990c0f5476dec
+backlight 0c9501f823a40a061f755d3789c4705c9fe85f14
+battery a1b94355ea3fde5e13db7ff37c0272fcde4e29b2
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator 1f57ef5dc717006efa39d95cadad8306d0422be6
+security c659af78eb7b7d7be40f23d9d97bde58eb1368ac
+integrity 07a77aadc4e8d1b51abd9043a39e79cef4aeac05
+keys ed51e44e914c634bfd8435037474ebb0b47db956
+selinux 3a2f5a59a695a73e0cde9a61e0feae5fa730e936
+tpmdd c659af78eb7b7d7be40f23d9d97bde58eb1368ac
+watchdog 7ce7d89f48834cefece7804d38fc5d85382edf77
+iommu fce794089d6007b38651aceb75aa484c8577db29
+dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio 2b8bb1d771f736b8b34bf160115aee1b12d29f83
+trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff
+audit 62bc306e2083436675e33b5bdeb6a77907d35971
+devicetree a51741ebe1315c88488ed35f942e95f427ea2d31
+mailbox db4d22c07e3e652eeec82abcc1399e6305edd838
+spi e38103cebb339c57bf45f563be7d381ebdfbdcbd
+tip 4929143ff1e2403571ea383a171c34efe433c530
+clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3
+edac 9cae24b7b113cf6da0ccb3aa0d862daec9f3d9e7
+edac-amd 127c1225bf89764976f80e6a0afb4e26df33c2f2
+irqchip 88e20c74ee020f9e0c99dfce0dd9aa61c3f0cca0
+ftrace b9b0c831bed2682c2e3e9f5420fb6985549ef020
+rcu 8f28ec9a33d73692cf5dd4fb3d51593e00b7aab6
+kvm a17f32270af1e1054bbc8858b0f27226a2c859ba
+kvm-arm 21cbe3cc8a48ff17059912e019fbde28ed54745a
+kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+kvm-ppc e34af7849014f1d80899b811cf9021588cb8dd88
+kvms390 f97017a64449c310fcb2fb4a2fdbe87e7c533a76
+xen-tip da72ff5bfcb02c6ac8b169a7cf597a3c8e6c4de1
+percpu aaf0f2fa682861e47a4f6a8762d2b8a9a4a51077
+workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51
+drivers-x86 7b81271210d86bcc41c12090cfe0c59a6047af79
+chrome-platform 31b764171cb545cc1f750c573eef713329936660
+hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
+leds 4e552c8cb5bc9137e67e035bab8df6dddbca7384
+ipmi c5afee1b0dfc0652dea72404ffd55fd15b61b61e
+driver-core 64e90a8acb8590c2468c919f803652f081e3a4bf
+tty aa75941ca1de08e876ec21f7eaf390a5de62519f
+usb afa197e3cb240fdd6194dd4c8545cdd45c82770e
+usb-gadget 591c8004dd43b98dec124ba5b1e3e03f0783bb10
+usb-serial 2eee05020a0e7ee7c04422cbacdb07859e45dce6
+usb-chipidea-next 30a9566a4f6071ef159f83e18f8c15a66ee08c2d
+phy-next a8df2768c2ed38eb7da0f24f50a0e105f0ff7665
+staging 1c5fa1c7dbff0b9abc87730cd06bcdb29c9e0589
+char-misc 8e27a236312c4ab6dc8dbd303552b771d3569cf1
+extcon 4fcf37fb7dae07b62349f20bab11891c9f13b155
+slave-dma 7919f00e4fdfeaad6f357af4e7e38aa9add33097
+cgroup e055b0e58d99e2b5d3de6919de22987e97f2e758
+scsi b32d9f752e17a53c38ab5227110a194cb27f4007
+scsi-mkp 13c599069130e5a1f04a9409d65566e149b12708
+target-updates 291e3e51a34d2f546608bfd31f185151621135b7
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+target-bva 300af14bdb28157090f0c6f89d244fda940082da
+libata 428d57c1683acf19d27db7b426292983c64d99ed
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost ec4537a7d64fddf0e2a20ccb1b6b57333682a114
+rpmsg 5956dd81ac182d67b3d103089be92367a6729d26
+gpio ffd6ce2f3b2079b8d65e7eaf34b7c39422cb920f
+pinctrl 2a15343f1e82f2edd578745493f6c0f1a0797d9a
+dma-mapping 1001354ca34179f3db924eb66672442a173147dc
+pwm e52d5f1c5221494cf5096917f5737809ce3c4aea
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns 68eb94f16227336a5773b83ecfa8290f1d6b78ce
+ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613
+aio b562e44f507e863c6792946e4e1b1449fbbac85d
+kselftest 1e4c2830c36914feb7d03916e21f7c2e45dc2055
+y2038 69973b830859bc6529a7a0468ba0d80ee5117826
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d
+livepatching 372e2db7210df7c45ead46429aeb1443ba148060
+coresight 7f12a0d4a6749c632ed010aacfebf5ef1f322f12
+rtc 21da8ba5b665a7a36addf259d9e5a5b3a5043211
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm 1f19b983a8877f81763fab3e693c6befe212736d
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+extable 586270614c586b790f5061cad1df0081a4b59e53
+akpm-current ab81b9a880b476be79468852b9e73917eebceae3
+akpm 2361296903e97c64e7d06035528fb8febdc7c2b5
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..0d3b54a53587
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,256 @@
+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
+fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent
+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
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next
+bcm2835 git git://github.com/anholt/linux.git#for-next
+berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next
+cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mvebu git git://git.infradead.org/linux-mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next
+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
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+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
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next
+mpc5xxx git git://git.denx.de/linux-denx-agust.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+sh git git://git.libc.org/linux-sh#for-next
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+unicore32 git git://github.com/gxt/linux.git#unicore32
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master
+befs git git://github.com/luisbg/linux-befs.git#for-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next
+fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+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/fs/xfs/xfs-linux.git#for-next
+file-locks git git://git.samba.org/jlayton/linux.git#linux-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs
+vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
+dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master
+fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+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/drm-misc#for-linux-next
+drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next
+drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next
+hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd
+mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/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/jeyu/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+selinux git git://git.infradead.org/users/pcmoore/selinux#next
+tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+vfio git git://github.com/awilliam/linux-vfio.git#next
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit git git://git.infradead.org/users/pcmoore/audit#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next
+kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/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
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#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
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge
+target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next
+binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://github.com/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+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
+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
+extable git git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git#extable
+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..fdc80ae50b09
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,8750 @@
+$ date -R
+Wed, 25 Jan 2017 09:11:02 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at a4685d2f58e2 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
+Merging origin/master (0263d4ebd94b Merge tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86)
+$ git merge origin/master
+Updating a4685d2f58e2..0263d4ebd94b
+Fast-forward
+ MAINTAINERS | 1 +
+ drivers/platform/x86/ideapad-laptop.c | 1 +
+ drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
+ drivers/platform/x86/mlx-platform.c | 2 +-
+ drivers/platform/x86/surface3-wmi.c | 6 ++----
+ kernel/ucount.c | 14 ++++++++------
+ 6 files changed, 14 insertions(+), 12 deletions(-)
+Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (7a308bb3016f Linux 4.10-rc5)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (90f92c631b21 ARM: 8613/1: Fix the uaccess crash on PB11MPCore)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (178f358208ce powerpc: Ignore reserved field in DCSR and PVR reads and writes)
+$ git merge powerpc-fixes/fixes
+Already up-to-date.
+Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/mmu_context_64.h | 8 ++++----
+ arch/sparc/kernel/sstate.c | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
+$ git merge fscrypt-current/for-stable
+Already up-to-date.
+Merging net/master (ec221a17a638 Merge branch 'lwt-module-unload')
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/phy.txt | 5 +-
+ MAINTAINERS | 2 +-
+ drivers/net/can/c_can/c_can_pci.c | 1 +
+ drivers/net/can/ti_hecc.c | 16 ++-
+ drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 +
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 8 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 15 ++-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +
+ drivers/net/ethernet/atheros/alx/main.c | 11 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 2 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 7 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 --
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 88 +++++++--------
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 24 ++--
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/phy/bcm63xx.c | 21 +++-
+ drivers/net/phy/dp83848.c | 3 +
+ drivers/net/phy/marvell.c | 2 +
+ drivers/net/phy/phy.c | 14 ++-
+ drivers/net/tun.c | 2 +-
+ drivers/net/usb/cdc_ether.c | 8 ++
+ drivers/net/usb/qmi_wwan.c | 7 ++
+ drivers/net/usb/r8152.c | 6 +-
+ drivers/net/virtio_net.c | 12 +-
+ drivers/net/vxlan.c | 12 +-
+ drivers/net/xen-netback/interface.c | 6 +-
+ drivers/net/xen-netback/xenbus.c | 13 +++
+ drivers/net/xen-netfront.c | 2 +-
+ include/linux/bpf.h | 2 +
+ include/linux/virtio_net.h | 6 +-
+ include/net/lwtunnel.h | 13 +++
+ kernel/bpf/arraymap.c | 18 ++-
+ kernel/bpf/hashtab.c | 22 ++--
+ kernel/bpf/stackmap.c | 20 ++--
+ kernel/bpf/syscall.c | 26 +++++
+ net/bridge/br_netlink.c | 33 +++---
+ net/core/dev.c | 4 +-
+ net/core/ethtool.c | 2 +-
+ net/core/lwt_bpf.c | 1 +
+ net/core/lwtunnel.c | 66 ++++++++++-
+ net/dsa/slave.c | 6 +-
+ net/ipv4/fib_frontend.c | 8 ++
+ net/ipv4/ip_tunnel_core.c | 2 +
+ net/ipv4/tcp_fastopen.c | 1 +
+ net/ipv6/addrconf.c | 4 +-
+ net/ipv6/ila/ila_lwt.c | 1 +
+ net/ipv6/ip6_gre.c | 3 +
+ net/ipv6/ip6_tunnel.c | 36 ++++--
+ net/ipv6/route.c | 12 +-
+ net/ipv6/seg6.c | 2 +
+ net/ipv6/seg6_iptunnel.c | 1 +
+ net/mac80211/rate.c | 2 -
+ net/mpls/af_mpls.c | 48 ++++----
+ net/mpls/mpls_iptunnel.c | 1 +
+ net/packet/af_packet.c | 4 +-
+ net/tipc/node.c | 9 +-
+ net/tipc/server.c | 48 ++++----
+ net/tipc/subscr.c | 124 ++++++++++++---------
+ net/tipc/subscr.h | 1 +
+ net/unix/af_unix.c | 27 +++--
+ samples/bpf/tc_l2_redirect_kern.c | 1 +
+ samples/bpf/xdp_tx_iptunnel_kern.c | 1 +
+ tools/testing/selftests/bpf/test_lru_map.c | 53 ++++-----
+ 71 files changed, 597 insertions(+), 350 deletions(-)
+Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
+$ git merge ipsec/master
+Already up-to-date.
+Merging netfilter/master (e5072053b096 netfilter: conntrack: refine gc worker heuristics, redux)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ include/net/netfilter/nft_fib.h | 6 +++++
+ include/uapi/linux/netfilter/nf_tables.h | 4 +--
+ net/ipv4/ip_output.c | 1 +
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 ++++-
+ net/ipv4/netfilter/ipt_rpfilter.c | 8 +++---
+ net/ipv4/netfilter/nf_reject_ipv4.c | 2 ++
+ net/ipv4/netfilter/nft_fib_ipv4.c | 15 ++++-------
+ net/ipv6/netfilter/ip6t_rpfilter.c | 8 +++---
+ net/ipv6/netfilter/nf_reject_ipv6.c | 3 +++
+ net/ipv6/netfilter/nft_fib_ipv6.c | 13 +++-------
+ net/ipv6/tcp_ipv6.c | 1 +
+ net/netfilter/Kconfig | 2 +-
+ net/netfilter/nf_conntrack_core.c | 44 +++++++++++++++-----------------
+ net/netfilter/nf_tables_api.c | 5 ++--
+ 14 files changed, 63 insertions(+), 56 deletions(-)
+Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (bd19b5ab1da6 Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/bcma/bcma_private.h | 3 +++
+ drivers/bcma/driver_chipcommon.c | 11 +++--------
+ drivers/bcma/driver_mips.c | 3 +++
+ drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 7 ++++---
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 12 ++++++++----
+ 6 files changed, 22 insertions(+), 16 deletions(-)
+Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (ea2a7fb12093 Revert "PCI: Add runtime PM support for PCIe ports")
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/pci/pcie/portdrv_core.c | 3 ---
+ drivers/pci/pcie/portdrv_pci.c | 43 -----------------------------------------
+ 2 files changed, 46 deletions(-)
+Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (488dc164914f xhci: remove WARN_ON if dma mask is not set for platform devices)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (5d03a2fd2292 USB: serial: option: add device ID for HP lt2523 (Novatel E371))
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/option.c | 1 +
+ drivers/usb/serial/qcserial.c | 1 +
+ 2 files changed, 2 insertions(+)
+Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Merge made by the 'recursive' strategy.
+Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
+$ git merge phy/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (9579c4dc2129 Merge tag 'iio-fixes-for-4.10b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/iio/adc/palmas_gpadc.c | 4 ++--
+ drivers/iio/health/afe4403.c | 4 ++--
+ drivers/iio/health/afe4404.c | 4 ++--
+ drivers/iio/health/max30100.c | 2 +-
+ drivers/iio/humidity/dht11.c | 6 ++++--
+ 5 files changed, 11 insertions(+), 9 deletions(-)
+Merging char-misc.current/char-misc-linus (49def1853334 Linux 4.10-rc4)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (3f5c34c6d468 Input: wm97xx - make missing platform data non-fatal)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/touchscreen/wm97xx-core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ arch/arm64/crypto/aes-modes.S | 88 +++++++++++++++++++++----------------------
+ crypto/algapi.c | 1 +
+ 2 files changed, 43 insertions(+), 46 deletions(-)
+Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
+$ git merge ide/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging vfio-fixes/for-linus (94a6fa899d2c vfio/type1: Remove pid_namespace.h include)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
+$ 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 (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (3bfdfdcbce27 drm/i915: Ignore bogus plane coordinates on SKL when the plane is not visible)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging drm-misc-fixes/for-linux-next-fixes (7e9081c5aac7 drm/fence: fix memory overwrite when setting out_fence fd)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_atomic.c | 12 ++++++------
+ include/drm/drm_atomic.h | 2 +-
+ include/drm/drm_mode_config.h | 2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------
+ scripts/genksyms/parse.y | 2 -
+ 2 files changed, 234 insertions(+), 242 deletions(-)
+Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
+$ git merge asm-generic/master
+Resolved 'include/asm-generic/percpu.h' using previous resolution.
+Auto-merging include/asm-generic/percpu.h
+CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b8766d2329af] Merge remote-tracking branch 'asm-generic/master'
+$ git diff -M --stat --summary HEAD^..
+ include/asm-generic/page.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
+$ git merge arc/for-next
+Already up-to-date.
+Merging arm/for-next (01c4a81b2c85 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Auto-merging lib/Kconfig.debug
+Auto-merging include/linux/mm.h
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 1 +
+ arch/arm/Kconfig-nommu | 3 +-
+ arch/arm/common/mcpm_entry.c | 12 ++---
+ arch/arm/include/asm/memory.h | 22 ++++++++-
+ arch/arm/kernel/setup.c | 10 ++++-
+ arch/arm/mach-alpine/platsmp.c | 2 +-
+ arch/arm/mach-axxia/platsmp.c | 2 +-
+ arch/arm/mach-bcm/bcm63xx_smp.c | 2 +-
+ arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +-
+ arch/arm/mach-bcm/platsmp.c | 4 +-
+ arch/arm/mach-berlin/platsmp.c | 2 +-
+ arch/arm/mach-exynos/firmware.c | 4 +-
+ arch/arm/mach-exynos/mcpm-exynos.c | 2 +-
+ arch/arm/mach-exynos/platsmp.c | 4 +-
+ arch/arm/mach-exynos/pm.c | 6 +--
+ arch/arm/mach-exynos/suspend.c | 6 +--
+ arch/arm/mach-hisi/platmcpm.c | 2 +-
+ arch/arm/mach-hisi/platsmp.c | 6 +--
+ arch/arm/mach-imx/platsmp.c | 2 +-
+ arch/arm/mach-imx/pm-imx6.c | 2 +-
+ arch/arm/mach-imx/src.c | 2 +-
+ arch/arm/mach-mediatek/platsmp.c | 2 +-
+ arch/arm/mach-mvebu/pm.c | 2 +-
+ arch/arm/mach-mvebu/pmsu.c | 2 +-
+ arch/arm/mach-mvebu/system-controller.c | 2 +-
+ arch/arm/mach-omap2/control.c | 8 ++--
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 ++---
+ arch/arm/mach-omap2/omap-smp.c | 4 +-
+ arch/arm/mach-prima2/platsmp.c | 2 +-
+ arch/arm/mach-prima2/pm.c | 2 +-
+ arch/arm/mach-pxa/palmz72.c | 2 +-
+ arch/arm/mach-pxa/pxa25x.c | 2 +-
+ arch/arm/mach-pxa/pxa27x.c | 2 +-
+ arch/arm/mach-pxa/pxa3xx.c | 2 +-
+ arch/arm/mach-realview/platsmp-dt.c | 2 +-
+ arch/arm/mach-rockchip/platsmp.c | 4 +-
+ arch/arm/mach-rockchip/pm.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-jive.c | 2 +-
+ arch/arm/mach-s3c24xx/pm-s3c2410.c | 2 +-
+ arch/arm/mach-s3c24xx/pm-s3c2416.c | 2 +-
+ arch/arm/mach-s3c64xx/pm.c | 2 +-
+ arch/arm/mach-s5pv210/pm.c | 2 +-
+ arch/arm/mach-sa1100/pm.c | 2 +-
+ arch/arm/mach-shmobile/platsmp-apmu.c | 6 +--
+ arch/arm/mach-shmobile/platsmp-scu.c | 4 +-
+ arch/arm/mach-socfpga/platsmp.c | 4 +-
+ arch/arm/mach-spear/platsmp.c | 2 +-
+ arch/arm/mach-sti/platsmp.c | 2 +-
+ arch/arm/mach-sunxi/platsmp.c | 4 +-
+ arch/arm/mach-tango/platsmp.c | 2 +-
+ arch/arm/mach-tango/pm.c | 2 +-
+ arch/arm/mach-tegra/reset.c | 4 +-
+ arch/arm/mach-ux500/platsmp.c | 2 +-
+ arch/arm/mach-vexpress/dcscb.c | 2 +-
+ arch/arm/mach-vexpress/platsmp.c | 2 +-
+ arch/arm/mach-vexpress/tc2_pm.c | 4 +-
+ arch/arm/mach-zx/platsmp.c | 4 +-
+ arch/arm/mach-zynq/platsmp.c | 2 +-
+ arch/arm/mm/Makefile | 1 +
+ arch/arm/mm/dma-mapping.c | 3 ++
+ arch/arm/mm/flush.c | 6 +++
+ arch/arm/mm/init.c | 7 +--
+ arch/arm/mm/mmu.c | 75 ++++++++++++-------------------
+ arch/arm/mm/nommu.c | 8 ++--
+ arch/arm/mm/physaddr.c | 57 +++++++++++++++++++++++
+ arch/x86/Kconfig | 1 +
+ drivers/firmware/psci.c | 2 +-
+ drivers/mtd/devices/lart.c | 24 +++++-----
+ include/linux/mm.h | 4 ++
+ kernel/kexec_core.c | 2 +-
+ lib/Kconfig.debug | 5 ++-
+ mm/cma.c | 15 +++----
+ mm/kasan/kasan_init.c | 15 ++++---
+ mm/usercopy.c | 4 +-
+ 74 files changed, 255 insertions(+), 182 deletions(-)
+ create mode 100644 arch/arm/mm/physaddr.c
+Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (73f9e92ed3d0 ARM: SoC: Document merges)
+$ git merge arm-soc/for-next
+Resolved 'arch/arm/mach-ux500/platsmp.c' using previous resolution.
+Auto-merging arch/arm/mach-ux500/platsmp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
+Auto-merging arch/arm/mach-shmobile/platsmp-apmu.c
+Auto-merging arch/arm/mach-s3c64xx/pm.c
+Auto-merging arch/arm/mach-exynos/suspend.c
+Auto-merging arch/arm/mach-exynos/mcpm-exynos.c
+Removing arch/arm/boot/dts/exynos4x12.dtsi
+Auto-merging arch/arm/boot/dts/exynos4412-pinctrl.dtsi
+Removing arch/arm/boot/dts/exynos4212.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fb3255e19b15] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/axentia.txt | 19 +
+ Documentation/devicetree/bindings/arm/shmobile.txt | 2 +-
+ .../devicetree/bindings/clock/st,stm32-rcc.txt | 17 +
+ MAINTAINERS | 8 +
+ arch/arm/arm-soc-for-next-contents.txt | 105 ++
+ arch/arm/boot/dts/Makefile | 8 +
+ arch/arm/boot/dts/armada-370-db.dts | 10 +-
+ arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 10 +-
+ arch/arm/boot/dts/armada-370-mirabox.dts | 10 +-
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 10 +-
+ arch/arm/boot/dts/armada-370-rd.dts | 10 +-
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 10 +-
+ arch/arm/boot/dts/armada-370-xp.dtsi | 10 +-
+ arch/arm/boot/dts/armada-370.dtsi | 10 +-
+ arch/arm/boot/dts/armada-375-db.dts | 10 +-
+ arch/arm/boot/dts/armada-375.dtsi | 10 +-
+ arch/arm/boot/dts/armada-380.dtsi | 10 +-
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 58 +-
+ arch/arm/boot/dts/armada-385.dtsi | 10 +-
+ arch/arm/boot/dts/armada-388-clearfog-base.dts | 109 ++
+ arch/arm/boot/dts/armada-388-clearfog-pro.dts | 55 +
+ arch/arm/boot/dts/armada-388-clearfog.dts | 374 ++----
+ arch/arm/boot/dts/armada-388-clearfog.dtsi | 307 +++++
+ arch/arm/boot/dts/armada-388-db.dts | 10 +-
+ arch/arm/boot/dts/armada-388-rd.dts | 10 +-
+ .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 130 ++-
+ arch/arm/boot/dts/armada-38x.dtsi | 10 +-
+ arch/arm/boot/dts/armada-390-db.dts | 10 +-
+ arch/arm/boot/dts/armada-390.dtsi | 10 +-
+ arch/arm/boot/dts/armada-395.dtsi | 10 +-
+ arch/arm/boot/dts/armada-398-db.dts | 10 +-
+ arch/arm/boot/dts/armada-398.dtsi | 10 +-
+ arch/arm/boot/dts/armada-39x.dtsi | 10 +-
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-db.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-gp.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-matrix.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 +-
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 10 +-
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 +-
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 10 +-
+ arch/arm/boot/dts/armada-xp-synology-ds414.dts | 10 +-
+ arch/arm/boot/dts/armada-xp.dtsi | 10 +-
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 14 +
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 24 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 45 +
+ arch/arm/boot/dts/aspeed-g4.dtsi | 776 +++++++++++++
+ arch/arm/boot/dts/aspeed-g5.dtsi | 879 +++++++++++++++
+ arch/arm/boot/dts/at91-linea.dtsi | 49 +
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 6 +
+ arch/arm/boot/dts/at91-tse850-3.dts | 274 +++++
+ arch/arm/boot/dts/bcm-nsp.dtsi | 64 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 +
+ arch/arm/boot/dts/bcm283x.dtsi | 8 +
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 3 +-
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 3 +-
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 7 +-
+ arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 -
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 -
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 7 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 3 +-
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 7 +-
+ arch/arm/boot/dts/bcm4708.dtsi | 4 +
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 3 +-
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 7 +-
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 3 +-
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 60 +
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 107 ++
+ arch/arm/boot/dts/bcm47081.dtsi | 4 +
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 3 +-
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +-
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 11 +-
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 51 +-
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 -
+ arch/arm/boot/dts/bcm4709.dtsi | 1 +
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 7 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 13 +-
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 7 +-
+ arch/arm/boot/dts/bcm47094.dtsi | 1 +
+ arch/arm/boot/dts/bcm5301x.dtsi | 41 +-
+ arch/arm/boot/dts/bcm53573.dtsi | 22 +
+ arch/arm/boot/dts/bcm94708.dts | 4 -
+ arch/arm/boot/dts/bcm94709.dts | 4 -
+ arch/arm/boot/dts/bcm953012er.dts | 4 -
+ arch/arm/boot/dts/bcm953012k.dts | 1 -
+ arch/arm/boot/dts/bcm958522er.dts | 35 +-
+ arch/arm/boot/dts/bcm958525er.dts | 35 +-
+ arch/arm/boot/dts/bcm958525xmc.dts | 68 +-
+ arch/arm/boot/dts/bcm958622hr.dts | 42 +
+ arch/arm/boot/dts/bcm958623hr.dts | 58 +-
+ arch/arm/boot/dts/bcm958625hr.dts | 72 +-
+ arch/arm/boot/dts/bcm958625k.dts | 151 ++-
+ arch/arm/boot/dts/bcm988312hr.dts | 42 +
+ arch/arm/boot/dts/dove-cm-a510.dtsi | 10 +-
+ arch/arm/boot/dts/dove-sbc-a510.dts | 10 +-
+ arch/arm/boot/dts/exynos4.dtsi | 6 +-
+ arch/arm/boot/dts/exynos4212.dtsi | 133 ---
+ arch/arm/boot/dts/exynos4412-itop-elite.dts | 25 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 28 +-
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 13 +
+ arch/arm/boot/dts/exynos4412-odroidx2.dts | 25 +-
+ ...os4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} | 4 +-
+ arch/arm/boot/dts/exynos4412-prime.dtsi | 41 +
+ arch/arm/boot/dts/exynos4412.dtsi | 577 +++++++++-
+ arch/arm/boot/dts/exynos4x12.dtsi | 594 ----------
+ arch/arm/boot/dts/exynos5250.dtsi | 8 +
+ arch/arm/boot/dts/exynos5410.dtsi | 8 +
+ arch/arm/boot/dts/exynos5420.dtsi | 8 +
+ arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 10 +-
+ .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 10 +-
+ arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 10 +-
+ .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 10 +-
+ arch/arm/boot/dts/orion5x-kuroboxpro.dts | 10 +-
+ arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 10 +-
+ arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 10 +-
+ arch/arm/boot/dts/orion5x-linkstation.dtsi | 10 +-
+ arch/arm/boot/dts/orion5x-lschl.dts | 10 +-
+ arch/arm/boot/dts/orion5x-lswsgl.dts | 10 +-
+ arch/arm/boot/dts/ox810se.dtsi | 10 +-
+ arch/arm/boot/dts/ox820.dtsi | 14 +-
+ arch/arm/boot/dts/r8a73a4.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7743.dtsi | 13 +-
+ arch/arm/boot/dts/r8a7745.dtsi | 13 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 10 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 8 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 35 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 33 +-
+ arch/arm/boot/dts/r8a7792.dtsi | 24 +-
+ arch/arm/boot/dts/r8a7793-gose.dts | 21 +
+ arch/arm/boot/dts/r8a7793.dtsi | 21 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 21 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 30 +-
+ arch/arm/boot/dts/sama5d36ek_cmp.dts | 87 ++
+ arch/arm/boot/dts/sama5d3_uart.dtsi | 4 +-
+ arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 201 ++++
+ arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 301 +++++
+ arch/arm/boot/dts/sama5d4.dtsi | 16 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 2 +-
+ arch/arm/boot/dts/socfpga.dtsi | 31 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 32 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 9 +
+ arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts | 31 +
+ arch/arm/boot/dts/socfpga_arria5.dtsi | 4 +
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 43 +
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 53 +
+ arch/arm/boot/dts/stih407-family.dtsi | 58 +-
+ arch/arm/boot/dts/stih410-b2120.dts | 6 +
+ arch/arm/boot/dts/stih410.dtsi | 24 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 29 +
+ arch/arm/boot/dts/stm32f429-disco.dts | 6 +
+ arch/arm/boot/dts/stm32f429.dtsi | 87 +-
+ arch/arm/boot/dts/stm32f469-disco.dts | 8 +-
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 12 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 14 +-
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 14 +-
+ arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 38 +-
+ arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 12 +-
+ arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 16 +-
+ arch/arm/boot/dts/sun4i-a10-inet1.dts | 26 +-
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 14 +-
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 29 +-
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 12 +-
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 13 +-
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +-
+ arch/arm/boot/dts/sun4i-a10-mk802.dts | 18 +-
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 27 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 19 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 6 +-
+ arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 32 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 169 +--
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 18 +-
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 29 +-
+ arch/arm/boot/dts/sun5i-a10s-mk802.dts | 19 +-
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 36 +-
+ arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +-
+ arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 21 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 43 +-
+ .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 23 +-
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 22 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 40 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 36 +-
+ arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 11 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 24 +-
+ arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 12 +-
+ arch/arm/boot/dts/sun5i-gr8-evb.dts | 24 +-
+ arch/arm/boot/dts/sun5i-gr8.dtsi | 122 +-
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 27 +-
+ .../boot/dts/sun5i-reference-design-tablet.dtsi | 33 +-
+ arch/arm/boot/dts/sun5i.dtsi | 75 +-
+ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 6 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 22 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 23 +-
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 19 +-
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 19 +-
+ arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 19 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi | 98 +-
+ arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 13 +-
+ arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 29 +-
+ .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 9 +-
+ .../boot/dts/sun6i-reference-design-tablet.dtsi | 14 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 27 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 26 +-
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 37 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 13 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 38 +-
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 24 +-
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 26 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 7 +-
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 30 +-
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +-
+ arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 32 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +-
+ .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 8 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 33 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 28 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 45 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 38 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +-
+ arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 25 +-
+ arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 13 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 277 ++---
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 99 +-
+ arch/arm/boot/dts/sun8i-a23-evb.dts | 7 +-
+ .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 8 +-
+ .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 8 +-
+ arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 9 +-
+ arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 18 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 6 +-
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 21 +-
+ arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 18 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 18 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 26 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 18 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 18 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 18 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 10 +-
+ arch/arm/boot/dts/sun8i-h3.dtsi | 104 +-
+ arch/arm/boot/dts/sun8i-q8-common.dtsi | 9 +-
+ arch/arm/boot/dts/sun8i-r16-parrot.dts | 36 +-
+ .../boot/dts/sun8i-reference-design-tablet.dtsi | 26 +-
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 23 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 41 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 61 +-
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi | 24 +-
+ arch/arm/boot/dts/tango4-common.dtsi | 46 +
+ arch/arm/boot/dts/tango4-vantage-1172.dts | 5 +
+ arch/arm/configs/aspeed_g4_defconfig | 38 +-
+ arch/arm/configs/aspeed_g5_defconfig | 38 +-
+ arch/arm/configs/exynos_defconfig | 1 +
+ arch/arm/configs/multi_v7_defconfig | 7 +-
+ arch/arm/configs/pxa_defconfig | 1 -
+ arch/arm/configs/s5pv210_defconfig | 4 -
+ arch/arm/configs/sama5_defconfig | 7 +-
+ arch/arm/configs/shmobile_defconfig | 6 +
+ arch/arm/configs/socfpga_defconfig | 28 +-
+ arch/arm/configs/tegra_defconfig | 2 +-
+ arch/arm/mach-aspeed/Kconfig | 4 +
+ arch/arm/mach-at91/pm.c | 2 +-
+ arch/arm/mach-at91/pm.h | 2 -
+ arch/arm/mach-exynos/exynos.c | 4 +-
+ arch/arm/mach-exynos/mcpm-exynos.c | 2 +-
+ arch/arm/mach-exynos/suspend.c | 10 +-
+ arch/arm/mach-s3c24xx/bast-irq.c | 4 +-
+ arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +-
+ arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 +-
+ arch/arm/mach-s3c64xx/common.c | 3 +-
+ arch/arm/mach-s3c64xx/dev-audio.c | 19 -
+ arch/arm/mach-s3c64xx/pm.c | 2 +-
+ arch/arm/mach-shmobile/platsmp-apmu.c | 41 +-
+ arch/arm/mach-shmobile/rcar-gen2.h | 2 -
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 -
+ arch/arm/mach-shmobile/smp-r8a7791.c | 14 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 1 -
+ arch/arm/mach-ux500/platsmp.c | 45 +-
+ arch/arm/plat-samsung/devs.c | 19 -
+ arch/arm/plat-samsung/include/plat/wakeup-mask.h | 2 +-
+ arch/arm/plat-samsung/wakeup-mask.c | 2 +-
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 43 +-
+ arch/arm64/boot/dts/arm/juno-clocks.dtsi | 3 +-
+ arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 100 ++
+ arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 7 -
+ arch/arm64/boot/dts/arm/juno-r1.dts | 16 +-
+ arch/arm64/boot/dts/arm/juno-r2.dts | 16 +-
+ arch/arm64/boot/dts/arm/juno.dts | 27 +-
+ arch/arm64/boot/dts/broadcom/Makefile | 2 +-
+ arch/arm64/boot/dts/broadcom/ns2-svk.dts | 4 +
+ arch/arm64/boot/dts/broadcom/ns2-xmc.dts | 191 ++++
+ arch/arm64/boot/dts/broadcom/ns2.dtsi | 123 +-
+ arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 197 ++++
+ arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 373 +++---
+ .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1187 ++++++++++++++++++++
+ arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1036 +----------------
+ arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 12 +-
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 115 +-
+ arch/arm64/boot/dts/marvell/armada-371x.dtsi | 10 +-
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 44 +-
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 76 +-
+ arch/arm64/boot/dts/marvell/armada-372x.dtsi | 10 +-
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 39 +-
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 +
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 119 +-
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 37 +
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 183 ++-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/clk/samsung/clk-exynos4.c | 4 +
+ drivers/memory/atmel-ebi.c | 27 +-
+ include/dt-bindings/clock/stm32fx-clock.h | 39 +
+ include/dt-bindings/pinctrl/samsung.h | 14 +
+ 326 files changed, 9821 insertions(+), 5013 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/axentia.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/armada-388-clearfog-base.dts
+ create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts
+ create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dtsi
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+ create mode 100644 arch/arm/boot/dts/at91-linea.dtsi
+ create mode 100644 arch/arm/boot/dts/at91-tse850-3.dts
+ create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+ create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+ delete mode 100644 arch/arm/boot/dts/exynos4212.dtsi
+ rename arch/arm/boot/dts/{exynos4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} (99%)
+ create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi
+ delete mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d36ek_cmp.dts
+ create mode 100644 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts
+ create mode 100644 arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/ns2-xmc.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+ create mode 100644 include/dt-bindings/clock/stm32fx-clock.h
+Merging amlogic/for-next (61e787270fde Merge v4.11/dt64)
+$ git merge amlogic/for-next
+Resolved 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi' using previous resolution.
+Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 490910689119] Merge remote-tracking branch 'amlogic/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/amlogic.txt | 2 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm64/boot/dts/amlogic/Makefile | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 71 +++++++++++++
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 12 +++
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 11 ++
+ .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 66 ++++++++++++
+ .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 94 ++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 118 +++++++++++----------
+ ...ox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} | 0
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 61 +++++++++++
+ ...{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} | 0
+ ...{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} | 0
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 10 ++
+ drivers/clk/meson/gxbb.c | 48 +++++++++
+ drivers/clk/meson/gxbb.h | 13 ++-
+ include/dt-bindings/clock/gxbb-clkc.h | 6 ++
+ 17 files changed, 456 insertions(+), 65 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+ rename arch/arm64/boot/dts/amlogic/{meson-gxl-nexbox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} (100%)
+ rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} (100%)
+ rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} (100%)
+Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
+$ git merge aspeed/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (3d928ca85412 Merge branch 'at91-soc' 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 (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
+$ git merge bcm2835/for-next
+Merge made by the 'recursive' strategy.
+Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (1393f73bb898 Merge branch 'zte/pm-domains' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/soc/zte/pd-2967xx.txt | 19 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ MAINTAINERS | 4 +
+ arch/arm/boot/dts/Makefile | 5 +
+ arch/arm/boot/dts/imx1-ads.dts | 1 -
+ arch/arm/boot/dts/imx1.dtsi | 3 +-
+ arch/arm/boot/dts/imx23.dtsi | 5 +-
+ arch/arm/boot/dts/imx25.dtsi | 7 +-
+ arch/arm/boot/dts/imx27-apf27dev.dts | 2 -
+ .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 -
+ arch/arm/boot/dts/imx27-pdk.dts | 1 -
+ arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 -
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 -
+ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 -
+ arch/arm/boot/dts/imx27.dtsi | 1 +
+ arch/arm/boot/dts/imx28.dtsi | 7 +-
+ arch/arm/boot/dts/imx31.dtsi | 5 +-
+ arch/arm/boot/dts/imx35.dtsi | 5 +-
+ arch/arm/boot/dts/imx50-evk.dts | 1 -
+ arch/arm/boot/dts/imx51-apf51dev.dts | 2 -
+ arch/arm/boot/dts/imx51-babbage.dts | 1 -
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 -
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 -
+ arch/arm/boot/dts/imx53-qsb.dts | 5 +-
+ arch/arm/boot/dts/imx53-qsrb.dts | 6 +-
+ arch/arm/boot/dts/imx53-smd.dts | 1 -
+ arch/arm/boot/dts/imx53-tqma53.dtsi | 2 -
+ arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 1 -
+ arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 -
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-cubox-i.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-icore-rqs.dts | 51 +++
+ arch/arm/boot/dts/imx6dl-icore.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-nit6xlite.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-sabrelite.dts | 10 +-
+ arch/arm/boot/dts/imx6dl-savageboard.dts | 51 +++
+ arch/arm/boot/dts/imx6dl-ts4900.dts | 10 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 +-
+ arch/arm/boot/dts/imx6q-b450v3.dts | 10 +-
+ arch/arm/boot/dts/imx6q-b650v3.dts | 10 +-
+ arch/arm/boot/dts/imx6q-b850v3.dts | 10 +-
+ arch/arm/boot/dts/imx6q-ba16.dtsi | 11 +-
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 32 +-
+ arch/arm/boot/dts/imx6q-cubox-i.dts | 10 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 -
+ arch/arm/boot/dts/imx6q-evi.dts | 3 -
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 -
+ arch/arm/boot/dts/imx6q-h100.dts | 10 +-
+ arch/arm/boot/dts/imx6q-hummingboard.dts | 10 +-
+ arch/arm/boot/dts/imx6q-icore-rqs.dts | 12 +-
+ arch/arm/boot/dts/imx6q-icore.dts | 10 +-
+ arch/arm/boot/dts/imx6q-marsboard.dts | 11 +-
+ arch/arm/boot/dts/imx6q-mccmon6.dts | 473 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6q-nitrogen6_max.dts | 10 +-
+ arch/arm/boot/dts/imx6q-nitrogen6_som2.dts | 10 +-
+ arch/arm/boot/dts/imx6q-nitrogen6x.dts | 10 +-
+ arch/arm/boot/dts/imx6q-novena.dts | 1 -
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 10 +-
+ arch/arm/boot/dts/imx6q-savageboard.dts | 55 +++
+ arch/arm/boot/dts/imx6q-ts4900.dts | 10 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 12 +-
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +-
+ arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 132 ++++--
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 166 +++++---
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 163 ++++---
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 16 +
+ arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 132 ++++--
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 130 ++++--
+ arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 98 ++++-
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-icore.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-microsom.dtsi | 10 +-
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 -
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-savageboard.dtsi | 255 +++++++++++
+ arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 12 +-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 -
+ arch/arm/boot/dts/imx6sl-evk.dts | 1 -
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 11 +-
+ arch/arm/boot/dts/imx6sx-sdb-sai.dts | 10 +-
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 1 +
+ arch/arm/boot/dts/imx6ul-geam-kit.dts | 10 +-
+ arch/arm/boot/dts/imx6ul-geam.dtsi | 10 +-
+ arch/arm/boot/dts/imx6ul-isiot.dts | 119 ++++++
+ arch/arm/boot/dts/imx6ul-liteboard.dts | 10 +-
+ arch/arm/boot/dts/imx6ul-litesom.dtsi | 10 +-
+ arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 10 +-
+ arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 -
+ arch/arm/boot/dts/imx6ul.dtsi | 7 +-
+ arch/arm/boot/dts/imx6ull-14x14-evk.dts | 10 +-
+ arch/arm/boot/dts/imx6ull.dtsi | 10 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 1 -
+ arch/arm/boot/dts/imx7s.dtsi | 1 -
+ arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 10 +-
+ arch/arm/boot/dts/vf-colibri.dtsi | 10 +-
+ arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 10 +-
+ arch/arm/boot/dts/vf500-colibri.dtsi | 10 +-
+ arch/arm/boot/dts/vf500.dtsi | 10 +-
+ arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 10 +-
+ arch/arm/boot/dts/vf610-colibri.dtsi | 10 +-
+ arch/arm/boot/dts/vf610-twr.dts | 10 +-
+ arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 10 +-
+ arch/arm/boot/dts/vf610.dtsi | 10 +-
+ arch/arm/boot/dts/vf610m4-colibri.dts | 10 +-
+ arch/arm/boot/dts/vf610m4-cosmic.dts | 10 +-
+ arch/arm/boot/dts/vf610m4.dtsi | 10 +-
+ arch/arm/boot/dts/vfxxx.dtsi | 10 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 4 +-
+ arch/arm/mach-imx/devices/platform-flexcan.c | 9 -
+ .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 10 -
+ arch/arm/mach-imx/mach-mx27_3ds.c | 107 -----
+ arch/arm/mach-imx/mach-mx31_3ds.c | 160 -------
+ arch/arm/mach-imx/mach-mx35_3ds.c | 103 -----
+ arch/arm/mach-imx/mach-pcm037.c | 115 -----
+ arch/arm/mach-imx/mx31moboard-marxbot.c | 92 ----
+ arch/arm/mach-imx/mx31moboard-smartbot.c | 74 ----
+ arch/arm64/boot/dts/freescale/Makefile | 3 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 115 +++++
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 128 ++++++
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 59 +++
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 247 +++++++++++
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 80 ++++
+ arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 1 -
+ arch/arm64/boot/dts/zte/zx296718.dtsi | 39 ++
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 1 +
+ drivers/soc/zte/Kconfig | 13 +
+ drivers/soc/zte/Makefile | 5 +
+ drivers/soc/zte/zx296718_pm_domains.c | 182 ++++++++
+ drivers/soc/zte/zx2967_pm_domains.c | 143 +++++++
+ drivers/soc/zte/zx2967_pm_domains.h | 44 ++
+ include/dt-bindings/soc/zte,pm_domains.h | 24 ++
+ 152 files changed, 3154 insertions(+), 1280 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt
+ create mode 100644 arch/arm/boot/dts/imx6dl-icore-rqs.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-savageboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-mccmon6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-savageboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-savageboard.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-isiot.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+ create mode 100644 drivers/soc/zte/Kconfig
+ create mode 100644 drivers/soc/zte/Makefile
+ create mode 100644 drivers/soc/zte/zx296718_pm_domains.c
+ create mode 100644 drivers/soc/zte/zx2967_pm_domains.c
+ create mode 100644 drivers/soc/zte/zx2967_pm_domains.h
+ create mode 100644 include/dt-bindings/soc/zte,pm_domains.h
+Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
+$ git merge keystone/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 3 ++-
+ arch/arm/boot/dts/keystone-k2e.dtsi | 25 +++++++++++++++++++++++
+ arch/arm/boot/dts/keystone-k2g.dtsi | 14 ++++++++++++-
+ arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 3 ++-
+ arch/arm/boot/dts/keystone-k2hk.dtsi | 32 ++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 3 ++-
+ arch/arm/boot/dts/keystone-k2l.dtsi | 32 ++++++++++++++++++++++++++++--
+ arch/arm/boot/dts/keystone.dtsi | 9 +++++++--
+ arch/arm/configs/keystone_defconfig | 1 +
+ arch/arm/mach-keystone/Kconfig | 1 +
+ drivers/soc/ti/knav_dma.c | 4 ++--
+ drivers/soc/ti/knav_qmss_acc.c | 15 +++-----------
+ drivers/soc/ti/knav_qmss_queue.c | 25 ++++++++---------------
+ 13 files changed, 128 insertions(+), 39 deletions(-)
+Merging mvebu/for-next (cdc8c5c16f57 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/armada-370-rd.dts | 44 +++++++
+ arch/arm/boot/dts/armada-385-linksys.dtsi | 52 +++++++-
+ arch/arm/boot/dts/armada-388-clearfog.dts | 65 ++++++++++
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 53 +++++++++
+ arch/arm/boot/dts/kirkwood-dir665.dts | 49 ++++++++
+ arch/arm/boot/dts/kirkwood-linksys-viper.dts | 49 ++++++++
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 49 ++++++++
+ arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 9 +-
+ arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 11 ++
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 44 +++++++
+ arch/arm/mach-mv78xx0/pcie.c | 2 +-
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 138 ++++++++++++++++++++++
+ drivers/soc/dove/pmu.c | 2 +-
+ 14 files changed, 560 insertions(+), 8 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+Merging omap/for-next (618fc1a367cd Merge branch 'omap-for-v4.11/soc' into for-next)
+$ git merge omap/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 19 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +
+ arch/arm/boot/dts/am335x-boneblack-common.dtsi | 163 ++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 +++++++++
+ arch/arm/boot/dts/am335x-boneblack.dts | 155 +------------
+ arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 44 ++++
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 126 +++++++++++
+ arch/arm/boot/dts/am335x-bonegreen.dts | 38 +---
+ arch/arm/boot/dts/am335x-chilisom.dtsi | 8 +
+ arch/arm/boot/dts/am335x-evm.dts | 4 +
+ arch/arm/boot/dts/am335x-evmsk.dts | 4 +
+ arch/arm/boot/dts/am335x-icev2.dts | 4 +
+ arch/arm/boot/dts/am335x-nano.dts | 31 ++-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 72 +-----
+ arch/arm/boot/dts/am335x-sl50.dts | 70 +++++-
+ arch/arm/boot/dts/am335x-wega.dtsi | 9 +-
+ arch/arm/boot/dts/am33xx.dtsi | 3 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 4 +
+ arch/arm/boot/dts/am437x-idk-evm.dts | 4 +
+ arch/arm/boot/dts/am437x-sk-evm.dts | 4 +
+ arch/arm/boot/dts/am43x-epos-evm.dts | 4 +
+ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 18 +-
+ arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 +
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 +
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 +
+ arch/arm/boot/dts/dm814x.dtsi | 9 +-
+ arch/arm/boot/dts/dm816x.dtsi | 6 +-
+ arch/arm/boot/dts/dra7-evm.dts | 286 +++---------------------
+ arch/arm/boot/dts/dra71-evm.dts | 5 +
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 20 +-
+ arch/arm/boot/dts/dra72-evm-revc.dts | 4 +
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 16 ++
+ arch/arm/boot/dts/omap3-igep.dtsi | 21 --
+ arch/arm/boot/dts/omap3-n900.dts | 3 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 16 ++
+ arch/arm/boot/dts/omap5-igep0050.dts | 21 ++
+ arch/arm/boot/dts/omap5-uevm.dts | 21 ++
+ arch/arm/configs/omap2plus_defconfig | 7 +-
+ arch/arm/mach-omap1/clock.c | 20 --
+ arch/arm/mach-omap1/clock.h | 2 -
+ arch/arm/mach-omap1/include/mach/usb.h | 2 -
+ arch/arm/mach-omap1/usb.c | 51 ++---
+ arch/arm/mach-omap2/clock.c | 61 -----
+ arch/arm/mach-omap2/clock.h | 4 -
+ arch/arm/mach-omap2/display.c | 258 +--------------------
+ arch/arm/mach-omap2/display.h | 7 -
+ arch/arm/mach-omap2/id.c | 10 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 33 +++
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 8 +-
+ arch/arm/mach-omap2/pdata-quirks.c | 1 -
+ drivers/soc/ti/wkup_m3_ipc.c | 2 -
+ include/dt-bindings/pinctrl/omap.h | 4 +-
+ 53 files changed, 865 insertions(+), 944 deletions(-)
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack-common.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts
+ create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+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 (73cb27cef98f Merge tag 'qcom-defconfig-for-4.11' into noo-for-4.11)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi
+Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 62 ++++-
+ .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 69 +++++
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 --
+ arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 37 +++
+ .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 7 +
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 287 ++++++++++++++++++++-
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-msm8660-surf.dts | 2 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 12 +-
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 +
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 96 ++++++-
+ arch/arm/configs/qcom_defconfig | 34 +++
+ arch/arm/kernel/armksyms.c | 2 +-
+ arch/arm/kernel/smccc-call.S | 7 +-
+ .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 32 +++
+ .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 19 ++
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 75 +++++-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +
+ arch/arm64/kernel/arm64ksyms.c | 2 +-
+ arch/arm64/kernel/asm-offsets.c | 7 +-
+ arch/arm64/kernel/smccc-call.S | 16 +-
+ drivers/bus/Kconfig | 1 +
+ drivers/firmware/qcom_scm-32.c | 18 ++
+ drivers/firmware/qcom_scm-64.c | 29 ++-
+ drivers/firmware/qcom_scm.c | 8 +-
+ drivers/firmware/qcom_scm.h | 2 +
+ include/linux/arm-smccc.h | 38 ++-
+ include/linux/qcom_scm.h | 54 ++--
+ 33 files changed, 922 insertions(+), 88 deletions(-)
+Merging renesas/next (b4f907b34180 Merge branch 'dt-for-v4.11' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/r7s72100-rskrza1.dts | 8 +++
+ arch/arm/boot/dts/r7s72100.dtsi | 27 ++++++++++
+ arch/arm/boot/dts/r8a7743.dtsi | 3 ++
+ arch/arm/boot/dts/r8a7745.dtsi | 3 ++
+ arch/arm/boot/dts/r8a7779-marzen.dts | 4 ++
+ arch/arm/boot/dts/r8a7779.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 2 +
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 62 ++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 1 +
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 61 +++++++++++++++++++++
+ include/dt-bindings/clock/r7s72100-clock.h | 4 ++
+ 12 files changed, 177 insertions(+)
+Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/rockchip,rk3328-cru.txt | 57 ++
+ .../bindings/clock/rockchip,rk3399-cru.txt | 6 +
+ .../devicetree/bindings/soc/rockchip/grf.txt | 4 +
+ .../bindings/soc/rockchip/power_domain.txt | 3 +
+ arch/arm/boot/dts/rk3036-evb.dts | 2 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 12 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 8 +-
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +-
+ arch/arm/boot/dts/rk3066a-mk808.dts | 10 +-
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 4 +
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 10 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 20 +-
+ arch/arm/boot/dts/rk3188.dtsi | 4 +
+ arch/arm/boot/dts/rk3229-evb.dts | 2 +-
+ arch/arm/boot/dts/rk3288-evb-act8846.dts | 6 +-
+ arch/arm/boot/dts/rk3288-evb-rk808.dts | 2 +-
+ arch/arm/boot/dts/rk3288-evb.dtsi | 14 +-
+ arch/arm/boot/dts/rk3288-fennec.dts | 6 +-
+ arch/arm/boot/dts/rk3288-firefly-beta.dts | 2 +-
+ arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-firefly-reload.dts | 26 +-
+ arch/arm/boot/dts/rk3288-firefly.dts | 2 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 18 +-
+ arch/arm/boot/dts/rk3288-miqi.dts | 8 +-
+ arch/arm/boot/dts/rk3288-popmetal.dts | 8 +-
+ arch/arm/boot/dts/rk3288-r89.dts | 14 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 +-
+ arch/arm/boot/dts/rk3288-rock2-square.dts | 14 +-
+ arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 8 +-
+ arch/arm/boot/dts/rk3288-veyron-brain.dts | 8 +-
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 14 +-
+ arch/arm/boot/dts/rk3288-veyron-jaq.dts | 14 +-
+ arch/arm/boot/dts/rk3288-veyron-jerry.dts | 12 +-
+ arch/arm/boot/dts/rk3288-veyron-mickey.dts | 6 +-
+ arch/arm/boot/dts/rk3288-veyron-minnie.dts | 18 +-
+ arch/arm/boot/dts/rk3288-veyron-pinky.dts | 4 +-
+ arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-veyron-speedy.dts | 10 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 10 +-
+ arch/arm/boot/dts/rk3288.dtsi | 84 ++
+ arch/arm/mach-rockchip/rockchip.c | 12 -
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 10 +-
+ arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 10 +-
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 14 +-
+ arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 10 +-
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 +-
+ arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 8 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 41 +-
+ drivers/clk/rockchip/Makefile | 2 +
+ drivers/clk/rockchip/clk-muxgrf.c | 102 +++
+ drivers/clk/rockchip/clk-pll.c | 16 +-
+ drivers/clk/rockchip/clk-rk3188.c | 4 +-
+ drivers/clk/rockchip/clk-rk3288.c | 36 +-
+ drivers/clk/rockchip/clk-rk3328.c | 895 +++++++++++++++++++++
+ drivers/clk/rockchip/clk-rk3399.c | 2 +-
+ drivers/clk/rockchip/clk.c | 8 +-
+ drivers/clk/rockchip/clk.h | 40 +
+ drivers/soc/rockchip/Kconfig | 10 +
+ drivers/soc/rockchip/Makefile | 1 +
+ drivers/soc/rockchip/grf.c | 134 +++
+ drivers/soc/rockchip/pm_domains.c | 63 +-
+ include/dt-bindings/clock/rk3188-cru-common.h | 2 +
+ include/dt-bindings/clock/rk3288-cru.h | 2 +
+ include/dt-bindings/clock/rk3328-cru.h | 400 +++++++++
+ include/dt-bindings/power/rk3328-power.h | 18 +
+ 66 files changed, 2095 insertions(+), 243 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt
+ create mode 100644 drivers/clk/rockchip/clk-muxgrf.c
+ create mode 100644 drivers/clk/rockchip/clk-rk3328.c
+ create mode 100644 drivers/soc/rockchip/grf.c
+ create mode 100644 include/dt-bindings/clock/rk3328-cru.h
+ create mode 100644 include/dt-bindings/power/rk3328-power.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 (1001354ca341 Linux 4.9-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (4a8144f4d470 Merge branch 'next/dt64' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm64/boot/dts/exynos/exynos5433.dtsi
+Auto-merging arch/arm/mach-exynos/suspend.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-exynos/Kconfig | 5 -----
+ arch/arm/mach-exynos/exynos.c | 1 -
+ arch/arm/mach-exynos/suspend.c | 1 -
+ arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 10 +++++-----
+ .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 16 ++++++++++++++++
+ arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 13 +++++++++++++
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +++---
+ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 14 +++++++-------
+ drivers/soc/samsung/exynos-pmu.c | 22 ++++++++++++++--------
+ include/linux/soc/samsung/exynos-pmu.h | 10 ++++++++++
+ 10 files changed, 68 insertions(+), 30 deletions(-)
+Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
+$ git merge tegra/for-next
+Auto-merging drivers/i2c/busses/Makefile
+Auto-merging drivers/i2c/busses/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 ++
+ drivers/clk/tegra/Kconfig | 4 +
+ drivers/clk/tegra/Makefile | 1 +
+ drivers/clk/tegra/clk-bpmp.c | 620 +++++++++++++++++++++
+ drivers/clk/tegra/clk-tegra20.c | 1 +
+ drivers/clk/tegra/clk-tegra30.c | 1 +
+ drivers/i2c/busses/Kconfig | 11 +
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-tegra-bpmp.c | 365 ++++++++++++
+ 9 files changed, 1046 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt
+ create mode 100644 drivers/clk/tegra/clk-bpmp.c
+ create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c
+Merging arm64/for-next/core (829d2bd13392 arm64: entry-ftrace.S: avoid open-coded {adr,ldr}_l)
+$ git merge arm64/for-next/core
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/kernel/traps.c
+Auto-merging arch/arm64/include/asm/memory.h
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/cpu-feature-registers.txt | 240 +++++++++++++++++
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/cpufeature.h | 26 +-
+ arch/arm64/include/asm/cputype.h | 3 +
+ arch/arm64/include/asm/insn.h | 2 +
+ arch/arm64/include/asm/kvm_mmu.h | 4 +-
+ arch/arm64/include/asm/memory.h | 66 +++--
+ arch/arm64/include/asm/mmu_context.h | 6 +-
+ arch/arm64/include/asm/pgtable.h | 2 +-
+ arch/arm64/include/asm/processor.h | 1 -
+ arch/arm64/include/asm/sysreg.h | 26 +-
+ arch/arm64/include/uapi/asm/hwcap.h | 2 +
+ arch/arm64/kernel/acpi_parking_protocol.c | 3 +-
+ arch/arm64/kernel/armv8_deprecated.c | 2 +-
+ arch/arm64/kernel/cacheinfo.c | 13 +-
+ arch/arm64/kernel/cpu-reset.h | 2 +-
+ arch/arm64/kernel/cpu_errata.c | 15 +-
+ arch/arm64/kernel/cpufeature.c | 362 +++++++++++++++++---------
+ arch/arm64/kernel/cpuinfo.c | 2 +
+ arch/arm64/kernel/efi-entry.S | 9 +-
+ arch/arm64/kernel/entry-ftrace.S | 12 +-
+ arch/arm64/kernel/head.S | 7 +-
+ arch/arm64/kernel/hibernate.c | 26 +-
+ arch/arm64/kernel/insn.c | 31 ++-
+ arch/arm64/kernel/process.c | 2 +-
+ arch/arm64/kernel/psci.c | 3 +-
+ arch/arm64/kernel/setup.c | 9 +-
+ arch/arm64/kernel/smp_spin_table.c | 3 +-
+ arch/arm64/kernel/traps.c | 2 +-
+ arch/arm64/kernel/vdso.c | 8 +-
+ arch/arm64/mm/Makefile | 2 +
+ arch/arm64/mm/dma-mapping.c | 12 +-
+ arch/arm64/mm/fault.c | 14 -
+ arch/arm64/mm/init.c | 12 +-
+ arch/arm64/mm/kasan_init.c | 22 +-
+ arch/arm64/mm/mmu.c | 33 ++-
+ arch/arm64/mm/physaddr.c | 30 +++
+ drivers/of/base.c | 26 ++
+ include/linux/of.h | 1 +
+ 39 files changed, 789 insertions(+), 253 deletions(-)
+ create mode 100644 Documentation/arm64/cpu-feature-registers.txt
+ create mode 100644 arch/arm64/mm/physaddr.c
+Merging clk/clk-next (8076e04441f2 clk: stm32f7: Introduce stm32f7 clocks for STM32F746 boards)
+$ git merge clk/clk-next
+Resolved 'Documentation/devicetree/bindings/clock/st,stm32-rcc.txt' using previous resolution.
+Resolved 'include/dt-bindings/clock/stm32fx-clock.h' using previous resolution.
+Auto-merging include/dt-bindings/clock/stm32fx-clock.h
+CONFLICT (add/add): Merge conflict in include/dt-bindings/clock/stm32fx-clock.h
+Removing include/dt-bindings/clock/exynos4415.h
+Removing drivers/clk/samsung/clk-exynos4415.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
+Removing Documentation/devicetree/bindings/clock/exynos4415-clock.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eacb4f3f1510] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/clock/brcm,bcm2835-cprman.txt | 15 +-
+ .../devicetree/bindings/clock/exynos4415-clock.txt | 38 -
+ .../devicetree/bindings/clock/hi3660-clock.txt | 42 +
+ .../devicetree/bindings/clock/idt,versaclock5.txt | 65 ++
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 +
+ .../devicetree/bindings/clock/st,stm32-rcc.txt | 20 +
+ .../devicetree/bindings/clock/ti,cdce925.txt | 15 +-
+ .../devicetree/bindings/clock/zx296718-clk.txt | 3 +
+ MAINTAINERS | 5 +
+ drivers/clk/Kconfig | 21 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/axs10x/i2s_pll_clock.c | 1 +
+ drivers/clk/bcm/clk-bcm2835.c | 303 +++++-
+ drivers/clk/clk-cdce925.c | 108 ++-
+ drivers/clk/clk-conf.c | 15 +-
+ drivers/clk/clk-cs2000-cp.c | 22 +
+ drivers/clk/clk-scpi.c | 14 +-
+ drivers/clk/clk-stm32f4.c | 872 ++++++++++++++++-
+ drivers/clk/clk-versaclock5.c | 791 +++++++++++++++
+ drivers/clk/clk-wm831x.c | 3 +-
+ drivers/clk/hisilicon/Kconfig | 7 +
+ drivers/clk/hisilicon/Makefile | 1 +
+ drivers/clk/hisilicon/clk-hi3660.c | 567 +++++++++++
+ drivers/clk/imx/clk-imx6q.c | 21 +-
+ drivers/clk/imx/clk-imx7d.c | 3 +-
+ drivers/clk/imx/clk-pllv3.c | 99 ++
+ drivers/clk/imx/clk-vf610.c | 4 +-
+ drivers/clk/imx/clk.h | 1 +
+ drivers/clk/mvebu/ap806-system-controller.c | 28 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 71 ++
+ drivers/clk/qcom/gcc-ipq4019.c | 479 ++++++++-
+ drivers/clk/qcom/gcc-mdm9615.c | 30 +
+ drivers/clk/qcom/gcc-msm8996.c | 1 +
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 9 +
+ drivers/clk/samsung/Makefile | 1 -
+ drivers/clk/samsung/clk-exynos-audss.c | 24 +-
+ drivers/clk/samsung/clk-exynos4415.c | 1022 --------------------
+ drivers/clk/samsung/clk-exynos5433.c | 8 +-
+ drivers/clk/uniphier/clk-uniphier-core.c | 7 +-
+ drivers/clk/uniphier/clk-uniphier-cpugear.c | 1 -
+ drivers/clk/zte/clk-zx296718.c | 154 ++-
+ drivers/clk/zte/clk.c | 127 +++
+ drivers/clk/zte/clk.h | 21 +
+ include/dt-bindings/clock/bcm2835.h | 2 +
+ include/dt-bindings/clock/exynos4415.h | 360 -------
+ include/dt-bindings/clock/hi3660-clock.h | 194 ++++
+ include/dt-bindings/clock/imx7d-clock.h | 3 +-
+ include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 +
+ include/dt-bindings/clock/qcom,gcc-mdm9615.h | 2 +
+ include/dt-bindings/clock/qcom,gcc-msm8996.h | 1 +
+ include/dt-bindings/clock/qcom,rpmcc.h | 40 +-
+ include/dt-bindings/clock/stm32fx-clock.h | 20 +
+ 52 files changed, 4066 insertions(+), 1608 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/exynos4415-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.txt
+ create mode 100644 drivers/clk/clk-versaclock5.c
+ create mode 100644 drivers/clk/hisilicon/clk-hi3660.c
+ delete mode 100644 drivers/clk/samsung/clk-exynos4415.c
+ delete mode 100644 include/dt-bindings/clock/exynos4415.h
+ create mode 100644 include/dt-bindings/clock/hi3660-clock.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 a8e788808da5] 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 (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (d25c164fc0be m68k/defconfig: amcore board defconfig tuning)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amcore_defconfig | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (1d02d4bb23cc MIPS: Lantiq: Lock DMA register accesses for SMP)
+$ git merge mips/mips-for-linux-next
+Auto-merging drivers/of/base.c
+Removing arch/mips/kernel/mips_ksyms.c
+Removing arch/mips/include/asm/unaligned.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/mips/img/pistachio-marduk.txt | 10 +
+ MAINTAINERS | 8 +-
+ arch/mips/Kconfig | 41 +-
+ arch/mips/Makefile | 20 +-
+ arch/mips/Makefile.postlink | 35 +
+ arch/mips/alchemy/board-gpr.c | 1 -
+ arch/mips/ath79/clock.c | 9 +-
+ arch/mips/bcm47xx/board.c | 9 +
+ arch/mips/bcm47xx/buttons.c | 72 ++
+ arch/mips/bcm47xx/leds.c | 81 ++
+ arch/mips/boot/compressed/Makefile | 10 +-
+ arch/mips/boot/dts/brcm/bcm7125.dtsi | 49 +-
+ arch/mips/boot/dts/brcm/bcm7346.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm7358.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm7360.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm7362.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm7420.dtsi | 49 +-
+ arch/mips/boot/dts/brcm/bcm7425.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm7435.dtsi | 43 +
+ arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 +
+ arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 4 +
+ arch/mips/boot/dts/brcm/bcm97358svmb.dts | 36 +
+ arch/mips/boot/dts/brcm/bcm97360svmb.dts | 36 +
+ arch/mips/boot/dts/brcm/bcm97362svmb.dts | 4 +
+ arch/mips/boot/dts/brcm/bcm97420c.dts | 4 +
+ arch/mips/boot/dts/brcm/bcm97425svmb.dts | 36 +
+ arch/mips/boot/dts/brcm/bcm97435svmb.dts | 4 +
+ arch/mips/boot/dts/img/Makefile | 9 +
+ arch/mips/boot/dts/img/pistachio.dtsi | 924 +++++++++++++++++++++
+ arch/mips/boot/dts/img/pistachio_marduk.dts | 163 ++++
+ arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 63 ++
+ arch/mips/cavium-octeon/dma-octeon.c | 15 +-
+ .../cavium-octeon/executive/cvmx-helper-rgmii.c | 3 +-
+ .../cavium-octeon/executive/cvmx-helper-sgmii.c | 3 +-
+ .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 3 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 3 +-
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 47 +-
+ arch/mips/cavium-octeon/octeon-memcpy.S | 5 +
+ arch/mips/cavium-octeon/setup.c | 23 +
+ arch/mips/cavium-octeon/smp.c | 21 +-
+ arch/mips/configs/ip22_defconfig | 4 +-
+ arch/mips/configs/ip27_defconfig | 2 +-
+ arch/mips/configs/lemote2f_defconfig | 2 +-
+ arch/mips/configs/loongson1b_defconfig | 4 +
+ arch/mips/configs/loongson1c_defconfig | 4 +
+ arch/mips/configs/malta_defconfig | 4 +-
+ arch/mips/configs/malta_kvm_defconfig | 4 +-
+ arch/mips/configs/malta_kvm_guest_defconfig | 4 +-
+ arch/mips/configs/maltaup_xpa_defconfig | 4 +-
+ arch/mips/configs/nlm_xlp_defconfig | 2 +-
+ arch/mips/configs/nlm_xlr_defconfig | 2 +-
+ arch/mips/configs/xilfpga_defconfig | 37 +-
+ arch/mips/configs/xway_defconfig | 21 +-
+ arch/mips/emma/markeins/setup.c | 2 +-
+ arch/mips/generic/Makefile | 1 +
+ arch/mips/generic/init.c | 13 +
+ arch/mips/generic/kexec.c | 44 +
+ arch/mips/include/asm/Kbuild | 2 +
+ arch/mips/include/asm/asm.h | 10 +-
+ arch/mips/include/asm/bootinfo.h | 13 +
+ arch/mips/include/asm/elf.h | 9 +
+ arch/mips/include/asm/highmem.h | 3 -
+ arch/mips/include/asm/i8259.h | 1 -
+ arch/mips/include/asm/irq.h | 12 +
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 9 +
+ .../asm/mach-cavium-octeon/kernel-entry-init.h | 15 +-
+ arch/mips/include/asm/mach-ip27/spaces.h | 6 +-
+ arch/mips/include/asm/mach-loongson32/loongson1.h | 9 +-
+ arch/mips/include/asm/mach-loongson32/platform.h | 9 +-
+ arch/mips/include/asm/mach-loongson32/regs-rtc.h | 23 +
+ arch/mips/include/asm/mach-ralink/mt7620.h | 7 +-
+ arch/mips/include/asm/mips-cm.h | 7 +
+ arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 3 +-
+ arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 3 +-
+ arch/mips/include/asm/octeon/cvmx-helper-spi.h | 3 +-
+ arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 3 +-
+ arch/mips/include/asm/octeon/cvmx-helper.h | 14 +-
+ arch/mips/include/asm/smp.h | 10 +-
+ arch/mips/include/asm/stackframe.h | 19 +-
+ arch/mips/include/asm/switch_to.h | 18 +-
+ arch/mips/include/asm/thread_info.h | 1 -
+ arch/mips/include/asm/uaccess.h | 18 +
+ arch/mips/include/asm/unaligned.h | 28 -
+ arch/mips/kernel/Makefile | 4 +-
+ arch/mips/kernel/asm-offsets.c | 2 +-
+ arch/mips/kernel/cacheinfo.c | 85 ++
+ arch/mips/kernel/cpu-bugs64.c | 24 +-
+ arch/mips/kernel/crash.c | 2 +-
+ arch/mips/kernel/entry.S | 18 -
+ arch/mips/kernel/genex.S | 81 +-
+ arch/mips/kernel/irq.c | 11 +
+ arch/mips/kernel/linux32.c | 11 +-
+ arch/mips/kernel/machine_kexec.c | 22 +
+ arch/mips/kernel/mcount.S | 3 +
+ arch/mips/kernel/mips-mt-fpaff.c | 5 +-
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +-
+ arch/mips/kernel/mips_ksyms.c | 94 ---
+ arch/mips/kernel/process.c | 214 +++--
+ arch/mips/kernel/prom.c | 7 +
+ arch/mips/kernel/ptrace.c | 34 +-
+ arch/mips/kernel/r2300_switch.S | 2 +
+ arch/mips/kernel/r4k_switch.S | 3 +
+ arch/mips/kernel/relocate.c | 56 +-
+ arch/mips/kernel/setup.c | 94 ++-
+ arch/mips/kernel/smp-bmips.c | 2 +-
+ arch/mips/kernel/smp-cps.c | 7 +-
+ arch/mips/kernel/smp.c | 34 +-
+ arch/mips/kernel/syscall.c | 11 +-
+ arch/mips/kernel/traps.c | 65 +-
+ arch/mips/kernel/uprobes.c | 2 +-
+ arch/mips/kernel/vmlinux.lds.S | 2 +-
+ arch/mips/lantiq/xway/dma.c | 38 +-
+ arch/mips/lantiq/xway/sysctrl.c | 4 +-
+ arch/mips/lib/csum_partial.S | 6 +
+ arch/mips/lib/memcpy.S | 9 +
+ arch/mips/lib/memset.S | 5 +
+ arch/mips/lib/strlen_user.S | 4 +
+ arch/mips/lib/strncpy_user.S | 7 +
+ arch/mips/lib/strnlen_user.S | 7 +
+ arch/mips/loongson32/common/platform.c | 45 +-
+ arch/mips/loongson32/ls1b/board.c | 7 +-
+ arch/mips/loongson32/ls1c/board.c | 7 +-
+ arch/mips/loongson64/common/dma-swiotlb.c | 20 +-
+ arch/mips/loongson64/loongson-3/smp.c | 1 -
+ arch/mips/mm/c-r4k.c | 6 +-
+ arch/mips/mm/init.c | 2 +
+ arch/mips/mm/mmap.c | 10 +-
+ arch/mips/mm/page-funcs.S | 3 +
+ arch/mips/mm/page.c | 2 +
+ arch/mips/mm/sc-ip22.c | 54 +-
+ arch/mips/mm/sc-mips.c | 1 +
+ arch/mips/mm/tlbex.c | 6 +-
+ arch/mips/netlogic/common/irq.c | 4 +-
+ arch/mips/netlogic/common/smpboot.S | 4 +-
+ arch/mips/netlogic/xlp/wakeup.c | 2 +-
+ arch/mips/pci/pci-tx4927.c | 22 +-
+ arch/mips/pci/pci-tx4938.c | 30 +-
+ arch/mips/pci/pci-tx4939.c | 10 +-
+ arch/mips/ralink/Kconfig | 1 +
+ arch/mips/ralink/clk.c | 6 +
+ arch/mips/ralink/irq.c | 4 +-
+ arch/mips/ralink/mt7620.c | 31 +-
+ arch/mips/ralink/mt7621.c | 2 +-
+ arch/mips/ralink/of.c | 16 +-
+ arch/mips/ralink/prom.c | 9 +-
+ arch/mips/ralink/rt288x.c | 11 +-
+ arch/mips/ralink/rt305x.c | 13 +-
+ arch/mips/ralink/rt3883.c | 14 +-
+ arch/mips/ralink/timer.c | 14 -
+ arch/mips/sgi-ip22/Platform | 2 +-
+ arch/mips/sgi-ip27/ip27-klnuma.c | 2 +-
+ arch/mips/sgi-ip32/ip32-irq.c | 4 +-
+ arch/mips/txx9/generic/7segled.c | 4 +-
+ arch/mips/txx9/generic/pci.c | 28 +-
+ arch/mips/txx9/generic/setup_tx3927.c | 6 +-
+ arch/mips/txx9/generic/setup_tx4927.c | 20 +-
+ arch/mips/txx9/generic/setup_tx4938.c | 28 +-
+ arch/mips/txx9/generic/setup_tx4939.c | 8 +-
+ arch/mips/txx9/generic/smsc_fdc37m81x.c | 17 +-
+ arch/mips/txx9/jmr3927/prom.c | 2 +-
+ arch/mips/txx9/jmr3927/setup.c | 11 +-
+ arch/mips/txx9/rbtx4938/setup.c | 14 +-
+ arch/mips/vdso/Makefile | 7 +-
+ arch/mips/xilfpga/intc.c | 7 +-
+ drivers/of/base.c | 2 +-
+ drivers/of/fdt.c | 9 +-
+ 166 files changed, 3194 insertions(+), 792 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt
+ create mode 100644 arch/mips/Makefile.postlink
+ create mode 100644 arch/mips/boot/dts/img/Makefile
+ create mode 100644 arch/mips/boot/dts/img/pistachio.dtsi
+ create mode 100644 arch/mips/boot/dts/img/pistachio_marduk.dts
+ create mode 100644 arch/mips/generic/kexec.c
+ create mode 100644 arch/mips/include/asm/mach-loongson32/regs-rtc.h
+ delete mode 100644 arch/mips/include/asm/unaligned.h
+ create mode 100644 arch/mips/kernel/cacheinfo.c
+ delete mode 100644 arch/mips/kernel/mips_ksyms.c
+Merging nios2/for-next (744606c76c4a nios2: add screen_info)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
+$ git merge openrisc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ arch/openrisc/Kconfig | 1 +
+ arch/openrisc/TODO.openrisc | 1 -
+ arch/openrisc/include/asm/Kbuild | 5 +-
+ arch/openrisc/include/asm/atomic.h | 53 +++++++
+ arch/openrisc/include/asm/bitops.h | 2 +-
+ arch/openrisc/include/asm/bitops/atomic.h | 103 +++++++++++++
+ arch/openrisc/include/asm/cmpxchg.h | 82 ++++++++++
+ arch/openrisc/include/asm/cpuinfo.h | 2 +
+ arch/openrisc/include/asm/futex.h | 135 +++++++++++++++++
+ arch/openrisc/include/asm/spinlock.h | 232 ++++++++++++++++++++++++++++-
+ arch/openrisc/include/asm/spinlock_types.h | 28 ++++
+ arch/openrisc/include/asm/spr_defs.h | 4 +-
+ arch/openrisc/include/asm/string.h | 10 ++
+ arch/openrisc/kernel/.gitignore | 1 +
+ arch/openrisc/kernel/entry.S | 60 +++++---
+ arch/openrisc/kernel/head.S | 195 +++++++++---------------
+ arch/openrisc/kernel/or32_ksyms.c | 1 +
+ arch/openrisc/kernel/process.c | 17 +++
+ arch/openrisc/kernel/ptrace.c | 1 -
+ arch/openrisc/kernel/setup.c | 67 +++++----
+ arch/openrisc/kernel/traps.c | 183 +++++++++++++++++++++++
+ arch/openrisc/lib/Makefile | 2 +-
+ arch/openrisc/lib/memcpy.c | 124 +++++++++++++++
+ arch/openrisc/lib/memset.S | 98 ++++++++++++
+ scripts/checkstack.pl | 3 +
+ 26 files changed, 1224 insertions(+), 187 deletions(-)
+ create mode 100644 arch/openrisc/include/asm/atomic.h
+ create mode 100644 arch/openrisc/include/asm/bitops/atomic.h
+ create mode 100644 arch/openrisc/include/asm/cmpxchg.h
+ create mode 100644 arch/openrisc/include/asm/futex.h
+ create mode 100644 arch/openrisc/include/asm/spinlock_types.h
+ create mode 100644 arch/openrisc/include/asm/string.h
+ create mode 100644 arch/openrisc/kernel/.gitignore
+ create mode 100644 arch/openrisc/lib/memcpy.c
+ create mode 100644 arch/openrisc/lib/memset.S
+Merging parisc-hd/for-next (69973b830859 Linux 4.9)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (7ce7d89f4883 Linux 4.10-rc1)
+$ git merge powerpc/next
+Already up-to-date.
+Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
+$ 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 (9437964885f8 s390/bpf: remove redundant check for non-null image)
+$ git merge s390/features
+Auto-merging drivers/s390/virtio/virtio_ccw.c
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +-
+ arch/s390/Kconfig.debug | 4 +
+ arch/s390/include/asm/cpu_mf.h | 5 +-
+ arch/s390/include/asm/ctl_reg.h | 4 +-
+ arch/s390/include/asm/pci_clp.h | 2 +-
+ arch/s390/include/asm/sclp.h | 1 +
+ arch/s390/include/asm/uaccess.h | 4 +-
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/early.c | 12 ++
+ arch/s390/kernel/early_printk.c | 35 ++++
+ arch/s390/kernel/ipl.c | 3 +-
+ arch/s390/kernel/os_info.c | 6 +-
+ arch/s390/kernel/perf_cpum_cf_events.c | 2 +-
+ arch/s390/kernel/processor.c | 2 +-
+ arch/s390/kernel/sclp.c | 47 ++++--
+ arch/s390/kernel/setup.c | 2 +
+ arch/s390/kernel/time.c | 2 +-
+ arch/s390/kernel/topology.c | 19 +--
+ arch/s390/kvm/priv.c | 2 +-
+ arch/s390/kvm/vsie.c | 2 +-
+ arch/s390/lib/mem.S | 28 ++--
+ arch/s390/mm/extmem.c | 2 +-
+ arch/s390/mm/mem_detect.c | 6 +-
+ arch/s390/net/bpf_jit_comp.c | 11 +-
+ arch/s390/pci/pci.c | 8 +-
+ drivers/s390/char/con3270.c | 2 +-
+ drivers/s390/char/raw3270.c | 2 +-
+ drivers/s390/char/zcore.c | 3 +-
+ drivers/s390/cio/chp.c | 13 +-
+ drivers/s390/cio/chp.h | 2 +-
+ drivers/s390/cio/chsc.c | 48 +++++-
+ drivers/s390/cio/chsc.h | 2 +
+ drivers/s390/cio/cmf.c | 10 +-
+ drivers/s390/cio/css.c | 209 ++++++++++++------------
+ drivers/s390/cio/css.h | 13 +-
+ drivers/s390/crypto/ap_asm.h | 10 +-
+ drivers/s390/crypto/ap_card.c | 2 +-
+ drivers/s390/crypto/ap_queue.c | 2 +-
+ drivers/s390/crypto/zcrypt_api.c | 4 +-
+ drivers/s390/virtio/virtio_ccw.c | 2 +-
+ 40 files changed, 332 insertions(+), 208 deletions(-)
+ create mode 100644 arch/s390/kernel/early_printk.c
+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 (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
+$ git merge tile/master
+Already up-to-date.
+Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
+$ git merge unicore32/unicore32
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 14 +
+ arch/unicore32/include/asm/Kbuild | 3 -
+ arch/unicore32/include/asm/signal.h | 21 +
+ arch/unicore32/include/asm/syscalls.h | 25 +
+ arch/unicore32/include/uapi/asm/sigcontext.h | 14 +
+ arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++
+ arch/unicore32/include/uapi/asm/stat.h | 19 +
+ arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
+ arch/unicore32/include/uapi/asm/unistd.h | 8 +
+ arch/unicore32/kernel/entry.S | 17 +
+ arch/unicore32/kernel/signal.c | 41 ++
+ 11 files changed, 1000 insertions(+), 3 deletions(-)
+ create mode 100644 arch/unicore32/include/asm/signal.h
+ create mode 100644 arch/unicore32/include/asm/syscalls.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat.h
+ create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
+Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
+$ git merge xtensa/xtensa-for-next
+Already up-to-date.
+Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
+$ git merge fscrypt/master
+Auto-merging fs/f2fs/super.c
+Merge made by the 'recursive' strategy.
+ fs/crypto/Kconfig | 1 -
+ fs/crypto/Makefile | 1 +
+ fs/crypto/bio.c | 145 ++++++++++++++++++++++++++++++++++++++++
+ fs/crypto/crypto.c | 157 +++++---------------------------------------
+ fs/crypto/fname.c | 4 +-
+ fs/crypto/fscrypt_private.h | 16 ++++-
+ fs/crypto/keyinfo.c | 46 +++++--------
+ fs/crypto/policy.c | 95 ++++++++++-----------------
+ fs/ext4/ext4.h | 11 ----
+ fs/ext4/ialloc.c | 2 +-
+ fs/ext4/namei.c | 16 ++++-
+ fs/ext4/super.c | 13 +---
+ fs/f2fs/dir.c | 5 +-
+ fs/f2fs/f2fs.h | 9 ---
+ fs/f2fs/namei.c | 4 +-
+ fs/f2fs/super.c | 14 +---
+ fs/ubifs/crypto.c | 11 +---
+ include/linux/fscrypto.h | 14 ++--
+ 18 files changed, 263 insertions(+), 301 deletions(-)
+ create mode 100644 fs/crypto/bio.c
+Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
+$ git merge btrfs/next
+Already up-to-date.
+Merging btrfs-kdave/for-next (640764eb528b Merge branch 'for-next-next-v4.11-20170120' into for-next-20170120)
+$ git merge btrfs-kdave/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/btrfs_inode.h | 26 ++--
+ fs/btrfs/compression.c | 2 +-
+ fs/btrfs/ctree.c | 66 ++++----
+ fs/btrfs/ctree.h | 70 +++++----
+ fs/btrfs/delayed-inode.c | 57 ++++---
+ fs/btrfs/delayed-inode.h | 16 +-
+ fs/btrfs/delayed-ref.c | 6 +-
+ fs/btrfs/delayed-ref.h | 3 +-
+ fs/btrfs/dir-item.c | 5 +-
+ fs/btrfs/export.c | 13 +-
+ fs/btrfs/extent-tree.c | 38 ++---
+ fs/btrfs/extent_io.c | 21 +--
+ fs/btrfs/file-item.c | 8 +-
+ fs/btrfs/file.c | 17 +-
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/inode.c | 360 +++++++++++++++++++++++--------------------
+ fs/btrfs/ioctl.c | 66 ++++----
+ fs/btrfs/ordered-data.c | 47 +++---
+ fs/btrfs/ordered-data.h | 2 +-
+ fs/btrfs/props.c | 4 +-
+ fs/btrfs/qgroup.c | 31 +++-
+ fs/btrfs/raid56.c | 2 -
+ fs/btrfs/relocation.c | 18 +--
+ fs/btrfs/root-tree.c | 6 +-
+ fs/btrfs/send.c | 37 ++++-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/transaction.c | 14 +-
+ fs/btrfs/tree-log.c | 291 +++++++++++++++++-----------------
+ fs/btrfs/tree-log.h | 14 +-
+ fs/btrfs/xattr.c | 16 +-
+ include/trace/events/btrfs.h | 2 +-
+ 31 files changed, 664 insertions(+), 598 deletions(-)
+Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/readdir.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 15 ---------------
+ fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++-
+ fs/ecryptfs/keystore.c | 2 +-
+ fs/ecryptfs/main.c | 2 +-
+ fs/ecryptfs/miscdev.c | 2 +-
+ 5 files changed, 11 insertions(+), 19 deletions(-)
+Merging ext3/for_next (70f16cef06b5 udf: allow implicit blocksize specification during mount)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/udf/ecma_167.h | 98 ++++++++++++++++++++++-----------------------
+ fs/udf/inode.c | 118 +++++++++++++++++++++++-------------------------------
+ fs/udf/lowlevel.c | 2 +-
+ fs/udf/misc.c | 2 -
+ fs/udf/namei.c | 2 +-
+ fs/udf/osta_udf.h | 34 ++++++++--------
+ fs/udf/super.c | 53 +++++++++++++++---------
+ fs/udf/symlink.c | 30 ++++++++++++++
+ fs/udf/udfdecl.h | 2 +-
+ 9 files changed, 183 insertions(+), 158 deletions(-)
+Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/extents.c | 27 ++++++++++++++++++---------
+ fs/ext4/namei.c | 12 ++++++++++++
+ 2 files changed, 30 insertions(+), 9 deletions(-)
+Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/f2fs/namei.c
+Auto-merging fs/f2fs/f2fs.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 2 +
+ fs/f2fs/checkpoint.c | 33 +++++-----
+ fs/f2fs/data.c | 80 +++++++++++++++++++---
+ fs/f2fs/debug.c | 7 ++
+ fs/f2fs/extent_cache.c | 22 +++----
+ fs/f2fs/f2fs.h | 35 +++++++++-
+ fs/f2fs/file.c | 17 +++--
+ fs/f2fs/gc.c | 6 ++
+ fs/f2fs/namei.c | 18 ++++-
+ fs/f2fs/node.c | 38 +++++++++--
+ fs/f2fs/node.h | 17 ++++-
+ fs/f2fs/recovery.c | 4 --
+ fs/f2fs/segment.c | 131 ++++++++++++++++++++++++++++++-------
+ fs/f2fs/segment.h | 27 ++++++++
+ fs/f2fs/super.c | 38 ++++++++++-
+ include/linux/f2fs_fs.h | 6 ++
+ include/trace/events/f2fs.h | 86 +++++++++++++++---------
+ 17 files changed, 451 insertions(+), 116 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 (210675270caa fuse: fix time_to_jiffies nsec sanity check)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/for-next (b63f5e84826b GFS2: Wake up io waiters whenever a flush is done)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/log.c
+Auto-merging fs/gfs2/glock.c
+Auto-merging fs/gfs2/bmap.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/bmap.c | 29 ++++++++++++++++++++++++++---
+ fs/gfs2/glock.c | 12 +++++++-----
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/log.c | 15 ++++++++++++---
+ fs/gfs2/ops_fstype.c | 1 +
+ 5 files changed, 47 insertions(+), 11 deletions(-)
+Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (c929ea0b9103 SUNRPC: cleanup ida information when removing sunrpc module)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4proc.c | 4 +++-
+ include/linux/nfs4.h | 3 ++-
+ include/linux/sunrpc/clnt.h | 1 +
+ net/sunrpc/clnt.c | 5 +++++
+ net/sunrpc/sunrpc_syms.c | 1 +
+ 5 files changed, 12 insertions(+), 2 deletions(-)
+Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/svc.c | 2 +
+ fs/nfsd/export.c | 1 +
+ fs/nfsd/nfs3proc.c | 8 +--
+ fs/nfsd/nfs4proc.c | 6 +-
+ fs/nfsd/nfs4xdr.c | 9 ++-
+ fs/nfsd/nfsctl.c | 10 ++-
+ fs/nfsd/nfsd.h | 6 +-
+ fs/nfsd/nfsproc.c | 8 +--
+ fs/nfsd/nfssvc.c | 2 +
+ fs/nfsd/vfs.c | 142 ++++++++++++++------------------------
+ fs/nfsd/vfs.h | 6 +-
+ include/linux/sunrpc/cache.h | 1 +
+ include/uapi/linux/nfsd/export.h | 5 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 4 +-
+ net/sunrpc/cache.c | 12 ++++
+ 15 files changed, 103 insertions(+), 119 deletions(-)
+Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
+$ git merge orangefs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (4c7d0c9cb713 ovl: fix possible use after free on redirect dir lookup)
+$ git merge overlayfs/overlayfs-next
+Already up-to-date.
+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 (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (83d230eb5c63 xfs: verify dirblocklog correctly)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/libxfs/xfs_bmap.c | 44 ++++++++++++++++++++++++++++++++------------
+ fs/xfs/libxfs/xfs_bmap.h | 6 +++++-
+ fs/xfs/libxfs/xfs_sb.c | 2 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ 4 files changed, 39 insertions(+), 15 deletions(-)
+Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
+$ git merge vfs/for-next
+Resolved 'drivers/block/nbd.c' using previous resolution.
+Auto-merging net/unix/af_unix.c
+Auto-merging net/socket.c
+Auto-merging net/core/skbuff.c
+Auto-merging include/net/tcp.h
+Auto-merging include/linux/skbuff.h
+Auto-merging drivers/block/nbd.c
+CONFLICT (content): Merge conflict in drivers/block/nbd.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 72daff6d58d3] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/block/drbd/drbd_main.c | 11 ++-
+ drivers/block/nbd.c | 76 +++++++++------------
+ drivers/target/iscsi/iscsi_target_util.c | 64 +++++++----------
+ drivers/usb/usbip/usbip_common.c | 32 +++------
+ fs/afs/rxrpc.c | 15 ++--
+ fs/ncpfs/sock.c | 111 +++++++++++-------------------
+ fs/splice.c | 22 +++---
+ include/linux/fs.h | 1 +
+ include/linux/net.h | 2 +-
+ include/linux/skbuff.h | 3 +-
+ include/linux/splice.h | 4 +-
+ include/net/tcp.h | 2 +-
+ kernel/relay.c | 1 -
+ kernel/trace/trace.c | 2 -
+ net/ceph/messenger.c | 44 ++++++++----
+ net/core/skbuff.c | 4 +-
+ net/ipv4/tcp.c | 7 +-
+ net/kcm/kcmsock.c | 5 +-
+ net/rds/page.c | 29 --------
+ net/rds/rds.h | 7 --
+ net/socket.c | 4 +-
+ net/unix/af_unix.c | 113 +++----------------------------
+ 22 files changed, 186 insertions(+), 373 deletions(-)
+Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
+$ git merge vfs-jk/vfs
+Already up-to-date.
+Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
+$ git merge vfs-miklos/next
+Resolved 'fs/overlayfs/dir.c' using previous resolution.
+Resolved 'fs/read_write.c' using previous resolution.
+Auto-merging include/linux/fs.h
+Auto-merging fs/read_write.c
+CONFLICT (content): Merge conflict in fs/read_write.c
+Auto-merging fs/proc/namespaces.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/overlayfs/dir.c
+CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
+Auto-merging fs/nsfs.c
+Auto-merging fs/namei.c
+Auto-merging Documentation/filesystems/vfs.txt
+Auto-merging Documentation/filesystems/Locking
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cc20a513c0f8] Merge remote-tracking branch 'vfs-miklos/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 6 ++--
+ Documentation/filesystems/porting | 3 ++
+ Documentation/filesystems/vfs.txt | 5 ++-
+ fs/afs/mntpt.c | 2 +-
+ fs/bad_inode.c | 8 +----
+ fs/namei.c | 65 +++++++++++++++------------------------
+ fs/nsfs.c | 17 +++++++---
+ fs/overlayfs/dir.c | 3 +-
+ fs/proc/base.c | 57 ++++++++++++----------------------
+ fs/proc/namespaces.c | 13 ++++----
+ fs/read_write.c | 17 +++++++---
+ include/linux/fs.h | 6 +---
+ include/linux/proc_ns.h | 4 +--
+ 13 files changed, 89 insertions(+), 117 deletions(-)
+Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
+$ git merge printk/for-next
+Auto-merging kernel/printk/printk_safe.c
+Auto-merging kernel/panic.c
+Auto-merging kernel/kexec_core.c
+Auto-merging init/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 ++
+ include/linux/printk.h | 21 ++-
+ init/Kconfig | 16 ++-
+ init/main.c | 2 +-
+ kernel/kexec_core.c | 2 +-
+ kernel/panic.c | 4 +-
+ kernel/printk/Makefile | 2 +-
+ kernel/printk/internal.h | 79 ++++++-----
+ kernel/printk/printk.c | 232 ++++++++++++++------------------
+ kernel/printk/{nmi.c => printk_safe.c} | 234 +++++++++++++++++++++++----------
+ lib/nmi_backtrace.c | 2 +-
+ 11 files changed, 347 insertions(+), 255 deletions(-)
+ rename kernel/printk/{nmi.c => printk_safe.c} (53%)
+Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
+$ git merge pci/next
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/net/ethernet/amd/xgbe/xgbe.h
+Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-pci.c
+Merge made by the 'recursive' strategy.
+ Documentation/PCI/MSI-HOWTO.txt | 6 +-
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 +
+ .../devicetree/bindings/pci/rockchip-pcie.txt | 2 +
+ drivers/acpi/pci_mcfg.c | 5 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 8 +-
+ drivers/media/pci/cobalt/cobalt-driver.h | 2 -
+ drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 128 ++++++---------------
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 8 +-
+ drivers/pci/host/pci-dra7xx.c | 81 +++++++------
+ drivers/pci/host/pci-imx6.c | 4 +-
+ drivers/pci/host/pci-thunder-pem.c | 25 +++-
+ drivers/pci/host/pcie-rcar.c | 2 +-
+ drivers/pci/host/pcie-rockchip.c | 115 ++++++++++++++++++
+ drivers/pci/hotplug/acpiphp_ibm.c | 2 +-
+ drivers/pci/hotplug/rpadlpar_core.c | 4 +-
+ drivers/pci/msi.c | 28 ++---
+ drivers/pci/probe.c | 15 ++-
+ include/linux/pci.h | 16 +--
+ 18 files changed, 261 insertions(+), 191 deletions(-)
+Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (8098418ae7c3 Merge branch 'for-4.11/wacom' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/hid-over-i2c.txt | 5 +
+ drivers/hid/Kconfig | 5 +
+ drivers/hid/hid-core.c | 26 +-
+ drivers/hid/hid-ids.h | 10 +-
+ drivers/hid/hid-mf.c | 19 +-
+ drivers/hid/hid-microsoft.c | 12 -
+ drivers/hid/hid-rmi.c | 975 +++------------------
+ drivers/hid/i2c-hid/i2c-hid.c | 45 +-
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 4 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 1 -
+ drivers/hid/intel-ish-hid/ishtp/init.c | 1 -
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 3 +-
+ drivers/hid/usbhid/hid-core.c | 3 +-
+ drivers/hid/usbhid/hid-quirks.c | 12 +-
+ drivers/hid/usbhid/usbkbd.c | 3 +-
+ drivers/hid/usbhid/usbmouse.c | 3 +-
+ drivers/hid/wacom.h | 2 +-
+ drivers/hid/wacom_sys.c | 36 +-
+ include/linux/i2c/i2c-hid.h | 6 +
+ 20 files changed, 263 insertions(+), 910 deletions(-)
+Merging i2c/i2c/for-next (701dc207bf55 i2c: piix4: Avoid race conditions with IMC)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+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 (0c744ea4f77d Linux 4.10-rc2)
+$ git merge dmi/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (2c72fa4f5882 hwmon: Make name attribute mandatory for new APIs)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/adc128d818.txt | 38 +++
+ Documentation/devicetree/bindings/hwmon/lm70.txt | 1 +
+ Documentation/hwmon/lm70 | 8 +-
+ Documentation/hwmon/sht21 | 5 +-
+ drivers/hwmon/adc128d818.c | 147 ++++++---
+ drivers/hwmon/adm1021.c | 14 +-
+ drivers/hwmon/adm1025.c | 16 +-
+ drivers/hwmon/adm1026.c | 128 ++++----
+ drivers/hwmon/adm1031.c | 15 +-
+ drivers/hwmon/adm9240.c | 28 +-
+ drivers/hwmon/adt7411.c | 361 ++++++++++++++++++---
+ drivers/hwmon/adt7470.c | 48 ++-
+ drivers/hwmon/adt7475.c | 28 +-
+ drivers/hwmon/adt7x10.c | 7 +-
+ drivers/hwmon/asb100.c | 36 +-
+ drivers/hwmon/atxp1.c | 35 +-
+ drivers/hwmon/dme1737.c | 46 +--
+ drivers/hwmon/ds1621.c | 16 +-
+ drivers/hwmon/emc2103.c | 36 +-
+ drivers/hwmon/f71805f.c | 16 +-
+ drivers/hwmon/f71882fg.c | 6 +-
+ drivers/hwmon/fam15h_power.c | 34 +-
+ drivers/hwmon/fschmd.c | 6 +-
+ drivers/hwmon/g760a.c | 22 +-
+ drivers/hwmon/g762.c | 86 +++--
+ drivers/hwmon/gl518sm.c | 13 +-
+ drivers/hwmon/gl520sm.c | 73 +++--
+ drivers/hwmon/gpio-fan.c | 54 +--
+ drivers/hwmon/hwmon.c | 10 +-
+ drivers/hwmon/i5500_temp.c | 6 +-
+ drivers/hwmon/i5k_amb.c | 4 +-
+ drivers/hwmon/it87.c | 20 +-
+ drivers/hwmon/jz4740-hwmon.c | 6 +-
+ drivers/hwmon/k10temp.c | 12 +-
+ drivers/hwmon/k8temp.c | 4 +-
+ drivers/hwmon/lm63.c | 48 ++-
+ drivers/hwmon/lm70.c | 18 +-
+ drivers/hwmon/lm78.c | 38 +--
+ drivers/hwmon/lm80.c | 4 +-
+ drivers/hwmon/lm83.c | 4 +-
+ drivers/hwmon/lm85.c | 22 +-
+ drivers/hwmon/lm87.c | 43 +--
+ drivers/hwmon/lm90.c | 8 +-
+ drivers/hwmon/lm92.c | 10 +-
+ drivers/hwmon/lm93.c | 39 +--
+ drivers/hwmon/lm95234.c | 12 +-
+ drivers/hwmon/ltc4151.c | 1 +
+ drivers/hwmon/max1111.c | 4 +-
+ drivers/hwmon/max1619.c | 4 +-
+ drivers/hwmon/max197.c | 6 +-
+ drivers/hwmon/max6650.c | 44 +--
+ drivers/hwmon/mc13783-adc.c | 6 +-
+ drivers/hwmon/mcp3021.c | 6 +-
+ drivers/hwmon/nct6683.c | 17 +-
+ drivers/hwmon/nct6775.c | 4 +-
+ drivers/hwmon/nsa320-hwmon.c | 12 +-
+ drivers/hwmon/pc87360.c | 26 +-
+ drivers/hwmon/pc87427.c | 4 +-
+ drivers/hwmon/pcf8591.c | 24 +-
+ drivers/hwmon/sch5627.c | 4 +-
+ drivers/hwmon/sch56xx-common.c | 1 -
+ drivers/hwmon/sht15.c | 4 +-
+ drivers/hwmon/sht21.c | 92 +++++-
+ drivers/hwmon/sis5595.c | 36 +-
+ drivers/hwmon/smsc47m1.c | 10 +-
+ drivers/hwmon/smsc47m192.c | 14 +-
+ drivers/hwmon/tmp401.c | 60 ++--
+ drivers/hwmon/via-cputemp.c | 6 +-
+ drivers/hwmon/via686a.c | 8 +-
+ drivers/hwmon/vt8231.c | 59 ++--
+ drivers/hwmon/w83627ehf.c | 8 +-
+ drivers/hwmon/w83627hf.c | 53 +--
+ drivers/hwmon/w83781d.c | 34 +-
+ drivers/hwmon/w83791d.c | 23 +-
+ drivers/hwmon/w83792d.c | 15 +-
+ drivers/hwmon/w83793.c | 6 +-
+ 76 files changed, 1343 insertions(+), 879 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt
+Merging jc_docs/docs-next (43d8808b0820 Documentation: cpuset: Fix 'cpuset.tasks' -> 'tasks')
+$ git merge jc_docs/docs-next
+Removing Documentation/cpu-hotplug.txt
+Removing Documentation/DocBook/iio.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/iio.tmpl | 697 ---------------------
+ Documentation/admin-guide/README.rst | 4 +-
+ Documentation/cgroup-v1/cpusets.txt | 2 +-
+ Documentation/core-api/cpu_hotplug.rst | 372 +++++++++++
+ Documentation/core-api/index.rst | 1 +
+ Documentation/cpu-freq/user-guide.txt | 4 +-
+ Documentation/cpu-hotplug.txt | 452 -------------
+ Documentation/driver-api/iio/buffers.rst | 125 ++++
+ Documentation/driver-api/iio/core.rst | 182 ++++++
+ Documentation/driver-api/iio/index.rst | 17 +
+ Documentation/driver-api/iio/intro.rst | 33 +
+ Documentation/driver-api/iio/triggered-buffers.rst | 69 ++
+ Documentation/driver-api/iio/triggers.rst | 80 +++
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/hwmon/ds1621 | 8 +-
+ Documentation/pps/pps.txt | 18 +-
+ Documentation/thermal/nouveau_thermal | 2 +-
+ scripts/kernel-doc | 101 ++-
+ 19 files changed, 978 insertions(+), 1192 deletions(-)
+ delete mode 100644 Documentation/DocBook/iio.tmpl
+ create mode 100644 Documentation/core-api/cpu_hotplug.rst
+ delete mode 100644 Documentation/cpu-hotplug.txt
+ create mode 100644 Documentation/driver-api/iio/buffers.rst
+ create mode 100644 Documentation/driver-api/iio/core.rst
+ create mode 100644 Documentation/driver-api/iio/index.rst
+ create mode 100644 Documentation/driver-api/iio/intro.rst
+ create mode 100644 Documentation/driver-api/iio/triggered-buffers.rst
+ create mode 100644 Documentation/driver-api/iio/triggers.rst
+Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ drivers/media/cec/cec-adap.c | 103 ++++++++++++-------------
+ drivers/media/dvb-core/dvb_net.c | 15 ++--
+ drivers/media/i2c/Kconfig | 1 +
+ drivers/media/i2c/smiapp/smiapp-core.c | 33 +++-----
+ drivers/media/i2c/tvp5150.c | 56 ++++++++------
+ drivers/media/i2c/tvp5150_reg.h | 9 +++
+ drivers/media/usb/dvb-usb/pctv452e.c | 133 ++++++++++++++++++---------------
+ include/uapi/linux/cec-funcs.h | 10 ++-
+ 8 files changed, 193 insertions(+), 167 deletions(-)
+Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
+$ git merge fbdev/fbdev-for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/console/fbcon.c | 67 ++++++++++++++++-----------
+ drivers/video/fbdev/imxfb.c | 6 ++-
+ drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 10 +++-
+ drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 5 +-
+ drivers/video/fbdev/maxinefb.c | 2 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 +--
+ drivers/video/fbdev/simplefb.c | 56 +++++++++++++++-------
+ drivers/video/fbdev/wm8505fb.c | 2 +-
+ include/linux/platform_data/video-imxfb.h | 4 --
+ 9 files changed, 102 insertions(+), 56 deletions(-)
+Merging pm/linux-next (10e335ed42b3 Merge branches 'acpica', 'pm-cpufreq' and 'pm-sleep' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/power/states.txt | 4 +---
+ drivers/acpi/acpica/tbdata.c | 9 ++-------
+ drivers/acpi/acpica/tbinstal.c | 17 +++++++++++++++--
+ drivers/acpi/sleep.c | 8 --------
+ drivers/cpufreq/intel_pstate.c | 14 +++++++++++++-
+ include/linux/suspend.h | 2 --
+ kernel/power/suspend.c | 4 ++--
+ 7 files changed, 33 insertions(+), 25 deletions(-)
+Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+Merging thermal/next (e4004621061f Merge branch 'thermal-soc' into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/clock_cooling.c | 50 +++++---------------------
+ drivers/thermal/cpu_cooling.c | 63 ++++++--------------------------
+ drivers/thermal/devfreq_cooling.c | 53 +++++----------------------
+ drivers/thermal/thermal_core.c | 75 ++++++++++++++-------------------------
+ include/linux/thermal.h | 4 +--
+ 5 files changed, 56 insertions(+), 189 deletions(-)
+Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
+$ git merge thermal-soc/next
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/rcar-gen3-thermal.txt | 56 ++++
+ drivers/thermal/Kconfig | 9 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/mtk_thermal.c | 16 +-
+ drivers/thermal/rcar_gen3_thermal.c | 335 +++++++++++++++++++++
+ drivers/thermal/ti-soc-thermal/Kconfig | 1 -
+ drivers/thermal/ti-soc-thermal/dra752-bandgap.h | 19 --
+ .../thermal/ti-soc-thermal/dra752-thermal-data.c | 28 +-
+ 8 files changed, 410 insertions(+), 55 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt
+ create mode 100644 drivers/thermal/rcar_gen3_thermal.c
+Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
+$ git merge swiotlb/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/xen/swiotlb-xen.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+Merging net-next/master (264e6777f958 Merge branch 'netvsc-enhancements')
+$ git merge net-next/master
+Resolved 'net/mpls/af_mpls.c' using previous resolution.
+Auto-merging net/tipc/node.c
+Auto-merging net/socket.c
+Removing net/sctp/ssnmap.c
+Auto-merging net/rds/rds.h
+Auto-merging net/packet/af_packet.c
+Auto-merging net/mpls/mpls_iptunnel.c
+Auto-merging net/mpls/af_mpls.c
+CONFLICT (content): Merge conflict in net/mpls/af_mpls.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv6/ip6_gre.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/ipv4/ip_tunnel_core.c
+Auto-merging net/dsa/slave.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/lwt_bpf.c
+Auto-merging net/core/dev.c
+Auto-merging net/bridge/br_netlink.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/net/tcp.h
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/bpf.h
+Auto-merging fs/afs/rxrpc.c
+Auto-merging drivers/net/xen-netfront.c
+Auto-merging drivers/net/vxlan.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/net/usb/cdc_ether.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/net/phy/marvell.c
+Removing drivers/net/ethernet/synopsys/dwc_eth_qos.c
+Removing drivers/net/ethernet/synopsys/Makefile
+Removing drivers/net/ethernet/synopsys/Kconfig
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_roce.c
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_ll2.h
+Auto-merging drivers/net/ethernet/qlogic/qed/qed_ll2.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+Auto-merging drivers/net/ethernet/ibm/ibmveth.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/atheros/alx/main.c
+Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/dra7.dtsi
+Auto-merging arch/arm/boot/dts/dm814x.dtsi
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 04585387ac6c] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 10 +-
+ .../devicetree/bindings/net/brcm,systemport.txt | 5 +-
+ Documentation/devicetree/bindings/net/cpsw.txt | 3 -
+ Documentation/devicetree/bindings/net/dsa/dsa.txt | 20 +-
+ .../devicetree/bindings/net/dsa/marvell.txt | 41 +-
+ .../devicetree/bindings/net/meson-dwmac.txt | 16 +
+ .../bindings/net/snps,dwc-qos-ethernet.txt | 3 +
+ Documentation/devicetree/bindings/net/stmmac.txt | 3 +-
+ .../devicetree/bindings/net/wireless/ieee80211.txt | 24 +
+ Documentation/driver-api/80211/cfg80211.rst | 3 +
+ Documentation/networking/ip-sysctl.txt | 40 +-
+ Documentation/networking/packet_mmap.txt | 9 +-
+ Documentation/networking/regulatory.txt | 8 +-
+ Documentation/siphash.txt | 175 ++
+ Documentation/sysctl/net.txt | 21 +
+ MAINTAINERS | 34 +-
+ arch/Kconfig | 3 +
+ arch/arm/boot/dts/am33xx.dtsi | 1 -
+ arch/arm/boot/dts/am4372.dtsi | 1 -
+ arch/arm/boot/dts/dm814x.dtsi | 1 -
+ arch/arm/boot/dts/dra7.dtsi | 1 -
+ arch/arm/configs/multi_v7_defconfig | 3 +-
+ arch/m68k/emu/nfeth.c | 1 -
+ arch/sparc/Kconfig | 1 +
+ drivers/atm/eni.c | 2 +-
+ drivers/atm/midway.h | 2 +-
+ drivers/infiniband/hw/mlx5/cq.c | 10 +-
+ drivers/infiniband/hw/mlx5/main.c | 330 ++-
+ drivers/infiniband/hw/mlx5/mem.c | 32 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 121 +-
+ drivers/infiniband/hw/mlx5/mr.c | 518 ++--
+ drivers/infiniband/hw/mlx5/odp.c | 424 ++-
+ drivers/infiniband/hw/mlx5/qp.c | 444 ++-
+ drivers/net/bonding/bond_main.c | 10 +-
+ drivers/net/dsa/b53/b53_common.c | 95 +-
+ drivers/net/dsa/b53/b53_mdio.c | 13 +-
+ drivers/net/dsa/b53/b53_priv.h | 61 +-
+ drivers/net/dsa/bcm_sf2.c | 222 +-
+ drivers/net/dsa/bcm_sf2.h | 41 +-
+ drivers/net/dsa/bcm_sf2_regs.h | 47 +-
+ drivers/net/dsa/mv88e6060.c | 10 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 342 +--
+ drivers/net/dsa/mv88e6xxx/global2.c | 111 +-
+ drivers/net/dsa/mv88e6xxx/global2.h | 33 +-
+ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 43 +-
+ drivers/net/dsa/qca8k.c | 2 +-
+ drivers/net/dummy.c | 222 +-
+ drivers/net/ethernet/3com/typhoon.c | 25 +-
+ drivers/net/ethernet/Kconfig | 2 +-
+ drivers/net/ethernet/Makefile | 2 +-
+ drivers/net/ethernet/alacritech/slicoss.c | 6 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 5 +-
+ drivers/net/ethernet/aquantia/Kconfig | 24 +
+ drivers/net/ethernet/aquantia/Makefile | 5 +
+ drivers/net/ethernet/aquantia/atlantic/Makefile | 42 +
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 77 +
+ drivers/net/ethernet/aquantia/atlantic/aq_common.h | 23 +
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 261 ++
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.h | 19 +
+ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 177 ++
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.c | 68 +
+ .../net/ethernet/aquantia/atlantic/aq_hw_utils.h | 47 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 273 ++
+ drivers/net/ethernet/aquantia/atlantic/aq_main.h | 17 +
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 937 ++++++
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 108 +
+ .../ethernet/aquantia/atlantic/aq_nic_internal.h | 46 +
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 345 +++
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.h | 34 +
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 376 +++
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 157 +
+ drivers/net/ethernet/aquantia/atlantic/aq_rss.h | 26 +
+ drivers/net/ethernet/aquantia/atlantic/aq_utils.h | 50 +
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 392 +++
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 42 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 905 ++++++
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h | 34 +
+ .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h | 155 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 958 ++++++
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 34 +
+ .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 207 ++
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 1394 +++++++++
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 677 +++++
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 2375 +++++++++++++++
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 570 ++++
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 210 ++
+ drivers/net/ethernet/aquantia/atlantic/ver.h | 18 +
+ drivers/net/ethernet/atheros/alx/main.c | 7 +-
+ drivers/net/ethernet/broadcom/b44.c | 5 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 334 ++-
+ drivers/net/ethernet/broadcom/bcmsysport.h | 80 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 5 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 15 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 199 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 437 ++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 125 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 117 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 23 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 295 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 20 +-
+ drivers/net/ethernet/broadcom/tg3.c | 8 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 6 +-
+ drivers/net/ethernet/cadence/macb.c | 32 +-
+ drivers/net/ethernet/cadence/macb.h | 74 +
+ drivers/net/ethernet/calxeda/xgmac.c | 5 +-
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 14 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 59 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 40 +-
+ .../net/ethernet/cavium/liquidio/liquidio_common.h | 2 +
+ .../net/ethernet/cavium/liquidio/octeon_config.h | 10 +-
+ .../net/ethernet/cavium/liquidio/octeon_console.c | 10 +
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 6 +
+ drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +-
+ .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 5 +-
+ .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 4 +-
+ .../net/ethernet/cavium/liquidio/octeon_mem_ops.c | 21 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 4 +-
+ .../net/ethernet/cavium/liquidio/request_manager.c | 49 +-
+ .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 14 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 84 +-
+ drivers/net/ethernet/chelsio/cxgb4/sched.c | 5 -
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 16 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 149 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 15 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 29 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 8 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 91 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c | 41 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 14 +-
+ drivers/net/ethernet/dlink/dl2k.c | 71 +-
+ drivers/net/ethernet/dlink/sundance.c | 14 +-
+ drivers/net/ethernet/ec_bhf.c | 4 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 73 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 5 +-
+ drivers/net/ethernet/ethoc.c | 9 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 14 +-
+ drivers/net/ethernet/fealnx.c | 14 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 18 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 7 +-
+ drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 51 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +-
+ drivers/net/ethernet/ibm/emac/core.c | 70 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 30 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 31 +-
+ drivers/net/ethernet/intel/e100.c | 14 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 4 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 14 +-
+ drivers/net/ethernet/intel/fm10k/fm10k.h | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 21 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 12 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 10 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 4 -
+ drivers/net/ethernet/intel/i40e/i40e.h | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 11 +
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 15 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 4 +
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 46 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 5 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 115 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 153 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 106 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 66 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 4 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 50 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 90 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 594 +++-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 +
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 72 +-
+ drivers/net/ethernet/intel/ixgbevf/mbx.h | 1 +
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 24 +-
+ drivers/net/ethernet/jme.c | 34 +-
+ drivers/net/ethernet/jme.h | 6 +-
+ drivers/net/ethernet/korina.c | 14 +-
+ drivers/net/ethernet/marvell/mvneta.c | 39 +-
+ drivers/net/ethernet/marvell/mvpp2.c | 4 +-
+ drivers/net/ethernet/marvell/skge.c | 63 +-
+ drivers/net/ethernet/marvell/sky2.c | 80 +-
+ drivers/net/ethernet/marvell/sky2.h | 1 +
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 33 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 23 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 218 ++
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 12 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 91 +-
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 89 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 47 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 40 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 299 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 20 +
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 73 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 12 +
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 72 +
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 114 -
+ drivers/net/ethernet/mellanox/mlx5/core/uar.c | 351 ++-
+ drivers/net/ethernet/mellanox/mlxsw/cmd.h | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 41 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 208 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 +
+ drivers/net/ethernet/micrel/ks8851.c | 7 -
+ drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 9 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_hw.h | 32 +-
+ .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 305 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.h | 60 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 31 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 31 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 43 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 36 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.h | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_roce.h | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_selftest.c | 32 +
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 32 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.c | 249 +-
+ drivers/net/ethernet/qlogic/qed/qed_sriov.h | 41 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.c | 44 +-
+ drivers/net/ethernet/qlogic/qed/qed_vf.h | 32 +-
+ drivers/net/ethernet/qlogic/qede/Makefile | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 83 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 114 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c | 759 +++++
+ drivers/net/ethernet/qlogic/qede/qede_fp.c | 1691 +++++++++++
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 2622 +---------------
+ drivers/net/ethernet/qlogic/qede/qede_roce.c | 2 +-
+ drivers/net/ethernet/qualcomm/emac/Makefile | 2 +-
+ drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 185 ++
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 20 -
+ drivers/net/ethernet/qualcomm/emac/emac-phy.c | 2 -
+ drivers/net/ethernet/qualcomm/emac/emac-phy.h | 13 -
+ .../ethernet/qualcomm/emac/emac-sgmii-fsm9900.c | 2 +-
+ .../ethernet/qualcomm/emac/emac-sgmii-qdf2400.c | 2 +-
+ .../ethernet/qualcomm/emac/emac-sgmii-qdf2432.c | 2 +-
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 8 +-
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.h | 13 +
+ drivers/net/ethernet/qualcomm/emac/emac.c | 67 +-
+ drivers/net/ethernet/qualcomm/emac/emac.h | 7 +-
+ drivers/net/ethernet/realtek/8139too.c | 9 +-
+ drivers/net/ethernet/realtek/atp.c | 7 +-
+ drivers/net/ethernet/realtek/r8169.c | 4 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 241 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 10 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +-
+ drivers/net/ethernet/sfc/ef10.c | 124 +-
+ drivers/net/ethernet/sfc/ef10_sriov.c | 17 +-
+ drivers/net/ethernet/sfc/ef10_sriov.h | 3 -
+ drivers/net/ethernet/sfc/efx.c | 31 +-
+ drivers/net/ethernet/sfc/ethtool.c | 29 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 9 +-
+ drivers/net/ethernet/sfc/falcon/ethtool.c | 29 +-
+ drivers/net/ethernet/sfc/falcon/mdio_10g.c | 44 +-
+ drivers/net/ethernet/sfc/falcon/mdio_10g.h | 3 +-
+ drivers/net/ethernet/sfc/falcon/net_driver.h | 12 +-
+ drivers/net/ethernet/sfc/falcon/qt202x_phy.c | 9 +-
+ drivers/net/ethernet/sfc/falcon/tenxpress.c | 22 +-
+ drivers/net/ethernet/sfc/falcon/txc43128_phy.c | 9 +-
+ drivers/net/ethernet/sfc/farch.c | 16 +
+ drivers/net/ethernet/sfc/net_driver.h | 19 +-
+ drivers/net/ethernet/sfc/nic.h | 20 +-
+ drivers/net/ethernet/sfc/siena.c | 28 +-
+ drivers/net/ethernet/sfc/sriov.c | 11 -
+ drivers/net/ethernet/sfc/sriov.h | 3 -
+ drivers/net/ethernet/sfc/tx.c | 2 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 6 +-
+ drivers/net/ethernet/stmicro/Kconfig | 3 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 24 +-
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 8 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 202 ++
+ .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 20 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 5 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 21 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 75 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 5 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 5 -
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 111 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 68 +-
+ drivers/net/ethernet/sun/niu.c | 6 +-
+ drivers/net/ethernet/synopsys/Kconfig | 27 -
+ drivers/net/ethernet/synopsys/Makefile | 5 -
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2998 -------------------
+ drivers/net/ethernet/ti/cpsw.c | 209 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 180 +-
+ drivers/net/ethernet/ti/cpsw_ale.h | 17 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 164 +-
+ drivers/net/ethernet/ti/davinci_cpdma.h | 5 +
+ drivers/net/ethernet/ti/netcp.h | 21 +
+ drivers/net/ethernet/ti/netcp_core.c | 100 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 23 +-
+ drivers/net/ethernet/tile/tilepro.c | 8 +-
+ drivers/net/ethernet/via/via-rhine.c | 8 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 22 +-
+ drivers/net/fddi/skfp/cfm.c | 22 +-
+ drivers/net/fddi/skfp/drvfbi.c | 4 +-
+ drivers/net/fddi/skfp/ecm.c | 34 +-
+ drivers/net/fddi/skfp/ess.c | 66 +-
+ drivers/net/fddi/skfp/fplustm.c | 24 +-
+ drivers/net/fddi/skfp/h/cmtdef.h | 67 +-
+ drivers/net/fddi/skfp/h/hwmtm.h | 24 +-
+ drivers/net/fddi/skfp/hwmtm.c | 178 +-
+ drivers/net/fddi/skfp/pcmplc.c | 83 +-
+ drivers/net/fddi/skfp/pmf.c | 4 +-
+ drivers/net/fddi/skfp/rmt.c | 40 +-
+ drivers/net/fddi/skfp/smt.c | 109 +-
+ drivers/net/fddi/skfp/srf.c | 14 +-
+ drivers/net/fjes/fjes_main.c | 7 +-
+ drivers/net/hyperv/hyperv_net.h | 216 +-
+ drivers/net/hyperv/netvsc.c | 321 +-
+ drivers/net/hyperv/netvsc_drv.c | 575 ++--
+ drivers/net/hyperv/rndis_filter.c | 338 ++-
+ drivers/net/ifb.c | 22 +-
+ drivers/net/ipvlan/ipvlan.h | 2 +
+ drivers/net/ipvlan/ipvlan_core.c | 3 -
+ drivers/net/ipvlan/ipvlan_main.c | 108 +-
+ drivers/net/irda/bfin_sir.c | 5 +-
+ drivers/net/irda/sh_sir.c | 1 -
+ drivers/net/loopback.c | 5 +-
+ drivers/net/macsec.c | 8 +-
+ drivers/net/macvlan.c | 7 +-
+ drivers/net/mdio.c | 178 ++
+ drivers/net/nlmon.c | 4 +-
+ drivers/net/phy/bcm7xxx.c | 36 +
+ drivers/net/phy/marvell.c | 424 ++-
+ drivers/net/phy/mdio-gpio.c | 60 +-
+ drivers/net/phy/mdio_device.c | 2 +-
+ drivers/net/ppp/ppp_generic.c | 4 +-
+ drivers/net/slip/slip.c | 3 +-
+ drivers/net/team/team.c | 3 +-
+ drivers/net/tun.c | 79 +-
+ drivers/net/usb/cdc_ether.c | 2 +-
+ drivers/net/veth.c | 6 +-
+ drivers/net/virtio_net.c | 9 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 4 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
+ drivers/net/vrf.c | 5 +-
+ drivers/net/vxlan.c | 2 +-
+ drivers/net/wireless/admtek/adm8211.c | 27 +-
+ drivers/net/wireless/ath/ath10k/core.c | 11 +-
+ drivers/net/wireless/ath/ath10k/core.h | 2 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 43 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 8 +
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 3 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +
+ drivers/net/wireless/ath/ath10k/hw.h | 2 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 73 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 4 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 12 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 21 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 36 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 14 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 3 +
+ drivers/net/wireless/ath/ath9k/debug.h | 13 +
+ drivers/net/wireless/ath/ath9k/debug_sta.c | 54 +
+ drivers/net/wireless/ath/ath9k/eeprom.c | 42 +-
+ drivers/net/wireless/ath/ath9k/eeprom.h | 85 +-
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 137 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 129 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 163 +-
+ drivers/net/wireless/ath/ath9k/init.c | 2 +
+ drivers/net/wireless/ath/ath9k/main.c | 6 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 65 +
+ drivers/net/wireless/ath/ath9k/xmit.c | 192 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 20 +-
+ drivers/net/wireless/marvell/libertas/cfg.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h | 19 +-
+ drivers/net/wireless/marvell/mwifiex/init.c | 3 +-
+ drivers/net/wireless/marvell/mwifiex/main.h | 2 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 6 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800.h | 2 +
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 79 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 6 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00lib.h | 31 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00link.c | 132 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 12 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 15 +-
+ drivers/net/wireless/realtek/rtlwifi/cam.c | 14 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 31 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.h | 16 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.c | 3 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 48 +-
+ drivers/net/wireless/realtek/rtlwifi/ps.c | 3 +-
+ drivers/net/wireless/realtek/rtlwifi/rc.c | 3 +-
+ drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 44 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 33 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 35 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 46 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 39 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c | 7 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 35 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 34 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 35 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 45 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 10 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 40 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 39 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 46 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 43 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/led.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 45 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 21 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 31 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 15 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 18 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/led.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 33 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 14 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.c | 26 +-
+ .../realtek/rtlwifi/rtl8723com/phy_common.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 28 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 33 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 54 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 14 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 20 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 48 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c | 2 +-
+ drivers/net/xen-netfront.c | 6 +-
+ drivers/pci/pci-driver.c | 6 +
+ drivers/s390/net/qeth_core.h | 5 -
+ drivers/s390/net/qeth_core_main.c | 135 +-
+ drivers/s390/net/qeth_core_mpc.h | 17 +
+ drivers/s390/net/qeth_l2_main.c | 189 +-
+ drivers/s390/net/qeth_l3_main.c | 15 -
+ drivers/s390/net/qeth_l3_sys.c | 33 +-
+ drivers/staging/ks7010/ks_hostif.c | 2 -
+ drivers/staging/netlogic/xlr_net.c | 11 +-
+ drivers/staging/octeon/ethernet-tx.c | 5 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 1 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 -
+ drivers/staging/wlan-ng/hfa384x_usb.c | 1 -
+ drivers/staging/wlan-ng/p80211netdev.c | 2 -
+ drivers/vhost/net.c | 23 +-
+ drivers/vhost/vhost.c | 8 +-
+ fs/afs/callback.c | 2 +-
+ fs/afs/cmservice.c | 63 +-
+ fs/afs/file.c | 170 +-
+ fs/afs/fsclient.c | 195 +-
+ fs/afs/internal.h | 115 +-
+ fs/afs/main.c | 1 +
+ fs/afs/rxrpc.c | 208 +-
+ fs/afs/vlclient.c | 8 +-
+ fs/afs/vlocation.c | 4 +-
+ fs/afs/vnode.c | 30 +-
+ fs/afs/volume.c | 1 +
+ fs/afs/write.c | 19 +-
+ include/linux/bpf.h | 19 +-
+ include/linux/brcmphy.h | 1 +
+ include/linux/device.h | 11 +
+ include/linux/etherdevice.h | 60 +
+ include/linux/ieee80211.h | 2 +
+ include/linux/if_bridge.h | 1 +
+ include/linux/mdio.h | 23 +-
+ include/linux/mlx5/cq.h | 5 +-
+ include/linux/mlx5/device.h | 108 +-
+ include/linux/mlx5/doorbell.h | 6 +-
+ include/linux/mlx5/driver.h | 198 +-
+ include/linux/mlx5/mlx5_ifc.h | 249 +-
+ include/linux/mlx5/qp.h | 76 +-
+ include/linux/mroute.h | 59 +-
+ include/linux/mroute6.h | 2 +-
+ include/linux/netdevice.h | 29 +-
+ include/linux/pci.h | 2 -
+ include/linux/phy.h | 8 +-
+ include/linux/qed/common_hsi.h | 33 +-
+ include/linux/qed/eth_common.h | 32 +-
+ include/linux/qed/iscsi_common.h | 32 +-
+ include/linux/qed/qed_chain.h | 34 +-
+ include/linux/qed/qed_eth_if.h | 34 +-
+ include/linux/qed/qed_if.h | 35 +-
+ include/linux/qed/qed_iov_if.h | 34 +-
+ include/linux/qed/qed_iscsi_if.h | 32 +-
+ include/linux/qed/qed_ll2_if.h | 31 +-
+ include/linux/qed/qed_roce_if.h | 2 +-
+ include/linux/qed/qede_roce.h | 2 +-
+ include/linux/qed/rdma_common.h | 32 +-
+ include/linux/qed/roce_common.h | 32 +-
+ include/linux/qed/storage_common.h | 32 +-
+ include/linux/qed/tcp_common.h | 32 +-
+ include/linux/sctp.h | 27 +
+ include/linux/siphash.h | 140 +
+ include/linux/skbuff.h | 15 +-
+ include/linux/soc/ti/knav_dma.h | 2 +
+ include/linux/socket.h | 13 +-
+ include/linux/stmmac.h | 7 +-
+ include/linux/tcp.h | 8 +-
+ include/net/addrconf.h | 4 +-
+ include/net/cfg80211.h | 135 +-
+ include/net/checksum.h | 2 +-
+ include/net/dsa.h | 29 +-
+ include/net/dst_ops.h | 9 +-
+ include/net/flow_dissector.h | 19 +
+ include/net/inet6_connection_sock.h | 5 -
+ include/net/inet_connection_sock.h | 10 +-
+ include/net/inet_frag.h | 8 +-
+ include/net/inet_hashtables.h | 15 +-
+ include/net/inet_timewait_sock.h | 13 +-
+ include/net/ip.h | 10 +
+ include/net/ip_fib.h | 1 -
+ include/net/ip_tunnels.h | 4 +-
+ include/net/iw_handler.h | 66 +-
+ include/net/mac80211.h | 6 +-
+ include/net/netns/ipv4.h | 13 +
+ include/net/netns/sctp.h | 3 +
+ include/net/psample.h | 36 +
+ include/net/request_sock.h | 4 +-
+ include/net/rtnetlink.h | 4 +
+ include/net/sch_generic.h | 20 +-
+ include/net/sctp/constants.h | 4 +-
+ include/net/sctp/sctp.h | 9 +-
+ include/net/sctp/sm.h | 8 +-
+ include/net/sctp/structs.h | 104 +-
+ include/net/smc.h | 20 +
+ include/net/sock.h | 7 +-
+ include/net/tc_act/tc_sample.h | 50 +
+ include/net/tcp.h | 41 +-
+ include/net/udp.h | 1 -
+ include/trace/events/afs.h | 184 ++
+ include/trace/events/rxrpc.h | 518 +++-
+ include/uapi/linux/Kbuild | 5 +
+ include/uapi/linux/bpf.h | 23 +-
+ include/uapi/linux/if_link.h | 2 +
+ include/uapi/linux/igmp.h | 4 +-
+ include/uapi/linux/mpls.h | 30 +
+ include/uapi/linux/netlink.h | 1 +
+ include/uapi/linux/nl80211.h | 64 +-
+ include/uapi/linux/pkt_cls.h | 66 +-
+ include/uapi/linux/psample.h | 35 +
+ include/uapi/linux/rds.h | 33 +
+ include/uapi/linux/rtnetlink.h | 1 +
+ include/uapi/linux/sctp.h | 18 +
+ include/uapi/linux/seg6.h | 2 +
+ include/uapi/linux/seg6_hmac.h | 1 +
+ include/uapi/linux/seg6_iptunnel.h | 4 +
+ include/uapi/linux/smc.h | 35 +
+ include/uapi/linux/smc_diag.h | 85 +
+ include/uapi/linux/tc_act/Kbuild | 1 +
+ include/uapi/linux/tc_act/tc_csum.h | 3 +-
+ include/uapi/linux/tc_act/tc_sample.h | 26 +
+ include/uapi/linux/tipc.h | 6 +-
+ include/uapi/rdma/mlx5-abi.h | 19 +-
+ kernel/bpf/Makefile | 2 +-
+ kernel/bpf/bpf_lru_list.c | 20 +-
+ kernel/bpf/helpers.c | 4 +-
+ kernel/bpf/lpm_trie.c | 503 ++++
+ kernel/bpf/verifier.c | 287 +-
+ kernel/trace/bpf_trace.c | 76 +-
+ lib/Kconfig.debug | 6 +-
+ lib/Makefile | 5 +-
+ lib/siphash.c | 551 ++++
+ lib/test_siphash.c | 223 ++
+ net/6lowpan/nhc.c | 8 +-
+ net/8021q/vlan_dev.c | 5 +-
+ net/Kconfig | 2 +
+ net/Makefile | 2 +
+ net/batman-adv/bridge_loop_avoidance.c | 1 -
+ net/batman-adv/distributed-arp-table.c | 1 -
+ net/batman-adv/soft-interface.c | 2 -
+ net/bridge/br_device.c | 6 +-
+ net/bridge/br_forward.c | 39 +-
+ net/bridge/br_mdb.c | 2 +-
+ net/bridge/br_multicast.c | 92 +-
+ net/bridge/br_netlink.c | 5 +
+ net/bridge/br_private.h | 3 +-
+ net/bridge/br_sysfs_if.c | 2 +
+ net/caif/chnl_net.c | 1 -
+ net/compat.c | 17 +-
+ net/core/dev.c | 56 +-
+ net/core/filter.c | 247 +-
+ net/core/flow_dissector.c | 57 +
+ net/core/lwt_bpf.c | 2 +-
+ net/core/pktgen.c | 4 +-
+ net/core/request_sock.c | 2 -
+ net/core/rtnetlink.c | 53 +-
+ net/core/scm.c | 2 +-
+ net/core/secure_seq.c | 147 +-
+ net/core/skbuff.c | 3 -
+ net/core/sock.c | 13 +-
+ net/core/sysctl_net_core.c | 31 +-
+ net/dccp/ipv4.c | 1 -
+ net/dccp/ipv6.c | 2 -
+ net/dsa/Kconfig | 16 +-
+ net/dsa/dsa.c | 207 +-
+ net/dsa/dsa2.c | 45 +-
+ net/dsa/dsa_priv.h | 1 -
+ net/dsa/slave.c | 19 +-
+ net/dsa/tag_brcm.c | 5 +-
+ net/dsa/tag_qca.c | 2 +-
+ net/dsa/tag_trailer.c | 2 +-
+ net/ipv4/af_inet.c | 7 +-
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/icmp.c | 125 +-
+ net/ipv4/inet_connection_sock.c | 278 +-
+ net/ipv4/inet_diag.c | 2 +-
+ net/ipv4/inet_hashtables.c | 19 +-
+ net/ipv4/inet_timewait_sock.c | 3 +-
+ net/ipv4/ip_sockglue.c | 9 +-
+ net/ipv4/ip_tunnel_core.c | 6 +-
+ net/ipv4/ipmr.c | 266 +-
+ net/ipv4/ping.c | 6 +-
+ net/ipv4/proc.c | 4 +-
+ net/ipv4/route.c | 25 +-
+ net/ipv4/syncookies.c | 21 +-
+ net/ipv4/sysctl_net_ipv4.c | 99 +-
+ net/ipv4/tcp.c | 42 +-
+ net/ipv4/tcp_input.c | 258 +-
+ net/ipv4/tcp_ipv4.c | 23 +-
+ net/ipv4/tcp_metrics.c | 1 -
+ net/ipv4/tcp_minisocks.c | 15 +-
+ net/ipv4/tcp_output.c | 75 +-
+ net/ipv4/tcp_recovery.c | 148 +-
+ net/ipv4/tcp_timer.c | 5 +-
+ net/ipv4/udp.c | 87 +-
+ net/ipv6/addrconf.c | 7 +
+ net/ipv6/af_inet6.c | 3 +-
+ net/ipv6/icmp.c | 68 +-
+ net/ipv6/inet6_connection_sock.c | 40 -
+ net/ipv6/inet6_hashtables.c | 46 +-
+ net/ipv6/ip6_gre.c | 5 -
+ net/ipv6/ip6mr.c | 13 +-
+ net/ipv6/ipv6_sockglue.c | 16 +-
+ net/ipv6/ping.c | 7 -
+ net/ipv6/route.c | 53 +-
+ net/ipv6/seg6_hmac.c | 46 +-
+ net/ipv6/syncookies.c | 41 +-
+ net/ipv6/tcp_ipv6.c | 12 +-
+ net/ipv6/udp.c | 2 +-
+ net/l2tp/l2tp_eth.c | 6 +-
+ net/l2tp/l2tp_ip.c | 29 +-
+ net/l2tp/l2tp_ip6.c | 30 +-
+ net/mac80211/cfg.c | 12 +
+ net/mac80211/chan.c | 4 +-
+ net/mac80211/debugfs.c | 27 +
+ net/mac80211/debugfs_netdev.c | 3 +
+ net/mac80211/ieee80211_i.h | 6 +-
+ net/mac80211/iface.c | 4 +-
+ net/mac80211/mesh.c | 7 +-
+ net/mac80211/mesh.h | 2 +-
+ net/mac80211/mesh_plink.c | 14 +-
+ net/mac80211/mesh_sync.c | 27 +-
+ net/mac80211/mlme.c | 4 -
+ net/mac80211/rc80211_minstrel.c | 21 +-
+ net/mac80211/rc80211_minstrel.h | 33 +-
+ net/mac80211/rc80211_minstrel_debugfs.c | 24 +-
+ net/mac80211/rc80211_minstrel_ht.c | 68 +-
+ net/mac80211/rc80211_minstrel_ht.h | 6 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 32 +-
+ net/mac80211/rx.c | 4 -
+ net/mac80211/scan.c | 8 +-
+ net/mac80211/sta_info.c | 18 +-
+ net/mac80211/status.c | 8 +-
+ net/mac80211/tx.c | 132 +-
+ net/mac80211/vht.c | 4 -
+ net/mac80211/wep.c | 3 +-
+ net/mac80211/wpa.c | 3 +-
+ net/mpls/af_mpls.c | 181 +-
+ net/mpls/internal.h | 58 +-
+ net/mpls/mpls_iptunnel.c | 11 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 7 +-
+ net/netlink/af_netlink.c | 4 +-
+ net/openvswitch/vport-internal_dev.c | 4 +-
+ net/packet/af_packet.c | 42 +-
+ net/packet/diag.c | 3 +-
+ net/psample/Kconfig | 15 +
+ net/psample/Makefile | 5 +
+ net/psample/psample.c | 301 ++
+ net/rds/af_rds.c | 31 +
+ net/rds/bind.c | 4 +-
+ net/rds/connection.c | 10 +-
+ net/rds/ib.c | 11 +
+ net/rds/ib.h | 22 +-
+ net/rds/ib_cm.c | 89 +-
+ net/rds/ib_frmr.c | 16 +-
+ net/rds/ib_recv.c | 14 +-
+ net/rds/ib_send.c | 29 +-
+ net/rds/ib_stats.c | 2 +
+ net/rds/rdma.c | 22 +-
+ net/rds/rdma_transport.c | 11 +-
+ net/rds/rds.h | 17 +
+ net/rds/recv.c | 36 +-
+ net/rds/send.c | 50 +-
+ net/rds/tcp_listen.c | 1 +
+ net/rds/tcp_recv.c | 5 +
+ net/rfkill/core.c | 100 +-
+ net/rxrpc/af_rxrpc.c | 8 +
+ net/rxrpc/ar-internal.h | 195 +-
+ net/rxrpc/call_accept.c | 3 +-
+ net/rxrpc/call_object.c | 18 -
+ net/rxrpc/conn_client.c | 8 -
+ net/rxrpc/conn_object.c | 1 +
+ net/rxrpc/input.c | 16 +-
+ net/rxrpc/misc.c | 151 -
+ net/rxrpc/proc.c | 9 +-
+ net/rxrpc/sendmsg.c | 2 +-
+ net/sched/Kconfig | 13 +
+ net/sched/Makefile | 1 +
+ net/sched/act_api.c | 11 +-
+ net/sched/act_csum.c | 30 +
+ net/sched/act_ife.c | 7 +-
+ net/sched/act_mirred.c | 21 +-
+ net/sched/act_sample.c | 274 ++
+ net/sched/cls_flower.c | 91 +-
+ net/sched/cls_matchall.c | 22 +-
+ net/sched/cls_u32.c | 1 -
+ net/sched/sch_api.c | 3 +-
+ net/sched/sch_fq_codel.c | 6 +-
+ net/sched/sch_generic.c | 2 +-
+ net/sched/sch_netem.c | 2 +-
+ net/sched/sch_teql.c | 5 +-
+ net/sctp/Makefile | 2 +-
+ net/sctp/associola.c | 25 +-
+ net/sctp/chunk.c | 107 +-
+ net/sctp/debug.c | 5 +-
+ net/sctp/endpointola.c | 1 +
+ net/sctp/input.c | 17 +-
+ net/sctp/ipv6.c | 16 +-
+ net/sctp/objcnt.c | 2 -
+ net/sctp/output.c | 14 +-
+ net/sctp/outqueue.c | 33 +-
+ net/sctp/primitive.c | 3 +
+ net/sctp/protocol.c | 21 +-
+ net/sctp/sm_make_chunk.c | 148 +-
+ net/sctp/sm_sideeffect.c | 32 +
+ net/sctp/sm_statefuns.c | 166 +-
+ net/sctp/sm_statetable.c | 40 +
+ net/sctp/socket.c | 124 +-
+ net/sctp/ssnmap.c | 125 -
+ net/sctp/stream.c | 164 +
+ net/sctp/transport.c | 17 +-
+ net/sctp/ulpqueue.c | 36 +-
+ net/smc/Kconfig | 20 +
+ net/smc/Makefile | 4 +
+ net/smc/af_smc.c | 1407 +++++++++
+ net/smc/smc.h | 274 ++
+ net/smc/smc_cdc.c | 304 ++
+ net/smc/smc_cdc.h | 218 ++
+ net/smc/smc_clc.c | 280 ++
+ net/smc/smc_clc.h | 116 +
+ net/smc/smc_close.c | 442 +++
+ net/smc/smc_close.h | 28 +
+ net/smc/smc_core.c | 677 +++++
+ net/smc/smc_core.h | 181 ++
+ net/smc/smc_diag.c | 215 ++
+ net/smc/smc_ib.c | 466 +++
+ net/smc/smc_ib.h | 71 +
+ net/smc/smc_llc.c | 158 +
+ net/smc/smc_llc.h | 63 +
+ net/smc/smc_pnet.c | 534 ++++
+ net/smc/smc_pnet.h | 23 +
+ net/smc/smc_rx.c | 217 ++
+ net/smc/smc_rx.h | 23 +
+ net/smc/smc_tx.c | 483 +++
+ net/smc/smc_tx.h | 35 +
+ net/smc/smc_wr.c | 614 ++++
+ net/smc/smc_wr.h | 106 +
+ net/socket.c | 8 +-
+ net/tipc/bcast.c | 204 +-
+ net/tipc/bcast.h | 33 +-
+ net/tipc/bearer.c | 15 +-
+ net/tipc/bearer.h | 8 +-
+ net/tipc/link.c | 87 +-
+ net/tipc/msg.c | 17 +
+ net/tipc/msg.h | 11 +-
+ net/tipc/name_table.c | 128 +-
+ net/tipc/name_table.h | 24 +-
+ net/tipc/node.c | 42 +-
+ net/tipc/node.h | 4 +-
+ net/tipc/socket.c | 492 ++-
+ net/tipc/udp_media.c | 8 +-
+ net/wireless/Makefile | 1 +
+ net/wireless/core.c | 3 +
+ net/wireless/core.h | 8 +-
+ net/wireless/mlme.c | 29 +-
+ net/wireless/nl80211.c | 137 +-
+ net/wireless/nl80211.h | 10 +-
+ net/wireless/of.c | 138 +
+ net/wireless/reg.c | 27 +-
+ net/wireless/scan.c | 9 +-
+ net/wireless/sme.c | 72 +-
+ net/wireless/sysfs.c | 6 +-
+ net/wireless/util.c | 30 +-
+ net/wireless/wext-core.c | 67 +
+ net/wireless/wext-sme.c | 23 -
+ samples/bpf/map_perf_test_kern.c | 30 +
+ samples/bpf/map_perf_test_user.c | 49 +
+ security/selinux/hooks.c | 3 +-
+ tools/testing/selftests/bpf/.gitignore | 1 +
+ tools/testing/selftests/bpf/Makefile | 4 +-
+ tools/testing/selftests/bpf/test_lpm_map.c | 358 +++
+ tools/testing/selftests/bpf/test_tag.c | 202 ++
+ tools/testing/selftests/bpf/test_verifier.c | 3129 ++++++++++++++------
+ tools/testing/selftests/net/psock_lib.h | 39 +-
+ tools/testing/selftests/net/psock_tpacket.c | 97 +-
+ 893 files changed, 47585 insertions(+), 17469 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.txt
+ create mode 100644 Documentation/siphash.txt
+ create mode 100644 drivers/net/ethernet/aquantia/Kconfig
+ create mode 100644 drivers/net/ethernet/aquantia/Makefile
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/Makefile
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_common.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_main.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_main.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_ring.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_rss.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_utils.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_vec.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/ver.h
+ create mode 100644 drivers/net/ethernet/qlogic/qede/qede_filter.c
+ create mode 100644 drivers/net/ethernet/qlogic/qede/qede_fp.c
+ create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+ delete mode 100644 drivers/net/ethernet/synopsys/Kconfig
+ delete mode 100644 drivers/net/ethernet/synopsys/Makefile
+ delete mode 100644 drivers/net/ethernet/synopsys/dwc_eth_qos.c
+ create mode 100644 include/linux/siphash.h
+ create mode 100644 include/net/psample.h
+ create mode 100644 include/net/smc.h
+ create mode 100644 include/net/tc_act/tc_sample.h
+ create mode 100644 include/trace/events/afs.h
+ create mode 100644 include/uapi/linux/psample.h
+ create mode 100644 include/uapi/linux/smc.h
+ create mode 100644 include/uapi/linux/smc_diag.h
+ create mode 100644 include/uapi/linux/tc_act/tc_sample.h
+ create mode 100644 kernel/bpf/lpm_trie.c
+ create mode 100644 lib/siphash.c
+ create mode 100644 lib/test_siphash.c
+ create mode 100644 net/psample/Kconfig
+ create mode 100644 net/psample/Makefile
+ create mode 100644 net/psample/psample.c
+ create mode 100644 net/sched/act_sample.c
+ delete mode 100644 net/sctp/ssnmap.c
+ create mode 100644 net/sctp/stream.c
+ create mode 100644 net/smc/Kconfig
+ create mode 100644 net/smc/Makefile
+ create mode 100644 net/smc/af_smc.c
+ create mode 100644 net/smc/smc.h
+ create mode 100644 net/smc/smc_cdc.c
+ create mode 100644 net/smc/smc_cdc.h
+ create mode 100644 net/smc/smc_clc.c
+ create mode 100644 net/smc/smc_clc.h
+ create mode 100644 net/smc/smc_close.c
+ create mode 100644 net/smc/smc_close.h
+ create mode 100644 net/smc/smc_core.c
+ create mode 100644 net/smc/smc_core.h
+ create mode 100644 net/smc/smc_diag.c
+ create mode 100644 net/smc/smc_ib.c
+ create mode 100644 net/smc/smc_ib.h
+ create mode 100644 net/smc/smc_llc.c
+ create mode 100644 net/smc/smc_llc.h
+ create mode 100644 net/smc/smc_pnet.c
+ create mode 100644 net/smc/smc_pnet.h
+ create mode 100644 net/smc/smc_rx.c
+ create mode 100644 net/smc/smc_rx.h
+ create mode 100644 net/smc/smc_tx.c
+ create mode 100644 net/smc/smc_tx.h
+ create mode 100644 net/smc/smc_wr.c
+ create mode 100644 net/smc/smc_wr.h
+ create mode 100644 net/wireless/of.c
+ create mode 100644 tools/testing/selftests/bpf/test_lpm_map.c
+ create mode 100644 tools/testing/selftests/bpf/test_tag.c
+$ git am -3 ../patches/0001-smc-merge-fix-for-switch-socket-splice_read-to-struc.patch
+Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/smc/af_smc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 38da5ac64974] Merge remote-tracking branch 'net-next/master'
+ Date: Wed Jan 25 11:02:01 2017 +1100
+Merging ipsec-next/master (eb758c8864d4 esp: Introduce a helper to setup the trailer)
+$ git merge ipsec-next/master
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 4 +-
+ net/ipv4/ah4.c | 3 +
+ net/ipv4/esp4.c | 332 ++++++++++++++++++++++++++++++++++++++-----------
+ net/ipv4/xfrm4_state.c | 8 --
+ net/ipv6/ah6.c | 3 +
+ net/ipv6/esp6.c | 318 ++++++++++++++++++++++++++++++++++++----------
+ net/xfrm/xfrm_output.c | 8 +-
+ net/xfrm/xfrm_policy.c | 2 +-
+ net/xfrm/xfrm_state.c | 86 ++++++-------
+ 9 files changed, 565 insertions(+), 199 deletions(-)
+Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/nf_tables_api.c
+Removing net/netfilter/nf_nat_proto_udplite.c
+Removing net/netfilter/nf_conntrack_proto_udplite.c
+Auto-merging net/netfilter/Kconfig
+Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c
+Auto-merging include/uapi/linux/netfilter/nf_tables.h
+Merge made by the 'recursive' strategy.
+ include/linux/netfilter/x_tables.h | 9 +
+ include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 +
+ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 1 +
+ include/net/netns/conntrack.h | 16 --
+ include/uapi/linux/netfilter/nf_tables.h | 5 +
+ net/bridge/netfilter/ebt_limit.c | 1 +
+ net/bridge/netfilter/ebtables.c | 78 +++---
+ net/ipv4/netfilter/arp_tables.c | 15 +-
+ net/ipv4/netfilter/ip_tables.c | 21 +-
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 +
+ net/ipv6/netfilter/ip6_tables.c | 21 +-
+ net/ipv6/netfilter/ip6t_NPT.c | 2 +
+ net/netfilter/Kconfig | 2 +-
+ net/netfilter/Makefile | 2 -
+ net/netfilter/nf_conntrack_proto_sctp.c | 32 +++
+ net/netfilter/nf_conntrack_proto_udp.c | 123 ++++++++++
+ net/netfilter/nf_conntrack_proto_udplite.c | 324 -------------------------
+ net/netfilter/nf_nat_proto_udp.c | 78 +++++-
+ net/netfilter/nf_nat_proto_udplite.c | 73 ------
+ net/netfilter/nf_tables_api.c | 15 +-
+ net/netfilter/nft_ct.c | 22 +-
+ net/netfilter/nft_meta.c | 31 ++-
+ net/netfilter/x_tables.c | 68 +++++-
+ net/netfilter/xt_CT.c | 3 +
+ net/netfilter/xt_RATEEST.c | 1 +
+ net/netfilter/xt_TEE.c | 2 +
+ net/netfilter/xt_bpf.c | 2 +
+ net/netfilter/xt_cgroup.c | 1 +
+ net/netfilter/xt_connlimit.c | 5 +-
+ net/netfilter/xt_hashlimit.c | 4 +
+ net/netfilter/xt_limit.c | 2 +
+ net/netfilter/xt_pkttype.c | 3 +-
+ net/netfilter/xt_quota.c | 1 +
+ net/netfilter/xt_rateest.c | 1 +
+ net/netfilter/xt_string.c | 1 +
+ 35 files changed, 437 insertions(+), 530 deletions(-)
+ delete mode 100644 net/netfilter/nf_conntrack_proto_udplite.c
+ delete mode 100644 net/netfilter/nf_nat_proto_udplite.c
+Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
+$ git merge ipvs-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (106e0deca1ac rtlwifi: rtl8192cu: Convert driver to use common macros)
+$ git merge wireless-drivers-next/master
+Auto-merging drivers/net/wireless/realtek/rtlwifi/usb.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 6 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 45 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 -
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 10 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.h | 2 +
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 14 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 -
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 7 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.h | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +-
+ drivers/net/wireless/marvell/libertas/cmd.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 19 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 3 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h | 1 +
+ drivers/net/wireless/marvell/mwifiex/init.c | 38 +-
+ drivers/net/wireless/marvell/mwifiex/main.c | 137 ++----
+ drivers/net/wireless/marvell/mwifiex/main.h | 15 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 304 +++++-------
+ drivers/net/wireless/marvell/mwifiex/pcie.h | 2 +
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 508 ++++++++++-----------
+ drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +-
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 +
+ drivers/net/wireless/marvell/mwifiex/usb.c | 41 +-
+ drivers/net/wireless/marvell/mwifiex/util.c | 15 -
+ drivers/net/wireless/ralink/rt2x00/rt2800.h | 26 ++
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 119 +++--
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 49 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 32 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 18 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 2 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 59 ---
+ drivers/net/wireless/realtek/rtlwifi/base.h | 1 -
+ drivers/net/wireless/realtek/rtlwifi/debug.c | 61 +--
+ drivers/net/wireless/realtek/rtlwifi/debug.h | 35 +-
+ drivers/net/wireless/realtek/rtlwifi/efuse.c | 45 ++
+ drivers/net/wireless/realtek/rtlwifi/efuse.h | 4 +
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 18 -
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 67 +--
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 11 +-
+ .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 70 +--
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 10 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 272 +++++------
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 71 +--
+ .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 68 +--
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 11 +-
+ .../realtek/rtlwifi/rtl8723com/fw_common.c | 69 +--
+ .../realtek/rtlwifi/rtl8723com/fw_common.h | 6 -
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 67 +--
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 11 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 1 -
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 38 +-
+ include/linux/mmc/sdio_ids.h | 1 +
+ 71 files changed, 965 insertions(+), 1552 deletions(-)
+Merging bluetooth/master (0e40f4c9593b tcp: accept RST for rcv_nxt - 1 after receiving a FIN)
+$ git merge bluetooth/master
+Already up-to-date.
+Merging mac80211-next/master (1331b62c9721 rfkill: remove rfkill-regulator)
+$ git merge mac80211-next/master
+Removing net/rfkill/rfkill-regulator.c
+Removing include/linux/rfkill-regulator.h
+Merge made by the 'recursive' strategy.
+ include/linux/rfkill-regulator.h | 48 ------------
+ include/net/cfg80211.h | 63 ++++++++++++----
+ include/net/mac80211.h | 74 +++++++++++--------
+ net/rfkill/Kconfig | 11 ---
+ net/rfkill/Makefile | 1 -
+ net/rfkill/rfkill-regulator.c | 154 ---------------------------------------
+ 6 files changed, 92 insertions(+), 259 deletions(-)
+ delete mode 100644 include/linux/rfkill-regulator.h
+ delete mode 100644 net/rfkill/rfkill-regulator.c
+Merging rdma/for-next (5c37077fd025 IB/ipoib: Remove the unnecessary error check)
+$ git merge rdma/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cache.c | 144 +++---
+ drivers/infiniband/core/cm.c | 2 +
+ drivers/infiniband/core/cma.c | 104 +++-
+ drivers/infiniband/core/cq.c | 2 +-
+ drivers/infiniband/core/mad.c | 4 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 6 +-
+ drivers/infiniband/hw/cxgb4/device.c | 133 +++--
+ drivers/infiniband/hw/hfi1/pcie.c | 10 -
+ drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 137 ++---
+ drivers/infiniband/hw/i40iw/i40iw_uk.c | 34 +-
+ drivers/infiniband/hw/mlx4/qp.c | 6 +-
+ drivers/infiniband/hw/nes/nes_cm.c | 22 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 4 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 3 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 5 -
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 15 +-
+ drivers/infiniband/hw/qedr/qedr_cm.c | 2 +-
+ drivers/infiniband/hw/qedr/qedr_cm.h | 1 -
+ drivers/infiniband/hw/qedr/verbs.c | 549 +++++++++------------
+ drivers/infiniband/hw/qib/qib_iba7322.c | 1 -
+ drivers/infiniband/hw/qib/qib_pcie.c | 8 -
+ drivers/infiniband/hw/qib/qib_qsfp.c | 10 -
+ drivers/infiniband/hw/qib/qib_qsfp.h | 1 -
+ drivers/infiniband/hw/qib/qib_user_sdma.c | 6 +-
+ drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h | 1 -
+ drivers/infiniband/hw/usnic/usnic_fwd.h | 3 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 5 +-
+ drivers/infiniband/sw/rxe/rxe.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_comp.c | 91 ++--
+ drivers/infiniband/sw/rxe/rxe_cq.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_hdr.h | 12 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 29 +-
+ drivers/infiniband/sw/rxe/rxe_mcast.c | 8 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 10 +-
+ drivers/infiniband/sw/rxe/rxe_net.c | 51 +-
+ drivers/infiniband/sw/rxe/rxe_pool.c | 14 +-
+ drivers/infiniband/sw/rxe/rxe_pool.h | 8 +-
+ drivers/infiniband/sw/rxe/rxe_qp.c | 4 +-
+ drivers/infiniband/sw/rxe/rxe_recv.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_req.c | 34 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 64 +--
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 10 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 24 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 10 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 30 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 14 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 47 +-
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 10 +-
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 14 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 2 +-
+ include/rdma/ib_cache.h | 13 +
+ include/rdma/ib_sa.h | 6 +-
+ include/rdma/ib_verbs.h | 11 +-
+ include/uapi/linux/if_ether.h | 1 +
+ include/uapi/rdma/Kbuild | 1 +
+ include/uapi/rdma/hfi/Kbuild | 1 +
+ include/uapi/rdma/hfi/hfi1_ioctl.h | 173 +++++++
+ include/uapi/rdma/hfi/hfi1_user.h | 175 +------
+ include/uapi/rdma/ib_user_mad.h | 14 +-
+ include/uapi/rdma/rdma_user_ioctl.h | 87 ++++
+ 60 files changed, 1134 insertions(+), 1060 deletions(-)
+ create mode 100644 include/uapi/rdma/hfi/hfi1_ioctl.h
+ create mode 100644 include/uapi/rdma/rdma_user_ioctl.h
+Merging rdma-leon/rdma-next (f3cbb454fed0 Merge branch 'topic/odp-ksm' into rdma-next)
+$ git merge rdma-leon/rdma-next
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c
+Auto-merging drivers/infiniband/hw/qedr/verbs.c
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/core/cma.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma.c | 3 +-
+ drivers/infiniband/core/umem.c | 3 -
+ drivers/infiniband/core/umem_odp.c | 92 +++-
+ drivers/infiniband/core/umem_rbtree.c | 21 +-
+ drivers/infiniband/core/uverbs.h | 1 +
+ drivers/infiniband/core/uverbs_cmd.c | 53 ++-
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 7 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 8 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 1 +
+ drivers/infiniband/hw/hns/hns_roce_main.c | 7 +-
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 8 +-
+ drivers/infiniband/hw/mlx4/alias_GUID.c | 1 +
+ drivers/infiniband/hw/mlx4/main.c | 23 +-
+ drivers/infiniband/hw/mlx4/sysfs.c | 1 +
+ drivers/infiniband/hw/mlx5/Makefile | 2 +-
+ drivers/infiniband/hw/mlx5/cmd.c | 48 ++
+ drivers/infiniband/hw/mlx5/cmd.h | 40 ++
+ drivers/infiniband/hw/mlx5/mad.c | 14 +-
+ drivers/infiniband/hw/mlx5/main.c | 302 ++++++++++---
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 46 +-
+ drivers/infiniband/hw/mlx5/mr.c | 128 ++++--
+ drivers/infiniband/hw/mlx5/odp.c | 505 ++++++++++++++++++++--
+ drivers/infiniband/hw/mlx5/qp.c | 84 +++-
+ drivers/infiniband/hw/mlx5/srq.c | 11 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 9 +-
+ drivers/infiniband/hw/nes/nes_verbs.c | 5 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 9 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 +
+ drivers/infiniband/hw/qedr/verbs.c | 9 +-
+ drivers/infiniband/hw/qib/qib_verbs.c | 1 +
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 4 +-
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 5 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 4 +-
+ drivers/infiniband/sw/rdmavt/vt.c | 7 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 12 +-
+ include/linux/mlx5/driver.h | 6 +-
+ include/linux/mlx5/mlx5_ifc.h | 2 +-
+ include/rdma/ib_umem_odp.h | 21 +-
+ include/rdma/ib_verbs.h | 57 ++-
+ include/uapi/rdma/ib_user_verbs.h | 19 +-
+ 42 files changed, 1344 insertions(+), 244 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mlx5/cmd.c
+ create mode 100644 drivers/infiniband/hw/mlx5/cmd.h
+Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
+$ git merge rdma-leon-test/testing/rdma-next
+Already up-to-date.
+Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
+$ git merge nand/nand/next
+Removing include/linux/mtd/fsmc.h
+Auto-merging drivers/mtd/nand/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/Kconfig | 1 +
+ drivers/mtd/nand/fsmc_nand.c | 153 ++++++++++++++++++++++++++++++++++------
+ drivers/mtd/nand/lpc32xx_slc.c | 9 +--
+ include/linux/mtd/fsmc.h | 156 -----------------------------------------
+ include/linux/mtd/nand.h | 3 +-
+ 5 files changed, 137 insertions(+), 185 deletions(-)
+ delete mode 100644 include/linux/mtd/fsmc.h
+Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
+$ git merge crypto/master
+Auto-merging arch/x86/crypto/aesni-intel_glue.c
+Removing arch/arm/crypto/bsaes-armv7.pl
+Removing arch/arm/crypto/aesbs-glue.c
+Removing arch/arm/crypto/aesbs-core.S_shipped
+Removing arch/arm/crypto/aes_glue.h
+Removing arch/arm/crypto/aes_glue.c
+Removing arch/arm/crypto/aes-armv4.S
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/mediatek-crypto.txt | 27 +
+ arch/arm/crypto/Kconfig | 27 +-
+ arch/arm/crypto/Makefile | 11 +-
+ arch/arm/crypto/aes-armv4.S | 1089 ---------
+ arch/arm/crypto/aes-cipher-core.S | 179 ++
+ arch/arm/crypto/aes-cipher-glue.c | 74 +
+ arch/arm/crypto/aes-neonbs-core.S | 1021 ++++++++
+ arch/arm/crypto/aes-neonbs-glue.c | 405 ++++
+ arch/arm/crypto/aes_glue.c | 98 -
+ arch/arm/crypto/aes_glue.h | 19 -
+ arch/arm/crypto/aesbs-core.S_shipped | 2548 --------------------
+ arch/arm/crypto/aesbs-glue.c | 367 ---
+ arch/arm/crypto/bsaes-armv7.pl | 2471 -------------------
+ arch/arm/crypto/chacha20-neon-core.S | 523 ++++
+ arch/arm/crypto/chacha20-neon-glue.c | 128 +
+ arch/arm64/crypto/Kconfig | 17 +
+ arch/arm64/crypto/Makefile | 9 +
+ arch/arm64/crypto/aes-cipher-core.S | 127 +
+ arch/arm64/crypto/aes-cipher-glue.c | 69 +
+ arch/arm64/crypto/aes-glue.c | 25 +-
+ arch/arm64/crypto/aes-neonbs-core.S | 963 ++++++++
+ arch/arm64/crypto/aes-neonbs-glue.c | 420 ++++
+ arch/arm64/crypto/chacha20-neon-core.S | 450 ++++
+ arch/arm64/crypto/chacha20-neon-glue.c | 127 +
+ arch/x86/crypto/aesni-intel_asm.S | 37 +-
+ arch/x86/crypto/aesni-intel_avx-x86_64.S | 32 +-
+ arch/x86/crypto/aesni-intel_glue.c | 12 +-
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 5 +-
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 12 +-
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 14 +-
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 12 +-
+ arch/x86/crypto/chacha20-avx2-x86_64.S | 9 +-
+ arch/x86/crypto/chacha20-ssse3-x86_64.S | 7 +-
+ arch/x86/crypto/chacha20_glue.c | 70 +-
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +-
+ arch/x86/crypto/crct10dif-pcl-asm_64.S | 14 +-
+ arch/x86/crypto/des3_ede-asm_64.S | 2 +-
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 3 +-
+ arch/x86/crypto/poly1305-avx2-x86_64.S | 6 +-
+ arch/x86/crypto/poly1305-sse2-x86_64.S | 6 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 5 +-
+ arch/x86/crypto/serpent-avx2-asm_64.S | 9 +-
+ arch/x86/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S | 6 +-
+ arch/x86/crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S | 3 +-
+ arch/x86/crypto/sha1-mb/sha1_x8_avx2.S | 15 +-
+ arch/x86/crypto/sha1_ni_asm.S | 8 +-
+ arch/x86/crypto/sha256-avx-asm.S | 9 +-
+ arch/x86/crypto/sha256-avx2-asm.S | 9 +-
+ .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 6 +-
+ .../crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S | 3 +-
+ arch/x86/crypto/sha256-mb/sha256_x8_avx2.S | 7 +-
+ arch/x86/crypto/sha256-ssse3-asm.S | 8 +-
+ arch/x86/crypto/sha256_ni_asm.S | 4 +-
+ arch/x86/crypto/sha512-avx-asm.S | 9 +-
+ arch/x86/crypto/sha512-avx2-asm.S | 10 +-
+ .../crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S | 10 +-
+ .../crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S | 4 +-
+ arch/x86/crypto/sha512-mb/sha512_x4_avx2.S | 4 +-
+ arch/x86/crypto/sha512-ssse3-asm.S | 9 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 6 +-
+ crypto/ablkcipher.c | 5 +-
+ crypto/acompress.c | 3 +-
+ crypto/aead.c | 3 +-
+ crypto/ahash.c | 3 +-
+ crypto/akcipher.c | 3 +-
+ crypto/algif_hash.c | 2 +-
+ crypto/blkcipher.c | 7 +-
+ crypto/chacha20_generic.c | 73 +-
+ crypto/cts.c | 5 +-
+ crypto/kpp.c | 3 +-
+ crypto/pcbc.c | 3 +-
+ crypto/rng.c | 3 +-
+ crypto/scompress.c | 3 +-
+ crypto/shash.c | 9 +-
+ crypto/skcipher.c | 23 +-
+ crypto/tcrypt.c | 6 +
+ crypto/testmgr.c | 1048 ++------
+ crypto/testmgr.h | 272 +--
+ drivers/char/hw_random/core.c | 64 +-
+ drivers/char/hw_random/n2-drv.c | 204 +-
+ drivers/char/hw_random/n2rng.h | 51 +-
+ drivers/crypto/Kconfig | 18 +-
+ drivers/crypto/Makefile | 15 +-
+ drivers/crypto/bfin_crc.c | 6 +-
+ drivers/crypto/bfin_crc.h | 1 -
+ drivers/crypto/img-hash.c | 4 +-
+ drivers/crypto/mediatek/Makefile | 2 +
+ drivers/crypto/mediatek/mtk-aes.c | 1299 ++++++++++
+ drivers/crypto/mediatek/mtk-platform.c | 604 +++++
+ drivers/crypto/mediatek/mtk-platform.h | 231 ++
+ drivers/crypto/mediatek/mtk-regs.h | 194 ++
+ drivers/crypto/mediatek/mtk-sha.c | 1435 +++++++++++
+ drivers/crypto/picoxcell_crypto.c | 28 +-
+ drivers/crypto/qat/qat_c3xxx/adf_drv.c | 2 +-
+ drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 +-
+ drivers/crypto/qat/qat_c62x/adf_drv.c | 4 +-
+ drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 +-
+ drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 +
+ drivers/crypto/qat/qat_common/adf_cfg_common.h | 1 +
+ drivers/crypto/qat/qat_common/adf_common_drv.h | 4 +-
+ drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 +-
+ drivers/crypto/qat/qat_common/adf_init.c | 28 +-
+ drivers/crypto/qat/qat_common/adf_sriov.c | 4 +-
+ drivers/crypto/qat/qat_common/adf_vf_isr.c | 4 +-
+ drivers/crypto/qat/qat_common/qat_hal.c | 4 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +-
+ drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 +-
+ drivers/crypto/virtio/Kconfig | 1 +
+ drivers/crypto/virtio/virtio_crypto_algs.c | 54 +-
+ drivers/crypto/virtio/virtio_crypto_common.h | 16 +
+ drivers/crypto/virtio/virtio_crypto_core.c | 74 +-
+ drivers/crypto/vmx/aes_ctr.c | 6 +
+ include/crypto/chacha20.h | 6 +-
+ include/crypto/internal/skcipher.h | 2 +-
+ include/crypto/skcipher.h | 34 +
+ include/linux/compiler-gcc.h | 1 +
+ include/linux/miscdevice.h | 1 +
+ 117 files changed, 9353 insertions(+), 8115 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/mediatek-crypto.txt
+ delete mode 100644 arch/arm/crypto/aes-armv4.S
+ create mode 100644 arch/arm/crypto/aes-cipher-core.S
+ create mode 100644 arch/arm/crypto/aes-cipher-glue.c
+ create mode 100644 arch/arm/crypto/aes-neonbs-core.S
+ create mode 100644 arch/arm/crypto/aes-neonbs-glue.c
+ delete mode 100644 arch/arm/crypto/aes_glue.c
+ delete mode 100644 arch/arm/crypto/aes_glue.h
+ delete mode 100644 arch/arm/crypto/aesbs-core.S_shipped
+ delete mode 100644 arch/arm/crypto/aesbs-glue.c
+ delete mode 100644 arch/arm/crypto/bsaes-armv7.pl
+ create mode 100644 arch/arm/crypto/chacha20-neon-core.S
+ create mode 100644 arch/arm/crypto/chacha20-neon-glue.c
+ create mode 100644 arch/arm64/crypto/aes-cipher-core.S
+ create mode 100644 arch/arm64/crypto/aes-cipher-glue.c
+ create mode 100644 arch/arm64/crypto/aes-neonbs-core.S
+ create mode 100644 arch/arm64/crypto/aes-neonbs-glue.c
+ create mode 100644 arch/arm64/crypto/chacha20-neon-core.S
+ create mode 100644 arch/arm64/crypto/chacha20-neon-glue.c
+ create mode 100644 drivers/crypto/mediatek/Makefile
+ create mode 100644 drivers/crypto/mediatek/mtk-aes.c
+ create mode 100644 drivers/crypto/mediatek/mtk-platform.c
+ create mode 100644 drivers/crypto/mediatek/mtk-platform.h
+ create mode 100644 drivers/crypto/mediatek/mtk-regs.h
+ create mode 100644 drivers/crypto/mediatek/mtk-sha.c
+Merging drm/drm-next (f0493e653f96 drm/mgag200: Added support for the new device G200eH3)
+$ git merge drm/drm-next
+Resolved 'include/drm/drm_atomic.h' using previous resolution.
+Auto-merging lib/Makefile
+Auto-merging include/drm/drm_mode_config.h
+Auto-merging include/drm/drm_atomic.h
+CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
+Auto-merging drivers/gpu/drm/virtio/virtgpu_fb.c
+Auto-merging drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+Removing drivers/gpu/drm/sti/sti_vtac.c
+Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+Auto-merging drivers/gpu/drm/meson/meson_plane.c
+Auto-merging drivers/gpu/drm/i915/intel_uc.h
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
+Auto-merging drivers/gpu/drm/i915/gvt/handlers.c
+Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c
+Auto-merging drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+Auto-merging drivers/gpu/drm/drm_probe_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Auto-merging drivers/gpu/drm/cirrus/Kconfig
+Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+Auto-merging MAINTAINERS
+Removing Documentation/dma-buf-sharing.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7f73bef013ae] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/ti,ths8135.txt | 46 +
+ .../bindings/display/hisilicon/hisi-ade.txt | 2 +-
+ Documentation/dma-buf-sharing.txt | 482 -----
+ Documentation/driver-api/dma-buf.rst | 92 +
+ Documentation/gpu/drm-mm.rst | 40 +-
+ Documentation/gpu/drm-uapi.rst | 25 +-
+ Documentation/gpu/i915.rst | 103 +
+ Documentation/gpu/introduction.rst | 15 +-
+ MAINTAINERS | 2 +-
+ arch/blackfin/include/asm/vga.h | 1 +
+ drivers/char/agp/intel-gtt.c | 6 +-
+ drivers/dma-buf/dma-buf.c | 207 +-
+ drivers/dma-buf/dma-fence.c | 26 +
+ drivers/dma-buf/sync_debug.c | 17 +-
+ drivers/dma-buf/sync_file.c | 21 +-
+ drivers/gpu/drm/Kconfig | 32 +-
+ drivers/gpu/drm/Makefile | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +-
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 3 +-
+ drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 +-
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 18 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 10 +-
+ drivers/gpu/drm/armada/Makefile | 2 +
+ drivers/gpu/drm/armada/armada_crtc.c | 9 +-
+ drivers/gpu/drm/armada/armada_debugfs.c | 6 +-
+ drivers/gpu/drm/armada/armada_drv.c | 6 -
+ drivers/gpu/drm/armada/armada_fb.c | 2 +-
+ drivers/gpu/drm/armada/armada_fbdev.c | 5 +-
+ drivers/gpu/drm/armada/armada_overlay.c | 4 +-
+ drivers/gpu/drm/ast/Kconfig | 2 +-
+ drivers/gpu/drm/ast/ast_drv.h | 3 +-
+ drivers/gpu/drm/ast/ast_fb.c | 4 +-
+ drivers/gpu/drm/ast/ast_main.c | 5 +-
+ drivers/gpu/drm/ast/ast_mode.c | 16 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 +-
+ drivers/gpu/drm/bochs/Kconfig | 2 +-
+ drivers/gpu/drm/bochs/bochs.h | 1 +
+ drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
+ drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +-
+ drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 +
+ drivers/gpu/drm/bridge/dw-hdmi.c | 3 +-
+ drivers/gpu/drm/cirrus/Kconfig | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 7 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +-
+ drivers/gpu/drm/drm_atomic.c | 53 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 139 +-
+ drivers/gpu/drm/drm_auth.c | 8 +-
+ drivers/gpu/drm/drm_bridge.c | 88 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 4 +-
+ drivers/gpu/drm/drm_connector.c | 231 ++-
+ drivers/gpu/drm/drm_crtc.c | 32 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 67 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 9 +
+ drivers/gpu/drm/drm_debugfs.c | 1 +
+ drivers/gpu/drm/drm_debugfs_crc.c | 34 +-
+ drivers/gpu/drm/drm_drv.c | 29 +-
+ drivers/gpu/drm/drm_dumb_buffers.c | 2 +-
+ drivers/gpu/drm/drm_edid.c | 7 +-
+ drivers/gpu/drm/drm_encoder.c | 21 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 97 +-
+ drivers/gpu/drm/drm_fb_helper.c | 35 +-
+ drivers/gpu/drm/drm_fops.c | 4 +-
+ drivers/gpu/drm/drm_framebuffer.c | 59 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 93 +-
+ drivers/gpu/drm/drm_global.c | 23 +
+ drivers/gpu/drm/drm_internal.h | 8 +-
+ drivers/gpu/drm/drm_ioctl.c | 34 +-
+ drivers/gpu/drm/drm_irq.c | 32 +-
+ drivers/gpu/drm/drm_legacy.h | 7 +
+ drivers/gpu/drm/drm_mm.c | 655 +++---
+ drivers/gpu/drm/drm_mode_config.c | 145 +-
+ drivers/gpu/drm/drm_mode_object.c | 3 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 25 +-
+ drivers/gpu/drm/drm_of.c | 1 +
+ drivers/gpu/drm/drm_pci.c | 4 -
+ drivers/gpu/drm/drm_plane.c | 18 +-
+ drivers/gpu/drm/drm_plane_helper.c | 8 +-
+ drivers/gpu/drm/drm_platform.c | 4 -
+ drivers/gpu/drm/drm_print.c | 6 +
+ drivers/gpu/drm/drm_probe_helper.c | 20 +-
+ drivers/gpu/drm/drm_property.c | 2 +-
+ drivers/gpu/drm/drm_rect.c | 6 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 23 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 12 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 9 +-
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_dp.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 12 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +-
+ drivers/gpu/drm/gma500/Kconfig | 2 +-
+ drivers/gpu/drm/gma500/accel_2d.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 6 +-
+ drivers/gpu/drm/gma500/gma_display.c | 13 +-
+ drivers/gpu/drm/gma500/mdfld_intel_display.c | 17 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 +-
+ drivers/gpu/drm/gma500/psb_drv.c | 3 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 1 +
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 17 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 12 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 +-
+ drivers/gpu/drm/i915/Kconfig.debug | 15 +
+ drivers/gpu/drm/i915/Makefile | 9 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 7 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 10 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 174 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 1047 +---------
+ drivers/gpu/drm/i915/i915_drv.c | 146 +-
+ drivers/gpu/drm/i915/i915_drv.h | 880 +++++---
+ drivers/gpu/drm/i915/i915_gem.c | 232 ++-
+ drivers/gpu/drm/i915/i915_gem.h | 4 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 244 +--
+ drivers/gpu/drm/i915/i915_gem_context.h | 277 +++
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 164 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 10 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 36 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 193 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 21 +-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 4 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 75 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 11 -
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 119 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 115 +-
+ drivers/gpu/drm/i915/i915_guc_reg.h | 7 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 368 ++--
+ drivers/gpu/drm/i915/i915_irq.c | 14 +-
+ drivers/gpu/drm/i915/i915_oa_hsw.c | 752 +++++++
+ drivers/gpu/drm/i915/i915_oa_hsw.h | 38 +
+ drivers/gpu/drm/i915/i915_params.c | 6 +-
+ drivers/gpu/drm/i915/i915_params.h | 2 +-
+ drivers/gpu/drm/i915/i915_pci.c | 183 +-
+ drivers/gpu/drm/i915/i915_perf.c | 2096 +++++++++++++++++++
+ drivers/gpu/drm/i915/i915_reg.h | 462 ++++-
+ drivers/gpu/drm/i915/i915_suspend.c | 16 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 140 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h | 6 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +-
+ drivers/gpu/drm/i915/i915_trace.h | 34 +-
+ drivers/gpu/drm/i915/i915_utils.h | 64 +
+ drivers/gpu/drm/i915/i915_vma.c | 52 +-
+ drivers/gpu/drm/i915/i915_vma.h | 18 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 31 -
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 51 +-
+ drivers/gpu/drm/i915/intel_audio.c | 39 +-
+ drivers/gpu/drm/i915/intel_bios.c | 27 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 10 +-
+ drivers/gpu/drm/i915/intel_crt.c | 7 +-
+ drivers/gpu/drm/i915/intel_csr.c | 4 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 70 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 53 +-
+ drivers/gpu/drm/i915/intel_display.c | 744 ++++---
+ drivers/gpu/drm/i915/intel_dp.c | 314 ++-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 28 +-
+ drivers/gpu/drm/i915/intel_dpio_phy.c | 130 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 351 +++-
+ drivers/gpu/drm/i915/intel_dpll_mgr.h | 178 +-
+ drivers/gpu/drm/i915/intel_drv.h | 103 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 46 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 18 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 9 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 28 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 18 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 16 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 55 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 49 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 256 ++-
+ drivers/gpu/drm/i915/intel_hdmi.c | 184 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 22 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 216 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 9 +-
+ drivers/gpu/drm/i915/intel_lspcon.c | 94 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 7 +-
+ drivers/gpu/drm/i915/intel_mocs.h | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 286 +--
+ drivers/gpu/drm/i915/intel_panel.c | 32 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 939 +++++++++
+ drivers/gpu/drm/i915/intel_pm.c | 843 ++++----
+ drivers/gpu/drm/i915/intel_psr.c | 6 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 85 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 66 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 163 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 21 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 131 +-
+ drivers/gpu/drm/i915/intel_tv.c | 4 +-
+ drivers/gpu/drm/i915/intel_uc.c | 142 ++
+ drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} | 41 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 14 +-
+ drivers/gpu/drm/i915/intel_vbt_defs.h | 12 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 8 +-
+ drivers/gpu/drm/imx/imx-tve.c | 11 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 40 +-
+ drivers/gpu/drm/imx/parallel-display.c | 6 +-
+ drivers/gpu/drm/lib/drm_random.c | 41 +
+ drivers/gpu/drm/lib/drm_random.h | 25 +
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +-
+ drivers/gpu/drm/meson/meson_plane.c | 2 +-
+ drivers/gpu/drm/mga/mga_dma.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 2 +-
+ drivers/gpu/drm/mgag200/Kconfig | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 +
+ drivers/gpu/drm/mgag200/mgag200_main.c | 9 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 100 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 17 +-
+ drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +-
+ drivers/gpu/drm/msm/msm_debugfs.c | 6 +-
+ drivers/gpu/drm/msm/msm_fb.c | 12 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +-
+ drivers/gpu/drm/nouveau/Kconfig | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 17 +-
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 28 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 14 +-
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +-
+ .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 +
+ drivers/gpu/drm/omapdrm/dss/dispc.c | 27 +-
+ drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 3 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 -
+ drivers/gpu/drm/omapdrm/omap_connector.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 154 +-
+ drivers/gpu/drm/omapdrm/omap_debugfs.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 218 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h | 51 +-
+ drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 176 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_irq.c | 242 ++-
+ drivers/gpu/drm/omapdrm/omap_plane.c | 24 -
+ drivers/gpu/drm/qxl/Kconfig | 2 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_draw.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 3 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_kms.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 6 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 19 +-
+ drivers/gpu/drm/radeon/r100.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 1 +
+ drivers/gpu/drm/radeon/radeon_ttm.c | 6 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 1 +
+ drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 22 +-
+ drivers/gpu/drm/savage/savage_bci.c | 4 +-
+ drivers/gpu/drm/savage/savage_drv.h | 2 +-
+ drivers/gpu/drm/selftests/Makefile | 1 +
+ drivers/gpu/drm/selftests/drm_mm_selftests.h | 23 +
+ drivers/gpu/drm/selftests/drm_selftest.c | 109 +
+ drivers/gpu/drm/selftests/drm_selftest.h | 41 +
+ drivers/gpu/drm/selftests/test-drm_mm.c | 2176 ++++++++++++++++++++
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 +
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +-
+ drivers/gpu/drm/sis/sis_drv.c | 4 +-
+ drivers/gpu/drm/sti/Makefile | 1 -
+ drivers/gpu/drm/sti/sti_drv.c | 28 +-
+ drivers/gpu/drm/sti/sti_drv.h | 1 -
+ drivers/gpu/drm/sti/sti_dvo.c | 3 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 10 +-
+ drivers/gpu/drm/sti/sti_hda.c | 3 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 208 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 25 +-
+ drivers/gpu/drm/sti/sti_plane.c | 17 +-
+ drivers/gpu/drm/sti/sti_plane.h | 2 +-
+ drivers/gpu/drm/sti/sti_vtac.c | 223 --
+ drivers/gpu/drm/sti/sti_vtg.c | 4 +
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +-
+ drivers/gpu/drm/tegra/dc.c | 8 +-
+ drivers/gpu/drm/tegra/drm.c | 20 +-
+ drivers/gpu/drm/tegra/drm.h | 1 +
+ drivers/gpu/drm/tegra/fb.c | 6 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo_manager.c | 13 +-
+ drivers/gpu/drm/udl/udl_drv.h | 2 +-
+ drivers/gpu/drm/udl/udl_fb.c | 6 +-
+ drivers/gpu/drm/udl/udl_main.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 2 +
+ drivers/gpu/drm/vc4/vc4_plane.c | 8 +-
+ drivers/gpu/drm/via/via_drv.h | 2 +-
+ drivers/gpu/drm/via/via_map.c | 4 +-
+ drivers/gpu/drm/virtio/Kconfig | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 4 -
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_fb.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 10 +-
+ drivers/gpu/drm/vmwgfx/Kconfig | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
+ drivers/gpu/drm/zte/zx_plane.c | 4 +-
+ drivers/gpu/drm/zte/zx_vou.c | 15 +-
+ drivers/video/fbdev/Kconfig | 8 +
+ drivers/video/fbdev/core/fbmem.c | 18 +-
+ include/drm/drmP.h | 14 +
+ include/drm/drm_atomic.h | 31 +-
+ include/drm/drm_atomic_helper.h | 3 -
+ include/drm/drm_auth.h | 17 +-
+ include/drm/drm_bridge.h | 46 +-
+ include/drm/drm_connector.h | 91 +-
+ include/drm/drm_crtc.h | 31 +-
+ include/drm/drm_drv.h | 34 +-
+ include/drm/drm_encoder.h | 7 +-
+ include/drm/drm_encoder_slave.h | 1 +
+ include/drm/drm_fb_cma_helper.h | 5 +-
+ include/drm/drm_fb_helper.h | 5 +-
+ include/drm/drm_framebuffer.h | 33 +-
+ include/drm/drm_gem_cma_helper.h | 17 +
+ include/drm/drm_irq.h | 4 +-
+ include/drm/drm_mm.h | 373 +++-
+ include/drm/drm_mode_config.h | 20 +-
+ include/drm/drm_modeset_helper.h | 3 +-
+ include/drm/drm_modeset_helper_vtables.h | 3 +-
+ include/drm/drm_plane.h | 4 +-
+ include/drm/drm_print.h | 24 +-
+ include/drm/drm_simple_kms_helper.h | 10 +-
+ include/drm/i915_pciids.h | 21 +-
+ include/drm/intel-gtt.h | 6 +-
+ include/linux/dma-buf.h | 224 +-
+ include/linux/dma-fence.h | 52 +-
+ include/linux/kref.h | 2 +-
+ include/linux/prime_numbers.h | 37 +
+ include/linux/reservation.h | 34 +
+ include/uapi/drm/Kbuild | 1 +
+ include/uapi/drm/drm_fourcc.h | 11 +
+ include/uapi/drm/i915_drm.h | 135 ++
+ lib/Kconfig | 7 +
+ lib/Makefile | 2 +
+ lib/prime_numbers.c | 314 +++
+ tools/testing/selftests/drivers/gpu/drm_mm.sh | 15 +
+ tools/testing/selftests/lib/prime_numbers.sh | 15 +
+ 414 files changed, 16511 insertions(+), 7525 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
+ delete mode 100644 Documentation/dma-buf-sharing.txt
+ create mode 100644 arch/blackfin/include/asm/vga.h
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h
+ create mode 100644 drivers/gpu/drm/i915/i915_perf.c
+ create mode 100644 drivers/gpu/drm/i915/i915_utils.h
+ create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c
+ create mode 100644 drivers/gpu/drm/i915/intel_uc.c
+ rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (85%)
+ create mode 100644 drivers/gpu/drm/lib/drm_random.c
+ create mode 100644 drivers/gpu/drm/lib/drm_random.h
+ create mode 100644 drivers/gpu/drm/selftests/Makefile
+ create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h
+ create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c
+ create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c
+ delete mode 100644 drivers/gpu/drm/sti/sti_vtac.c
+ create mode 100644 include/linux/prime_numbers.h
+ create mode 100644 lib/prime_numbers.c
+ create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh
+ create mode 100755 tools/testing/selftests/lib/prime_numbers.sh
+$ git reset --hard HEAD^
+HEAD is now at b2cc4b2dc2e1 Merge remote-tracking branch 'crypto/master'
+Merging next-20170123 version of drm
+$ git merge -m next-20170123/drm 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897
+Resolved 'include/drm/drm_atomic.h' using previous resolution.
+Auto-merging lib/Makefile
+Auto-merging include/drm/drm_mode_config.h
+Auto-merging include/drm/drm_atomic.h
+CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
+Auto-merging drivers/gpu/drm/virtio/virtgpu_fb.c
+Auto-merging drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+Auto-merging drivers/gpu/drm/meson/meson_plane.c
+Auto-merging drivers/gpu/drm/i915/intel_uc.h
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
+Auto-merging drivers/gpu/drm/i915/gvt/handlers.c
+Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c
+Auto-merging drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+Auto-merging drivers/gpu/drm/drm_probe_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Auto-merging drivers/gpu/drm/cirrus/Kconfig
+Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+Auto-merging MAINTAINERS
+Removing Documentation/dma-buf-sharing.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4060658c940f] next-20170123/drm
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/ti,ths8135.txt | 46 +
+ .../bindings/display/hisilicon/hisi-ade.txt | 2 +-
+ Documentation/dma-buf-sharing.txt | 482 -----
+ Documentation/driver-api/dma-buf.rst | 92 +
+ Documentation/gpu/drm-mm.rst | 40 +-
+ Documentation/gpu/drm-uapi.rst | 25 +-
+ Documentation/gpu/i915.rst | 103 +
+ Documentation/gpu/introduction.rst | 15 +-
+ MAINTAINERS | 2 +-
+ arch/blackfin/include/asm/vga.h | 1 +
+ drivers/char/agp/intel-gtt.c | 6 +-
+ drivers/dma-buf/dma-buf.c | 207 +-
+ drivers/dma-buf/dma-fence.c | 26 +
+ drivers/dma-buf/sync_debug.c | 17 +-
+ drivers/dma-buf/sync_file.c | 21 +-
+ drivers/gpu/drm/Kconfig | 32 +-
+ drivers/gpu/drm/Makefile | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +-
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 3 +-
+ drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 +-
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 18 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 10 +-
+ drivers/gpu/drm/armada/Makefile | 2 +
+ drivers/gpu/drm/armada/armada_crtc.c | 9 +-
+ drivers/gpu/drm/armada/armada_debugfs.c | 6 +-
+ drivers/gpu/drm/armada/armada_drv.c | 6 -
+ drivers/gpu/drm/armada/armada_fb.c | 2 +-
+ drivers/gpu/drm/armada/armada_fbdev.c | 5 +-
+ drivers/gpu/drm/armada/armada_overlay.c | 4 +-
+ drivers/gpu/drm/ast/Kconfig | 2 +-
+ drivers/gpu/drm/ast/ast_drv.h | 3 +-
+ drivers/gpu/drm/ast/ast_fb.c | 4 +-
+ drivers/gpu/drm/ast/ast_main.c | 5 +-
+ drivers/gpu/drm/ast/ast_mode.c | 16 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 +-
+ drivers/gpu/drm/bochs/Kconfig | 2 +-
+ drivers/gpu/drm/bochs/bochs.h | 1 +
+ drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
+ drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +-
+ drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 +
+ drivers/gpu/drm/bridge/dw-hdmi.c | 3 +-
+ drivers/gpu/drm/cirrus/Kconfig | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 7 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +-
+ drivers/gpu/drm/drm_atomic.c | 53 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 139 +-
+ drivers/gpu/drm/drm_auth.c | 8 +-
+ drivers/gpu/drm/drm_bridge.c | 88 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 4 +-
+ drivers/gpu/drm/drm_connector.c | 231 ++-
+ drivers/gpu/drm/drm_crtc.c | 32 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 67 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 9 +
+ drivers/gpu/drm/drm_debugfs.c | 1 +
+ drivers/gpu/drm/drm_debugfs_crc.c | 34 +-
+ drivers/gpu/drm/drm_drv.c | 25 +-
+ drivers/gpu/drm/drm_dumb_buffers.c | 2 +-
+ drivers/gpu/drm/drm_edid.c | 7 +-
+ drivers/gpu/drm/drm_encoder.c | 21 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 97 +-
+ drivers/gpu/drm/drm_fb_helper.c | 35 +-
+ drivers/gpu/drm/drm_fops.c | 4 +-
+ drivers/gpu/drm/drm_framebuffer.c | 59 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 93 +-
+ drivers/gpu/drm/drm_global.c | 23 +
+ drivers/gpu/drm/drm_internal.h | 8 +-
+ drivers/gpu/drm/drm_ioctl.c | 34 +-
+ drivers/gpu/drm/drm_irq.c | 32 +-
+ drivers/gpu/drm/drm_legacy.h | 7 +
+ drivers/gpu/drm/drm_mm.c | 655 +++---
+ drivers/gpu/drm/drm_mode_config.c | 145 +-
+ drivers/gpu/drm/drm_mode_object.c | 3 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 25 +-
+ drivers/gpu/drm/drm_of.c | 1 +
+ drivers/gpu/drm/drm_pci.c | 4 -
+ drivers/gpu/drm/drm_plane.c | 18 +-
+ drivers/gpu/drm/drm_plane_helper.c | 8 +-
+ drivers/gpu/drm/drm_platform.c | 4 -
+ drivers/gpu/drm/drm_print.c | 6 +
+ drivers/gpu/drm/drm_probe_helper.c | 20 +-
+ drivers/gpu/drm/drm_property.c | 2 +-
+ drivers/gpu/drm/drm_rect.c | 6 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 23 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 12 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 9 +-
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_dp.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 12 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +-
+ drivers/gpu/drm/gma500/Kconfig | 2 +-
+ drivers/gpu/drm/gma500/accel_2d.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 6 +-
+ drivers/gpu/drm/gma500/gma_display.c | 13 +-
+ drivers/gpu/drm/gma500/mdfld_intel_display.c | 17 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 +-
+ drivers/gpu/drm/gma500/psb_drv.c | 3 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 1 +
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 17 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 12 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 +-
+ drivers/gpu/drm/i915/Kconfig.debug | 15 +
+ drivers/gpu/drm/i915/Makefile | 9 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 7 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 10 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 174 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 1047 +---------
+ drivers/gpu/drm/i915/i915_drv.c | 146 +-
+ drivers/gpu/drm/i915/i915_drv.h | 880 +++++---
+ drivers/gpu/drm/i915/i915_gem.c | 232 ++-
+ drivers/gpu/drm/i915/i915_gem.h | 4 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 244 +--
+ drivers/gpu/drm/i915/i915_gem_context.h | 277 +++
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 164 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 10 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 36 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 193 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 21 +-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 4 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 75 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 11 -
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 119 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 115 +-
+ drivers/gpu/drm/i915/i915_guc_reg.h | 7 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 368 ++--
+ drivers/gpu/drm/i915/i915_irq.c | 14 +-
+ drivers/gpu/drm/i915/i915_oa_hsw.c | 752 +++++++
+ drivers/gpu/drm/i915/i915_oa_hsw.h | 38 +
+ drivers/gpu/drm/i915/i915_params.c | 6 +-
+ drivers/gpu/drm/i915/i915_params.h | 2 +-
+ drivers/gpu/drm/i915/i915_pci.c | 183 +-
+ drivers/gpu/drm/i915/i915_perf.c | 2096 +++++++++++++++++++
+ drivers/gpu/drm/i915/i915_reg.h | 462 ++++-
+ drivers/gpu/drm/i915/i915_suspend.c | 16 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 140 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h | 6 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +-
+ drivers/gpu/drm/i915/i915_trace.h | 34 +-
+ drivers/gpu/drm/i915/i915_utils.h | 64 +
+ drivers/gpu/drm/i915/i915_vma.c | 52 +-
+ drivers/gpu/drm/i915/i915_vma.h | 18 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 31 -
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 51 +-
+ drivers/gpu/drm/i915/intel_audio.c | 39 +-
+ drivers/gpu/drm/i915/intel_bios.c | 27 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 10 +-
+ drivers/gpu/drm/i915/intel_crt.c | 7 +-
+ drivers/gpu/drm/i915/intel_csr.c | 4 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 70 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 53 +-
+ drivers/gpu/drm/i915/intel_display.c | 744 ++++---
+ drivers/gpu/drm/i915/intel_dp.c | 314 ++-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 28 +-
+ drivers/gpu/drm/i915/intel_dpio_phy.c | 130 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 351 +++-
+ drivers/gpu/drm/i915/intel_dpll_mgr.h | 178 +-
+ drivers/gpu/drm/i915/intel_drv.h | 103 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 46 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 18 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 9 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 28 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 18 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 16 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 55 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 49 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 256 ++-
+ drivers/gpu/drm/i915/intel_hdmi.c | 184 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 22 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 216 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 9 +-
+ drivers/gpu/drm/i915/intel_lspcon.c | 94 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 7 +-
+ drivers/gpu/drm/i915/intel_mocs.h | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 286 +--
+ drivers/gpu/drm/i915/intel_panel.c | 32 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 939 +++++++++
+ drivers/gpu/drm/i915/intel_pm.c | 843 ++++----
+ drivers/gpu/drm/i915/intel_psr.c | 6 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 85 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 66 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 163 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 21 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 131 +-
+ drivers/gpu/drm/i915/intel_tv.c | 4 +-
+ drivers/gpu/drm/i915/intel_uc.c | 142 ++
+ drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} | 41 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 14 +-
+ drivers/gpu/drm/i915/intel_vbt_defs.h | 12 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 8 +-
+ drivers/gpu/drm/imx/imx-tve.c | 11 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 40 +-
+ drivers/gpu/drm/imx/parallel-display.c | 6 +-
+ drivers/gpu/drm/lib/drm_random.c | 41 +
+ drivers/gpu/drm/lib/drm_random.h | 25 +
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +-
+ drivers/gpu/drm/meson/meson_plane.c | 2 +-
+ drivers/gpu/drm/mga/mga_dma.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 2 +-
+ drivers/gpu/drm/mgag200/Kconfig | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 9 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 23 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 17 +-
+ drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +-
+ drivers/gpu/drm/msm/msm_debugfs.c | 6 +-
+ drivers/gpu/drm/msm/msm_fb.c | 12 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +-
+ drivers/gpu/drm/nouveau/Kconfig | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 17 +-
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 28 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 14 +-
+ drivers/gpu/drm/omapdrm/omap_debugfs.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 4 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 12 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
+ drivers/gpu/drm/qxl/Kconfig | 2 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_draw.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 3 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_kms.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 6 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 19 +-
+ drivers/gpu/drm/radeon/r100.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 1 +
+ drivers/gpu/drm/radeon/radeon_ttm.c | 6 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 1 +
+ drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 22 +-
+ drivers/gpu/drm/savage/savage_bci.c | 4 +-
+ drivers/gpu/drm/savage/savage_drv.h | 2 +-
+ drivers/gpu/drm/selftests/Makefile | 1 +
+ drivers/gpu/drm/selftests/drm_mm_selftests.h | 23 +
+ drivers/gpu/drm/selftests/drm_selftest.c | 109 +
+ drivers/gpu/drm/selftests/drm_selftest.h | 41 +
+ drivers/gpu/drm/selftests/test-drm_mm.c | 2176 ++++++++++++++++++++
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 +
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +-
+ drivers/gpu/drm/sis/sis_drv.c | 4 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 3 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 10 +-
+ drivers/gpu/drm/sti/sti_hda.c | 3 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 3 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +-
+ drivers/gpu/drm/tegra/dc.c | 8 +-
+ drivers/gpu/drm/tegra/drm.c | 20 +-
+ drivers/gpu/drm/tegra/drm.h | 1 +
+ drivers/gpu/drm/tegra/fb.c | 6 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo_manager.c | 13 +-
+ drivers/gpu/drm/udl/udl_drv.h | 2 +-
+ drivers/gpu/drm/udl/udl_fb.c | 6 +-
+ drivers/gpu/drm/udl/udl_main.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 2 +
+ drivers/gpu/drm/vc4/vc4_plane.c | 8 +-
+ drivers/gpu/drm/via/via_drv.h | 2 +-
+ drivers/gpu/drm/via/via_map.c | 4 +-
+ drivers/gpu/drm/virtio/Kconfig | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 4 -
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_fb.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 10 +-
+ drivers/gpu/drm/vmwgfx/Kconfig | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
+ drivers/gpu/drm/zte/zx_plane.c | 4 +-
+ drivers/gpu/drm/zte/zx_vou.c | 15 +-
+ drivers/video/fbdev/Kconfig | 8 +
+ drivers/video/fbdev/core/fbmem.c | 18 +-
+ include/drm/drmP.h | 14 +
+ include/drm/drm_atomic.h | 31 +-
+ include/drm/drm_atomic_helper.h | 3 -
+ include/drm/drm_auth.h | 17 +-
+ include/drm/drm_bridge.h | 46 +-
+ include/drm/drm_connector.h | 91 +-
+ include/drm/drm_crtc.h | 31 +-
+ include/drm/drm_drv.h | 34 +-
+ include/drm/drm_encoder.h | 7 +-
+ include/drm/drm_encoder_slave.h | 1 +
+ include/drm/drm_fb_cma_helper.h | 5 +-
+ include/drm/drm_fb_helper.h | 5 +-
+ include/drm/drm_framebuffer.h | 33 +-
+ include/drm/drm_gem_cma_helper.h | 17 +
+ include/drm/drm_irq.h | 4 +-
+ include/drm/drm_mm.h | 373 +++-
+ include/drm/drm_mode_config.h | 20 +-
+ include/drm/drm_modeset_helper.h | 3 +-
+ include/drm/drm_modeset_helper_vtables.h | 3 +-
+ include/drm/drm_plane.h | 4 +-
+ include/drm/drm_print.h | 24 +-
+ include/drm/drm_simple_kms_helper.h | 10 +-
+ include/drm/i915_pciids.h | 21 +-
+ include/drm/intel-gtt.h | 6 +-
+ include/linux/dma-buf.h | 224 +-
+ include/linux/dma-fence.h | 52 +-
+ include/linux/kref.h | 2 +-
+ include/linux/prime_numbers.h | 37 +
+ include/linux/reservation.h | 34 +
+ include/uapi/drm/drm_fourcc.h | 11 +
+ include/uapi/drm/i915_drm.h | 135 ++
+ lib/Kconfig | 7 +
+ lib/Makefile | 2 +
+ lib/prime_numbers.c | 314 +++
+ tools/testing/selftests/drivers/gpu/drm_mm.sh | 15 +
+ tools/testing/selftests/lib/prime_numbers.sh | 15 +
+ 389 files changed, 15850 insertions(+), 6674 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
+ delete mode 100644 Documentation/dma-buf-sharing.txt
+ create mode 100644 arch/blackfin/include/asm/vga.h
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h
+ create mode 100644 drivers/gpu/drm/i915/i915_perf.c
+ create mode 100644 drivers/gpu/drm/i915/i915_utils.h
+ create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c
+ create mode 100644 drivers/gpu/drm/i915/intel_uc.c
+ rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (85%)
+ create mode 100644 drivers/gpu/drm/lib/drm_random.c
+ create mode 100644 drivers/gpu/drm/lib/drm_random.h
+ create mode 100644 drivers/gpu/drm/selftests/Makefile
+ create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h
+ create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c
+ create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c
+ create mode 100644 include/linux/prime_numbers.h
+ create mode 100644 lib/prime_numbers.c
+ create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh
+ create mode 100755 tools/testing/selftests/lib/prime_numbers.sh
+Merging drm-panel/drm/panel/for-next (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel())
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_panel.c | 2 +-
+ include/drm/drm_panel.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging drm-intel/for-linux-next (b976dc53ec43 drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
+Auto-merging drivers/gpu/drm/i915/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c
+Merge made by the 'recursive' strategy.
+ Documentation/sound/hd-audio/dp-mst.rst | 17 +
+ drivers/char/agp/intel-gtt.c | 16 +-
+ drivers/gpu/drm/i915/Makefile | 2 +
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 33 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 138 +++++-
+ drivers/gpu/drm/i915/i915_drv.c | 84 ++--
+ drivers/gpu/drm/i915/i915_drv.h | 85 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 362 ++++++++-------
+ drivers/gpu/drm/i915/i915_gem_context.c | 60 ++-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 39 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 64 ++-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.h | 2 +
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 442 ++++++++++++------
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 74 ++-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 8 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 23 +
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 35 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 347 ++++++++------
+ drivers/gpu/drm/i915/i915_gpu_error.c | 3 +-
+ drivers/gpu/drm/i915/i915_guc_reg.h | 6 +
+ drivers/gpu/drm/i915/i915_guc_submission.c | 603 +-----------------------
+ drivers/gpu/drm/i915/i915_irq.c | 95 ++--
+ drivers/gpu/drm/i915/i915_reg.h | 20 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 1 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_trace.h | 16 +-
+ drivers/gpu/drm/i915/i915_vgpu.c | 33 +-
+ drivers/gpu/drm/i915/i915_vma.c | 223 +++++----
+ drivers/gpu/drm/i915/i915_vma.h | 41 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 20 +
+ drivers/gpu/drm/i915/intel_audio.c | 2 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 18 +-
+ drivers/gpu/drm/i915/intel_color.c | 4 +-
+ drivers/gpu/drm/i915/intel_crt.c | 9 +-
+ drivers/gpu/drm/i915/intel_csr.c | 16 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 20 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 2 +-
+ drivers/gpu/drm/i915/intel_display.c | 257 +++++------
+ drivers/gpu/drm/i915/intel_dp.c | 64 ++-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
+ drivers/gpu/drm/i915/intel_drv.h | 17 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 82 +++-
+ drivers/gpu/drm/i915/intel_fbc.c | 57 +--
+ drivers/gpu/drm/i915/intel_fbdev.c | 7 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 24 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 214 +++++----
+ drivers/gpu/drm/i915/intel_guc_log.c | 658 +++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_huc.c | 338 ++++++++++++++
+ drivers/gpu/drm/i915/intel_i2c.c | 4 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 123 ++---
+ drivers/gpu/drm/i915/intel_lrc.h | 4 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 3 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 104 ++++-
+ drivers/gpu/drm/i915/intel_pm.c | 13 +-
+ drivers/gpu/drm/i915/intel_psr.c | 203 +++++++--
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 7 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 8 +-
+ drivers/gpu/drm/i915/intel_uc.c | 26 --
+ drivers/gpu/drm/i915/intel_uc.h | 73 +--
+ include/drm/drm_dp_helper.h | 13 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ sound/pci/hda/hda_codec.c | 76 +++-
+ sound/pci/hda/hda_codec.h | 3 +
+ sound/pci/hda/patch_hdmi.c | 245 +++++++---
+ 70 files changed, 3542 insertions(+), 2106 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_log.c
+ create mode 100644 drivers/gpu/drm/i915/intel_huc.c
+Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/for-linux-next (442ffefc0c3f drm/vgem: Switch to reservation_object_lock() helpers)
+$ git merge drm-misc/for-linux-next
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Merge made by the 'recursive' strategy.
+ .../bindings/display/bridge/adi,adv7511.txt | 12 +
+ .../devicetree/bindings/display/bridge/dw_hdmi.txt | 85 ++--
+ .../devicetree/bindings/display/imx/hdmi.txt | 51 +--
+ .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 43 +-
+ Documentation/gpu/drm-mm.rst | 6 +
+ drivers/gpu/drm/Kconfig | 4 +-
+ drivers/gpu/drm/armada/Kconfig | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 153 +++++--
+ drivers/gpu/drm/bridge/dw-hdmi.c | 440 +++++++++++++--------
+ drivers/gpu/drm/bridge/dw-hdmi.h | 85 +++-
+ drivers/gpu/drm/drm_atomic_helper.c | 135 +++++--
+ drivers/gpu/drm/drm_cache.c | 27 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 27 +-
+ drivers/gpu/drm/drm_mode_config.c | 7 +-
+ drivers/gpu/drm/etnaviv/Kconfig | 1 +
+ drivers/gpu/drm/exynos/Kconfig | 2 -
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 6 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 -
+ drivers/gpu/drm/i915/i915_drv.h | 1 +
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 -
+ drivers/gpu/drm/msm/Kconfig | 1 +
+ drivers/gpu/drm/msm/msm_fbdev.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 33 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 +-
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 10 +
+ drivers/gpu/drm/qxl/qxl_display.c | 1 -
+ drivers/gpu/drm/qxl/qxl_drv.c | 69 +++-
+ drivers/gpu/drm/qxl/qxl_drv.h | 6 +-
+ drivers/gpu/drm/qxl/qxl_kms.c | 56 +--
+ drivers/gpu/drm/qxl/qxl_ttm.c | 8 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +-
+ drivers/gpu/drm/selftests/test-drm_mm.c | 12 +-
+ drivers/gpu/drm/tegra/drm.c | 19 +-
+ drivers/gpu/drm/tegra/fb.c | 7 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 17 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 1 -
+ drivers/gpu/drm/vgem/vgem_drv.h | 1 +
+ drivers/gpu/drm/vgem/vgem_fence.c | 4 +-
+ include/drm/bridge/dw_hdmi.h | 19 +-
+ include/drm/drmP.h | 5 -
+ include/drm/drm_atomic_helper.h | 6 +
+ include/drm/drm_cache.h | 4 +
+ include/drm/drm_crtc.h | 9 +
+ include/drm/drm_fb_cma_helper.h | 2 +
+ include/drm/drm_simple_kms_helper.h | 4 +
+ include/uapi/drm/drm_fourcc.h | 7 +
+ lib/prime_numbers.c | 3 +-
+ 54 files changed, 969 insertions(+), 504 deletions(-)
+Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (95cc3a9501ff drm: mali-dp: Rename malidp_input_format to malidp_pixel_format)
+$ git merge mali-dp/for-upstream/mali-dp
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/arm/malidp_drv.c | 2 --
+ drivers/gpu/drm/arm/malidp_drv.h | 2 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 24 ++++++++--------
+ drivers/gpu/drm/arm/malidp_hw.h | 8 +++---
+ drivers/gpu/drm/arm/malidp_planes.c | 57 +++++++++++++++++++++----------------
+ 5 files changed, 50 insertions(+), 43 deletions(-)
+Merging sunxi/sunxi/for-next (9181f40cede2 Merge branch 'sunxi/clk-for-4.11' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Resolved 'arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts' using previous resolution.
+Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c
+Auto-merging arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cb20c9d90a2e] Merge remote-tracking branch 'sunxi/sunxi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/sunxi/README | 8 +
+ Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
+ .../devicetree/bindings/clock/sunxi-ccu.txt | 1 +
+ .../bindings/power/supply/axp20x_usb_power.txt | 5 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/axp223.dtsi | 58 ++
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 31 +
+ arch/arm/boot/dts/sun4i-a10.dtsi | 1 +
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 85 +-
+ arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 224 +++++
+ arch/arm/boot/dts/sun5i-a13.dtsi | 140 +--
+ arch/arm/boot/dts/sun5i-gr8.dtsi | 520 ++--------
+ arch/arm/boot/dts/sun5i-r8.dtsi | 10 +-
+ arch/arm/boot/dts/sun5i.dtsi | 362 +------
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 19 +
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 30 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 22 +
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 5 +
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 33 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 38 +
+ .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 90 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 6 +
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 9 +-
+ arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 23 +
+ arch/arm/boot/dts/sun8i-a23.dtsi | 16 +
+ arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 2 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 2 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 35 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 1 +
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 160 +++
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 +
+ arch/arm/boot/dts/sun8i-h3.dtsi | 22 +
+ arch/arm/boot/dts/sun8i-r16-parrot.dts | 2 +-
+ .../boot/dts/sun8i-reference-design-tablet.dtsi | 6 +-
+ arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 103 ++
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 312 ++++++
+ arch/arm/boot/dts/sun9i-a80.dtsi | 3 +
+ arch/arm/configs/sunxi_defconfig | 1 +
+ arch/arm/mach-sunxi/sunxi.c | 2 +
+ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 23 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 59 ++
+ drivers/clk/sunxi-ng/Kconfig | 21 +
+ drivers/clk/sunxi-ng/Makefile | 2 +
+ drivers/clk/sunxi-ng/ccu-sun5i.c | 1022 ++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu-sun5i.h | 67 ++
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 14 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 +
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 591 +++++++++++
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 63 ++
+ drivers/clk/sunxi-ng/ccu_common.h | 2 +
+ drivers/clk/sunxi-ng/ccu_div.h | 10 +-
+ drivers/clk/sunxi-ng/ccu_mp.c | 10 +-
+ drivers/clk/sunxi-ng/ccu_mult.c | 30 +-
+ drivers/clk/sunxi-ng/ccu_mult.h | 24 +-
+ drivers/clk/sunxi-ng/ccu_mux.c | 8 +-
+ drivers/clk/sunxi-ng/ccu_nk.c | 22 +-
+ drivers/clk/sunxi-ng/ccu_nkm.c | 26 +-
+ drivers/clk/sunxi-ng/ccu_nkmp.c | 25 +-
+ drivers/clk/sunxi-ng/ccu_nm.c | 17 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +-
+ include/dt-bindings/clock/sun5i-ccu.h | 103 ++
+ include/dt-bindings/clock/sun8i-v3s-ccu.h | 107 ++
+ include/dt-bindings/reset/sun5i-ccu.h | 32 +
+ include/dt-bindings/reset/sun8i-v3s-ccu.h | 78 ++
+ 67 files changed, 3678 insertions(+), 1099 deletions(-)
+ create mode 100644 arch/arm/boot/dts/axp223.dtsi
+ create mode 100644 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-v3s.dtsi
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.h
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.h
+ create mode 100644 include/dt-bindings/clock/sun5i-ccu.h
+ create mode 100644 include/dt-bindings/clock/sun8i-v3s-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun5i-ccu.h
+ create mode 100644 include/dt-bindings/reset/sun8i-v3s-ccu.h
+Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
+$ git merge kspp/for-next/kspp
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 22 +++
+ include/linux/compiler.h | 6 +-
+ scripts/Makefile.gcc-plugins | 4 +
+ scripts/gcc-plugins/cyc_complexity_plugin.c | 6 +-
+ scripts/gcc-plugins/gcc-common.h | 55 +++++--
+ scripts/gcc-plugins/latent_entropy_plugin.c | 8 +-
+ scripts/gcc-plugins/sancov_plugin.c | 8 +-
+ scripts/gcc-plugins/structleak_plugin.c | 246 ++++++++++++++++++++++++++++
+ 8 files changed, 326 insertions(+), 29 deletions(-)
+ create mode 100644 scripts/gcc-plugins/structleak_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 (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regcache-rbtree.c | 7 +-
+ drivers/base/regmap/regcache.c | 20 +++---
+ drivers/base/regmap/regmap-irq.c | 62 ++++++++--------
+ drivers/base/regmap/regmap.c | 129 +++++++++++++++++++---------------
+ include/linux/regmap.h | 115 +++++++++++++++++-------------
+ 5 files changed, 184 insertions(+), 149 deletions(-)
+Merging sound/for-next (9eb5d0e635eb ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform)
+$ git merge sound/for-next
+Auto-merging sound/usb/quirks.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Merge made by the 'recursive' strategy.
+ include/sound/rawmidi.h | 4 +--
+ include/sound/snd_wavefront.h | 4 +--
+ sound/core/rawmidi.c | 2 +-
+ sound/core/seq/seq_virmidi.c | 4 +--
+ sound/drivers/mpu401/mpu401_uart.c | 4 +--
+ sound/drivers/mtpav.c | 4 +--
+ sound/drivers/mts64.c | 4 +--
+ sound/drivers/portman2x4.c | 4 +--
+ sound/drivers/serial-u16550.c | 4 +--
+ sound/drivers/vx/vx_pcm.c | 8 +++--
+ sound/firewire/Kconfig | 1 +
+ sound/firewire/bebob/bebob_hwdep.c | 17 +++++-----
+ sound/firewire/bebob/bebob_midi.c | 26 +++++++--------
+ sound/firewire/bebob/bebob_pcm.c | 51 ++++++++++++++---------------
+ sound/firewire/dice/dice-interface.h | 1 +
+ sound/firewire/dice/dice-midi.c | 22 ++++++-------
+ sound/firewire/dice/dice-stream.c | 12 ++++++-
+ sound/firewire/digi00x/digi00x-hwdep.c | 17 +++++-----
+ sound/firewire/digi00x/digi00x-midi.c | 52 ++++++++++++++----------------
+ sound/firewire/digi00x/digi00x-pcm.c | 52 ++++++++++++++----------------
+ sound/firewire/fireworks/fireworks_hwdep.c | 19 ++++++-----
+ sound/firewire/fireworks/fireworks_midi.c | 26 +++++++--------
+ sound/firewire/fireworks/fireworks_pcm.c | 52 ++++++++++++++----------------
+ sound/firewire/oxfw/oxfw-midi.c | 26 +++++++--------
+ sound/firewire/oxfw/oxfw-scs1x.c | 14 ++++----
+ sound/firewire/oxfw/oxfw.c | 1 +
+ sound/firewire/tascam/tascam-hwdep.c | 17 +++++-----
+ sound/firewire/tascam/tascam-midi.c | 26 +++++++--------
+ sound/firewire/tascam/tascam-pcm.c | 52 ++++++++++++++----------------
+ sound/isa/gus/gus_uart.c | 4 +--
+ sound/isa/msnd/msnd_midi.c | 2 +-
+ sound/isa/sb/sb8_midi.c | 4 +--
+ sound/isa/wavefront/wavefront_midi.c | 4 +--
+ sound/mips/hal2.c | 4 +++
+ sound/pci/ca0106/ca_midi.c | 4 +--
+ sound/pci/cs4281.c | 4 +--
+ sound/pci/cs46xx/cs46xx_lib.c | 4 +--
+ sound/pci/cs5535audio/cs5535audio_pm.c | 4 +--
+ sound/pci/echoaudio/midi.c | 4 +--
+ sound/pci/emu10k1/emu10k1x.c | 4 +--
+ sound/pci/emu10k1/emumpu401.c | 4 +--
+ sound/pci/ens1370.c | 4 +--
+ sound/pci/hda/hda_controller.c | 4 +++
+ sound/pci/hda/hda_controller.h | 1 +
+ sound/pci/hda/hda_intel.c | 23 +++++++++++--
+ sound/pci/hda/patch_ca0132.c | 3 ++
+ sound/pci/hda/patch_realtek.c | 37 ++++++++++++++++++++-
+ sound/pci/ice1712/ice1724.c | 4 +--
+ sound/pci/mixart/mixart.h | 2 +-
+ sound/pci/rme9652/hdsp.c | 4 +--
+ sound/pci/rme9652/hdspm.c | 4 +--
+ sound/pci/vx222/vx222_ops.c | 12 +++----
+ sound/pcmcia/vx/vxp_ops.c | 12 +++----
+ sound/synth/emux/emux_seq.c | 14 ++++----
+ sound/usb/6fire/midi.c | 4 +--
+ sound/usb/bcd2000/bcd2000.c | 4 +--
+ sound/usb/caiaq/midi.c | 4 +--
+ sound/usb/line6/midi.c | 4 +--
+ sound/usb/midi.c | 4 +--
+ sound/usb/quirks.c | 15 +++++++++
+ 60 files changed, 400 insertions(+), 331 deletions(-)
+Merging sound-asoc/for-next (64240ade1b71 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/pxa/pxa2xx-ac97.h
+Removing sound/soc/fsl/mpc5200_psc_ac97.h
+Auto-merging arch/arm/mach-s3c64xx/dev-audio.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/misc/atmel-ssc.txt | 2 +
+ .../bindings/sound/axentia,tse850-pcm5142.txt | 11 +-
+ .../bindings/sound/sunxi,sun4i-spdif.txt | 1 +
+ arch/arm/mach-s3c64xx/dev-audio.c | 4 +-
+ drivers/misc/atmel-ssc.c | 50 +++
+ include/drm/drm_edid.h | 13 +
+ include/linux/atmel-ssc.h | 1 +
+ include/linux/platform_data/asoc-s3c.h | 6 +-
+ include/sound/soc-dai.h | 3 +
+ include/sound/soc.h | 22 +-
+ sound/hda/ext/hdac_ext_stream.c | 15 +-
+ sound/soc/amd/acp-pcm-dma.c | 3 -
+ sound/soc/atmel/tse850-pcm5142.c | 23 +-
+ sound/soc/codecs/Kconfig | 10 +-
+ sound/soc/codecs/Makefile | 4 +-
+ sound/soc/codecs/adau17x1.c | 3 +-
+ sound/soc/codecs/ak4642.c | 2 +-
+ sound/soc/codecs/arizona.h | 1 +
+ sound/soc/codecs/cs47l24.c | 8 +-
+ sound/soc/codecs/da7218.c | 3 +-
+ sound/soc/codecs/hdac_hdmi.c | 238 ++++---------
+ sound/soc/codecs/hdmi-codec.c | 380 ++++++++++++++++++++-
+ sound/soc/codecs/max98090.c | 2 +-
+ sound/soc/codecs/max9867.c | 5 +-
+ sound/soc/codecs/pcm3168a.c | 2 -
+ sound/soc/codecs/rt5514-spi.c | 1 -
+ sound/soc/codecs/rt5640.c | 12 +-
+ sound/soc/codecs/rt5645.c | 2 +-
+ sound/soc/codecs/rt5659.c | 91 +++--
+ sound/soc/codecs/rt5660.c | 6 +-
+ sound/soc/codecs/rt5677-spi.c | 1 -
+ sound/soc/codecs/tlv320aic3x.c | 6 +
+ sound/soc/codecs/wm0010.c | 1 -
+ sound/soc/codecs/wm5102.c | 7 +-
+ sound/soc/codecs/wm5110.c | 10 +-
+ sound/soc/codecs/wm8731.h | 2 +-
+ sound/soc/codecs/wm8753.c | 3 +-
+ sound/soc/codecs/wm8997.c | 6 +-
+ sound/soc/codecs/wm8998.c | 6 +-
+ sound/soc/codecs/wm_adsp.c | 45 ++-
+ sound/soc/codecs/wm_adsp.h | 11 +
+ sound/soc/dwc/designware_i2s.c | 9 +-
+ sound/soc/dwc/designware_pcm.c | 99 ++++--
+ sound/soc/dwc/local.h | 9 +-
+ sound/soc/fsl/efika-audio-fabric.c | 1 -
+ sound/soc/fsl/mpc5200_psc_ac97.c | 1 -
+ sound/soc/fsl/mpc5200_psc_ac97.h | 13 -
+ sound/soc/img/img-parallel-out.c | 2 -
+ sound/soc/intel/Kconfig | 51 ++-
+ sound/soc/intel/Makefile | 2 +-
+ sound/soc/intel/atom/Makefile | 7 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +-
+ sound/soc/intel/atom/sst/sst_ipc.c | 2 -
+ sound/soc/intel/atom/sst/sst_stream.c | 2 -
+ sound/soc/intel/boards/broadwell.c | 2 +
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5640.c | 10 +
+ sound/soc/intel/common/sst-dsp.c | 52 +--
+ sound/soc/intel/skylake/bxt-sst.c | 64 ++--
+ sound/soc/intel/skylake/skl-pcm.c | 164 ++++-----
+ sound/soc/intel/skylake/skl-sst-dsp.h | 4 +-
+ sound/soc/intel/skylake/skl-sst-ipc.h | 5 +-
+ sound/soc/intel/skylake/skl-topology.c | 65 ++--
+ sound/soc/intel/skylake/skl-topology.h | 19 ++
+ sound/soc/intel/skylake/skl-tplg-interface.h | 12 -
+ sound/soc/mxs/mxs-saif.c | 34 +-
+ sound/soc/pxa/e740_wm9705.c | 3 -
+ sound/soc/pxa/e750_wm9705.c | 2 -
+ sound/soc/pxa/e800_wm9712.c | 2 -
+ sound/soc/pxa/em-x270.c | 2 -
+ sound/soc/pxa/mioa701_wm9713.c | 1 -
+ sound/soc/pxa/palm27x.c | 2 -
+ sound/soc/pxa/pxa2xx-ac97.c | 2 -
+ sound/soc/pxa/pxa2xx-ac97.h | 17 -
+ sound/soc/pxa/tosa.c | 2 -
+ sound/soc/pxa/zylonite.c | 1 -
+ sound/soc/samsung/Kconfig | 2 +
+ sound/soc/samsung/i2s.c | 203 +++++------
+ sound/soc/samsung/smdk_wm8580.c | 5 +-
+ sound/soc/samsung/tm2_wm5110.c | 1 +
+ sound/soc/sh/rcar/core.c | 2 -
+ sound/soc/sh/rcar/rsnd.h | 4 +-
+ sound/soc/soc-ac97.c | 2 +-
+ sound/soc/soc-core.c | 185 +++++++++-
+ sound/soc/soc-dapm.c | 62 ++++
+ sound/soc/soc-ops.c | 2 +-
+ sound/soc/soc-pcm.c | 55 ++-
+ sound/soc/soc-topology.c | 19 +-
+ sound/soc/sunxi/sun4i-codec.c | 1 +
+ sound/soc/sunxi/sun4i-i2s.c | 4 +-
+ sound/soc/sunxi/sun4i-spdif.c | 47 ++-
+ sound/soc/zte/zx-i2s.c | 5 +-
+ 92 files changed, 1507 insertions(+), 783 deletions(-)
+ delete mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h
+ delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h
+Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Merge made by the 'recursive' strategy.
+ include/linux/module.h | 2 --
+ kernel/module.c | 2 ++
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging input/next (f719315b52b5 Input: constify device_type structures)
+$ git merge input/next
+Removing include/linux/i2c/mpr121_touchkey.h
+Removing drivers/input/touchscreen/intel-mid-touch.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/cypress,tm2-touchkey.txt | 27 +
+ .../devicetree/bindings/input/mpr121-touchkey.txt | 30 +
+ .../devicetree/bindings/input/pwm-beeper.txt | 16 +
+ drivers/input/input.c | 2 +-
+ drivers/input/joystick/maplecontrol.c | 1 -
+ drivers/input/joystick/xpad.c | 112 ++--
+ drivers/input/keyboard/Kconfig | 11 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/adc-keys.c | 2 -
+ drivers/input/keyboard/adp5520-keys.c | 2 -
+ drivers/input/keyboard/bcm-keypad.c | 2 -
+ drivers/input/keyboard/bf54x-keys.c | 2 -
+ drivers/input/keyboard/cap11xx.c | 1 -
+ drivers/input/keyboard/cros_ec_keyb.c | 3 +-
+ drivers/input/keyboard/davinci_keyscan.c | 4 +-
+ drivers/input/keyboard/gpio_keys.c | 66 ++-
+ drivers/input/keyboard/gpio_keys_polled.c | 7 +-
+ drivers/input/keyboard/jornada680_kbd.c | 2 -
+ drivers/input/keyboard/maple_keyb.c | 1 -
+ drivers/input/keyboard/matrix_keypad.c | 2 -
+ drivers/input/keyboard/max7359_keypad.c | 1 -
+ drivers/input/keyboard/mpr121_touchkey.c | 176 ++++--
+ drivers/input/keyboard/nspire-keypad.c | 2 -
+ drivers/input/keyboard/omap4-keypad.c | 3 -
+ drivers/input/keyboard/opencores-kbd.c | 4 -
+ drivers/input/keyboard/samsung-keypad.c | 2 -
+ drivers/input/keyboard/spear-keyboard.c | 2 -
+ drivers/input/keyboard/sun4i-lradc-keys.c | 1 -
+ drivers/input/keyboard/tca8418_keypad.c | 8 +-
+ drivers/input/keyboard/tm2-touchkey.c | 284 +++++++++
+ drivers/input/keyboard/twl4030_keypad.c | 1 -
+ drivers/input/misc/88pm80x_onkey.c | 1 -
+ drivers/input/misc/ab8500-ponkey.c | 1 -
+ drivers/input/misc/arizona-haptics.c | 2 -
+ drivers/input/misc/atmel_captouch.c | 1 -
+ drivers/input/misc/bfin_rotary.c | 11 +-
+ drivers/input/misc/bma150.c | 4 +-
+ drivers/input/misc/da9063_onkey.c | 1 -
+ drivers/input/misc/dm355evm_keys.c | 2 -
+ drivers/input/misc/drv260x.c | 2 +-
+ drivers/input/misc/e3x0-button.c | 8 -
+ drivers/input/misc/gp2ap002a00f.c | 2 -
+ drivers/input/misc/gpio_decoder.c | 1 -
+ drivers/input/misc/gpio_tilt_polled.c | 2 +-
+ drivers/input/misc/hisi_powerkey.c | 17 +-
+ drivers/input/misc/mma8450.c | 2 -
+ drivers/input/misc/pm8941-pwrkey.c | 1 -
+ drivers/input/misc/pmic8xxx-pwrkey.c | 8 -
+ drivers/input/misc/pwm-beeper.c | 156 +++--
+ drivers/input/misc/retu-pwrbutton.c | 6 -
+ drivers/input/misc/sirfsoc-onkey.c | 8 -
+ drivers/input/misc/soc_button_array.c | 8 +-
+ drivers/input/misc/tps65218-pwrbutton.c | 8 +-
+ drivers/input/misc/twl4030-pwrbutton.c | 1 -
+ drivers/input/mouse/alps.c | 2 +-
+ drivers/input/mouse/bcm5974.c | 2 +-
+ drivers/input/mouse/cyapa.c | 6 +-
+ drivers/input/mouse/cyapa_gen3.c | 29 +-
+ drivers/input/mouse/cypress_ps2.c | 6 +-
+ drivers/input/mouse/elan_i2c_core.c | 46 +-
+ drivers/input/mouse/elantech.c | 2 +-
+ drivers/input/mouse/hgpk.c | 5 +-
+ drivers/input/mouse/logips2pp.c | 2 +-
+ drivers/input/mouse/maplemouse.c | 1 -
+ drivers/input/mouse/trackpoint.c | 4 +-
+ drivers/input/rmi4/rmi_bus.c | 4 +-
+ drivers/input/serio/at32psif.c | 12 +-
+ drivers/input/serio/hyperv-keyboard.c | 1 -
+ drivers/input/serio/i8042-x86ia64io.h | 8 +
+ drivers/input/serio/i8042.c | 6 +-
+ drivers/input/serio/xilinx_ps2.c | 7 +-
+ drivers/input/touchscreen/88pm860x-ts.c | 3 -
+ drivers/input/touchscreen/Kconfig | 12 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/ads7846.c | 2 -
+ drivers/input/touchscreen/ar1021_i2c.c | 1 -
+ drivers/input/touchscreen/atmel-wm97xx.c | 4 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ drivers/input/touchscreen/bu21013_ts.c | 2 -
+ drivers/input/touchscreen/colibri-vf50-ts.c | 2 -
+ drivers/input/touchscreen/edt-ft5x06.c | 5 +-
+ drivers/input/touchscreen/eeti_ts.c | 5 +-
+ drivers/input/touchscreen/egalax_ts.c | 3 -
+ drivers/input/touchscreen/elants_i2c.c | 2 -
+ drivers/input/touchscreen/fsl-imx25-tcq.c | 2 +-
+ drivers/input/touchscreen/ili210x.c | 3 +-
+ drivers/input/touchscreen/intel-mid-touch.c | 654 ---------------------
+ drivers/input/touchscreen/lpc32xx_ts.c | 1 -
+ drivers/input/touchscreen/max11801_ts.c | 2 -
+ drivers/input/touchscreen/mcs5000_ts.c | 1 -
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 4 +-
+ drivers/input/touchscreen/raydium_i2c_ts.c | 2 -
+ drivers/input/touchscreen/rohm_bu21023.c | 3 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 2 +-
+ drivers/input/touchscreen/sis_i2c.c | 1 -
+ drivers/input/touchscreen/st1232.c | 1 -
+ drivers/input/touchscreen/sx8654.c | 1 -
+ include/linux/i2c/mpr121_touchkey.h | 20 -
+ 98 files changed, 775 insertions(+), 1140 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
+ create mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt
+ create mode 100644 drivers/input/keyboard/tm2-touchkey.c
+ delete mode 100644 drivers/input/touchscreen/intel-mid-touch.c
+ delete mode 100644 include/linux/i2c/mpr121_touchkey.h
+Merging block/for-next (79f6d4b71580 Merge branch 'for-4.11/block' into for-next)
+$ git merge block/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 +-
+ block/Kconfig.iosched | 50 +++++
+ block/Makefile | 3 +-
+ block/blk-cgroup.c | 22 +-
+ block/blk-core.c | 20 +-
+ block/blk-exec.c | 3 +-
+ block/blk-flush.c | 12 +-
+ block/blk-ioc.c | 12 +-
+ block/blk-merge.c | 4 +-
+ block/blk-mq-sched.c | 388 ++++++++++++++++++++++++++++++++
+ block/blk-mq-sched.h | 172 ++++++++++++++
+ block/blk-mq-sysfs.c | 13 ++
+ block/blk-mq-tag.c | 151 +++++++------
+ block/blk-mq-tag.h | 9 +-
+ block/blk-mq.c | 499 +++++++++++++++++++++++++----------------
+ block/blk-mq.h | 40 ++++
+ block/blk-tag.c | 1 +
+ block/blk-throttle.c | 6 +-
+ block/blk.h | 26 ++-
+ block/cfq-iosched.c | 10 +-
+ block/deadline-iosched.c | 2 +-
+ block/elevator.c | 244 ++++++++++++++------
+ block/mq-deadline.c | 553 ++++++++++++++++++++++++++++++++++++++++++++++
+ block/noop-iosched.c | 2 +-
+ block/partitions/efi.c | 17 +-
+ drivers/block/floppy.c | 2 +-
+ drivers/nvme/host/pci.c | 1 +
+ include/linux/blk-mq.h | 9 +-
+ include/linux/blk_types.h | 22 +-
+ include/linux/blkdev.h | 28 ++-
+ include/linux/elevator.h | 36 ++-
+ lib/sbitmap.c | 48 +++-
+ 32 files changed, 2014 insertions(+), 395 deletions(-)
+ create mode 100644 block/blk-mq-sched.c
+ create mode 100644 block/blk-mq-sched.h
+ create mode 100644 block/mq-deadline.c
+Merging lightnvm/for-next (fa3742367ee5 lightnvm: add ioctls for vector I/Os)
+$ git merge lightnvm/for-next
+Auto-merging drivers/nvme/host/nvme.h
+Auto-merging drivers/nvme/host/core.c
+Removing drivers/lightnvm/sysblk.c
+Removing drivers/lightnvm/gennvm.h
+Removing drivers/lightnvm/gennvm.c
+Merge made by the 'recursive' strategy.
+ drivers/block/null_blk.c | 3 +-
+ drivers/lightnvm/Kconfig | 9 -
+ drivers/lightnvm/Makefile | 3 +-
+ drivers/lightnvm/core.c | 1008 ++++++++++++++++++++++++-----------------
+ drivers/lightnvm/gennvm.c | 657 ---------------------------
+ drivers/lightnvm/gennvm.h | 62 ---
+ drivers/lightnvm/sysblk.c | 733 ------------------------------
+ drivers/nvme/host/core.c | 4 +
+ drivers/nvme/host/lightnvm.c | 312 +++++++++++--
+ drivers/nvme/host/nvme.h | 6 +
+ include/linux/lightnvm.h | 121 +----
+ include/uapi/linux/lightnvm.h | 50 ++
+ 12 files changed, 935 insertions(+), 2033 deletions(-)
+ delete mode 100644 drivers/lightnvm/gennvm.c
+ delete mode 100644 drivers/lightnvm/gennvm.h
+ delete mode 100644 drivers/lightnvm/sysblk.c
+Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
+$ 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/next (2ed14a2aac8a mmc: tmio: discard obsolete SDIO irqs before enabling irqs)
+$ git merge mmc/next
+Removing include/linux/mmc/dw_mmc.h
+Removing include/linux/mmc/boot.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 +-
+ .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt | 16 +
+ Documentation/devicetree/bindings/mmc/sdhci-st.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/sdhci.txt | 2 +-
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 15 +-
+ .../devicetree/bindings/mmc/zx-dw-mshc.txt | 33 ++
+ .../bindings/net/wireless/marvell-8xxx.txt | 7 +-
+ MAINTAINERS | 1 -
+ arch/arm/mach-davinci/board-da850-evm.c | 1 +
+ arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
+ arch/arm/mach-davinci/board-neuros-osd2.c | 1 +
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 1 +
+ arch/arm/mach-pxa/balloon3.c | 1 +
+ arch/arm/mach-pxa/colibri-pxa270-income.c | 1 +
+ arch/arm/mach-pxa/corgi.c | 1 +
+ arch/arm/mach-pxa/trizeps4.c | 1 +
+ arch/arm/mach-pxa/vpac270.c | 1 +
+ arch/arm/mach-pxa/zeus.c | 1 +
+ arch/arm/mach-pxa/zylonite.c | 1 +
+ arch/mips/alchemy/devboards/db1300.c | 1 +
+ arch/sh/boot/romimage/mmcif-sh7724.c | 16 +-
+ drivers/mmc/core/Kconfig | 10 +
+ drivers/mmc/core/Makefile | 1 +
+ drivers/mmc/core/block.c | 53 +--
+ drivers/mmc/core/block.h | 8 +
+ drivers/mmc/core/bus.c | 2 +
+ drivers/mmc/core/bus.h | 16 +-
+ drivers/mmc/core/card.h | 223 +++++++++++++
+ drivers/mmc/core/core.c | 11 +-
+ drivers/mmc/core/core.h | 41 ++-
+ drivers/mmc/core/debugfs.c | 2 +
+ drivers/mmc/core/host.h | 48 +++
+ drivers/mmc/core/mmc.c | 27 +-
+ drivers/mmc/core/mmc_ops.c | 44 +--
+ drivers/mmc/core/mmc_ops.h | 14 +
+ drivers/mmc/core/mmc_test.c | 108 +++----
+ drivers/mmc/core/pwrseq.h | 6 +-
+ drivers/mmc/core/pwrseq_sd8787.c | 117 +++++++
+ drivers/mmc/core/queue.c | 4 +-
+ drivers/mmc/core/queue.h | 6 +-
+ drivers/mmc/core/quirks.c | 2 +
+ drivers/mmc/core/sd.c | 2 +
+ drivers/mmc/core/sd.h | 5 +-
+ drivers/mmc/core/sd_ops.c | 30 +-
+ drivers/mmc/core/sd_ops.h | 9 +
+ drivers/mmc/core/sdio.c | 40 ++-
+ drivers/mmc/core/sdio_bus.c | 1 +
+ drivers/mmc/core/sdio_bus.h | 3 +
+ drivers/mmc/core/sdio_cis.h | 3 +
+ drivers/mmc/core/sdio_io.c | 2 +
+ drivers/mmc/core/sdio_irq.c | 2 +
+ drivers/mmc/core/sdio_ops.c | 10 +-
+ drivers/mmc/core/sdio_ops.h | 5 +
+ drivers/mmc/core/slot-gpio.c | 6 -
+ drivers/mmc/core/slot-gpio.h | 2 +
+ drivers/mmc/host/Kconfig | 9 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/davinci_mmc.c | 1 +
+ drivers/mmc/host/dw_mmc-exynos.c | 1 -
+ drivers/mmc/host/dw_mmc-k3.c | 1 -
+ drivers/mmc/host/dw_mmc-pci.c | 1 -
+ drivers/mmc/host/dw_mmc-pltfm.c | 1 -
+ drivers/mmc/host/dw_mmc-rockchip.c | 1 -
+ drivers/mmc/host/dw_mmc-zx.c | 241 ++++++++++++++
+ drivers/mmc/host/dw_mmc-zx.h | 31 ++
+ drivers/mmc/host/dw_mmc.c | 25 +-
+ drivers/mmc/host/dw_mmc.h | 263 +++++++++++++++
+ drivers/mmc/host/meson-gx-mmc.c | 1 +
+ drivers/mmc/host/mtk-sd.c | 8 +-
+ drivers/mmc/host/mxs-mmc.c | 16 +-
+ drivers/mmc/host/omap.c | 2 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +-
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +-
+ drivers/mmc/host/s3cmci.c | 1 +
+ drivers/mmc/host/sdhci-acpi.c | 5 +-
+ drivers/mmc/host/sdhci-cadence.c | 1 +
+ drivers/mmc/host/sdhci-esdhc.h | 44 +--
+ drivers/mmc/host/sdhci-iproc.c | 11 +-
+ drivers/mmc/host/sdhci-msm.c | 356 +++++++++++++--------
+ drivers/mmc/host/sdhci-of-esdhc.c | 39 ++-
+ drivers/mmc/host/sdhci-pci-core.c | 97 +++++-
+ drivers/mmc/host/sdhci-pci.h | 1 -
+ drivers/mmc/host/sdhci.c | 13 +-
+ drivers/mmc/host/sdhci.h | 2 +
+ drivers/mmc/host/sh_mmcif.c | 28 +-
+ drivers/mmc/host/sh_mobile_sdhi.c | 72 ++---
+ drivers/mmc/host/tmio_mmc.h | 3 +
+ drivers/mmc/host/tmio_mmc_pio.c | 61 ++--
+ drivers/mmc/host/via-sdmmc.c | 1 +
+ drivers/mmc/host/vub300.c | 8 +-
+ drivers/mmc/host/wbsd.c | 7 +-
+ drivers/mmc/host/wmt-sdmmc.c | 1 +
+ include/linux/mfd/tmio.h | 6 +-
+ include/linux/mmc/boot.h | 7 -
+ include/linux/mmc/card.h | 245 +-------------
+ include/linux/mmc/core.h | 86 +----
+ include/linux/mmc/dw_mmc.h | 274 ----------------
+ include/linux/mmc/host.h | 63 +---
+ include/linux/mmc/mmc.h | 62 +---
+ include/linux/mmc/sh_mmcif.h | 5 -
+ include/linux/mmc/slot-gpio.h | 3 +
+ include/linux/platform_data/mmc-mxcmmc.h | 1 +
+ 102 files changed, 1902 insertions(+), 1177 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
+ create mode 100644 drivers/mmc/core/card.h
+ create mode 100644 drivers/mmc/core/pwrseq_sd8787.c
+ create mode 100644 drivers/mmc/host/dw_mmc-zx.c
+ create mode 100644 drivers/mmc/host/dw_mmc-zx.h
+ delete mode 100644 include/linux/mmc/boot.h
+ delete mode 100644 include/linux/mmc/dw_mmc.h
+Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/kdb/kdb_io.c
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (c8fdae277039 md/r5cache: enable chunk_aligned_read with write back cache)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/linear.c | 2 +
+ drivers/md/md.c | 47 ++++++++
+ drivers/md/md.h | 2 +
+ drivers/md/multipath.c | 4 +
+ drivers/md/raid0.c | 2 +
+ drivers/md/raid5-cache.c | 277 +++++++++++++++++++++++++++++++++++++++++------
+ drivers/md/raid5.c | 196 +++++++++++++++++++++++++++------
+ drivers/md/raid5.h | 12 ++
+ lib/radix-tree.c | 1 +
+ 9 files changed, 472 insertions(+), 71 deletions(-)
+Merging mfd/for-mfd-next (666114db60a6 mfd: mt6397: Add MT6323 LED support into MT6397 driver)
+$ git merge mfd/for-mfd-next
+Resolved 'arch/arm/boot/dts/stm32f429.dtsi' using previous resolution.
+Auto-merging arch/arm/boot/dts/stm32f469-disco.dts
+Auto-merging arch/arm/boot/dts/stm32f429.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32f429.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e91aafd76305] Merge remote-tracking branch 'mfd/for-mfd-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-bus-iio-timer-stm32 | 29 ++
+ .../bindings/iio/timer/stm32-timer-trigger.txt | 23 ++
+ .../devicetree/bindings/mfd/aspeed-gfx.txt | 17 +
+ .../devicetree/bindings/mfd/aspeed-lpc.txt | 137 +++++++
+ Documentation/devicetree/bindings/mfd/mfd.txt | 12 +-
+ Documentation/devicetree/bindings/mfd/mt6397.txt | 4 +
+ .../devicetree/bindings/mfd/stm32-timers.txt | 46 +++
+ .../devicetree/bindings/pwm/pwm-stm32.txt | 35 ++
+ arch/arm/boot/dts/stm32f429.dtsi | 275 ++++++++++++++
+ arch/arm/boot/dts/stm32f469-disco.dts | 28 ++
+ drivers/iio/trigger/Kconfig | 9 +
+ drivers/iio/trigger/Makefile | 1 +
+ drivers/iio/trigger/stm32-timer-trigger.c | 342 ++++++++++++++++++
+ drivers/mfd/Kconfig | 12 +
+ drivers/mfd/Makefile | 2 +
+ drivers/mfd/ab8500-core.c | 4 +-
+ drivers/mfd/ab8500-sysctrl.c | 14 +-
+ drivers/mfd/arizona-irq.c | 86 +++--
+ drivers/mfd/arizona.h | 2 -
+ drivers/mfd/axp20x.c | 78 +++-
+ drivers/mfd/cros_ec.c | 53 +++
+ drivers/mfd/intel-lpss-pci.c | 17 +-
+ drivers/mfd/max77686.c | 25 +-
+ drivers/mfd/mt6397-core.c | 4 +
+ drivers/mfd/stm32-timers.c | 80 +++++
+ drivers/mfd/sun6i-prcm.c | 13 +
+ drivers/mfd/tps65912-i2c.c | 1 +
+ drivers/platform/chrome/cros_ec_proto.c | 5 +
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-stm32.c | 398 +++++++++++++++++++++
+ include/linux/iio/timer/stm32-timer-trigger.h | 62 ++++
+ include/linux/mfd/abx500.h | 2 +-
+ include/linux/mfd/abx500/ab8500-bm.h | 4 +-
+ include/linux/mfd/axp20x.h | 20 +-
+ include/linux/mfd/cros_ec.h | 2 +
+ include/linux/mfd/cros_ec_commands.h | 87 ++++-
+ include/linux/mfd/stm32-timers.h | 71 ++++
+ 38 files changed, 1929 insertions(+), 81 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
+ create mode 100644 Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-gfx.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/stm32-timers.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-stm32.txt
+ create mode 100644 drivers/iio/trigger/stm32-timer-trigger.c
+ create mode 100644 drivers/mfd/stm32-timers.c
+ create mode 100644 drivers/pwm/pwm-stm32.c
+ create mode 100644 include/linux/iio/timer/stm32-timer-trigger.h
+ create mode 100644 include/linux/mfd/stm32-timers.h
+Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/for-next (a1b94355ea3f power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference)
+$ git merge battery/for-next
+Auto-merging include/linux/mfd/axp20x.h
+Removing drivers/power/supply/intel_mid_battery.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/power/supply/bq27xxx.txt | 36 +
+ .../devicetree/bindings/power/supply/qcom_smbb.txt | 19 +
+ .../bindings/power/supply/sbs_sbs-charger.txt | 23 +
+ .../bindings/power/supply/ti,bq24735.txt | 8 +-
+ .../bindings/power_supply/maxim,max14656.txt | 25 +
+ drivers/power/reset/Kconfig | 2 +-
+ drivers/power/reset/at91-poweroff.c | 54 +-
+ drivers/power/reset/at91-reset.c | 18 +-
+ drivers/power/reset/at91-sama5d2_shdwc.c | 49 +-
+ drivers/power/supply/Kconfig | 24 +-
+ drivers/power/supply/Makefile | 3 +-
+ drivers/power/supply/ab8500_btemp.c | 16 +-
+ drivers/power/supply/axp20x_usb_power.c | 117 ++-
+ drivers/power/supply/axp288_charger.c | 387 +++++-----
+ drivers/power/supply/axp288_fuel_gauge.c | 539 +++-----------
+ drivers/power/supply/bq2415x_charger.c | 5 +
+ drivers/power/supply/bq24190_charger.c | 188 ++---
+ drivers/power/supply/bq24735-charger.c | 108 ++-
+ drivers/power/supply/bq27xxx_battery.c | 356 ++++++++-
+ drivers/power/supply/bq27xxx_battery_i2c.c | 22 +-
+ drivers/power/supply/gpio-charger.c | 84 ++-
+ drivers/power/supply/intel_mid_battery.c | 795 ---------------------
+ drivers/power/supply/max14656_charger_detector.c | 325 +++++++++
+ drivers/power/supply/max8997_charger.c | 15 +-
+ drivers/power/supply/pcf50633-charger.c | 13 +-
+ drivers/power/supply/qcom_smbb.c | 72 +-
+ drivers/power/supply/sbs-charger.c | 274 +++++++
+ drivers/power/supply/tps65217_charger.c | 99 +--
+ drivers/power/supply/wm97xx_battery.c | 5 -
+ include/linux/mfd/axp20x.h | 31 +-
+ include/linux/power/bq27xxx_battery.h | 12 +-
+ include/soc/at91/at91sam9_ddrsdr.h | 3 +
+ 32 files changed, 1913 insertions(+), 1814 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/maxim,max14656.txt
+ delete mode 100644 drivers/power/supply/intel_mid_battery.c
+ create mode 100644 drivers/power/supply/max14656_charger_detector.c
+ create mode 100644 drivers/power/supply/sbs-charger.c
+Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (1f57ef5dc717 Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/qcom-smd' and 'regulator/topic/supplies' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/qcom,smd-rpm-regulator.txt | 56 +++++++++++
+ drivers/regulator/arizona-micsupp.c | 6 +-
+ drivers/regulator/core.c | 13 +++
+ drivers/regulator/qcom_smd-regulator.c | 102 +++++++++++++++++++++
+ drivers/regulator/twl6030-regulator.c | 2 +-
+ 5 files changed, 176 insertions(+), 3 deletions(-)
+Merging security/next (c659af78eb7b tpm: Check size of response before accessing data)
+$ git merge security/next
+Auto-merging security/selinux/hooks.c
+Removing security/apparmor/sid.c
+Auto-merging security/apparmor/include/secid.h
+Merge made by the 'recursive' strategy.
+ Documentation/security/LSM.txt | 7 +
+ drivers/char/tpm/st33zp24/st33zp24.c | 1 -
+ drivers/char/tpm/tpm-chip.c | 8 +-
+ drivers/char/tpm/tpm-interface.c | 159 ++++--
+ drivers/char/tpm/tpm-sysfs.c | 28 +-
+ drivers/char/tpm/tpm.h | 7 +-
+ drivers/char/tpm/tpm2-cmd.c | 170 +++---
+ drivers/char/tpm/tpm_crb.c | 8 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 106 ++--
+ drivers/char/tpm/tpm_tis.c | 2 +-
+ drivers/char/tpm/tpm_tis_core.c | 9 +-
+ drivers/char/tpm/tpm_tis_core.h | 2 +-
+ drivers/char/tpm/tpm_tis_spi.c | 1 -
+ drivers/char/tpm/tpm_vtpm_proxy.c | 48 +-
+ include/linux/lsm_hooks.h | 15 +-
+ kernel/seccomp.c | 29 +-
+ samples/seccomp/bpf-helper.h | 125 ++--
+ security/apparmor/Kconfig | 31 +-
+ security/apparmor/Makefile | 2 +-
+ security/apparmor/apparmorfs.c | 681 ++++++++++++++++++----
+ security/apparmor/audit.c | 98 +---
+ security/apparmor/capability.c | 26 +-
+ security/apparmor/context.c | 107 ++--
+ security/apparmor/crypto.c | 39 +-
+ security/apparmor/domain.c | 137 ++---
+ security/apparmor/file.c | 80 +--
+ security/apparmor/include/apparmor.h | 82 +--
+ security/apparmor/include/apparmorfs.h | 21 +-
+ security/apparmor/include/audit.h | 152 ++---
+ security/apparmor/include/context.h | 84 +--
+ security/apparmor/include/crypto.h | 5 +
+ security/apparmor/include/domain.h | 4 +-
+ security/apparmor/include/file.h | 9 +-
+ security/apparmor/include/lib.h | 200 +++++++
+ security/apparmor/include/match.h | 26 +-
+ security/apparmor/include/path.h | 53 ++
+ security/apparmor/include/policy.h | 199 ++-----
+ security/apparmor/include/policy_ns.h | 147 +++++
+ security/apparmor/include/policy_unpack.h | 28 +-
+ security/apparmor/include/{sid.h => secid.h} | 18 +-
+ security/apparmor/ipc.c | 18 +-
+ security/apparmor/lib.c | 111 +++-
+ security/apparmor/lsm.c | 320 +++++++----
+ security/apparmor/match.c | 47 +-
+ security/apparmor/nulldfa.in | 1 +
+ security/apparmor/policy.c | 824 ++++++++++-----------------
+ security/apparmor/policy_ns.c | 346 +++++++++++
+ security/apparmor/policy_unpack.c | 257 ++++++---
+ security/apparmor/procattr.c | 38 +-
+ security/apparmor/resource.c | 19 +-
+ security/apparmor/secid.c | 55 ++
+ security/apparmor/sid.c | 55 --
+ security/commoncap.c | 3 +-
+ security/inode.c | 26 +-
+ security/loadpin/loadpin.c | 2 +-
+ security/security.c | 38 ++
+ security/selinux/hooks.c | 2 +-
+ security/smack/smack_lsm.c | 2 +-
+ security/tomoyo/tomoyo.c | 2 +-
+ security/yama/yama_lsm.c | 2 +-
+ 60 files changed, 3319 insertions(+), 1803 deletions(-)
+ create mode 100644 security/apparmor/include/lib.h
+ create mode 100644 security/apparmor/include/policy_ns.h
+ rename security/apparmor/include/{sid.h => secid.h} (50%)
+ create mode 100644 security/apparmor/nulldfa.in
+ create mode 100644 security/apparmor/policy_ns.c
+ create mode 100644 security/apparmor/secid.c
+ delete mode 100644 security/apparmor/sid.c
+Merging integrity/next (07a77aadc4e8 ima: fix ima_d_path() possible race with rename)
+$ git merge integrity/next
+Merge made by the 'recursive' strategy.
+ security/integrity/ima/ima.h | 2 +-
+ security/integrity/ima/ima_api.c | 20 ++++++++++++++++++--
+ security/integrity/ima/ima_main.c | 8 +++++---
+ 3 files changed, 24 insertions(+), 6 deletions(-)
+Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
+$ git merge keys/keys-next
+Auto-merging security/keys/keyctl.c
+Auto-merging crypto/asymmetric_keys/x509_cert_parser.c
+Auto-merging crypto/asymmetric_keys/public_key.c
+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 (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
+$ git merge selinux/next
+Auto-merging security/smack/smack_lsm.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging fs/proc/base.c
+Merge made by the 'recursive' strategy.
+ fs/proc/base.c | 13 +-
+ include/linux/lsm_hooks.h | 10 +-
+ include/linux/security.h | 10 +-
+ kernel/exit.c | 19 +-
+ security/apparmor/lsm.c | 7 +-
+ security/security.c | 10 +-
+ security/selinux/hooks.c | 377 ++++++++++++++++++------------------
+ security/selinux/include/classmap.h | 62 ++++++
+ security/selinux/include/objsec.h | 10 +
+ security/selinux/include/security.h | 3 +-
+ security/selinux/selinuxfs.c | 98 ++++++----
+ security/selinux/ss/services.c | 3 +
+ security/smack/smack_lsm.c | 31 +--
+ 13 files changed, 339 insertions(+), 314 deletions(-)
+$ git am -3 ../patches/0001-selinux-merge-fix-for-smc-establish-new-socket-famil.patch
+Applying: selinux: merge fix for "smc: establish new socket family"
+$ git reset HEAD^
+Unstaged changes after reset:
+M security/selinux/hooks.c
+M security/selinux/include/classmap.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 176c090ea5bd] Merge remote-tracking branch 'selinux/next'
+ Date: Wed Jan 25 12:55:16 2017 +1100
+Merging tpmdd/next (c659af78eb7b tpm: Check size of response before accessing data)
+$ git merge tpmdd/next
+Already up-to-date.
+Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/iova.c | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
+$ git merge vfio/next
+Already up-to-date.
+Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
+$ git merge audit/next
+Resolved 'include/uapi/linux/audit.h' using previous resolution.
+Auto-merging net/compat.c
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit.c
+Auto-merging include/uapi/linux/audit.h
+CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
+Auto-merging include/linux/audit.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8436afa7f904] Merge remote-tracking branch 'audit/next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/audit.h | 20 ++++++++++++++++++++
+ include/uapi/linux/audit.h | 6 +++++-
+ kernel/audit.c | 12 ++++++++++--
+ kernel/auditsc.c | 2 +-
+ net/compat.c | 17 ++++++++++++++---
+ 5 files changed, 50 insertions(+), 7 deletions(-)
+Merging devicetree/for-next (a51741ebe131 Documentation: usb: fix wrong documentation paths)
+$ git merge devicetree/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/bus/qcom,ebi2.txt | 6 +-
+ .../bindings/clock/mvebu-gated-clock.txt | 2 +-
+ .../devicetree/bindings/display/arm,pl11x.txt | 2 +-
+ .../bindings/display/bridge/analogix_dp.txt | 2 +-
+ .../bindings/display/cirrus,clps711x-fb.txt | 2 +-
+ .../bindings/display/exynos/exynos7-decon.txt | 2 +-
+ .../bindings/display/exynos/samsung-fimd.txt | 2 +-
+ .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 +-
+ .../devicetree/bindings/display/imx/ldb.txt | 2 +-
+ .../bindings/display/mediatek/mediatek,disp.txt | 2 +-
+ .../devicetree/bindings/display/msm/dsi.txt | 2 +-
+ .../devicetree/bindings/display/msm/edp.txt | 2 +-
+ .../devicetree/bindings/display/msm/hdmi.txt | 2 +-
+ .../bindings/display/panel/panel-dpi.txt | 2 +-
+ .../bindings/display/panel/samsung,ld9040.txt | 2 +-
+ .../bindings/display/panel/samsung,s6e8aa0.txt | 2 +-
+ .../display/rockchip/analogix_dp-rockchip.txt | 2 +-
+ .../devicetree/bindings/display/tilcdc/panel.txt | 2 +-
+ .../devicetree/bindings/iommu/arm,smmu.txt | 10 +-
+ .../devicetree/bindings/mfd/omap-usb-host.txt | 4 +-
+ .../devicetree/bindings/pci/pci-iommu.txt | 6 +-
+ .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 +-
+ .../devicetree/bindings/soc/fsl/qman-portals.txt | 20 -
+ Documentation/devicetree/bindings/usb/dwc3-st.txt | 4 +-
+ .../devicetree/bindings/usb/ehci-omap.txt | 1 -
+ Documentation/devicetree/bindings/usb/ehci-st.txt | 2 +-
+ .../devicetree/bindings/usb/mt8173-mtu3.txt | 2 +-
+ .../devicetree/bindings/usb/mt8173-xhci.txt | 4 +-
+ .../devicetree/bindings/usb/qcom,dwc3.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ drivers/of/irq.c | 19 +-
+ drivers/of/of_pci_irq.c | 10 +-
+ drivers/of/of_reserved_mem.c | 4 +
+ drivers/of/overlay.c | 2 -
+ drivers/of/resolver.c | 1 -
+ drivers/of/unittest.c | 1 -
+ scripts/dtc/checks.c | 349 +++++-----
+ scripts/dtc/dtc-lexer.l | 21 +-
+ scripts/dtc/dtc-lexer.lex.c_shipped | 650 +++++++++---------
+ scripts/dtc/dtc-parser.tab.c_shipped | 752 +++++++++++----------
+ scripts/dtc/dtc-parser.tab.h_shipped | 54 +-
+ scripts/dtc/dtc-parser.y | 34 +-
+ scripts/dtc/dtc.c | 69 +-
+ scripts/dtc/dtc.h | 39 +-
+ scripts/dtc/flattree.c | 41 +-
+ scripts/dtc/fstree.c | 5 +-
+ scripts/dtc/libfdt/Makefile.libfdt | 2 +-
+ scripts/dtc/libfdt/fdt_ro.c | 30 +-
+ scripts/dtc/libfdt/fdt_rw.c | 6 +-
+ scripts/dtc/libfdt/fdt_strerror.c | 6 +
+ scripts/dtc/libfdt/fdt_wip.c | 29 +-
+ scripts/dtc/libfdt/libfdt.h | 210 +++++-
+ scripts/dtc/libfdt/libfdt_env.h | 1 +
+ scripts/dtc/livetree.c | 299 +++++++-
+ scripts/dtc/srcpos.c | 35 +-
+ scripts/dtc/srcpos.h | 1 -
+ scripts/dtc/treesource.c | 14 +-
+ scripts/dtc/util.c | 30 +
+ scripts/dtc/util.h | 1 +
+ scripts/dtc/version_gen.h | 2 +-
+ 60 files changed, 1727 insertions(+), 1090 deletions(-)
+Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (e38103cebb33 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/spi-rockchip.txt | 7 +++
+ drivers/spi/Kconfig | 5 +-
+ drivers/spi/spi-armada-3700.c | 12 ++---
+ drivers/spi/spi-ath79.c | 23 ++++----
+ drivers/spi/spi-bcm53xx.c | 18 ++++---
+ drivers/spi/spi-dw.c | 8 +--
+ drivers/spi/spi-dw.h | 1 -
+ drivers/spi/spi-fsl-lpspi.c | 8 +--
+ drivers/spi/spi-fsl-spi.c | 17 +++---
+ drivers/spi/spi-imx.c | 16 +++---
+ drivers/spi/spi-mpc52xx.c | 12 ++---
+ drivers/spi/spi-ppc4xx.c | 7 +--
+ drivers/spi/spi-pxa2xx-pci.c | 24 +++++++++
+ drivers/spi/spi-pxa2xx.c | 33 +++++++-----
+ drivers/spi/spi-rockchip.c | 5 ++
+ drivers/spi/spi-rspi.c | 4 +-
+ drivers/spi/spi-s3c64xx.c | 57 ++++++++++----------
+ drivers/spi/spi-sh-msiof.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 31 ++++++-----
+ drivers/spi/spi.c | 62 +++++++++++++---------
+ include/linux/pxa2xx_ssp.h | 14 ++---
+ 21 files changed, 211 insertions(+), 157 deletions(-)
+Merging tip/auto-latest (4929143ff1e2 Merge branch 'ras/core')
+$ git merge tip/auto-latest
+Resolved 'security/apparmor/include/apparmor.h' using previous resolution.
+Auto-merging security/apparmor/include/policy.h
+Auto-merging security/apparmor/include/apparmor.h
+CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
+Auto-merging net/sunrpc/cache.c
+Auto-merging net/ceph/messenger.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/exit.c
+Auto-merging init/main.c
+Auto-merging include/linux/sunrpc/cache.h
+Auto-merging include/linux/kref.h
+Removing include/linux/intel_pmic_gpio.h
+Auto-merging include/drm/drm_framebuffer.h
+Removing drivers/platform/x86/intel_pmic_gpio.c
+Auto-merging drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_object.h
+Auto-merging drivers/gpu/drm/drm_mode_object.c
+Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c
+Auto-merging drivers/block/drbd/drbd_main.c
+Removing arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
+Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.h
+Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.c
+Auto-merging arch/x86/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c8082f1b6e3f] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/locking/ww-mutex-design.txt | 12 +-
+ Documentation/scheduler/sched-deadline.txt | 6 +
+ Documentation/scheduler/sched-rt-group.txt | 8 +-
+ Documentation/x86/intel_rdt_ui.txt | 114 ++++
+ arch/ia64/include/asm/thread_info.h | 6 +
+ arch/ia64/kernel/setup.c | 2 +
+ arch/ia64/kernel/time.c | 66 ++-
+ arch/parisc/kernel/setup.c | 2 +
+ arch/powerpc/include/asm/accounting.h | 14 +-
+ arch/powerpc/include/asm/paca.h | 1 -
+ arch/powerpc/kernel/asm-offsets.c | 8 +-
+ arch/powerpc/kernel/time.c | 138 +++--
+ arch/powerpc/xmon/xmon.c | 8 +-
+ arch/s390/include/asm/lowcore.h | 65 ++-
+ arch/s390/include/asm/processor.h | 3 +
+ arch/s390/kernel/vtime.c | 138 +++--
+ arch/tile/include/asm/Kbuild | 1 -
+ arch/tile/include/asm/div64.h | 14 +
+ arch/um/drivers/random.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/include/asm/apic.h | 2 +-
+ arch/x86/include/asm/cpufeatures.h | 2 +-
+ arch/x86/include/asm/div64.h | 11 +
+ arch/x86/include/asm/e820.h | 2 -
+ arch/x86/include/asm/intel-mid.h | 5 +-
+ arch/x86/include/asm/mce.h | 20 +-
+ arch/x86/include/asm/microcode.h | 9 +-
+ arch/x86/include/asm/microcode_amd.h | 2 -
+ arch/x86/include/asm/msr.h | 51 +-
+ arch/x86/include/asm/pgtable_32.h | 32 +
+ arch/x86/include/asm/spinlock.h | 3 -
+ arch/x86/kernel/apic/apic.c | 39 +-
+ arch/x86/kernel/apic/io_apic.c | 4 +-
+ arch/x86/kernel/apic/vector.c | 2 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 30 +-
+ arch/x86/kernel/cpu/amd.c | 6 +-
+ arch/x86/kernel/cpu/centaur.c | 6 +-
+ arch/x86/kernel/cpu/common.c | 3 +
+ arch/x86/kernel/cpu/cyrix.c | 2 +
+ arch/x86/kernel/cpu/intel.c | 6 +-
+ arch/x86/kernel/cpu/mcheck/mce-apei.c | 5 +-
+ arch/x86/kernel/cpu/mcheck/mce-genpool.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 +-
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 57 +-
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 13 +-
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 36 +-
+ arch/x86/kernel/cpu/mcheck/threshold.c | 4 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 500 +++++-----------
+ arch/x86/kernel/cpu/microcode/core.c | 81 ++-
+ arch/x86/kernel/cpu/microcode/intel.c | 9 +-
+ arch/x86/kernel/cpu/transmeta.c | 3 +
+ arch/x86/kernel/e820.c | 22 +-
+ arch/x86/kernel/fpu/core.c | 4 +-
+ arch/x86/kernel/fpu/xstate.c | 1 +
+ arch/x86/kernel/head32.c | 62 ++
+ arch/x86/kernel/head_32.S | 121 +---
+ arch/x86/kernel/irq.c | 4 +-
+ arch/x86/kernel/irq_work.c | 5 +-
+ arch/x86/kernel/itmt.c | 6 +-
+ arch/x86/kernel/jump_label.c | 3 +-
+ arch/x86/kernel/kvm.c | 14 -
+ arch/x86/kernel/kvmclock.c | 2 +-
+ arch/x86/kernel/paravirt-spinlocks.c | 3 -
+ arch/x86/kernel/setup.c | 4 +-
+ arch/x86/kernel/smp.c | 15 +-
+ arch/x86/kernel/tsc.c | 11 +
+ arch/x86/lib/delay.c | 4 +-
+ arch/x86/platform/intel-mid/device_libs/Makefile | 3 +-
+ .../intel-mid/device_libs/platform_gpio_keys.c | 3 +
+ .../platform/intel-mid/device_libs/platform_ipc.c | 68 ---
+ .../platform/intel-mid/device_libs/platform_ipc.h | 18 -
+ .../intel-mid/device_libs/platform_mrfld_rtc.c | 48 ++
+ .../intel-mid/device_libs/platform_mrfld_wdt.c | 12 +-
+ .../intel-mid/device_libs/platform_msic_audio.c | 3 +-
+ .../intel-mid/device_libs/platform_msic_battery.c | 3 +-
+ .../intel-mid/device_libs/platform_msic_gpio.c | 3 +-
+ .../intel-mid/device_libs/platform_msic_ocd.c | 3 +-
+ .../device_libs/platform_msic_power_btn.c | 3 +-
+ .../intel-mid/device_libs/platform_msic_thermal.c | 3 +-
+ .../intel-mid/device_libs/platform_pmic_gpio.c | 54 --
+ arch/x86/platform/intel-mid/mrfld.c | 1 +
+ arch/x86/platform/intel-mid/sfi.c | 58 +-
+ arch/x86/ras/Kconfig | 2 +-
+ arch/x86/xen/spinlock.c | 19 -
+ drivers/acpi/acpi_extlog.c | 1 +
+ drivers/acpi/nfit/mce.c | 1 +
+ drivers/base/platform-msi.c | 2 +-
+ drivers/block/drbd/drbd_bitmap.c | 2 +-
+ drivers/block/drbd/drbd_main.c | 7 +-
+ drivers/block/drbd/drbd_req.c | 31 +-
+ drivers/block/rbd.c | 8 +-
+ drivers/block/virtio_blk.c | 2 +-
+ drivers/edac/i7core_edac.c | 1 +
+ drivers/edac/mce_amd.c | 8 +-
+ drivers/edac/mce_amd.h | 1 -
+ drivers/edac/sb_edac.c | 3 +-
+ drivers/edac/skx_edac.c | 3 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
+ drivers/gpu/drm/drm_info.c | 2 +-
+ drivers/gpu/drm/drm_mode_object.c | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 63 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_object.c | 2 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.h | 6 +-
+ drivers/infiniband/hw/cxgb3/iwch_qp.c | 2 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 6 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 2 +-
+ drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 6 +-
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 4 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-crypt.c | 4 +-
+ drivers/md/persistent-data/dm-block-manager.c | 4 +-
+ drivers/misc/genwqe/card_dev.c | 2 +-
+ drivers/misc/mei/debugfs.c | 2 +-
+ drivers/pci/hotplug/pnv_php.c | 2 +-
+ drivers/pci/slot.c | 2 +-
+ drivers/platform/x86/Kconfig | 7 -
+ drivers/platform/x86/Makefile | 1 -
+ drivers/platform/x86/intel_pmic_gpio.c | 326 -----------
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +-
+ drivers/scsi/cxgbi/libcxgbi.h | 4 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
+ drivers/scsi/lpfc/lpfc_els.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 40 +-
+ drivers/scsi/lpfc/lpfc_init.c | 3 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +-
+ drivers/staging/android/ion/ion.c | 2 +-
+ drivers/staging/comedi/comedi_buf.c | 2 +-
+ .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 2 +-
+ drivers/target/target_core_pr.c | 10 +-
+ drivers/target/tcm_fc/tfc_sess.c | 2 +-
+ drivers/tty/tty_ldsem.c | 18 +-
+ drivers/usb/gadget/function/f_fs.c | 2 +-
+ drivers/usb/mon/mon_main.c | 2 +-
+ fs/exofs/sys.c | 2 +-
+ fs/fuse/fuse_i.h | 2 +-
+ fs/jbd2/commit.c | 2 +-
+ fs/jbd2/journal.c | 12 +-
+ fs/ocfs2/cluster/netdebug.c | 2 +-
+ fs/ocfs2/cluster/tcp.c | 2 +-
+ fs/ocfs2/dlm/dlmdebug.c | 12 +-
+ fs/ocfs2/dlm/dlmdomain.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 8 +-
+ fs/ocfs2/dlm/dlmunlock.c | 2 +-
+ include/asm-generic/rwsem.h | 13 +-
+ include/drm/drm_framebuffer.h | 2 +-
+ include/drm/ttm/ttm_bo_api.h | 15 +-
+ include/drm/ttm/ttm_bo_driver.h | 4 +-
+ include/linux/clocksource.h | 3 +
+ include/linux/intel_pmic_gpio.h | 15 -
+ include/linux/jump_label.h | 4 +-
+ include/linux/kernel_stat.h | 5 +-
+ include/linux/kprobes.h | 30 +-
+ include/linux/kref.h | 61 +-
+ include/linux/math64.h | 26 +-
+ include/linux/mutex.h | 9 +-
+ include/linux/percpu-rwsem.h | 8 +-
+ include/linux/poison.h | 1 +
+ include/linux/rcuwait.h | 63 ++
+ include/linux/sched.h | 47 +-
+ include/linux/spinlock.h | 8 -
+ include/linux/spinlock_api_smp.h | 2 -
+ include/linux/spinlock_api_up.h | 1 -
+ include/linux/sunrpc/cache.h | 2 +-
+ include/linux/vtime.h | 7 +-
+ include/linux/ww_mutex.h | 32 +-
+ include/net/bluetooth/hci_core.h | 4 +-
+ init/main.c | 1 -
+ init/version.c | 4 +-
+ kernel/exit.c | 52 +-
+ kernel/extable.c | 9 +-
+ kernel/fork.c | 6 +-
+ kernel/kprobes.c | 73 ++-
+ kernel/locking/Makefile | 1 +
+ kernel/locking/locktorture.c | 73 +++
+ kernel/locking/mutex.c | 515 ++++++++++------
+ kernel/locking/percpu-rwsem.c | 7 +-
+ kernel/locking/qspinlock_paravirt.h | 2 +-
+ kernel/locking/rwsem-spinlock.c | 18 +-
+ kernel/locking/rwsem-xadd.c | 14 +-
+ kernel/locking/semaphore.c | 7 +-
+ kernel/locking/spinlock.c | 8 -
+ kernel/locking/test-ww_mutex.c | 646 +++++++++++++++++++++
+ kernel/pid.c | 4 +-
+ kernel/sched/clock.c | 158 ++---
+ kernel/sched/completion.c | 10 +-
+ kernel/sched/core.c | 203 +++++--
+ kernel/sched/cputime.c | 16 +-
+ kernel/sched/deadline.c | 10 +-
+ kernel/sched/debug.c | 4 +
+ kernel/sched/fair.c | 94 ++-
+ kernel/sched/idle_task.c | 2 +-
+ kernel/sched/rt.c | 6 +-
+ kernel/sched/sched.h | 105 +++-
+ kernel/sched/stop_task.c | 2 +-
+ kernel/time/clocksource.c | 4 +
+ lib/Kconfig.debug | 12 +
+ lib/timerqueue.c | 3 +-
+ net/bluetooth/6lowpan.c | 2 +-
+ net/bluetooth/a2mp.c | 4 +-
+ net/bluetooth/amp.c | 4 +-
+ net/bluetooth/l2cap_core.c | 4 +-
+ net/ceph/messenger.c | 4 +-
+ net/ceph/osd_client.c | 10 +-
+ net/sunrpc/cache.c | 2 +-
+ net/sunrpc/svc_xprt.c | 6 +-
+ net/sunrpc/svcauth.c | 15 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +-
+ security/apparmor/include/policy.h | 4 +-
+ tools/arch/x86/include/asm/cpufeatures.h | 1 +
+ tools/arch/x86/include/uapi/asm/vmx.h | 5 +
+ tools/lib/subcmd/parse-options.h | 19 +-
+ tools/objtool/arch/x86/decode.c | 2 +-
+ tools/perf/Build | 4 +-
+ tools/perf/Documentation/perf-kallsyms.txt | 24 +
+ tools/perf/Documentation/perf-record.txt | 14 +-
+ tools/perf/Documentation/perf-sched.txt | 2 +
+ tools/perf/Documentation/perf-script.txt | 4 +-
+ tools/perf/Documentation/perf-trace.txt | 8 +-
+ tools/perf/Makefile.config | 6 +-
+ tools/perf/Makefile.perf | 1 +
+ tools/perf/builtin-help.c | 2 +-
+ tools/perf/builtin-kallsyms.c | 67 +++
+ tools/perf/builtin-record.c | 154 ++++-
+ tools/perf/builtin-sched.c | 130 ++++-
+ tools/perf/builtin-script.c | 3 +-
+ tools/perf/builtin-trace.c | 120 +++-
+ tools/perf/builtin.h | 1 +
+ tools/perf/command-list.txt | 1 +
+ tools/perf/perf.c | 4 +-
+ tools/perf/tests/Build | 1 +
+ tools/perf/tests/builtin-test.c | 4 +
+ tools/perf/tests/tests.h | 1 +
+ tools/perf/tests/unit_number__scnprintf.c | 37 ++
+ tools/perf/ui/setup.c | 1 +
+ tools/perf/util/Build | 1 +
+ tools/perf/util/evlist.c | 12 +-
+ tools/perf/util/evlist.h | 2 +
+ tools/perf/util/header.c | 2 +
+ tools/perf/util/machine.c | 19 +
+ tools/perf/util/machine.h | 1 +
+ tools/perf/util/pmu.c | 62 +-
+ tools/perf/util/session.c | 2 +-
+ tools/perf/util/util.c | 13 +
+ tools/perf/util/util.h | 1 +
+ tools/testing/selftests/locking/ww_mutex.sh | 10 +
+ .../selftests/rcutorture/configs/lock/CFLIST | 1 +
+ .../selftests/rcutorture/configs/lock/LOCK07 | 6 +
+ .../selftests/rcutorture/configs/lock/LOCK07.boot | 1 +
+ tools/testing/selftests/x86/Makefile | 2 +-
+ tools/testing/selftests/x86/sysret_rip.c | 195 +++++++
+ 257 files changed, 3916 insertions(+), 2353 deletions(-)
+ create mode 100644 arch/tile/include/asm/div64.h
+ delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c
+ delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_rtc.c
+ delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
+ delete mode 100644 drivers/platform/x86/intel_pmic_gpio.c
+ delete mode 100644 include/linux/intel_pmic_gpio.h
+ create mode 100644 include/linux/rcuwait.h
+ create mode 100644 kernel/locking/test-ww_mutex.c
+ create mode 100644 tools/perf/Documentation/perf-kallsyms.txt
+ create mode 100644 tools/perf/builtin-kallsyms.c
+ create mode 100644 tools/perf/tests/unit_number__scnprintf.c
+ create mode 100644 tools/testing/selftests/locking/ww_mutex.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK07
+ create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK07.boot
+ create mode 100644 tools/testing/selftests/x86/sysret_rip.c
+$ git am -3 ../patches/0001-locking-atomic-kref-merge-fixup-for-code-movement.patch
+Applying: locking/atomic, kref: merge fixup for code movement
+$ git reset HEAD^
+Unstaged changes after reset:
+M security/apparmor/include/lib.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 3c11942833e8] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Wed Jan 25 13:06:36 2017 +1100
+Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
+$ git merge clockevents/clockevents/next
+Already up-to-date.
+Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
+$ git merge edac/linux_next
+Resolved 'Documentation/00-INDEX' using previous resolution.
+Resolved 'drivers/edac/edac_device.c' using previous resolution.
+Resolved 'drivers/edac/edac_pci.c' using previous resolution.
+Auto-merging drivers/edac/edac_pci.c
+CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
+Auto-merging drivers/edac/edac_device.c
+CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
+Auto-merging Documentation/00-INDEX
+CONFLICT (content): Merge conflict in Documentation/00-INDEX
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 13063771d107] Merge remote-tracking branch 'edac/linux_next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac-amd/for-next (127c1225bf89 EDAC, sb_edac: Get rid of ->show_interleave_mode())
+$ git merge edac-amd/for-next
+Auto-merging drivers/edac/sb_edac.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-edac | 17 +++++++++++
+ Documentation/admin-guide/ras.rst | 20 +++++++++++++
+ drivers/edac/amd64_edac.c | 6 ++--
+ drivers/edac/edac_mc_sysfs.c | 40 ++++++++++++++++++++++++-
+ drivers/edac/i82975x_edac.c | 4 +++
+ drivers/edac/sb_edac.c | 44 +++++++---------------------
+ include/linux/edac.h | 4 +--
+ 7 files changed, 96 insertions(+), 39 deletions(-)
+Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
+$ git merge irqchip/irqchip/for-next
+Merge made by the 'recursive' strategy.
+ drivers/irqchip/irq-keystone.c | 28 +++++++++++++++++++---------
+ drivers/irqchip/irq-mxs.c | 4 ++++
+ 2 files changed, 23 insertions(+), 9 deletions(-)
+Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
+$ git merge ftrace/for-next
+Auto-merging include/linux/compiler.h
+Merge made by the 'recursive' strategy.
+ include/linux/compiler.h | 27 +++--
+ kernel/trace/ftrace.c | 244 +++++++++++++++++++++++++++----------------
+ kernel/trace/trace.h | 80 ++++++++------
+ kernel/trace/trace_branch.c | 83 +++++++++++----
+ kernel/trace/trace_entries.h | 6 +-
+ kernel/trace/trace_uprobe.c | 3 +-
+ 6 files changed, 286 insertions(+), 157 deletions(-)
+Merging rcu/rcu/next (8f28ec9a33d7 rcu: Make call_rcu() do deferred NOCB wakeups)
+$ git merge rcu/rcu/next
+Auto-merging net/netfilter/nf_conntrack_core.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/dccp/ipv6.c
+Auto-merging net/dccp/ipv4.c
+Auto-merging mm/slab.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/locking/locktorture.c
+Auto-merging kernel/fork.c
+Auto-merging init/Kconfig
+Auto-merging include/net/sock.h
+Auto-merging include/linux/slab.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/dma-fence.h
+Auto-merging fs/jbd2/journal.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_request.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging arch/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/00-INDEX | 2 +-
+ .../Design/Data-Structures/Data-Structures.html | 5 +-
+ .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++
+ .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++
+ .../Expedited-Grace-Periods.html | 667 +++++++++++++++++
+ .../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 | 93 ++-
+ Documentation/RCU/rculist_nulls.txt | 6 +-
+ Documentation/RCU/trace.txt | 5 +-
+ Documentation/RCU/whatisRCU.txt | 2 +-
+ Documentation/admin-guide/kernel-parameters.txt | 7 +
+ Documentation/memory-barriers.txt | 70 +-
+ arch/Kconfig | 3 +
+ arch/powerpc/Kconfig | 1 +
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +-
+ fs/jbd2/journal.c | 2 +-
+ fs/signalfd.c | 2 +-
+ include/linux/dma-fence.h | 4 +-
+ include/linux/llist.h | 37 +-
+ include/linux/rcupdate.h | 12 +
+ include/linux/rcutiny.h | 11 +
+ include/linux/sched.h | 3 +-
+ include/linux/slab.h | 4 +-
+ include/linux/srcu.h | 10 +-
+ include/net/sock.h | 2 +-
+ include/trace/events/rcu.h | 10 +-
+ init/Kconfig | 14 -
+ kernel/fork.c | 4 +-
+ kernel/locking/lockdep.c | 12 +-
+ kernel/locking/locktorture.c | 6 +
+ kernel/membarrier.c | 4 +
+ kernel/rcu/rcu.h | 4 +-
+ kernel/rcu/rcutorture.c | 19 +-
+ kernel/rcu/srcu.c | 170 ++---
+ kernel/rcu/tiny.c | 22 +-
+ kernel/rcu/tiny_plugin.h | 4 +-
+ kernel/rcu/tree.c | 317 +++++---
+ kernel/rcu/tree.h | 16 +-
+ kernel/rcu/tree_exp.h | 38 +-
+ kernel/rcu/tree_plugin.h | 12 +-
+ kernel/rcu/tree_trace.c | 5 +-
+ kernel/rcu/update.c | 6 +-
+ kernel/sched/core.c | 1 +
+ kernel/signal.c | 2 +-
+ lib/Kconfig.debug | 1 +
+ mm/kasan/kasan.c | 6 +-
+ mm/kmemcheck.c | 2 +-
+ mm/rmap.c | 4 +-
+ mm/slab.c | 6 +-
+ mm/slab.h | 4 +-
+ mm/slab_common.c | 4 +-
+ mm/slob.c | 6 +-
+ mm/slub.c | 12 +-
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 2 +-
+ net/ipv4/tcp_ipv4.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 2 +-
+ net/llc/af_llc.c | 2 +-
+ net/llc/llc_conn.c | 4 +-
+ net/llc/llc_sap.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 8 +-
+ .../selftests/rcutorture/configs/rcu/CFcommon | 3 -
+ .../selftests/rcutorture/configs/rcu/TINY01 | 1 +
+ .../selftests/rcutorture/configs/rcu/TINY02 | 3 +-
+ .../selftests/rcutorture/configs/rcu/TREE01 | 3 +
+ .../selftests/rcutorture/configs/rcu/TREE02 | 4 +
+ .../selftests/rcutorture/configs/rcu/TREE03 | 3 +
+ .../selftests/rcutorture/configs/rcu/TREE04 | 4 +
+ .../selftests/rcutorture/configs/rcu/TREE05 | 3 +
+ .../selftests/rcutorture/configs/rcu/TREE06 | 3 +
+ .../selftests/rcutorture/configs/rcu/TREE07 | 3 +
+ .../selftests/rcutorture/configs/rcu/TREE08 | 4 +-
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 33 +-
+ .../rcutorture/formal/srcu-cbmc/.gitignore | 1 +
+ .../selftests/rcutorture/formal/srcu-cbmc/Makefile | 16 +
+ .../formal/srcu-cbmc/empty_includes/linux/delay.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/export.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/mutex.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/percpu.h | 0
+ .../srcu-cbmc/empty_includes/linux/preempt.h | 0
+ .../srcu-cbmc/empty_includes/linux/rcupdate.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/sched.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/smp.h | 0
+ .../srcu-cbmc/empty_includes/linux/workqueue.h | 0
+ .../srcu-cbmc/empty_includes/uapi/linux/types.h | 0
+ .../formal/srcu-cbmc/include/linux/.gitignore | 1 +
+ .../formal/srcu-cbmc/include/linux/kconfig.h | 1 +
+ .../formal/srcu-cbmc/include/linux/types.h | 155 ++++
+ .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 375 ++++++++++
+ .../rcutorture/formal/srcu-cbmc/src/assume.h | 16 +
+ .../rcutorture/formal/srcu-cbmc/src/barriers.h | 41 +
+ .../rcutorture/formal/srcu-cbmc/src/bug_on.h | 13 +
+ .../formal/srcu-cbmc/src/combined_source.c | 13 +
+ .../rcutorture/formal/srcu-cbmc/src/config.h | 27 +
+ .../rcutorture/formal/srcu-cbmc/src/include_srcu.c | 31 +
+ .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h | 33 +
+ .../rcutorture/formal/srcu-cbmc/src/locks.h | 220 ++++++
+ .../rcutorture/formal/srcu-cbmc/src/misc.c | 11 +
+ .../rcutorture/formal/srcu-cbmc/src/misc.h | 58 ++
+ .../rcutorture/formal/srcu-cbmc/src/percpu.h | 92 +++
+ .../rcutorture/formal/srcu-cbmc/src/preempt.c | 78 ++
+ .../rcutorture/formal/srcu-cbmc/src/preempt.h | 58 ++
+ .../formal/srcu-cbmc/src/simple_sync_srcu.c | 50 ++
+ .../rcutorture/formal/srcu-cbmc/src/workqueues.h | 102 +++
+ .../srcu-cbmc/tests/store_buffering/.gitignore | 1 +
+ .../srcu-cbmc/tests/store_buffering/Makefile | 11 +
+ .../tests/store_buffering/assert_end.fail | 1 +
+ .../srcu-cbmc/tests/store_buffering/force.fail | 1 +
+ .../srcu-cbmc/tests/store_buffering/force2.fail | 1 +
+ .../srcu-cbmc/tests/store_buffering/force3.fail | 1 +
+ .../srcu-cbmc/tests/store_buffering/main.pass | 0
+ .../formal/srcu-cbmc/tests/store_buffering/test.c | 72 ++
+ .../formal/srcu-cbmc/tests/test_script.sh | 102 +++
+ 123 files changed, 7390 insertions(+), 415 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 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
+ create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass
+ create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
+ create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
+$ git am -3 ../patches/0001-smc-merge-fix-for-mm-Rename-SLAB_DESTROY_BY_RCU-to-S.patch
+Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/smc/af_smc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master bd455c16a8a7] Merge remote-tracking branch 'rcu/rcu/next'
+ Date: Wed Jan 25 13:28:28 2017 +1100
+Merging kvm/linux-next (a17f32270af1 kvm: x86: Expose Intel VPOPCNTDQ feature to guest)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/kvm/x86.c
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/locking.txt | 31 ++-
+ arch/x86/include/asm/kvm_emulate.h | 1 +
+ arch/x86/include/asm/kvm_host.h | 25 +-
+ arch/x86/include/asm/vmx.h | 28 +-
+ arch/x86/kvm/cpuid.c | 2 +-
+ arch/x86/kvm/emulate.c | 20 +-
+ arch/x86/kvm/hyperv.c | 4 +-
+ arch/x86/kvm/i8259.c | 16 +-
+ arch/x86/kvm/irq.h | 19 +-
+ arch/x86/kvm/irq_comm.c | 29 +-
+ arch/x86/kvm/lapic.c | 135 +++++++---
+ arch/x86/kvm/lapic.h | 12 +-
+ arch/x86/kvm/mmu.c | 489 +++++++++++++++++++++++-----------
+ arch/x86/kvm/svm.c | 2 +
+ arch/x86/kvm/vmx.c | 62 +++--
+ arch/x86/kvm/x86.c | 92 ++++---
+ 16 files changed, 664 insertions(+), 303 deletions(-)
+Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
+$ git merge kvm-mips/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (f97017a64449 KVM: s390: Add debug logging to basic cpu model interface)
+$ git merge kvms390/next
+Auto-merging arch/s390/kvm/vsie.c
+Auto-merging arch/s390/kvm/priv.c
+Merge made by the 'recursive' strategy.
+ arch/s390/kvm/gaccess.c | 26 ++++++++++++++++----------
+ arch/s390/kvm/gaccess.h | 10 +++++-----
+ arch/s390/kvm/kvm-s390.c | 37 ++++++++++++++++++++++++++++++++++++-
+ arch/s390/kvm/kvm-s390.h | 10 ++++------
+ arch/s390/kvm/priv.c | 30 +++++++++++++++---------------
+ arch/s390/kvm/vsie.c | 3 +++
+ arch/s390/tools/gen_facilities.c | 2 ++
+ 7 files changed, 81 insertions(+), 37 deletions(-)
+Merging xen-tip/linux-next (da72ff5bfcb0 partially revert "xen: Remove event channel notification through Xen PCI platform device")
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (aaf0f2fa6828 percpu_counter: percpu_counter_hotcpu_callback() cleanup)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ lib/percpu_counter.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/for-next (7b81271210d8 platform/x86: thinkpad_acpi: Add support for status LED)
+$ git merge drivers-x86/for-next
+Resolved 'drivers/platform/x86/fujitsu-laptop.c' using previous resolution.
+Recorded preimage for 'drivers/platform/x86/intel_mid_powerbtn.c'
+Auto-merging drivers/platform/x86/mlx-platform.c
+Auto-merging drivers/platform/x86/intel_mid_powerbtn.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
+Auto-merging drivers/platform/x86/fujitsu-laptop.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
+Auto-merging drivers/platform/x86/Makefile
+Auto-merging drivers/platform/x86/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/platform/x86/intel_mid_powerbtn.c'.
+[master 92b8e1c41a6e] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/platform/x86/Kconfig | 20 ++-
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/acer-wmi.c | 22 ++-
+ drivers/platform/x86/fujitsu-laptop.c | 220 +++++++++++++++--------------
+ drivers/platform/x86/hp_accel.c | 1 +
+ drivers/platform/x86/intel_mid_powerbtn.c | 225 ++++++++++++++++++++++--------
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/platform/x86/intel_pmc_ipc.c | 2 -
+ drivers/platform/x86/intel_turbo_max_3.c | 152 ++++++++++++++++++++
+ drivers/platform/x86/mlx-platform.c | 84 ++++++-----
+ drivers/platform/x86/thinkpad_acpi.c | 4 +-
+ 11 files changed, 521 insertions(+), 212 deletions(-)
+ create mode 100644 drivers/platform/x86/intel_turbo_max_3.c
+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
+Already up-to-date.
+Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/common.txt | 28 +++++++++++++++--------
+ include/linux/leds.h | 1 +
+ 2 files changed, 19 insertions(+), 10 deletions(-)
+Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/IPMI.txt | 2 +-
+ drivers/acpi/acpi_ipmi.c | 2 +-
+ drivers/char/ipmi/ipmi_devintf.c | 2 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 4 ++--
+ drivers/char/ipmi/ipmi_watchdog.c | 2 +-
+ include/linux/ipmi.h | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
+$ git merge driver-core/driver-core-next
+Removing Documentation/firmware_class/README
+Auto-merging Documentation/driver-api/index.rst
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/firmware/built-in-fw.rst | 38 ++++
+ Documentation/driver-api/firmware/core.rst | 16 ++
+ .../driver-api/firmware/direct-fs-lookup.rst | 30 ++++
+ .../driver-api/firmware/fallback-mechanisms.rst | 195 +++++++++++++++++++++
+ .../driver-api/firmware/firmware_cache.rst | 51 ++++++
+ .../driver-api/firmware/fw_search_path.rst | 26 +++
+ Documentation/driver-api/firmware/index.rst | 16 ++
+ Documentation/driver-api/firmware/introduction.rst | 27 +++
+ Documentation/driver-api/firmware/lookup-order.rst | 18 ++
+ .../driver-api/firmware/request_firmware.rst | 56 ++++++
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/firmware_class/README | 128 --------------
+ drivers/base/platform.c | 2 +-
+ drivers/macintosh/windfarm_core.c | 4 +-
+ drivers/net/hamradio/baycom_epp.c | 10 +-
+ drivers/pnp/pnpbios/core.c | 5 +-
+ drivers/staging/greybus/svc_watchdog.c | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +-
+ fs/nfsd/nfs4layouts.c | 6 +-
+ include/linux/debugfs.h | 3 +-
+ include/linux/kmod.h | 7 +-
+ kernel/kmod.c | 18 +-
+ security/Kconfig | 35 ++++
+ security/keys/request_key.c | 7 +-
+ tools/testing/selftests/firmware/fw_filesystem.sh | 25 ++-
+ 25 files changed, 577 insertions(+), 159 deletions(-)
+ create mode 100644 Documentation/driver-api/firmware/built-in-fw.rst
+ create mode 100644 Documentation/driver-api/firmware/core.rst
+ create mode 100644 Documentation/driver-api/firmware/direct-fs-lookup.rst
+ create mode 100644 Documentation/driver-api/firmware/fallback-mechanisms.rst
+ create mode 100644 Documentation/driver-api/firmware/firmware_cache.rst
+ create mode 100644 Documentation/driver-api/firmware/fw_search_path.rst
+ create mode 100644 Documentation/driver-api/firmware/index.rst
+ create mode 100644 Documentation/driver-api/firmware/introduction.rst
+ create mode 100644 Documentation/driver-api/firmware/lookup-order.rst
+ create mode 100644 Documentation/driver-api/firmware/request_firmware.rst
+ delete mode 100644 Documentation/firmware_class/README
+Merging tty/tty-next (aa75941ca1de serial: 8250_omap: Remove rx_dma_broken flag)
+$ git merge tty/tty-next
+Auto-merging lib/Kconfig.debug
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 6 +
+ Documentation/devicetree/bindings/serial/8250.txt | 1 +
+ arch/sh/kernel/cpu/sh2/setup-sh7619.c | 9 +-
+ arch/sh/kernel/cpu/sh2a/setup-mxg.c | 3 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 24 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 16 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 12 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 32 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 32 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 6 +-
+ arch/sh/kernel/cpu/sh3/setup-sh770x.c | 10 -
+ arch/sh/kernel/cpu/sh3/setup-sh7710.c | 8 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 4 -
+ arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 3 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7750.c | 9 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 21 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 12 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 9 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 21 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 21 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 18 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 9 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 9 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 30 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 18 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 18 +-
+ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 9 +-
+ arch/sh/kernel/cpu/sh5/setup-sh5.c | 4 +-
+ drivers/dma/hsu/pci.c | 17 +-
+ drivers/tty/goldfish.c | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 5 +-
+ drivers/tty/serial/8250/8250_gsc.c | 4 +
+ drivers/tty/serial/8250/8250_lpss.c | 4 +-
+ drivers/tty/serial/8250/8250_mid.c | 45 +-
+ drivers/tty/serial/8250/8250_moxa.c | 1 +
+ drivers/tty/serial/8250/8250_of.c | 1 +
+ drivers/tty/serial/8250/8250_omap.c | 25 +-
+ drivers/tty/serial/8250/8250_pci.c | 13 +-
+ drivers/tty/serial/8250/8250_port.c | 26 +-
+ drivers/tty/serial/8250/Kconfig | 6 +-
+ drivers/tty/serial/Kconfig | 1 +
+ drivers/tty/serial/amba-pl011.c | 2 +-
+ drivers/tty/serial/bfin_sport_uart.c | 2 +-
+ drivers/tty/serial/fsl_lpuart.c | 35 +-
+ drivers/tty/serial/imx.c | 6 +-
+ drivers/tty/serial/lantiq.c | 40 +-
+ drivers/tty/serial/max310x.c | 2 +-
+ drivers/tty/serial/meson_uart.c | 2 +-
+ drivers/tty/serial/msm_serial.c | 1 +
+ drivers/tty/serial/mxs-auart.c | 3 +
+ drivers/tty/serial/omap-serial.c | 55 ++
+ drivers/tty/serial/pic32_uart.c | 6 +-
+ drivers/tty/serial/samsung.c | 17 +-
+ drivers/tty/serial/samsung.h | 4 -
+ drivers/tty/serial/sh-sci.c | 835 +++++++++-------------
+ drivers/tty/serial/sh-sci.h | 4 +-
+ drivers/tty/tty_buffer.c | 2 +-
+ drivers/tty/tty_io.c | 52 +-
+ drivers/tty/tty_port.c | 7 +-
+ include/linux/serial_core.h | 2 +-
+ include/linux/serial_sci.h | 15 -
+ include/linux/tty.h | 3 +-
+ include/uapi/linux/serial_core.h | 3 +-
+ include/uapi/linux/serial_reg.h | 8 +
+ lib/Kconfig.debug | 10 +
+ 67 files changed, 757 insertions(+), 893 deletions(-)
+Merging usb/usb-next (afa197e3cb24 dt-bindings: mt8173-mtu3: add reference clock)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/host/xhci-plat.c
+Auto-merging Documentation/devicetree/bindings/usb/mt8173-xhci.txt
+Auto-merging Documentation/devicetree/bindings/usb/mt8173-mtu3.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/mt8173-mtu3.txt | 10 +-
+ .../devicetree/bindings/usb/mt8173-xhci.txt | 10 +-
+ drivers/usb/core/devio.c | 43 +++------
+ drivers/usb/core/hcd.c | 1 +
+ drivers/usb/core/message.c | 33 +++----
+ drivers/usb/gadget/udc/fotg210-udc.c | 2 +-
+ drivers/usb/host/Kconfig | 4 +-
+ drivers/usb/host/ehci-exynos.c | 2 +
+ drivers/usb/host/ehci-fsl.c | 2 +-
+ drivers/usb/host/ohci-exynos.c | 2 +
+ drivers/usb/host/ohci-omap.c | 3 +-
+ drivers/usb/host/oxu210hp-hcd.c | 2 -
+ drivers/usb/host/xhci-mtk.c | 15 +++
+ drivers/usb/host/xhci-mtk.h | 1 +
+ drivers/usb/host/xhci-plat.c | 6 +-
+ drivers/usb/isp1760/isp1760-udc.c | 2 +-
+ drivers/usb/mtu3/mtu3.h | 1 +
+ drivers/usb/mtu3/mtu3_plat.c | 45 ++++++---
+ drivers/usb/renesas_usbhs/mod_host.c | 2 +-
+ drivers/usb/storage/ene_ub6250.c | 2 -
+ tools/usb/usbip/README | 57 ++++++++++-
+ tools/usb/usbip/vudc/vudc_server_example.sh | 107 +++++++++++++++++++++
+ 22 files changed, 268 insertions(+), 84 deletions(-)
+ create mode 100755 tools/usb/usbip/vudc/vudc_server_example.sh
+Merging usb-gadget/next (591c8004dd43 usb: gadget: f_fs: Accept up to 30 endpoints.)
+$ git merge usb-gadget/next
+Auto-merging drivers/usb/gadget/function/f_fs.c
+Auto-merging drivers/usb/dwc3/dwc3-exynos.c
+Auto-merging drivers/usb/dwc2/params.c
+Auto-merging drivers/usb/dwc2/hcd.c
+Auto-merging drivers/usb/dwc2/gadget.c
+Auto-merging drivers/usb/dwc2/core.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/dwc2.txt | 2 +
+ Documentation/devicetree/bindings/usb/dwc3.txt | 4 +
+ Documentation/usb/gadget-testing.txt | 2 +
+ drivers/usb/dwc2/core.c | 22 +-
+ drivers/usb/dwc2/core.h | 110 +++--
+ drivers/usb/dwc2/core_intr.c | 11 +-
+ drivers/usb/dwc2/debug.h | 4 +-
+ drivers/usb/dwc2/debugfs.c | 26 +-
+ drivers/usb/dwc2/gadget.c | 218 ++++-----
+ drivers/usb/dwc2/hcd.c | 65 ++-
+ drivers/usb/dwc2/hcd.h | 76 ++--
+ drivers/usb/dwc2/hcd_ddma.c | 19 +-
+ drivers/usb/dwc2/hcd_intr.c | 53 ++-
+ drivers/usb/dwc2/hcd_queue.c | 26 +-
+ drivers/usb/dwc2/hw.h | 596 ++++++++++++-------------
+ drivers/usb/dwc2/params.c | 79 +++-
+ drivers/usb/dwc2/pci.c | 3 +-
+ drivers/usb/dwc2/platform.c | 14 +-
+ drivers/usb/dwc3/core.h | 5 +
+ drivers/usb/dwc3/dwc3-exynos.c | 5 +-
+ drivers/usb/dwc3/dwc3-omap.c | 20 +-
+ drivers/usb/dwc3/ep0.c | 14 +
+ drivers/usb/dwc3/gadget.c | 156 +++++--
+ drivers/usb/gadget/function/f_fs.c | 4 +-
+ drivers/usb/gadget/function/f_hid.c | 101 +++--
+ drivers/usb/gadget/function/f_printer.c | 57 ++-
+ drivers/usb/gadget/function/f_uac2.c | 49 +-
+ drivers/usb/gadget/function/u_ether.c | 24 +-
+ drivers/usb/gadget/function/u_ether_configfs.h | 2 +-
+ drivers/usb/gadget/function/u_fs.h | 3 +-
+ drivers/usb/gadget/function/u_printer.h | 5 +-
+ drivers/usb/gadget/function/u_uac2.h | 2 +
+ drivers/usb/gadget/legacy/audio.c | 1 +
+ drivers/usb/gadget/legacy/printer.c | 28 +-
+ drivers/usb/gadget/udc/core.c | 45 +-
+ drivers/usb/phy/phy-ab8500-usb.c | 20 -
+ drivers/usb/phy/phy-fsl-usb.c | 12 -
+ drivers/usb/phy/phy-msm-usb.c | 51 +--
+ drivers/usb/phy/phy-omap-otg.c | 24 +-
+ drivers/usb/phy/phy-qcom-8x16-usb.c | 13 +-
+ drivers/usb/phy/phy-tahvo.c | 10 +-
+ drivers/usb/renesas_usbhs/common.c | 2 +-
+ tools/usb/ffs-test.c | 52 ++-
+ 43 files changed, 1154 insertions(+), 881 deletions(-)
+Merging usb-serial/usb-next (2eee05020a0e USB: serial: opticon: fix CTS retrieval at open)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ark3116.c | 38 ++++++++---
+ drivers/usb/serial/ch341.c | 118 ++++++++++++++++------------------
+ drivers/usb/serial/cypress_m8.c | 5 --
+ drivers/usb/serial/ftdi_sio.c | 13 +++-
+ drivers/usb/serial/io_edgeport.c | 48 +++++++++-----
+ drivers/usb/serial/iuu_phoenix.c | 15 +----
+ drivers/usb/serial/kl5kusb105.c | 115 +++++++--------------------------
+ drivers/usb/serial/mct_u232.c | 6 +-
+ drivers/usb/serial/mos7720.c | 9 ++-
+ drivers/usb/serial/mos7840.c | 19 ++++--
+ drivers/usb/serial/opticon.c | 2 +-
+ drivers/usb/serial/pl2303.c | 8 +--
+ drivers/usb/serial/quatech2.c | 24 +++----
+ drivers/usb/serial/spcp8x5.c | 8 ++-
+ drivers/usb/serial/ssu100.c | 31 +++++++--
+ drivers/usb/serial/ti_usb_3410_5052.c | 12 ++--
+ 16 files changed, 228 insertions(+), 243 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/ulpi.txt | 20 ++
+ drivers/of/device.c | 25 +++
+ drivers/usb/chipidea/Kconfig | 8 +
+ drivers/usb/chipidea/Makefile | 1 +
+ drivers/usb/chipidea/ci.h | 22 +-
+ drivers/usb/chipidea/ci_hdrc_msm.c | 280 +++++++++++++++++++++----
+ drivers/usb/chipidea/ci_hdrc_usb2.c | 4 -
+ drivers/usb/chipidea/core.c | 153 +++++---------
+ drivers/usb/chipidea/host.c | 10 +
+ drivers/usb/chipidea/otg.c | 99 +++++++--
+ drivers/usb/chipidea/udc.c | 5 +-
+ drivers/usb/chipidea/ulpi.c | 113 ++++++++++
+ drivers/usb/common/ulpi.c | 79 ++++++-
+ include/linux/of_device.h | 6 +
+ include/linux/usb/chipidea.h | 9 +-
+ 15 files changed, 663 insertions(+), 171 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/ulpi.txt
+ create mode 100644 drivers/usb/chipidea/ulpi.c
+Merging phy-next/next (a8df2768c2ed drivers: phy: constify phy_ops structures)
+$ git merge phy-next/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 +
+ drivers/phy/phy-bcm-cygnus-pcie.c | 2 +-
+ drivers/phy/phy-hi6220-usb.c | 2 +-
+ drivers/phy/phy-mt65xx-usb3.c | 2 +-
+ drivers/phy/phy-rcar-gen3-usb2.c | 10 +++++-----
+ drivers/phy/phy-rockchip-inno-usb2.c | 7 ++++++-
+ drivers/phy/phy-sun4i-usb.c | 18 +++++++++++++++---
+ 7 files changed, 30 insertions(+), 12 deletions(-)
+Merging staging/staging-next (1c5fa1c7dbff staging: media: lirc: use new parport device model)
+$ git merge staging/staging-next
+Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h
+Removing drivers/staging/i4l/pcbit/pcbit.h
+Removing drivers/staging/i4l/pcbit/module.c
+Removing drivers/staging/i4l/pcbit/layer2.h
+Removing drivers/staging/i4l/pcbit/layer2.c
+Removing drivers/staging/i4l/pcbit/edss1.h
+Removing drivers/staging/i4l/pcbit/edss1.c
+Removing drivers/staging/i4l/pcbit/drv.c
+Removing drivers/staging/i4l/pcbit/capi.h
+Removing drivers/staging/i4l/pcbit/capi.c
+Removing drivers/staging/i4l/pcbit/callbacks.h
+Removing drivers/staging/i4l/pcbit/callbacks.c
+Removing drivers/staging/i4l/pcbit/Makefile
+Removing drivers/staging/i4l/pcbit/Kconfig
+Removing drivers/staging/i4l/icn/icn.h
+Removing drivers/staging/i4l/icn/icn.c
+Removing drivers/staging/i4l/icn/Makefile
+Removing drivers/staging/i4l/icn/Kconfig
+Removing drivers/staging/i4l/act2000/module.c
+Removing drivers/staging/i4l/act2000/capi.h
+Removing drivers/staging/i4l/act2000/capi.c
+Removing drivers/staging/i4l/act2000/act2000_isa.h
+Removing drivers/staging/i4l/act2000/act2000_isa.c
+Removing drivers/staging/i4l/act2000/act2000.h
+Removing drivers/staging/i4l/act2000/Makefile
+Removing drivers/staging/i4l/act2000/Kconfig
+Removing drivers/staging/i4l/TODO
+Removing drivers/staging/i4l/Makefile
+Removing drivers/staging/i4l/Kconfig
+Removing drivers/staging/i4l/Documentation/README.sc
+Removing drivers/staging/i4l/Documentation/README.pcbit
+Removing drivers/staging/i4l/Documentation/README.icn
+Removing drivers/staging/i4l/Documentation/README.act2000
+Removing drivers/staging/greybus/timesync_platform.c
+Removing drivers/staging/greybus/timesync.h
+Removing drivers/staging/greybus/timesync.c
+Auto-merging drivers/staging/greybus/svc_watchdog.c
+Auto-merging drivers/iio/health/max30100.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-iio | 15 +-
+ .../devicetree/bindings/iio/accel/lis302.txt | 2 +-
+ .../devicetree/bindings/iio/adc/avia-hx711.txt | 18 +
+ .../devicetree/bindings/iio/adc/max11100.txt | 18 +
+ .../devicetree/bindings/iio/adc/ti-ads7950.txt | 23 +
+ .../devicetree/bindings/iio/imu/bmi160.txt | 36 +
+ .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 24 +
+ .../devicetree/bindings/iio/light/cm3605.txt | 41 +
+ .../devicetree/bindings/iio/st-sensors.txt | 2 +
+ .../devicetree/bindings/iio/temperature/tmp007.txt | 27 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ drivers/iio/accel/Kconfig | 2 +
+ drivers/iio/accel/bmc150-accel-core.c | 3 +-
+ drivers/iio/accel/hid-sensor-accel-3d.c | 104 +-
+ drivers/iio/accel/mma8452.c | 4 +-
+ drivers/iio/accel/ssp_accel_sensor.c | 1 +
+ drivers/iio/accel/st_accel.h | 18 +
+ drivers/iio/accel/st_accel_i2c.c | 78 +-
+ drivers/iio/accel/st_accel_spi.c | 9 +
+ drivers/iio/adc/Kconfig | 53 +
+ drivers/iio/adc/Makefile | 4 +
+ drivers/iio/adc/axp288_adc.c | 32 +-
+ drivers/iio/adc/exynos_adc.c | 2 +-
+ drivers/iio/adc/fsl-imx25-gcq.c | 1 +
+ drivers/iio/adc/hx711.c | 532 ++++++
+ drivers/iio/adc/ina2xx-adc.c | 2 +
+ drivers/iio/adc/max11100.c | 181 +++
+ drivers/iio/adc/max1363.c | 1 +
+ drivers/iio/adc/qcom-spmi-vadc.c | 481 ++++--
+ drivers/iio/adc/ti-ads1015.c | 4 +-
+ drivers/iio/adc/ti-ads7950.c | 490 ++++++
+ drivers/iio/adc/ti-tlc4541.c | 271 ++++
+ drivers/iio/buffer/industrialio-buffer-cb.c | 3 +-
+ drivers/iio/buffer/kfifo_buf.c | 3 +
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 36 +-
+ drivers/iio/common/ssp_sensors/ssp_iio.c | 1 +
+ drivers/iio/common/st_sensors/st_sensors_i2c.c | 20 +
+ drivers/iio/dac/ad5592r.c | 8 +
+ drivers/iio/dac/ad5593r.c | 8 +
+ drivers/iio/dummy/iio_simple_dummy.h | 8 +-
+ drivers/iio/dummy/iio_simple_dummy_buffer.c | 4 +-
+ drivers/iio/gyro/ssp_gyro_sensor.c | 1 +
+ drivers/iio/health/max30100.c | 2 +-
+ drivers/iio/humidity/hts221_i2c.c | 8 +
+ drivers/iio/imu/Kconfig | 1 +
+ drivers/iio/imu/Makefile | 2 +
+ drivers/iio/imu/bmi160/bmi160_core.c | 8 +-
+ drivers/iio/imu/bmi160/bmi160_i2c.c | 14 +-
+ drivers/iio/imu/bmi160/bmi160_spi.c | 18 +-
+ drivers/iio/imu/st_lsm6dsx/Kconfig | 22 +
+ drivers/iio/imu/st_lsm6dsx/Makefile | 5 +
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 141 ++
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 454 ++++++
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 673 ++++++++
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 101 ++
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 118 ++
+ drivers/iio/industrialio-buffer.c | 321 ++--
+ drivers/iio/industrialio-core.c | 2 +
+ drivers/iio/industrialio-trigger.c | 92 +-
+ drivers/iio/inkern.c | 10 +-
+ drivers/iio/light/Kconfig | 10 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/cm3232.c | 2 +-
+ drivers/iio/light/cm3605.c | 330 ++++
+ drivers/iio/light/hid-sensor-als.c | 24 +-
+ drivers/iio/light/opt3001.c | 1 +
+ drivers/iio/magnetometer/ak8974.c | 8 +-
+ drivers/iio/magnetometer/mag3110.c | 30 +-
+ drivers/iio/potentiometer/mcp4531.c | 1 +
+ drivers/iio/pressure/bmp280-core.c | 14 +-
+ drivers/iio/pressure/ms5611_core.c | 12 +-
+ drivers/iio/pressure/st_pressure.h | 8 +
+ drivers/iio/pressure/st_pressure_core.c | 12 +-
+ drivers/iio/pressure/st_pressure_i2c.c | 51 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 +
+ drivers/iio/proximity/sx9500.c | 10 +-
+ drivers/iio/temperature/Kconfig | 10 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/tmp007.c | 345 ++++
+ drivers/iio/trigger/iio-trig-interrupt.c | 8 +-
+ drivers/iio/trigger/iio-trig-sysfs.c | 2 +-
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/staging/android/ion/ion-ioctl.c | 3 +-
+ drivers/staging/android/ion/ion_cma_heap.c | 6 +-
+ drivers/staging/android/ion/ion_of.c | 1 -
+ drivers/staging/android/ion/ion_priv.h | 40 +-
+ drivers/staging/comedi/Kconfig | 10 +-
+ drivers/staging/comedi/comedi_compat32.h | 3 +-
+ drivers/staging/comedi/comedi_fops.c | 10 +-
+ drivers/staging/comedi/comedi_internal.h | 9 +-
+ drivers/staging/comedi/comedi_pci.h | 18 +-
+ drivers/staging/comedi/comedi_pcmcia.c | 3 +-
+ drivers/staging/comedi/comedi_pcmcia.h | 22 +-
+ drivers/staging/comedi/comedi_usb.h | 16 +-
+ drivers/staging/comedi/comedidev.h | 55 +-
+ drivers/staging/comedi/drivers/addi_watchdog.h | 2 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 140 +-
+ drivers/staging/comedi/drivers/comedi_8254.h | 30 +-
+ drivers/staging/comedi/drivers/comedi_isadma.h | 10 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 401 ++---
+ drivers/staging/comedi/drivers/mite.h | 37 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 10 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 2 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 62 +-
+ drivers/staging/comedi/drivers/ni_labpc.h | 4 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 173 +-
+ drivers/staging/comedi/drivers/ni_tio.h | 42 +-
+ drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +-
+ drivers/staging/comedi/proc.c | 6 +-
+ drivers/staging/dgnc/TODO | 3 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 30 +-
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 18 +-
+ drivers/staging/fbtft/fb_ra8875.c | 4 -
+ drivers/staging/fbtft/fb_ssd1306.c | 37 +-
+ drivers/staging/fbtft/fbtft-core.c | 30 +-
+ drivers/staging/fbtft/fbtft-io.c | 4 -
+ drivers/staging/fbtft/fbtft-sysfs.c | 7 +-
+ drivers/staging/fbtft/fbtft.h | 1 -
+ drivers/staging/fbtft/flexfb.c | 18 +-
+ drivers/staging/gdm724x/gdm_endian.c | 24 +-
+ drivers/staging/gdm724x/gdm_endian.h | 15 +-
+ drivers/staging/gdm724x/gdm_lte.c | 27 +-
+ drivers/staging/gdm724x/hci_packet.h | 46 +-
+ drivers/staging/greybus/Makefile | 4 +-
+ drivers/staging/greybus/arche-apb-ctrl.c | 4 +-
+ drivers/staging/greybus/arche_platform.h | 2 -
+ drivers/staging/greybus/audio_codec.c | 46 +-
+ drivers/staging/greybus/audio_codec.h | 46 -
+ drivers/staging/greybus/audio_gb.c | 4 +-
+ drivers/staging/greybus/audio_module.c | 2 +-
+ drivers/staging/greybus/audio_topology.c | 104 +-
+ drivers/staging/greybus/camera.c | 10 +-
+ drivers/staging/greybus/connection.c | 6 +
+ drivers/staging/greybus/control.c | 50 -
+ drivers/staging/greybus/control.h | 7 -
+ drivers/staging/greybus/core.c | 11 -
+ drivers/staging/greybus/es2.c | 132 --
+ drivers/staging/greybus/gpio.c | 24 +-
+ drivers/staging/greybus/greybus.h | 1 -
+ drivers/staging/greybus/greybus_protocols.h | 47 -
+ drivers/staging/greybus/greybus_trace.h | 28 -
+ drivers/staging/greybus/hd.h | 7 -
+ drivers/staging/greybus/interface.c | 56 +-
+ drivers/staging/greybus/interface.h | 5 -
+ drivers/staging/greybus/log.c | 6 +-
+ drivers/staging/greybus/loopback.c | 20 +-
+ drivers/staging/greybus/svc.c | 87 -
+ drivers/staging/greybus/svc.h | 7 -
+ drivers/staging/greybus/svc_watchdog.c | 4 +-
+ drivers/staging/greybus/timesync.c | 1357 ----------------
+ drivers/staging/greybus/timesync.h | 45 -
+ drivers/staging/greybus/timesync_platform.c | 82 -
+ drivers/staging/greybus/tools/loopback_test.c | 5 +-
+ drivers/staging/i4l/Documentation/README.act2000 | 104 --
+ drivers/staging/i4l/Documentation/README.icn | 148 --
+ drivers/staging/i4l/Documentation/README.pcbit | 40 -
+ drivers/staging/i4l/Documentation/README.sc | 281 ----
+ drivers/staging/i4l/Kconfig | 13 -
+ drivers/staging/i4l/Makefile | 5 -
+ drivers/staging/i4l/TODO | 3 -
+ drivers/staging/i4l/act2000/Kconfig | 9 -
+ drivers/staging/i4l/act2000/Makefile | 9 -
+ drivers/staging/i4l/act2000/act2000.h | 202 ---
+ drivers/staging/i4l/act2000/act2000_isa.c | 444 -----
+ drivers/staging/i4l/act2000/act2000_isa.h | 136 --
+ drivers/staging/i4l/act2000/capi.c | 1187 --------------
+ drivers/staging/i4l/act2000/capi.h | 357 ----
+ drivers/staging/i4l/act2000/module.c | 816 ----------
+ drivers/staging/i4l/icn/Kconfig | 12 -
+ drivers/staging/i4l/icn/Makefile | 5 -
+ drivers/staging/i4l/icn/icn.c | 1696 --------------------
+ drivers/staging/i4l/icn/icn.h | 252 ---
+ drivers/staging/i4l/pcbit/Kconfig | 10 -
+ drivers/staging/i4l/pcbit/Makefile | 9 -
+ drivers/staging/i4l/pcbit/callbacks.c | 345 ----
+ drivers/staging/i4l/pcbit/callbacks.h | 44 -
+ drivers/staging/i4l/pcbit/capi.c | 646 --------
+ drivers/staging/i4l/pcbit/capi.h | 81 -
+ drivers/staging/i4l/pcbit/drv.c | 1070 ------------
+ drivers/staging/i4l/pcbit/edss1.c | 310 ----
+ drivers/staging/i4l/pcbit/edss1.h | 99 --
+ drivers/staging/i4l/pcbit/layer2.c | 710 --------
+ drivers/staging/i4l/pcbit/layer2.h | 281 ----
+ drivers/staging/i4l/pcbit/module.c | 125 --
+ drivers/staging/i4l/pcbit/pcbit.h | 177 --
+ drivers/staging/iio/accel/adis16201_core.c | 4 +-
+ drivers/staging/iio/accel/adis16203_core.c | 6 +-
+ drivers/staging/iio/accel/adis16209_core.c | 4 +-
+ drivers/staging/iio/adc/ad7606.c | 79 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 2 +-
+ drivers/staging/iio/addac/adt7316.c | 3 +-
+ drivers/staging/iio/cdc/ad7150.c | 4 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +-
+ drivers/staging/iio/light/isl29028.c | 415 +++--
+ drivers/staging/iio/meter/ade7753.c | 2 +-
+ drivers/staging/iio/meter/ade7753.h | 2 +-
+ drivers/staging/iio/meter/ade7754.c | 2 +-
+ drivers/staging/iio/meter/ade7754.h | 2 +-
+ drivers/staging/iio/meter/ade7758.h | 2 +-
+ drivers/staging/iio/meter/ade7758_core.c | 2 +-
+ drivers/staging/iio/meter/ade7758_ring.c | 1 +
+ drivers/staging/iio/meter/ade7759.c | 2 +-
+ drivers/staging/iio/meter/ade7759.h | 2 +-
+ drivers/staging/iio/meter/ade7854.c | 2 +-
+ drivers/staging/iio/meter/ade7854.h | 2 +-
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +-
+ drivers/staging/ks7010/ks7010_sdio.h | 4 +-
+ drivers/staging/ks7010/ks_wlan_net.c | 5 +-
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 14 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 10 +-
+ drivers/staging/lustre/include/linux/lnet/lnetst.h | 198 +--
+ .../staging/lustre/include/linux/lnet/socklnd.h | 2 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 70 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 6 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 2 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 14 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 26 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c | 6 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 170 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 20 +-
+ drivers/staging/lustre/lnet/lnet/lib-msg.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +-
+ drivers/staging/lustre/lnet/lnet/net_fault.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 10 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 2 +-
+ drivers/staging/lustre/lnet/selftest/conctl.c | 76 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 36 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.h | 4 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 56 +-
+ drivers/staging/lustre/lnet/selftest/console.h | 24 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 18 +-
+ drivers/staging/lustre/lnet/selftest/rpc.c | 6 +-
+ drivers/staging/lustre/lnet/selftest/rpc.h | 38 +-
+ drivers/staging/lustre/lnet/selftest/selftest.h | 10 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 3 +
+ .../lustre/lustre/include/lustre/lustre_idl.h | 46 -
+ .../staging/lustre/lustre/include/lustre_obdo.h | 54 +
+ drivers/staging/lustre/lustre/include/obd.h | 5 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 5 +-
+ drivers/staging/lustre/lustre/llite/file.c | 2 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 27 +-
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 -
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 58 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +-
+ drivers/staging/lustre/lustre/obdclass/cl_io.c | 4 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 3 +-
+ drivers/staging/lustre/lustre/obdclass/obdo.c | 54 +
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 30 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 11 +-
+ drivers/staging/lustre/lustre/osc/osc_internal.h | 4 +
+ drivers/staging/lustre/lustre/osc/osc_io.c | 62 +-
+ drivers/staging/lustre/lustre/osc/osc_object.c | 19 +
+ drivers/staging/lustre/lustre/osc/osc_request.c | 45 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 3 -
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 +
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 93 +-
+ drivers/staging/most/hdm-usb/hdm_usb.c | 4 +-
+ drivers/staging/nvec/nvec_power.c | 2 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 14 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 144 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 -
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 9 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 -
+ drivers/staging/rtl8188eu/core/rtw_led.c | 1 +
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 +
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 43 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 137 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 18 +
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 1 +
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 3 +
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 8 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +-
+ drivers/staging/rtl8188eu/include/drv_types.h | 1 -
+ drivers/staging/rtl8188eu/include/osdep_service.h | 7 -
+ drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 185 ---
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 13 -
+ drivers/staging/rtl8188eu/include/rtw_security.h | 36 -
+ drivers/staging/rtl8188eu/include/wifi.h | 101 --
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 15 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 -
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 14 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 15 -
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 1 +
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 +
+ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 22 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +-
+ drivers/staging/rtl8192u/r8180_93cx6.h | 27 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 31 +-
+ drivers/staging/rtl8712/hal_init.c | 12 +-
+ drivers/staging/rtl8712/ieee80211.c | 18 +-
+ drivers/staging/rtl8712/mlme_linux.c | 6 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c | 7 +-
+ drivers/staging/rtl8712/rtl8712_event.h | 2 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 10 +-
+ drivers/staging/rtl8712/rtl8712_recv.h | 28 +-
+ drivers/staging/rtl8712/rtl8712_xmit.h | 16 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 6 +-
+ drivers/staging/rtl8712/rtl871x_event.h | 2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 15 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 9 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 16 +-
+ drivers/staging/rtl8712/usb_ops.c | 18 +-
+ drivers/staging/rtl8712/usb_ops_linux.c | 5 +-
+ drivers/staging/rtl8712/wifi.h | 4 +-
+ drivers/staging/rtl8712/wlan_bssdef.h | 2 +-
+ drivers/staging/rts5208/rtsx_transport.c | 4 +-
+ drivers/staging/skein/skein_base.c | 16 +-
+ drivers/staging/skein/skein_base.h | 112 +-
+ drivers/staging/skein/skein_block.c | 32 +-
+ drivers/staging/skein/skein_block.h | 20 +-
+ drivers/staging/skein/skein_iv.h | 24 +-
+ drivers/staging/sm750fb/ddk750_chip.c | 6 +-
+ drivers/staging/sm750fb/sm750.c | 7 +-
+ drivers/staging/speakup/kobjects.c | 54 +-
+ drivers/staging/unisys/include/channel.h | 134 +-
+ drivers/staging/unisys/visorbus/controlvmchannel.h | 87 +-
+ drivers/staging/unisys/visorbus/visorbus_main.c | 48 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 236 ++-
+ drivers/staging/unisys/visorbus/vmcallinterface.h | 8 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 4 -
+ drivers/staging/unisys/visornic/visornic_main.c | 11 +-
+ .../interface/vchi/connections/connection.h | 3 +-
+ .../interface/vchi/message_drivers/message.h | 9 +-
+ .../staging/vc04_services/interface/vchi/vchi.h | 18 +-
+ .../vc04_services/interface/vchi/vchi_common.h | 9 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_2835.h | 42 -
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 49 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 132 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 102 +-
+ .../interface/vchiq_arm/vchiq_debugfs.h | 3 +-
+ .../interface/vchiq_arm/vchiq_kern_lib.c | 14 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 24 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_util.c | 9 +-
+ drivers/staging/vme/devices/vme_user.c | 3 +-
+ drivers/staging/vt6656/int.c | 2 +-
+ drivers/staging/vt6656/key.c | 14 +-
+ drivers/staging/vt6656/mac.c | 46 +-
+ drivers/staging/vt6656/main_usb.c | 63 +-
+ drivers/staging/vt6656/wcmd.h | 4 +-
+ drivers/staging/wilc1000/host_interface.c | 3 +-
+ drivers/staging/wilc1000/linux_wlan.c | 4 +-
+ drivers/staging/wilc1000/wilc_debugfs.c | 4 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 5 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 19 +-
+ drivers/staging/wlan-ng/cfg80211.c | 6 +-
+ drivers/staging/wlan-ng/hfa384x.h | 4 +-
+ drivers/staging/wlan-ng/prism2mib.c | 2 -
+ drivers/staging/xgifb/vb_init.c | 3 +-
+ include/linux/hid-sensor-hub.h | 4 +
+ include/linux/hid-sensor-ids.h | 4 +
+ include/linux/iio/buffer.h | 160 +-
+ include/linux/iio/buffer_impl.h | 162 ++
+ include/linux/iio/common/st_sensors_i2c.h | 9 +
+ include/linux/iio/kfifo_buf.h | 5 +-
+ include/uapi/linux/iio/types.h | 1 +
+ tools/iio/iio_event_monitor.c | 2 +
+ 368 files changed, 8131 insertions(+), 15303 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/max11100.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads7950.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/imu/bmi160.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/cm3605.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/temperature/tmp007.txt
+ create mode 100644 drivers/iio/adc/hx711.c
+ create mode 100644 drivers/iio/adc/max11100.c
+ create mode 100644 drivers/iio/adc/ti-ads7950.c
+ create mode 100644 drivers/iio/adc/ti-tlc4541.c
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/Kconfig
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/Makefile
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
+ create mode 100644 drivers/iio/light/cm3605.c
+ create mode 100644 drivers/iio/temperature/tmp007.c
+ delete mode 100644 drivers/staging/greybus/timesync.c
+ delete mode 100644 drivers/staging/greybus/timesync.h
+ delete mode 100644 drivers/staging/greybus/timesync_platform.c
+ delete mode 100644 drivers/staging/i4l/Documentation/README.act2000
+ delete mode 100644 drivers/staging/i4l/Documentation/README.icn
+ delete mode 100644 drivers/staging/i4l/Documentation/README.pcbit
+ delete mode 100644 drivers/staging/i4l/Documentation/README.sc
+ delete mode 100644 drivers/staging/i4l/Kconfig
+ delete mode 100644 drivers/staging/i4l/Makefile
+ delete mode 100644 drivers/staging/i4l/TODO
+ delete mode 100644 drivers/staging/i4l/act2000/Kconfig
+ delete mode 100644 drivers/staging/i4l/act2000/Makefile
+ delete mode 100644 drivers/staging/i4l/act2000/act2000.h
+ delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.c
+ delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.h
+ delete mode 100644 drivers/staging/i4l/act2000/capi.c
+ delete mode 100644 drivers/staging/i4l/act2000/capi.h
+ delete mode 100644 drivers/staging/i4l/act2000/module.c
+ delete mode 100644 drivers/staging/i4l/icn/Kconfig
+ delete mode 100644 drivers/staging/i4l/icn/Makefile
+ delete mode 100644 drivers/staging/i4l/icn/icn.c
+ delete mode 100644 drivers/staging/i4l/icn/icn.h
+ delete mode 100644 drivers/staging/i4l/pcbit/Kconfig
+ delete mode 100644 drivers/staging/i4l/pcbit/Makefile
+ delete mode 100644 drivers/staging/i4l/pcbit/callbacks.c
+ delete mode 100644 drivers/staging/i4l/pcbit/callbacks.h
+ delete mode 100644 drivers/staging/i4l/pcbit/capi.c
+ delete mode 100644 drivers/staging/i4l/pcbit/capi.h
+ delete mode 100644 drivers/staging/i4l/pcbit/drv.c
+ delete mode 100644 drivers/staging/i4l/pcbit/edss1.c
+ delete mode 100644 drivers/staging/i4l/pcbit/edss1.h
+ delete mode 100644 drivers/staging/i4l/pcbit/layer2.c
+ delete mode 100644 drivers/staging/i4l/pcbit/layer2.h
+ delete mode 100644 drivers/staging/i4l/pcbit/module.c
+ delete mode 100644 drivers/staging/i4l/pcbit/pcbit.h
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_obdo.h
+ delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h
+ create mode 100644 include/linux/iio/buffer_impl.h
+Merging char-misc/char-misc-next (8e27a236312c Drivers: hv: vmbus: Cleanup hyperv_vmbus.h)
+$ git merge char-misc/char-misc-next
+Auto-merging init/Kconfig
+Auto-merging include/linux/miscdevice.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/misc/idt_89hpesx.txt | 44 +
+ MAINTAINERS | 1 +
+ arch/arm/mach-davinci/da850.c | 10 +-
+ arch/arm/mach-davinci/da8xx-dt.c | 12 +-
+ arch/x86/Kbuild | 3 +
+ arch/x86/hyperv/Makefile | 1 +
+ arch/x86/hyperv/hv_init.c | 252 ++++
+ arch/x86/include/asm/mshyperv.h | 147 ++
+ arch/x86/include/uapi/asm/hyperv.h | 8 +
+ arch/x86/kernel/cpu/mshyperv.c | 50 +-
+ drivers/char/Kconfig | 5 +-
+ drivers/char/apm-emulation.c | 7 -
+ drivers/char/ds1302.c | 1 -
+ drivers/char/mmtimer.c | 6 +-
+ drivers/hv/channel.c | 35 +-
+ drivers/hv/channel_mgmt.c | 36 +-
+ drivers/hv/connection.c | 24 +-
+ drivers/hv/hv.c | 347 +----
+ drivers/hv/hv_fcopy.c | 4 +
+ drivers/hv/hv_kvp.c | 4 +
+ drivers/hv/hv_snapshot.c | 4 +
+ drivers/hv/hv_util.c | 3 +-
+ drivers/hv/hyperv_vmbus.h | 297 +---
+ drivers/hv/ring_buffer.c | 7 +
+ drivers/hv/vmbus_drv.c | 53 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 2 +-
+ drivers/memory/ti-aemif.c | 8 +-
+ drivers/misc/eeprom/Kconfig | 10 +
+ drivers/misc/eeprom/Makefile | 1 +
+ drivers/misc/eeprom/idt_89hpesx.c | 1587 ++++++++++++++++++++
+ drivers/misc/genwqe/card_base.c | 1 -
+ drivers/misc/lkdtm_bugs.c | 7 +-
+ drivers/misc/mei/client.c | 4 +-
+ drivers/misc/mei/client.h | 2 -
+ drivers/misc/mic/vop/vop_vringh.c | 1 -
+ drivers/misc/sram.c | 4 +-
+ include/linux/hyperv.h | 1 +
+ include/linux/miscdevice.h | 1 +
+ include/linux/platform_data/ti-aemif.h | 23 +
+ include/linux/vme.h | 1 -
+ init/Kconfig | 7 +
+ scripts/checkkconfigsymbols.py | 6 +-
+ 42 files changed, 2337 insertions(+), 690 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/idt_89hpesx.txt
+ create mode 100644 arch/x86/hyperv/Makefile
+ create mode 100644 arch/x86/hyperv/hv_init.c
+ create mode 100644 drivers/misc/eeprom/idt_89hpesx.c
+ create mode 100644 include/linux/platform_data/ti-aemif.h
+Merging extcon/extcon-next (4fcf37fb7dae extcon: palmas: Don't spam console)
+$ git merge extcon/extcon-next
+Auto-merging drivers/extcon/extcon.c
+Merge made by the 'recursive' strategy.
+ Documentation/extcon/intel-int3496.txt | 22 ++++
+ drivers/extcon/Kconfig | 10 ++
+ drivers/extcon/Makefile | 1 +
+ drivers/extcon/devres.c | 2 +-
+ drivers/extcon/extcon-adc-jack.c | 2 +-
+ drivers/extcon/extcon-arizona.c | 20 ++--
+ drivers/extcon/extcon-axp288.c | 110 ++++++++------------
+ drivers/extcon/extcon-intel-int3496.c | 179 +++++++++++++++++++++++++++++++++
+ drivers/extcon/extcon-max14577.c | 6 +-
+ drivers/extcon/extcon-max77693.c | 12 ++-
+ drivers/extcon/extcon-max77843.c | 24 +++--
+ drivers/extcon/extcon-palmas.c | 21 ++--
+ drivers/extcon/extcon-rt8973a.c | 6 +-
+ drivers/extcon/extcon-sm5502.c | 6 +-
+ drivers/extcon/extcon-usb-gpio.c | 7 ++
+ drivers/extcon/extcon.c | 43 +++-----
+ drivers/extcon/extcon.h | 62 ++++++++++++
+ include/linux/extcon.h | 71 +++----------
+ include/linux/extcon/extcon-adc-jack.h | 2 +-
+ 19 files changed, 414 insertions(+), 192 deletions(-)
+ create mode 100644 Documentation/extcon/intel-int3496.txt
+ create mode 100644 drivers/extcon/extcon-intel-int3496.c
+ create mode 100644 drivers/extcon/extcon.h
+Merging slave-dma/next (7919f00e4fdf Merge branch 'topic/zx' into next)
+$ git merge slave-dma/next
+Auto-merging drivers/dma/zx_dma.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-platform-hidma | 2 +-
+ .../ABI/testing/sysfs-platform-hidma-mgmt | 20 ++---
+ .../devicetree/bindings/dma/stm32-dma.txt | 5 +-
+ drivers/dma/Kconfig | 6 +-
+ drivers/dma/Makefile | 2 +-
+ drivers/dma/dmaengine.c | 21 +++---
+ drivers/dma/dw/pci.c | 3 +-
+ drivers/dma/ipu/ipu_irq.c | 2 +-
+ drivers/dma/ste_dma40.c | 7 +-
+ drivers/dma/stm32-dma.c | 88 +++++++++++++++-------
+ drivers/dma/{zx296702_dma.c => zx_dma.c} | 4 +-
+ 11 files changed, 97 insertions(+), 63 deletions(-)
+ rename drivers/dma/{zx296702_dma.c => zx_dma.c} (99%)
+Merging cgroup/for-next (e055b0e58d99 Merge branch 'for-4.11' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging init/Kconfig
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging drivers/infiniband/core/uverbs_cmd.c
+Merge made by the 'recursive' strategy.
+ Documentation/cgroup-v1/rdma.txt | 109 ++
+ Documentation/cgroup-v2.txt | 79 +
+ drivers/infiniband/core/Makefile | 1 +
+ drivers/infiniband/core/cgroup.c | 62 +
+ drivers/infiniband/core/core_priv.h | 30 +
+ drivers/infiniband/core/device.c | 10 +
+ drivers/infiniband/core/uverbs_cmd.c | 102 +-
+ drivers/infiniband/core/uverbs_main.c | 20 +
+ fs/kernfs/dir.c | 2 +-
+ fs/kernfs/file.c | 53 +-
+ fs/kernfs/kernfs-internal.h | 2 +-
+ include/linux/cgroup-defs.h | 57 +-
+ include/linux/cgroup.h | 2 +-
+ include/linux/cgroup_rdma.h | 53 +
+ include/linux/cgroup_subsys.h | 4 +
+ include/linux/kernfs.h | 12 +-
+ include/rdma/ib_verbs.h | 14 +
+ init/Kconfig | 10 +
+ kernel/Makefile | 5 +-
+ kernel/cgroup/Makefile | 6 +
+ kernel/cgroup/cgroup-internal.h | 214 +++
+ kernel/cgroup/cgroup-v1.c | 1395 ++++++++++++++++
+ kernel/{ => cgroup}/cgroup.c | 2131 ++++---------------------
+ kernel/{ => cgroup}/cpuset.c | 0
+ kernel/{cgroup_freezer.c => cgroup/freezer.c} | 0
+ kernel/cgroup/namespace.c | 155 ++
+ kernel/{cgroup_pids.c => cgroup/pids.c} | 0
+ kernel/cgroup/rdma.c | 619 +++++++
+ 28 files changed, 3239 insertions(+), 1908 deletions(-)
+ create mode 100644 Documentation/cgroup-v1/rdma.txt
+ create mode 100644 drivers/infiniband/core/cgroup.c
+ create mode 100644 include/linux/cgroup_rdma.h
+ create mode 100644 kernel/cgroup/Makefile
+ create mode 100644 kernel/cgroup/cgroup-internal.h
+ create mode 100644 kernel/cgroup/cgroup-v1.c
+ rename kernel/{ => cgroup}/cgroup.c (72%)
+ rename kernel/{ => cgroup}/cpuset.c (100%)
+ rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%)
+ create mode 100644 kernel/cgroup/namespace.c
+ rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%)
+ create mode 100644 kernel/cgroup/rdma.c
+Merging scsi/for-next (b32d9f752e17 Merge branch 'fixes' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/qla2xxx/qla_isr.c
+Auto-merging drivers/scsi/qla2xxx/qla_def.h
+Auto-merging drivers/scsi/lpfc/lpfc_els.c
+Merge made by the 'recursive' strategy.
+ drivers/block/cciss.h | 30 +-
+ drivers/message/fusion/mptlan.h | 1 -
+ drivers/scsi/be2iscsi/be.h | 3 -
+ drivers/scsi/be2iscsi/be_cmds.c | 41 +-
+ drivers/scsi/be2iscsi/be_cmds.h | 17 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 165 +++---
+ drivers/scsi/be2iscsi/be_main.c | 344 +++++------
+ drivers/scsi/be2iscsi/be_main.h | 44 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 117 ++--
+ drivers/scsi/be2iscsi/be_mgmt.h | 98 +---
+ drivers/scsi/bfa/bfa_fcs.c | 181 ++----
+ drivers/scsi/bfa/bfa_fcs.h | 4 -
+ drivers/scsi/cxlflash/common.h | 32 +-
+ drivers/scsi/cxlflash/lunmgt.c | 31 +-
+ drivers/scsi/cxlflash/main.c | 465 ++++++++-------
+ drivers/scsi/cxlflash/sislite.h | 19 +-
+ drivers/scsi/cxlflash/superpipe.c | 183 +++---
+ drivers/scsi/cxlflash/vlun.c | 169 +++---
+ drivers/scsi/dpt_i2o.c | 8 +-
+ drivers/scsi/esas2r/esas2r_init.c | 2 +-
+ drivers/scsi/esas2r/esas2r_ioctl.c | 2 +-
+ drivers/scsi/esas2r/esas2r_log.h | 4 +-
+ drivers/scsi/esas2r/esas2r_main.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 1 +
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 3 +
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 26 +-
+ drivers/scsi/hpsa.h | 40 +-
+ drivers/scsi/lpfc/lpfc.h | 1 -
+ drivers/scsi/lpfc/lpfc_attr.c | 57 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 7 +-
+ drivers/scsi/lpfc/lpfc_els.c | 6 +
+ drivers/scsi/lpfc/lpfc_hw.h | 6 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 18 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 13 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 8 +
+ drivers/scsi/megaraid/megaraid_sas.h | 139 +++--
+ drivers/scsi/megaraid/megaraid_sas_base.c | 240 ++++++--
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 341 +++++++++--
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 746 ++++++++++++++++++++----
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 364 ++++++++++--
+ drivers/scsi/pmcraid.c | 92 ++-
+ drivers/scsi/pmcraid.h | 1 -
+ drivers/scsi/qedi/qedi_dbg.c | 9 +-
+ drivers/scsi/qla2xxx/qla_def.h | 4 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 6 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 10 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 3 -
+ drivers/scsi/qla4xxx/ql4_os.c | 6 +-
+ drivers/scsi/storvsc_drv.c | 148 ++++-
+ drivers/scsi/ufs/ufs-qcom.c | 1 +
+ drivers/scsi/ufs/ufs.h | 12 +
+ drivers/scsi/ufs/ufs_quirks.h | 28 +-
+ drivers/scsi/ufs/ufshcd.c | 845 +++++++++++++++++++++++++---
+ drivers/scsi/ufs/ufshcd.h | 77 ++-
+ drivers/scsi/ufs/ufshci.h | 3 +
+ drivers/scsi/vmw_pvscsi.c | 104 ++--
+ drivers/scsi/vmw_pvscsi.h | 5 -
+ include/scsi/scsi.h | 10 -
+ include/trace/events/ufs.h | 263 +++++++++
+ include/uapi/scsi/cxlflash_ioctl.h | 1 +
+ 62 files changed, 3988 insertions(+), 1624 deletions(-)
+ create mode 100644 include/trace/events/ufs.h
+Merging scsi-mkp/for-next (13c599069130 scsi: hisi_sas: decrease running_req in hisi_sas_slot_task_free())
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/lpfc/lpfc_els.c
+Merge made by the 'recursive' strategy.
+ drivers/scsi/be2iscsi/be_main.c | 2 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 20 +++---
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 109 +++++++++++++++++++++++++++++----
+ drivers/scsi/lpfc/lpfc_attr.c | 4 +-
+ drivers/scsi/lpfc/lpfc_els.c | 3 +-
+ drivers/scsi/sd.c | 4 +-
+ 6 files changed, 112 insertions(+), 30 deletions(-)
+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 target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
+$ git merge target-bva/for-next
+Already up-to-date.
+Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ drivers/ata/Kconfig | 19 +++-
+ drivers/ata/Makefile | 1 +
+ drivers/ata/ahci_imx.c | 196 +++++++++++++++++++++++++++++++++++++++++
+ drivers/ata/ahci_qoriq.c | 35 ++++++--
+ drivers/ata/ahci_xgene.c | 6 +-
+ drivers/ata/libata-core.c | 67 ++++++++------
+ drivers/ata/libata-eh.c | 44 ++++++---
+ drivers/ata/libata-scsi.c | 97 ++++++++------------
+ drivers/ata/libata-sff.c | 45 ++++++----
+ drivers/ata/libata.h | 8 --
+ drivers/ata/pata_at91.c | 6 +-
+ drivers/ata/pata_atiixp.c | 5 ++
+ drivers/ata/pata_bf54x.c | 7 +-
+ drivers/ata/pata_ep93xx.c | 4 +-
+ drivers/ata/pata_falcon.c | 184 ++++++++++++++++++++++++++++++++++++++
+ drivers/ata/pata_ixp4xx_cf.c | 4 +-
+ drivers/ata/pata_legacy.c | 15 ++--
+ drivers/ata/pata_octeon_cf.c | 20 ++---
+ drivers/ata/pata_of_platform.c | 9 +-
+ drivers/ata/pata_pcmcia.c | 6 +-
+ drivers/ata/pata_samsung_cf.c | 4 +-
+ drivers/ata/sata_mv.c | 12 +--
+ drivers/ata/sata_rcar.c | 4 +-
+ include/linux/libata.h | 8 +-
+ 24 files changed, 616 insertions(+), 190 deletions(-)
+ create mode 100644 drivers/ata/pata_falcon.c
+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 vhost/linux-next (ec4537a7d64f pci: drop link_reset)
+$ git merge vhost/linux-next
+Auto-merging include/uapi/linux/Kbuild
+Auto-merging include/linux/pci.h
+Merge made by the 'recursive' strategy.
+ Documentation/PCI/pci-error-recovery.txt | 24 +++---------------------
+ drivers/media/pci/ngene/ngene-cards.c | 7 -------
+ drivers/vhost/vsock.c | 13 +++++++++----
+ drivers/virtio/virtio_mmio.c | 22 ++++++++++++++++++++--
+ drivers/virtio/virtio_ring.c | 7 +++++++
+ include/linux/pci.h | 3 ---
+ include/uapi/linux/Kbuild | 1 +
+ include/{ => uapi}/linux/virtio_mmio.h | 0
+ 8 files changed, 40 insertions(+), 37 deletions(-)
+ rename include/{ => uapi}/linux/virtio_mmio.h (100%)
+Merging rpmsg/for-next (5956dd81ac18 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 4 +-
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ drivers/remoteproc/Kconfig | 7 +-
+ drivers/remoteproc/da8xx_remoteproc.c | 2 +-
+ drivers/remoteproc/omap_remoteproc.c | 2 +-
+ drivers/remoteproc/qcom_q6v5_pil.c | 383 ++++++++++----
+ drivers/remoteproc/st_remoteproc.c | 2 +-
+ drivers/remoteproc/st_slim_rproc.c | 2 +-
+ drivers/remoteproc/wkup_m3_rproc.c | 2 +-
+ drivers/rpmsg/Kconfig | 9 +
+ drivers/rpmsg/Makefile | 1 +
+ drivers/rpmsg/qcom_smd.c | 58 ++
+ drivers/rpmsg/rpmsg_char.c | 585 +++++++++++++++++++++
+ drivers/rpmsg/rpmsg_core.c | 20 +
+ drivers/rpmsg/rpmsg_internal.h | 18 +
+ include/linux/rpmsg.h | 13 +
+ include/uapi/linux/rpmsg.h | 35 ++
+ 17 files changed, 1047 insertions(+), 97 deletions(-)
+ create mode 100644 drivers/rpmsg/rpmsg_char.c
+ create mode 100644 include/uapi/linux/rpmsg.h
+Merging gpio/for-next (ffd6ce2f3b20 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging drivers/input/keyboard/gpio_keys_polled.c
+Auto-merging drivers/input/keyboard/gpio_keys.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-pca953x.txt | 4 +
+ Documentation/devicetree/bindings/gpio/gpio.txt | 8 +-
+ drivers/gpio/devres.c | 21 ++-
+ drivers/gpio/gpio-davinci.c | 177 ++++++++++-----------
+ drivers/gpio/gpio-intel-mid.c | 2 +-
+ drivers/gpio/gpio-mm-lantiq.c | 2 +-
+ drivers/gpio/gpio-mockup.c | 23 +--
+ drivers/gpio/gpio-mvebu.c | 2 +-
+ drivers/gpio/gpio-pca953x.c | 9 ++
+ drivers/gpio/gpio-rcar.c | 21 ++-
+ drivers/gpio/gpio-stp-xway.c | 2 +-
+ drivers/gpio/gpiolib-acpi.c | 5 +-
+ drivers/gpio/gpiolib-of.c | 31 ++--
+ drivers/gpio/gpiolib.c | 45 +++---
+ drivers/gpio/gpiolib.h | 3 +-
+ drivers/input/keyboard/gpio_keys.c | 10 +-
+ drivers/input/keyboard/gpio_keys_polled.c | 12 +-
+ drivers/leds/leds-gpio.c | 13 +-
+ drivers/video/fbdev/amba-clcd-nomadik.c | 19 ++-
+ include/linux/gpio/consumer.h | 23 ++-
+ include/linux/platform_data/gpio-davinci.h | 15 +-
+ tools/gpio/.gitignore | 4 +
+ 22 files changed, 245 insertions(+), 206 deletions(-)
+ create mode 100644 tools/gpio/.gitignore
+Merging pinctrl/for-next (2a15343f1e82 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/sunxi/pinctrl-sun5i.c
+Removing drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+Removing drivers/pinctrl/sunxi/pinctrl-gr8.c
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 2 +-
+ .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 20 +-
+ .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 131 +-
+ .../devicetree/bindings/pinctrl/ti,iodelay.txt | 47 +
+ Documentation/pinctrl.txt | 4 +-
+ drivers/pinctrl/Kconfig | 12 +-
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1115 +++++++++++-
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1524 +++++++++++++++-
+ drivers/pinctrl/aspeed/pinctrl-aspeed.c | 165 +-
+ drivers/pinctrl/aspeed/pinctrl-aspeed.h | 33 +-
+ drivers/pinctrl/core.c | 372 +++-
+ drivers/pinctrl/core.h | 55 +
+ drivers/pinctrl/devicetree.c | 31 +-
+ drivers/pinctrl/devicetree.h | 12 +-
+ drivers/pinctrl/freescale/Kconfig | 3 +-
+ drivers/pinctrl/freescale/pinctrl-imx.c | 300 ++-
+ drivers/pinctrl/freescale/pinctrl-imx.h | 34 +-
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 56 +-
+ drivers/pinctrl/intel/pinctrl-broxton.c | 3 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 53 +-
+ drivers/pinctrl/intel/pinctrl-intel.h | 2 -
+ drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 -
+ drivers/pinctrl/mediatek/pinctrl-mt7623.c | 2 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h | 2 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 26 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 26 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-370.c | 24 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-375.c | 24 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 24 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 24 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 35 +-
+ drivers/pinctrl/mvebu/pinctrl-dove.c | 96 +-
+ drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 32 +-
+ drivers/pinctrl/mvebu/pinctrl-mvebu.c | 179 +-
+ drivers/pinctrl/mvebu/pinctrl-mvebu.h | 65 +-
+ drivers/pinctrl/mvebu/pinctrl-orion.c | 8 +-
+ drivers/pinctrl/pinctrl-amd.c | 37 +-
+ drivers/pinctrl/pinctrl-amd.h | 8 +-
+ drivers/pinctrl/pinctrl-da850-pupd.c | 1 +
+ drivers/pinctrl/pinctrl-falcon.c | 2 +-
+ drivers/pinctrl/pinctrl-lantiq.c | 2 +-
+ drivers/pinctrl/pinctrl-lantiq.h | 2 +-
+ drivers/pinctrl/pinctrl-single.c | 297 +--
+ drivers/pinctrl/pinctrl-xway.c | 2 +-
+ drivers/pinctrl/pinmux.c | 216 ++-
+ drivers/pinctrl/pinmux.h | 56 +
+ drivers/pinctrl/qcom/pinctrl-msm8660.c | 6 +-
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 75 -
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 2 -
+ drivers/pinctrl/samsung/pinctrl-samsung.h | 1 -
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 1 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 450 +++--
+ drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 1920 +++++++++++++++++++-
+ drivers/pinctrl/sh-pfc/pinctrl.c | 4 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 13 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 1 +
+ drivers/pinctrl/sunxi/Kconfig | 14 +-
+ drivers/pinctrl/sunxi/Makefile | 5 +-
+ drivers/pinctrl/sunxi/pinctrl-gr8.c | 536 ------
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 403 ----
+ .../{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c} | 201 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 321 ++++
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 77 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 30 +-
+ drivers/pinctrl/ti/Kconfig | 10 +
+ drivers/pinctrl/ti/Makefile | 1 +
+ drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 937 ++++++++++
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 2 +-
+ include/linux/pinctrl/pinctrl.h | 15 +
+ 70 files changed, 7842 insertions(+), 2349 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt
+ delete mode 100644 drivers/pinctrl/sunxi/pinctrl-gr8.c
+ delete mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+ rename drivers/pinctrl/sunxi/{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c} (83%)
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
+ create mode 100644 drivers/pinctrl/ti/Kconfig
+ create mode 100644 drivers/pinctrl/ti/Makefile
+ create mode 100644 drivers/pinctrl/ti/pinctrl-ti-iodelay.c
+Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (e52d5f1c5221 Merge branch 'for-4.11/drivers' into for-next)
+$ git merge pwm/for-next
+Auto-merging drivers/pwm/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/leds/leds-pwm.c | 16 +---
+ drivers/pwm/Kconfig | 4 +-
+ drivers/pwm/core.c | 12 ---
+ drivers/pwm/pwm-atmel-hlcdc.c | 1 -
+ drivers/pwm/pwm-atmel.c | 1 -
+ drivers/pwm/pwm-bcm-kona.c | 1 -
+ drivers/pwm/pwm-berlin.c | 1 -
+ drivers/pwm/pwm-bfin.c | 2 +-
+ drivers/pwm/pwm-brcmstb.c | 1 -
+ drivers/pwm/pwm-fsl-ftm.c | 1 -
+ drivers/pwm/pwm-imx.c | 3 +-
+ drivers/pwm/pwm-lp3943.c | 1 -
+ drivers/pwm/pwm-mxs.c | 2 +-
+ drivers/pwm/pwm-pca9685.c | 165 +++++++++++++++++++++++++++++++++++++++++-
+ drivers/pwm/pwm-pxa.c | 2 +-
+ drivers/pwm/pwm-sti.c | 1 -
+ drivers/pwm/pwm-sun4i.c | 1 -
+ drivers/pwm/pwm-twl-led.c | 1 -
+ drivers/pwm/pwm-twl.c | 1 -
+ drivers/pwm/pwm-vt8500.c | 2 +-
+ drivers/staging/greybus/pwm.c | 1 -
+ include/linux/pwm.h | 10 ---
+ 22 files changed, 174 insertions(+), 56 deletions(-)
+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
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 51e12d6f62dd] Merge remote-tracking branch 'dma-buf/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+Merging userns/for-next (68eb94f16227 proc: Better ownership of files for non-dumpable tasks in user namespaces)
+$ git merge userns/for-next
+Recorded preimage for 'security/selinux/hooks.c'
+Auto-merging security/smack/smack_lsm.c
+Auto-merging security/selinux/hooks.c
+CONFLICT (content): Merge conflict in security/selinux/hooks.c
+Auto-merging security/commoncap.c
+Auto-merging security/apparmor/domain.c
+Auto-merging include/linux/security.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/proc/base.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'security/selinux/hooks.c'.
+[master 52e97caecb90] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/exec.c | 8 +--
+ fs/notify/inotify/inotify.h | 17 ++++++
+ fs/notify/inotify/inotify_fsnotify.c | 6 +--
+ fs/notify/inotify/inotify_user.c | 34 ++++++------
+ fs/proc/base.c | 102 ++++++++++++++++++++---------------
+ fs/proc/fd.c | 12 +----
+ fs/proc/internal.h | 16 +-----
+ include/linux/fsnotify_backend.h | 3 +-
+ include/linux/sched.h | 4 --
+ include/linux/security.h | 3 +-
+ include/linux/user_namespace.h | 4 ++
+ kernel/ucount.c | 6 ++-
+ security/apparmor/domain.c | 2 +-
+ security/commoncap.c | 5 +-
+ security/selinux/hooks.c | 3 +-
+ security/smack/smack_lsm.c | 2 +-
+ 16 files changed, 117 insertions(+), 110 deletions(-)
+Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
+$ git merge ktest/for-next
+Already up-to-date.
+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 (1e4c2830c369 selftest: cpufreq: Add special tests)
+$ git merge kselftest/next
+Recorded preimage for 'tools/testing/selftests/bpf/Makefile'
+Auto-merging tools/testing/selftests/x86/protection_keys.c
+Auto-merging tools/testing/selftests/x86/Makefile
+Auto-merging tools/testing/selftests/bpf/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
+Auto-merging tools/testing/selftests/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'tools/testing/selftests/bpf/Makefile'.
+[master 8bb5eb765347] Merge remote-tracking branch 'kselftest/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kselftest.txt | 12 +
+ tools/power/cpupower/utils/cpufreq-info.c | 21 +-
+ tools/testing/selftests/Makefile | 38 +++-
+ tools/testing/selftests/bpf/Makefile | 10 +-
+ tools/testing/selftests/breakpoints/Makefile | 10 +-
+ tools/testing/selftests/capabilities/Makefile | 11 +-
+ tools/testing/selftests/cpufreq/Makefile | 8 +
+ tools/testing/selftests/cpufreq/cpu.sh | 84 +++++++
+ tools/testing/selftests/cpufreq/cpufreq.sh | 241 ++++++++++++++++++++
+ tools/testing/selftests/cpufreq/governor.sh | 153 +++++++++++++
+ tools/testing/selftests/cpufreq/main.sh | 194 ++++++++++++++++
+ tools/testing/selftests/cpufreq/module.sh | 243 +++++++++++++++++++++
+ tools/testing/selftests/cpufreq/special-tests.sh | 115 ++++++++++
+ tools/testing/selftests/efivarfs/Makefile | 8 +-
+ tools/testing/selftests/exec/Makefile | 32 ++-
+ tools/testing/selftests/ftrace/Makefile | 6 +-
+ tools/testing/selftests/futex/Makefile | 21 +-
+ tools/testing/selftests/futex/functional/Makefile | 17 +-
+ tools/testing/selftests/futex/include/logging.h | 1 +
+ tools/testing/selftests/gpio/.gitignore | 1 +
+ tools/testing/selftests/intel_pstate/Makefile | 13 +-
+ tools/testing/selftests/intel_pstate/aperf.c | 2 +-
+ tools/testing/selftests/ipc/.gitignore | 1 +
+ tools/testing/selftests/ipc/Makefile | 7 +-
+ tools/testing/selftests/kcmp/Makefile | 6 +-
+ tools/testing/selftests/lib.mk | 36 ++-
+ tools/testing/selftests/membarrier/Makefile | 6 +-
+ tools/testing/selftests/memfd/Makefile | 15 +-
+ tools/testing/selftests/mount/Makefile | 7 +-
+ tools/testing/selftests/mqueue/Makefile | 6 +-
+ tools/testing/selftests/net/Makefile | 15 +-
+ tools/testing/selftests/nsfs/Makefile | 9 +-
+ tools/testing/selftests/powerpc/Makefile | 15 +-
+ tools/testing/selftests/powerpc/alignment/Makefile | 9 +-
+ .../testing/selftests/powerpc/benchmarks/Makefile | 15 +-
+ .../selftests/powerpc/context_switch/Makefile | 9 +-
+ tools/testing/selftests/powerpc/copyloops/Makefile | 19 +-
+ tools/testing/selftests/powerpc/dscr/Makefile | 13 +-
+ tools/testing/selftests/powerpc/math/Makefile | 25 +--
+ tools/testing/selftests/powerpc/mm/Makefile | 18 +-
+ tools/testing/selftests/powerpc/pmu/Makefile | 26 +--
+ tools/testing/selftests/powerpc/pmu/ebb/Makefile | 15 +-
+ .../testing/selftests/powerpc/primitives/Makefile | 9 +-
+ .../testing/selftests/powerpc/stringloops/Makefile | 9 +-
+ .../selftests/powerpc/switch_endian/Makefile | 17 +-
+ tools/testing/selftests/powerpc/syscalls/Makefile | 9 +-
+ tools/testing/selftests/powerpc/tm/Makefile | 17 +-
+ tools/testing/selftests/powerpc/vphn/Makefile | 10 +-
+ tools/testing/selftests/pstore/Makefile | 4 +-
+ tools/testing/selftests/ptrace/Makefile | 8 +-
+ tools/testing/selftests/seccomp/Makefile | 6 +-
+ tools/testing/selftests/sigaltstack/Makefile | 5 +-
+ tools/testing/selftests/size/Makefile | 10 +-
+ tools/testing/selftests/timers/Makefile | 10 +-
+ tools/testing/selftests/vm/Makefile | 41 ++--
+ tools/testing/selftests/x86/Makefile | 17 +-
+ tools/testing/selftests/x86/protection_keys.c | 15 --
+ tools/testing/selftests/zram/Makefile | 3 +-
+ 58 files changed, 1311 insertions(+), 392 deletions(-)
+ create mode 100644 tools/testing/selftests/cpufreq/Makefile
+ create mode 100755 tools/testing/selftests/cpufreq/cpu.sh
+ create mode 100755 tools/testing/selftests/cpufreq/cpufreq.sh
+ create mode 100755 tools/testing/selftests/cpufreq/governor.sh
+ create mode 100755 tools/testing/selftests/cpufreq/main.sh
+ create mode 100755 tools/testing/selftests/cpufreq/module.sh
+ create mode 100755 tools/testing/selftests/cpufreq/special-tests.sh
+ create mode 100644 tools/testing/selftests/gpio/.gitignore
+Merging y2038/y2038 (69973b830859 Linux 4.9)
+$ git merge y2038/y2038
+Already up-to-date.
+Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge borntraeger/linux-next
+Already up-to-date.
+Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/livepatch/livepatch.txt | 19 -------------------
+ arch/powerpc/include/asm/livepatch.h | 7 -------
+ 2 files changed, 26 deletions(-)
+Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 1 +
+ drivers/hwtracing/coresight/coresight-etm4x.c | 10 +++++++---
+ drivers/hwtracing/coresight/coresight-etm4x.h | 1 +
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+Merging rtc/rtc-next (21da8ba5b665 rtc: sun6i: Switch to devm_rtc_device_register)
+$ git merge rtc/rtc-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/cortina,gemini.txt | 14 +
+ .../devicetree/bindings/rtc/imxdi-rtc.txt | 5 +-
+ .../devicetree/bindings/rtc/st,stm32-rtc.txt | 27 +
+ .../devicetree/bindings/rtc/sun6i-rtc.txt | 10 +
+ drivers/rtc/Kconfig | 13 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-armada38x.c | 141 +++-
+ drivers/rtc/rtc-au1xxx.c | 2 +-
+ drivers/rtc/rtc-bfin.c | 2 +-
+ drivers/rtc/rtc-dm355evm.c | 2 +-
+ drivers/rtc/rtc-gemini.c | 7 +
+ drivers/rtc/rtc-imxdi.c | 33 +-
+ drivers/rtc/rtc-ls1x.c | 2 +-
+ drivers/rtc/rtc-mcp795.c | 183 +++++-
+ drivers/rtc/rtc-mxc.c | 2 +-
+ drivers/rtc/rtc-rx8010.c | 24 +-
+ drivers/rtc/rtc-sh.c | 2 +-
+ drivers/rtc/rtc-stm32.c | 725 +++++++++++++++++++++
+ drivers/rtc/rtc-sun6i.c | 182 +++++-
+ drivers/rtc/rtc-tegra.c | 41 +-
+ drivers/rtc/rtc-tps65910.c | 146 ++++-
+ include/linux/mfd/tps65910.h | 1 +
+ 22 files changed, 1452 insertions(+), 113 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/cortina,gemini.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt
+ create mode 100644 drivers/rtc/rtc-stm32.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 (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
+$ 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 extable/extable (586270614c58 module.h: remove extable.h include now users have migrated)
+$ git merge extable/extable
+Auto-merging kernel/module.c
+Auto-merging kernel/extable.c
+Auto-merging init/main.c
+Auto-merging include/linux/module.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/kernel/traps.c | 2 +-
+ arch/alpha/mm/fault.c | 2 +-
+ arch/arc/mm/extable.c | 3 ++-
+ arch/arm/mm/extable.c | 2 +-
+ arch/arm/mm/fault.c | 2 +-
+ arch/cris/arch-v32/kernel/traps.c | 2 +-
+ arch/frv/mm/extable.c | 2 +-
+ arch/hexagon/mm/vm_fault.c | 2 +-
+ arch/ia64/include/asm/exception.h | 35 +++++++++++++++++++++++++++++++++++
+ arch/ia64/include/asm/uaccess.h | 15 ---------------
+ arch/ia64/kernel/kprobes.c | 4 ++--
+ arch/ia64/kernel/traps.c | 6 ++++--
+ arch/ia64/kernel/unaligned.c | 4 +++-
+ arch/ia64/mm/fault.c | 2 ++
+ arch/m32r/mm/extable.c | 2 +-
+ arch/m32r/mm/fault.c | 2 +-
+ arch/metag/mm/extable.c | 3 +--
+ arch/microblaze/mm/fault.c | 2 +-
+ arch/mn10300/mm/extable.c | 2 +-
+ arch/mn10300/mm/misalignment.c | 2 +-
+ arch/nios2/mm/extable.c | 2 +-
+ arch/nios2/mm/fault.c | 2 +-
+ arch/openrisc/mm/fault.c | 2 +-
+ arch/score/mm/extable.c | 2 +-
+ arch/score/mm/fault.c | 2 +-
+ arch/sh/include/asm/uaccess.h | 1 -
+ arch/sh/kernel/kprobes.c | 2 +-
+ arch/sh/kernel/traps.c | 3 ++-
+ arch/sh/mm/extable_32.c | 2 +-
+ arch/sh/mm/extable_64.c | 2 +-
+ arch/sparc/mm/extable.c | 1 +
+ arch/unicore32/mm/extable.c | 2 +-
+ arch/unicore32/mm/fault.c | 2 +-
+ arch/xtensa/mm/fault.c | 2 +-
+ include/linux/module.h | 1 -
+ init/main.c | 1 +
+ kernel/extable.c | 1 +
+ kernel/module.c | 1 +
+ 38 files changed, 78 insertions(+), 49 deletions(-)
+ create mode 100644 arch/ia64/include/asm/exception.h
+Merging akpm-current/current (ab81b9a880b4 ipc/sem: add hysteresis)
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.h'
+Recorded preimage for 'fs/proc/base.c'
+Resolved 'tools/testing/selftests/vm/Makefile' using previous resolution.
+Auto-merging tools/testing/selftests/vm/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
+Auto-merging security/selinux/selinuxfs.c
+Auto-merging scripts/checkstack.pl
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/kasan/kasan.c
+Auto-merging lib/radix-tree.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/relay.c
+Auto-merging kernel/panic.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/compiler-gcc.h
+Auto-merging fs/proc/base.c
+CONFLICT (content): Merge conflict in fs/proc/base.c
+Auto-merging fs/ocfs2/dlm/dlmmaster.c
+Auto-merging fs/kernfs/file.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging drivers/staging/android/ion/ion.c
+Auto-merging drivers/scsi/cxlflash/superpipe.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_ttm.c
+Auto-merging drivers/gpu/drm/udl/udl_drv.h
+Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c
+Auto-merging drivers/gpu/drm/qxl/qxl_ttm.c
+Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c
+Auto-merging drivers/gpu/drm/msm/msm_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/gma500/framebuffer.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging arch/powerpc/xmon/xmon.c
+Removing arch/m32r/include/asm/current.h
+Auto-merging MAINTAINERS
+Removing Documentation/ABI/obsolete/sysfs-block-zram
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.h'.
+Recorded resolution for 'fs/proc/base.c'.
+[master eccb01131f01] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-block-zram | 119 ---
+ Documentation/ABI/testing/sysfs-block-zram | 101 +-
+ Documentation/blockdev/zram.txt | 74 +-
+ Documentation/filesystems/proc.txt | 5 +-
+ .../trace/postprocess/trace-vmscan-postprocess.pl | 26 +-
+ Documentation/vm/ksm.txt | 14 +
+ Documentation/vm/transhuge.txt | 8 +-
+ MAINTAINERS | 7 +-
+ arch/arm/include/asm/page.h | 2 +
+ arch/frv/include/asm/atomic.h | 35 +-
+ arch/frv/mb93090-mb00/pci-frv.c | 11 +-
+ arch/ia64/mm/init.c | 48 -
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/cmpxchg.h | 15 +-
+ arch/m32r/include/asm/current.h | 15 -
+ arch/m68k/68000/bootlogo-vz.h | 4 +-
+ arch/m68k/68000/bootlogo.h | 4 +-
+ arch/m68k/include/asm/MC68328.h | 3 +-
+ arch/m68k/include/asm/MC68EZ328.h | 3 +-
+ arch/m68k/include/asm/MC68VZ328.h | 2 +-
+ arch/m68k/include/asm/natfeat.h | 3 +-
+ arch/m68k/lib/ashldi3.c | 8 +-
+ arch/m68k/lib/ashrdi3.c | 8 +-
+ arch/m68k/lib/lshrdi3.c | 8 +-
+ arch/m68k/lib/muldi3.c | 8 +-
+ arch/mn10300/include/asm/switch_to.h | 2 +-
+ arch/parisc/mm/init.c | 49 -
+ arch/powerpc/include/asm/page.h | 4 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 4 +-
+ arch/powerpc/platforms/cell/spufs/file.c | 39 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ arch/s390/kernel/crash_dump.c | 1 +
+ arch/s390/mm/gmap.c | 2 +-
+ arch/sparc/kernel/setup_32.c | 2 +-
+ arch/sparc/mm/init_32.c | 11 -
+ arch/tile/mm/pgtable.c | 45 -
+ arch/unicore32/mm/init.c | 44 -
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/mm/init_64.c | 17 +-
+ arch/x86/mm/mpx.c | 2 +-
+ block/genhd.c | 2 +-
+ crypto/lz4.c | 21 +-
+ crypto/lz4hc.c | 21 +-
+ drivers/android/binder.c | 4 +-
+ drivers/base/memory.c | 30 +-
+ drivers/block/zram/zram_drv.c | 141 +--
+ drivers/block/zram/zram_drv.h | 3 -
+ drivers/char/agp/alpha-agp.c | 5 +-
+ drivers/char/mspec.c | 6 +-
+ drivers/dax/dax.c | 38 +-
+ drivers/gpu/drm/drm_vm.c | 32 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 3 +-
+ drivers/gpu/drm/gma500/gem.c | 3 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 2 +-
+ drivers/gpu/drm/i915/i915_drv.h | 2 +-
+ drivers/gpu/drm/i915/i915_gem.c | 4 +-
+ drivers/gpu/drm/msm/msm_drv.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 3 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 6 +-
+ drivers/gpu/drm/tegra/gem.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +-
+ drivers/gpu/drm/udl/udl_drv.h | 2 +-
+ drivers/gpu/drm/udl/udl_gem.c | 3 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 7 +-
+ drivers/hwtracing/intel_th/msu.c | 6 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 4 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +-
+ drivers/memstick/core/memstick.c | 2 +-
+ drivers/misc/cxl/context.c | 3 +-
+ drivers/misc/sgi-gru/grumain.c | 3 +-
+ drivers/misc/sgi-gru/grutables.h | 2 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 2 +-
+ drivers/nvdimm/pfn_devs.c | 42 +-
+ drivers/rapidio/devices/rio_mport_cdev.c | 11 +-
+ drivers/scsi/cxlflash/superpipe.c | 6 +-
+ drivers/scsi/sg.c | 3 +-
+ drivers/staging/android/ion/ion.c | 9 +-
+ drivers/staging/lustre/lustre/llite/llite_mmap.c | 7 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +-
+ drivers/target/target_core_user.c | 6 +-
+ drivers/tty/sysrq.c | 2 +-
+ drivers/tty/vt/keyboard.c | 2 +-
+ drivers/uio/uio.c | 6 +-
+ drivers/usb/mon/mon_bin.c | 4 +-
+ drivers/video/fbdev/core/fb_defio.c | 16 +-
+ drivers/video/fbdev/core/fbcmap.c | 26 +-
+ drivers/xen/privcmd.c | 4 +-
+ fs/9p/vfs_file.c | 4 +-
+ fs/Kconfig | 1 +
+ fs/affs/affs.h | 22 +-
+ fs/affs/amigaffs.c | 42 +-
+ fs/affs/inode.c | 9 +-
+ fs/affs/namei.c | 95 +-
+ fs/affs/super.c | 3 +-
+ fs/binfmt_elf.c | 30 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/ceph/addr.c | 8 +-
+ fs/cifs/file.c | 2 +-
+ fs/dax.c | 136 ++-
+ fs/ext2/Kconfig | 1 -
+ fs/ext2/file.c | 17 +-
+ fs/ext4/Kconfig | 1 -
+ fs/ext4/ext4.h | 4 +-
+ fs/ext4/file.c | 30 +-
+ fs/ext4/inode.c | 9 +-
+ fs/f2fs/file.c | 7 +-
+ fs/fuse/file.c | 6 +-
+ fs/gfs2/file.c | 8 +-
+ fs/hfs/dir.c | 2 +-
+ fs/hfs/mdb.c | 2 +-
+ fs/hfsplus/wrapper.c | 2 +-
+ fs/iomap.c | 5 +-
+ fs/kernfs/file.c | 13 +-
+ fs/ncpfs/mmap.c | 7 +-
+ fs/nfs/file.c | 4 +-
+ fs/nfs/write.c | 2 -
+ fs/nilfs2/file.c | 3 +-
+ fs/ocfs2/acl.c | 29 +-
+ fs/ocfs2/dlm/dlmmaster.c | 66 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 40 +-
+ fs/ocfs2/dlmglue.c | 105 +-
+ fs/ocfs2/dlmglue.h | 18 +
+ fs/ocfs2/file.c | 58 +-
+ fs/ocfs2/mmap.c | 15 +-
+ fs/ocfs2/ocfs2.h | 1 +
+ fs/proc/base.c | 150 ++-
+ fs/proc/generic.c | 11 +-
+ fs/proc/vmcore.c | 4 +-
+ fs/pstore/platform.c | 14 +-
+ fs/reiserfs/super.c | 2 +-
+ fs/romfs/super.c | 23 +-
+ fs/squashfs/lz4_wrapper.c | 12 +-
+ fs/ubifs/file.c | 5 +-
+ fs/userfaultfd.c | 498 ++++++++-
+ fs/xfs/xfs_file.c | 40 +-
+ include/linux/compiler-gcc.h | 1 +
+ include/linux/dax.h | 11 +-
+ include/linux/delay.h | 11 +
+ include/linux/huge_mm.h | 1 +
+ include/linux/hugetlb.h | 12 +-
+ include/linux/iomap.h | 3 +-
+ include/linux/iopoll.h | 2 +-
+ include/linux/kasan.h | 4 +-
+ include/linux/kernel.h | 10 +-
+ include/linux/kexec.h | 2 +
+ include/linux/lz4.h | 589 +++++++++--
+ include/linux/memblock.h | 2 +
+ include/linux/memory.h | 4 +-
+ include/linux/memory_hotplug.h | 10 +-
+ include/linux/mm.h | 69 +-
+ include/linux/mm_inline.h | 7 +
+ include/linux/mmzone.h | 44 +-
+ include/linux/nmi.h | 1 +
+ include/linux/pagemap.h | 13 +-
+ include/linux/pfn_t.h | 6 +
+ include/linux/rbtree_augmented.h | 4 +-
+ include/linux/sem.h | 2 +-
+ include/linux/shmem_fs.h | 11 +
+ include/linux/swap.h | 30 +-
+ include/linux/swap_slots.h | 30 +
+ include/linux/trace_events.h | 4 +
+ include/linux/userfaultfd_k.h | 42 +
+ include/linux/vm_event_item.h | 1 +
+ include/linux/writeback.h | 2 +-
+ include/trace/events/compaction.h | 60 +-
+ include/trace/events/fs_dax.h | 156 +++
+ include/trace/events/mmflags.h | 98 ++
+ include/trace/events/oom.h | 81 ++
+ include/trace/events/vmscan.h | 150 ++-
+ include/trace/events/writeback.h | 2 +-
+ include/trace/trace_events.h | 11 +
+ include/uapi/asm-generic/ioctl.h | 10 +-
+ include/uapi/linux/mqueue.h | 2 +
+ include/uapi/linux/userfaultfd.h | 67 +-
+ ipc/sem.c | 109 +-
+ ipc/shm.c | 6 +-
+ kernel/configs/android-base.config | 2 +
+ kernel/configs/android-recommended.config | 1 +
+ kernel/events/core.c | 6 +-
+ kernel/fork.c | 10 +-
+ kernel/memremap.c | 74 +-
+ kernel/notifier.c | 2 +-
+ kernel/panic.c | 2 +-
+ kernel/relay.c | 4 +-
+ kernel/trace/trace_output.c | 38 +
+ kernel/watchdog.c | 9 +
+ kernel/watchdog_hld.c | 28 +-
+ lib/Kconfig | 6 +-
+ lib/Kconfig.debug | 13 +-
+ lib/Makefile | 3 +
+ lib/atomic64_test.c | 10 +-
+ lib/crc32.c | 824 ---------------
+ lib/crc32test.c | 856 +++++++++++++++
+ lib/debugobjects.c | 57 +-
+ lib/decompress_unlz4.c | 13 +-
+ lib/dma-debug.c | 5 +
+ lib/find_bit.c | 4 +-
+ lib/fonts/Kconfig | 16 +-
+ lib/glob.c | 164 ---
+ lib/globtest.c | 167 +++
+ lib/ioremap.c | 1 -
+ lib/lz4/lz4_compress.c | 1103 ++++++++++++++------
+ lib/lz4/lz4_decompress.c | 694 +++++++-----
+ lib/lz4/lz4defs.h | 320 +++---
+ lib/lz4/lz4hc_compress.c | 855 +++++++++------
+ lib/radix-tree.c | 2 +-
+ lib/rbtree.c | 4 +-
+ lib/show_mem.c | 4 +-
+ lib/sort.c | 41 +-
+ lib/test_kasan.c | 34 +
+ lib/test_sort.c | 43 +
+ mm/Kconfig | 1 +
+ mm/Makefile | 2 +-
+ mm/backing-dev.c | 4 +-
+ mm/bootmem.c | 2 +-
+ mm/compaction.c | 29 +-
+ mm/filemap.c | 31 +-
+ mm/gup.c | 2 +-
+ mm/huge_memory.c | 165 +--
+ mm/hugetlb.c | 164 ++-
+ mm/internal.h | 11 +-
+ mm/kasan/kasan.c | 2 +-
+ mm/kasan/quarantine.c | 1 +
+ mm/ksm.c | 68 +-
+ mm/madvise.c | 10 +-
+ mm/memblock.c | 118 ++-
+ mm/memcontrol.c | 4 +-
+ mm/memory-failure.c | 26 +-
+ mm/memory.c | 64 +-
+ mm/memory_hotplug.c | 130 +--
+ mm/mempolicy.c | 2 +-
+ mm/mmap.c | 35 +-
+ mm/mmzone.c | 2 +-
+ mm/mprotect.c | 44 +-
+ mm/mremap.c | 17 +-
+ mm/nommu.c | 10 +-
+ mm/oom_kill.c | 31 +-
+ mm/page_alloc.c | 684 +++++++-----
+ mm/page_isolation.c | 10 +-
+ mm/page_owner.c | 4 +-
+ mm/shmem.c | 152 ++-
+ mm/slab_common.c | 9 +-
+ mm/slub.c | 24 +-
+ mm/sparse-vmemmap.c | 24 +-
+ mm/sparse.c | 466 ++++++---
+ mm/swap.c | 15 +-
+ mm/swap_slots.c | 342 ++++++
+ mm/swap_state.c | 80 +-
+ mm/swapfile.c | 512 +++++++--
+ mm/userfaultfd.c | 235 ++++-
+ mm/vmalloc.c | 6 +-
+ mm/vmscan.c | 300 +++---
+ mm/vmstat.c | 2 +
+ mm/workingset.c | 2 +-
+ mm/z3fold.c | 10 +-
+ mm/zsmalloc.c | 6 +-
+ mm/zswap.c | 125 ++-
+ scripts/Lindent | 14 +-
+ scripts/checkpatch.pl | 30 +-
+ scripts/checkstack.pl | 3 +
+ scripts/gdb/linux/constants.py.in | 7 +
+ scripts/gdb/linux/proc.py | 73 ++
+ scripts/spelling.txt | 37 +
+ security/selinux/selinuxfs.c | 5 +-
+ sound/core/pcm_native.c | 15 +-
+ sound/usb/usx2y/us122l.c | 5 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 7 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 5 +-
+ tools/lib/find_bit.c | 2 +-
+ tools/testing/selftests/vm/Makefile | 4 +
+ tools/testing/selftests/vm/run_vmtests | 24 +
+ tools/testing/selftests/vm/userfaultfd.c | 484 ++++++++-
+ tools/vm/Makefile | 8 +
+ virt/kvm/kvm_main.c | 4 +-
+ 282 files changed, 9771 insertions(+), 4910 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/sysfs-block-zram
+ delete mode 100644 arch/m32r/include/asm/current.h
+ create mode 100644 include/linux/swap_slots.h
+ create mode 100644 include/trace/events/fs_dax.h
+ create mode 100644 lib/crc32test.c
+ create mode 100644 lib/globtest.c
+ create mode 100644 lib/test_sort.c
+ create mode 100644 mm/swap_slots.c
+$ 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: fs: add i_blocksize()
+Applying: truncate: use i_blocksize()
+Applying: nilfs2: use nilfs_btree_node_size()
+Applying: nilfs2: use i_blocksize()
+Applying: Reimplement IDR and IDA using the radix tree
+Applying: idr: support storing NULL in the IDR
+Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
+Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
+Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
+Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
+Applying: scripts/spelling.txt: add some typo-words
+Applying: lib/vsprintf.c: remove %Z support
+Applying: checkpatch: warn when formats use %Z and suggest %z
+Applying: checkpatchpl-warn-against-using-%z-fix
+Applying: mm: add new mmgrab() helper
+Applying: mm: add new mmget() helper
+Applying: mm: use mmget_not_zero() helper
+Applying: mm: clarify mm_struct.mm_{users,count} documentation
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + daa7531de57a...2361296903e9 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (2361296903e9 mm: clarify mm_struct.mm_{users,count} documentation)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/libata.tmpl | 2 +-
+ Documentation/acpi/method-customizing.txt | 2 +-
+ Documentation/acpi/method-tracing.txt | 2 +-
+ Documentation/admin-guide/ras.rst | 2 +-
+ Documentation/blockdev/mflash.txt | 2 +-
+ Documentation/dev-tools/kcov.rst | 2 +-
+ Documentation/device-mapper/dm-raid.txt | 2 +-
+ Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 2 +-
+ .../bindings/net/marvell-armada-370-neta.txt | 2 +-
+ Documentation/devicetree/bindings/opp/opp.txt | 2 +-
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 +-
+ .../devicetree/bindings/power/pd-samsung.txt | 2 +-
+ .../bindings/regulator/ti-abb-regulator.txt | 2 +-
+ .../devicetree/bindings/soc/rockchip/grf.txt | 4 +-
+ .../devicetree/bindings/sound/rockchip-i2s.txt | 4 +-
+ .../devicetree/bindings/sound/sun4i-codec.txt | 2 +-
+ .../devicetree/bindings/sound/sun4i-i2s.txt | 4 +-
+ Documentation/filesystems/quota.txt | 2 +-
+ Documentation/kselftest.txt | 4 +-
+ Documentation/media/dvb-drivers/ci.rst | 2 +-
+ .../media/uapi/dvb/dvb-frontend-parameters.rst | 4 +-
+ Documentation/memory-hotplug.txt | 4 +-
+ Documentation/networking/cdc_mbim.txt | 4 +-
+ Documentation/scsi/ChangeLog.megaraid_sas | 2 +-
+ Documentation/sound/hd-audio/notes.rst | 2 +-
+ Documentation/vm/userfaultfd.txt | 2 +-
+ arch/Kconfig | 2 +-
+ arch/alpha/kernel/smp.c | 2 +-
+ arch/arc/kernel/smp.c | 4 +-
+ arch/arc/kernel/unwind.c | 4 +-
+ arch/arm/boot/compressed/head.S | 2 +-
+ arch/arm/include/asm/mach/flash.h | 2 +-
+ arch/arm/kernel/smp.c | 2 +-
+ arch/arm/mach-omap2/omap_twl.c | 2 +-
+ arch/arm/mm/cache-v7.S | 2 +-
+ arch/arm/mm/cache-v7m.S | 2 +-
+ arch/arm64/kernel/smp.c | 2 +-
+ arch/arm64/lib/copy_template.S | 2 +-
+ arch/blackfin/mach-common/smp.c | 4 +-
+ arch/cris/arch-v32/drivers/cryptocop.c | 2 +-
+ arch/frv/mm/mmu-context.c | 2 +-
+ arch/hexagon/kernel/smp.c | 2 +-
+ arch/ia64/kernel/setup.c | 2 +-
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +-
+ arch/m32r/kernel/setup.c | 2 +-
+ arch/m68k/ifpsp060/src/isp.S | 2 +-
+ arch/metag/kernel/smp.c | 4 +-
+ arch/mips/kernel/traps.c | 2 +-
+ arch/mn10300/kernel/smp.c | 2 +-
+ arch/openrisc/kernel/entry.S | 6 +-
+ arch/openrisc/kernel/head.S | 6 +-
+ arch/openrisc/kernel/vmlinux.lds.S | 4 +-
+ arch/parisc/kernel/smp.c | 2 +-
+ arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 2 +-
+ arch/powerpc/include/asm/book3s/64/mmu.h | 2 +-
+ arch/powerpc/include/asm/fsl_hcalls.h | 2 +-
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 2 +-
+ arch/powerpc/xmon/ppc-opc.c | 2 +-
+ arch/s390/kernel/processor.c | 2 +-
+ arch/s390/kernel/vtime.c | 2 +-
+ arch/score/kernel/traps.c | 2 +-
+ arch/sh/kernel/irq.c | 2 +-
+ arch/sh/kernel/smp.c | 4 +-
+ arch/sparc/include/asm/switch_to_32.h | 2 +-
+ arch/sparc/kernel/leon_smp.c | 2 +-
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/kernel/sun4d_smp.c | 2 +-
+ arch/sparc/kernel/sun4m_smp.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 2 +-
+ arch/sparc/kernel/traps_64.c | 2 +-
+ arch/sparc/kernel/visemul.c | 2 +-
+ arch/tile/kernel/smpboot.c | 2 +-
+ arch/x86/include/asm/desc_defs.h | 2 +-
+ arch/x86/kernel/cpu/common.c | 4 +-
+ arch/x86/kernel/ftrace.c | 2 +-
+ arch/x86/kvm/mmu.c | 2 +-
+ arch/xtensa/kernel/smp.c | 4 +-
+ block/blk-throttle.c | 2 +-
+ block/bsg.c | 6 +-
+ certs/blacklist.c | 2 +-
+ drivers/acpi/acpica/acmacros.h | 2 +-
+ drivers/acpi/acpica/dbconvert.c | 2 +-
+ drivers/acpi/acpica/nspredef.c | 2 +-
+ drivers/acpi/acpica/nsxfeval.c | 4 +-
+ drivers/acpi/resource.c | 2 +-
+ drivers/acpi/spcr.c | 2 +-
+ drivers/ata/libata-eh.c | 2 +-
+ drivers/atm/ambassador.c | 7 +-
+ drivers/atm/eni.c | 6 +-
+ drivers/atm/firestream.c | 12 +-
+ drivers/atm/horizon.c | 7 +-
+ drivers/atm/iphase.c | 2 +-
+ drivers/atm/iphase.h | 2 +-
+ drivers/atm/lanai.c | 16 +-
+ drivers/block/loop.c | 2 +-
+ drivers/block/paride/pcd.c | 2 +-
+ drivers/block/paride/pd.c | 2 +-
+ drivers/block/paride/pf.c | 2 +-
+ drivers/block/paride/pg.c | 2 +-
+ drivers/block/paride/pt.c | 2 +-
+ drivers/char/pcmcia/cm4000_cs.c | 4 +-
+ drivers/char/pcmcia/cm4040_cs.c | 2 +-
+ drivers/char/sonypi.c | 2 +-
+ drivers/crypto/caam/ctrl.c | 2 +-
+ drivers/crypto/ux500/cryp/cryp.c | 2 +-
+ drivers/devfreq/devfreq.c | 2 +-
+ drivers/extcon/extcon-rt8973a.c | 2 +-
+ drivers/firewire/core-device.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +-
+ drivers/gpu/drm/amd/include/atombios.h | 8 +-
+ .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +-
+ drivers/gpu/drm/drm_probe_helper.c | 4 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 4 +-
+ drivers/gpu/drm/radeon/atombios.h | 6 +-
+ drivers/hid/hid-kye.c | 2 +-
+ drivers/hv/channel.c | 2 +-
+ drivers/hwmon/g762.c | 2 +-
+ drivers/ide/ide-acpi.c | 2 +-
+ drivers/ide/ide-tape.c | 4 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba6120.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba7220.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 2 +-
+ drivers/infiniband/sw/rdmavt/mad.c | 6 +-
+ drivers/input/touchscreen/cyttsp4_core.c | 62 +-
+ drivers/iommu/intel-svm.c | 2 +-
+ drivers/isdn/hardware/eicon/debug.c | 2 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +-
+ drivers/isdn/hisax/st5481_b.c | 2 +-
+ drivers/isdn/mISDN/dsp_core.c | 2 +-
+ drivers/media/dvb-core/dvb_ringbuffer.h | 4 +-
+ drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 12 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 16 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.h | 4 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 2 +-
+ drivers/media/dvb-frontends/helene.c | 2 +-
+ drivers/media/dvb-frontends/or51132.c | 2 +-
+ drivers/media/dvb-frontends/tda10048.c | 2 +-
+ drivers/media/i2c/adv7183_regs.h | 2 +-
+ drivers/media/pci/saa7164/saa7164-fw.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-core.h | 2 +-
+ drivers/media/tuners/xc5000.c | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +-
+ drivers/media/usb/gspca/t613.c | 6 +-
+ drivers/media/usb/tm6000/tm6000-input.c | 2 +-
+ drivers/media/v4l2-core/tuner-core.c | 4 +-
+ drivers/misc/vmw_vmci/vmci_context.c | 2 +-
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +-
+ drivers/mmc/host/mmci_qcom_dml.c | 2 +-
+ drivers/mtd/spi-nor/spi-nor.c | 2 +-
+ drivers/net/arcnet/arcnet.c | 2 +-
+ drivers/net/can/flexcan.c | 2 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +-
+ drivers/net/ethernet/cadence/macb.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 8 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +-
+ drivers/net/ethernet/qlogic/qlge/qlge.h | 4 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +-
+ drivers/net/ethernet/sis/sis900.c | 2 +-
+ drivers/net/gtp.c | 2 +-
+ drivers/net/usb/kalmia.c | 2 +-
+ drivers/net/usb/rndis_host.c | 2 +-
+ drivers/net/usb/sierra_net.c | 2 +-
+ drivers/net/wimax/i2400m/usb-fw.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 4 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 4 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 30 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 16 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 4 +-
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
+ drivers/net/wireless/ti/wl18xx/main.c | 2 +-
+ drivers/net/wireless/ti/wlcore/init.c | 2 +-
+ drivers/nfc/pn533/pn533.c | 2 +-
+ drivers/nvme/host/rdma.c | 2 +-
+ drivers/parport/ieee1284_ops.c | 2 +-
+ drivers/parport/parport_pc.c | 2 +-
+ drivers/pci/quirks.c | 2 +-
+ drivers/pinctrl/bcm/Kconfig | 2 +-
+ drivers/power/avs/smartreflex.c | 6 +-
+ drivers/scsi/aacraid/linit.c | 2 +-
+ drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
+ drivers/scsi/bfa/bfi_ms.h | 2 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
+ drivers/scsi/ipr.c | 2 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 2 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 18 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +-
+ drivers/scsi/osd/osd_initiator.c | 4 +-
+ drivers/scsi/osst.c | 6 +-
+ drivers/scsi/qla2xxx/qla_init.c | 10 +-
+ drivers/scsi/scsi_transport_sas.c | 2 +-
+ drivers/scsi/storvsc_drv.c | 2 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +-
+ drivers/staging/wilc1000/linux_wlan.c | 2 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
+ drivers/tty/n_hdlc.c | 2 +-
+ drivers/tty/serial/ioc4_serial.c | 2 +-
+ drivers/usb/core/devio.c | 2 +-
+ drivers/usb/gadget/legacy/inode.c | 5 +-
+ drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-
+ drivers/usb/gadget/udc/renesas_usb3.c | 4 +-
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ drivers/usb/host/fotg210-hcd.c | 2 +-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/host/xhci.c | 4 +-
+ drivers/usb/misc/adutux.c | 6 +-
+ drivers/usb/misc/legousbtower.c | 2 +-
+ drivers/usb/misc/uss720.c | 8 +-
+ drivers/usb/usbip/usbip_common.c | 2 +-
+ drivers/video/fbdev/aty/radeon_monitor.c | 2 +-
+ drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +-
+ drivers/video/fbdev/metronomefb.c | 2 +-
+ drivers/watchdog/bcm2835_wdt.c | 6 +-
+ fs/afs/dir.c | 14 +-
+ fs/block_dev.c | 2 +-
+ fs/btrfs/file.c | 2 +-
+ fs/buffer.c | 12 +-
+ fs/ceph/addr.c | 2 +-
+ fs/direct-io.c | 2 +-
+ fs/ecryptfs/kthread.c | 2 +-
+ fs/ext4/extents_status.c | 2 +-
+ fs/ext4/inode.c | 6 +-
+ fs/ext4/mballoc.c | 2 +-
+ fs/ext4/move_extent.c | 2 +-
+ fs/inode.c | 2 +-
+ fs/iomap.c | 10 +-
+ fs/jfs/super.c | 4 +-
+ fs/mpage.c | 2 +-
+ fs/ncpfs/sock.c | 4 +-
+ fs/nfs/blocklayout/blocklayout.c | 2 +-
+ fs/nfs/filelayout/filelayout.c | 4 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 4 +-
+ fs/nfs/objlayout/objlayout.c | 2 +-
+ fs/nfsd/blocklayout.c | 6 +-
+ fs/nfsd/nfscache.c | 2 +-
+ fs/nilfs2/alloc.c | 2 +-
+ fs/nilfs2/btnode.c | 2 +-
+ fs/nilfs2/btree.c | 4 +-
+ fs/nilfs2/inode.c | 4 +-
+ fs/nilfs2/mdt.c | 4 +-
+ fs/nilfs2/segment.c | 2 +-
+ fs/ocfs2/aops.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 2 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/orangefs/orangefs-utils.c | 4 +-
+ fs/proc/base.c | 8 +-
+ fs/proc/task_mmu.c | 4 +-
+ fs/proc/task_nommu.c | 2 +-
+ fs/reiserfs/file.c | 2 +-
+ fs/reiserfs/inode.c | 2 +-
+ fs/stat.c | 2 +-
+ fs/udf/inode.c | 2 +-
+ fs/userfaultfd.c | 8 +-
+ fs/xfs/xfs_aops.c | 16 +-
+ fs/xfs/xfs_file.c | 4 +-
+ fs/xfs/xfs_log_recover.c | 2 +-
+ include/dt-bindings/sound/cs42l42.h | 2 +-
+ include/linux/dcache.h | 4 +-
+ include/linux/fs.h | 5 +
+ include/linux/idr.h | 138 ++-
+ include/linux/kconfig.h | 2 +-
+ include/linux/mm_types.h | 23 +-
+ include/linux/mtd/qinfo.h | 2 +-
+ include/linux/radix-tree.h | 53 +-
+ include/linux/regulator/machine.h | 2 +-
+ include/linux/sched.h | 43 +
+ include/linux/spi/flash.h | 2 +-
+ include/media/v4l2-ctrls.h | 4 +-
+ include/net/cfg80211.h | 2 +-
+ include/net/irda/timer.h | 2 +-
+ include/net/mac80211.h | 2 +-
+ include/xen/interface/grant_table.h | 2 +-
+ init/main.c | 3 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/events/core.c | 2 +-
+ kernel/events/uprobes.c | 2 +-
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 4 +-
+ kernel/futex.c | 2 +-
+ kernel/irq/manage.c | 2 +-
+ kernel/relay.c | 2 +-
+ kernel/sched/core.c | 4 +-
+ kernel/torture.c | 2 +-
+ kernel/trace/trace_stack.c | 2 +-
+ lib/idr.c | 1145 ++++----------------
+ lib/radix-tree.c | 347 ++++--
+ lib/vsprintf.c | 8 +-
+ mm/dmapool.c | 2 +-
+ mm/khugepaged.c | 2 +-
+ mm/ksm.c | 2 +-
+ mm/mmu_context.c | 2 +-
+ mm/mmu_notifier.c | 2 +-
+ mm/oom_kill.c | 4 +-
+ mm/page-writeback.c | 2 +-
+ mm/page_alloc.c | 2 +-
+ mm/percpu.c | 2 +-
+ mm/swapfile.c | 12 +-
+ mm/truncate.c | 2 +-
+ net/appletalk/ddp.c | 4 +-
+ net/atm/mpc.c | 2 +-
+ net/bluetooth/hci_sock.c | 6 +-
+ net/bridge/netfilter/ebt_among.c | 2 +-
+ net/ieee802154/socket.c | 4 +-
+ net/ipv4/fib_trie.c | 2 +-
+ net/ipv4/ipmr.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +-
+ net/ipv4/netfilter/nf_log_arp.c | 2 +-
+ net/ipv6/netfilter/nf_log_ipv6.c | 2 +-
+ net/irda/irnet/irnet_ppp.c | 12 +-
+ net/l2tp/l2tp_core.c | 4 +-
+ net/mac80211/mesh.c | 2 +-
+ net/netfilter/ipvs/ip_vs_conn.c | 2 +-
+ net/netfilter/ipvs/ip_vs_dh.c | 4 +-
+ net/netfilter/ipvs/ip_vs_lblc.c | 4 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c | 4 +-
+ net/netfilter/ipvs/ip_vs_sh.c | 4 +-
+ net/netfilter/ipvs/ip_vs_sync.c | 2 +-
+ net/netfilter/nf_conntrack_ftp.c | 2 +-
+ net/netfilter/nfnetlink_cthelper.c | 2 +-
+ net/netfilter/x_tables.c | 2 +-
+ net/sctp/output.c | 2 +-
+ net/sctp/transport.c | 4 +-
+ net/sunrpc/auth_gss/auth_gss.c | 2 +-
+ net/sunrpc/svc.c | 2 +-
+ net/sunrpc/svcsock.c | 4 +-
+ net/sunrpc/xprtsock.c | 8 +-
+ scripts/checkpatch.pl | 29 +-
+ scripts/recordmcount.pl | 2 +-
+ scripts/spelling.txt | 47 +
+ security/selinux/ss/ebitmap.c | 2 +-
+ security/selinux/ss/policydb.c | 2 +-
+ sound/pci/ac97/ac97_patch.c | 2 +-
+ sound/pci/cs46xx/cs46xx_dsp_task_types.h | 2 +-
+ sound/pci/hda/patch_ca0132.c | 2 +-
+ sound/pci/ice1712/wm8766.c | 2 +-
+ sound/pci/ice1712/wm8776.c | 2 +-
+ sound/pci/korg1212/korg1212.c | 4 +-
+ sound/pci/pcxhr/pcxhr_hwdep.c | 2 +-
+ sound/pcmcia/vx/vxp_ops.c | 2 +-
+ sound/ppc/snd_ps3.c | 2 +-
+ sound/soc/amd/acp-pcm-dma.c | 4 +-
+ sound/soc/codecs/wm_hubs.c | 2 +-
+ sound/soc/fsl/fsl_asrc.c | 2 +-
+ sound/soc/qcom/lpass.h | 2 +-
+ sound/soc/soc-core.c | 2 +-
+ sound/soc/soc-topology.c | 4 +-
+ tools/include/linux/spinlock.h | 4 +
+ tools/lguest/lguest.c | 2 +-
+ tools/lib/bpf/Makefile | 2 +-
+ tools/lib/bpf/bpf.c | 2 +-
+ tools/lib/traceevent/Makefile | 2 +-
+ tools/lib/traceevent/event-parse.h | 2 +-
+ tools/perf/Documentation/tips.txt | 2 +-
+ tools/perf/util/dso.c | 2 +-
+ tools/perf/util/probe-finder.c | 4 +-
+ tools/perf/util/sort.h | 2 +-
+ tools/testing/radix-tree/.gitignore | 1 +
+ tools/testing/radix-tree/Makefile | 10 +-
+ tools/testing/radix-tree/idr-test.c | 242 +++++
+ tools/testing/radix-tree/linux/export.h | 1 +
+ tools/testing/radix-tree/linux/gfp.h | 8 +-
+ tools/testing/radix-tree/linux/idr.h | 1 +
+ tools/testing/radix-tree/linux/kernel.h | 2 +
+ tools/testing/radix-tree/main.c | 6 +
+ tools/testing/radix-tree/test.h | 2 +
+ virt/kvm/async_pf.c | 2 +-
+ virt/kvm/kvm_main.c | 2 +-
+ 387 files changed, 1608 insertions(+), 1727 deletions(-)
+ create mode 100644 tools/include/linux/spinlock.h
+ create mode 100644 tools/testing/radix-tree/idr-test.c
+ create mode 100644 tools/testing/radix-tree/linux/idr.h
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..339069419c85
--- /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 4.10-rc2
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..299f81191e52
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20170125