summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-03-03 13:13:09 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-03-03 13:13:09 +1100
commitc0b7b2b33bd17f7155956d0338ce92615da686c9 (patch)
tree08c42f2a27f818b3ece1a1f877f5394ada2e3046
parenta7542abb121b8385e149abcc8661fea8cac27611 (diff)
Add linux-next specific files for 20170303next-20170303
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s255
-rw-r--r--Next/Trees257
-rw-r--r--Next/merge.log2040
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 2557 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..9813fa41b8a3
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,255 @@
+Name SHA1
+---- ----
+origin 54d7989f476ca57fc3c5cc71524c480ccb74c481
+fixes c470abd4fde40ea6a0846a2beab642a578c0b8cd
+kbuild-current c7858bf16c0b2cc62f475f31e6df28c3a68da1d6
+arc-current 8ba605b607b7278548c1092b2ac36381627f0839
+arm-current 9e3440481845b2ec22508f60837ee2cab2b6054f
+m68k-current 3dfe33020ca8a5e4f72993cc792a4838c464c8b3
+metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218
+powerpc-fixes c470abd4fde40ea6a0846a2beab642a578c0b8cd
+sparc f8e6859ea9d06ae1565b21278c4e10fbce5f1eab
+fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net a2d35d0b9412b201fbc236c4e6ab62c4517b2515
+ipsec e3dc847a5f85b43ee2bfc8eae407a7e383483228
+netfilter 29e09229d9f26129a39462fae0ddabc4d9533989
+ipvs 045169816b31b10faed984b01c390db1b32ee4c1
+wireless-drivers 52f5631a4c056ad01682393be56d2be237e81610
+mac80211 eb1e011a14748a1d9df9a7d7df9a5711721a1bdb
+sound-current f3ac9f737603da80c2da3e84b89e74429836bb6d
+pci-current 2a7275a3d867b228216886aae35e1f64291180b1
+driver-core.current bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+tty.current bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+usb.current bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+usb-gadget-fixes efe357f4633a12ca89bdf9bbdd8aaf5a7a0cc3c0
+usb-serial-fixes d07830db1bdb254e4b50d366010b219286b8c937
+usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9
+phy 7ce7d89f48834cefece7804d38fc5d85382edf77
+staging.current a45e47f4b342884dcf9e40a530033f64c379ffc7
+char-misc.current bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+input-current 6e11617fcff3688f70650a3e40addb0043dda137
+crypto-current 5839f555fa576be57371686265206398d9ea1480
+ide 96297aee8bce237961b0e1b99e22913c5726af12
+vfio-fixes 930a42ded3fede7ca3acafc9153f4f2d0f56a92c
+kselftest-fixes 7738789fba09108a28a5fb4739595d9a0a2f85fe
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29
+v4l-dvb-fixes 9eeb0ed0f30938f31a3d9135a88b9502192c18dd
+drm-intel-fixes c470abd4fde40ea6a0846a2beab642a578c0b8cd
+drm-misc-fixes 3bc8b11dc78e95d0691effa95cf807e013e6449f
+kbuild fde42bfcd232fb1a46d844dbf486cb67cb910004
+asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c
+arc d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
+arm 17a870bea3b86f464706b6ba2736210cb8602693
+arm-perf 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+arm-soc ca2dea434d10e3a676482fdf6df17d20cdb3e907
+amlogic 2452b94d227c711dea600c851e14977d50e2632c
+aspeed ab15e12960f12f8f9236c2d66c52fac8505f430c
+at91 f5fde64706f0b3303ca11063b98d447f08f5e1dc
+bcm2835 8d6e1b09237b5773670b9dc43101a08fe0b6c07c
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs 57aba12f97c262eaa8de1b2c8b580e514aec9801
+keystone 9e07c85a01ec662fb1c2f0386a3bd11c17222a07
+mvebu e8ba6e4b2558a677599157e01f995eb807b4fbcb
+omap 2b6a9eabd44e5db840232f52cb9fdf9aedbb3f1b
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+qcom a844f941617c929b29c583f6abf1783d13f37de3
+renesas 59fd3e06b3d7e1b53b507605cdc399114cf9acb4
+rockchip 0aab64671debcff285ecdf23ef4b316ad2a185c1
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 1001354ca34179f3db924eb66672442a173147dc
+samsung-krzk 9689628ec120c8c6b398d748531c058f26406787
+tegra 10e459de8497ea01e0dcdb755cf40ad207aae40e
+arm64 ffe7afd1713558d73483834c2e2d03a1e39a4062
+clk f59de563358eb9351b7f8f0ba2d3be2ebb70b93d
+blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33
+c6x ca3060d39ae7a0964f8c123a4833029981e86476
+cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 3dfe33020ca8a5e4f72993cc792a4838c464c8b3
+m68knommu 73ec49463f8925363aa8482ed19030beeed75323
+metag f5d163aad31e4ec30f7258e655503824a2b03d45
+microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3
+mips 5bb089f4584717920ebc9d4286cb4e958f90e524
+nios2 744606c76c4a3a73eb34d21f265013426426c4b5
+openrisc a4d4426635804379d618dd28e29f574a2bc11184
+parisc-hd d85daeae23d437d55265609b945df25e117b531e
+powerpc 9f3768e02335ddd6ebe1d85d5cb3a68ee6264004
+fsl 75b824727680a9d12c34d78096a5ac642e53f5d0
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 d03bd0454b101adb94d0b5a9cc11396182943cb4
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+sh e61c10e468a42512f5fad74c00b62af5cc19f65f
+tile 14e73e78ee982710292248536aa84cba41e974f4
+uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725
+unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa ec59c4ad070d82850f5e429b267abfb91a46ac27
+fscrypt 6f69f0ed6136c302976f8e8f859b73d47f0c0c5c
+befs 7ce7d89f48834cefece7804d38fc5d85382edf77
+btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave 439a0b8730e25fe7f3b1d16030dd0699be506665
+ceph 54ea0046b6fe36ec18e82d282a29a18da6cdea0f
+cifs 50952b70e56f9886de7904cf3505e14d0a12a447
+configfs e16769d4bca67218531505ad1a8365d227fedcf9
+ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3 6c71100db53e4a0bc0cefce7d9180f5ec10f0f27
+ext4 cab7076a185e1e27f6879325e4da762424c3f1c9
+f2fs 4977ab6e92e267afe9d8f78438c3db330ca8434c
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 9a87ad3da905239413477ac0698734afc5cc30bd
+gfs2 5bcbe22ca47da04cda3a858cef67f55b550c1d13
+jfs 684666e51585f3b136a3f505f8173d7580bc52cd
+nfs c470abd4fde40ea6a0846a2beab642a578c0b8cd
+nfsd ff7d11797e728efbd1da8cfaa6f7c37585784ca5
+orangefs e98bdb3059cbf2b1cd4261e126b08429f64466c3
+overlayfs 51f8f3c4e22535933ef9aecc00e9a6069e051b57
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 1cb51a15b576ee325d527726afff40947218fd5e
+xfs 8d242e932fb7660c24b3a534197e69c241067e0d
+file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+vfs 9e9c5ba8bd70714708bc9ae9b557eb8141f1de74
+vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58
+printk d9c23523ed98a3acaa0bfd8fef143595d6aa631d
+pci c4d052ce970ea98e9e1cc72461ba3b7a25397657
+pstore fc1b326efd276e7d121f5c1ced2884ae52a85814
+hid b03fa3ca9c90d67bcfa93ca9e6b8857b30e7d27b
+i2c ce3496c8d5ff356db28a6c83ef7cde4582d8227c
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+hwmon-staging 2f1736ff0664937636f8c0a4994c4a5a23da2090
+jc_docs bd8562626c8e170691d6457fe4e8dfb45607a48d
+v4l-dvb e6b377dbbb944d5e3ceef4e5d429fc5c841e3692
+v4l-dvb-next 432ac2d4acefbbc2e14c672718a70fd13ad8387c
+fbdev 42f82367df2cb2b71ceead6164e4415851c51fa4
+pm b485f1586a7c580fcc59bae0e75818d9bf1edd03
+idle 306899f94804aece6d8fa8b4223ede3b48dbb59c
+thermal 6fefe19f583625ca4ea3ecc9128baa51c31c60a4
+thermal-soc 4f47aff5201c018408f197d2ff43283a451f0547
+ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm c0ae148576778de958a0d5ff9a5ba00044e371a8
+swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a
+net-next 2d6be4abf514fc26c83d239c7f31da1f95e4a31d
+ipsec-next 7785bba299a8dc8fe8390a0183dad3cafb3f1d80
+netfilter-next f1ef09fde17f9b77ca1435a5b53a28b203afb81c
+ipvs-next 8d8e20e2d7bba8c50e64e0eca1cb83956f468e49
+wireless-drivers-next 4e33e34625103593a71d2bae471ce49cef62ef06
+bluetooth 8f91566f99fab8f7a0d2728a1e3defb13675837a
+mac80211-next 3bacb8ca198a85380ad76a6373e6cf53a8f74313
+rdma 9294000d6d895ad609f3cc4aff98c9c6175b466f
+mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2
+l2-mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2
+nand a4077ce5871304f8a78f80b74b18b6052a410f1a
+spi-nor 7fa2c7038cc0ec16ae5d8eee347ea136de0f4b65
+crypto 12cb3a1c4184f891d965d1f39f8cfcc9ef617647
+drm a44ddbcbbd72ba8569df1ecbb4b1372506454dff
+drm-panel eaeebffa90f35e0f92658249b0e5c49ddfa89915
+drm-intel 998d75730b40afc218c059d811869abe9676b305
+drm-tegra 7b1d4185050d204d638166e62b85c26c81326eff
+drm-misc a44ddbcbbd72ba8569df1ecbb4b1372506454dff
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm 57edb4bc581dc1ef4f7505bcbb148db405b4f84a
+hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec
+mali-dp 83d642ee6dbec57ef1639a3de1e383fbfc5c44ec
+sunxi d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
+kspp 4b020bbc236ff9222ef7cb1d09beac67e3991a70
+kconfig 5bcba792bb304e8341217d759ec486969a3b4258
+regmap bbbed19517040c8940e4fa49d399ccd049b0551b
+sound f3ac9f737603da80c2da3e84b89e74429836bb6d
+sound-asoc 141dee78c40ac2c43aa4ff306688d625e1c731de
+modules 0d4ec7849f5a197d46c062a49f47ed326dd0388c
+input 4f95963558d4ed0019938b5410a3402700a1bc4c
+block 3695539290d72998cdd809df872c881666f8efbf
+lightnvm e57ef816cf77f423035bd7c67016ec226db50d1e
+device-mapper 2664f3c94abc7181171b7c05b2aaa76ea7d9d613
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc 86292b33d4b79ee03e2f43ea0381ef85f077c760
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md 874f93fcf50146fd1a71e73fd9e716d958d28ff2
+mfd e93c10211d03c35271896b03a40d3eca4a674770
+backlight 80e5d455339ad15d0a5995c8b72d267ce1f70841
+battery 744cc304a18f1c9de4f3215fbe93fe878f934179
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator 877fe823a0ad9cc89e08ef00112c231e6ebed739
+security 61841be6358c03e864ad4c386c9a102edbba9cb8
+integrity 20f482ab9e0f800d1e01ce748ebd382d085abe56
+keys ed51e44e914c634bfd8435037474ebb0b47db956
+selinux b2a607a8f39c47d8882f41d9b17a5bade04dc408
+tpmdd cefcadb300efd2ca40307f8890a1acdfacbe5ab4
+watchdog 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869
+iommu 8d2932dd0634ebeb0a42df896976772bdb569bfe
+dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio d9d84780f17cd9e25ddde10eb40357b96b7d6874
+trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff
+audit fe8e52b9b9100c486051aaf5208dbf4072bb87b1
+devicetree 4e29ccdb240ec833f172a34fcf405e077b51066b
+mailbox db4d22c07e3e652eeec82abcc1399e6305edd838
+spi 827498a198046ff02e2b20b71b00a7aa689df343
+tip b1460aed6ca3315ac3d9301addf937a27a66c9b8
+clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3
+edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755
+edac-amd 75bf2f6478cab9b0c1d7f5f674a765d1e2ad530e
+irqchip 88e20c74ee020f9e0c99dfce0dd9aa61c3f0cca0
+ftrace 7ce2040796fd5e01065c498cc28293d051126155
+rcu 31945aa9f14085c81cb3257e51bb210698b78626
+kvm 16ce771b93ab569490fd27415694132a7ade0d79
+kvm-arm 7b6b46311a8562fb3a9e035ed6ffab6d49c28886
+kvm-mips 12ed1faece3f141c2604b5b3a8377ba71d23ec9d
+kvm-ppc bcd3bb63dbc87a3bbb21e95a09cd26bb6479c332
+kvms390 b2d8fdd12a405a98a903e2ad8e1b97361d6e2f81
+xen-tip 4610d240d691768203fdd210a5da0a2e02eddb76
+percpu 966d2b04e070bc040319aaebfec09e0144dc3341
+workqueues a45463cbf3f9dcdae683033c256f50bded513d6a
+drivers-x86 af050abb5c2e5e7d3e1368475d63cbac597dc34f
+chrome-platform 31b764171cb545cc1f750c573eef713329936660
+hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
+leds fb3d769173d26268d7bf068094a599bb28b2ac63
+ipmi eb994594bc22220976f367c03ffa141580aa45e4
+driver-core bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+usb bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+usb-gadget e42a5dbb8a3d14f5a35bffa3bf7dcb87883f767a
+usb-serial beabdc3cd3e3ef9a56b62ee0e0b0663edacd5264
+usb-chipidea-next 753dfd23612dfb4b585b7814a94237987fdf3359
+phy-next 0b10f64dbe60cb1b2056f647c052b4278627fe24
+tty bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+char-misc bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+extcon d8c04aa4518bf97c81ddd4b3ecd47c0b63307053
+staging bc49a7831b1137ce1c2dda1c57e3631655f5d2ae
+slave-dma 235840692925335d7ae64fbb18435cd5bbdca990
+cgroup f83f3c515654474e19c7fc86e3b06564bb5cb4d4
+scsi 42a70abddd90374518057e989f5b7289b7b535d8
+scsi-mkp 8893cf6cb1cf56334c05120e23092dbfc9423ebb
+target-updates c87ba9c49c1fa86261448b09c5f1b2223bf7efd9
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+target-bva 762b6f00a995863afa274d6b5ffa3880dac1714b
+libata 428d57c1683acf19d27db7b426292983c64d99ed
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost 80363894995b24fd79af2718f917f23595c72bfd
+rpmsg 349709ba5bea715c03ebf7fe7ac84b7baacab0b5
+gpio 3498d8694d41af701c51289e7caf3ffefc7bfb6b
+pinctrl baafacab092e282c69f57a90dc2c4ed25b083e22
+dma-mapping 1001354ca34179f3db924eb66672442a173147dc
+pwm 38b0a526ec33314ee1d9926e3a347078f63eac8e
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns ace0c791e6c3cf5ef37cad2df69f0d90ccc40ffb
+ktest 5739438b725c09938bb6af9e4477c4283b8326cf
+random db61ffe3a71c697aaa91c42c862a5f7557a0e562
+aio b562e44f507e863c6792946e4e1b1449fbbac85d
+kselftest e53aff45c490ea04aa5d9e3cffa65b6b54397455
+y2038 69973b830859bc6529a7a0468ba0d80ee5117826
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d
+livepatching 372e2db7210df7c45ead46429aeb1443ba148060
+coresight dc83e0549ea1c093c2971d0117224eccd87c95d5
+rtc d4f6c6f15a1f57e10374cf1a457f4eab5933bd0c
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm bfb34527a32a1a576d9bfb7026d3ab0369a6cd60
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+idr 2c1c878ea8d8eb2d26a0fc11c9bde5e323c2ae34
+akpm-current c2118ec0a377b26bf2ab1664811961e1be4c1963
+akpm 34733d139bccdf288bce976a33665aa429dba620
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..3924ab137658
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,257 @@
+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
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#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/media_tree.git#master
+v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master
+fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+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
+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
+spi-nor git git://github.com/spi-nor/linux.git#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
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+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
+idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11
+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..f51ab248a3b5
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,2040 @@
+$ date -R
+Fri, 03 Mar 2017 09:19:16 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 6053dc981449 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
+Merging origin/master (54d7989f476c Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge origin/master
+Updating 6053dc981449..54d7989f476c
+Fast-forward
+ Documentation/filesystems/f2fs.txt | 7 +-
+ Documentation/security/keys.txt | 17 +-
+ arch/x86/kernel/vmlinux.lds.S | 2 -
+ block/Kconfig | 5 +
+ block/Makefile | 1 +
+ block/blk-mq-virtio.c | 54 +++
+ drivers/block/virtio_blk.c | 14 +-
+ drivers/char/virtio_console.c | 14 +-
+ drivers/crypto/virtio/virtio_crypto_core.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +-
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/misc/mic/vop/vop_main.c | 2 +-
+ drivers/net/caif/caif_virtio.c | 3 +-
+ drivers/net/virtio_net.c | 2 +-
+ drivers/remoteproc/remoteproc_virtio.c | 3 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
+ drivers/s390/virtio/kvm_virtio.c | 3 +-
+ drivers/s390/virtio/virtio_ccw.c | 3 +-
+ drivers/scsi/virtio_scsi.c | 127 +-----
+ drivers/vhost/vhost.c | 173 ++++++--
+ drivers/vhost/vhost.h | 8 +
+ drivers/virtio/virtio_balloon.c | 3 +-
+ drivers/virtio/virtio_input.c | 3 +-
+ drivers/virtio/virtio_mmio.c | 5 +-
+ drivers/virtio/virtio_pci_common.c | 376 +++++++----------
+ drivers/virtio/virtio_pci_common.h | 50 +--
+ drivers/virtio/virtio_pci_legacy.c | 9 +-
+ drivers/virtio/virtio_pci_modern.c | 17 +-
+ drivers/watchdog/Kconfig | 15 +-
+ drivers/watchdog/kempld_wdt.c | 9 +-
+ drivers/watchdog/softdog.c | 44 +-
+ fs/cifs/connect.c | 2 +-
+ fs/crypto/keyinfo.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 2 +-
+ fs/f2fs/checkpoint.c | 70 +++-
+ fs/f2fs/data.c | 191 ++++++---
+ fs/f2fs/debug.c | 31 +-
+ fs/f2fs/dir.c | 38 +-
+ fs/f2fs/extent_cache.c | 52 ++-
+ fs/f2fs/f2fs.h | 644 +++++++++++++++++------------
+ fs/f2fs/file.c | 36 +-
+ fs/f2fs/gc.c | 79 ++--
+ fs/f2fs/inode.c | 4 +-
+ fs/f2fs/namei.c | 18 +-
+ fs/f2fs/node.c | 560 +++++++++++++++++++------
+ fs/f2fs/node.h | 33 +-
+ fs/f2fs/recovery.c | 17 +-
+ fs/f2fs/segment.c | 501 ++++++++++++++++------
+ fs/f2fs/segment.h | 40 +-
+ fs/f2fs/super.c | 138 +++++--
+ fs/f2fs/xattr.c | 151 ++++++-
+ fs/f2fs/xattr.h | 7 +-
+ fs/fscache/object-list.c | 2 +-
+ fs/nfs/cache_lib.c | 3 +-
+ fs/nfs/callback_xdr.c | 38 +-
+ fs/nfs/dir.c | 36 +-
+ fs/nfs/filelayout/filelayout.c | 6 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 60 +--
+ fs/nfs/nfs42proc.c | 69 ++--
+ fs/nfs/nfs4_fs.h | 15 +-
+ fs/nfs/nfs4idmap.c | 2 +-
+ fs/nfs/nfs4proc.c | 390 ++++++-----------
+ fs/nfs/nfs4renewd.c | 2 +-
+ fs/nfs/nfs4session.h | 7 +
+ fs/nfs/nfs4state.c | 2 +-
+ fs/nfs/nfs4trace.h | 64 +--
+ fs/nfs/nfs4xdr.c | 187 ++++-----
+ fs/nfs/super.c | 21 +-
+ fs/nfs/write.c | 6 +-
+ include/keys/user-type.h | 9 +-
+ include/linux/blk-mq-virtio.h | 10 +
+ include/linux/compiler-gcc.h | 4 +-
+ include/linux/cpuhotplug.h | 1 -
+ include/linux/f2fs_fs.h | 8 +
+ include/linux/frame.h | 2 +-
+ include/linux/key.h | 5 +-
+ include/linux/lockd/lockd.h | 3 +-
+ include/linux/log2.h | 13 +-
+ include/linux/sunrpc/auth.h | 6 +-
+ include/linux/sunrpc/cache.h | 15 +-
+ include/linux/sunrpc/clnt.h | 6 +-
+ include/linux/sunrpc/debug.h | 58 ++-
+ include/linux/sunrpc/xdr.h | 179 ++++++++
+ include/linux/sunrpc/xprt.h | 4 +
+ include/linux/sunrpc/xprtsock.h | 3 +
+ include/linux/virtio_config.h | 12 +-
+ include/trace/events/f2fs.h | 151 ++++---
+ include/uapi/linux/Kbuild | 1 +
+ include/{ => uapi}/linux/virtio_mmio.h | 0
+ include/uapi/linux/virtio_pci.h | 2 +-
+ lib/digsig.c | 2 +-
+ net/dns_resolver/dns_query.c | 4 +-
+ net/sunrpc/auth.c | 15 +-
+ net/sunrpc/auth_null.c | 3 -
+ net/sunrpc/auth_unix.c | 18 +-
+ net/sunrpc/cache.c | 68 +--
+ net/sunrpc/clnt.c | 51 +--
+ net/sunrpc/debugfs.c | 35 +-
+ net/sunrpc/svcauth_unix.c | 4 +-
+ net/sunrpc/xdr.c | 34 ++
+ net/sunrpc/xprt.c | 2 -
+ net/sunrpc/xprtrdma/fmr_ops.c | 5 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 11 +-
+ net/sunrpc/xprtrdma/rpc_rdma.c | 82 ++--
+ net/sunrpc/xprtrdma/transport.c | 6 +-
+ net/sunrpc/xprtrdma/verbs.c | 96 ++---
+ net/sunrpc/xprtrdma/xprt_rdma.h | 30 +-
+ net/sunrpc/xprtsock.c | 94 ++++-
+ net/vmw_vsock/virtio_transport.c | 3 +-
+ scripts/mod/modpost.c | 1 +
+ scripts/module-common.lds | 5 +-
+ security/keys/dh.c | 2 +-
+ security/keys/encrypted-keys/encrypted.c | 4 +-
+ security/keys/trusted.c | 4 +-
+ security/keys/user_defined.c | 6 +-
+ security/selinux/hooks.c | 7 +-
+ security/selinux/include/security.h | 2 +
+ security/selinux/selinuxfs.c | 3 +-
+ security/selinux/ss/services.c | 4 +
+ tools/include/linux/log2.h | 13 +-
+ tools/objtool/builtin-check.c | 6 +-
+ 121 files changed, 3437 insertions(+), 2178 deletions(-)
+ create mode 100644 block/blk-mq-virtio.c
+ create mode 100644 include/linux/blk-mq-virtio.h
+ rename include/{ => uapi}/linux/virtio_mmio.h (100%)
+Merging fixes/master (c470abd4fde4 Linux 4.10)
+$ 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 (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (9e3440481845 ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user())
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
+$ 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 (c470abd4fde4 Linux 4.10)
+$ git merge powerpc-fixes/fixes
+Already up-to-date.
+Merging sparc/master (f8e6859ea9d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
+$ git merge sparc/master
+Already up-to-date.
+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 (a2d35d0b9412 Merge branch 'amd-xgbe-fixes')
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 24 +++++
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 ++
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 30 ++++--
+ drivers/net/geneve.c | 2 +
+ drivers/net/usb/asix_devices.c | 2 +-
+ drivers/net/vxlan.c | 8 +-
+ drivers/net/wireless/mac80211_hwsim.c | 28 ++++--
+ include/linux/mlx4/driver.h | 2 +-
+ include/linux/netdevice.h | 29 ++----
+ include/trace/events/rxrpc.h | 2 +
+ kernel/bpf/verifier.c | 2 +-
+ net/bridge/br_forward.c | 3 +-
+ net/bridge/br_vlan.c | 2 +-
+ net/core/dev.c | 111 +++++++++++++++++++--
+ net/dccp/input.c | 10 +-
+ net/ipv4/fib_frontend.c | 1 +
+ net/ipv4/tcp_input.c | 10 +-
+ net/ipv6/addrconf.c | 22 ++--
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 1 +
+ net/ipv6/route.c | 15 ++-
+ net/mac80211/agg-rx.c | 3 +-
+ net/mac80211/pm.c | 1 +
+ net/mac80211/rx.c | 31 ++++--
+ net/mac80211/sta_info.c | 4 +-
+ net/mac80211/sta_info.h | 6 +-
+ net/mac80211/status.c | 3 +-
+ net/openvswitch/conntrack.c | 1 -
+ net/packet/af_packet.c | 8 +-
+ net/rds/ib.c | 4 +-
+ net/rds/ib_mr.h | 2 -
+ net/rxrpc/af_rxrpc.c | 12 ++-
+ net/rxrpc/ar-internal.h | 1 +
+ net/rxrpc/call_accept.c | 48 +++++++++
+ net/rxrpc/call_object.c | 18 +++-
+ net/rxrpc/input.c | 1 +
+ net/rxrpc/recvmsg.c | 39 ++++++--
+ net/rxrpc/sendmsg.c | 57 +++++++++--
+ net/sctp/input.c | 3 +
+ 41 files changed, 446 insertions(+), 117 deletions(-)
+Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.)
+$ git merge ipsec/master
+Auto-merging net/xfrm/xfrm_policy.c
+Auto-merging net/ipv6/ip6_vti.c
+Merge made by the 'recursive' strategy.
+ net/ipv6/ip6_vti.c | 8 ++++++--
+ net/xfrm/xfrm_policy.c | 19 +++++++++----------
+ 2 files changed, 15 insertions(+), 12 deletions(-)
+Merging netfilter/master (29e09229d9f2 netfilter: use skb_to_full_sk in ip_route_me_harder)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ net/ipv4/netfilter.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 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 (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (eb1e011a1474 average: change to declare precision, not factor)
+$ git merge mac80211/master
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/net/virtio_net.c | 2 +-
+ drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +-
+ include/linux/average.h | 61 +++++++++++++++++++----------
+ net/batman-adv/types.h | 2 +-
+ net/mac80211/ieee80211_i.h | 2 +-
+ net/mac80211/sta_info.h | 2 +-
+ 7 files changed, 47 insertions(+), 26 deletions(-)
+Merging sound-current/for-linus (f3ac9f737603 ALSA: seq: Fix link corruption by event error handling)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (2a7275a3d867 PCI: altera: Fix TLP_CFG_DW0 for TLP write)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/pci/dwc/pci-exynos.c | 1 +
+ drivers/pci/dwc/pci-imx6.c | 1 +
+ drivers/pci/dwc/pci-keystone.c | 2 ++
+ drivers/pci/dwc/pci-layerscape.c | 2 ++
+ drivers/pci/dwc/pcie-armada8k.c | 2 ++
+ drivers/pci/dwc/pcie-artpec6.c | 2 ++
+ drivers/pci/dwc/pcie-designware-plat.c | 2 ++
+ drivers/pci/dwc/pcie-hisi.c | 2 ++
+ drivers/pci/dwc/pcie-qcom.c | 2 ++
+ drivers/pci/dwc/pcie-spear13xx.c | 2 ++
+ drivers/pci/host/pcie-altera.c | 10 +++++++---
+ 11 files changed, 25 insertions(+), 3 deletions(-)
+Merging driver-core.current/driver-core-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ 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 (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+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 (a45e47f4b342 staging: fsl-mc: fix warning in DT ranges parser)
+$ git merge staging.current/staging-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 -
+ drivers/iio/adc/rcar-gyroadc.c | 4 +++-
+ drivers/iio/adc/xilinx-xadc-core.c | 6 +++---
+ drivers/iio/counter/104-quad-8.c | 2 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 22 +++++++++-------------
+ drivers/staging/lustre/lnet/selftest/rpc.c | 2 +-
+ .../staging/media/platform/bcm2835/mmal-vchiq.c | 7 +++++--
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 8 +++++++-
+ 8 files changed, 29 insertions(+), 23 deletions(-)
+Merging char-misc.current/char-misc-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (6e11617fcff3 Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (5839f555fa57 crypto: vmx - Use skcipher for xts fallback)
+$ git merge crypto-current/master
+Auto-merging drivers/crypto/Kconfig
+Auto-merging crypto/testmgr.h
+Merge made by the 'recursive' strategy.
+ arch/arm/crypto/Makefile | 12 ++++++-
+ arch/arm/crypto/crc32-ce-core.S | 2 +-
+ crypto/ccm.c | 5 +--
+ crypto/testmgr.h | 2 +-
+ crypto/xts.c | 14 +++++----
+ drivers/crypto/Kconfig | 3 ++
+ drivers/crypto/cavium/cpt/cptvf_main.c | 5 ++-
+ drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 4 +--
+ drivers/crypto/vmx/aes_cbc.c | 47 ++++++++++++++--------------
+ drivers/crypto/vmx/aes_xts.c | 32 +++++++++----------
+ include/crypto/algapi.h | 7 ++++-
+ 11 files changed, 79 insertions(+), 54 deletions(-)
+Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
+$ git merge ide/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
+$ 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 v4l-dvb-fixes/fixes (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG)
+$ git merge v4l-dvb-fixes/fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (c470abd4fde4 Linux 4.10)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging drm-misc-fixes/for-linux-next-fixes (3bc8b11dc78e drm/edid: Add EDID_QUIRK_FORCE_8BPC quirk for Rotel RSX-1058)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Auto-merging drivers/gpu/drm/drm_edid.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_edid.c | 3 +++
+ 1 file changed, 3 insertions(+)
+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 978bd5f6936e] 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 (d5adbfcd5f7b Linux 4.10-rc7)
+$ git merge arc/for-next
+Already up-to-date.
+Merging arm/for-next (17a870bea3b8 Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus)
+$ git merge arm/for-next
+Already up-to-date.
+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 (ca2dea434d10 Merge tag 'juno-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/late)
+$ git merge arm-soc/for-next
+Removing arch/arm/mach-ux500/setup.h
+Auto-merging arch/arm/mach-ux500/platsmp.c
+Removing arch/arm/mach-ux500/hotplug.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.txt | 2 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/configs/moxart_defconfig | 12 +-
+ arch/arm/mach-ux500/Makefile | 3 -
+ arch/arm/mach-ux500/cpu-db8500.c | 2 -
+ arch/arm/mach-ux500/hotplug.c | 37 ---
+ arch/arm/mach-ux500/platsmp.c | 9 +-
+ arch/arm/mach-ux500/setup.h | 16 --
+ arch/arm64/boot/dts/amlogic/Makefile | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 68 +++++
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 50 ++++
+ .../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 | 128 +++++----
+ ...ox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} | 0
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 78 ++++++
+ ...{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 | 14 +
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 13 +-
+ .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 12 -
+ arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++
+ arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++
+ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++-
+ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++----------
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++
+ drivers/clk/meson/gxbb.c | 48 ++++
+ drivers/clk/meson/gxbb.h | 15 +-
+ include/dt-bindings/clock/gxbb-clkc.h | 6 +
+ include/dt-bindings/pinctrl/samsung.h | 8 +
+ 31 files changed, 852 insertions(+), 302 deletions(-)
+ delete mode 100644 arch/arm/mach-ux500/hotplug.c
+ delete mode 100644 arch/arm/mach-ux500/setup.h
+ 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 amlogic/for-next (2452b94d227c Merge v4.11/dt64)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+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 (f5fde64706f0 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
+$ git merge at91/at91-next
+Auto-merging drivers/soc/Makefile
+Auto-merging drivers/soc/Kconfig
+Removing arch/arm/mach-at91/soc.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/atmel-at91.txt | 3 +-
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 +
+ arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 5 +
+ arch/arm/mach-at91/Makefile | 1 -
+ arch/arm/mach-at91/at91rm9200.c | 15 +-
+ arch/arm/mach-at91/at91sam9.c | 46 +---
+ arch/arm/mach-at91/sama5.c | 52 +----
+ arch/arm/mach-at91/soc.c | 142 -------------
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 1 +
+ drivers/soc/atmel/Kconfig | 6 +
+ drivers/soc/atmel/Makefile | 1 +
+ drivers/soc/atmel/soc.c | 231 +++++++++++++++++++++
+ {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h | 0
+ 16 files changed, 252 insertions(+), 256 deletions(-)
+ delete mode 100644 arch/arm/mach-at91/soc.c
+ create mode 100644 drivers/soc/atmel/Kconfig
+ create mode 100644 drivers/soc/atmel/Makefile
+ create mode 100644 drivers/soc/atmel/soc.c
+ rename {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h (100%)
+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 (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
+$ git merge imx-mxs/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (e8ba6e4b2558 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging omap/for-next (2b6a9eabd44e Merge branch 'omap-for-v4.10/fixes' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap2/omap-headsmp.S | 3 ++-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 20 ++++++++++++++++++++
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+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 (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
+$ git merge qcom/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
+$ git merge renesas/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
+$ git merge rockchip/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
+$ git merge samsung-krzk/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging tegra/for-next (10e459de8497 Merge branch for-4.11/i2c into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging clk/clk-next (f59de563358e clk: renesas: mstp: ensure register writes complete)
+$ git merge clk/clk-next
+Already up-to-date.
+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 522c0ebdac33] 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 (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning)
+$ git merge m68knommu/for-next
+Already up-to-date.
+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 (5bb089f45847 MIPS: ralink: Fix typos in rt3883 pinctrl)
+$ git merge mips/mips-for-linux-next
+Auto-merging arch/mips/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/asm/spinlock.h | 8 ++++----
+ arch/mips/ralink/rt3883.c | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+Merging nios2/for-next (744606c76c4a nios2: add screen_info)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
+$ git merge openrisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (d85daeae23d4 parisc: Enhance detection if cr16 clocksources are synchronous)
+$ git merge parisc-hd/for-next
+Auto-merging drivers/parisc/ccio-dma.c
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/cacheflush.h | 2 -
+ arch/parisc/include/asm/processor.h | 2 +
+ arch/parisc/include/asm/uaccess.h | 6 +-
+ arch/parisc/kernel/cache.c | 18 ------
+ arch/parisc/kernel/processor.c | 4 +-
+ arch/parisc/kernel/signal.c | 13 ++--
+ arch/parisc/kernel/time.c | 24 +++++--
+ arch/parisc/mm/fault.c | 4 +-
+ drivers/parisc/ccio-dma.c | 6 +-
+ drivers/parisc/eisa.c | 122 +++++++++++++++++++----------------
+ 10 files changed, 108 insertions(+), 93 deletions(-)
+Merging powerpc/next (9f3768e02335 powerpc: Remove leftover cputime_to_nsecs call causing build error)
+$ git merge powerpc/next
+Already up-to-date.
+Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
+$ 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 (d03bd0454b10 s390/timex: micro optimization for tod_to_ns)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/crypto/paes_s390.c | 5 ++++-
+ arch/s390/include/asm/cputime.h | 20 ++++++++------------
+ arch/s390/include/asm/timex.h | 12 ++++--------
+ arch/s390/kernel/entry.S | 10 +++++-----
+ arch/s390/kernel/process.c | 3 +++
+ arch/s390/kernel/vtime.c | 2 +-
+ 6 files changed, 25 insertions(+), 27 deletions(-)
+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
+Auto-merging arch/unicore32/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 14 +
+ arch/unicore32/include/asm/Kbuild | 3 -
+ arch/unicore32/include/asm/signal.h | 21 +
+ arch/unicore32/include/asm/syscalls.h | 25 +
+ arch/unicore32/include/uapi/asm/sigcontext.h | 14 +
+ arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++
+ arch/unicore32/include/uapi/asm/stat.h | 19 +
+ arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
+ arch/unicore32/include/uapi/asm/unistd.h | 8 +
+ arch/unicore32/kernel/entry.S | 17 +
+ arch/unicore32/kernel/signal.c | 41 ++
+ 11 files changed, 1000 insertions(+), 3 deletions(-)
+ create mode 100644 arch/unicore32/include/asm/signal.h
+ create mode 100644 arch/unicore32/include/asm/syscalls.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
+ create mode 100644 arch/unicore32/include/uapi/asm/stat.h
+ create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
+Merging xtensa/xtensa-for-next (ec59c4ad070d Merge branch 'xtensa-boot' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Auto-merging arch/xtensa/kernel/setup.c
+Removing arch/xtensa/boot/boot-uboot/Makefile
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Makefile | 8 +++----
+ arch/xtensa/boot/Makefile | 23 +++++++++++++------
+ arch/xtensa/boot/boot-elf/Makefile | 2 +-
+ arch/xtensa/boot/boot-redboot/Makefile | 2 +-
+ arch/xtensa/boot/boot-uboot/Makefile | 14 ------------
+ arch/xtensa/include/asm/vectors.h | 4 ++++
+ arch/xtensa/kernel/setup.c | 7 ++++--
+ arch/xtensa/kernel/vmlinux.lds.S | 41 ++++++++++++++++++++++++++++++++++
+ 8 files changed, 71 insertions(+), 30 deletions(-)
+ delete mode 100644 arch/xtensa/boot/boot-uboot/Makefile
+Merging fscrypt/master (6f69f0ed6136 fscrypt: constify struct fscrypt_operations)
+$ git merge fscrypt/master
+Already up-to-date.
+Merging befs/for-next (7ce7d89f4883 Linux 4.10-rc1)
+$ git merge befs/for-next
+Already up-to-date.
+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 (439a0b8730e2 Merge branch 'for-next-current-v4.10-20170228' into for-next-20170228)
+$ git merge btrfs-kdave/for-next
+Auto-merging fs/btrfs/volumes.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/btrfs_inode.h | 31 ++-
+ fs/btrfs/compression.c | 43 ++---
+ fs/btrfs/compression.h | 30 ++-
+ fs/btrfs/ctree.c | 9 +-
+ fs/btrfs/ctree.h | 39 ++--
+ fs/btrfs/delayed-inode.c | 2 +-
+ fs/btrfs/dev-replace.c | 5 +-
+ fs/btrfs/dev-replace.h | 5 +-
+ fs/btrfs/dir-item.c | 9 +-
+ fs/btrfs/disk-io.c | 32 ++--
+ fs/btrfs/disk-io.h | 2 +-
+ fs/btrfs/extent-tree.c | 144 +++++++-------
+ fs/btrfs/extent_io.c | 75 ++++----
+ fs/btrfs/extent_io.h | 50 +++--
+ fs/btrfs/file-item.c | 40 +++-
+ fs/btrfs/file.c | 139 +++++++-------
+ fs/btrfs/free-space-cache.c | 5 +-
+ fs/btrfs/inode-map.c | 2 +-
+ fs/btrfs/inode.c | 445 ++++++++++++++++++++++---------------------
+ fs/btrfs/ioctl.c | 38 ++--
+ fs/btrfs/lzo.c | 12 +-
+ fs/btrfs/ordered-data.c | 9 +-
+ fs/btrfs/ordered-data.h | 7 +-
+ fs/btrfs/relocation.c | 17 +-
+ fs/btrfs/scrub.c | 11 +-
+ fs/btrfs/send.c | 125 +++++++++++-
+ fs/btrfs/tests/inode-tests.c | 46 ++---
+ fs/btrfs/transaction.c | 6 +-
+ fs/btrfs/tree-log.c | 97 +++++-----
+ fs/btrfs/volumes.c | 21 +-
+ fs/btrfs/volumes.h | 12 +-
+ fs/btrfs/zlib.c | 9 +-
+ 32 files changed, 861 insertions(+), 656 deletions(-)
+Merging ceph/master (54ea0046b6fe libceph, rbd, ceph: WRITE | ONDISK -> WRITE)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (50952b70e56f CIFS: implement get_dfs_refer for SMB2+)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_dfs_ref.c | 4 +-
+ fs/cifs/cifsglob.h | 2 +-
+ fs/cifs/cifspdu.h | 16 +++--
+ fs/cifs/cifsproto.h | 7 +++
+ fs/cifs/cifssmb.c | 119 ++-----------------------------------
+ fs/cifs/dir.c | 13 ++++-
+ fs/cifs/misc.c | 105 +++++++++++++++++++++++++++++++++
+ fs/cifs/smb2file.c | 3 +-
+ fs/cifs/smb2ops.c | 156 ++++++++++++++++++++++++++++++++++++++++++++-----
+ fs/cifs/smb2pdu.c | 117 ++++++++++++++++++++++++++++++-------
+ fs/cifs/smb2pdu.h | 8 +++
+ fs/cifs/smb2proto.h | 3 +-
+ 12 files changed, 395 insertions(+), 158 deletions(-)
+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 (6c71100db53e fanotify: simplify the code of fanotify_merge)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (cab7076a185e Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
+$ git merge ext4/dev
+Already up-to-date.
+Merging f2fs/dev (4977ab6e92e2 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge f2fs/dev
+Already up-to-date.
+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 (9a87ad3da905 fuse: release: private_data cannot be NULL)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/dir.c | 2 +-
+ fs/fuse/file.c | 28 ++++++++++++----------------
+ fs/fuse/fuse_i.h | 1 -
+ 3 files changed, 13 insertions(+), 18 deletions(-)
+Merging gfs2/for-next (5bcbe22ca47d Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
+$ git merge gfs2/for-next
+Already up-to-date.
+Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
+$ git merge jfs/jfs-next
+Auto-merging fs/jfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/jfs/resize.c | 4 ++--
+ fs/jfs/super.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (c470abd4fde4 Linux 4.10)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (ff7d11797e72 nfsd: Fix display of the version string)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging orangefs/for-next (e98bdb3059cb Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next)
+$ git merge orangefs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials)
+$ git merge overlayfs/overlayfs-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/namei.c
+Merge made by the 'recursive' strategy.
+ fs/namei.c | 68 +++++++++++++++++++++++-------------
+ fs/open.c | 14 ++++----
+ fs/overlayfs/copy_up.c | 91 +++++++++++++++++++++++++++++++++++-------------
+ fs/overlayfs/overlayfs.h | 11 ++++++
+ fs/overlayfs/ovl_entry.h | 3 ++
+ fs/overlayfs/super.c | 39 +++++++++++++++++++--
+ fs/overlayfs/util.c | 30 ++++++++++++++++
+ fs/read_write.c | 9 +++--
+ include/linux/fs.h | 29 ++++++++-------
+ 9 files changed, 219 insertions(+), 75 deletions(-)
+Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (8d242e932fb7 xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (9e9c5ba8bd70 Merge branch 'work.statx' into for-next)
+$ git merge vfs/for-next
+Resolved 'fs/f2fs/f2fs.h' using previous resolution.
+Resolved 'fs/proc/base.c' using previous resolution.
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging net/unix/af_unix.c
+Auto-merging net/socket.c
+Auto-merging net/rds/rds.h
+Auto-merging net/kcm/kcmsock.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/ceph/messenger.c
+Auto-merging mm/shmem.c
+Auto-merging mm/nommu.c
+Auto-merging mm/mmap.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/relay.c
+Auto-merging ipc/shm.c
+Auto-merging include/net/tcp.h
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/ubifs/ubifs.h
+Auto-merging fs/stat.c
+Auto-merging fs/splice.c
+Auto-merging fs/proc/root.c
+Auto-merging fs/proc/proc_sysctl.c
+Auto-merging fs/proc/internal.h
+Auto-merging fs/proc/generic.c
+Auto-merging fs/proc/base.c
+CONFLICT (content): Merge conflict in fs/proc/base.c
+Auto-merging fs/overlayfs/copy_up.c
+Auto-merging fs/orangefs/orangefs-kernel.h
+Auto-merging fs/orangefs/inode.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/nfsd/vfs.h
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging fs/nfs/namespace.c
+Auto-merging fs/ncpfs/sock.c
+Auto-merging fs/namei.c
+Auto-merging fs/kernfs/kernfs-internal.h
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ceph/super.h
+Auto-merging fs/ceph/inode.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/aio.c
+Auto-merging fs/afs/rxrpc.c
+Auto-merging fs/afs/internal.h
+Auto-merging drivers/usb/usbip/usbip_common.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Auto-merging drivers/gpu/drm/vgem/vgem_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_dmabuf.c
+Auto-merging drivers/block/nbd.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/drbd/drbd_main.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 75de873c9a23] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 3 +-
+ Documentation/filesystems/vfs.txt | 3 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ drivers/base/devtmpfs.c | 3 +-
+ drivers/block/drbd/drbd_main.c | 11 +-
+ drivers/block/loop.c | 7 +-
+ drivers/block/nbd.c | 76 +++---
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 2 +-
+ drivers/mtd/ubi/build.c | 2 +-
+ drivers/mtd/ubi/kapi.c | 2 +-
+ drivers/staging/lustre/lustre/llite/file.c | 9 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 3 +-
+ drivers/target/iscsi/iscsi_target_util.c | 64 ++----
+ drivers/usb/usbip/usbip_common.c | 32 +--
+ fs/9p/fid.c | 10 +-
+ fs/9p/vfs_inode.c | 20 +-
+ fs/9p/vfs_inode_dotl.c | 25 +-
+ fs/afs/inode.c | 8 +-
+ fs/afs/internal.h | 2 +-
+ fs/afs/rxrpc.c | 15 +-
+ fs/aio.c | 4 +-
+ fs/bad_inode.c | 4 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/ceph/inode.c | 6 +-
+ fs/ceph/super.h | 4 +-
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/inode.c | 5 +-
+ fs/coda/coda_linux.h | 2 +-
+ fs/coda/file.c | 2 +-
+ fs/coda/inode.c | 7 +-
+ fs/ecryptfs/inode.c | 13 +-
+ fs/exportfs/expfs.c | 3 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/inode.c | 6 +-
+ fs/f2fs/f2fs.h | 4 +-
+ fs/f2fs/file.c | 6 +-
+ fs/fat/fat.h | 4 +-
+ fs/fat/file.c | 5 +-
+ fs/fuse/dir.c | 6 +-
+ fs/gfs2/inode.c | 11 +-
+ fs/hfs/dir.c | 2 +-
+ fs/kernfs/inode.c | 8 +-
+ fs/kernfs/kernfs-internal.h | 4 +-
+ fs/libfs.c | 12 +-
+ fs/minix/inode.c | 11 +-
+ fs/minix/minix.h | 2 +-
+ fs/namei.c | 183 ++++++++-------
+ fs/ncpfs/sock.c | 111 ++++-----
+ fs/nfs/inode.c | 13 +-
+ fs/nfs/namespace.c | 9 +-
+ fs/nfsd/nfs4xdr.c | 4 +-
+ fs/nfsd/vfs.h | 3 +-
+ fs/ocfs2/file.c | 11 +-
+ fs/ocfs2/file.h | 4 +-
+ fs/orangefs/inode.c | 13 +-
+ fs/orangefs/orangefs-kernel.h | 5 +-
+ fs/overlayfs/copy_up.c | 6 +-
+ fs/overlayfs/dir.c | 10 +-
+ fs/overlayfs/inode.c | 7 +-
+ fs/proc/base.c | 12 +-
+ fs/proc/generic.c | 6 +-
+ fs/proc/internal.h | 2 +-
+ fs/proc/proc_net.c | 6 +-
+ fs/proc/proc_sysctl.c | 5 +-
+ fs/proc/root.c | 6 +-
+ fs/read_write.c | 121 ++++------
+ fs/splice.c | 24 +-
+ fs/stat.c | 214 ++++++++++++++---
+ fs/sync.c | 2 +-
+ fs/sysv/itree.c | 7 +-
+ fs/sysv/sysv.h | 2 +-
+ fs/ubifs/dir.c | 6 +-
+ fs/ubifs/ubifs.h | 4 +-
+ fs/udf/symlink.c | 5 +-
+ fs/xattr.c | 20 +-
+ fs/xfs/xfs_iops.c | 9 +-
+ include/linux/fs.h | 59 ++++-
+ include/linux/net.h | 2 +-
+ include/linux/nfs_fs.h | 2 +-
+ include/linux/skbuff.h | 3 +-
+ include/linux/splice.h | 4 +-
+ include/linux/stat.h | 24 +-
+ include/linux/syscalls.h | 3 +
+ include/net/9p/9p.h | 8 +-
+ include/net/9p/client.h | 18 +-
+ include/net/tcp.h | 2 +-
+ include/uapi/linux/fcntl.h | 5 +
+ include/uapi/linux/stat.h | 131 +++++++++++
+ ipc/shm.c | 4 +-
+ kernel/relay.c | 1 -
+ kernel/trace/trace.c | 2 -
+ mm/mmap.c | 2 +-
+ mm/nommu.c | 4 +-
+ mm/shmem.c | 6 +-
+ net/9p/client.c | 18 +-
+ 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 +--------
+ samples/Kconfig | 5 +
+ samples/Makefile | 2 +-
+ samples/statx/Makefile | 10 +
+ samples/statx/test-statx.c | 254 +++++++++++++++++++++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/splice/Makefile | 8 +
+ .../selftests/splice/default_file_splice_read.c | 8 +
+ .../selftests/splice/default_file_splice_read.sh | 7 +
+ 113 files changed, 1267 insertions(+), 812 deletions(-)
+ create mode 100644 samples/statx/Makefile
+ create mode 100644 samples/statx/test-statx.c
+ create mode 100644 tools/testing/selftests/splice/Makefile
+ create mode 100644 tools/testing/selftests/splice/default_file_splice_read.c
+ create mode 100755 tools/testing/selftests/splice/default_file_splice_read.sh
+$ 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 19328209875a] Merge remote-tracking branch 'vfs/for-next'
+ Date: Fri Mar 3 10:05:09 2017 +1100
+$ git am -3 ../patches/0001-statx-disable-the-sample-code-for-now.patch
+Applying: statx: disable the sample code for now
+$ git reset HEAD^
+Unstaged changes after reset:
+M samples/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master a3f319c840c1] Merge remote-tracking branch 'vfs/for-next'
+ Date: Fri Mar 3 10:05:09 2017 +1100
+Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
+$ git merge vfs-jk/vfs
+Already up-to-date.
+Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
+$ git merge vfs-miklos/next
+Already up-to-date.
+Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
+$ git merge printk/for-next
+Already up-to-date.
+Merging pci/next (c4d052ce970e Merge branch 'pci/virtualization' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (b03fa3ca9c90 Merge branch 'for-4.11/upstream-fixes' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/hid-over-i2c.txt | 5 +++
+ drivers/hid/i2c-hid/i2c-hid.c | 45 ++++++++++++++++++++--
+ include/linux/i2c/i2c-hid.h | 6 +++
+ 3 files changed, 53 insertions(+), 3 deletions(-)
+Merging i2c/i2c/for-next (ce3496c8d5ff Merge branch 'i2c/for-4.11' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (2f1736ff0664 hwmon: (sht15) Add device tree support)
+$ git merge hwmon-staging/hwmon-next
+Already up-to-date.
+Merging jc_docs/docs-next (bd8562626c8e docs / driver-api: Fix structure references in device_link.rst)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging v4l-dvb/master (e6b377dbbb94 Merge tag 'v4.10' into patchwork)
+$ git merge v4l-dvb/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb-next/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging fbdev/fbdev-for-next (42f82367df2c video: fbdev: fsl-diu-fb: fix spelling mistake "palette")
+$ git merge fbdev/fbdev-for-next
+Already up-to-date.
+Merging pm/linux-next (b485f1586a7c Merge branch 'pm-tools' into linux-next)
+$ git merge pm/linux-next
+Auto-merging kernel/power/hibernate.c
+Auto-merging Documentation/devicetree/bindings/opp/opp.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/opp/opp.txt | 44 +-
+ Documentation/power/pm_qos_interface.txt | 13 +-
+ Documentation/power/runtime_pm.txt | 6 +-
+ arch/x86/include/asm/intel-family.h | 1 +
+ arch/x86/include/asm/msr-index.h | 11 +-
+ drivers/acpi/apei/bert.c | 20 +-
+ drivers/base/power/domain.c | 178 +--
+ drivers/base/power/opp/core.c | 3 +-
+ drivers/base/power/qos.c | 53 +-
+ drivers/cpufreq/intel_pstate.c | 80 +-
+ drivers/cpufreq/qoriq-cpufreq.c | 4 -
+ drivers/cpuidle/governors/menu.c | 2 +-
+ drivers/idle/intel_idle.c | 178 +--
+ include/linux/pm_qos.h | 15 +-
+ kernel/power/hibernate.c | 93 +-
+ tools/power/x86/turbostat/turbostat.8 | 253 ++--
+ tools/power/x86/turbostat/turbostat.c | 1880 ++++++++++++++++++-------
+ 17 files changed, 1868 insertions(+), 966 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 (6fefe19f5836 Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
+$ git merge thermal-soc/next
+Merge made by the 'recursive' strategy.
+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 (c0ae14857677 dlm: Fix kernel memory disclosure)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/user.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
+$ git merge swiotlb/linux-next
+Auto-merging drivers/xen/swiotlb-xen.c
+Auto-merging arch/arm/xen/mm.c
+Merge made by the 'recursive' strategy.
+ arch/arm/xen/mm.c | 2 ++
+ drivers/xen/swiotlb-xen.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ include/xen/swiotlb-xen.h | 11 +++++++++++
+ 3 files changed, 60 insertions(+)
+Merging net-next/master (2d6be4abf514 Merge tag 'for-linus-4.11' of git://git.code.sf.net/p/openipmi/linux-ipmi)
+$ git merge net-next/master
+Already up-to-date.
+Merging ipsec-next/master (7785bba299a8 esp: Add a software GRO codepath)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging netfilter-next/master (f1ef09fde17f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
+$ git merge netfilter-next/master
+Already up-to-date.
+Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
+$ git merge ipvs-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (4e33e3462510 tcp: use page_ref_inc() in tcp_sendmsg())
+$ git merge wireless-drivers-next/master
+Already up-to-date.
+Merging bluetooth/master (8f91566f99fa btmrvl: fix spelling mistake: "actived" -> "activated")
+$ git merge bluetooth/master
+Already up-to-date.
+Merging mac80211-next/master (3bacb8ca198a mac80211_hwsim: fix command documentation indentation)
+$ git merge mac80211-next/master
+Auto-merging net/mac80211/sta_info.h
+Auto-merging net/mac80211/sta_info.c
+Auto-merging include/net/mac80211.h
+Auto-merging include/net/cfg80211.h
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/admtek/adm8211.c | 2 +
+ drivers/net/wireless/ath/ar5523/ar5523.c | 2 +
+ drivers/net/wireless/ath/ath10k/mac.c | 2 +
+ drivers/net/wireless/ath/ath5k/base.c | 2 +
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +
+ drivers/net/wireless/ath/ath9k/init.c | 2 +
+ drivers/net/wireless/ath/carl9170/main.c | 2 +
+ drivers/net/wireless/ath/wcn36xx/main.c | 3 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +-
+ drivers/net/wireless/atmel/at76c50x-usb.c | 2 +
+ drivers/net/wireless/broadcom/b43/main.c | 2 +
+ drivers/net/wireless/broadcom/b43legacy/main.c | 2 +
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 +
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +
+ drivers/net/wireless/mac80211_hwsim.c | 5 +
+ drivers/net/wireless/mac80211_hwsim.h | 4 +-
+ drivers/net/wireless/marvell/libertas_tf/main.c | 2 +
+ drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +-
+ drivers/net/wireless/marvell/mwl8k.c | 2 +
+ drivers/net/wireless/mediatek/mt7601u/init.c | 2 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 3 +
+ drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 +
+ drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 +
+ drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 +
+ include/linux/ieee80211.h | 7 +-
+ include/net/cfg80211.h | 13 ++
+ include/net/mac80211.h | 6 +
+ include/uapi/linux/nl80211.h | 9 +-
+ net/mac80211/cfg.c | 28 +++++
+ net/mac80211/mesh_hwmp.c | 23 +++-
+ net/mac80211/mesh_pathtbl.c | 3 +
+ net/mac80211/mlme.c | 29 ++++-
+ net/mac80211/rate.c | 10 +-
+ net/mac80211/rate.h | 1 -
+ net/mac80211/spectmgmt.c | 4 +-
+ net/mac80211/sta_info.c | 11 +-
+ net/mac80211/sta_info.h | 18 +--
+ net/mac80211/util.c | 22 ++--
+ net/wireless/core.c | 21 +++-
+ net/wireless/core.h | 9 ++
+ net/wireless/nl80211.c | 138 +++++++++++++++++++--
+ net/wireless/rdev-ops.h | 12 ++
+ net/wireless/trace.h | 22 ++++
+ net/wireless/util.c | 70 ++++++-----
+ 48 files changed, 423 insertions(+), 97 deletions(-)
+Merging rdma/for-next (9294000d6d89 IB/srp: Drain the send queue before destroying a QP)
+$ git merge rdma/for-next
+Already up-to-date.
+Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
+$ git merge nand/nand/next
+Already up-to-date.
+Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check)
+$ git merge spi-nor/next
+Already up-to-date.
+Merging crypto/master (12cb3a1c4184 crypto: xts - Add ECB dependency)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (a44ddbcbbd72 Merge tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (998d75730b40 drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT)
+$ git merge drm-intel/for-linux-next
+Already up-to-date.
+Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/for-linux-next (a44ddbcbbd72 Merge tag 'drm-misc-next-fixes-2017-02-27' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
+$ git merge drm-misc/for-linux-next
+Already up-to-date.
+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 (57edb4bc581d drm/msm: move submit fence wait out of struct_mutex)
+$ git merge drm-msm/msm-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 -
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 --
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 --
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 36 +++++++----
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 33 +++++------
+ drivers/gpu/drm/msm/msm_debugfs.c | 2 +
+ drivers/gpu/drm/msm/msm_drv.c | 2 +
+ drivers/gpu/drm/msm/msm_gem_submit.c | 39 ++++++------
+ drivers/gpu/drm/msm/msm_gpu.c | 95 ++++++++----------------------
+ drivers/gpu/drm/msm/msm_gpu.h | 12 ++--
+ drivers/gpu/drm/msm/msm_iommu.c | 69 ++++++----------------
+ 11 files changed, 112 insertions(+), 186 deletions(-)
+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 (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
+$ git merge mali-dp/for-upstream/mali-dp
+Already up-to-date.
+Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7)
+$ git merge sunxi/sunxi/for-next
+Already up-to-date.
+Merging kspp/for-next/kspp (4b020bbc236f Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
+$ git merge kspp/for-next/kspp
+Auto-merging scripts/Makefile.gcc-plugins
+Auto-merging mm/util.c
+Auto-merging mm/kasan/kasan.c
+Auto-merging lib/vsprintf.c
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/compiler-gcc.h
+Auto-merging include/linux/audit.h
+Auto-merging include/drm/drm_drv.h
+Auto-merging include/acpi/acpixf.h
+Auto-merging drivers/acpi/acpica/acutils.h
+Auto-merging arch/x86/kernel/hpet.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 40 +
+ arch/arm/include/asm/string.h | 10 +-
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/string.h | 25 +-
+ arch/powerpc/include/asm/string.h | 19 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/string_32.h | 25 +-
+ arch/x86/include/asm/string_64.h | 23 +-
+ arch/x86/kernel/hpet.c | 2 +-
+ arch/x86/lib/Makefile | 4 +
+ drivers/acpi/acpica/acutils.h | 2 +-
+ fs/char_dev.c | 2 +-
+ fs/ntfs/debug.h | 6 +-
+ fs/ocfs2/cluster/masklog.h | 2 +-
+ include/acpi/acpixf.h | 2 +-
+ include/asm-generic/asm-prototypes.h | 8 +-
+ include/asm-generic/bug.h | 7 +-
+ include/asm-generic/vmlinux.lds.h | 2 +
+ include/drm/drm_drv.h | 2 +-
+ include/linux/audit.h | 5 +-
+ include/linux/compiler-gcc.h | 22 +
+ include/linux/compiler.h | 8 +
+ include/linux/fs.h | 8 +-
+ include/linux/printk.h | 2 +-
+ include/linux/ratelimit.h | 3 +-
+ include/linux/string.h | 75 +-
+ lib/string.c | 3 +-
+ lib/vsprintf.c | 6 +-
+ mm/kasan/kasan.c | 2 +
+ mm/util.c | 10 +-
+ scripts/Makefile.gcc-plugins | 14 +
+ scripts/gcc-plugins/initify_plugin.c | 1865 ++++++++++++++++++++++++++++++++++
+ scripts/gcc-plugins/sancov_plugin.c | 2 +-
+ security/integrity/integrity.h | 2 +-
+ 34 files changed, 2091 insertions(+), 119 deletions(-)
+ create mode 100644 scripts/gcc-plugins/initify_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
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging sound/for-next (f3ac9f737603 ALSA: seq: Fix link corruption by event error handling)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (141dee78c40a Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
+$ git merge sound-asoc/for-next
+Already up-to-date.
+Merging modules/modules-next (0d4ec7849f5a MAINTAINERS: add tree for modules)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (4f95963558d4 Input: ad7879 - do not manipulate capability bits directly)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/tsc2007_core.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/touchscreen/ad7879.txt | 19 +++
+ .../bindings/input/{ => touchscreen}/ads7846.txt | 0
+ drivers/input/keyboard/tca8418_keypad.c | 2 -
+ drivers/input/touchscreen/Kconfig | 12 ++
+ drivers/input/touchscreen/Makefile | 2 +
+ drivers/input/touchscreen/ad7879-i2c.c | 67 ++-------
+ drivers/input/touchscreen/ad7879-spi.c | 131 ++----------------
+ drivers/input/touchscreen/ad7879.c | 152 +++++++++++----------
+ drivers/input/touchscreen/ad7879.h | 14 +-
+ drivers/input/touchscreen/tsc2007.h | 101 ++++++++++++++
+ .../touchscreen/{tsc2007.c => tsc2007_core.c} | 102 +++++---------
+ drivers/input/touchscreen/tsc2007_iio.c | 140 +++++++++++++++++++
+ 12 files changed, 414 insertions(+), 328 deletions(-)
+ rename Documentation/devicetree/bindings/input/{ => touchscreen}/ads7846.txt (100%)
+ create mode 100644 drivers/input/touchscreen/tsc2007.h
+ rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (83%)
+ create mode 100644 drivers/input/touchscreen/tsc2007_iio.c
+Merging block/for-next (3695539290d7 Merge branch 'for-4.11/block' into for-next)
+$ git merge block/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
+$ git merge lightnvm/for-next
+Already up-to-date.
+Merging device-mapper/for-next (2664f3c94abc dm raid: bump the target version)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-raid.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+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 (86292b33d4b7 Merge branch 'akpm' (patches from Andrew))
+$ git merge mmc/next
+Already up-to-date.
+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 (874f93fcf501 md-cluster: add the support for resize)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/md/md-cluster.txt | 2 +-
+ drivers/md/bitmap.c | 41 ++++++--
+ drivers/md/bitmap.h | 2 +
+ drivers/md/md-cluster.c | 225 +++++++++++++++++++++++++++++++++++++---
+ drivers/md/md-cluster.h | 1 +
+ drivers/md/md.c | 46 ++++----
+ drivers/md/md.h | 9 --
+ drivers/md/raid1.c | 27 ++++-
+ drivers/md/raid10.c | 41 ++++++--
+ drivers/md/raid5.c | 2 -
+ 10 files changed, 324 insertions(+), 72 deletions(-)
+Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH)
+$ git merge mfd/for-mfd-next
+Already up-to-date.
+Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
+$ git merge battery/for-next
+Already up-to-date.
+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 (877fe823a0ad Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
+$ git merge regulator/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging security/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static)
+$ git merge security/next
+Already up-to-date.
+Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
+$ git merge integrity/next
+Already up-to-date.
+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
+Auto-merging Documentation/security/keys.txt
+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 (b2a607a8f39c selinux: constify nlmsg permission tables)
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ security/selinux/nlmsgtab.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging tpmdd/next (cefcadb300ef tpm: select CONFIG_CRYPTO)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/Kconfig | 1 +
+ drivers/char/tpm/tpm-chip.c | 43 +++++++++++++++++++-------------------
+ drivers/char/tpm/tpm_crb.c | 27 ++++++++++++++++++++++--
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 18 +++++++++-------
+ drivers/char/tpm/tpm_tis_core.c | 6 ++++--
+ 5 files changed, 62 insertions(+), 33 deletions(-)
+Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_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 (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements)
+$ git merge audit/next
+Already up-to-date.
+Merging devicetree/for-next (4e29ccdb240e DT: add Faraday Tec. as vendor)
+$ git merge devicetree/for-next
+Already up-to-date.
+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 (827498a19804 Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/topcliff-pch' into spi-next)
+$ git merge spi/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging tip/auto-latest (b1460aed6ca3 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging kernel/trace/trace.c
+Merge made by the 'recursive' strategy.
+ Documentation/trace/kprobetrace.txt | 2 +-
+ Documentation/trace/uprobetracer.txt | 2 +-
+ arch/s390/configs/default_defconfig | 2 +-
+ arch/s390/configs/gcov_defconfig | 2 +-
+ arch/s390/configs/performance_defconfig | 2 +-
+ arch/s390/defconfig | 2 +-
+ arch/x86/entry/entry_32.S | 2 +-
+ arch/x86/entry/entry_64.S | 15 +++++-----
+ arch/x86/events/amd/core.c | 2 +-
+ arch/x86/events/intel/cstate.c | 2 +-
+ arch/x86/events/intel/rapl.c | 2 +-
+ arch/x86/events/intel/uncore.h | 6 ++--
+ arch/x86/hyperv/hv_init.c | 2 +-
+ arch/x86/include/asm/alternative.h | 17 +++++++++++
+ arch/x86/include/asm/page_64.h | 15 +++++++++-
+ arch/x86/include/asm/pkeys.h | 15 ++++++----
+ arch/x86/include/uapi/asm/bootparam.h | 2 +-
+ arch/x86/kernel/apic/apic.c | 23 +++++---------
+ arch/x86/kernel/cpu/amd.c | 4 ---
+ arch/x86/kernel/cpu/centaur.c | 2 --
+ arch/x86/kernel/cpu/common.c | 3 --
+ arch/x86/kernel/cpu/cyrix.c | 1 -
+ arch/x86/kernel/cpu/intel.c | 4 ---
+ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1 -
+ arch/x86/kernel/cpu/transmeta.c | 2 --
+ arch/x86/kernel/cpu/vmware.c | 1 -
+ arch/x86/kernel/kdebugfs.c | 2 +-
+ arch/x86/kernel/kprobes/common.h | 2 +-
+ arch/x86/kernel/kprobes/core.c | 6 ++--
+ arch/x86/kernel/kprobes/opt.c | 2 +-
+ arch/x86/kernel/reboot.c | 8 +++++
+ arch/x86/kernel/tsc.c | 35 ++++++++++++++--------
+ arch/x86/lib/clear_page_64.S | 17 +++++------
+ arch/x86/pci/common.c | 9 ++++++
+ arch/x86/platform/uv/tlb_uv.c | 1 -
+ arch/x86/purgatory/purgatory.c | 11 +++----
+ arch/x86/purgatory/purgatory.h | 8 +++++
+ arch/x86/purgatory/setup-x86_64.S | 1 +
+ drivers/acpi/internal.h | 2 ++
+ drivers/acpi/ioapic.c | 22 ++++++++++----
+ drivers/acpi/pci_root.c | 4 +--
+ drivers/firmware/efi/arm-runtime.c | 1 +
+ drivers/firmware/efi/libstub/secureboot.c | 4 +--
+ drivers/irqchip/irq-crossbar.c | 3 +-
+ fs/timerfd.c | 8 ++---
+ kernel/locking/lockdep.c | 11 +++++--
+ kernel/locking/test-ww_mutex.c | 6 ++--
+ kernel/sched/core.c | 11 +++++--
+ kernel/sched/fair.c | 2 +-
+ kernel/sched/features.h | 5 ++++
+ kernel/trace/Kconfig | 6 ++--
+ kernel/trace/Makefile | 4 +--
+ kernel/trace/trace.c | 10 +++----
+ kernel/trace/trace_probe.h | 4 +--
+ lib/refcount.c | 14 ++++-----
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 +-
+ tools/testing/selftests/x86/fsgsbase.c | 2 +-
+ tools/testing/selftests/x86/ldt_gdt.c | 16 ++++++----
+ tools/testing/selftests/x86/ptrace_syscall.c | 3 +-
+ tools/testing/selftests/x86/single_step_syscall.c | 5 +++-
+ 60 files changed, 230 insertions(+), 150 deletions(-)
+ create mode 100644 arch/x86/purgatory/purgatory.h
+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 (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (75bf2f6478ca EDAC, mce_amd: Print IPID and Syndrome on a separate line)
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date.
+Merging ftrace/for-next (7ce2040796fd Merge branch 'for-next/ftrace/core-2' into temp)
+$ git merge ftrace/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging kvm/linux-next (16ce771b93ab Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into next)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging tools/testing/selftests/x86/Makefile
+Auto-merging arch/powerpc/include/asm/book3s/64/mmu.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/book3s/64/mmu.h | 3 +-
+ arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 8 +-
+ arch/x86/include/asm/desc.h | 18 ++--
+ arch/x86/kernel/ioport.c | 8 +-
+ arch/x86/kernel/process.c | 6 +-
+ arch/x86/kvm/pmu.c | 13 ++-
+ arch/x86/kvm/vmx.c | 9 +-
+ include/linux/kvm_host.h | 3 +-
+ tools/testing/selftests/x86/Makefile | 2 +-
+ tools/testing/selftests/x86/ioperm.c | 170 +++++++++++++++++++++++++++++++
+ virt/kvm/kvm_main.c | 8 +-
+ 12 files changed, 223 insertions(+), 30 deletions(-)
+ create mode 100644 tools/testing/selftests/x86/ioperm.c
+Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
+$ git merge kvm-mips/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (bcd3bb63dbc8 KVM: PPC: Book3S HV: Disable HPT resizing on POWER9 for now)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (b2d8fdd12a40 KVM: s390: log runtime instrumentation enablement)
+$ git merge kvms390/next
+Merge made by the 'recursive' strategy.
+ arch/s390/kvm/kvm-s390.c | 14 ++++++++------
+ arch/s390/kvm/priv.c | 1 +
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+Merging xen-tip/linux-next (4610d240d691 xen/privcmd: add IOCTL_PRIVCMD_RESTRICT)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/for-next (af050abb5c2e platform/x86: intel_turbo_max_3: make it explicitly non-modular)
+$ git merge drivers-x86/for-next
+Already up-to-date.
+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 (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable)
+$ git merge leds/for-next
+Already up-to-date.
+Merging ipmi/for-next (eb994594bc22 ipmi: bt-bmc: Use a regmap for register access)
+$ git merge ipmi/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging usb/usb-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge usb/usb-next
+Already up-to-date.
+Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (beabdc3cd3e3 USB: serial: keyspan: drop header file)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
+$ git merge usb-chipidea-next/ci-for-usb-next
+Already up-to-date.
+Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
+$ git merge phy-next/next
+Already up-to-date.
+Merging tty/tty-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge tty/tty-next
+Already up-to-date.
+Merging char-misc/char-misc-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging extcon/extcon-next (d8c04aa4518b extcon: int3496: Add GPIO ACPI mapping table)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ Documentation/extcon/intel-int3496.txt | 5 ++++
+ drivers/extcon/extcon-arizona.c | 46 ++++++++++++++++++++++++++++++++++
+ drivers/extcon/extcon-intel-int3496.c | 28 ++++++++++++++++++---
+ drivers/extcon/extcon-palmas.c | 6 +++++
+ drivers/extcon/extcon-usb-gpio.c | 7 +++---
+ 5 files changed, 84 insertions(+), 8 deletions(-)
+Merging staging/staging-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
+$ git merge staging/staging-next
+Already up-to-date.
+Merging slave-dma/next (235840692925 Merge branch 'fixes' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+Merging cgroup/for-next (f83f3c515654 kernfs: fix locking around kernfs_ops->release() callback)
+$ git merge cgroup/for-next
+Already up-to-date.
+Merging scsi/for-next (42a70abddd90 scsi: qedi: Fix memory leak in tmf response processing.)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/cxlflash/superpipe.c
+Auto-merging drivers/scsi/aacraid/linit.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 +
+ drivers/ata/libata-scsi.c | 12 +-
+ drivers/block/cciss.c | 32 +-
+ drivers/scsi/Kconfig | 4 +-
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aacraid/aachba.c | 59 +-
+ drivers/scsi/aacraid/aacraid.h | 107 +-
+ drivers/scsi/aacraid/commctrl.c | 2 +-
+ drivers/scsi/aacraid/comminit.c | 2 +-
+ drivers/scsi/aacraid/commsup.c | 118 +-
+ drivers/scsi/aacraid/linit.c | 47 +-
+ drivers/scsi/aacraid/rx.c | 2 +-
+ drivers/scsi/aacraid/src.c | 48 +-
+ drivers/scsi/cxlflash/main.c | 4 +
+ drivers/scsi/cxlflash/main.h | 1 +
+ drivers/scsi/cxlflash/superpipe.c | 8 +-
+ drivers/scsi/cxlflash/vlun.c | 4 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 16 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c | 9 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 10 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 7 +-
+ drivers/scsi/lpfc/Makefile | 11 +-
+ drivers/scsi/lpfc/lpfc.h | 162 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 570 ++++-
+ drivers/scsi/lpfc/lpfc_attr.h | 4 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 33 +-
+ drivers/scsi/lpfc/lpfc_bsg.h | 6 +-
+ drivers/scsi/lpfc/lpfc_compat.h | 4 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 68 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 388 +++-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2300 +++++++++++++-----
+ drivers/scsi/lpfc/lpfc_debugfs.h | 291 +--
+ drivers/scsi/lpfc/lpfc_disc.h | 24 +-
+ drivers/scsi/lpfc/lpfc_els.c | 366 ++-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 363 ++-
+ drivers/scsi/lpfc/lpfc_hw.h | 86 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 506 +++-
+ drivers/scsi/lpfc/lpfc_ids.h | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2889 +++++++++++++----------
+ drivers/scsi/lpfc/lpfc_logmsg.h | 8 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 114 +-
+ drivers/scsi/lpfc/lpfc_mem.c | 278 ++-
+ drivers/scsi/lpfc/lpfc_nl.h | 4 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 257 ++-
+ drivers/scsi/lpfc/lpfc_nvme.c | 2464 ++++++++++++++++++++
+ drivers/scsi/lpfc/lpfc_nvme.h | 103 +
+ drivers/scsi/lpfc/lpfc_nvmet.c | 1986 ++++++++++++++++
+ drivers/scsi/lpfc/lpfc_nvmet.h | 116 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 111 +-
+ drivers/scsi/lpfc/lpfc_scsi.h | 22 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 2195 ++++++++++++++----
+ drivers/scsi/lpfc/lpfc_sli.h | 42 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 98 +-
+ drivers/scsi/lpfc/lpfc_version.h | 10 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 21 +-
+ drivers/scsi/lpfc/lpfc_vport.h | 4 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 105 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 2 -
+ drivers/scsi/osd/osd_uld.c | 3 +-
+ drivers/scsi/qedf/Kconfig | 11 +
+ drivers/scsi/qedf/Makefile | 5 +
+ drivers/scsi/qedf/qedf.h | 545 +++++
+ drivers/scsi/qedf/qedf_attr.c | 165 ++
+ drivers/scsi/qedf/qedf_dbg.c | 195 ++
+ drivers/scsi/qedf/qedf_dbg.h | 154 ++
+ drivers/scsi/qedf/qedf_debugfs.c | 460 ++++
+ drivers/scsi/qedf/qedf_els.c | 949 ++++++++
+ drivers/scsi/qedf/qedf_fip.c | 269 +++
+ drivers/scsi/qedf/qedf_hsi.h | 422 ++++
+ drivers/scsi/qedf/qedf_io.c | 2282 ++++++++++++++++++
+ drivers/scsi/qedf/qedf_main.c | 3336 +++++++++++++++++++++++++++
+ drivers/scsi/qedf/qedf_version.h | 15 +
+ drivers/scsi/qedi/qedi_fw.c | 5 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 7 +-
+ drivers/scsi/qla2xxx/qla_os.c | 16 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +-
+ drivers/scsi/scsi_common.c | 4 +-
+ drivers/scsi/scsi_dh.c | 22 +-
+ drivers/scsi/scsi_ioctl.c | 3 +-
+ drivers/scsi/scsi_lib.c | 113 +-
+ drivers/scsi/scsi_transport_spi.c | 24 +-
+ drivers/scsi/sd.c | 40 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 8 +-
+ drivers/scsi/sr_ioctl.c | 19 +-
+ drivers/scsi/ufs/ufs-qcom.c | 12 -
+ drivers/scsi/ufs/ufshcd.c | 10 +-
+ include/scsi/scsi_device.h | 14 +-
+ 87 files changed, 22404 insertions(+), 3220 deletions(-)
+ create mode 100644 drivers/scsi/lpfc/lpfc_nvme.c
+ create mode 100644 drivers/scsi/lpfc/lpfc_nvme.h
+ create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.c
+ create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.h
+ create mode 100644 drivers/scsi/qedf/Kconfig
+ create mode 100644 drivers/scsi/qedf/Makefile
+ create mode 100644 drivers/scsi/qedf/qedf.h
+ create mode 100644 drivers/scsi/qedf/qedf_attr.c
+ create mode 100644 drivers/scsi/qedf/qedf_dbg.c
+ create mode 100644 drivers/scsi/qedf/qedf_dbg.h
+ create mode 100644 drivers/scsi/qedf/qedf_debugfs.c
+ create mode 100644 drivers/scsi/qedf/qedf_els.c
+ create mode 100644 drivers/scsi/qedf/qedf_fip.c
+ create mode 100644 drivers/scsi/qedf/qedf_hsi.h
+ create mode 100644 drivers/scsi/qedf/qedf_io.c
+ create mode 100644 drivers/scsi/qedf/qedf_main.c
+ create mode 100644 drivers/scsi/qedf/qedf_version.h
+Merging scsi-mkp/for-next (8893cf6cb1cf scsi: mpt3sas: Avoid sleeping in interrupt context)
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/scsi/scsi_lib.c
+Merge made by the 'recursive' strategy.
+ drivers/scsi/libiscsi.c | 26 +++-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 3 -
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 19 +--
+ drivers/scsi/qedi/qedi_main.c | 2 +-
+ drivers/scsi/scsi_lib.c | 14 ++-
+ drivers/scsi/scsi_priv.h | 3 -
+ drivers/scsi/sd.c | 17 +++
+ drivers/scsi/ufs/ufs.h | 22 ++--
+ drivers/scsi/ufs/ufshcd.c | 231 ++++++++++++++++++++++++++---------
+ drivers/scsi/ufs/ufshcd.h | 15 +++
+ include/scsi/libiscsi.h | 1 +
+ include/scsi/scsi_device.h | 4 +
+ 12 files changed, 256 insertions(+), 101 deletions(-)
+Merging target-updates/for-next (c87ba9c49c1f target: Add counters for ABORT_TASK success + failure)
+$ git merge target-updates/for-next
+Auto-merging include/target/target_core_base.h
+Auto-merging drivers/target/target_core_tpg.c
+Auto-merging drivers/target/iscsi/iscsi_target_util.c
+Auto-merging drivers/target/iscsi/iscsi_target_login.c
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/qla2xxx/qla_mr.c
+Auto-merging drivers/scsi/qla2xxx/qla_isr.c
+Auto-merging drivers/scsi/qla2xxx/qla_init.c
+Auto-merging drivers/scsi/qla2xxx/qla_gs.c
+Auto-merging drivers/scsi/qla2xxx/qla_def.h
+Auto-merging drivers/scsi/qla2xxx/qla_bsg.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 4 +
+ drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 2 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 3 +
+ drivers/scsi/qla2xxx/qla_bsg.c | 23 +-
+ drivers/scsi/qla2xxx/qla_def.h | 306 ++-
+ drivers/scsi/qla2xxx/qla_dfs.c | 11 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 106 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 72 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 726 +++++-
+ drivers/scsi/qla2xxx/qla_init.c | 1612 +++++++++----
+ drivers/scsi/qla2xxx/qla_inline.h | 18 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 167 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 317 ++-
+ drivers/scsi/qla2xxx/qla_mbx.c | 232 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 48 +-
+ drivers/scsi/qla2xxx/qla_os.c | 330 ++-
+ drivers/scsi/qla2xxx/qla_target.c | 2392 +++++++++-----------
+ drivers/scsi/qla2xxx/qla_target.h | 252 +--
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 256 ++-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 4 +-
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 30 +-
+ drivers/target/iscsi/cxgbit/cxgbit_lro.h | 5 +-
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 69 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 173 +-
+ drivers/target/iscsi/iscsi_target.c | 138 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 6 +-
+ drivers/target/iscsi/iscsi_target_erl2.c | 6 +-
+ drivers/target/iscsi/iscsi_target_erl2.h | 2 +-
+ drivers/target/iscsi/iscsi_target_login.c | 2 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 16 +-
+ drivers/target/iscsi/iscsi_target_tmr.c | 4 +-
+ drivers/target/iscsi/iscsi_target_util.c | 39 +-
+ drivers/target/target_core_device.c | 11 +-
+ drivers/target/target_core_sbc.c | 2 +-
+ drivers/target/target_core_stat.c | 36 +
+ drivers/target/target_core_tmr.c | 17 +-
+ drivers/target/target_core_tpg.c | 3 +-
+ drivers/target/target_core_transport.c | 164 +-
+ drivers/target/tcm_fc/tfc_cmd.c | 2 -
+ include/target/iscsi/iscsi_transport.h | 11 +-
+ include/target/target_core_base.h | 7 +-
+ include/target/target_core_fabric.h | 2 +-
+ include/uapi/linux/target_core_user.h | 22 +-
+ 43 files changed, 4790 insertions(+), 2858 deletions(-)
+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 (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors)
+$ 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
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (80363894995b virtio_mmio: expose header to userspace)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+Merging rpmsg/for-next (349709ba5bea Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging gpio/for-next (3498d8694d41 gpio: reintroduce devm_get_gpiod_from_child())
+$ git merge gpio/for-next
+Already up-to-date.
+Merging pinctrl/for-next (baafacab092e pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data())
+$ git merge pinctrl/for-next
+Already up-to-date.
+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 (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
+$ git merge dma-buf/for-next
+Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
+Auto-merging drivers/dma-buf/Kconfig
+CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7723fb673d91] 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 (ace0c791e6c3 proc/sysctl: Don't grab i_lock under sysctl_lock.)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (5739438b725c ktest: Add variable run_command_status to save status of commands executed)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
+$ git merge random/dev
+Auto-merging init/main.c
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 129 +++++++++++++++++++------------------------------
+ include/linux/random.h | 18 +++++--
+ init/main.c | 1 -
+ 3 files changed, 65 insertions(+), 83 deletions(-)
+Merging aio/master (b562e44f507e Linux 4.5)
+$ git merge aio/master
+Already up-to-date.
+Merging kselftest/next (e53aff45c490 selftests: lib.mk Fix individual test builds)
+$ git merge kselftest/next
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/lib.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+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
+Already up-to-date.
+Merging coresight/next (dc83e0549ea1 coresight: Fixes coresight DT parse to get correct output port ID.)
+$ git merge coresight/next
+Auto-merging drivers/hwtracing/coresight/coresight-stm.c
+Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-etb10.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +-
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 80 ++++++++++++----------
+ drivers/hwtracing/coresight/coresight-funnel.c | 4 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 2 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 2 +-
+ drivers/hwtracing/coresight/of_coresight.c | 2 +-
+ 7 files changed, 52 insertions(+), 42 deletions(-)
+Merging rtc/rtc-next (d4f6c6f15a1f rtc: ds3232: Call device_init_wakeup before device_register)
+$ git merge rtc/rtc-next
+Already up-to-date.
+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 (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
+$ 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 idr/idr-4.11 (2c1c878ea8d8 radix tree test suite: Depend on Makefile and quieten grep)
+$ git merge idr/idr-4.11
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gvt/gvt.c | 1 +
+ tools/testing/radix-tree/Makefile | 14 +--
+ tools/testing/radix-tree/benchmark.c | 173 +++++++++++++++++++++++++++++++++--
+ tools/testing/radix-tree/idr-test.c | 44 +++++++++
+ tools/testing/radix-tree/tag_check.c | 29 ++++++
+ 5 files changed, 248 insertions(+), 13 deletions(-)
+Merging akpm-current/current (c2118ec0a377 scripts/gdb: add lx-fdtdump command)
+$ git merge --no-ff akpm-current/current
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/page.h | 2 ++
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ block/genhd.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 66 ++++++++++++++++++++++++----------
+ fs/ocfs2/dlm/dlmrecovery.c | 40 ++++++++-------------
+ include/linux/kexec.h | 2 ++
+ include/uapi/linux/sysctl.h | 4 +++
+ lib/scatterlist.c | 22 +++++++++---
+ mm/page_alloc.c | 5 +++
+ mm/page_owner.c | 4 +--
+ mm/vmscan.c | 17 ++++++---
+ scripts/gdb/linux/constants.py.in | 7 ++++
+ scripts/gdb/linux/proc.py | 73 ++++++++++++++++++++++++++++++++++++++
+ 13 files changed, 190 insertions(+), 55 deletions(-)
+$ 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: scripts/spelling.txt: add "intialise(d)" 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
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 3a8a52e1bd52...34733d139bcc akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (34733d139bcc scripts/spelling.txt: add "overide" pattern and fix typo instances)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kcov.rst | 2 +-
+ Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt | 2 +-
+ arch/cris/arch-v32/drivers/cryptocop.c | 2 +-
+ arch/x86/kernel/ftrace.c | 2 +-
+ certs/blacklist.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/crypto/ux500/cryp/cryp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
+ drivers/hv/channel.c | 2 +-
+ drivers/isdn/hisax/st5481_b.c | 2 +-
+ drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 8 +++-----
+ drivers/mtd/spi-nor/spi-nor.c | 2 +-
+ drivers/net/can/flexcan.c | 2 +-
+ drivers/net/ethernet/qlogic/qlge/qlge.h | 4 ++--
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 ++++----
+ drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
+ drivers/usb/gadget/legacy/inode.c | 3 +--
+ drivers/usb/host/xhci.c | 4 ++--
+ drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +-
+ fs/inode.c | 2 +-
+ fs/xfs/xfs_log_recover.c | 2 +-
+ include/dt-bindings/sound/cs42l42.h | 2 +-
+ include/linux/regulator/machine.h | 2 +-
+ include/net/irda/timer.h | 2 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/events/core.c | 2 +-
+ kernel/trace/trace_stack.c | 2 +-
+ scripts/spelling.txt | 6 ++++++
+ sound/soc/amd/acp-pcm-dma.c | 2 +-
+ tools/lguest/lguest.c | 2 +-
+ tools/lib/bpf/Makefile | 2 +-
+ tools/lib/traceevent/Makefile | 2 +-
+ tools/lib/traceevent/event-parse.h | 2 +-
+ 37 files changed, 49 insertions(+), 46 deletions(-)
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..2590b32af7b4
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20170303