summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Next/SHA1s269
-rw-r--r--Next/Trees272
-rw-r--r--Next/merge.log6532
-rw-r--r--Next/quilt-import.log36
-rw-r--r--localversion-next1
5 files changed, 7110 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..9939f6dd8456
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,269 @@
+Name SHA1
+---- ----
+origin ff5abbe799e29099695cb8b5b2f198dd8b8bdf26
+fixes 820bf5c419e4b85298e5c3001bd1b5be46d60765
+kbuild-current bbfe63b60aad29bb0ed65a1968519765bd68368a
+arc-current 753affba96d3608e058cefc4534007661efd8c96
+arm-current 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e
+m68k-current 558d5ad276c9b2ffbe706e78310a777f87e65c5f
+metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861
+powerpc-fixes 6b2c08f989250c54f31b53dba9ace863a1f3fff6
+sparc 23198ddffb6cddb5d5824230af4dd4b46e4046a4
+fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net 6e9c0075409d4ec1bc63558ee5a93916a6d7d16f
+ipsec 10a7ef33679073d13bf1dd05e3f1b7912f999543
+netfilter c0576e3975084d4699b7bfef578613fb8e1144f6
+ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d
+wireless-drivers a6127b4440d1f74f26b64006b2f50c9dc6d66efc
+mac80211 c0576e3975084d4699b7bfef578613fb8e1144f6
+sound-current 99fee508245825765ff60155fed43f970ff83a8f
+pci-current 407dae1e4415acde2d9f48bb76361893c4653756
+driver-core.current 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+tty.current 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+usb.current 2d30408ecfd450c8377186615b330d329ded18ea
+usb-gadget-fixes 7c80f9e4a588f1925b07134bb2e3689335f6c6d8
+usb-serial-fixes 299d7572e46f98534033a9e65973f13ad1ce9047
+usb-chipidea-fixes cbb22ebcfb9920380ed69854a7095d497798063d
+phy 2fb850092fd95198a0a4746f07b80077d5a3aa37
+staging.current 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+char-misc.current 512cf465ee01eb23936a9e6ed0b6414eccb00853
+input-current 2b30297d481ad305134252557768c22391e0fed6
+crypto-current b61907bb42409adf9b3120f741af7c57dd7e3db2
+ide b671e1703394d77163130c91f53b075db1c446bf
+vfio-fixes 796b755066dd6254bfb6388fec901631e868d1c7
+kselftest-fixes ea344f6a507f8ce92bf1e10f044c6cfc67e4d22b
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe
+spi-nor-fixes 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+mfd-fixes 0f0fc5c090055983163ed8e7b3a73980e128048c
+v4l-dvb-fixes ead666000a5fe34bdc82d61838e4df2d416ea15e
+reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa
+drm-intel-fixes ea850f64c2722278f150dc11de2141baeb24211c
+drm-misc-fixes f7974880cf869ddbd0ba9a8e2ab11dff4a667f96
+kbuild 5128ee1f98751bbb6e5c141ca6c93c78e76bb347
+uuid c0020756315eebec58310aca42cf9fb73e1322eb
+dma-mapping 6d57339890c9a9dfcd4ba4f8931b911b962968e3
+asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12
+arc 64dd3a7c8202f09f5d08e48577bc72ca1d85004d
+arm b3ec92e48b1568578c49489227d254959e8738b2
+arm-perf e884f80cf2a76a86547e2316982e1f200f556ddf
+arm-soc cb84cdc08eedda70cb82dc204aa798a5df1a3a4f
+actions 2a6a17c006dabb3a66e6f1f9fd40ed6c6f59b1b3
+alpine a1144b2b1ec47f50951a83eb2bd847c74415b567
+amlogic 4c4430da13d30d1e41828453a196b07caf93d7d9
+aspeed 9c9ae757dc8b8c5f7ca676587e58af3e63d4c766
+at91 bee152d6af7d735f177ad1398ed9bbe84dfb6d63
+bcm2835 e83e7335d05989773de0f70c0bea6a912343c21a
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs 88beee7ca525068f050f4564a9fe37f5caa71afb
+keystone 8270bfa5860d590a37063ee1fb586b13fb5f2caf
+mvebu 35296d4ab8a404b997724ede433fea8682d39ab1
+omap 7146456259a73e0235849940bc612662c22ac653
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+reset 2a158f888853cb11140532be79883c8faf31c83d
+qcom d5a2179120d035b56d09f5d3a8c4a6e21604d402
+realtek 74e912bc01df9a767745b50a5336a22c177a60e3
+renesas 3e6eeb6a433fd05295ff7bac578626e89ea5088e
+rockchip baec7db1d3803eef5edcdb2ec11845c4e25f1fda
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 2ea659a9ef488125eb46da6eb571de5eae5c43f6
+samsung-krzk fe6b37c4fe04a96669dc246b3a5c910ae5057bf8
+sunxi 42d7dbe2cf4c90c4c50244474b26839b88755c63
+tegra b4aed883ebbe0855c9a8cceea22ce28d621afb0a
+arm64 611a7bc74ed2dcbab6693c20bb534cfcf15f9d1d
+clk 0a4e632b6f9d1ccabe3e9507814184cd34ff3f31
+clk-samsung a4f21e9ceb5c81f5b297cabb98dac0b5c03bd4dc
+c6x 62016565bb04cb9f138510e87c9e4da95e00fdfb
+cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 10df0ba4c2c22653e554710aca6e22c3e344e0d3
+m68knommu a667eb87a7e4d65db886cc76c8430860521788cf
+metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5
+microblaze 428dbf156cc5a8f9994d1f1a5c79373d15476f3c
+mips 64876b53b00883fbd96484eecb830ee7542aaf96
+nios2 65d1e3ddeae117f6a224535e10a09145f0f96508
+openrisc 56ce2f25ab0d8830d914e626bc88e45b42e11661
+parisc-hd 3229c9219c300b58388f2e464c448ee7f7bd40ef
+powerpc 5632874311dbf432c698fcbe0cf7a49e01ebf324
+fsl a4e89ffb59235fd11d27107dea3efa4562ac0a12
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 bd5d0e61c2bb9fa3c368bf38079317f346617e35
+sparc-next 9cd6681cb1169e815c41af0265165dd1b872f228
+sh 6e2fbfdd585f46128ce8879738bca09719a65138
+tile 637f23abca87d26e091e0d6647ec878d97d2c6cd
+uml 6d20e6b235aad0be463b23588093b079362bb2e4
+unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa 271335b9726e230eda124c83af2b4773502288f5
+fscrypt c250b7dd8e73b5f7d88d231fbaac92e3360a7234
+befs 5771a8c08880cdca3bfb4a3fc6d309d6bba20877
+btrfs 5226fcac7841f66e5c141d27f0d099b5fd0d626f
+btrfs-kdave cb128ceaffcc8a6ff64d3edc8d45569714f02415
+ceph 38f340ccdf9ed5f1350505b46c5689d015967057
+cifs 2c90d14d7c772f8474ad07c080e988763e8c055b
+configfs 19e72d3abb63cb16d021a4066ce1a18880509e99
+ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3 222c8c74fbd8b2cb4bdbf46c6dec690a9b3d7d2b
+ext4 51e3ae81ec58e95f10a98ef3dd6d7bce5d8e35a2
+f2fs 7056964a85031f42e2360617b14272593729ce1b
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 5b97eeacbd80a7bb60f2534eb43304f821e1ba06
+jfs f070e5ac9bc7de71c34402048ce5526dccbd347c
+nfs 68ebe3cbe786a954481d6ded0dc83f7d551640bf
+nfsd a133552a0049aa2ff92f83dbe8d5185485b538c4
+orangefs 0b08273c8ab7e688832120c4817b1adfdc56e231
+overlayfs 85fdee1eef1a9e48ad5716916677e0c5fbc781e3
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 89b68cd926633ff0df1e1a0ae29fcd80f68bdd96
+xfs 93e8befc17f6d6ea92b0aee3741ceac8bca4590f
+file-locks 3b9f8ed25dbe5f858b1331588929f2a766aef55f
+vfs f8340cc34799cb4d9f75e9a06ce99392f94d8b74
+vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58
+printk 38a8c55325f5d4f261fde8b1bebfa2e9daf7c3e1
+pci 555291c0759eb917ec635d880fa0057235783836
+pstore e19b205be43d11bff638cad4487008c48d21c103
+hid 1275230e65a5ae5dd96356e4756c636ef707a837
+i2c 50ca324a2ed67f0a89226e71a61690881f0be694
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi e181b8c089dac15ace0df824cda9afe520e2c722
+hwmon-staging 22ba11d04ff08dbecce96790e3c0175c2d2457ab
+jc_docs 58e7cb9e935d53c64414361fba3f95ed261f9110
+v4l-dvb 8382e556b1a2f30c4bf866f021b33577a64f9ebf
+v4l-dvb-next db6321a1af8432df983048d2dd8529525589f71d
+fbdev 23e9f4ef99dd313fc8d19c326f6518459a402d71
+pm 80010c9ca2376392e1572cc9a72b457e471692c1
+opp 9e66317d3c92ddaab330c125dfe9d06eee268aff
+idle 306899f94804aece6d8fa8b4223ede3b48dbb59c
+thermal 02bc1bd0498c36c29c734bfe95401cd0e4bf3f8d
+thermal-soc aa647852c32a1890a4b1bc327b9d748b82bc1484
+ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb
+swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a
+net-next 952925dec0f276b407b2abce4aee82cba7c700c3
+ipsec-next a1b831f23a2b3306ecf275872a54abcf97b0b977
+netfilter-next 63c2af90e502fca6cda2855541d43443666e337f
+nfc-next bd751808f9ff5e1822c627f6c4283009e66b2e53
+ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f
+wireless-drivers-next 20d879e7f0fe632827bcff3016e067b4d80bf791
+bluetooth 05e89fb576f580ac95e7a5d00bdb34830b09671a
+mac80211-next a67a4893f37d5389c812d85ccf1e258b87ef4ead
+rdma 4988be5813ff2afdc0d8bfa315ef34a577d3efbf
+gfs2 c2c4be28c248232d5bdfa5911f3b721db771f4f0
+mtd 36de80740008e6a4a55115b4a92e2059e47c1cba
+l2-mtd d1f936d73683a540227cca3aaecdb68b6c3d53c5
+nand fc256f5789cbb58bb5aa308a781be46a270bcd98
+spi-nor bb1191c1e3638ddcfa90dc560e0ebdd1c46f4d82
+crypto d9fa482e5913213c2686404238f7f9cdb14b6c6c
+drm c5c7bc71a0e6bc382744497e45c6c70503f9d7e6
+drm-panel e4bac408b08437d190785ab1250cc676304ed171
+drm-intel 612dde7ec306696d376d88d659f6287391d369a4
+drm-tegra 65d5d30ccebd555de9ad8fd2b5dfc50291922337
+drm-misc cccf4e3fe3e286b55634c2c5d0c4399f4288e440
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm 642e5ef8c6c496794e3efe7d10e79216009f452f
+hdlcd fee4964f0a6cd2ce6368d2c69e9ec8e6f44fb0ec
+mali-dp e46477b8f23c4b7286884147928adefd725459d6
+sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f
+imx-drm e64b9189bfd58e215ee44159767b39b8cf6fa302
+etnaviv 8272170f7da34e2554bed10ab76582094ea6816d
+kconfig 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c
+regmap 6ee5a9e8e4b37dd906e8e235bfdea93232719298
+sound 7debc7d248ee76ac2f536fead12b5b1ff14525a0
+sound-asoc f6d4de48318c5f42615ae73d70201fc8711ee495
+modules 0bf8bf50eddc7511b52461bae798cbfaa0157a34
+input 60942e674e9d3400722d09b11ba0119ca707a1f0
+block 5cf5a83c9161d768ae76c1f0fc5abab096a14099
+lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba
+device-mapper 41dcf197ad5373a7dd0a4b6572aec2e3ec6a0e49
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc cf653c788a29fa70e07b86492a7599c471c705de
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md 6e4c63dc37a23bfdf4742307acda734276c15cae
+mfd b01e9348e106544e50691252bf58cde239681f19
+backlight 2606706e4d7b89ebf13f35895a7dfe00e394e782
+battery 5d01fd38a3b01ca2112a689d70f7ecec40d952ee
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator 9f9e5f58e7341f3365f20bde03acd65591dbe152
+security 25eabb13c7d67ae32298015c5e28d00f604f412c
+integrity 067b74aa4a3cb7745e74f6e28c51afea0249f69c
+keys 8ab2a6905b28a3a54cf833675ef555ab70cc9108
+selinux 4298555df5e5cb956549de5b01e4c77b1e4bc00a
+tpmdd 1ab761ac3d4c92cd8ae4ba9d36ea7b2e5ca1a7e4
+watchdog 4cb30b044a8f06e6e6418ae12c3c00bb02679dac
+iommu 8f6a3de987a8429e76f56e749f7f7479bb6d3db0
+dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio 79d40370e8d31886a9413e2ee115fc426b4ae97e
+trivial 6fbc8798d9461c0ff22fab9fbaddde13de815941
+audit 462d9d95961356a15d2a1606773afe1ee06c329a
+devicetree 1620c624305f3773563996757a87eecf44cecfec
+mailbox 1da92afbbfcde9dcbbf85cc94ef506c986c7e4a1
+spi 8b31a79774e2e2ca49b295d75e2af1e2e9b83af3
+tip bee090cf8fe377ef0834bdd3e7bdb2621f6c4729
+clockevents 6ec6257f89815435c9769e93eb9abd09e8959cb1
+edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755
+edac-amd 24281a2f4ca569d44e44e4cbc500cf08e7bb4c36
+irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+ftrace 6171a0310a06a7a0cb83713fa7068bdd4192de19
+rcu 698f230d8bce6575d2528baba96666e9833bc789
+kvm 31afb2ea2b10a7d17ce3db4cdb0a12b63b2fe08a
+kvm-arm 9b87e7a8bfb5098129836757608b3cbbdc11245a
+kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03
+kvm-ppc 31afb2ea2b10a7d17ce3db4cdb0a12b63b2fe08a
+kvms390 373d2f76f375e73a29e09f2eba808b8aaa2b5b70
+xen-tip eac779aa509d453a55da0ea4302bdb79c4e0854f
+percpu 438a50618095061920d3a30d4c5ca1ef2e0ff860
+workqueues d160a249ce3433550e9d6d563552918c17465080
+drivers-x86 cd6bf7741cf992306748db11e1888c741d16dd0f
+chrome-platform 859eb05676f67d4960130dff36d3368006716110
+hsi 8635d6b3afe68cdde2f646c2a3bbd8149c031e8c
+leds 94bf9e0cbb15c0d8db6c869f09f901b07f01c386
+ipmi b79bba15b3f2cf3d7828d45de2d2f2d08fcbb523
+driver-core 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f
+usb 4fcae770f3027abefd952c5d511ac6299828865a
+usb-gadget e42c6cd963538f4a97ed15322ccb78065ab18fc5
+usb-serial 9eabd28e8baf3bd7cfa729e74c664eed060958bc
+usb-chipidea-next fc5b920c3b9bbe9bf05aeb1c497643608ecb656b
+phy-next 415060b21f318e009d865b4bcbf8f220ebc36964
+tty 9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2
+char-misc c2e5df616e1ae6c2a074cb241ebb65a318ebaf7c
+extcon f12c89504cb8f7a898f4bb424302c264879975af
+staging 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee
+mux aae4e7a8bc44722fe70d58920a36916b1043195e
+slave-dma 967bec7c9c76cbddb62ba3e61b4a1b6a154c5f0f
+cgroup 8cae35ab62640c0435a21633eba1d2fecf9ccc99
+scsi d546269d304820ad2b487aeb58d235a77b4f289c
+scsi-mkp 2269848386c4b8395bc67eaaf7d08011da7c07ef
+target-updates 04229774f69250e0f7e63b4d1b50ba8371c9d165
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+target-bva 2ea659a9ef488125eb46da6eb571de5eae5c43f6
+libata 1bbb1b0d97c31a916344b3c6db4329309dae9309
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost ac7380709f6557c1c85fd9011cbe4055433a33ad
+rpmsg 243ab38a4c0a9a65fe39f576570506618d812c33
+gpio d264ab0a52d9b9b09652b883f8eab072cd803de4
+pinctrl a2ec7b6b92e14808b2c4fcf48d2712df32a89c39
+pinctrl-samsung 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e
+pwm 7755daf5e7e82499a4cdd7c2ad2be2578cc1df20
+dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a
+userns 076a9bcacfc7ccbc2b3fdf3bd490718f6b182419
+ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e
+random 72e5c740f6335e27253b8ff64d23d00337091535
+aio 2a8a98673c13cb2a61a6476153acf8344adfa992
+kselftest 9e66317d3c92ddaab330c125dfe9d06eee268aff
+y2038 69973b830859bc6529a7a0468ba0d80ee5117826
+luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d
+livepatching 93904f3ef04c18cd1b7cca6e9e1d3c0b3cc6968d
+coresight 9a937c2f634eb94cb88ef83d455c53ea6081c6c8
+rtc 74717b28cb32e1ad3c1042cafd76b264c8c0f68d
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371
+kspp be53cdda2fddf08392faf85f41e1d1581d9f9c70
+akpm-current 86766d4b6cdb85169b487c82eb4ef8273cd166ce
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..2133042c4343
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,272 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent
+nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes
+spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+uuid git git://git.infradead.org/users/hch/uuid.git#for-next
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next
+alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next
+bcm2835 git git://github.com/anholt/linux.git#for-next
+berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next
+cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mvebu git git://git.infradead.org/linux-mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next
+realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next
+c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next
+cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next
+h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next
+hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next
+ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next
+nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next
+mpc5xxx git git://git.denx.de/linux-denx-agust.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+sh git git://git.libc.org/linux-sh#for-next
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+unicore32 git git://github.com/gxt/linux.git#unicore32
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master
+befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next
+fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next
+v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-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
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+mtd git git://git.infradead.org/mtd-2.6.git#master
+l2-mtd git git://git.infradead.org/l2-mtd.git#master
+nand git git://git.infradead.org/l2-mtd.git#nand/next
+spi-nor git git://git.infradead.org/l2-mtd.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://people.freedesktop.org/~airlied/linux.git#drm-next
+drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next
+drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next
+hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd
+mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp
+sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next
+imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
+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.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#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.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next
+kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+mux git https://gitlab.com/peda-linux/mux.git#for-next
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge
+target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next
+binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://github.com/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+aio git git://git.kvack.org/~bcrl/aio-next.git#master
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038
+luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next
+borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next
+coresight git git://git.linaro.org/kernel/coresight.git#next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc
+idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/
+akpm mmotm http://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..f582ad2b6f1a
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,6532 @@
+$ date -R
+Thu, 12 Oct 2017 19:49:09 +0100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 8a5776a5f498 Linux 4.14-rc4
+Merging origin/master (ff5abbe799e2 Merge tag 'rpmsg-v4.14-fixes' of git://github.com/andersson/remoteproc)
+$ git merge origin/master
+Updating 8a5776a5f498..ff5abbe799e2
+Fast-forward
+ Documentation/networking/bonding.txt | 2 +-
+ MAINTAINERS | 4 +--
+ arch/Kconfig | 3 ---
+ arch/powerpc/kernel/exceptions-64s.S | 24 +++++++++++++++++-
+ arch/powerpc/kernel/signal_64.c | 13 +++++++++-
+ arch/sparc/Kconfig | 1 -
+ block/bio.c | 26 +++++++++++++------
+ drivers/gpio/Kconfig | 3 ++-
+ drivers/gpio/gpio-omap.c | 24 ++++++++++--------
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 ++
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 22 ----------------
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 19 --------------
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 16 ++++++------
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 14 -----------
+ drivers/net/ppp/ppp_generic.c | 20 +++++++++++++++
+ drivers/net/usb/cdc_ether.c | 13 ++++++++++
+ drivers/pinctrl/Kconfig | 1 +
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 ---
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 14 ++++++++++-
+ drivers/remoteproc/Kconfig | 2 ++
+ drivers/remoteproc/imx_rproc.c | 9 +++----
+ drivers/rpmsg/qcom_glink_native.c | 14 ++++++++---
+ fs/9p/vfs_addr.c | 10 +++++---
+ fs/direct-io.c | 3 ++-
+ fs/f2fs/f2fs.h | 2 +-
+ fs/f2fs/segment.c | 6 ++---
+ fs/f2fs/super.c | 2 +-
+ fs/nfs/client.c | 2 +-
+ fs/nfs/filelayout/filelayout.c | 3 ++-
+ fs/nfs/nfs4idmap.c | 2 +-
+ fs/nfs/nfs4proc.c | 3 +--
+ fs/nfs/nfs4xdr.c | 4 +--
+ fs/nfsd/nfs4proc.c | 9 ++++++-
+ include/linux/bpf.h | 5 ++++
+ include/linux/netfilter_bridge/ebtables.h | 7 +++---
+ include/uapi/linux/netfilter/xt_bpf.h | 1 +
+ kernel/bpf/inode.c | 1 +
+ kernel/bpf/verifier.c | 5 ++++
+ kernel/seccomp.c | 2 +-
+ net/bridge/netfilter/ebtable_broute.c | 4 +--
+ net/bridge/netfilter/ebtable_filter.c | 4 +--
+ net/bridge/netfilter/ebtable_nat.c | 4 +--
+ net/bridge/netfilter/ebtables.c | 17 +++++++------
+ net/ipv4/gre_offload.c | 2 +-
+ net/ipv4/netfilter/ipt_SYNPROXY.c | 3 ++-
+ net/ipv4/route.c | 2 +-
+ net/ipv4/udp.c | 14 ++++-------
+ net/ipv4/udp_offload.c | 2 +-
+ net/ipv6/addrconf.c | 4 +--
+ net/ipv6/ip6_offload.c | 2 +-
+ net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +-
+ net/ipv6/route.c | 2 +-
+ net/netfilter/ipset/ip_set_core.c | 29 ++++++++++++++--------
+ net/netfilter/ipset/ip_set_hash_ip.c | 22 ++++++++--------
+ net/netfilter/ipset/ip_set_hash_ipmark.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_ipport.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_ipportip.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 +--
+ net/netfilter/ipset/ip_set_hash_net.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_netnet.c | 4 +--
+ net/netfilter/ipset/ip_set_hash_netport.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_netportnet.c | 4 +--
+ net/netfilter/ipvs/ip_vs_xmit.c | 8 ++++--
+ net/netfilter/nf_tables_api.c | 10 +++++---
+ net/netfilter/x_tables.c | 4 +--
+ net/netfilter/xt_bpf.c | 22 ++++++++++++++--
+ net/netfilter/xt_socket.c | 4 +--
+ net/netlink/af_netlink.c | 13 +++++-----
+ net/sunrpc/xprtsock.c | 2 +-
+ net/tipc/bcast.c | 4 +--
+ net/tipc/msg.c | 8 ++++++
+ net/wireless/nl80211.c | 14 +++++++++--
+ net/xfrm/xfrm_device.c | 1 +
+ net/xfrm/xfrm_input.c | 6 +++--
+ net/xfrm/xfrm_state.c | 4 +--
+ net/xfrm/xfrm_user.c | 1 +
+ tools/testing/selftests/mqueue/Makefile | 4 +--
+ .../networking/timestamping/rxtimestamp.c | 2 +-
+ tools/testing/selftests/x86/Makefile | 2 +-
+ 82 files changed, 348 insertions(+), 223 deletions(-)
+Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/fixes (bbfe63b60aad Makefile: kselftest: fix grammar typo)
+$ git merge kbuild-current/fixes
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 6 +++---
+ init/Kconfig | 2 +-
+ scripts/Makefile.modpost | 1 -
+ tools/power/cpupower/Makefile | 2 +-
+ tools/scripts/Makefile.include | 6 +++---
+ 5 files changed, 8 insertions(+), 9 deletions(-)
+Merging arc-current/for-curr (753affba96d3 ARC: [plat-hsdk] Increase SDIO CIU frequency to 50000000Hz)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/boot/dts/hsdk.dts | 11 ++++++-----
+ arch/arc/configs/hsdk_defconfig | 1 -
+ arch/arc/plat-hsdk/Kconfig | 1 +
+ arch/arc/plat-hsdk/platform.c | 10 ++++++++++
+ 4 files changed, 17 insertions(+), 6 deletions(-)
+Merging arm-current/fixes (2bd6bf03f4c1 Linux 4.14-rc1)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (6b2c08f98925 powerpc: Don't call lockdep_assert_cpus_held() from arch_update_cpu_topology())
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 45 +++++++++-----------------
+ arch/powerpc/lib/sstep.c | 6 ++--
+ arch/powerpc/mm/numa.c | 1 -
+ 3 files changed, 19 insertions(+), 33 deletions(-)
+Merging sparc/master (23198ddffb6c sparc32: Add cmpxchg64().)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/cmpxchg_32.h | 3 +++
+ arch/sparc/include/asm/mmu_context_64.h | 2 ++
+ arch/sparc/kernel/time_64.c | 1 -
+ arch/sparc/lib/atomic32.c | 14 ++++++++++++++
+ drivers/sbus/char/display7seg.c | 1 -
+ include/linux/miscdevice.h | 1 +
+ 6 files changed, 20 insertions(+), 2 deletions(-)
+Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
+$ git merge fscrypt-current/for-stable
+Already up-to-date.
+Merging net/master (6e9c0075409d net/ncsi: Don't limit vids based on hot_channel)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 63 ++++++++++++----------
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 20 ++++---
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 +--
+ drivers/net/ethernet/realtek/r8169.c | 2 -
+ drivers/net/macsec.c | 2 +
+ drivers/net/wimax/i2400m/fw.c | 2 +-
+ mm/memcontrol.c | 15 ------
+ net/core/sock.c | 8 +--
+ net/ipv4/inet_connection_sock.c | 1 +
+ net/ncsi/internal.h | 1 +
+ net/ncsi/ncsi-manage.c | 17 +++---
+ 12 files changed, 75 insertions(+), 66 deletions(-)
+Merging ipsec/master (10a7ef336790 ipsec: Fix dst leak in xfrm_bundle_create().)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_policy.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+Merging netfilter/master (c0576e397508 net: call cgroup_sk_alloc() earlier in sk_clone_lock())
+$ git merge netfilter/master
+Already up-to-date.
+Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (a6127b4440d1 Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 3 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 197 ++++++++++-----------
+ drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 1 +
+ drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 2 +-
+ .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 15 ++
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 16 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 137 +++++++-------
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 21 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +-
+ 18 files changed, 232 insertions(+), 197 deletions(-)
+Merging mac80211/master (c0576e397508 net: call cgroup_sk_alloc() earlier in sk_clone_lock())
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (99fee5082458 ALSA: caiaq: Fix stray URB at probe error path)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ include/sound/seq_virmidi.h | 1 +
+ sound/core/seq/seq_clientmgr.c | 6 +++++-
+ sound/core/seq/seq_ports.c | 7 +++++--
+ sound/core/seq/seq_virmidi.c | 27 +++++++++++++++++++--------
+ sound/usb/caiaq/device.c | 12 +++++++++---
+ sound/usb/line6/driver.c | 7 ++++---
+ sound/usb/line6/podhd.c | 8 +++++---
+ sound/usb/mixer.c | 12 ++++++++++--
+ sound/usb/mixer.h | 2 ++
+ sound/usb/quirks.c | 1 +
+ 10 files changed, 61 insertions(+), 22 deletions(-)
+Merging pci-current/for-linus (407dae1e4415 PCI: aardvark: Move to struct pci_host_bridge IRQ mapping functions)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/pci/host/pci-aardvark.c | 2 ++
+ drivers/pci/host/pci-tegra.c | 22 ++++++----------------
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+Merging driver-core.current/driver-core-linus (8a5776a5f498 Linux 4.14-rc4)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (8a5776a5f498 Linux 4.14-rc4)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (2d30408ecfd4 Merge tag 'fixes-for-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/gadget/composite.c | 5 +++++
+ drivers/usb/gadget/configfs.c | 15 ++++++++-------
+ drivers/usb/gadget/configfs.h | 11 ++++++-----
+ drivers/usb/gadget/function/f_rndis.c | 12 ++++++++++--
+ drivers/usb/gadget/function/u_rndis.h | 1 +
+ drivers/usb/gadget/udc/dummy_hcd.c | 9 ++++++---
+ drivers/usb/misc/usbtest.c | 10 ++++++++--
+ drivers/usb/phy/phy-tegra-usb.c | 17 +++++++++++++++++
+ drivers/usb/renesas_usbhs/fifo.c | 2 +-
+ drivers/usb/serial/console.c | 3 ++-
+ drivers/usb/serial/cp210x.c | 13 +++++++------
+ drivers/usb/serial/ftdi_sio.c | 2 ++
+ drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++
+ drivers/usb/serial/option.c | 2 ++
+ drivers/usb/serial/qcserial.c | 4 ++++
+ 15 files changed, 86 insertions(+), 27 deletions(-)
+Merging usb-gadget-fixes/fixes (7c80f9e4a588 usb: usbtest: fix NULL pointer dereference)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (299d7572e46f USB: serial: console: fix use-after-free after failed setup)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging phy/fixes (2fb850092fd9 phy: rockchip-typec: Check for errors from tcphy_phy_init())
+$ git merge phy/fixes
+Merge made by the 'recursive' strategy.
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 18 ++++--
+ drivers/phy/mediatek/phy-mtk-tphy.c | 3 +-
+ drivers/phy/rockchip/phy-rockchip-typec.c | 82 +++++++++++++++++++---------
+ drivers/phy/tegra/xusb.c | 2 +
+ 4 files changed, 73 insertions(+), 32 deletions(-)
+Merging staging.current/staging-linus (8a5776a5f498 Linux 4.14-rc4)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (512cf465ee01 binder: fix use-after-free in binder_transaction())
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/android/binder.c | 93 ++++++++++++++++++++++++++++++-------------
+ drivers/hv/channel.c | 6 +--
+ drivers/hv/channel_mgmt.c | 37 +++++++++--------
+ drivers/hv/vmbus_drv.c | 3 +-
+ drivers/misc/mei/hw-me-regs.h | 2 +
+ drivers/misc/mei/pci-me.c | 23 ++++++-----
+ drivers/misc/mei/pci-txe.c | 30 +++++---------
+ include/linux/hyperv.h | 2 +-
+ 8 files changed, 115 insertions(+), 81 deletions(-)
+Merging input-current/for-linus (2b30297d481a Input: synaptics - disable kernel tracking on SMBus devices)
+$ git merge input-current/for-linus
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 2058 and retry the command.
+Merge made by the 'recursive' strategy.
+ drivers/input/mouse/synaptics.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging crypto-current/master (b61907bb4240 crypto: shash - Fix zero-length shash ahash digest crash)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ crypto/shash.c | 10 ++++++----
+ crypto/skcipher.c | 17 +++++++++++------
+ crypto/xts.c | 6 ++++--
+ drivers/crypto/axis/artpec6_crypto.c | 4 ++--
+ drivers/crypto/stm32/stm32-hash.c | 15 +++++++++------
+ 5 files changed, 32 insertions(+), 20 deletions(-)
+Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/ide-pnp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (ea344f6a507f selftests: mqueue: fix regression in silencing output from RUN_TESTS)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up-to-date.
+Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
+$ git merge ftrace-fixes/for-next-urgent
+Already up-to-date.
+Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
+$ git merge nand-fixes/nand/fixes
+Already up-to-date.
+Merging spi-nor-fixes/spi-nor/fixes (8a5776a5f498 Linux 4.14-rc4)
+$ git merge spi-nor-fixes/spi-nor/fixes
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging v4l-dvb-fixes/fixes (ead666000a5f media: dvb_frontend: only use kref after initialized)
+$ git merge v4l-dvb-fixes/fixes
+Auto-merging drivers/media/cec/cec-adap.c
+Merge made by the 'recursive' strategy.
+ drivers/media/cec/cec-adap.c | 13 +++--
+ drivers/media/dvb-core/dvb_frontend.c | 25 +++++++--
+ drivers/media/dvb-frontends/dib3000mc.c | 50 ++++++++++++++----
+ drivers/media/dvb-frontends/dvb-pll.c | 22 ++++++--
+ drivers/media/platform/Kconfig | 2 +-
+ drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 2 +-
+ drivers/media/platform/qcom/venus/helpers.c | 1 +
+ .../media/platform/s5p-cec/exynos_hdmi_cecctrl.c | 3 +-
+ drivers/media/platform/s5p-cec/s5p_cec.c | 11 +++-
+ drivers/media/platform/s5p-cec/s5p_cec.h | 2 +
+ drivers/media/tuners/mt2060.c | 59 +++++++++++++++++-----
+ drivers/staging/media/imx/imx-media-dev.c | 4 +-
+ 12 files changed, 153 insertions(+), 41 deletions(-)
+Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
+$ git merge reset-fixes/reset/fixes
+Merge made by the 'recursive' strategy.
+ drivers/reset/reset-socfpga.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+Merging drm-intel-fixes/for-linux-next-fixes (ea850f64c272 drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem.c | 7 ++++++-
+ drivers/gpu/drm/i915/intel_bios.c | 2 +-
+ drivers/gpu/drm/i915/intel_color.c | 16 +++++++---------
+ drivers/gpu/drm/i915/intel_display.c | 14 +++++++++-----
+ drivers/gpu/drm/i915/intel_dp.c | 4 ++--
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +-
+ 6 files changed, 26 insertions(+), 19 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (f7974880cf86 sync_file: Return consistent status in SYNC_IOC_FILE_INFO)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/dma-buf/sync_file.c | 17 ++++++++++++-----
+ drivers/gpu/drm/drm_atomic_helper.c | 1 +
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+Merging kbuild/for-next (5128ee1f9875 Merge branch 'kbuild' into for-next)
+$ git merge kbuild/for-next
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 5 +
+ Makefile | 269 +++++++++++++++++++++----------------------
+ arch/arm/Makefile | 2 +-
+ arch/arm64/Makefile | 2 +-
+ arch/hexagon/kernel/ptrace.c | 4 +-
+ arch/nios2/Makefile | 2 +-
+ scripts/Makefile.headersinst | 2 +-
+ scripts/Makefile.lib | 21 ++--
+ scripts/link-vmlinux.sh | 15 +--
+ scripts/mkcompile_h | 7 +-
+ scripts/package/Makefile | 9 +-
+ scripts/package/mkspec | 269 ++++++++++++++++++++-----------------------
+ 12 files changed, 284 insertions(+), 323 deletions(-)
+Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
+$ git merge uuid/for-next
+Already up-to-date.
+Merging dma-mapping/for-next (6d57339890c9 dma-coherent: fix rmem_dma_device_init regression)
+$ git merge dma-mapping/for-next
+Already up-to-date.
+Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (64dd3a7c8202 Merge remote-tracking branch 'reset/reset/arc' into for-next)
+$ git merge arc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/reset/snps,axs10x-reset.txt | 33 +++++++++
+ MAINTAINERS | 6 ++
+ drivers/reset/Kconfig | 6 ++
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-axs10x.c | 83 ++++++++++++++++++++++
+ 5 files changed, 129 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+ create mode 100644 drivers/reset/reset-axs10x.c
+Merging arm/for-next (b3ec92e48b15 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Auto-merging arch/arm/kernel/signal.c
+Auto-merging arch/arm/kernel/entry-common.S
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 12 +++++
+ arch/arm/boot/Makefile | 13 ++++-
+ arch/arm/boot/compressed/Makefile | 7 ++-
+ arch/arm/boot/compressed/head.S | 2 +
+ arch/arm/boot/compressed/vmlinux.lds.S | 11 ++++
+ arch/arm/boot/deflate_xip_data.sh | 64 +++++++++++++++++++++++
+ arch/arm/common/sa1111.c | 33 ------------
+ arch/arm/include/asm/dma-mapping.h | 7 ---
+ arch/arm/include/asm/elf.h | 16 +++++-
+ arch/arm/include/asm/hardware/sa1111.h | 3 --
+ arch/arm/include/asm/highmem.h | 1 -
+ arch/arm/include/asm/mmu.h | 8 +++
+ arch/arm/include/asm/processor.h | 22 +++++---
+ arch/arm/include/asm/ucontext.h | 1 +
+ arch/arm/include/uapi/asm/ptrace.h | 4 ++
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/Makefile | 5 ++
+ arch/arm/kernel/asm-offsets.c | 4 ++
+ arch/arm/kernel/atags_parse.c | 7 +--
+ arch/arm/kernel/elf.c | 24 ++++++++-
+ arch/arm/kernel/entry-common.S | 9 ----
+ arch/arm/kernel/head-common.S | 85 ++++++++++++++++++------------
+ arch/arm/kernel/head-inflate-data.c | 62 ++++++++++++++++++++++
+ arch/arm/kernel/setup.c | 10 ++++
+ arch/arm/kernel/signal.c | 53 +++++++++++++------
+ arch/arm/kernel/signal.h | 11 ++++
+ arch/arm/kernel/sigreturn_codes.S | 56 ++++++++++++++++++--
+ arch/arm/kernel/traps.c | 3 ++
+ arch/arm/kernel/vmlinux-xip.lds.S | 94 ++++++++++++++++------------------
+ arch/arm/kernel/vmlinux.lds.S | 40 +++------------
+ arch/arm/mm/dma-mapping.c | 21 ++------
+ arch/arm/mm/init.c | 10 ----
+ drivers/pcmcia/sa1111_generic.c | 33 +++++++-----
+ drivers/usb/host/ohci-sa1111.c | 25 +++++----
+ fs/Kconfig.binfmt | 4 +-
+ fs/binfmt_elf.c | 15 +++++-
+ fs/binfmt_elf_fdpic.c | 13 ++++-
+ 37 files changed, 525 insertions(+), 264 deletions(-)
+ create mode 100755 arch/arm/boot/deflate_xip_data.sh
+ create mode 100644 arch/arm/kernel/head-inflate-data.c
+ create mode 100644 arch/arm/kernel/signal.h
+Merging arm-perf/for-next/perf (e884f80cf2a7 arm64: perf: add support for Cortex-A35)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (cb84cdc08eed Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/arm-soc-for-next-contents.txt | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+Merging actions/for-next (2a6a17c006da Merge branch 'v4.15/dt' into next)
+$ git merge actions/for-next
+Removing arch/arm/mach-actions/headsmp.S
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/actions.txt | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/owl-s500-cubieboard6.dts | 44 +++++++++++++++++++
+ arch/arm/mach-actions/Makefile | 4 +-
+ arch/arm/mach-actions/headsmp.S | 52 -----------------------
+ arch/arm/mach-actions/platsmp.c | 2 +-
+ 6 files changed, 48 insertions(+), 56 deletions(-)
+ create mode 100644 arch/arm/boot/dts/owl-s500-cubieboard6.dts
+ delete mode 100644 arch/arm/mach-actions/headsmp.S
+Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
+$ git merge alpine/alpine/for-next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 4467 and retry the command.
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (4c4430da13d3 Merge branch 'v4.15/drivers' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.txt | 2 +
+ .../devicetree/bindings/arm/amlogic/analog-top.txt | 20 ++
+ .../devicetree/bindings/arm/amlogic/assist.txt | 17 +
+ .../devicetree/bindings/arm/amlogic/bootrom.txt | 17 +
+ arch/arm/boot/dts/meson.dtsi | 23 +-
+ arch/arm/boot/dts/meson8.dtsi | 13 +-
+ arch/arm/boot/dts/meson8b-odroidc1.dts | 23 ++
+ arch/arm/boot/dts/meson8b.dtsi | 25 +-
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm64/boot/dts/amlogic/Makefile | 2 +
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 12 +-
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 31 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 12 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 +-
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 +-
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 8 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 27 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 20 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 400 +++++++++++++++++++++
+ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts | 38 ++
+ drivers/soc/amlogic/Kconfig | 10 +
+ drivers/soc/amlogic/Makefile | 1 +
+ drivers/soc/amlogic/meson-mx-socinfo.c | 175 +++++++++
+ 31 files changed, 870 insertions(+), 48 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/analog-top.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/assist.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/amlogic/bootrom.txt
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
+ create mode 100644 drivers/soc/amlogic/meson-mx-socinfo.c
+Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next)
+$ git merge aspeed/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 19 +
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 56 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 58 +
+ arch/arm/boot/dts/aspeed-g4.dtsi | 1816 ++++++++++++++-----------
+ arch/arm/boot/dts/aspeed-g5.dtsi | 1806 +++++++++++++-----------
+ 5 files changed, 2199 insertions(+), 1556 deletions(-)
+Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 4 +-
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 46 +++++++++++------------
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 57 ++++++++++++++++++++++-------
+ arch/arm/boot/dts/at91sam9x25ek.dts | 10 +++++
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +
+ arch/arm/boot/dts/sama5d2.dtsi | 1 +
+ arch/arm/boot/dts/usb_a9g20_common.dtsi | 4 +-
+ 7 files changed, 84 insertions(+), 40 deletions(-)
+Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next)
+$ git merge bcm2835/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (88beee7ca525 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/misc/ge-achc.txt | 26 +
+ .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 +
+ .../devicetree/bindings/spi/spi-fsl-dspi.txt | 1 +
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/imx53-ppd.dts | 1042 ++++++++++++++++++++
+ arch/arm/boot/dts/imx6q-pistachio.dts | 693 +++++++++++++
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 3 +-
+ arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 572 +++++++++++
+ arch/arm/boot/dts/imx7d-pico.dts | 39 +
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/mach-mxs/pm.c | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 33 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 20 +
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 7 +
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 7 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 88 ++
+ arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 7 +
+ 18 files changed, 2548 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/ge-achc.txt
+ create mode 100644 arch/arm/boot/dts/imx53-ppd.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-pistachio.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+Merging keystone/next (8270bfa5860d Merge branch 'for_4.15/keystone-soc' into next)
+$ git merge keystone/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 93 +++++++++++++++
+ arch/arm/boot/dts/keystone-k2g.dtsi | 208 +++++++++++++++++++++++++++++++++
+ arch/arm/configs/keystone_defconfig | 2 +
+ drivers/firmware/ti_sci.c | 2 +-
+ 4 files changed, 304 insertions(+), 1 deletion(-)
+Merging mvebu/for-next (35296d4ab8a4 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/mvebu-uart.txt | 2 +-
+ arch/arm/boot/dts/armada-38x.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 11 ++++
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 3 +-
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 43 ++++++++++++++
+ arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 14 +++++
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 57 +++++++++++++++++++
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 11 ++++
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 11 ++++
+ .../boot/dts/marvell/armada-cp110-master.dtsi | 65 ++++++++++++++++++----
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 64 +++++++++++++++++----
+ arch/arm64/configs/defconfig | 3 +
+ 12 files changed, 261 insertions(+), 27 deletions(-)
+Merging omap/for-next (7146456259a7 Merge branch 'omap-for-v4.15/soc' into for-next)
+$ git merge omap/for-next
+Removing arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/omap/ctrl.txt | 2 +
+ Documentation/devicetree/bindings/bus/ti-sysc.txt | 93 ++++
+ Documentation/devicetree/bindings/hsi/omap-ssi.txt | 13 +-
+ .../bindings/memory-controllers/ti/emif.txt | 6 +-
+ .../devicetree/bindings/power/ti-smartreflex.txt | 47 ++
+ arch/arm/boot/dts/am33xx.dtsi | 10 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 239 ++++++++-
+ arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +
+ arch/arm/boot/dts/dra7-evm.dts | 4 -
+ arch/arm/boot/dts/dra7.dtsi | 36 +-
+ arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 +
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 209 +-------
+ arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 216 ++++++++
+ arch/arm/boot/dts/omap3-evm.dts | 76 ++-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
+ .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 1 +
+ arch/arm/boot/dts/omap3.dtsi | 1 +
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 4 +
+ arch/arm/boot/dts/omap4.dtsi | 256 ++++++++-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 4 +
+ arch/arm/boot/dts/omap5.dtsi | 3 +-
+ arch/arm/configs/omap2plus_defconfig | 10 +
+ arch/arm/mach-omap1/board-ams-delta.c | 2 +-
+ arch/arm/mach-omap1/board-fsample.c | 2 +-
+ arch/arm/mach-omap1/board-h2.c | 2 +-
+ arch/arm/mach-omap1/board-h3.c | 2 +-
+ arch/arm/mach-omap1/board-htcherald.c | 2 +-
+ arch/arm/mach-omap1/board-innovator.c | 4 +-
+ arch/arm/mach-omap1/board-nokia770.c | 2 +-
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap1/board-palmte.c | 2 +-
+ arch/arm/mach-omap1/board-palmtt.c | 2 +-
+ arch/arm/mach-omap1/board-palmz71.c | 2 +-
+ arch/arm/mach-omap1/board-perseus2.c | 2 +-
+ arch/arm/mach-omap1/board-sx1.c | 2 +-
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/common.h | 1 -
+ arch/arm/mach-omap2/dma.c | 2 +-
+ arch/arm/mach-omap2/hdq1w.c | 22 -
+ arch/arm/mach-omap2/id.c | 5 +-
+ arch/arm/mach-omap2/omap4-common.c | 24 -
+ arch/arm/mach-omap2/omap_device.c | 292 ++++-------
+ arch/arm/mach-omap2/omap_device.h | 4 -
+ arch/arm/mach-omap2/omap_hwmod.c | 569 +++++----------------
+ arch/arm/mach-omap2/omap_hwmod.h | 88 +---
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 -
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 -
+ .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 27 -
+ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 15 -
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 6 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 130 -----
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 6 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 39 --
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 43 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 548 --------------------
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 20 -
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 57 ---
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 44 --
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 41 --
+ arch/arm/mach-omap2/prcm-common.h | 1 -
+ arch/arm/mach-omap2/prm.h | 2 -
+ arch/arm/mach-omap2/prm3xxx.c | 14 +-
+ arch/arm/mach-omap2/prm44xx.c | 21 +-
+ arch/arm/mach-omap2/prm_common.c | 12 +-
+ arch/arm/mach-omap2/soc.h | 2 +-
+ arch/arm/plat-omap/dma.c | 12 +-
+ arch/arm/plat-omap/dmtimer.c | 10 +-
+ drivers/bus/Kconfig | 7 +
+ drivers/bus/Makefile | 1 +
+ drivers/bus/ti-sysc.c | 558 ++++++++++++++++++++
+ include/dt-bindings/pinctrl/am43xx.h | 12 +
+ 72 files changed, 1851 insertions(+), 2060 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/bus/ti-sysc.txt
+ create mode 100644 Documentation/devicetree/bindings/power/ti-smartreflex.txt
+ create mode 100644 arch/arm/boot/dts/omap3-evm-processor-common.dtsi
+ delete mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+ create mode 100644 drivers/bus/ti-sysc.c
+Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
+$ git merge omap-pending/for-next
+Already up-to-date.
+Merging reset/reset/next (2a158f888853 reset: uniphier: add PXs3 reset data)
+$ git merge reset/reset/next
+Auto-merging drivers/reset/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/reset/uniphier-reset.txt | 3 +
+ drivers/reset/Kconfig | 2 +-
+ drivers/reset/reset-uniphier.c | 30 +++++++
+ include/dt-bindings/reset/mt7622-reset.h | 94 ++++++++++++++++++++++
+ 4 files changed, 128 insertions(+), 1 deletion(-)
+ create mode 100644 include/dt-bindings/reset/mt7622-reset.h
+Merging qcom/for-next (d5a2179120d0 Merge branch 'drivers-for-4.15' into all-for-4.15)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/firmware/qcom,scm.txt | 2 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 5 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 67 +++
+ arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 321 +++++++++++
+ .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 641 +++++++++++++++++++++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 14 +
+ arch/arm/boot/dts/qcom-msm8974pro.dtsi | 18 +
+ arch/arm/configs/qcom_defconfig | 42 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 171 ++++++
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 22 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 7 +-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 195 +++++++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 179 ++++++
+ arch/arm64/configs/defconfig | 1 +
+ drivers/firmware/Kconfig | 11 +
+ drivers/firmware/qcom_scm-32.c | 24 +
+ drivers/firmware/qcom_scm-64.c | 44 ++
+ drivers/firmware/qcom_scm.c | 87 +++
+ drivers/firmware/qcom_scm.h | 8 +
+ drivers/soc/qcom/smem.c | 335 ++++++++---
+ include/linux/qcom_scm.h | 4 +
+ 23 files changed, 2114 insertions(+), 87 deletions(-)
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974pro.dtsi
+Merging realtek/for-next (74e912bc01df Merge branch 'v4.15/dt64' into next)
+$ git merge realtek/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+Merging renesas/next (3e6eeb6a433f Merge branches 'arm64-dt-for-v4.15', 'dt-for-v4.15' and 'soc-for-v4.15' into next)
+$ git merge renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/include/uapi/asm/ptrace.h
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/shmobile.txt | 16 +-
+ .../bindings/display/bridge/renesas,dw-hdmi.txt | 2 +-
+ .../devicetree/bindings/power/renesas,apmu.txt | 1 +
+ .../bindings/power/renesas,rcar-sysc.txt | 1 +
+ .../devicetree/bindings/reset/renesas,rst.txt | 1 +
+ MAINTAINERS | 2 +
+ arch/arm/Kconfig.debug | 10 +
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/iwg20d-q7-common.dtsi | 147 ++++
+ arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 43 ++
+ arch/arm/boot/dts/r7s72100-gr-peach.dts | 26 +-
+ arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts | 19 +
+ arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 42 +-
+ arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 43 ++
+ arch/arm/boot/dts/r8a7743.dtsi | 257 +++++++
+ arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 94 +++
+ arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 111 +++
+ arch/arm/boot/dts/r8a7745.dtsi | 337 +++++++++
+ arch/arm/boot/dts/r8a7790-lager.dts | 7 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 756 +++++++-------------
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +-
+ arch/arm/boot/dts/r8a7791-porter.dts | 4 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 760 +++++++--------------
+ arch/arm/boot/dts/r8a7792-blanche.dts | 3 +-
+ arch/arm/boot/dts/r8a7792-wheat.dts | 3 +-
+ arch/arm/boot/dts/r8a7792.dtsi | 384 +++--------
+ arch/arm/boot/dts/r8a7793-gose.dts | 4 +-
+ arch/arm/boot/dts/r8a7793.dtsi | 626 ++++++-----------
+ arch/arm/boot/dts/r8a7794-alt.dts | 7 +-
+ arch/arm/boot/dts/r8a7794-silk.dts | 3 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 700 ++++++-------------
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/include/uapi/asm/ptrace.h | 1 +
+ arch/arm/mach-shmobile/Makefile | 1 +
+ arch/arm/mach-shmobile/common.h | 2 +
+ arch/arm/mach-shmobile/headsmp-apmu.S | 39 ++
+ arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 20 +-
+ arch/arm64/Kconfig.platforms | 6 +
+ arch/arm64/boot/dts/renesas/Makefile | 4 +
+ .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 15 +-
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts | 19 +
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 37 +
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 57 ++
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 382 +++++++++++
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 78 +++
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 267 +++++++-
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 21 +-
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 169 +++++
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 7 +-
+ arch/arm64/configs/defconfig | 3 +
+ drivers/soc/renesas/Kconfig | 8 +-
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a77970-sysc.c | 39 ++
+ drivers/soc/renesas/rcar-rst.c | 1 +
+ drivers/soc/renesas/rcar-sysc.c | 3 +
+ drivers/soc/renesas/rcar-sysc.h | 1 +
+ drivers/soc/renesas/renesas-soc.c | 8 +
+ include/dt-bindings/power/r8a77970-sysc.h | 32 +
+ 62 files changed, 3318 insertions(+), 2361 deletions(-)
+ create mode 100644 arch/arm/boot/dts/iwg20d-q7-common.dtsi
+ create mode 100644 arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts
+ create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+ create mode 100644 arch/arm/boot/dts/r8a7745-iwg22m.dtsi
+ create mode 100644 arch/arm/mach-shmobile/headsmp-apmu.S
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77970.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+ create mode 100644 drivers/soc/renesas/r8a77970-sysc.c
+ create mode 100644 include/dt-bindings/power/r8a77970-sysc.h
+Merging rockchip/for-next (baec7db1d380 Merge branch 'v4.15-clk/next' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/rockchip.txt | 4 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 16 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 5 +
+ arch/arm/boot/dts/rk3036.dtsi | 19 ++
+ arch/arm/boot/dts/rk3066a.dtsi | 24 ++
+ arch/arm/boot/dts/rk3188-radxarock.dts | 4 +
+ arch/arm/boot/dts/rk3188.dtsi | 24 ++
+ arch/arm/boot/dts/rk322x.dtsi | 21 ++
+ arch/arm/boot/dts/rk3288-vyasa.dts | 341 +++++++++++++++++++++
+ arch/arm/boot/dts/rk3288.dtsi | 52 ++++
+ arch/arm/boot/dts/rk3xxx.dtsi | 11 +
+ arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 72 ++++-
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 21 ++
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 +-
+ drivers/clk/rockchip/clk-cpu.c | 2 -
+ 17 files changed, 618 insertions(+), 5 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3288-vyasa.dts
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (fe6b37c4fe04 Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/samsung/pmu.txt | 1 -
+ .../bindings/arm/samsung/samsung-boards.txt | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/exynos3250-rinato.dts | 22 -
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 -
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 2 -
+ arch/arm/boot/dts/exynos4412-trats2.dts | 111 ++++
+ arch/arm/boot/dts/exynos5250-arndale.dts | 22 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 18 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 18 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 18 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +
+ arch/arm/boot/dts/exynos5420-cpus.dtsi | 8 +
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +-
+ arch/arm/boot/dts/exynos5420.dtsi | 5 +-
+ arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 443 +++++++++++++
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 213 ++++++
+ arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 13 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 711 ++++++++-------------
+ arch/arm/boot/dts/exynos54xx.dtsi | 2 +
+ arch/arm/configs/exynos_defconfig | 2 +-
+ arch/arm/configs/multi_v7_defconfig | 2 +
+ arch/arm/mach-exynos/Kconfig | 5 -
+ arch/arm/mach-exynos/common.h | 11 +-
+ arch/arm/mach-exynos/exynos.c | 2 -
+ arch/arm/mach-exynos/firmware.c | 5 -
+ arch/arm/mach-exynos/pm.c | 3 +-
+ arch/arm/mach-exynos/suspend.c | 4 -
+ arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 8 +-
+ arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 8 +-
+ arch/arm/mach-s3c64xx/dev-backlight.c | 10 +-
+ arch/arm/plat-samsung/adc.c | 12 +-
+ arch/arm/plat-samsung/devs.c | 33 +-
+ arch/arm/plat-samsung/platformdata.c | 4 +-
+ drivers/soc/samsung/exynos-pmu.c | 9 -
+ drivers/soc/samsung/exynos-pmu.h | 2 -
+ drivers/soc/samsung/exynos4-pmu.c | 13 +-
+ 40 files changed, 1142 insertions(+), 645 deletions(-)
+ create mode 100644 arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5422-odroidhc1.dts
+Merging sunxi/sunxi/for-next (42d7dbe2cf4c Merge branches 'sunxi/clk-for-4.15' and 'sunxi/dt-for-4.15' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/arm/sunxi/README | 11 +-
+ Documentation/devicetree/bindings/arm/sunxi.txt | 2 +
+ .../devicetree/bindings/dma/sun6i-dma.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/boot/dts/Makefile | 6 +-
+ arch/arm/boot/dts/axp209.dtsi | 2 +-
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 16 -
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 6 -
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 6 +-
+ arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 32 +-
+ arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 15 +-
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 16 -
+ arch/arm/boot/dts/sun4i-a10-inet1.dts | 20 +-
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +-
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 50 +-
+ arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 16 -
+ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 7 -
+ arch/arm/boot/dts/sun4i-a10-mk802.dts | 20 -
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 6 -
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 20 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 9 -
+ arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 25 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 790 ++++---------------
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 4 +-
+ arch/arm/boot/dts/sun5i-gr8.dtsi | 8 +-
+ arch/arm/boot/dts/sun5i.dtsi | 82 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 21 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 221 ++++--
+ arch/arm/boot/dts/sun6i-a31s-primo81.dts | 25 +
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 25 +
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 8 +
+ .../boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 ++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 19 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 841 ++++-----------------
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 62 +-
+ arch/arm/boot/dts/sun8i-a23.dtsi | 4 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 18 +-
+ arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 199 +++++
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 39 +-
+ arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 20 -
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 42 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 6 +
+ arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 8 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 6 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 6 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 6 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
+ arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 178 +++++
+ arch/arm/boot/dts/sun8i-r40.dtsi | 396 ++++++++++
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 32 +-
+ arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 164 ++++
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 28 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 48 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 107 ++-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 115 ++-
+ arch/arm/mach-sunxi/sunxi.c | 1 +
+ arch/arm64/boot/dts/allwinner/Makefile | 1 +
+ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 76 +-
+ .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 193 +++++
+ drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.h | 8 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 20 +-
+ drivers/clk/sunxi-ng/ccu_reset.c | 14 +
+ include/dt-bindings/clock/sun6i-a31-ccu.h | 4 +
+ 69 files changed, 2260 insertions(+), 1984 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-r40.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+Merging tegra/for-next (b4aed883ebbe Merge branch for-4.14/arm/defconfig into for-next)
+$ git merge tegra/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (611a7bc74ed2 arm64: docs: describe ELF hwcaps)
+$ git merge arm64/for-next/core
+Auto-merging arch/arm64/mm/fault.c
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/include/asm/memory.h
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/cpu-feature-registers.txt | 12 +-
+ Documentation/arm64/elf_hwcaps.txt | 156 ++++++++++++++++++++++++++
+ Documentation/arm64/memory.txt | 10 +-
+ arch/arm64/Kconfig | 5 +-
+ arch/arm64/include/asm/elf.h | 4 +-
+ arch/arm64/include/asm/memory.h | 15 ---
+ arch/arm64/include/asm/processor.h | 21 ++++
+ arch/arm64/include/asm/sysreg.h | 4 +
+ arch/arm64/include/uapi/asm/hwcap.h | 5 +
+ arch/arm64/kernel/Makefile | 2 -
+ arch/arm64/kernel/cpufeature.c | 9 ++
+ arch/arm64/kernel/cpuinfo.c | 5 +
+ arch/arm64/kernel/entry.S | 2 +-
+ arch/arm64/kernel/setup.c | 7 +-
+ arch/arm64/kernel/smp.c | 6 +-
+ arch/arm64/mm/dma-mapping.c | 5 +-
+ arch/arm64/mm/fault.c | 52 +--------
+ drivers/perf/arm_pmu_acpi.c | 3 -
+ drivers/perf/qcom_l2_pmu.c | 54 +++++++++
+ 19 files changed, 285 insertions(+), 92 deletions(-)
+ create mode 100644 Documentation/arm64/elf_hwcaps.txt
+Merging clk/clk-next (0a4e632b6f9d Merge branch 'clk-fixes' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/clk-exynos-audss.txt | 6 +
+ .../devicetree/bindings/clock/exynos5433-clock.txt | 16 +
+ drivers/clk/clk.c | 126 ++++++-
+ drivers/clk/samsung/clk-exynos-audss.c | 76 ++--
+ drivers/clk/samsung/clk-exynos5433.c | 409 ++++++++++++++++-----
+ drivers/clk/samsung/clk-pll.c | 2 +-
+ drivers/clk/samsung/clk.c | 12 +-
+ drivers/clk/samsung/clk.h | 7 +
+ 8 files changed, 519 insertions(+), 135 deletions(-)
+Merging clk-samsung/for-next (a4f21e9ceb5c clk: samsung: Remove obsolete clkdev alias support)
+$ git merge clk-samsung/for-next
+Auto-merging drivers/clk/samsung/clk.h
+Auto-merging drivers/clk/samsung/clk.c
+Auto-merging drivers/clk/samsung/clk-pll.c
+Auto-merging drivers/clk/samsung/clk-exynos4.c
+Merge made by the 'recursive' strategy.
+ drivers/clk/samsung/clk-cpu.c | 2 -
+ drivers/clk/samsung/clk-exynos-clkout.c | 2 -
+ drivers/clk/samsung/clk-exynos4.c | 82 ++++++---------------------------
+ drivers/clk/samsung/clk-exynos5250.c | 18 ++++----
+ drivers/clk/samsung/clk-exynos5420.c | 5 +-
+ drivers/clk/samsung/clk-exynos5440.c | 12 ++++-
+ drivers/clk/samsung/clk-pll.c | 9 ----
+ drivers/clk/samsung/clk-s3c2443.c | 16 ++++---
+ drivers/clk/samsung/clk.c | 33 ++-----------
+ drivers/clk/samsung/clk.h | 73 ++++++-----------------------
+ include/dt-bindings/clock/s3c2443.h | 2 +
+ 11 files changed, 64 insertions(+), 190 deletions(-)
+Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition)
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ 1 file changed, 1 deletion(-)
+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
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 10997 and retry the command.
+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 (10df0ba4c2c2 m68k/defconfig: Update defconfigs for v4.14-rc1)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig | 4 ++++
+ arch/m68k/configs/apollo_defconfig | 4 ++++
+ arch/m68k/configs/atari_defconfig | 4 ++++
+ arch/m68k/configs/bvme6000_defconfig | 4 ++++
+ arch/m68k/configs/hp300_defconfig | 4 ++++
+ arch/m68k/configs/mac_defconfig | 4 ++++
+ arch/m68k/configs/multi_defconfig | 4 ++++
+ arch/m68k/configs/mvme147_defconfig | 4 ++++
+ arch/m68k/configs/mvme16x_defconfig | 4 ++++
+ arch/m68k/configs/q40_defconfig | 4 ++++
+ arch/m68k/configs/sun3_defconfig | 4 ++++
+ arch/m68k/configs/sun3x_defconfig | 4 ++++
+ 12 files changed, 48 insertions(+)
+Merging m68knommu/for-next (a667eb87a7e4 m68k: pull mach_beep in setup.c)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.cpu | 2 +-
+ arch/m68k/coldfire/m54xx.c | 4 ----
+ arch/m68k/include/asm/mcfmmu.h | 1 +
+ arch/m68k/include/asm/mmu_context.h | 1 -
+ arch/m68k/kernel/setup.c | 5 +++++
+ arch/m68k/kernel/setup_mm.c | 6 ++----
+ arch/m68k/mm/mcfmmu.c | 4 ++--
+ 7 files changed, 11 insertions(+), 12 deletions(-)
+Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (428dbf156cc5 arch: change default endian for microblaze)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (64876b53b008 Merge branches '4.14-fixes' and '4.15-features' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/cavium-octeon/octeon_boot.h
+Merge made by the 'recursive' strategy.
+ .../bindings/serial/brcm,bcm6345-uart.txt | 6 +
+ arch/mips/Kconfig | 4 +-
+ arch/mips/alchemy/common/clock.c | 10 +-
+ arch/mips/bcm63xx/clk.c | 242 +++++++++++++++++----
+ arch/mips/boot/dts/brcm/bcm3368.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm63268.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6328.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6358.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6362.dtsi | 2 +
+ arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +
+ .../cavium-octeon/executive/cvmx-helper-board.c | 2 +-
+ .../cavium-octeon/executive/cvmx-helper-jtag.c | 1 +
+ .../cavium-octeon/executive/cvmx-helper-rgmii.c | 1 +
+ .../cavium-octeon/executive/cvmx-helper-sgmii.c | 1 +
+ .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 1 +
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 1 +
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 3 +-
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 1 +
+ arch/mips/cavium-octeon/executive/cvmx-spi.c | 11 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 1 +
+ arch/mips/cavium-octeon/octeon_boot.h | 95 --------
+ arch/mips/cavium-octeon/setup.c | 10 +-
+ arch/mips/configs/ci20_defconfig | 7 +-
+ arch/mips/include/asm/bitops.h | 1 +
+ arch/mips/include/asm/cmpxchg.h | 6 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 8 +
+ arch/mips/include/asm/octeon/cvmx-asm.h | 6 +-
+ arch/mips/include/asm/octeon/cvmx-fpa.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-sysinfo.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx.h | 25 +--
+ arch/mips/include/asm/processor.h | 2 -
+ arch/mips/include/asm/smp.h | 2 +-
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/smp.c | 4 +-
+ arch/mips/loongson32/common/platform.c | 38 ++--
+ arch/mips/math-emu/cp1emu.c | 48 ++--
+ arch/mips/math-emu/dp_maddf.c | 8 +-
+ arch/mips/math-emu/dp_mul.c | 8 +-
+ arch/mips/math-emu/dp_sqrt.c | 4 +-
+ arch/mips/math-emu/ieee754.h | 15 +-
+ arch/mips/math-emu/ieee754int.h | 6 +-
+ arch/mips/math-emu/ieee754sp.c | 4 +-
+ arch/mips/math-emu/ieee754sp.h | 2 +-
+ arch/mips/math-emu/sp_div.c | 4 +-
+ arch/mips/math-emu/sp_fint.c | 2 +-
+ arch/mips/math-emu/sp_maddf.c | 6 +-
+ arch/mips/math-emu/sp_mul.c | 10 +-
+ arch/mips/mm/dma-default.c | 2 +-
+ arch/mips/mm/init.c | 4 -
+ arch/mips/net/ebpf_jit.c | 2 +-
+ arch/mips/pci/pcie-octeon.c | 12 +-
+ arch/mips/tools/generic-board-config.sh | 6 +-
+ drivers/tty/serial/bcm63xx_uart.c | 6 +-
+ 54 files changed, 382 insertions(+), 283 deletions(-)
+ delete mode 100644 arch/mips/cavium-octeon/octeon_boot.h
+Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging openrisc/for-next (56ce2f25ab0d openrisc: add forward declaration for struct vm_area_struct)
+$ git merge openrisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (3229c9219c30 parisc: Add CPU topology support)
+$ git merge parisc-hd/for-next
+Auto-merging arch/parisc/kernel/setup.c
+Auto-merging arch/parisc/kernel/processor.c
+Auto-merging arch/parisc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/parisc/Kconfig | 16 ++++
+ arch/parisc/include/asm/topology.h | 36 +++++++++
+ arch/parisc/kernel/Makefile | 4 +-
+ arch/parisc/kernel/processor.c | 13 ++++
+ arch/parisc/kernel/setup.c | 2 +
+ arch/parisc/kernel/topology.c | 153 +++++++++++++++++++++++++++++++------
+ 6 files changed, 198 insertions(+), 26 deletions(-)
+ create mode 100644 arch/parisc/include/asm/topology.h
+Merging powerpc/next (5632874311db cxl: Add support for POWER9 DD2)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/platforms/powernv/setup.c
+Auto-merging arch/powerpc/lib/sstep.c
+Auto-merging arch/powerpc/kernel/watchdog.c
+Auto-merging arch/powerpc/kernel/trace/ftrace_64_mprofile.S
+Auto-merging arch/powerpc/kernel/mce_power.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+Merge made by the 'recursive' strategy.
+ arch/powerpc/configs/powernv_defconfig | 1 +
+ arch/powerpc/configs/skiroot_defconfig | 232 +++++++++++++++++++++
+ arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 22 ++
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 3 +
+ arch/powerpc/include/asm/book3s/64/tlbflush.h | 15 ++
+ arch/powerpc/include/asm/eeh.h | 8 +-
+ arch/powerpc/include/asm/emulated_ops.h | 4 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 12 +-
+ arch/powerpc/include/asm/kprobes.h | 2 +-
+ arch/powerpc/include/asm/mmu_context.h | 46 ++++
+ arch/powerpc/include/asm/opal-api.h | 1 +
+ arch/powerpc/include/asm/opal.h | 2 +
+ arch/powerpc/include/asm/paca.h | 1 +
+ arch/powerpc/include/asm/uaccess.h | 17 ++
+ arch/powerpc/kernel/eeh.c | 46 ++--
+ arch/powerpc/kernel/exceptions-64s.S | 16 +-
+ arch/powerpc/kernel/irq.c | 41 +++-
+ arch/powerpc/kernel/kprobes-ftrace.c | 30 ++-
+ arch/powerpc/kernel/kprobes.c | 45 ++--
+ arch/powerpc/kernel/mce.c | 30 ++-
+ arch/powerpc/kernel/mce_power.c | 2 +-
+ arch/powerpc/kernel/process.c | 3 +-
+ arch/powerpc/kernel/tau_6xx.c | 3 +-
+ arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 4 +-
+ arch/powerpc/kernel/traps.c | 201 ++++++++++++++++++
+ arch/powerpc/kernel/watchdog.c | 29 +--
+ arch/powerpc/lib/sstep.c | 19 ++
+ arch/powerpc/mm/mmu_context.c | 9 -
+ arch/powerpc/mm/tlb-radix.c | 6 +-
+ arch/powerpc/oprofile/op_model_cell.c | 8 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 4 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 42 ++--
+ arch/powerpc/platforms/powernv/opal-irqchip.c | 8 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
+ arch/powerpc/platforms/powernv/pci-ioda.c | 3 +-
+ arch/powerpc/platforms/powernv/pci.h | 1 +
+ arch/powerpc/platforms/powernv/setup.c | 1 +
+ arch/powerpc/platforms/powernv/smp.c | 59 ++++++
+ arch/powerpc/xmon/xmon.c | 41 +++-
+ drivers/misc/cxl/api.c | 16 +-
+ drivers/misc/cxl/context.c | 3 +
+ drivers/misc/cxl/cxl.h | 2 +
+ drivers/misc/cxl/fault.c | 15 +-
+ drivers/misc/cxl/file.c | 24 ++-
+ drivers/misc/cxl/native.c | 8 +
+ drivers/misc/cxl/pci.c | 47 +++--
+ .../selftests/powerpc/dscr/dscr_sysfs_test.c | 6 +-
+ 47 files changed, 954 insertions(+), 185 deletions(-)
+ create mode 100644 arch/powerpc/configs/skiroot_defconfig
+Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err)
+$ 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 (bd5d0e61c2bb s390: qdio: Convert timers to use timer_setup())
+$ git merge s390/features
+Removing drivers/s390/virtio/kvm_virtio.c
+Auto-merging arch/s390/kernel/sthyi.c
+Removing arch/s390/include/asm/rwsem.h
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 15 +-
+ arch/s390/boot/compressed/Makefile | 2 +-
+ arch/s390/crypto/aes_s390.c | 296 ++++++++++++++++++-
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/s390/include/asm/atomic_ops.h | 32 +-
+ arch/s390/include/asm/ccwgroup.h | 2 +
+ arch/s390/include/asm/cpacf.h | 52 +++-
+ arch/s390/include/asm/kprobes.h | 2 -
+ arch/s390/include/asm/kvm_host.h | 1 -
+ arch/s390/include/asm/lowcore.h | 5 +-
+ arch/s390/include/asm/pgalloc.h | 18 +-
+ arch/s390/include/asm/processor.h | 8 +-
+ arch/s390/include/asm/runtime_instr.h | 86 +++---
+ arch/s390/include/asm/rwsem.h | 210 --------------
+ arch/s390/include/asm/spinlock.h | 162 ++---------
+ arch/s390/include/asm/spinlock_types.h | 4 +-
+ arch/s390/include/asm/string.h | 46 ++-
+ arch/s390/include/asm/sysinfo.h | 4 +-
+ arch/s390/include/asm/topology.h | 2 +
+ arch/s390/include/uapi/asm/sthyi.h | 6 +
+ arch/s390/include/uapi/asm/unistd.h | 3 +-
+ arch/s390/kernel/Makefile | 4 +-
+ arch/s390/kernel/compat_wrapper.c | 1 +
+ arch/s390/kernel/dis.c | 123 +++++++-
+ arch/s390/kernel/entry.h | 1 +
+ arch/s390/kernel/guarded_storage.c | 7 +-
+ arch/s390/kernel/kprobes.c | 7 -
+ arch/s390/kernel/perf_cpum_sf.c | 6 +-
+ arch/s390/kernel/process.c | 17 +-
+ arch/s390/kernel/ptrace.c | 142 ++++++++-
+ arch/s390/kernel/runtime_instr.c | 42 +--
+ arch/s390/kernel/setup.c | 2 +
+ arch/s390/kernel/smp.c | 14 +-
+ arch/s390/{kvm => kernel}/sthyi.c | 172 +++++++----
+ arch/s390/kernel/syscalls.S | 1 +
+ arch/s390/kernel/topology.c | 43 ++-
+ arch/s390/kernel/vdso.c | 6 +-
+ arch/s390/kvm/Makefile | 2 +-
+ arch/s390/kvm/intercept.c | 56 ++++
+ arch/s390/kvm/kvm-s390.c | 4 +-
+ arch/s390/kvm/kvm-s390.h | 5 +-
+ arch/s390/lib/mem.S | 64 +++-
+ arch/s390/lib/spinlock.c | 334 ++++++++++++---------
+ arch/s390/lib/string.c | 28 +-
+ arch/s390/mm/pgalloc.c | 14 +-
+ arch/s390/mm/vmem.c | 2 +-
+ drivers/s390/char/sclp_con.c | 7 +-
+ drivers/s390/char/sclp_tty.c | 7 +-
+ drivers/s390/char/tape_class.c | 3 +-
+ drivers/s390/char/vmlogrdr.c | 3 +-
+ drivers/s390/char/vmur.c | 3 +-
+ drivers/s390/cio/ccwgroup.c | 6 +
+ drivers/s390/cio/cmf.c | 278 +++++++-----------
+ drivers/s390/cio/qdio.h | 2 +-
+ drivers/s390/cio/qdio_main.c | 4 +-
+ drivers/s390/cio/qdio_setup.c | 3 +-
+ drivers/s390/crypto/zcrypt_msgtype50.c | 6 +-
+ drivers/s390/net/ctcm_main.c | 1 +
+ drivers/s390/net/lcs.c | 1 +
+ drivers/s390/net/qeth_core_main.c | 1 +
+ drivers/s390/virtio/Makefile | 6 +-
+ drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------
+ include/uapi/linux/elf.h | 1 +
+ samples/kprobes/kprobe_example.c | 8 +
+ 64 files changed, 1415 insertions(+), 1494 deletions(-)
+ delete mode 100644 arch/s390/include/asm/rwsem.h
+ create mode 100644 arch/s390/include/uapi/asm/sthyi.h
+ rename arch/s390/{kvm => kernel}/sthyi.c (77%)
+ delete mode 100644 drivers/s390/virtio/kvm_virtio.c
+Merging sparc-next/master (9cd6681cb116 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
+$ git merge sh/for-next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 2123 and retry the command.
+Auto-merging arch/sh/include/asm/futex.h
+Merge made by the 'recursive' strategy.
+ arch/sh/include/asm/futex.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem())
+$ git merge tile/master
+Already up-to-date.
+Merging uml/linux-next (6d20e6b235aa um: return negative in tuntap_open_tramp())
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
+$ git merge unicore32/unicore32
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 7985 and retry the command.
+Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution.
+Auto-merging arch/unicore32/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f1c820dce1ba] Merge remote-tracking branch 'unicore32/unicore32'
+$ git diff -M --stat --summary HEAD^..
+ arch/unicore32/Kconfig | 14 +
+ arch/unicore32/include/asm/Kbuild | 1 -
+ 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(+), 1 deletion(-)
+ 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 (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
+$ git merge fscrypt/master
+Already up-to-date.
+Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
+$ git merge befs/for-next
+Already up-to-date.
+Merging btrfs/next (5226fcac7841 squashfs: Add zstd support)
+$ git merge btrfs/next
+Auto-merging crypto/testmgr.h
+Auto-merging crypto/Kconfig
+Merge made by the 'recursive' strategy.
+ crypto/Kconfig | 9 ++
+ crypto/Makefile | 1 +
+ crypto/testmgr.c | 10 +++
+ crypto/testmgr.h | 71 +++++++++++++++
+ crypto/zstd.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 356 insertions(+)
+ create mode 100644 crypto/zstd.c
+Merging btrfs-kdave/for-next (cb128ceaffcc Merge branch 'for-next-next-v4.14-20171009' into for-next-20171009)
+$ git merge btrfs-kdave/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/Makefile | 2 +-
+ fs/btrfs/async-thread.c | 2 +-
+ fs/btrfs/check-integrity.c | 4 +-
+ fs/btrfs/compression.c | 507 +++++++++++++++++++++++++++++++--
+ fs/btrfs/compression.h | 6 +-
+ fs/btrfs/ctree.c | 15 +-
+ fs/btrfs/ctree.h | 8 +-
+ fs/btrfs/disk-io.c | 179 +-----------
+ fs/btrfs/extent-tree.c | 68 ++---
+ fs/btrfs/extent_io.c | 13 +-
+ fs/btrfs/extent_io.h | 1 -
+ fs/btrfs/file.c | 2 +-
+ fs/btrfs/inode.c | 54 +---
+ fs/btrfs/ioctl.c | 69 ++---
+ fs/btrfs/lzo.c | 5 +
+ fs/btrfs/props.c | 2 +-
+ fs/btrfs/raid56.c | 30 +-
+ fs/btrfs/root-tree.c | 4 -
+ fs/btrfs/send.c | 54 ++--
+ fs/btrfs/super.c | 16 +-
+ fs/btrfs/sysfs.c | 63 ++--
+ fs/btrfs/sysfs.h | 26 +-
+ fs/btrfs/tests/free-space-tree-tests.c | 3 +-
+ fs/btrfs/transaction.c | 2 +
+ fs/btrfs/tree-checker.c | 429 ++++++++++++++++++++++++++++
+ fs/btrfs/tree-checker.h | 23 ++
+ fs/btrfs/tree-log.c | 32 +--
+ fs/btrfs/volumes.c | 82 +++---
+ fs/btrfs/zlib.c | 12 +-
+ fs/btrfs/zstd.c | 24 +-
+ include/trace/events/btrfs.h | 7 +
+ include/uapi/linux/btrfs_tree.h | 1 +
+ 32 files changed, 1242 insertions(+), 503 deletions(-)
+ create mode 100644 fs/btrfs/tree-checker.c
+ create mode 100644 fs/btrfs/tree-checker.h
+Merging ceph/master (38f340ccdf9e ceph: fix __choose_mds() for LSSNAP request)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (2c90d14d7c77 cifs: fix remaining rsp_iov issues)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsglob.h | 8 ++++++--
+ fs/cifs/smb2maperror.c | 2 +-
+ fs/cifs/smb2ops.c | 31 +++++++++++++++++++++++------
+ fs/cifs/smb2pdu.c | 53 +++++++++++++++++++++++++++++--------------------
+ fs/cifs/smb2pdu.h | 5 +++--
+ fs/cifs/smb2proto.h | 1 +
+ fs/cifs/smb2transport.c | 26 +++++++++++++-----------
+ 7 files changed, 81 insertions(+), 45 deletions(-)
+Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
+$ git merge ecryptfs/next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 7127 and retry the command.
+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 (222c8c74fbd8 Merge ext2 parse_options() fixes.)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/super.c | 161 ++++++++++++++++++-------------------
+ fs/notify/fanotify/fanotify.c | 8 +-
+ fs/notify/fanotify/fanotify_user.c | 16 +++-
+ fs/notify/fdinfo.c | 3 +
+ fs/quota/dquot.c | 27 ++++---
+ include/linux/audit.h | 10 +++
+ include/linux/fsnotify_backend.h | 1 +
+ include/uapi/linux/audit.h | 1 +
+ include/uapi/linux/fanotify.h | 3 +
+ kernel/auditsc.c | 6 ++
+ 10 files changed, 140 insertions(+), 96 deletions(-)
+Merging ext4/dev (51e3ae81ec58 ext4: fix interaction between i_size, fallocate, and delalloc after a crash)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/buffer.c | 4 +-
+ fs/dax.c | 2 +-
+ fs/ext2/inode.c | 4 +-
+ fs/ext4/Kconfig | 1 +
+ fs/ext4/balloc.c | 15 ++-
+ fs/ext4/ext4.h | 7 +-
+ fs/ext4/extents.c | 6 +-
+ fs/ext4/file.c | 263 +++-----------------------------------------------
+ fs/ext4/inline.c | 33 +++++++
+ fs/ext4/inode.c | 129 ++++++++++---------------
+ fs/iomap.c | 13 +--
+ fs/nfsd/blocklayout.c | 4 +-
+ fs/xfs/xfs_iomap.c | 6 +-
+ include/linux/iomap.h | 15 +--
+ 14 files changed, 138 insertions(+), 364 deletions(-)
+Merging f2fs/dev (7056964a8503 Merge tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
+$ 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 (5b97eeacbd80 fuse: getattr cleanup)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (68ebe3cbe786 Merge tag 'nfs-for-4.14-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (a133552a0049 nfsd: use ARRAY_SIZE)
+$ git merge nfsd/nfsd-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfsd/nfs4proc.c
+Merge made by the 'recursive' strategy.
+ fs/nfs_common/grace.c | 24 ++++++++++++------------
+ fs/nfsd/fault_inject.c | 5 ++---
+ fs/nfsd/nfs4proc.c | 14 ++------------
+ fs/nfsd/nfs4state.c | 5 +++++
+ fs/nfsd/nfssvc.c | 2 +-
+ include/linux/fs.h | 4 ++--
+ 6 files changed, 24 insertions(+), 30 deletions(-)
+Merging orangefs/for-next (0b08273c8ab7 orangefs: Adjust three checks for null pointers)
+$ git merge orangefs/for-next
+Already up-to-date.
+Merging overlayfs/overlayfs-next (85fdee1eef1a ovl: fix regression caused by exclusive upper/work dir protection)
+$ git merge overlayfs/overlayfs-next
+Already up-to-date.
+Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (89b68cd92663 UBI: Fix two typos in comments)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (93e8befc17f6 xfs: handle error if xfs_btree_get_bufs fails)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/libxfs/xfs_alloc.c | 8 +++++
+ fs/xfs/libxfs/xfs_bmap.c | 4 +--
+ fs/xfs/libxfs/xfs_ialloc.c | 4 +--
+ fs/xfs/libxfs/xfs_log_format.h | 27 +++++----------
+ fs/xfs/xfs_acl.c | 22 ++++++++----
+ fs/xfs/xfs_attr_inactive.c | 2 ++
+ fs/xfs/xfs_bmap_util.c | 2 ++
+ fs/xfs/xfs_bmap_util.h | 13 +++++++
+ fs/xfs/xfs_file.c | 4 +--
+ fs/xfs/xfs_fsmap.c | 12 +++++++
+ fs/xfs/xfs_inode_item.c | 79 ++++++++++++++++++++++--------------------
+ fs/xfs/xfs_log.c | 2 +-
+ fs/xfs/xfs_mount.c | 2 +-
+ fs/xfs/xfs_ondisk.h | 2 +-
+ 14 files changed, 111 insertions(+), 72 deletions(-)
+Merging file-locks/locks-next (3b9f8ed25dbe Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
+$ git merge file-locks/locks-next
+Already up-to-date.
+Merging vfs/for-next (f8340cc34799 mips: switch to {get,put}_compat_sigset())
+$ git merge vfs/for-next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/compat.c
+Auto-merging include/linux/compat.h
+Auto-merging fs/signalfd.c
+Auto-merging fs/select.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/aio.c
+Auto-merging arch/sparc/kernel/signal32.c
+Auto-merging arch/s390/kernel/compat_signal.c
+Auto-merging arch/powerpc/kernel/signal_32.c
+Auto-merging arch/parisc/kernel/signal32.c
+Merge made by the 'recursive' strategy.
+ arch/mips/include/asm/compat-signal.h | 37 ++---------------
+ arch/parisc/kernel/signal.c | 9 ++--
+ arch/parisc/kernel/signal32.c | 13 ------
+ arch/parisc/kernel/signal32.h | 2 -
+ arch/powerpc/kernel/signal_32.c | 31 +-------------
+ arch/s390/kernel/compat_signal.c | 33 ++++-----------
+ arch/sparc/kernel/signal32.c | 9 +---
+ arch/sparc/kernel/sys_sparc32.c | 8 ++--
+ fs/aio.c | 55 +++++++++++++------------
+ fs/eventpoll.c | 4 +-
+ fs/select.c | 68 ++++++++++++-------------------
+ fs/signalfd.c | 4 +-
+ include/linux/compat.h | 10 ++---
+ kernel/compat.c | 61 ++++++++++++++-------------
+ kernel/signal.c | 77 +++++++++++------------------------
+ virt/kvm/kvm_main.c | 7 +---
+ 16 files changed, 137 insertions(+), 291 deletions(-)
+Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
+$ git merge vfs-jk/vfs
+Already up-to-date.
+Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
+$ git merge vfs-miklos/next
+Already up-to-date.
+Merging printk/for-next (38a8c55325f5 printk: simplify no_printk())
+$ git merge printk/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/printk.h | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging pci/next (555291c0759e Merge branch 'pci/host-v3-semi' into next)
+$ git merge pci/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/pci/designware-pcie-ecam.txt | 42 +
+ .../devicetree/bindings/pci/v3-v360epc-pci.txt | 75 +-
+ MAINTAINERS | 8 +-
+ arch/alpha/include/asm/pci.h | 5 -
+ arch/alpha/kernel/pci.c | 11 +-
+ arch/alpha/kernel/pci_impl.h | 8 -
+ arch/cris/include/asm/pci.h | 9 -
+ arch/frv/include/asm/pci.h | 4 -
+ arch/ia64/include/asm/pci.h | 4 -
+ arch/mips/include/asm/pci.h | 4 -
+ arch/mn10300/include/asm/pci.h | 4 -
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 3 -
+ arch/parisc/include/asm/pci.h | 8 -
+ arch/powerpc/include/asm/pci.h | 2 -
+ arch/powerpc/kernel/eeh_driver.c | 4 +-
+ arch/sh/include/asm/pci.h | 4 -
+ arch/sparc/include/asm/pci_32.h | 2 -
+ arch/x86/include/asm/pci.h | 2 -
+ arch/x86/pci/intel_mid_pci.c | 2 +-
+ arch/xtensa/include/asm/pci.h | 2 -
+ drivers/of/address.c | 19 +-
+ drivers/pci/Kconfig | 8 +-
+ drivers/pci/host/Kconfig | 6 +
+ drivers/pci/host/Makefile | 1 +
+ drivers/pci/host/pci-ftpci100.c | 20 +-
+ drivers/pci/host/pci-host-generic.c | 43 +
+ drivers/pci/host/pci-rcar-gen2.c | 20 +-
+ drivers/pci/host/pci-v3-semi.c | 965 +++++++++++++++++++++
+ drivers/pci/host/pci-xgene.c | 20 +-
+ drivers/pci/host/pcie-iproc.c | 20 +-
+ drivers/pci/host/pcie-rcar.c | 20 +-
+ drivers/pci/host/pcie-tango.c | 205 ++++-
+ drivers/pci/hotplug/acpiphp_glue.c | 15 +-
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 7 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 12 +-
+ drivers/pci/hotplug/pciehp_pci.c | 5 +-
+ drivers/pci/hotplug/shpchp_pci.c | 6 +-
+ drivers/pci/iov.c | 34 +-
+ drivers/pci/pci-acpi.c | 2 +-
+ drivers/pci/pci-sysfs.c | 35 +-
+ drivers/pci/pci.c | 35 +-
+ drivers/pci/pci.h | 3 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 9 +-
+ drivers/pci/pcie/aspm.c | 8 +-
+ drivers/pci/pcie/pme.c | 5 +-
+ drivers/pci/probe.c | 6 +-
+ drivers/pci/setup-bus.c | 7 +-
+ drivers/pci/switch/switchtec.c | 2 +-
+ include/linux/of_address.h | 10 +-
+ include/linux/pci.h | 13 +-
+ 50 files changed, 1487 insertions(+), 277 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/designware-pcie-ecam.txt
+ create mode 100644 drivers/pci/host/pci-v3-semi.c
+Merging pstore/for-next/pstore (e19b205be43d Linux 4.14-rc2)
+$ git merge pstore/for-next/pstore
+Already up-to-date.
+Merging hid/for-next (1275230e65a5 Merge branch 'for-4.14/upstream-fixes' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 4 ++--
+ drivers/hid/hid-asus.c | 29 ++++++++++++++++++++++++
+ drivers/hid/hid-core.c | 6 +++--
+ drivers/hid/hid-elecom.c | 13 +++++++----
+ drivers/hid/hid-hyperv.c | 2 +-
+ drivers/hid/hid-ids.h | 3 +++
+ drivers/hid/hid-input.c | 9 ++++++++
+ drivers/hid/hid-lg.c | 4 +++-
+ drivers/hid/hid-multitouch.c | 52 +++++++++++++++++++++++++++++++++++++++----
+ drivers/hid/usbhid/hid-core.c | 20 ++++++++++++-----
+ drivers/hid/wacom_wac.c | 37 +++++++++++++++++++-----------
+ include/linux/hid.h | 2 ++
+ 12 files changed, 149 insertions(+), 32 deletions(-)
+Merging i2c/i2c/for-next (50ca324a2ed6 Merge branch 'i2c/for-current' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/i2c-designware-core.h | 2 +
+ drivers/i2c/busses/i2c-designware-platdrv.c | 67 ++++++++++++++++++-----------
+ drivers/i2c/busses/i2c-ismt.c | 5 ++-
+ drivers/mfd/intel-lpss.h | 7 +--
+ 4 files changed, 49 insertions(+), 32 deletions(-)
+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 (e181b8c089da firmware: dmi_scan: Fix handling of empty DMI strings)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi_scan.c | 58 ++++++++++++++++++++-------------------------
+ 1 file changed, 26 insertions(+), 32 deletions(-)
+Merging hwmon-staging/hwmon-next (22ba11d04ff0 hwmon: (gpio-fan) Convert to use GPIO descriptors)
+$ git merge hwmon-staging/hwmon-next
+Removing include/linux/platform_data/sht15.h
+Removing include/linux/gpio-fan.h
+Merge made by the 'recursive' strategy.
+ .../bindings/{gpio => hwmon}/gpio-fan.txt | 0
+ .../devicetree/bindings/hwmon/max1619.txt | 12 +
+ .../devicetree/bindings/trivial-devices.txt | 1 +
+ Documentation/hwmon/sht15 | 3 +-
+ arch/arm/mach-pxa/stargate2.c | 17 +-
+ drivers/hwmon/Kconfig | 15 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/aspeed-pwm-tacho.c | 2 +-
+ drivers/hwmon/gpio-fan.c | 224 +++-----
+ drivers/hwmon/k10temp.c | 108 +++-
+ drivers/hwmon/max1619.c | 10 +
+ drivers/hwmon/max6621.c | 593 +++++++++++++++++++++
+ drivers/hwmon/sht15.c | 175 ++----
+ drivers/hwmon/stts751.c | 18 +-
+ drivers/hwmon/w83793.c | 4 +-
+ drivers/hwmon/xgene-hwmon.c | 1 +
+ include/linux/gpio-fan.h | 36 --
+ include/linux/platform_data/sht15.h | 38 --
+ 18 files changed, 885 insertions(+), 373 deletions(-)
+ rename Documentation/devicetree/bindings/{gpio => hwmon}/gpio-fan.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/max1619.txt
+ create mode 100644 drivers/hwmon/max6621.c
+ delete mode 100644 include/linux/gpio-fan.h
+ delete mode 100644 include/linux/platform_data/sht15.h
+Merging jc_docs/docs-next (58e7cb9e935d PM: docs: Fix stale reference in kernel-parameters.txt)
+$ git merge jc_docs/docs-next
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 12 +-
+ Documentation/core-api/kernel-api.rst | 43 ++++-
+ .../features/debug/KASAN/arch-support.txt | 2 +-
+ Documentation/filesystems/ext4.txt | 8 +-
+ Documentation/process/3.Early-stage.rst | 2 +-
+ Documentation/process/index.rst | 1 +
+ Documentation/process/kernel-driver-statement.rst | 199 +++++++++++++++++++++
+ Documentation/process/submitting-patches.rst | 8 +-
+ Documentation/sysctl/README | 2 +-
+ Documentation/sysctl/fs.txt | 2 +-
+ Documentation/timers/highres.txt | 4 +-
+ include/asm-generic/div64.h | 14 ++
+ include/linux/bitmap.h | 9 +-
+ include/linux/log2.h | 42 +++--
+ include/linux/math64.h | 27 +++
+ lib/crc32.c | 2 +-
+ lib/crc4.c | 2 +-
+ lib/crc8.c | 22 +--
+ lib/div64.c | 6 +
+ lib/gcd.c | 6 +
+ scripts/kernel-doc | 17 +-
+ 21 files changed, 367 insertions(+), 63 deletions(-)
+ create mode 100644 Documentation/process/kernel-driver-statement.rst
+Merging v4l-dvb/master (8382e556b1a2 Simplify major/minor non-dynamic logic)
+$ git merge v4l-dvb/master
+Removing include/linux/platform_data/media/gpio-ir-recv.h
+Removing drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+Removing drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+Removing drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h
+Removing drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c
+Removing drivers/staging/media/atomisp/platform/clock/Makefile
+Removing drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
+Auto-merging drivers/media/platform/Kconfig
+Auto-merging drivers/media/dvb-core/dvb_frontend.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/media/cec-gpio.txt | 32 ++
+ .../devicetree/bindings/media/tango-ir.txt | 21 +
+ Documentation/media/cec.h.rst.exceptions | 2 -
+ Documentation/media/kapi/cec-core.rst | 7 +-
+ Documentation/media/kapi/dtv-ca.rst | 4 +
+ Documentation/media/kapi/dtv-common.rst | 55 ++
+ Documentation/media/kapi/dtv-core.rst | 574 +--------------------
+ Documentation/media/kapi/dtv-demux.rst | 82 +++
+ Documentation/media/kapi/dtv-frontend.rst | 443 ++++++++++++++++
+ Documentation/media/kapi/dtv-net.rst | 4 +
+ Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 22 +-
+ Documentation/media/uapi/cec/cec-ioc-receive.rst | 10 +-
+ Documentation/media/uapi/dvb/examples.rst | 378 +-------------
+ Documentation/media/uapi/dvb/fe-get-property.rst | 7 +-
+ Documentation/media/uapi/dvb/net-types.rst | 2 +-
+ MAINTAINERS | 9 +
+ drivers/media/cec/cec-adap.c | 18 +-
+ drivers/media/cec/cec-api.c | 18 +-
+ drivers/media/cec/cec-core.c | 9 +-
+ drivers/media/cec/cec-pin.c | 37 +-
+ drivers/media/common/cypress_firmware.c | 6 +-
+ drivers/media/common/saa7146/saa7146_vbi.c | 2 +-
+ drivers/media/common/saa7146/saa7146_video.c | 2 +-
+ drivers/media/common/siano/smscoreapi.c | 39 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 12 +
+ drivers/media/dvb-core/dmxdev.h | 90 +++-
+ drivers/media/dvb-core/dvb_demux.c | 17 +-
+ drivers/media/dvb-core/dvb_demux.h | 248 ++++++++-
+ drivers/media/dvb-core/dvb_frontend.c | 508 +++++++++---------
+ drivers/media/dvb-core/dvb_frontend.h | 117 ++---
+ drivers/media/dvb-core/dvb_net.h | 34 +-
+ drivers/media/dvb-core/dvbdev.c | 32 +-
+ drivers/media/dvb-core/dvbdev.h | 137 ++++-
+ drivers/media/dvb-frontends/Kconfig | 6 +-
+ drivers/media/dvb-frontends/as102_fe.c | 7 +-
+ drivers/media/dvb-frontends/cx24113.c | 10 +-
+ drivers/media/dvb-frontends/cx24116.c | 22 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 7 +-
+ drivers/media/dvb-frontends/ds3000.c | 22 +-
+ drivers/media/dvb-frontends/lg2160.c | 14 -
+ drivers/media/dvb-frontends/lgdt3306a.c | 3 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 23 +-
+ drivers/media/dvb-frontends/mxl5xx.c | 2 +-
+ drivers/media/dvb-frontends/si2168.c | 1 -
+ drivers/media/dvb-frontends/sp2.c | 9 +-
+ drivers/media/dvb-frontends/stv0288.c | 7 -
+ drivers/media/dvb-frontends/stv6110.c | 9 -
+ drivers/media/i2c/Kconfig | 8 +
+ drivers/media/i2c/adv748x/adv748x-afe.c | 7 +-
+ drivers/media/i2c/adv7604.c | 10 +-
+ drivers/media/i2c/adv7842.c | 6 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
+ drivers/media/i2c/dw9714.c | 7 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 1 -
+ drivers/media/i2c/mt9m111.c | 2 +-
+ drivers/media/i2c/ov13858.c | 59 ++-
+ drivers/media/i2c/ov2640.c | 15 +-
+ drivers/media/i2c/ov5670.c | 35 +-
+ drivers/media/i2c/ov6650.c | 5 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 50 +-
+ drivers/media/i2c/soc_camera/ov9640.c | 11 +-
+ drivers/media/i2c/soc_camera/ov9740.c | 6 +-
+ drivers/media/i2c/tc358743.c | 209 +++++++-
+ drivers/media/i2c/tc358743_regs.h | 94 +++-
+ drivers/media/media-entity.c | 13 +-
+ drivers/media/pci/b2c2/Kconfig | 4 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 5 -
+ drivers/media/pci/cx18/cx18-driver.c | 28 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-i2c.c | 2 +-
+ drivers/media/pci/cx25821/cx25821-i2c.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-i2c.c | 2 +-
+ drivers/media/pci/mantis/hopper_cards.c | 9 +-
+ drivers/media/pci/mantis/mantis_cards.c | 8 +-
+ drivers/media/pci/meye/meye.c | 20 +-
+ drivers/media/pci/netup_unidvb/Kconfig | 12 +-
+ drivers/media/pci/saa7134/saa7134-i2c.c | 2 +-
+ drivers/media/pci/saa7146/hexium_gemini.c | 7 +-
+ drivers/media/pci/saa7146/hexium_orion.c | 10 +-
+ drivers/media/pci/saa7164/saa7164-buffer.c | 8 +-
+ drivers/media/pci/saa7164/saa7164-i2c.c | 2 +-
+ drivers/media/pci/ttpci/av7110.c | 2 +-
+ drivers/media/pci/ttpci/budget-core.c | 2 +-
+ drivers/media/platform/Kconfig | 10 +
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/atmel/atmel-isc.c | 12 +-
+ drivers/media/platform/atmel/atmel-isi.c | 14 +-
+ drivers/media/platform/blackfin/ppi.c | 1 -
+ drivers/media/platform/cec-gpio/Makefile | 1 +
+ drivers/media/platform/cec-gpio/cec-gpio.c | 239 +++++++++
+ drivers/media/platform/davinci/vpbe_display.c | 37 +-
+ drivers/media/platform/exynos4-is/Kconfig | 2 +-
+ drivers/media/platform/rcar_drif.c | 2 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 16 +
+ drivers/media/radio/wl128x/Kconfig | 10 +-
+ drivers/media/rc/Kconfig | 16 +-
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/ati_remote.c | 2 +-
+ drivers/media/rc/gpio-ir-recv.c | 192 ++-----
+ drivers/media/rc/igorplugusb.c | 2 +-
+ drivers/media/rc/img-ir/img-ir-core.c | 5 +-
+ drivers/media/rc/imon.c | 18 +-
+ drivers/media/rc/ir-lirc-codec.c | 65 ++-
+ drivers/media/rc/ir-nec-decoder.c | 29 +-
+ drivers/media/rc/keymaps/Makefile | 1 +
+ drivers/media/rc/keymaps/rc-avermedia-m135a.c | 3 +-
+ drivers/media/rc/keymaps/rc-tango.c | 92 ++++
+ drivers/media/rc/keymaps/rc-twinhan1027.c | 2 +-
+ drivers/media/rc/lirc_dev.c | 515 ++++++++----------
+ drivers/media/rc/mceusb.c | 2 +-
+ drivers/media/rc/rc-core-priv.h | 2 +-
+ drivers/media/rc/rc-main.c | 72 ++-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/rc/streamzap.c | 2 +-
+ drivers/media/rc/tango-ir.c | 281 ++++++++++
+ drivers/media/usb/au0828/au0828-i2c.c | 2 +-
+ drivers/media/usb/b2c2/Kconfig | 6 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 65 +--
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c | 3 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 1 +
+ drivers/media/usb/dvb-usb/friio-fe.c | 24 -
+ drivers/media/usb/dvb-usb/vp7045.c | 88 +---
+ drivers/media/usb/em28xx/em28xx-i2c.c | 2 +-
+ drivers/media/usb/gspca/Kconfig | 16 +-
+ drivers/media/usb/gspca/ov519.c | 22 +-
+ drivers/media/usb/pvrusb2/Kconfig | 1 -
+ drivers/media/usb/stk1160/stk1160-i2c.c | 2 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 32 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 9 +-
+ drivers/staging/media/atomisp/Kconfig | 11 +-
+ drivers/staging/media/atomisp/i2c/Kconfig | 70 +--
+ drivers/staging/media/atomisp/i2c/imx/drv201.c | 1 -
+ drivers/staging/media/atomisp/i2c/imx/dw9714.c | 1 -
+ drivers/staging/media/atomisp/i2c/imx/imx.c | 1 -
+ drivers/staging/media/atomisp/i2c/imx/otp_imx.c | 1 -
+ drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 8 +-
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 11 +-
+ .../atomisp/include/asm/intel_mid_pcihelpers.h | 37 --
+ drivers/staging/media/atomisp/pci/Kconfig | 17 +-
+ .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 21 +-
+ .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 2 +-
+ .../media/atomisp/pci/atomisp2/atomisp_internal.h | 3 -
+ .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 1 -
+ .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 1 -
+ .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 37 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../hrt/input_formatter_subsystem_defs.h | 2 +-
+ .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 3 +-
+ .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 6 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 12 +-
+ .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 6 +-
+ drivers/staging/media/atomisp/platform/Makefile | 1 -
+ .../staging/media/atomisp/platform/clock/Makefile | 6 -
+ .../platform/clock/platform_vlv2_plat_clk.c | 40 --
+ .../platform/clock/platform_vlv2_plat_clk.h | 27 -
+ .../media/atomisp/platform/clock/vlv2_plat_clock.c | 247 ---------
+ .../media/atomisp/platform/intel-mid/Makefile | 1 -
+ .../platform/intel-mid/atomisp_gmin_platform.c | 63 ++-
+ .../platform/intel-mid/intel_mid_pcihelpers.c | 297 -----------
+ drivers/staging/media/lirc/lirc_zilog.c | 231 ++++-----
+ include/linux/platform_data/media/gpio-ir-recv.h | 23 -
+ include/media/cec-pin.h | 4 +
+ include/media/cec.h | 16 +-
+ include/media/drv-intf/saa7146_vv.h | 4 +-
+ include/media/lirc_dev.h | 100 ++--
+ include/media/rc-map.h | 1 +
+ include/uapi/linux/cec.h | 2 +
+ include/uapi/linux/dvb/frontend.h | 2 +-
+ samples/v4l/v4l2-pci-skeleton.c | 6 +-
+ 173 files changed, 3590 insertions(+), 3453 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/media/tango-ir.txt
+ create mode 100644 Documentation/media/kapi/dtv-ca.rst
+ create mode 100644 Documentation/media/kapi/dtv-common.rst
+ create mode 100644 Documentation/media/kapi/dtv-demux.rst
+ create mode 100644 Documentation/media/kapi/dtv-frontend.rst
+ create mode 100644 Documentation/media/kapi/dtv-net.rst
+ create mode 100644 drivers/media/platform/cec-gpio/Makefile
+ create mode 100644 drivers/media/platform/cec-gpio/cec-gpio.c
+ create mode 100644 drivers/media/rc/keymaps/rc-tango.c
+ create mode 100644 drivers/media/rc/tango-ir.c
+ delete mode 100644 drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/Makefile
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h
+ delete mode 100644 drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+ delete mode 100644 drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+ delete mode 100644 include/linux/platform_data/media/gpio-ir-recv.h
+Merging v4l-dvb-next/master (db6321a1af84 media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA)
+$ git merge v4l-dvb-next/master
+Already up-to-date.
+Merging fbdev/fbdev-for-next (23e9f4ef99dd video/console: Update BIOS dates list for GPD win console rotation DMI quirk)
+$ git merge fbdev/fbdev-for-next
+Already up-to-date.
+Merging pm/linux-next (80010c9ca237 Merge branch 'device-properties' into linux-next)
+$ git merge pm/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/pm/devices.rst | 25 +-
+ MAINTAINERS | 2 +-
+ arch/arm/common/locomo.c | 24 --
+ arch/arm/include/asm/hardware/locomo.h | 2 -
+ arch/arm/include/asm/topology.h | 8 +
+ arch/arm64/include/asm/topology.h | 8 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/acpi/Kconfig | 16 ++
+ drivers/acpi/Makefile | 2 +
+ drivers/acpi/acpi_lpss.c | 8 +-
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/achware.h | 4 +-
+ drivers/acpi/acpica/acinterp.h | 6 +-
+ drivers/acpi/acpica/acutils.h | 33 ++-
+ drivers/acpi/acpica/dbconvert.c | 5 +-
+ drivers/acpi/acpica/dswexec.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 6 +-
+ drivers/acpi/acpica/exconcat.c | 2 +-
+ drivers/acpi/acpica/exconvrt.c | 30 +-
+ drivers/acpi/acpica/exmisc.c | 2 +-
+ drivers/acpi/acpica/exresop.c | 2 +-
+ drivers/acpi/acpica/hwgpe.c | 4 +-
+ drivers/acpi/acpica/hwregs.c | 72 ++---
+ drivers/acpi/acpica/hwtimer.c | 10 +-
+ drivers/acpi/acpica/hwxface.c | 118 +-------
+ drivers/acpi/acpica/nsconvert.c | 4 +-
+ drivers/acpi/acpica/tbxface.c | 9 +-
+ drivers/acpi/acpica/utstrsuppt.c | 438 +++++++++++++++++++++++++++++
+ drivers/acpi/acpica/utstrtoul64.c | 442 +++++++++++++++---------------
+ drivers/acpi/device_pm.c | 81 +++---
+ drivers/acpi/pmic/tps68470_pmic.c | 455 +++++++++++++++++++++++++++++++
+ drivers/acpi/property.c | 29 +-
+ drivers/base/arch_topology.c | 29 +-
+ drivers/base/power/Makefile | 1 -
+ drivers/base/power/generic_ops.c | 23 --
+ drivers/base/power/main.c | 32 +--
+ drivers/base/property.c | 19 +-
+ drivers/cpufreq/arm_big_little.c | 10 +-
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 -
+ drivers/cpufreq/cpufreq-dt.c | 12 +-
+ drivers/cpufreq/cpufreq.c | 6 +
+ drivers/cpufreq/powernow-k8.c | 2 +-
+ drivers/cpufreq/spear-cpufreq.c | 4 +-
+ drivers/cpufreq/ti-cpufreq.c | 5 +-
+ drivers/cpuidle/cpuidle.c | 1 +
+ drivers/opp/Kconfig | 13 +
+ drivers/{base/power => }/opp/Makefile | 0
+ drivers/{base/power => }/opp/core.c | 0
+ drivers/{base/power => }/opp/cpu.c | 0
+ drivers/{base/power => }/opp/debugfs.c | 0
+ drivers/{base/power => }/opp/of.c | 0
+ drivers/{base/power => }/opp/opp.h | 0
+ drivers/pci/pci-driver.c | 10 +-
+ include/acpi/acexcep.h | 16 +-
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl1.h | 30 ++
+ include/linux/acpi.h | 8 +-
+ include/linux/arch_topology.h | 17 +-
+ include/linux/cpufreq.h | 3 +
+ include/linux/device.h | 5 -
+ include/linux/pm.h | 1 -
+ kernel/power/Kconfig | 14 -
+ kernel/power/qos.c | 4 +-
+ kernel/power/snapshot.c | 35 +--
+ kernel/power/swap.c | 128 ++++-----
+ tools/power/acpi/tools/acpidump/Makefile | 1 +
+ tools/power/acpi/tools/acpidump/apdump.c | 3 +-
+ tools/power/acpi/tools/acpidump/apmain.c | 4 +-
+ 69 files changed, 1604 insertions(+), 689 deletions(-)
+ create mode 100644 drivers/acpi/acpica/utstrsuppt.c
+ create mode 100644 drivers/acpi/pmic/tps68470_pmic.c
+ create mode 100644 drivers/opp/Kconfig
+ rename drivers/{base/power => }/opp/Makefile (100%)
+ rename drivers/{base/power => }/opp/core.c (100%)
+ rename drivers/{base/power => }/opp/cpu.c (100%)
+ rename drivers/{base/power => }/opp/debugfs.c (100%)
+ rename drivers/{base/power => }/opp/of.c (100%)
+ rename drivers/{base/power => }/opp/opp.h (100%)
+Merging opp/opp/linux-next (9e66317d3c92 Linux 4.14-rc3)
+$ git merge opp/opp/linux-next
+Already up-to-date.
+Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
+$ git merge idle/next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 6841 and retry the command.
+Merge made by the 'recursive' strategy.
+Merging thermal/next (02bc1bd0498c Merge branch 'imx-nvmem' into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/imx-thermal.txt | 7 ++
+ arch/arm/boot/dts/imx6sx.dtsi | 13 ++-
+ arch/arm/boot/dts/imx6ul.dtsi | 19 ++++
+ drivers/thermal/imx_thermal.c | 104 +++++++++++++++------
+ 4 files changed, 112 insertions(+), 31 deletions(-)
+Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next)
+$ git merge thermal-soc/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
+$ git merge ieee1394/for-next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 5490 and retry the command.
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/ast.c | 2 +
+ fs/dlm/lock.c | 43 ++++++-----
+ fs/dlm/lowcomms.c | 218 ++++++++++++++++++++++++++++++++++--------------------
+ fs/dlm/rcom.c | 26 ++-----
+ fs/dlm/rcom.h | 1 -
+ fs/dlm/recover.c | 4 +
+ fs/dlm/recoverd.c | 16 +++-
+ 7 files changed, 186 insertions(+), 124 deletions(-)
+Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging net-next/master (952925dec0f2 bpf: remove redundant variable old_flags)
+$ git merge net-next/master
+Auto-merging tools/bpf/Makefile
+Removing net/wireless/regdb.h
+Removing net/wireless/genregdb.awk
+Removing net/wireless/db.txt
+Removing net/mac80211/aes_gcm.c
+Auto-merging net/mac80211/aead_api.c
+Auto-merging net/ipv4/inet_connection_sock.c
+Auto-merging drivers/s390/net/qeth_core_main.c
+Auto-merging drivers/net/macsec.c
+Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_nvm.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 48 +
+ Documentation/admin-guide/thunderbolt.rst | 24 +
+ .../devicetree/bindings/net/renesas,ravb.txt | 4 +-
+ Documentation/driver-api/80211/cfg80211.rst | 3 -
+ Documentation/networking/netvsc.txt | 8 +-
+ Documentation/networking/regulatory.txt | 30 +-
+ MAINTAINERS | 28 +-
+ arch/blackfin/mach-bf518/boards/ezbrd.c | 47 -
+ arch/blackfin/mach-bf518/boards/tcm-bf518.c | 1 -
+ drivers/atm/idt77105.c | 2 -
+ drivers/net/Kconfig | 12 +
+ drivers/net/Makefile | 3 +
+ drivers/net/appletalk/cops.c | 4 +-
+ drivers/net/appletalk/ltpc.c | 4 +-
+ drivers/net/arcnet/arcnet.c | 4 +-
+ drivers/net/bonding/bond_main.c | 33 +-
+ drivers/net/bonding/bond_options.c | 2 +-
+ drivers/net/caif/caif_hsi.c | 15 +-
+ drivers/net/can/grcan.c | 10 +-
+ drivers/net/can/sja1000/peak_pcmcia.c | 4 +-
+ drivers/net/can/usb/peak_usb/pcan_usb.c | 5 +-
+ drivers/net/dsa/b53/b53_common.c | 155 +-
+ drivers/net/dsa/b53/b53_priv.h | 145 +-
+ drivers/net/dsa/b53/b53_regs.h | 48 +
+ drivers/net/dsa/bcm_sf2.c | 158 +-
+ drivers/net/dsa/bcm_sf2.h | 2 -
+ drivers/net/dsa/bcm_sf2_cfp.c | 6 +-
+ drivers/net/dsa/bcm_sf2_regs.h | 11 -
+ drivers/net/dsa/lan9303-core.c | 164 +-
+ drivers/net/dsa/lan9303.h | 2 +
+ drivers/net/dsa/lan9303_mdio.c | 5 +-
+ drivers/net/dsa/mt7530.c | 7 +-
+ drivers/net/dsa/mv88e6060.c | 2 +-
+ drivers/net/dsa/qca8k.c | 2 +-
+ drivers/net/dummy.c | 4 +-
+ drivers/net/eql.c | 4 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 5 +-
+ drivers/net/ethernet/agere/et131x.c | 5 +-
+ drivers/net/ethernet/amazon/ena/ena_com.c | 4 +-
+ drivers/net/ethernet/amd/a2065.c | 7 +-
+ drivers/net/ethernet/amd/am79c961a.c | 4 +-
+ drivers/net/ethernet/amd/amd8111e.c | 5 +-
+ drivers/net/ethernet/amd/declance.c | 6 +-
+ drivers/net/ethernet/amd/pcnet32.c | 5 +-
+ drivers/net/ethernet/amd/sunlance.c | 5 +-
+ drivers/net/ethernet/broadcom/b44.c | 4 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 90 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h | 1 -
+ drivers/net/ethernet/broadcom/bnx2.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 7 +-
+ drivers/net/ethernet/broadcom/bnxt/Makefile | 3 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 5 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 1 +
+ drivers/net/ethernet/broadcom/tg3.c | 4 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 90 +-
+ .../net/ethernet/cavium/liquidio/liquidio_image.h | 1 +
+ .../net/ethernet/cavium/liquidio/octeon_device.c | 11 +-
+ .../net/ethernet/cavium/liquidio/octeon_device.h | 10 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1 +
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/Makefile | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 5 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 15 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 107 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 41 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 452 ++++++
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 66 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 136 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 8 +
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +-
+ drivers/net/ethernet/cisco/enic/enic_clsf.h | 5 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 5 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 5 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 4 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c | 4 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +-
+ drivers/net/ethernet/dlink/sundance.c | 4 +-
+ drivers/net/ethernet/fealnx.c | 8 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 5 +-
+ drivers/net/ethernet/hisilicon/Kconfig | 15 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 21 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 4 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 25 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 137 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 304 ++++
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h | 21 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 754 +++++++---
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 20 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 257 +++-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 15 +
+ .../ethernet/hisilicon/hns3/hns3pf/hns3_dcbnl.c | 100 ++
+ .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 169 ++-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h | 14 +
+ .../ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 139 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 18 +-
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 14 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 2 +
+ drivers/net/ethernet/intel/e100.c | 5 +-
+ drivers/net/ethernet/intel/e1000e/defines.h | 1 +
+ drivers/net/ethernet/intel/e1000e/e1000.h | 4 -
+ drivers/net/ethernet/intel/e1000e/mac.c | 11 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 86 +-
+ drivers/net/ethernet/intel/e1000e/param.c | 16 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 7 +-
+ drivers/net/ethernet/intel/fm10k/fm10k.h | 60 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_common.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 176 ++-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 207 ++-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 474 ++++--
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 12 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 3 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 109 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 12 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 68 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 249 ++-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 174 ++-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 401 +++--
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 20 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 +
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 62 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 22 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 204 ++-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 6 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 68 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c | 69 +
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 9 +
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 25 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 11 +-
+ drivers/net/ethernet/intel/i40evf/i40e_type.h | 23 +
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 34 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 38 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 189 ++-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 46 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 2 +
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 9 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 54 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 11 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 262 +++-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 19 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 14 +-
+ drivers/net/ethernet/korina.c | 230 +--
+ drivers/net/ethernet/marvell/mvpp2.c | 1 -
+ drivers/net/ethernet/marvell/pxa168_eth.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/catas.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 48 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 2 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 31 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 853 +++++++----
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.c | 106 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.h | 11 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 407 ++++-
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 116 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 15 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 106 +-
+ .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 129 ++
+ .../mellanox/mlxsw/spectrum_acl_flex_actions.h | 44 +
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 6 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 397 ++++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 1 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 1011 +++++++++++++
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h | 134 ++
+ .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | 838 +++++++++++
+ .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.h | 43 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 350 ++++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 22 +
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 514 +++++--
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 +
+ drivers/net/ethernet/natsemi/natsemi.c | 4 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 4 +-
+ drivers/net/ethernet/netronome/nfp/Makefile | 4 +-
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 403 ++---
+ drivers/net/ethernet/netronome/nfp/bpf/main.c | 8 -
+ drivers/net/ethernet/netronome/nfp/bpf/main.h | 49 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 412 ++++-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 16 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 130 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.c | 13 +
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 35 +
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 114 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 2 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 94 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 811 ++++++++++
+ drivers/net/ethernet/netronome/nfp/nfp_app.h | 8 +
+ drivers/net/ethernet/netronome/nfp/nfp_asm.c | 254 ++++
+ drivers/net/ethernet/netronome/nfp/nfp_asm.h | 293 +++-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 39 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 2 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 76 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 4 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 6 +
+ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 742 +++++++++
+ drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 44 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 103 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 8 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 24 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 1 +
+ drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 +
+ drivers/net/ethernet/qlogic/qla3xxx.c | 4 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c | 55 +-
+ drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 15 +-
+ drivers/net/ethernet/qualcomm/emac/emac.c | 27 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 168 ++-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 19 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 137 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.h | 3 +-
+ .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 4 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_private.h | 8 -
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 36 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 7 +-
+ drivers/net/ethernet/realtek/atp.c | 4 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 55 +-
+ drivers/net/ethernet/sis/sis900.c | 4 +-
+ drivers/net/ethernet/smsc/epic100.c | 4 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 14 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
+ drivers/net/ethernet/sun/cassini.c | 5 +-
+ drivers/net/ethernet/sun/ldmvsw.c | 2 +-
+ drivers/net/ethernet/sun/niu.c | 4 +-
+ drivers/net/ethernet/sun/sungem.c | 4 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 4 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 5 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 12 +-
+ drivers/net/hamradio/6pack.c | 4 +-
+ drivers/net/hamradio/baycom_epp.c | 50 +-
+ drivers/net/hamradio/mkiss.c | 3 +-
+ drivers/net/hippi/rrunner.c | 4 +-
+ drivers/net/hyperv/hyperv_net.h | 13 +-
+ drivers/net/hyperv/netvsc.c | 14 +-
+ drivers/net/hyperv/netvsc_drv.c | 106 +-
+ drivers/net/ieee802154/atusb.c | 317 +++-
+ drivers/net/ieee802154/atusb.h | 8 +
+ drivers/net/ifb.c | 3 +
+ drivers/net/ipvlan/ipvlan_main.c | 2 +-
+ drivers/net/macsec.c | 2 +-
+ drivers/net/macvlan.c | 20 +-
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/phy/Kconfig | 10 +
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/at803x.c | 2 +-
+ drivers/net/phy/dp83822.c | 344 +++++
+ drivers/net/phy/dp83848.c | 3 -
+ drivers/net/phy/realtek.c | 54 +-
+ drivers/net/phy/uPD60620.c | 109 ++
+ drivers/net/slip/slip.c | 8 +-
+ drivers/net/team/team.c | 5 +-
+ drivers/net/team/team_mode_loadbalance.c | 8 +-
+ drivers/net/thunderbolt.c | 1362 +++++++++++++++++
+ drivers/net/tun.c | 288 +++-
+ drivers/net/usb/asix_common.c | 2 +-
+ drivers/net/usb/catc.c | 4 +-
+ drivers/net/usb/qmi_wwan.c | 2 +-
+ drivers/net/virtio_net. | 0
+ drivers/net/virtio_net.c | 86 +-
+ drivers/net/vrf.c | 24 +-
+ drivers/net/wan/dscc4.c | 4 +-
+ drivers/net/wan/hdlc_cisco.c | 4 +-
+ drivers/net/wan/hdlc_fr.c | 5 +-
+ drivers/net/wan/hdlc_ppp.c | 4 +-
+ drivers/net/wan/lmc/lmc_main.c | 4 +-
+ drivers/net/wan/sdla.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c | 4 +-
+ drivers/net/wireless/atmel/atmel.c | 5 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +-
+ drivers/net/wireless/mac80211_hwsim.c | 192 +--
+ drivers/net/wireless/rsi/rsi_91x_hal.c | 5 +-
+ drivers/net/xen-netback/interface.c | 3 +-
+ drivers/s390/net/qeth_core.h | 22 +-
+ drivers/s390/net/qeth_core_main.c | 23 +-
+ drivers/s390/net/qeth_core_mpc.c | 4 +-
+ drivers/s390/net/qeth_core_mpc.h | 72 +
+ drivers/s390/net/qeth_l2.h | 6 +
+ drivers/s390/net/qeth_l2_main.c | 517 ++++++-
+ drivers/s390/net/qeth_l2_sys.c | 202 ++-
+ drivers/s390/net/qeth_l3_main.c | 31 +-
+ drivers/s390/net/qeth_l3_sys.c | 45 +-
+ drivers/thunderbolt/Makefile | 2 +-
+ drivers/thunderbolt/ctl.c | 46 +-
+ drivers/thunderbolt/ctl.h | 3 +-
+ drivers/thunderbolt/domain.c | 197 ++-
+ drivers/thunderbolt/icm.c | 218 ++-
+ drivers/thunderbolt/nhi.c | 412 +++--
+ drivers/thunderbolt/nhi.h | 141 +-
+ drivers/thunderbolt/nhi_regs.h | 11 +-
+ drivers/thunderbolt/property.c | 670 +++++++++
+ drivers/thunderbolt/switch.c | 7 +-
+ drivers/thunderbolt/tb.h | 88 +-
+ drivers/thunderbolt/tb_msgs.h | 168 ++-
+ drivers/thunderbolt/xdomain.c | 1579 ++++++++++++++++++++
+ drivers/vhost/net.c | 12 +-
+ include/linux/avf/virtchnl.h | 20 +
+ include/linux/bpf-cgroup.h | 54 +-
+ include/linux/bpf.h | 39 +
+ include/linux/bpf_verifier.h | 17 +
+ include/linux/byteorder/generic.h | 16 +
+ include/linux/filter.h | 32 +-
+ include/linux/ieee80211.h | 1 +
+ include/linux/if_arp.h | 2 +-
+ include/linux/if_bridge.h | 6 +
+ include/linux/if_macvlan.h | 3 +-
+ include/linux/if_phonet.h | 2 +-
+ include/linux/inetdevice.h | 1 +
+ include/linux/mod_devicetable.h | 26 +
+ include/linux/mroute.h | 46 +
+ include/linux/netdevice.h | 31 +-
+ include/linux/once.h | 6 +-
+ include/linux/perf_event.h | 7 +-
+ include/linux/qed/qed_ll2_if.h | 8 +
+ include/linux/rtnetlink.h | 4 +-
+ include/linux/skbuff.h | 133 +-
+ include/linux/tcp.h | 1 +
+ include/linux/thunderbolt.h | 598 ++++++++
+ include/net/act_api.h | 37 +-
+ include/net/addrconf.h | 4 +-
+ include/net/af_vsock.h | 20 +-
+ include/net/bonding.h | 3 +-
+ include/net/cfg80211.h | 40 +-
+ include/net/dsa.h | 20 +-
+ include/net/dst.h | 2 +-
+ include/net/dst_metadata.h | 6 +-
+ include/net/fib_notifier.h | 2 +
+ include/net/fq.h | 7 +
+ include/net/fq_impl.h | 72 +-
+ include/net/inet_ecn.h | 5 -
+ include/net/ip6_fib.h | 79 +-
+ include/net/ip6_route.h | 5 +
+ include/net/ip_fib.h | 3 -
+ include/net/ip_tunnels.h | 3 +-
+ include/net/ipv6.h | 4 +-
+ include/net/mac80211.h | 8 +-
+ include/net/neighbour.h | 4 +-
+ include/net/netns/ipv4.h | 12 +
+ include/net/netns/ipv6.h | 5 +
+ include/net/phonet/phonet.h | 6 +-
+ include/net/pkt_cls.h | 6 +-
+ include/net/rtnetlink.h | 5 -
+ include/net/sch_generic.h | 1 -
+ include/net/sctp/stream_sched.h | 72 +
+ include/net/sctp/structs.h | 63 +-
+ include/net/sock.h | 7 +-
+ include/net/switchdev.h | 1 +
+ include/net/tc_act/tc_gact.h | 5 +
+ include/net/tc_act/tc_mirred.h | 1 +
+ include/net/tcp.h | 125 +-
+ include/uapi/linux/bpf.h | 105 +-
+ include/uapi/linux/if_link.h | 3 +
+ include/uapi/linux/if_tun.h | 2 +
+ include/uapi/linux/if_tunnel.h | 1 +
+ include/uapi/linux/in6.h | 1 +
+ include/uapi/linux/nl80211.h | 82 +-
+ include/uapi/linux/openvswitch.h | 3 +
+ include/uapi/linux/qrtr.h | 35 +
+ include/uapi/linux/sctp.h | 16 +
+ include/uapi/linux/vm_sockets_diag.h | 33 +
+ kernel/bpf/Makefile | 1 +
+ kernel/bpf/arraymap.c | 2 +-
+ kernel/bpf/cgroup.c | 511 +++++--
+ kernel/bpf/core.c | 86 +-
+ kernel/bpf/disasm.c | 214 +++
+ kernel/bpf/disasm.h | 32 +
+ kernel/bpf/lpm_trie.c | 95 +-
+ kernel/bpf/sockmap.c | 4 +-
+ kernel/bpf/syscall.c | 128 +-
+ kernel/bpf/verifier.c | 822 +++++-----
+ kernel/cgroup/cgroup.c | 38 +-
+ kernel/events/core.c | 15 +-
+ kernel/trace/bpf_trace.c | 73 +-
+ lib/kobject_uevent.c | 94 +-
+ lib/once.c | 8 +-
+ lib/test_rhashtable.c | 293 +++-
+ net/8021q/vlan.c | 6 +-
+ net/8021q/vlan.h | 2 +-
+ net/8021q/vlan_netlink.c | 2 +-
+ net/batman-adv/bat_iv_ogm.c | 24 +-
+ net/batman-adv/bat_v.c | 2 +-
+ net/batman-adv/bat_v_elp.c | 6 +-
+ net/batman-adv/bat_v_ogm.c | 12 +-
+ net/batman-adv/distributed-arp-table.c | 4 +-
+ net/batman-adv/gateway_client.c | 8 +-
+ net/batman-adv/gateway_common.c | 18 +-
+ net/batman-adv/hard-interface.c | 14 +-
+ net/batman-adv/icmp_socket.c | 4 +-
+ net/batman-adv/main.c | 12 +-
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/multicast.c | 2 +-
+ net/batman-adv/originator.c | 26 +-
+ net/batman-adv/routing.c | 6 +-
+ net/batman-adv/send.c | 6 +-
+ net/batman-adv/soft-interface.c | 9 +-
+ net/batman-adv/sysfs.c | 4 +-
+ net/batman-adv/tp_meter.c | 2 +-
+ net/bpf/test_run.c | 3 +-
+ net/bridge/Makefile | 2 +-
+ net/bridge/br_arp_nd_proxy.c | 469 ++++++
+ net/bridge/br_device.c | 25 +-
+ net/bridge/br_forward.c | 2 +-
+ net/bridge/br_if.c | 20 +-
+ net/bridge/br_input.c | 75 +-
+ net/bridge/br_ioctl.c | 5 +-
+ net/bridge/br_multicast.c | 50 +-
+ net/bridge/br_netlink.c | 22 +-
+ net/bridge/br_private.h | 21 +-
+ net/bridge/br_sysfs_if.c | 20 +
+ net/core/datagram.c | 2 +-
+ net/core/dev.c | 190 ++-
+ net/core/dst.c | 16 +
+ net/core/filter.c | 107 +-
+ net/core/flow_dissector.c | 100 ++
+ net/core/lwt_bpf.c | 2 +-
+ net/core/neighbour.c | 18 +-
+ net/core/net-sysfs.c | 17 +-
+ net/core/rtnetlink.c | 222 +--
+ net/core/skbuff.c | 57 +-
+ net/dsa/Makefile | 2 +-
+ net/dsa/dsa.c | 34 +-
+ net/dsa/dsa2.c | 33 +-
+ net/dsa/dsa_priv.h | 39 +-
+ net/dsa/legacy.c | 25 +-
+ net/dsa/master.c | 117 ++
+ net/dsa/port.c | 42 +-
+ net/dsa/slave.c | 285 +---
+ net/dsa/tag_brcm.c | 9 +-
+ net/dsa/tag_dsa.c | 18 +-
+ net/dsa/tag_edsa.c | 18 +-
+ net/dsa/tag_ksz.c | 9 +-
+ net/dsa/tag_lan9303.c | 20 +-
+ net/dsa/tag_mtk.c | 16 +-
+ net/dsa/tag_qca.c | 17 +-
+ net/dsa/tag_trailer.c | 9 +-
+ net/ipv4/af_inet.c | 9 +-
+ net/ipv4/devinet.c | 30 +-
+ net/ipv4/fib_frontend.c | 22 +-
+ net/ipv4/fib_semantics.c | 15 +-
+ net/ipv4/inet_connection_sock.c | 36 +-
+ net/ipv4/inetpeer.c | 11 +-
+ net/ipv4/ip_gre.c | 30 +-
+ net/ipv4/ip_tunnel.c | 12 +-
+ net/ipv4/ip_vti.c | 7 +-
+ net/ipv4/ipip.c | 7 +-
+ net/ipv4/ipmr.c | 261 +++-
+ net/ipv4/route.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 60 +-
+ net/ipv4/tcp.c | 83 +-
+ net/ipv4/tcp_fastopen.c | 120 +-
+ net/ipv4/tcp_input.c | 269 ++--
+ net/ipv4/tcp_ipv4.c | 12 +-
+ net/ipv4/tcp_metrics.c | 14 +-
+ net/ipv4/tcp_minisocks.c | 1 +
+ net/ipv4/tcp_output.c | 179 ++-
+ net/ipv4/tcp_recovery.c | 52 +-
+ net/ipv4/tcp_timer.c | 24 +-
+ net/ipv4/tcp_vegas.c | 2 +-
+ net/ipv4/udp.c | 3 +-
+ net/ipv6/addrconf.c | 143 +-
+ net/ipv6/addrlabel.c | 146 +-
+ net/ipv6/exthdrs_core.c | 5 +-
+ net/ipv6/icmp.c | 44 +-
+ net/ipv6/ip6_fib.c | 645 ++++----
+ net/ipv6/ip6_gre.c | 8 +-
+ net/ipv6/ip6_tunnel.c | 20 +-
+ net/ipv6/ip6_vti.c | 23 +-
+ net/ipv6/ipv6_sockglue.c | 12 +
+ net/ipv6/ping.c | 5 +-
+ net/ipv6/route.c | 909 ++++++++---
+ net/ipv6/sit.c | 9 +-
+ net/kcm/kcmsock.c | 2 +-
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/{aes_ccm.c => aead_api.c} | 40 +-
+ net/mac80211/aead_api.h | 27 +
+ net/mac80211/aes_ccm.h | 42 +-
+ net/mac80211/aes_gcm.c | 109 --
+ net/mac80211/aes_gcm.h | 38 +-
+ net/mac80211/agg-rx.c | 4 +-
+ net/mac80211/ht.c | 12 +-
+ net/mac80211/ieee80211_i.h | 2 +
+ net/mac80211/iface.c | 29 +-
+ net/mac80211/mesh.c | 3 +-
+ net/mac80211/mesh.h | 1 +
+ net/mac80211/mesh_hwmp.c | 8 +-
+ net/mac80211/mesh_plink.c | 13 +-
+ net/mac80211/mlme.c | 19 +-
+ net/mac80211/scan.c | 37 +-
+ net/mac80211/sta_info.c | 61 +-
+ net/mac80211/sta_info.h | 4 +-
+ net/mac80211/tx.c | 34 +
+ net/mac80211/util.c | 25 +-
+ net/mac80211/vht.c | 10 +
+ net/mac80211/wpa.c | 4 +-
+ net/mac802154/llsec.c | 14 +-
+ net/mpls/af_mpls.c | 36 +
+ net/nfc/core.c | 5 +-
+ net/nfc/hci/core.c | 5 +-
+ net/nfc/hci/llc_shdlc.c | 15 +-
+ net/nfc/llcp_core.c | 10 +-
+ net/openvswitch/actions.c | 4 +
+ net/openvswitch/conntrack.c | 11 +
+ net/openvswitch/conntrack.h | 7 +
+ net/openvswitch/flow_netlink.c | 56 +-
+ net/openvswitch/vport-netdev.c | 3 +-
+ net/packet/af_packet.c | 4 +-
+ net/phonet/af_phonet.c | 17 +-
+ net/phonet/datagram.c | 2 +-
+ net/phonet/pep.c | 2 +-
+ net/qrtr/qrtr.c | 377 ++---
+ net/rds/ib.c | 11 +-
+ net/rds/ib.h | 2 -
+ net/rds/ib_rdma.c | 4 +-
+ net/sched/act_api.c | 220 +++
+ net/sched/act_bpf.c | 4 +-
+ net/sched/act_mirred.c | 13 +-
+ net/sched/cls_api.c | 35 +-
+ net/sched/cls_basic.c | 38 +-
+ net/sched/cls_bpf.c | 61 +-
+ net/sched/cls_flower.c | 88 +-
+ net/sched/cls_u32.c | 108 +-
+ net/sched/sch_api.c | 3 +-
+ net/sched/sch_generic.c | 10 +-
+ net/sched/sch_htb.c | 5 +
+ net/sched/sch_netem.c | 28 +-
+ net/sctp/Makefile | 3 +-
+ net/sctp/chunk.c | 6 +-
+ net/sctp/outqueue.c | 63 +-
+ net/sctp/sm_sideeffect.c | 3 +
+ net/sctp/socket.c | 179 ++-
+ net/sctp/stream.c | 196 ++-
+ net/sctp/stream_sched.c | 275 ++++
+ net/sctp/stream_sched_prio.c | 347 +++++
+ net/sctp/stream_sched_rr.c | 201 +++
+ net/smc/smc_cdc.c | 7 +-
+ net/smc/smc_cdc.h | 3 +-
+ net/smc/smc_tx.c | 6 +-
+ net/vmw_vsock/Kconfig | 10 +
+ net/vmw_vsock/Makefile | 3 +
+ net/vmw_vsock/af_vsock.c | 66 +-
+ net/vmw_vsock/diag.c | 186 +++
+ net/vmw_vsock/hyperv_transport.c | 12 +-
+ net/vmw_vsock/virtio_transport.c | 2 +-
+ net/vmw_vsock/virtio_transport_common.c | 22 +-
+ net/vmw_vsock/vmci_transport.c | 35 +-
+ net/vmw_vsock/vmci_transport_notify.c | 2 +-
+ net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +-
+ net/wireless/.gitignore | 3 +-
+ net/wireless/Kconfig | 58 +-
+ net/wireless/Makefile | 24 +-
+ net/wireless/certs/sforshee.x509 | Bin 0 -> 680 bytes
+ net/wireless/core.c | 2 +-
+ net/wireless/core.h | 5 +
+ net/wireless/db.txt | 17 -
+ net/wireless/genregdb.awk | 158 --
+ net/wireless/nl80211.c | 199 ++-
+ net/wireless/nl80211.h | 2 +
+ net/wireless/reg.c | 452 +++++-
+ net/wireless/reg.h | 14 +
+ net/wireless/regdb.h | 23 -
+ net/wireless/sme.c | 45 +-
+ net/wireless/util.c | 202 +--
+ samples/bpf/Makefile | 7 +-
+ samples/bpf/README.rst | 10 +
+ samples/bpf/bpf_load.c | 2 +
+ samples/bpf/cgroup_helpers.c | 4 +-
+ samples/bpf/map_perf_test_kern.c | 2 +-
+ samples/bpf/map_perf_test_user.c | 3 +-
+ samples/bpf/test_cgrp2_attach2.c | 224 ++-
+ samples/bpf/trace_event_kern.c | 10 +
+ samples/bpf/trace_event_user.c | 13 +-
+ samples/bpf/tracex6_kern.c | 26 +
+ samples/bpf/tracex6_user.c | 13 +-
+ samples/bpf/xdp_monitor_kern.c | 60 +-
+ samples/bpf/xdp_monitor_user.c | 123 +-
+ scripts/mod/devicetable-offsets.c | 7 +
+ scripts/mod/file2alias.c | 25 +
+ tools/Makefile | 14 +-
+ tools/{net => bpf}/Makefile | 18 +-
+ tools/{net => bpf}/bpf_asm.c | 0
+ tools/{net => bpf}/bpf_dbg.c | 0
+ tools/{net => bpf}/bpf_exp.l | 0
+ tools/{net => bpf}/bpf_exp.y | 0
+ tools/{net => bpf}/bpf_jit_disasm.c | 0
+ tools/bpf/bpftool/Documentation/Makefile | 34 +
+ tools/bpf/bpftool/Documentation/bpftool-map.rst | 110 ++
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 82 +
+ tools/bpf/bpftool/Documentation/bpftool.rst | 34 +
+ tools/bpf/bpftool/Makefile | 89 ++
+ tools/bpf/bpftool/common.c | 216 +++
+ tools/bpf/bpftool/jit_disasm.c | 87 ++
+ tools/bpf/bpftool/main.c | 212 +++
+ tools/bpf/bpftool/main.h | 95 ++
+ tools/bpf/bpftool/map.c | 744 +++++++++
+ tools/bpf/bpftool/prog.c | 484 ++++++
+ tools/include/uapi/linux/bpf.h | 80 +-
+ tools/lib/bpf/bpf.c | 89 +-
+ tools/lib/bpf/bpf.h | 27 +-
+ tools/lib/bpf/libbpf.c | 179 ++-
+ tools/lib/bpf/libbpf.h | 1 +
+ tools/testing/selftests/bpf/Makefile | 23 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 64 +-
+ tools/testing/selftests/bpf/test_lpm_map.c | 201 ++-
+ tools/testing/selftests/bpf/test_progs.c | 195 ++-
+ tools/testing/selftests/bpf/test_verifier.c | 321 +++-
+ tools/testing/selftests/bpf/test_verifier_log.c | 171 +++
+ tools/testing/selftests/bpf/test_xdp_meta.c | 53 +
+ tools/testing/selftests/bpf/test_xdp_meta.sh | 51 +
+ tools/testing/selftests/net/rtnetlink.sh | 229 +++
+ tools/testing/vsock/.gitignore | 2 +
+ tools/testing/vsock/Makefile | 9 +
+ tools/testing/vsock/README | 36 +
+ tools/testing/vsock/control.c | 219 +++
+ tools/testing/vsock/control.h | 13 +
+ tools/testing/vsock/timeout.c | 64 +
+ tools/testing/vsock/timeout.h | 14 +
+ tools/testing/vsock/vsock_diag_test.c | 681 +++++++++
+ 643 files changed, 36262 insertions(+), 8656 deletions(-)
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_dcbnl.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_asm.c
+ create mode 100644 drivers/net/phy/dp83822.c
+ create mode 100644 drivers/net/phy/uPD60620.c
+ create mode 100644 drivers/net/thunderbolt.c
+ create mode 100644 drivers/net/virtio_net.
+ create mode 100644 drivers/thunderbolt/property.c
+ create mode 100644 drivers/thunderbolt/xdomain.c
+ create mode 100644 include/linux/thunderbolt.h
+ create mode 100644 include/net/sctp/stream_sched.h
+ create mode 100644 include/uapi/linux/vm_sockets_diag.h
+ create mode 100644 kernel/bpf/disasm.c
+ create mode 100644 kernel/bpf/disasm.h
+ create mode 100644 net/bridge/br_arp_nd_proxy.c
+ create mode 100644 net/dsa/master.c
+ rename net/mac80211/{aes_ccm.c => aead_api.c} (67%)
+ create mode 100644 net/mac80211/aead_api.h
+ delete mode 100644 net/mac80211/aes_gcm.c
+ create mode 100644 net/sctp/stream_sched.c
+ create mode 100644 net/sctp/stream_sched_prio.c
+ create mode 100644 net/sctp/stream_sched_rr.c
+ create mode 100644 net/vmw_vsock/diag.c
+ create mode 100644 net/wireless/certs/sforshee.x509
+ delete mode 100644 net/wireless/db.txt
+ delete mode 100644 net/wireless/genregdb.awk
+ delete mode 100644 net/wireless/regdb.h
+ rename tools/{net => bpf}/Makefile (74%)
+ rename tools/{net => bpf}/bpf_asm.c (100%)
+ rename tools/{net => bpf}/bpf_dbg.c (100%)
+ rename tools/{net => bpf}/bpf_exp.l (100%)
+ rename tools/{net => bpf}/bpf_exp.y (100%)
+ rename tools/{net => bpf}/bpf_jit_disasm.c (100%)
+ create mode 100644 tools/bpf/bpftool/Documentation/Makefile
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-map.rst
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-prog.rst
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool.rst
+ create mode 100644 tools/bpf/bpftool/Makefile
+ create mode 100644 tools/bpf/bpftool/common.c
+ create mode 100644 tools/bpf/bpftool/jit_disasm.c
+ create mode 100644 tools/bpf/bpftool/main.c
+ create mode 100644 tools/bpf/bpftool/main.h
+ create mode 100644 tools/bpf/bpftool/map.c
+ create mode 100644 tools/bpf/bpftool/prog.c
+ create mode 100644 tools/testing/selftests/bpf/test_verifier_log.c
+ create mode 100644 tools/testing/selftests/bpf/test_xdp_meta.c
+ create mode 100755 tools/testing/selftests/bpf/test_xdp_meta.sh
+ create mode 100644 tools/testing/vsock/.gitignore
+ create mode 100644 tools/testing/vsock/Makefile
+ create mode 100644 tools/testing/vsock/README
+ create mode 100644 tools/testing/vsock/control.c
+ create mode 100644 tools/testing/vsock/control.h
+ create mode 100644 tools/testing/vsock/timeout.c
+ create mode 100644 tools/testing/vsock/timeout.h
+ create mode 100644 tools/testing/vsock/vsock_diag_test.c
+Merging ipsec-next/master (a1b831f23a2b xfrm: eradicate size_t)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_user.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 8 +++----
+ net/xfrm/xfrm_user.c | 60 +++++++++++++++++++++++++++-------------------------
+ 2 files changed, 35 insertions(+), 33 deletions(-)
+Merging netfilter-next/master (63c2af90e502 netfilter: ipset: deduplicate prefixlen maps)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/ipset/ip_set_hash_ipportnet.c
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +-
+ net/netfilter/ipset/ip_set_list_set.c | 5 +-
+ net/netfilter/ipset/pfxlen.c | 395 ++++++++++------------------
+ 3 files changed, 139 insertions(+), 263 deletions(-)
+Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
+$ git merge nfc-next/master
+Already up-to-date.
+Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
+$ git merge ipvs-next/master
+Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging wireless-drivers-next/master (20d879e7f0fe Merge tag 'iwlwifi-next-for-kalle-2017-10-06-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
+$ git merge wireless-drivers-next/master
+Resolved 'drivers/net/wireless/intel/iwlwifi/cfg/a000.c' using previous resolution.
+Resolved 'drivers/net/wireless/intel/iwlwifi/iwl-config.h' using previous resolution.
+Resolved 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c' using previous resolution.
+Auto-merging drivers/net/wireless/rsi/rsi_91x_hal.c
+Auto-merging drivers/net/wireless/quantenna/qtnfmac/event.c
+Auto-merging drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-config.h
+CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a26f2b0ff77e] Merge remote-tracking branch 'wireless-drivers-next/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/net/wireless/broadcom/b43/phy_g.c | 2 +-
+ drivers/net/wireless/broadcom/b43/phy_ht.c | 6 +-
+ drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 5 -
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/Makefile | 1 +
+ drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 103 ++---
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 210 ++++++++++
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 138 +++++++
+ .../net/wireless/intel/iwlwifi/fw/api/binding.h | 41 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 9 +
+ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 67 ----
+ drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 3 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 4 -
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 98 +----
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 17 -
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 16 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 16 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 16 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 76 ----
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 32 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 207 ++--------
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 52 +--
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 62 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 22 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 59 +--
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 96 ++---
+ .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 100 +----
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 89 ++++
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 23 +-
+ drivers/net/wireless/intersil/p54/main.c | 7 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 57 +--
+ drivers/net/wireless/marvell/mwifiex/fw.h | 1 +
+ drivers/net/wireless/marvell/mwifiex/main.h | 1 -
+ drivers/net/wireless/marvell/mwifiex/scan.c | 5 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 3 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 69 +---
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 52 ++-
+ drivers/net/wireless/quantenna/qtnfmac/commands.h | 3 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h | 6 -
+ drivers/net/wireless/quantenna/qtnfmac/event.c | 34 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h | 45 ++-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.c | 68 +++-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.h | 4 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 5 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 13 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 6 +-
+ drivers/net/wireless/rsi/rsi_91x_core.c | 33 +-
+ drivers/net/wireless/rsi/rsi_91x_debugfs.c | 19 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c | 86 ++--
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 446 ++++++++++++++++-----
+ drivers/net/wireless/rsi/rsi_91x_main.c | 34 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 46 ++-
+ drivers/net/wireless/rsi/rsi_91x_ps.c | 15 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 128 +++++-
+ drivers/net/wireless/rsi/rsi_91x_usb.c | 4 +-
+ drivers/net/wireless/rsi/rsi_common.h | 4 +-
+ drivers/net/wireless/rsi/rsi_hal.h | 6 +-
+ drivers/net/wireless/rsi/rsi_main.h | 24 +-
+ drivers/net/wireless/rsi/rsi_mgmt.h | 21 +-
+ drivers/net/wireless/rsi/rsi_ps.h | 7 +-
+ drivers/net/wireless/rsi/rsi_sdio.h | 2 +
+ 81 files changed, 1764 insertions(+), 1148 deletions(-)
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+Merging bluetooth/master (05e89fb576f5 Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/bluetooth.txt | 5 +
+ .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 +
+ drivers/bluetooth/Kconfig | 3 +-
+ drivers/bluetooth/bluecard_cs.c | 7 +-
+ drivers/bluetooth/btbcm.c | 1 +
+ drivers/bluetooth/btmrvl_sdio.c | 6 +-
+ drivers/bluetooth/btqcomsmd.c | 45 ++++
+ drivers/bluetooth/hci_bcm.c | 262 ++++++++++++---------
+ drivers/bluetooth/hci_bcsp.c | 10 +-
+ drivers/bluetooth/hci_h5.c | 10 +-
+ drivers/bluetooth/hci_ldisc.c | 7 +
+ drivers/bluetooth/hci_qca.c | 17 +-
+ drivers/net/ieee802154/ca8210.c | 2 +-
+ net/bluetooth/ecdh_helper.c | 228 +++++++++---------
+ net/bluetooth/ecdh_helper.h | 9 +-
+ net/bluetooth/selftest.c | 48 +++-
+ net/bluetooth/smp.c | 127 ++++++----
+ 17 files changed, 482 insertions(+), 313 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
+Merging mac80211-next/master (a67a4893f37d cfg80211: remove set but never used variable cf_offset)
+$ git merge mac80211-next/master
+Merge made by the 'recursive' strategy.
+ net/mac80211/aead_api.c | 4 ++--
+ net/wireless/chan.c | 4 +---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+Merging rdma/for-next (4988be5813ff IB/hfi1: Do not warn on lid conversions for OPA)
+$ git merge rdma/for-next
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c
+Auto-merging drivers/infiniband/hw/qedr/qedr_roce_cm.c
+Auto-merging drivers/infiniband/hw/qedr/qedr.h
+Auto-merging drivers/infiniband/hw/mlx5/mr.c
+Auto-merging drivers/infiniband/hw/i40iw/i40iw_verbs.c
+Auto-merging drivers/infiniband/hw/hfi1/file_ops.c
+Auto-merging drivers/infiniband/hw/hfi1/chip.h
+Auto-merging drivers/infiniband/hw/hfi1/chip.c
+Auto-merging drivers/infiniband/core/uverbs_cmd.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/infiniband/Kconfig | 1 -
+ drivers/infiniband/core/user_mad.c | 11 +-
+ drivers/infiniband/core/uverbs.h | 35 +-
+ drivers/infiniband/core/uverbs_cmd.c | 125 +-
+ drivers/infiniband/core/uverbs_ioctl_merge.c | 2 +-
+ drivers/infiniband/core/uverbs_main.c | 22 +-
+ drivers/infiniband/core/uverbs_std_types.c | 3 +-
+ drivers/infiniband/hw/cxgb3/Kconfig | 2 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 6 +-
+ drivers/infiniband/hw/cxgb4/Kconfig | 2 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 284 +-
+ drivers/infiniband/hw/cxgb4/cq.c | 117 +-
+ drivers/infiniband/hw/cxgb4/device.c | 37 +-
+ drivers/infiniband/hw/cxgb4/ev.c | 2 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 83 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 268 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 36 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 141 +-
+ drivers/infiniband/hw/cxgb4/resource.c | 46 +-
+ drivers/infiniband/hw/cxgb4/t4.h | 20 +-
+ drivers/infiniband/hw/hfi1/chip.c | 182 +-
+ drivers/infiniband/hw/hfi1/chip.h | 1 +
+ drivers/infiniband/hw/hfi1/debugfs.c | 4 +-
+ drivers/infiniband/hw/hfi1/driver.c | 4 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 484 +--
+ drivers/infiniband/hw/hfi1/firmware.c | 87 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 21 +-
+ drivers/infiniband/hw/hfi1/init.c | 43 +-
+ drivers/infiniband/hw/hfi1/mad.c | 7 +-
+ drivers/infiniband/hw/hfi1/sdma.c | 14 +-
+ drivers/infiniband/hw/hfi1/sysfs.c | 2 +-
+ drivers/infiniband/hw/hfi1/trace.c | 23 +-
+ drivers/infiniband/hw/hfi1/trace.h | 10 +
+ drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 49 +-
+ drivers/infiniband/hw/hfi1/trace_rx.h | 11 +-
+ drivers/infiniband/hw/hfi1/user_exp_rcv.c | 9 +-
+ drivers/infiniband/hw/hfi1/user_sdma.c | 62 +-
+ drivers/infiniband/hw/hfi1/user_sdma.h | 29 +-
+ drivers/infiniband/hw/hfi1/vnic_main.c | 7 +-
+ drivers/infiniband/hw/hns/Kconfig | 25 +-
+ drivers/infiniband/hw/hns/Makefile | 8 +-
+ drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 8 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.c | 107 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 50 +
+ drivers/infiniband/hw/hns/hns_roce_common.h | 23 +
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 72 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 101 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 699 ++++-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 32 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 532 +++-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 5 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3132 ++++++++++++++++++++
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1165 ++++++++
+ drivers/infiniband/hw/hns/hns_roce_main.c | 342 +--
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 512 +++-
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 20 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 179 +-
+ drivers/infiniband/hw/i40iw/Kconfig | 1 +
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 17 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.h | 1 +
+ drivers/infiniband/hw/i40iw/i40iw_uk.c | 13 +
+ drivers/infiniband/hw/i40iw/i40iw_user.h | 1 +
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 13 +
+ drivers/infiniband/hw/mlx5/mr.c | 4 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 2 +-
+ drivers/infiniband/hw/qedr/Kconfig | 1 +
+ drivers/infiniband/hw/qedr/Makefile | 2 +-
+ drivers/infiniband/hw/qedr/main.c | 106 +-
+ drivers/infiniband/hw/qedr/qedr.h | 31 +-
+ drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 6 +-
+ drivers/infiniband/hw/qedr/qedr_iw_cm.c | 749 +++++
+ drivers/infiniband/hw/qedr/qedr_iw_cm.h | 49 +
+ .../hw/qedr/{qedr_cm.c => qedr_roce_cm.c} | 2 +-
+ .../hw/qedr/{qedr_cm.h => qedr_roce_cm.h} | 0
+ drivers/infiniband/hw/qedr/verbs.c | 352 ++-
+ drivers/infiniband/hw/qedr/verbs.h | 2 +
+ drivers/infiniband/hw/qib/Kconfig | 1 +
+ drivers/infiniband/hw/qib/qib.h | 8 +-
+ drivers/infiniband/hw/qib/qib_7220.h | 1 -
+ drivers/infiniband/hw/qib/qib_driver.c | 8 +-
+ drivers/infiniband/hw/qib/qib_iba6120.c | 35 +-
+ drivers/infiniband/hw/qib/qib_iba7220.c | 52 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 158 +-
+ drivers/infiniband/hw/qib/qib_mad.c | 10 +-
+ drivers/infiniband/hw/qib/qib_pcie.c | 125 +-
+ drivers/infiniband/sw/rdmavt/Kconfig | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 2 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 42 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 22 +-
+ .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 7 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 44 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 1 +
+ .../infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 22 +-
+ drivers/staging/lustre/lnet/Kconfig | 2 +-
+ include/rdma/opa_addr.h | 6 +-
+ include/rdma/rdmavt_qp.h | 6 +-
+ 102 files changed, 9214 insertions(+), 2022 deletions(-)
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+ create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.c
+ create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.h
+ rename drivers/infiniband/hw/qedr/{qedr_cm.c => qedr_roce_cm.c} (99%)
+ rename drivers/infiniband/hw/qedr/{qedr_cm.h => qedr_roce_cm.h} (100%)
+Merging gfs2/for-next (c2c4be28c248 gfs2: Always update inode ctime in set_acl)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/acl.c | 1 +
+ fs/gfs2/bmap.c | 14 ++++++++++----
+ fs/gfs2/file.c | 1 +
+ fs/gfs2/inode.c | 3 ++-
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (d1f936d73683 Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next)
+$ git merge l2-mtd/master
+Already up-to-date.
+Merging nand/nand/next (fc256f5789cb mtd: nand: pxa3xx: enable NAND controller if the SoC needs it)
+$ git merge nand/nand/next
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging drivers/mtd/nand/atmel/pmecc.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/denali-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 4 +
+ arch/arm/mach-pxa/cm-x255.c | 19 +-
+ drivers/mtd/nand/Kconfig | 5 +-
+ drivers/mtd/nand/atmel/nand-controller.c | 6 +-
+ drivers/mtd/nand/atmel/pmecc.c | 17 +-
+ drivers/mtd/nand/atmel/pmecc.h | 1 +
+ drivers/mtd/nand/au1550nd.c | 3 +-
+ drivers/mtd/nand/denali.c | 291 +++++++++------------
+ drivers/mtd/nand/denali.h | 44 ++--
+ drivers/mtd/nand/denali_dt.c | 4 +-
+ drivers/mtd/nand/denali_pci.c | 5 +-
+ drivers/mtd/nand/diskonchip.c | 3 +-
+ drivers/mtd/nand/gpio.c | 112 ++++----
+ drivers/mtd/nand/hisi504_nand.c | 3 +-
+ drivers/mtd/nand/mxc_nand.c | 3 +-
+ drivers/mtd/nand/nand_base.c | 24 +-
+ drivers/mtd/nand/nuc900_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 41 ++-
+ drivers/mtd/nand/qcom_nandc.c | 127 +++++++--
+ drivers/mtd/nand/sh_flctl.c | 9 +-
+ include/linux/mtd/nand-gpio.h | 5 -
+ include/linux/mtd/rawnand.h | 3 +
+ 23 files changed, 421 insertions(+), 312 deletions(-)
+Merging spi-nor/spi-nor/next (bb1191c1e363 spi-nor: intel-spi: Fix Kconfig dependency to LPC_ICH)
+$ git merge spi-nor/spi-nor/next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/spi-nor/Kconfig | 3 +-
+ drivers/mtd/spi-nor/intel-spi-pci.c | 2 +
+ drivers/mtd/spi-nor/intel-spi.c | 209 ++++++++++++++++++++++++++----------
+ drivers/mtd/spi-nor/spi-nor.c | 97 +++++++++++++----
+ include/linux/mtd/spi-nor.h | 10 ++
+ 5 files changed, 242 insertions(+), 79 deletions(-)
+Merging crypto/master (d9fa482e5913 crypto: bcm - use of_device_get_match_data)
+$ git merge crypto/master
+Auto-merging drivers/crypto/stm32/stm32-hash.c
+Removing drivers/crypto/amcc/crypto4xx_sa.c
+Auto-merging crypto/testmgr.h
+Auto-merging crypto/testmgr.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../{rng => crypto}/samsung,exynos-rng4.txt | 0
+ MAINTAINERS | 2 +-
+ arch/x86/crypto/aesni-intel_glue.c | 10 +-
+ arch/x86/crypto/crc32-pclmul_asm.S | 17 +-
+ crypto/Kconfig | 11 +
+ crypto/Makefile | 1 +
+ crypto/algboss.c | 1 -
+ crypto/gcm.c | 23 +-
+ crypto/rmd128.c | 2 -
+ crypto/rmd160.c | 2 -
+ crypto/rmd256.c | 2 -
+ crypto/rmd320.c | 2 -
+ crypto/sm3_generic.c | 210 ++++++++++++++
+ crypto/tcrypt.c | 15 +-
+ crypto/testmgr.c | 6 +
+ crypto/testmgr.h | 67 +++++
+ drivers/char/hw_random/pseries-rng.c | 2 +-
+ drivers/char/hw_random/timeriomem-rng.c | 7 -
+ drivers/crypto/amcc/Makefile | 2 +-
+ drivers/crypto/amcc/crypto4xx_alg.c | 118 ++++++--
+ drivers/crypto/amcc/crypto4xx_core.c | 321 +++++++++++----------
+ drivers/crypto/amcc/crypto4xx_core.h | 113 ++++----
+ drivers/crypto/amcc/crypto4xx_sa.c | 85 ------
+ drivers/crypto/amcc/crypto4xx_sa.h | 33 ++-
+ drivers/crypto/atmel-aes.c | 5 +-
+ drivers/crypto/bcm/cipher.c | 116 ++++----
+ drivers/crypto/bcm/cipher.h | 3 +-
+ drivers/crypto/caam/caamalg.c | 10 +-
+ drivers/crypto/caam/compat.h | 1 +
+ drivers/crypto/ccp/ccp-crypto-aes-galois.c | 9 +-
+ drivers/crypto/ccp/ccp-dmaengine.c | 5 +-
+ drivers/crypto/chelsio/chcr_algo.c | 9 +-
+ drivers/crypto/inside-secure/safexcel_hash.c | 6 +-
+ drivers/crypto/ixp4xx_crypto.c | 1 -
+ drivers/crypto/marvell/cesa.c | 2 -
+ drivers/crypto/marvell/tdma.c | 5 +-
+ drivers/crypto/mediatek/mtk-aes.c | 8 +-
+ drivers/crypto/mv_cesa.c | 5 +-
+ drivers/crypto/n2_core.c | 12 +-
+ drivers/crypto/nx/nx-842-pseries.c | 2 +-
+ drivers/crypto/nx/nx-aes-gcm.c | 9 +-
+ drivers/crypto/nx/nx.c | 2 +-
+ drivers/crypto/omap-aes-gcm.c | 9 +-
+ drivers/crypto/omap-aes.c | 12 +-
+ drivers/crypto/omap-des.c | 7 +-
+ drivers/crypto/omap-sham.c | 7 +-
+ drivers/crypto/padlock-aes.c | 2 +-
+ drivers/crypto/padlock-sha.c | 2 +-
+ drivers/crypto/qce/ablkcipher.c | 5 +-
+ drivers/crypto/stm32/stm32-hash.c | 12 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 1 -
+ include/crypto/gcm.h | 8 +
+ include/crypto/hash.h | 28 +-
+ include/crypto/sm3.h | 40 +++
+ include/crypto/sm3_base.h | 117 ++++++++
+ include/linux/padata.h | 4 +
+ kernel/padata.c | 71 ++++-
+ 57 files changed, 1048 insertions(+), 539 deletions(-)
+ rename Documentation/devicetree/bindings/{rng => crypto}/samsung,exynos-rng4.txt (100%)
+ create mode 100644 crypto/sm3_generic.c
+ delete mode 100644 drivers/crypto/amcc/crypto4xx_sa.c
+ create mode 100644 include/crypto/gcm.h
+ create mode 100644 include/crypto/sm3.h
+ create mode 100644 include/crypto/sm3_base.h
+Merging drm/drm-next (c5c7bc71a0e6 Merge tag 'drm-intel-next-2017-09-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
+$ git merge drm/drm-next
+Removing drivers/gpu/drm/pl111/pl111_connector.c
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_csr.c
+Auto-merging drivers/gpu/drm/i915/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Removing drivers/gpu/drm/amd/powerplay/inc/eventmgr.h
+Removing drivers/gpu/drm/amd/powerplay/inc/eventmanager.h
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
+Removing drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
+Removing drivers/gpu/drm/amd/powerplay/eventmgr/Makefile
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ .../devicetree/bindings/display/faraday,tve200.txt | 54 +
+ .../bindings/display/panel/orisetech,otm8009a.txt | 21 +
+ .../bindings/display/panel/samsung,s6e63j0x03.txt | 24 +
+ .../bindings/display/panel/seiko,43wvf1g.txt | 23 +
+ .../bindings/display/rockchip/rockchip-lvds.txt | 99 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/gpu/drm-uapi.rst | 55 +
+ Documentation/gpu/index.rst | 1 +
+ Documentation/gpu/todo.rst | 43 +-
+ Documentation/gpu/tve200.rst | 6 +
+ MAINTAINERS | 11 +-
+ drivers/dma-buf/dma-buf.c | 2 +-
+ drivers/dma-buf/sw_sync.c | 10 +-
+ drivers/gpu/drm/Kconfig | 7 +-
+ drivers/gpu/drm/Makefile | 6 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 84 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 153 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 248 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 124 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 121 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 82 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 108 +-
+ .../eventmgr/psm.h => amdgpu/amdgpu_mn.h} | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 108 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 329 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 67 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 65 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 58 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 273 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 70 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 635 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 58 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/atom.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 109 +-
+ drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 241 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 364 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 18 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 83 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 46 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 29 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 498 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 97 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/vid.h | 10 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 -
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 50 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 6 -
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 90 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 100 +
+ .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 +
+ .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 15 +
+ drivers/gpu/drm/amd/include/atombios.h | 1 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 19 +-
+ drivers/gpu/drm/amd/include/cgs_common.h | 32 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 +
+ drivers/gpu/drm/amd/include/linux/chash.h | 366 +
+ drivers/gpu/drm/amd/include/v9_structs.h | 12 +-
+ drivers/gpu/drm/amd/include/vi_structs.h | 259 -
+ drivers/gpu/drm/amd/lib/Kconfig | 28 +
+ drivers/gpu/drm/amd/lib/Makefile | 11 +
+ drivers/gpu/drm/amd/lib/chash.c | 638 +
+ drivers/gpu/drm/amd/powerplay/Makefile | 5 +-
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 525 +-
+ drivers/gpu/drm/amd/powerplay/eventmgr/Makefile | 11 -
+ .../drm/amd/powerplay/eventmgr/eventactionchains.c | 291 -
+ .../drm/amd/powerplay/eventmgr/eventactionchains.h | 62 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 195 -
+ .../drm/amd/powerplay/eventmgr/eventmanagement.c | 215 -
+ .../drm/amd/powerplay/eventmgr/eventmanagement.h | 59 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 104 -
+ .../drm/amd/powerplay/eventmgr/eventsubchains.c | 410 -
+ .../drm/amd/powerplay/eventmgr/eventsubchains.h | 100 -
+ .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 445 -
+ .../gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 89 -
+ drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 119 -
+ drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 5 +-
+ .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 46 +-
+ .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 561 +-
+ .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 161 -
+ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 151 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 417 +-
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 2489 ++--
+ .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 250 +
+ .../{eventmgr/eventinit.h => hwmgr/pp_psm.h} | 24 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 88 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 8 +-
+ .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 20 -
+ .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 157 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 488 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 6 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 66 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 431 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 9 +-
+ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 110 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 183 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 5 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 449 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 -
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 129 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 277 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 13 +-
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 152 +-
+ drivers/gpu/drm/amd/powerplay/inc/eventmanager.h | 109 -
+ drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 124 -
+ drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h | 12222 +++----------------
+ .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 6 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 194 +-
+ .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 11792 +++---------------
+ drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 7 -
+ drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 7 +-
+ drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 206 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c | 2808 +++++
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h | 78 +
+ drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 308 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 120 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 177 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 120 +-
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 78 +-
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 152 +-
+ .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 173 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 130 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 8 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 217 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 36 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 261 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 144 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 64 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 194 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 16 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 24 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 3 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 3 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 3 +-
+ drivers/gpu/drm/armada/Makefile | 2 -
+ drivers/gpu/drm/armada/armada_510.c | 1 -
+ drivers/gpu/drm/armada/armada_drv.c | 3 -
+ drivers/gpu/drm/armada/armada_fb.c | 1 -
+ drivers/gpu/drm/armada/armada_fbdev.c | 1 -
+ drivers/gpu/drm/armada/armada_gem.c | 37 -
+ drivers/gpu/drm/armada/armada_gem.h | 4 -
+ drivers/gpu/drm/armada/armada_trace.h | 2 +-
+ drivers/gpu/drm/ast/ast_mode.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 1 +
+ drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 2 -
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 24 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 103 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
+ drivers/gpu/drm/drm_agpsupport.c | 45 +-
+ drivers/gpu/drm/drm_atomic.c | 26 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 313 +-
+ drivers/gpu/drm/drm_bridge.c | 7 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 4 +-
+ drivers/gpu/drm/drm_connector.c | 26 +-
+ drivers/gpu/drm/drm_crtc.c | 15 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 1 +
+ drivers/gpu/drm/drm_debugfs_crc.c | 2 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 74 +
+ drivers/gpu/drm/drm_drv.c | 51 +-
+ drivers/gpu/drm/drm_edid.c | 15 +
+ drivers/gpu/drm/drm_edid_load.c | 16 +
+ drivers/gpu/drm/drm_encoder.c | 2 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 77 +-
+ drivers/gpu/drm/drm_fb_helper.c | 6 +-
+ drivers/gpu/drm/drm_framebuffer.c | 9 +-
+ drivers/gpu/drm/drm_gem.c | 17 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 4 +-
+ drivers/gpu/drm/drm_kms_helper_common.c | 28 +
+ drivers/gpu/drm/drm_mode_object.c | 15 +-
+ drivers/gpu/drm/drm_modeset_lock.c | 96 +-
+ drivers/gpu/drm/drm_of.c | 2 +
+ drivers/gpu/drm/drm_pci.c | 2 +-
+ drivers/gpu/drm/drm_plane.c | 35 +-
+ drivers/gpu/drm/drm_prime.c | 4 +-
+ drivers/gpu/drm/drm_probe_helper.c | 21 +-
+ drivers/gpu/drm/drm_property.c | 6 +-
+ drivers/gpu/drm/drm_scdc_helper.c | 12 +-
+ drivers/gpu/drm/drm_syncobj.c | 90 +-
+ drivers/gpu/drm/drm_trace.h | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 6 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 3 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 6 +-
+ drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +-
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
+ drivers/gpu/drm/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Makefile | 5 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 26 +-
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 30 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 37 +-
+ drivers/gpu/drm/i915/gvt/execlist.c | 127 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 5 +-
+ drivers/gpu/drm/i915/gvt/gvt.c | 2 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 14 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 44 +-
+ drivers/gpu/drm/i915/gvt/mmio.c | 47 +-
+ drivers/gpu/drm/i915/gvt/render.c | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 114 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h | 1 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 116 +-
+ drivers/gpu/drm/i915/i915_drv.c | 45 +-
+ drivers/gpu/drm/i915/i915_drv.h | 252 +-
+ drivers/gpu/drm/i915/i915_gem.c | 132 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 12 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 33 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 51 +
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 460 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 46 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 32 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 35 -
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 83 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 29 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 358 +-
+ drivers/gpu/drm/i915/i915_irq.c | 969 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt2.c | 109 +
+ drivers/gpu/drm/i915/i915_oa_cflgt2.h | 34 +
+ drivers/gpu/drm/i915/i915_params.c | 208 +-
+ drivers/gpu/drm/i915/i915_params.h | 86 +-
+ drivers/gpu/drm/i915/i915_pci.c | 268 +-
+ drivers/gpu/drm/i915/i915_perf.c | 14 +-
+ drivers/gpu/drm/i915/i915_reg.h | 62 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 27 +-
+ drivers/gpu/drm/i915/i915_trace.h | 2 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 49 +-
+ drivers/gpu/drm/i915/intel_bios.c | 214 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 2 +-
+ drivers/gpu/drm/i915/intel_cdclk.c | 278 +-
+ drivers/gpu/drm/i915/intel_crt.c | 26 +-
+ drivers/gpu/drm/i915/intel_csr.c | 8 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 321 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 41 +-
+ drivers/gpu/drm/i915/intel_display.c | 312 +-
+ drivers/gpu/drm/i915/intel_dp.c | 238 +-
+ drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 2 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 27 +-
+ drivers/gpu/drm/i915/intel_drv.h | 117 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 32 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 12 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 291 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 28 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 3 +
+ drivers/gpu/drm/i915/intel_fifo_underrun.c | 14 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 10 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 13 +-
+ drivers/gpu/drm/i915/intel_guc_log.c | 26 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 12 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 157 +-
+ drivers/gpu/drm/i915/intel_huc.c | 42 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 461 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 36 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 28 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 2 +-
+ drivers/gpu/drm/i915/intel_panel.c | 8 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 65 +-
+ drivers/gpu/drm/i915/intel_pm.c | 485 +-
+ drivers/gpu/drm/i915/intel_psr.c | 337 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 167 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 147 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 102 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 40 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 29 +-
+ drivers/gpu/drm/i915/intel_tv.c | 16 +-
+ drivers/gpu/drm/i915/intel_uc.c | 74 +-
+ drivers/gpu/drm/i915/intel_uc.h | 23 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 237 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 10 +
+ drivers/gpu/drm/i915/intel_vbt_defs.h | 331 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_random.c | 5 -
+ drivers/gpu/drm/i915/selftests/i915_random.h | 5 +
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 24 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 5 +
+ drivers/gpu/drm/imx/imx-drm-core.c | 3 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 6 +-
+ drivers/gpu/drm/meson/meson_drv.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +-
+ drivers/gpu/drm/panel/Kconfig | 25 +
+ drivers/gpu/drm/panel/Makefile | 3 +
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 491 +
+ drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 532 +
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 372 +
+ drivers/gpu/drm/panel/panel-simple.c | 15 +-
+ drivers/gpu/drm/pl111/Kconfig | 3 +-
+ drivers/gpu/drm/pl111/Makefile | 4 +-
+ drivers/gpu/drm/pl111/pl111_connector.c | 126 -
+ drivers/gpu/drm/pl111/pl111_debugfs.c | 6 +
+ drivers/gpu/drm/pl111/pl111_display.c | 79 +-
+ drivers/gpu/drm/pl111/pl111_drm.h | 37 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 149 +-
+ drivers/gpu/drm/pl111/pl111_versatile.c | 270 +
+ drivers/gpu/drm/pl111/pl111_versatile.h | 9 +
+ drivers/gpu/drm/radeon/Makefile | 2 -
+ drivers/gpu/drm/radeon/atombios_dp.c | 8 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 22 +
+ drivers/gpu/drm/radeon/ci_dpm.h | 1 -
+ drivers/gpu/drm/radeon/ci_smc.c | 21 -
+ drivers/gpu/drm/radeon/r100.c | 2 +-
+ drivers/gpu/drm/radeon/r600_cs.c | 2 +-
+ drivers/gpu/drm/radeon/r600_hdmi.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_kfd.c | 31 +
+ drivers/gpu/drm/radeon/radeon_mode.h | 4 -
+ drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 33 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +-
+ drivers/gpu/drm/rockchip/Kconfig | 8 +
+ drivers/gpu/drm/rockchip/Makefile | 1 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 -
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 86 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 19 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 14 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 +
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 8 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 18 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 32 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 586 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.h | 114 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c | 3 +-
+ drivers/gpu/drm/sti/sti_drv.c | 3 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 6 +-
+ drivers/gpu/drm/stm/drv.c | 3 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 91 +-
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 196 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 3 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 5 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 3 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 5 +-
+ drivers/gpu/drm/tinydrm/mi0283qt.c | 14 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c | 7 +-
+ drivers/gpu/drm/tinydrm/repaper.c | 17 +-
+ drivers/gpu/drm/tinydrm/st7586.c | 19 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 34 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 1 -
+ drivers/gpu/drm/ttm/ttm_memory.c | 12 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 47 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 243 +-
+ drivers/gpu/drm/tve200/Kconfig | 16 +
+ drivers/gpu/drm/tve200/Makefile | 4 +
+ drivers/gpu/drm/tve200/tve200_display.c | 338 +
+ drivers/gpu/drm/tve200/tve200_drm.h | 126 +
+ drivers/gpu/drm/tve200/tve200_drv.c | 303 +
+ drivers/gpu/drm/udl/udl_connector.c | 2 +-
+ drivers/gpu/drm/vc4/Makefile | 2 -
+ drivers/gpu/drm/vc4/vc4_dsi.c | 100 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +-
+ drivers/gpu/drm/vc4/vc4_trace.h | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 3 +-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +-
+ drivers/rapidio/devices/rio_mport_cdev.c | 4 +-
+ drivers/staging/vboxvideo/vbox_mode.c | 2 +-
+ include/drm/drm_atomic.h | 94 +-
+ include/drm/drm_bridge.h | 2 +-
+ include/drm/drm_connector.h | 13 +-
+ include/drm/drm_crtc.h | 36 +-
+ include/drm/drm_dp_helper.h | 23 +
+ include/drm/drm_dp_mst_helper.h | 2 +
+ include/drm/drm_drv.h | 5 +-
+ include/drm/drm_edid.h | 2 +
+ include/drm/drm_encoder.h | 3 +-
+ include/drm/drm_fb_cma_helper.h | 13 -
+ include/drm/drm_framebuffer.h | 1 +
+ include/drm/drm_gem_framebuffer_helper.h | 2 +-
+ include/drm/drm_mode_object.h | 2 +
+ include/drm/drm_modeset_helper_vtables.h | 2 +-
+ include/drm/drm_modeset_lock.h | 12 +-
+ include/drm/drm_plane.h | 19 +-
+ include/drm/drm_property.h | 3 +-
+ include/drm/drm_syncobj.h | 5 +
+ include/drm/i915_pciids.h | 154 +-
+ include/drm/ttm/ttm_debug.h | 31 +
+ include/drm/ttm/ttm_memory.h | 5 +-
+ include/drm/ttm/ttm_page_alloc.h | 33 +-
+ include/linux/scatterlist.h | 17 +-
+ include/linux/sync_file.h | 4 +
+ include/uapi/drm/amdgpu_drm.h | 18 +
+ include/uapi/drm/drm_mode.h | 4 +-
+ include/uapi/drm/i915_drm.h | 17 +-
+ lib/scatterlist.c | 95 +-
+ scripts/coccinelle/api/drm-get-put.cocci | 5 +
+ tools/testing/scatterlist/Makefile | 30 +
+ tools/testing/scatterlist/linux/mm.h | 125 +
+ tools/testing/scatterlist/main.c | 79 +
+ 472 files changed, 26963 insertions(+), 35339 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
+ create mode 100644 Documentation/gpu/tve200.rst
+ rename drivers/gpu/drm/amd/{powerplay/eventmgr/psm.h => amdgpu/amdgpu_mn.h} (56%)
+ create mode 100644 drivers/gpu/drm/amd/include/linux/chash.h
+ create mode 100644 drivers/gpu/drm/amd/lib/Kconfig
+ create mode 100644 drivers/gpu/drm/amd/lib/Makefile
+ create mode 100644 drivers/gpu/drm/amd/lib/chash.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/Makefile
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
+ rename drivers/gpu/drm/amd/powerplay/{eventmgr/eventinit.h => hwmgr/pp_psm.h} (65%)
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmanager.h
+ delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmgr.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.c
+ create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h
+ create mode 100644 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+ create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
+ create mode 100644 drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
+ delete mode 100644 drivers/gpu/drm/pl111/pl111_connector.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_versatile.c
+ create mode 100644 drivers/gpu/drm/pl111/pl111_versatile.h
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
+ create mode 100644 drivers/gpu/drm/tve200/Kconfig
+ create mode 100644 drivers/gpu/drm/tve200/Makefile
+ create mode 100644 drivers/gpu/drm/tve200/tve200_display.c
+ create mode 100644 drivers/gpu/drm/tve200/tve200_drm.h
+ create mode 100644 drivers/gpu/drm/tve200/tve200_drv.c
+ create mode 100644 include/drm/ttm/ttm_debug.h
+ create mode 100644 tools/testing/scatterlist/Makefile
+ create mode 100644 tools/testing/scatterlist/linux/mm.h
+ create mode 100644 tools/testing/scatterlist/main.c
+Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (612dde7ec306 drm/i915: Simplify intel_sanitize_enable_ppgtt)
+$ git merge drm-intel/for-linux-next
+Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
+Auto-merging drivers/gpu/drm/i915/intel_sprite.c
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c1e693713e11948d02d6a74ebf7e0b27b6632c5f] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/Makefile | 3 +
+ drivers/gpu/drm/i915/gvt/scheduler.c | 1 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 379 ++---
+ drivers/gpu/drm/i915/i915_drv.c | 48 +-
+ drivers/gpu/drm/i915/i915_drv.h | 79 +-
+ drivers/gpu/drm/i915/i915_gem.c | 373 +++--
+ drivers/gpu/drm/i915/i915_gem_context.c | 99 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 7 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 40 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 285 +++-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 20 +-
+ drivers/gpu/drm/i915/i915_gem_internal.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 32 +-
+ drivers/gpu/drm/i915/i915_gem_request.c | 20 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 13 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 53 +-
+ drivers/gpu/drm/i915/i915_gemfs.c | 74 +
+ drivers/gpu/drm/i915/i915_gemfs.h | 34 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 14 +-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 123 +-
+ drivers/gpu/drm/i915/i915_guc_submission.h | 80 +
+ drivers/gpu/drm/i915/i915_irq.c | 138 +-
+ drivers/gpu/drm/i915/i915_params.c | 3 -
+ drivers/gpu/drm/i915/i915_params.h | 1 -
+ drivers/gpu/drm/i915/i915_pci.c | 77 +-
+ drivers/gpu/drm/i915/i915_reg.h | 25 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 2 -
+ drivers/gpu/drm/i915/i915_sysfs.c | 76 +-
+ drivers/gpu/drm/i915/i915_trace.h | 116 +-
+ drivers/gpu/drm/i915/i915_utils.h | 18 +
+ drivers/gpu/drm/i915/i915_vma.c | 121 +-
+ drivers/gpu/drm/i915/i915_vma.h | 49 +-
+ drivers/gpu/drm/i915/intel_audio.c | 2 +-
+ drivers/gpu/drm/i915/intel_bios.c | 128 +-
+ drivers/gpu/drm/i915/intel_cdclk.c | 40 +-
+ drivers/gpu/drm/i915/intel_crt.c | 86 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 41 +-
+ drivers/gpu/drm/i915/intel_display.c | 215 ++-
+ drivers/gpu/drm/i915/intel_dp.c | 45 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 10 +-
+ drivers/gpu/drm/i915/intel_drv.h | 22 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 7 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 33 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 240 ++-
+ drivers/gpu/drm/i915/intel_guc.c | 265 +++
+ drivers/gpu/drm/i915/intel_guc.h | 110 ++
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 48 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 5 +-
+ drivers/gpu/drm/i915/intel_guc_log.c | 6 +-
+ drivers/gpu/drm/i915/intel_guc_log.h | 59 +
+ drivers/gpu/drm/i915/intel_huc.c | 11 +-
+ drivers/gpu/drm/i915/intel_huc.h | 41 +
+ drivers/gpu/drm/i915/intel_lrc.c | 282 +++-
+ drivers/gpu/drm/i915/intel_lrc.h | 1 +
+ drivers/gpu/drm/i915/intel_lvds.c | 23 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 15 +-
+ drivers/gpu/drm/i915/intel_pm.c | 695 ++++----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 11 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 9 +
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 26 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 6 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 6 +
+ drivers/gpu/drm/i915/intel_uc.c | 313 +---
+ drivers/gpu/drm/i915/intel_uc.h | 228 +--
+ drivers/gpu/drm/i915/intel_uc_fw.c | 193 +++
+ drivers/gpu/drm/i915/intel_uc_fw.h | 107 ++
+ drivers/gpu/drm/i915/intel_uncore.c | 18 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 8 +
+ drivers/gpu/drm/i915/selftests/huge_gem_object.c | 14 +-
+ drivers/gpu/drm/i915/selftests/huge_pages.c | 1734 ++++++++++++++++++++
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_object.c | 8 -
+ drivers/gpu/drm/i915/selftests/i915_gem_request.c | 12 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 +
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 +
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 26 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 17 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 11 +-
+ drivers/gpu/drm/i915/selftests/scatterlist.c | 15 +
+ include/linux/shmem_fs.h | 2 +
+ include/uapi/drm/i915_drm.h | 18 +-
+ mm/shmem.c | 30 +-
+ 85 files changed, 5540 insertions(+), 2188 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gemfs.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gemfs.h
+ create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc.c
+ create mode 100644 drivers/gpu/drm/i915/intel_guc.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_log.h
+ create mode 100644 drivers/gpu/drm/i915/intel_huc.h
+ create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c
+ create mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/huge_pages.c
+Merging drm-tegra/drm/tegra/for-next (65d5d30ccebd drm/tegra: trace: Fix path to include)
+$ git merge drm-tegra/drm/tegra/for-next
+Merge made by the 'recursive' strategy.
+Merging drm-misc/for-linux-next (cccf4e3fe3e2 drm/dp: WARN about invalid/unknown link rates and bw codes)
+$ git merge drm-misc/for-linux-next
+Recorded preimage for 'drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c'
+Auto-merging drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c'.
+[master 644267f73fba] Merge remote-tracking branch 'drm-misc/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/adi,adv7511.txt | 4 +
+ .../devicetree/bindings/display/bridge/sii9234.txt | 49 +
+ .../panel/raspberrypi,7inch-touchscreen.txt | 49 +
+ .../bindings/display/sunxi/sun4i-drm.txt | 3 +
+ drivers/dma-buf/reservation.c | 56 +-
+ drivers/gpu/drm/bridge/Kconfig | 10 +-
+ drivers/gpu/drm/bridge/Makefile | 1 +
+ drivers/gpu/drm/bridge/adv7511/Kconfig | 8 +
+ drivers/gpu/drm/bridge/adv7511/Makefile | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 43 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 337 +++++++
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 116 ++-
+ drivers/gpu/drm/bridge/adv7511/adv7533.c | 38 +-
+ drivers/gpu/drm/bridge/panel.c | 10 +-
+ drivers/gpu/drm/bridge/sii9234.c | 994 +++++++++++++++++++++
+ drivers/gpu/drm/bridge/sil-sii8620.c | 96 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 5 +-
+ drivers/gpu/drm/drm_atomic.c | 3 -
+ drivers/gpu/drm/drm_dp_helper.c | 7 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 82 +-
+ drivers/gpu/drm/drm_of.c | 33 +
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 2 +-
+ drivers/gpu/drm/panel/Kconfig | 8 +
+ drivers/gpu/drm/panel/Makefile | 1 +
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 514 +++++++++++
+ drivers/gpu/drm/stm/ltdc.c | 16 +-
+ drivers/gpu/drm/stm/ltdc.h | 2 -
+ drivers/gpu/drm/sun4i/sun4i_hdmi.h | 107 +++
+ drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 38 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 185 +++-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 227 +++--
+ drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 68 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 91 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 17 +-
+ include/drm/bridge/mhl.h | 4 +
+ include/drm/drm_atomic.h | 94 +-
+ include/drm/drm_of.h | 8 +
+ include/linux/dma-fence.h | 5 +-
+ include/linux/regmap.h | 39 +
+ 40 files changed, 3046 insertions(+), 331 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt
+ create mode 100644 drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
+ create mode 100644 drivers/gpu/drm/bridge/sii9234.c
+ create mode 100644 drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+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 (642e5ef8c6c4 drm/msm: fix _NO_IMPLICIT fencing case)
+$ git merge drm-msm/msm-next
+Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/msm/Makefile | 4 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 10 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 10 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 222 +++++++++++++++++++---
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 103 ++++++++++-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 6 +-
+ drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 294 ++++++++++++++++++++++++++++++
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 183 ++++++++++---------
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 43 ++---
+ drivers/gpu/drm/msm/msm_drv.c | 67 ++++++-
+ drivers/gpu/drm/msm/msm_drv.h | 22 ++-
+ drivers/gpu/drm/msm/msm_fence.c | 2 +-
+ drivers/gpu/drm/msm/msm_fence.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem.c | 11 --
+ drivers/gpu/drm/msm/msm_gem.h | 5 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c | 49 +++--
+ drivers/gpu/drm/msm/msm_gpu.c | 182 +++++++++++++-----
+ drivers/gpu/drm/msm/msm_gpu.h | 54 ++++--
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 29 ++-
+ drivers/gpu/drm/msm/msm_ringbuffer.h | 32 +++-
+ drivers/gpu/drm/msm/msm_submitqueue.c | 160 ++++++++++++++++
+ include/uapi/drm/msm_drm.h | 24 +++
+ 22 files changed, 1242 insertions(+), 272 deletions(-)
+ create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_preempt.c
+ create mode 100644 drivers/gpu/drm/msm/msm_submitqueue.c
+Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (e46477b8f23c drm: mali-dp: Restore commit_tail behaviour to the runtime_pm friendly version.)
+$ git merge mali-dp/for-upstream/mali-dp
+Auto-merging drivers/gpu/drm/arm/malidp_drv.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/arm/malidp_crtc.c | 4 ++++
+ drivers/gpu/drm/arm/malidp_drv.c | 11 +++--------
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
+$ git merge sunxi-drm/sunxi-drm/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging imx-drm/imx-drm/next (e64b9189bfd5 gpu: ipu-v3: ipu-dc: Remove unused 'di' variable)
+$ git merge imx-drm/imx-drm/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt | 2 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
+ drivers/gpu/drm/imx/parallel-display.c | 2 +-
+ drivers/gpu/ipu-v3/ipu-dc.c | 3 ---
+ 4 files changed, 3 insertions(+), 6 deletions(-)
+Merging etnaviv/etnaviv/next (8272170f7da3 drm/etnaviv: remove unnecessary clock stabilization delay)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/etnaviv/Kconfig | 2 -
+ drivers/gpu/drm/etnaviv/Makefile | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 36 ++
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 15 +-
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 39 ++-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 69 +++-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 217 +++++++++---
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 13 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 197 ++++-------
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 7 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 120 +++----
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 106 ++++--
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 36 +-
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 495 +++++++++++++++++++++++++++
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.h | 49 +++
+ include/uapi/drm/etnaviv_drm.h | 43 ++-
+ 19 files changed, 1148 insertions(+), 330 deletions(-)
+ create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
+ create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
+Merging kconfig/for-next (6f7da290413b Linux 4.12)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging regmap/for-next (6ee5a9e8e4b3 Merge remote-tracking branches 'regmap/topic/field' and 'regmap/topic/namespace' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-spi.c | 2 +-
+ drivers/base/regmap/regmap-spmi.c | 4 ++--
+ include/linux/regmap.h | 17 +++++++++--------
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+Merging sound/for-next (7debc7d248ee Merge branch 'topic/card-disconnect' into for-next)
+$ git merge sound/for-next
+Auto-merging sound/usb/line6/podhd.c
+Auto-merging sound/usb/line6/driver.c
+Auto-merging sound/usb/caiaq/device.c
+Auto-merging sound/core/seq/seq_clientmgr.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/core/urb.c | 30 ++++++++++++++++++++++++++----
+ include/linux/usb.h | 2 ++
+ include/sound/core.h | 2 ++
+ sound/core/hrtimer.c | 2 +-
+ sound/core/hwdep.c | 2 ++
+ sound/core/init.c | 32 ++++++++++++++++++++++++++++++++
+ sound/core/pcm.c | 4 ++++
+ sound/core/seq/seq_clientmgr.c | 4 ++++
+ sound/core/timer.c | 11 +++++++----
+ sound/pci/asihpi/asihpi.c | 12 +++++-------
+ sound/pci/oxygen/xonar_dg.h | 2 +-
+ sound/pci/oxygen/xonar_dg_mixer.c | 2 +-
+ sound/sh/aica.c | 20 +++++++++-----------
+ sound/usb/bcd2000/bcd2000.c | 7 +++++++
+ sound/usb/caiaq/device.c | 7 +++++++
+ sound/usb/caiaq/input.c | 9 +++++++++
+ sound/usb/hiface/pcm.c | 9 +++++++--
+ sound/usb/line6/capture.c | 2 +-
+ sound/usb/line6/capture.h | 2 +-
+ sound/usb/line6/driver.c | 30 ++++++++++++++++++++++--------
+ sound/usb/line6/midi.c | 17 +++++++++++------
+ sound/usb/line6/playback.c | 2 +-
+ sound/usb/line6/playback.h | 2 +-
+ sound/usb/line6/podhd.c | 16 +++++++++++++++-
+ sound/usb/midi.c | 38 ++++++++++++++++++++++++++++++--------
+ sound/usb/quirks.c | 24 +++++++++---------------
+ sound/usb/usx2y/usbusx2y.c | 5 +++++
+ sound/usb/usx2y/usbusx2yaudio.c | 3 +++
+ 28 files changed, 225 insertions(+), 73 deletions(-)
+Merging sound-asoc/for-next (f6d4de48318c Merge remote-tracking branches 'asoc/topic/tfa9879', 'asoc/topic/ts3a277e', 'asoc/topic/wm97xx' and 'asoc/topic/zte' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/arizona.txt | 40 +-
+ Documentation/devicetree/bindings/sound/rt5514.txt | 13 +-
+ Documentation/devicetree/bindings/sound/rt5663.txt | 16 +
+ .../devicetree/bindings/sound/tfa9879.txt | 23 +
+ .../devicetree/bindings/sound/wlf,arizona.txt | 53 ++
+ MAINTAINERS | 1 +
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/input/touchscreen/wm97xx-core.c | 252 ++++++----
+ drivers/mfd/Kconfig | 14 +
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/arizona-core.c | 132 +----
+ drivers/mfd/wm97xx-core.c | 366 ++++++++++++++
+ include/linux/mfd/arizona/pdata.h | 3 +
+ include/linux/mfd/wm97xx.h | 25 +
+ include/sound/ac97/codec.h | 118 +++++
+ include/sound/ac97/compat.h | 20 +
+ include/sound/ac97/controller.h | 85 ++++
+ include/sound/ac97/regs.h | 262 ++++++++++
+ include/sound/ac97_codec.h | 239 +--------
+ include/sound/pxa2xx-lib.h | 15 +-
+ include/sound/rt5663.h | 3 +
+ include/sound/soc.h | 23 +
+ sound/Kconfig | 2 +
+ sound/Makefile | 1 +
+ sound/ac97/Kconfig | 19 +
+ sound/ac97/Makefile | 8 +
+ sound/ac97/ac97_core.h | 16 +
+ sound/ac97/bus.c | 539 +++++++++++++++++++++
+ sound/ac97/codec.c | 15 +
+ sound/ac97/snd_ac97_compat.c | 108 +++++
+ sound/arm/pxa2xx-ac97-lib.c | 37 +-
+ sound/arm/pxa2xx-ac97.c | 35 +-
+ sound/soc/bcm/cygnus-ssp.c | 34 +-
+ sound/soc/codecs/Kconfig | 9 +-
+ sound/soc/codecs/adau17x1.c | 24 +-
+ sound/soc/codecs/adau17x1.h | 2 +
+ sound/soc/codecs/arizona.c | 166 ++++++-
+ sound/soc/codecs/arizona.h | 6 +-
+ sound/soc/codecs/cs43130.c | 16 +-
+ sound/soc/codecs/cs47l24.c | 14 +-
+ sound/soc/codecs/hdmi-codec.c | 5 +-
+ sound/soc/codecs/max98090.c | 2 +-
+ sound/soc/codecs/max98927.c | 155 ++++--
+ sound/soc/codecs/max98927.h | 7 +-
+ sound/soc/codecs/msm8916-wcd-analog.c | 119 ++---
+ sound/soc/codecs/msm8916-wcd-digital.c | 4 +-
+ sound/soc/codecs/rl6231.c | 5 +-
+ sound/soc/codecs/rt5514-spi.c | 17 +-
+ sound/soc/codecs/rt5514-spi.h | 3 +
+ sound/soc/codecs/rt5514.c | 63 ---
+ sound/soc/codecs/rt5514.h | 3 -
+ sound/soc/codecs/rt5645.c | 8 +-
+ sound/soc/codecs/rt5663.c | 221 ++++++++-
+ sound/soc/codecs/rt5670.c | 143 +++++-
+ sound/soc/codecs/rt5670.h | 4 +
+ sound/soc/codecs/tas571x.c | 3 +-
+ sound/soc/codecs/tfa9879.c | 6 +
+ sound/soc/codecs/ts3a227e.c | 10 +
+ sound/soc/codecs/wm5102.c | 14 +-
+ sound/soc/codecs/wm5110.c | 14 +-
+ sound/soc/codecs/wm8997.c | 15 +-
+ sound/soc/codecs/wm8998.c | 95 ++--
+ sound/soc/codecs/wm9705.c | 66 ++-
+ sound/soc/codecs/wm9712.c | 45 +-
+ sound/soc/codecs/wm9713.c | 39 +-
+ sound/soc/davinci/davinci-mcasp.c | 21 +-
+ sound/soc/dwc/Kconfig | 4 +-
+ sound/soc/fsl/fsl-asoc-card.c | 14 +-
+ sound/soc/fsl/fsl_spdif.c | 4 +-
+ sound/soc/fsl/fsl_ssi.c | 46 +-
+ sound/soc/img/img-i2s-in.c | 130 ++++-
+ sound/soc/img/img-i2s-out.c | 120 +++--
+ sound/soc/img/img-parallel-out.c | 6 +
+ sound/soc/img/img-spdif-in.c | 110 ++++-
+ sound/soc/img/img-spdif-out.c | 87 +++-
+ sound/soc/intel/atom/sst-mfld-platform-compress.c | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform.h | 2 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 9 +-
+ sound/soc/intel/atom/sst/sst_loader.c | 1 -
+ sound/soc/intel/atom/sst/sst_stream.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5640.c | 8 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 20 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 187 ++++++-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 14 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 37 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 9 +
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +
+ sound/soc/intel/skylake/skl-messages.c | 23 +-
+ sound/soc/intel/skylake/skl-topology.c | 2 +-
+ sound/soc/intel/skylake/skl-topology.h | 4 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 2 +-
+ sound/soc/kirkwood/kirkwood.h | 2 +-
+ sound/soc/omap/omap-hdmi-audio.c | 3 +
+ sound/soc/pxa/pxa2xx-ac97.c | 32 +-
+ sound/soc/qcom/lpass-platform.c | 2 -
+ sound/soc/rockchip/rk3399_gru_sound.c | 159 +++++-
+ sound/soc/rockchip/rockchip_i2s.c | 1 -
+ sound/soc/samsung/i2s.c | 9 +-
+ sound/soc/samsung/i2s.h | 3 +
+ sound/soc/samsung/tm2_wm5110.c | 7 +-
+ sound/soc/sh/fsi.c | 11 +-
+ sound/soc/sh/rcar/adg.c | 13 +-
+ sound/soc/sh/rcar/core.c | 27 ++
+ sound/soc/sh/rcar/ctu.c | 88 ++--
+ sound/soc/sh/rcar/dma.c | 60 +--
+ sound/soc/sh/rcar/dvc.c | 60 +--
+ sound/soc/sh/rcar/mix.c | 158 +++++-
+ sound/soc/sh/rcar/rsnd.h | 16 +-
+ sound/soc/sh/rcar/ssi.c | 32 +-
+ sound/soc/soc-core.c | 137 +++++-
+ sound/soc/soc-dapm.c | 158 +++---
+ sound/soc/soc-pcm.c | 88 ++--
+ sound/soc/soc-topology.c | 5 +-
+ sound/soc/zte/zx-spdif.c | 4 +-
+ 114 files changed, 4400 insertions(+), 1364 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/tfa9879.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wlf,arizona.txt
+ create mode 100644 drivers/mfd/wm97xx-core.c
+ create mode 100644 include/linux/mfd/wm97xx.h
+ create mode 100644 include/sound/ac97/codec.h
+ create mode 100644 include/sound/ac97/compat.h
+ create mode 100644 include/sound/ac97/controller.h
+ create mode 100644 include/sound/ac97/regs.h
+ create mode 100644 sound/ac97/Kconfig
+ create mode 100644 sound/ac97/Makefile
+ create mode 100644 sound/ac97/ac97_core.h
+ create mode 100644 sound/ac97/bus.c
+ create mode 100644 sound/ac97/codec.c
+ create mode 100644 sound/ac97/snd_ac97_compat.c
+Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (60942e674e9d Input: synaptics-rmi4 - make array rmi_f54_report_type_names static)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/input/misc/adxl34x.c | 2 +-
+ drivers/input/mouse/elan_i2c_core.c | 11 +++--
+ drivers/input/rmi4/rmi_f54.c | 2 +-
+ drivers/input/serio/sa1111ps2.c | 69 ++++++++++++++++++------------
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/input/touchscreen/ad7879.c | 13 +-----
+ drivers/input/touchscreen/edt-ft5x06.c | 9 +---
+ drivers/input/touchscreen/elants_i2c.c | 19 +-------
+ drivers/input/touchscreen/melfas_mip4.c | 17 +-------
+ drivers/input/touchscreen/raydium_i2c_ts.c | 18 +-------
+ drivers/input/touchscreen/rohm_bu21023.c | 17 +-------
+ drivers/input/touchscreen/stmfts.c | 4 +-
+ drivers/input/touchscreen/wdt87xx_i2c.c | 10 +----
+ 13 files changed, 60 insertions(+), 133 deletions(-)
+Merging block/for-next (5cf5a83c9161 Merge branch 'for-4.15/block' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/sysctl.c
+Auto-merging fs/buffer.c
+Auto-merging drivers/md/dm.c
+Auto-merging block/blk-throttle.c
+Auto-merging block/blk-mq-debugfs.c
+Auto-merging block/bio.c
+Removing Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
+Merge made by the 'recursive' strategy.
+ .../ABI/obsolete/proc-sys-vm-nr_pdflush_threads | 5 -
+ block/bfq-iosched.c | 225 +++++++++++++++------
+ block/bio-integrity.c | 7 +-
+ block/bio.c | 38 +---
+ block/blk-cgroup.c | 4 +-
+ block/blk-core.c | 44 +++-
+ block/blk-mq-debugfs.c | 1 -
+ block/blk-mq-tag.h | 7 +-
+ block/blk-mq.c | 72 +++++--
+ block/blk-stat.c | 45 +----
+ block/blk-throttle.c | 12 +-
+ block/blk-timeout.c | 2 +-
+ block/blk-wbt.c | 2 +-
+ block/blk.h | 46 +----
+ block/elevator.c | 2 +-
+ drivers/block/amiflop.c | 58 +++---
+ drivers/block/aoe/aoecmd.c | 6 +-
+ drivers/block/aoe/aoedev.c | 9 +-
+ drivers/block/cryptoloop.c | 2 -
+ drivers/block/floppy.c | 10 +-
+ drivers/block/loop.c | 13 ++
+ drivers/block/loop.h | 1 +
+ drivers/block/null_blk.c | 6 +
+ drivers/md/bitmap.c | 2 +-
+ drivers/md/dm-rq.c | 2 +-
+ drivers/md/dm-table.c | 15 +-
+ drivers/md/dm.c | 11 -
+ fs/buffer.c | 60 +-----
+ fs/fs-writeback.c | 153 +++++++-------
+ fs/ntfs/aops.c | 2 +-
+ fs/ntfs/mft.c | 2 +-
+ fs/sync.c | 2 +-
+ include/linux/backing-dev-defs.h | 24 +++
+ include/linux/backing-dev.h | 4 -
+ include/linux/bio.h | 2 -
+ include/linux/blk-cgroup.h | 25 +--
+ include/linux/blk_types.h | 5 +-
+ include/linux/blkdev.h | 5 -
+ include/linux/buffer_head.h | 2 +-
+ include/linux/kthread.h | 11 +
+ include/linux/writeback.h | 30 +--
+ include/trace/events/writeback.h | 1 -
+ kernel/kthread.c | 66 +++++-
+ kernel/sysctl.c | 5 -
+ mm/backing-dev.c | 20 --
+ mm/page-writeback.c | 27 +--
+ mm/vmscan.c | 2 +-
+ 47 files changed, 569 insertions(+), 526 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
+Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
+$ git merge lightnvm/for-next
+Already up-to-date.
+Merging device-mapper/for-next (41dcf197ad53 dm raid: fix incorrect status output at the end of a "recover" process)
+$ git merge device-mapper/for-next
+Already up-to-date.
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/next (cf653c788a29 Merge branch 'fixes' into next)
+$ git merge mmc/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/mmc/amlogic,meson-mx-sdio.txt | 54 ++
+ .../devicetree/bindings/mmc/sdhci-msm.txt | 2 +
+ .../devicetree/bindings/mmc/sdhci-omap.txt | 16 +
+ MAINTAINERS | 6 +
+ drivers/mmc/core/block.c | 346 +++++++--
+ drivers/mmc/core/bus.c | 7 +
+ drivers/mmc/core/core.c | 252 ++++++-
+ drivers/mmc/core/core.h | 16 +-
+ drivers/mmc/core/host.c | 7 +-
+ drivers/mmc/core/host.h | 7 +-
+ drivers/mmc/core/mmc.c | 33 +-
+ drivers/mmc/core/mmc_ops.c | 6 +-
+ drivers/mmc/core/queue.c | 41 +-
+ drivers/mmc/core/queue.h | 4 +-
+ drivers/mmc/core/sd.c | 51 +-
+ drivers/mmc/core/sdio_irq.c | 3 +-
+ drivers/mmc/host/Kconfig | 28 +-
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/dw_mmc-k3.c | 2 +-
+ drivers/mmc/host/dw_mmc.c | 4 +-
+ drivers/mmc/host/dw_mmc.h | 3 +-
+ drivers/mmc/host/meson-mx-sdio.c | 769 +++++++++++++++++++++
+ drivers/mmc/host/mxcmmc.c | 4 +-
+ drivers/mmc/host/omap_hsmmc.c | 33 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 38 +-
+ drivers/mmc/host/sdhci-msm.c | 326 +++++++--
+ drivers/mmc/host/sdhci-of-at91.c | 3 +-
+ drivers/mmc/host/sdhci-of-esdhc.c | 58 +-
+ drivers/mmc/host/sdhci-omap.c | 607 ++++++++++++++++
+ drivers/mmc/host/sdhci-pci-core.c | 3 +
+ drivers/mmc/host/sdhci-pci.h | 1 +
+ drivers/mmc/host/sdhci-s3c.c | 18 +-
+ drivers/mmc/host/sdhci-tegra.c | 10 +-
+ drivers/mmc/host/sunxi-mmc.c | 5 +-
+ drivers/mmc/host/tmio_mmc_core.c | 5 +-
+ drivers/mmc/host/via-sdmmc.c | 4 +-
+ drivers/mmc/host/vub300.c | 10 +-
+ drivers/mmc/host/wbsd.c | 5 +-
+ drivers/regulator/pbias-regulator.c | 21 +-
+ include/linux/mfd/rtsx_pci.h | 1 +
+ include/linux/mmc/host.h | 9 +-
+ include/linux/mmc/sdhci-pci-data.h | 3 -
+ 42 files changed, 2538 insertions(+), 285 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-omap.txt
+ create mode 100644 drivers/mmc/host/meson-mx-sdio.c
+ create mode 100644 drivers/mmc/host/sdhci-omap.c
+Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 8147 and retry the command.
+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 (6e4c63dc37a2 md: raid10: remove a couple of redundant variables and initializations)
+$ git merge md/for-next
+Auto-merging drivers/md/md-multipath.c
+Auto-merging drivers/md/md-linear.c
+Auto-merging drivers/md/md-bitmap.c
+Auto-merging drivers/md/dm-raid.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 ++++++-
+ drivers/md/Makefile | 5 ++++-
+ drivers/md/dm-raid.c | 2 +-
+ drivers/md/{bitmap.c => md-bitmap.c} | 10 +++++++---
+ drivers/md/{bitmap.h => md-bitmap.h} | 0
+ drivers/md/md-cluster.c | 4 ++--
+ drivers/md/{faulty.c => md-faulty.c} | 0
+ drivers/md/{linear.c => md-linear.c} | 2 +-
+ drivers/md/{linear.h => md-linear.h} | 0
+ drivers/md/{multipath.c => md-multipath.c} | 2 +-
+ drivers/md/{multipath.h => md-multipath.h} | 0
+ drivers/md/md.c | 9 +++++----
+ drivers/md/raid1.c | 12 ++++++------
+ drivers/md/raid10.c | 23 ++++++++++++-----------
+ drivers/md/raid5-cache.c | 2 +-
+ drivers/md/raid5-ppl.c | 6 +++---
+ drivers/md/raid5.c | 2 +-
+ 17 files changed, 50 insertions(+), 36 deletions(-)
+ rename drivers/md/{bitmap.c => md-bitmap.c} (99%)
+ rename drivers/md/{bitmap.h => md-bitmap.h} (100%)
+ rename drivers/md/{faulty.c => md-faulty.c} (100%)
+ rename drivers/md/{linear.c => md-linear.c} (99%)
+ rename drivers/md/{linear.h => md-linear.h} (100%)
+ rename drivers/md/{multipath.c => md-multipath.c} (99%)
+ rename drivers/md/{multipath.h => md-multipath.h} (100%)
+Merging mfd/for-mfd-next (b01e9348e106 mfd: intel_soc_pmic: Differentiate between Bay and Cherry Trail CRC variants)
+$ git merge mfd/for-mfd-next
+Already up-to-date.
+Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/for-next (5d01fd38a3b0 power: supply: bq27xxx: enable writing capacity values for bq27421)
+$ 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 (9f9e5f58e734 Merge remote-tracking branch 'regulator/topic/axp20x' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/regulator/axp20x-regulator.c | 104 +++++++++++++++++++++++++++++++++--
+ include/linux/mfd/axp20x.h | 3 +
+ 2 files changed, 102 insertions(+), 5 deletions(-)
+Merging security/next-testing (25eabb13c7d6 Merge tag 'v4.14-rc2' into next-general)
+$ git merge security/next-testing
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging integrity/next (067b74aa4a3c ima: call ima_file_free() prior to calling fasync)
+$ git merge integrity/next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ fs/file_table.c | 2 +-
+ fs/namespace.c | 3 +-
+ include/linux/fs.h | 1 +
+ security/integrity/digsig.c | 14 +++++---
+ security/integrity/iint.c | 49 ---------------------------
+ security/integrity/ima/ima_api.c | 67 +++++++++++++++++++++++--------------
+ security/integrity/ima/ima_crypto.c | 10 ++++++
+ security/integrity/ima/ima_fs.c | 4 +--
+ security/integrity/ima/ima_main.c | 11 +++---
+ security/integrity/integrity.h | 2 --
+ 10 files changed, 73 insertions(+), 90 deletions(-)
+Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
+$ git merge keys/keys-next
+Merge made by the 'recursive' strategy.
+Merging selinux/next (4298555df5e5 selinux: fix build warning)
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ security/selinux/hooks.c | 50 ++++++++++++++++++------------------------
+ security/selinux/ss/hashtab.c | 17 ++++++++++++--
+ security/selinux/ss/hashtab.h | 4 ++++
+ security/selinux/ss/services.c | 4 ++++
+ 4 files changed, 44 insertions(+), 31 deletions(-)
+Merging tpmdd/next (1ab761ac3d4c tpm: use ARRAY_SIZE)
+$ git merge tpmdd/next
+Resolved 'drivers/char/tpm/tpm2-cmd.c' using previous resolution.
+Auto-merging security/integrity/ima/ima_main.c
+Auto-merging include/linux/fs.h
+Auto-merging drivers/char/tpm/tpm_tis_core.c
+Auto-merging drivers/char/tpm/tpm_crb.c
+Auto-merging drivers/char/tpm/tpm2-cmd.c
+CONFLICT (content): Merge conflict in drivers/char/tpm/tpm2-cmd.c
+Auto-merging drivers/char/tpm/tpm.h
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 92061ffd5a04] Merge remote-tracking branch 'tpmdd/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/ima_policy | 3 +-
+ Documentation/admin-guide/kernel-parameters.txt | 8 ++-
+ drivers/char/tpm/tpm-dev-common.c | 6 ++
+ drivers/char/tpm/tpm-sysfs.c | 87 ++++++++++++++-----------
+ drivers/char/tpm/tpm.h | 15 +----
+ drivers/char/tpm/tpm2-cmd.c | 74 +++++++--------------
+ drivers/char/tpm/tpm2-space.c | 4 +-
+ drivers/char/tpm/tpm_crb.c | 59 +++++++++--------
+ drivers/char/tpm/tpm_tis.c | 5 +-
+ drivers/char/tpm/tpm_tis_core.c | 6 +-
+ drivers/char/tpm/tpm_tis_core.h | 4 +-
+ drivers/char/tpm/tpm_tis_spi.c | 73 +++++++++++++--------
+ fs/efivarfs/file.c | 11 ++--
+ fs/libfs.c | 32 +++++++++
+ include/linux/fs.h | 2 +
+ security/integrity/ima/ima.h | 1 +
+ security/integrity/ima/ima_main.c | 12 +++-
+ security/integrity/ima/ima_policy.c | 41 +++++++++++-
+ 18 files changed, 263 insertions(+), 180 deletions(-)
+Merging watchdog/master (4cb30b044a8f watchdog: mei_wdt: constify mei_cl_device_id)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (8f6a3de987a8 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/drm.c | 3 +-
+ drivers/gpu/host1x/dev.c | 3 +-
+ drivers/iommu/amd_iommu.c | 41 ++--
+ drivers/iommu/arm-smmu-v3.c | 10 +
+ drivers/iommu/arm-smmu.c | 20 +-
+ drivers/iommu/dma-iommu.c | 18 +-
+ drivers/iommu/dmar.c | 7 +-
+ drivers/iommu/exynos-iommu.c | 25 ++-
+ drivers/iommu/intel-iommu.c | 23 ++-
+ drivers/iommu/io-pgtable-arm-v7s.c | 7 +-
+ drivers/iommu/io-pgtable-arm.c | 7 +-
+ drivers/iommu/iova.c | 205 ++++++++------------
+ drivers/iommu/ipmmu-vmsa.c | 10 +
+ drivers/iommu/mtk_iommu.c | 7 +
+ drivers/iommu/omap-iommu.c | 375 ++++++++++++++++++++++++++++---------
+ drivers/iommu/omap-iommu.h | 30 ++-
+ drivers/iommu/qcom_iommu.c | 15 ++
+ drivers/misc/mic/scif/scif_rma.c | 3 +-
+ include/linux/dmar.h | 1 +
+ include/linux/iova.h | 9 +-
+ 20 files changed, 506 insertions(+), 313 deletions(-)
+Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (79d40370e8d3 vfio-mdev/samples: make mdev_fops const and static)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci_config.c | 31 ++++++++++++++++++++++++++++---
+ drivers/vfio/vfio_iommu_spapr_tce.c | 2 ++
+ samples/vfio-mdev/mtty.c | 2 +-
+ 3 files changed, 31 insertions(+), 4 deletions(-)
+Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (462d9d959613 audit: use audit_set_enabled() in audit_enable())
+$ git merge audit/next
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit.h
+Auto-merging include/linux/audit.h
+Merge made by the 'recursive' strategy.
+ include/linux/audit.h | 8 ++++----
+ kernel/audit.c | 41 +++++++++++++++++++++++++++++++++--------
+ kernel/audit.h | 3 ++-
+ kernel/auditsc.c | 8 +++++++-
+ 4 files changed, 46 insertions(+), 14 deletions(-)
+Merging devicetree/for-next (1620c624305f dt-bindings: rtc: merge ds1339 in ds1307 documentation)
+$ git merge devicetree/for-next
+Auto-merging arch/powerpc/platforms/pseries/dlpar.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/trivial-devices.txt
+Removing Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/media/renesas,vsp1.txt | 2 +-
+ .../devicetree/bindings/rtc/dallas,ds1339.txt | 18 -
+ .../devicetree/bindings/rtc/rtc-ds1307.txt | 44 ++
+ .../devicetree/bindings/rtc/rtc-m41t80.txt | 31 +
+ .../devicetree/bindings/rtc/sirf,prima2-sysrtc.txt | 13 +
+ .../bindings/rtc/stericsson,coh901331.txt | 17 +
+ .../devicetree/bindings/trivial-devices.txt | 13 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 4 +
+ arch/powerpc/platforms/pseries/dlpar.c | 24 +-
+ arch/powerpc/platforms/pseries/reconfig.c | 2 +-
+ drivers/of/fdt.c | 69 +-
+ scripts/dtc/checks.c | 282 ++++++-
+ scripts/dtc/dtc-lexer.lex.c_shipped | 10 +-
+ scripts/dtc/dtc-parser.tab.c_shipped | 430 +++++-----
+ scripts/dtc/dtc-parser.y | 20 +-
+ scripts/dtc/dtc.c | 2 +-
+ scripts/dtc/dtc.h | 3 +
+ scripts/dtc/libfdt/fdt_addresses.c | 96 +++
+ scripts/dtc/libfdt/fdt_empty_tree.c | 1 -
+ scripts/dtc/libfdt/fdt_overlay.c | 861 +++++++++++++++++++++
+ scripts/dtc/libfdt/fdt_ro.c | 4 +-
+ scripts/dtc/libfdt/fdt_rw.c | 24 +-
+ scripts/dtc/libfdt/fdt_sw.c | 16 +-
+ scripts/dtc/libfdt/fdt_wip.c | 4 +-
+ scripts/dtc/libfdt/libfdt.h | 47 ++
+ scripts/dtc/livetree.c | 31 +-
+ scripts/dtc/update-dtc-source.sh | 4 +-
+ scripts/dtc/version_gen.h | 2 +-
+ 28 files changed, 1739 insertions(+), 335 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-ds1307.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-m41t80.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/sirf,prima2-sysrtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/stericsson,coh901331.txt
+ create mode 100644 scripts/dtc/libfdt/fdt_addresses.c
+ create mode 100644 scripts/dtc/libfdt/fdt_overlay.c
+Merging mailbox/mailbox-for-next (1da92afbbfcd mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (8b31a79774e2 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 6 +-
+ .../devicetree/bindings/spi/spi-davinci.txt | 10 +
+ Documentation/devicetree/bindings/spi/spi-rspi.txt | 5 +-
+ .../devicetree/bindings/spi/spi-sprd-adi.txt | 58 +++
+ drivers/spi/Kconfig | 11 +-
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-armada-3700.c | 162 +++-----
+ drivers/spi/spi-bcm-qspi.c | 9 +-
+ drivers/spi/spi-imx.c | 227 +++++++++--
+ drivers/spi/spi-mxs.c | 120 +++++-
+ drivers/spi/spi-rspi.c | 6 +-
+ drivers/spi/spi-sh-msiof.c | 8 +-
+ drivers/spi/spi-sprd-adi.c | 419 +++++++++++++++++++++
+ drivers/spi/spi-stm32.c | 4 +-
+ drivers/spi/spi-tegra114.c | 6 +-
+ include/uapi/linux/spi/spidev.h | 1 +
+ 16 files changed, 878 insertions(+), 175 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sprd-adi.txt
+ create mode 100644 drivers/spi/spi-sprd-adi.c
+Merging tip/auto-latest (bee090cf8fe3 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Recorded preimage for 'arch/s390/include/asm/spinlock.h'
+Removing tools/perf/arch/x86/tests/intel-cqm.c
+Auto-merging tools/include/uapi/linux/bpf.h
+Auto-merging kernel/kthread.c
+Auto-merging kernel/events/core.c
+Auto-merging include/linux/kthread.h
+Auto-merging drivers/s390/net/lcs.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/base/power/main.c
+Auto-merging drivers/atm/idt77105.c
+Removing arch/x86/include/asm/x2apic.h
+Auto-merging arch/s390/kernel/topology.c
+Auto-merging arch/s390/include/asm/spinlock.h
+CONFLICT (content): Merge conflict in arch/s390/include/asm/spinlock.h
+CONFLICT (modify/delete): arch/s390/include/asm/rwsem.h deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/s390/include/asm/rwsem.h left in tree.
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging Makefile
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/s390/include/asm/spinlock.h'.
+[master 73874ad008afd446cbcdfab284385fcae4160161] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 9 +-
+ Documentation/x86/intel_rdt_ui.txt | 11 +
+ Makefile | 6 +-
+ arch/alpha/include/asm/rwsem.h | 21 +-
+ arch/alpha/include/asm/spinlock.h | 14 -
+ arch/arc/include/asm/spinlock.h | 11 -
+ arch/arm/include/asm/spinlock.h | 15 -
+ arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 2 +-
+ arch/arm64/include/asm/spinlock.h | 9 -
+ arch/blackfin/include/asm/spinlock.h | 20 -
+ arch/hexagon/include/asm/spinlock.h | 15 -
+ arch/ia64/include/asm/rwsem.h | 25 +-
+ arch/ia64/include/asm/spinlock.h | 12 +-
+ arch/m32r/include/asm/spinlock.h | 20 -
+ arch/m68k/amiga/amisound.c | 2 +-
+ arch/m68k/mac/macboing.c | 2 +-
+ arch/metag/include/asm/spinlock.h | 9 -
+ arch/metag/include/asm/spinlock_lnkget.h | 37 -
+ arch/metag/include/asm/spinlock_lock1.h | 20 -
+ arch/mips/include/asm/spinlock.h | 7 -
+ arch/mips/mti-malta/malta-display.c | 6 +-
+ arch/mn10300/include/asm/spinlock.h | 16 +-
+ arch/parisc/include/asm/spinlock.h | 22 +-
+ arch/parisc/kernel/pdc_cons.c | 2 +-
+ arch/powerpc/include/asm/spinlock.h | 7 +-
+ arch/powerpc/mm/numa.c | 12 +-
+ arch/s390/include/asm/spinlock.h | 20 +-
+ arch/s390/kernel/lgr.c | 6 +-
+ arch/s390/kernel/topology.c | 6 +-
+ arch/s390/mm/cmm.c | 2 +-
+ arch/sh/include/asm/spinlock-cas.h | 20 -
+ arch/sh/include/asm/spinlock-llsc.h | 20 -
+ arch/sparc/include/asm/spinlock_32.h | 11 -
+ arch/sparc/include/asm/spinlock_64.h | 7 -
+ arch/tile/include/asm/spinlock_32.h | 22 -
+ arch/tile/include/asm/spinlock_64.h | 24 -
+ arch/x86/Kconfig | 3 +-
+ arch/x86/boot/header.S | 1 -
+ arch/x86/entry/entry_32.S | 4 +-
+ arch/x86/events/intel/core.c | 4 +
+ arch/x86/events/intel/uncore.c | 12 +-
+ arch/x86/events/perf_event.h | 24 +-
+ arch/x86/hyperv/hv_init.c | 5 +
+ arch/x86/hyperv/mmu.c | 57 +-
+ arch/x86/include/asm/alternative-asm.h | 4 +-
+ arch/x86/include/asm/alternative.h | 6 +-
+ arch/x86/include/asm/apic.h | 270 ++---
+ arch/x86/include/asm/archrandom.h | 8 +-
+ arch/x86/include/asm/bitops.h | 10 +-
+ arch/x86/include/asm/desc.h | 2 +-
+ arch/x86/include/asm/hw_irq.h | 6 +-
+ arch/x86/include/asm/io_apic.h | 2 -
+ arch/x86/include/asm/irq.h | 4 -
+ arch/x86/include/asm/irq_vectors.h | 8 +-
+ arch/x86/include/asm/irqdomain.h | 5 +-
+ arch/x86/include/asm/kprobes.h | 4 +-
+ arch/x86/include/asm/kvm_host.h | 2 +-
+ arch/x86/include/asm/mce.h | 1 -
+ arch/x86/include/asm/mpspec_def.h | 2 +-
+ arch/x86/include/asm/mshyperv.h | 1 +
+ arch/x86/include/asm/percpu.h | 2 +-
+ arch/x86/include/asm/qspinlock.h | 11 +-
+ arch/x86/include/asm/refcount.h | 2 +-
+ arch/x86/include/asm/rmwcc.h | 2 +-
+ arch/x86/include/asm/rwsem.h | 84 +-
+ arch/x86/include/asm/spinlock.h | 7 -
+ arch/x86/include/asm/timer.h | 2 +-
+ arch/x86/include/asm/trace/irq_vectors.h | 244 ++++
+ arch/x86/include/asm/tsc.h | 1 +
+ arch/x86/include/asm/x2apic.h | 49 -
+ arch/x86/include/asm/x86_init.h | 2 +
+ arch/x86/kernel/Makefile | 1 -
+ arch/x86/kernel/apic/Makefile | 2 +-
+ arch/x86/kernel/apic/apic.c | 241 ++--
+ arch/x86/kernel/apic/apic_common.c | 46 +
+ arch/x86/kernel/apic/apic_flat_64.c | 10 +-
+ arch/x86/kernel/apic/apic_noop.c | 25 +-
+ arch/x86/kernel/apic/apic_numachip.c | 12 +-
+ arch/x86/kernel/apic/bigsmp_32.c | 8 +-
+ arch/x86/kernel/apic/htirq.c | 5 +-
+ arch/x86/kernel/apic/io_apic.c | 139 +--
+ arch/x86/kernel/apic/msi.c | 5 +-
+ arch/x86/kernel/apic/probe_32.c | 29 +-
+ arch/x86/kernel/apic/vector.c | 1090 ++++++++++--------
+ arch/x86/kernel/apic/x2apic.h | 9 +
+ arch/x86/kernel/apic/x2apic_cluster.c | 196 ++--
+ arch/x86/kernel/apic/x2apic_phys.c | 44 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 17 +-
+ arch/x86/kernel/cpu/common.c | 4 +-
+ arch/x86/kernel/cpu/intel_rdt.h | 7 +
+ arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 45 +-
+ arch/x86/kernel/cpu/intel_rdt_monitor.c | 2 +-
+ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 113 +-
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 7 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 13 +-
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +
+ arch/x86/kernel/head_64.S | 27 +-
+ arch/x86/kernel/i8259.c | 1 +
+ arch/x86/kernel/idt.c | 12 +-
+ arch/x86/kernel/irq.c | 101 +-
+ arch/x86/kernel/irqinit.c | 4 +-
+ arch/x86/kernel/kprobes/common.h | 19 +-
+ arch/x86/kernel/kprobes/core.c | 63 +-
+ arch/x86/kernel/kprobes/ftrace.c | 32 +-
+ arch/x86/kernel/kprobes/opt.c | 79 +-
+ arch/x86/kernel/paravirt.c | 14 +-
+ arch/x86/kernel/reboot.c | 4 +
+ arch/x86/kernel/setup.c | 43 +-
+ arch/x86/kernel/smpboot.c | 103 +-
+ arch/x86/kernel/stacktrace.c | 10 +-
+ arch/x86/kernel/time.c | 5 +
+ arch/x86/kernel/traps.c | 2 +-
+ arch/x86/kernel/tsc.c | 27 +-
+ arch/x86/kernel/unwind_frame.c | 38 +-
+ arch/x86/kernel/verify_cpu.S | 3 +-
+ arch/x86/kernel/vsmp_64.c | 19 -
+ arch/x86/kernel/x86_init.c | 1 +
+ arch/x86/lib/rwsem.S | 12 +
+ arch/x86/mm/Makefile | 11 +-
+ arch/x86/mm/extable.c | 7 +-
+ arch/x86/platform/uv/uv_irq.c | 5 +-
+ arch/x86/xen/apic.c | 6 +-
+ arch/x86/xen/enlighten_pv.c | 1 +
+ arch/x86/xen/spinlock.c | 2 +
+ arch/x86/xen/xen-head.S | 11 +-
+ arch/xtensa/include/asm/spinlock.h | 7 -
+ drivers/atm/idt77105.c | 4 +-
+ drivers/atm/iphase.c | 2 +-
+ drivers/base/power/main.c | 8 +-
+ drivers/block/ataflop.c | 8 +-
+ drivers/char/dtlk.c | 2 +-
+ drivers/char/hangcheck-timer.c | 2 +-
+ drivers/char/nwbutton.c | 2 +-
+ drivers/char/rtc.c | 2 +-
+ drivers/char/tlclk.c | 12 +-
+ drivers/cpufreq/powernv-cpufreq.c | 13 +-
+ drivers/firewire/core-transaction.c | 10 +-
+ drivers/gpio/gpio-xgene-sb.c | 8 +-
+ drivers/hsi/clients/ssi_protocol.c | 32 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 2 +-
+ drivers/iommu/amd_iommu.c | 44 +-
+ drivers/iommu/intel_irq_remapping.c | 43 +-
+ drivers/irqchip/irq-gic-v3-its.c | 10 +-
+ drivers/net/cris/eth_v10.c | 6 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 11 +-
+ drivers/net/ethernet/tile/tilepro.c | 9 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/vxlan.c | 8 +-
+ drivers/net/wireless/ath/ath6kl/recovery.c | 9 +-
+ drivers/net/wireless/atmel/at76c50x-usb.c | 2 +-
+ drivers/parport/ieee1284.c | 21 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +-
+ drivers/ras/cec.c | 2 +-
+ drivers/s390/char/tape.h | 1 +
+ drivers/s390/char/tape_std.c | 18 +-
+ drivers/s390/net/lcs.c | 17 +-
+ drivers/s390/net/lcs.h | 1 +
+ drivers/scsi/qla1280.c | 14 +-
+ drivers/scsi/qla1280.h | 1 +
+ drivers/staging/speakup/main.c | 2 +-
+ drivers/staging/speakup/synth.c | 2 +-
+ drivers/tty/cyclades.c | 2 +-
+ drivers/tty/isicom.c | 2 +-
+ drivers/tty/moxa.c | 2 +-
+ drivers/tty/rocket.c | 2 +-
+ drivers/tty/vt/keyboard.c | 2 +-
+ drivers/tty/vt/vt.c | 2 +-
+ drivers/watchdog/alim7101_wdt.c | 4 +-
+ drivers/watchdog/machzwd.c | 2 +-
+ drivers/watchdog/mixcomwd.c | 2 +-
+ drivers/watchdog/sbc60xxwdt.c | 2 +-
+ drivers/watchdog/sc520_wdt.c | 2 +-
+ drivers/watchdog/via_wdt.c | 2 +-
+ drivers/watchdog/w83877f_wdt.c | 2 +-
+ drivers/xen/grant-table.c | 2 +-
+ fs/proc/array.c | 2 +-
+ fs/pstore/platform.c | 2 +-
+ fs/readdir.c | 11 +-
+ include/asm-generic/qrwlock.h | 20 -
+ include/asm-generic/qspinlock.h | 1 -
+ include/asm-generic/rwsem.h | 10 +
+ include/asm-generic/vmlinux.lds.h | 1 +
+ include/linux/ioprio.h | 3 +-
+ include/linux/irq.h | 22 +
+ include/linux/irqdesc.h | 1 +
+ include/linux/irqdomain.h | 14 +-
+ include/linux/kthread.h | 10 +-
+ include/linux/msi.h | 5 +
+ include/linux/parport.h | 1 +
+ include/linux/rwlock.h | 12 +-
+ include/linux/rwsem.h | 1 +
+ include/linux/sched.h | 17 +-
+ include/linux/sched/rt.h | 11 +
+ include/linux/sched/topology.h | 8 -
+ include/linux/spinlock.h | 15 +-
+ include/linux/spinlock_up.h | 11 -
+ include/linux/timekeeper_internal.h | 6 +-
+ include/linux/timekeeping.h | 1 +
+ include/linux/timer.h | 35 +-
+ include/linux/workqueue.h | 15 +-
+ include/trace/events/irq_matrix.h | 201 ++++
+ include/trace/events/sched.h | 2 +-
+ init/main.c | 2 +-
+ kernel/events/core.c | 15 +-
+ kernel/irq/Kconfig | 3 +
+ kernel/irq/Makefile | 1 +
+ kernel/irq/autoprobe.c | 2 +-
+ kernel/irq/chip.c | 37 +-
+ kernel/irq/cpuhotplug.c | 28 +-
+ kernel/irq/debugfs.c | 12 +
+ kernel/irq/internals.h | 19 +
+ kernel/irq/irqdesc.c | 3 +-
+ kernel/irq/irqdomain.c | 43 +-
+ kernel/irq/manage.c | 35 +-
+ kernel/irq/matrix.c | 443 ++++++++
+ kernel/irq/msi.c | 32 +-
+ kernel/irq/spurious.c | 2 +-
+ kernel/kprobes.c | 7 +-
+ kernel/kthread.c | 10 +-
+ kernel/locking/lockdep.c | 48 +-
+ kernel/locking/rwsem.c | 16 +
+ kernel/locking/spinlock.c | 6 +-
+ kernel/printk/printk.c | 130 ++-
+ kernel/sched/core.c | 22 +-
+ kernel/sched/deadline.c | 21 +-
+ kernel/sched/debug.c | 18 +-
+ kernel/sched/fair.c | 1188 ++++++++++++--------
+ kernel/sched/features.h | 3 +
+ kernel/sched/idle.c | 1 -
+ kernel/sched/rt.c | 316 ++----
+ kernel/sched/sched.h | 48 +-
+ kernel/sched/topology.c | 25 +-
+ kernel/test_kprobes.c | 20 +
+ kernel/time/tick-sched.c | 2 +
+ kernel/time/timekeeping.c | 60 +-
+ kernel/time/timer.c | 26 +-
+ kernel/trace/trace_output.c | 12 +-
+ kernel/trace/trace_sched_wakeup.c | 8 +-
+ kernel/workqueue.c | 15 +-
+ lib/Kconfig.debug | 48 +-
+ lib/locking-selftest.c | 2 +
+ lib/random32.c | 2 +-
+ mm/gup.c | 97 +-
+ net/atm/mpc.c | 2 +-
+ net/decnet/dn_route.c | 2 +-
+ net/ipv6/ip6_flowlabel.c | 2 +-
+ net/netrom/nr_loopback.c | 2 +-
+ security/apparmor/include/lib.h | 11 -
+ security/apparmor/label.c | 8 +-
+ security/keys/gc.c | 2 +-
+ sound/oss/midibuf.c | 2 +-
+ sound/oss/soundcard.c | 2 +-
+ sound/oss/sys_timer.c | 2 +-
+ sound/oss/uart6850.c | 2 +-
+ tools/include/linux/poison.h | 5 +
+ tools/include/uapi/linux/bpf.h | 2 +-
+ tools/objtool/check.c | 7 +-
+ tools/perf/Documentation/perf-list.txt | 9 +-
+ tools/perf/Documentation/perf-record.txt | 2 +
+ tools/perf/Documentation/perf-sched.txt | 8 +
+ tools/perf/Documentation/perf-script.txt | 4 +-
+ tools/perf/Documentation/perf-stat.txt | 7 +
+ tools/perf/Documentation/perf-top.txt | 3 +
+ tools/perf/Makefile.perf | 17 +-
+ tools/perf/arch/x86/include/arch-tests.h | 1 -
+ tools/perf/arch/x86/tests/Build | 1 -
+ tools/perf/arch/x86/tests/arch-tests.c | 4 -
+ tools/perf/arch/x86/tests/intel-cqm.c | 127 ---
+ tools/perf/builtin-c2c.c | 1 +
+ tools/perf/builtin-config.c | 22 +-
+ tools/perf/builtin-kvm.c | 4 +-
+ tools/perf/builtin-list.c | 7 +
+ tools/perf/builtin-mem.c | 1 +
+ tools/perf/builtin-record.c | 5 +-
+ tools/perf/builtin-sched.c | 4 +
+ tools/perf/builtin-script.c | 36 +-
+ tools/perf/builtin-stat.c | 82 +-
+ tools/perf/builtin-timechart.c | 4 +-
+ tools/perf/builtin-top.c | 13 +-
+ tools/perf/builtin-trace.c | 22 +-
+ tools/perf/perf.h | 1 +
+ .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 164 +++
+ .../arch/x86/broadwellde/bdwde-metrics.json | 164 +++
+ .../arch/x86/broadwellx/bdx-metrics.json | 164 +++
+ .../pmu-events/arch/x86/haswell/hsw-metrics.json | 158 +++
+ .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 158 +++
+ .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 164 +++
+ .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 164 +++
+ .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 140 +++
+ .../arch/x86/sandybridge/snb-metrics.json | 140 +++
+ .../pmu-events/arch/x86/skylake/skl-metrics.json | 164 +++
+ .../pmu-events/arch/x86/skylakex/skx-metrics.json | 182 +++
+ tools/perf/pmu-events/jevents.c | 24 +-
+ tools/perf/pmu-events/jevents.h | 2 +-
+ tools/perf/pmu-events/pmu-events.h | 1 +
+ tools/perf/tests/attr.c | 2 +-
+ tools/perf/tests/attr.py | 6 +-
+ tools/perf/tests/attr/base-record | 2 +-
+ tools/perf/tests/attr/test-record-group | 1 +
+ tools/perf/tests/attr/test-record-group-sampling | 2 +-
+ tools/perf/tests/attr/test-record-group1 | 1 +
+ tools/perf/tests/attr/test-stat-group | 2 +
+ tools/perf/tests/attr/test-stat-group1 | 2 +
+ tools/perf/tests/builtin-test.c | 1 +
+ tools/perf/tests/mmap-thread-lookup.c | 2 +-
+ tools/perf/trace/beauty/madvise_behavior.sh | 10 +
+ tools/perf/trace/beauty/mmap.c | 38 +-
+ tools/perf/ui/progress.c | 6 +-
+ tools/perf/ui/progress.h | 12 +-
+ tools/perf/ui/tui/progress.c | 32 +-
+ tools/perf/util/Build | 2 +
+ tools/perf/util/callchain.c | 6 +-
+ tools/perf/util/comm.c | 18 +-
+ tools/perf/util/config.c | 5 +-
+ tools/perf/util/data.c | 1 +
+ tools/perf/util/dso.c | 13 +-
+ tools/perf/util/dso.h | 4 +-
+ tools/perf/util/event.c | 161 ++-
+ tools/perf/util/event.h | 3 +-
+ tools/perf/util/evlist.h | 1 +
+ tools/perf/util/evsel.c | 7 +-
+ tools/perf/util/evsel.h | 1 +
+ tools/perf/util/machine.c | 163 ++-
+ tools/perf/util/machine.h | 33 +-
+ tools/perf/util/map.c | 34 +-
+ tools/perf/util/map.h | 3 +-
+ tools/perf/util/metricgroup.c | 490 ++++++++
+ tools/perf/util/metricgroup.h | 31 +
+ tools/perf/util/namespaces.c | 1 +
+ tools/perf/util/parse-events.c | 38 +-
+ tools/perf/util/parse-events.h | 3 +
+ tools/perf/util/parse-events.l | 3 +-
+ tools/perf/util/pmu.c | 111 +-
+ tools/perf/util/pmu.h | 3 +
+ tools/perf/util/probe-file.c | 1 +
+ tools/perf/util/rb_resort.h | 5 +-
+ tools/perf/util/rwsem.c | 32 +
+ tools/perf/util/rwsem.h | 19 +
+ tools/perf/util/session.c | 2 +-
+ tools/perf/util/stat-shadow.c | 110 +-
+ tools/perf/util/stat.h | 4 +-
+ tools/perf/util/symbol.c | 8 +-
+ tools/perf/util/thread.c | 57 +-
+ tools/perf/util/thread.h | 3 +
+ tools/perf/util/top.h | 1 +
+ tools/perf/util/trace-event-info.c | 1 -
+ tools/perf/util/trace-event-read.c | 1 -
+ tools/perf/util/util.c | 16 +-
+ tools/perf/util/util.h | 7 +-
+ tools/perf/util/vdso.c | 4 +-
+ tools/perf/util/zlib.c | 1 +
+ 352 files changed, 7876 insertions(+), 3570 deletions(-)
+ delete mode 100644 arch/x86/include/asm/x2apic.h
+ create mode 100644 arch/x86/kernel/apic/apic_common.c
+ create mode 100644 arch/x86/kernel/apic/x2apic.h
+ create mode 100644 include/trace/events/irq_matrix.h
+ create mode 100644 kernel/irq/matrix.c
+ delete mode 100644 tools/perf/arch/x86/tests/intel-cqm.c
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json
+ create mode 100755 tools/perf/trace/beauty/madvise_behavior.sh
+ create mode 100644 tools/perf/util/metricgroup.c
+ create mode 100644 tools/perf/util/metricgroup.h
+ create mode 100644 tools/perf/util/rwsem.c
+ create mode 100644 tools/perf/util/rwsem.h
+Merging clockevents/clockevents/next (6ec6257f8981 MAINTAINERS: Fix path and add bindings to timers)
+$ git merge clockevents/clockevents/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/timer/renesas,cmt.txt | 24 +++----
+ MAINTAINERS | 3 +-
+ drivers/clocksource/Kconfig | 50 +++-----------
+ drivers/clocksource/owl-timer.c | 4 +-
+ drivers/clocksource/rockchip_timer.c | 2 +-
+ drivers/clocksource/sh_cmt.c | 76 ++++++++++------------
+ drivers/clocksource/timer-fttmr010.c | 4 +-
+ 7 files changed, 61 insertions(+), 102 deletions(-)
+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 (24281a2f4ca5 EDAC, sb_edac: Fix missing DIMM sysfs entries with KNL SNC2/SNC4 mode)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 5 ++
+ drivers/edac/edac_mc.c | 7 ++-
+ drivers/edac/edac_mc.h | 8 +++
+ drivers/edac/ghes_edac.c | 137 ++++++++++++++++++++++---------------------
+ drivers/edac/i7core_edac.c | 11 +++-
+ drivers/edac/pnd2_edac.c | 9 ++-
+ drivers/edac/sb_edac.c | 42 +++++++------
+ drivers/edac/skx_edac.c | 30 +++++++---
+ drivers/edac/thunderx_edac.c | 25 --------
+ 9 files changed, 150 insertions(+), 124 deletions(-)
+Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date.
+Merging ftrace/for-next (6171a0310a06 ftrace/kallsyms: Have /proc/kallsyms show saved mod init functions)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/ftrace.c
+Merge made by the 'recursive' strategy.
+ include/linux/ftrace.h | 27 +++++
+ include/linux/init.h | 4 +-
+ kernel/kallsyms.c | 43 +++++++-
+ kernel/module.c | 2 +
+ kernel/trace/ftrace.c | 230 ++++++++++++++++++++++++++++++++++++++-
+ kernel/trace/ring_buffer.c | 64 +++--------
+ kernel/trace/trace.c | 91 ++++++++++++++++
+ kernel/trace/trace.h | 9 +-
+ kernel/trace/trace_events.c | 31 +++---
+ kernel/trace/trace_events_hist.c | 128 +++++++++++++++-------
+ kernel/trace/trace_kprobe.c | 18 +--
+ kernel/trace/trace_probe.c | 86 ---------------
+ kernel/trace/trace_probe.h | 7 --
+ kernel/trace/trace_selftest.c | 32 ------
+ kernel/trace/trace_uprobe.c | 2 +-
+ kernel/trace/tracing_map.c | 3 +-
+ kernel/trace/tracing_map.h | 2 +-
+ 17 files changed, 521 insertions(+), 258 deletions(-)
+Merging rcu/rcu/next (698f230d8bce doc: Update dyntick-idle design documentation for NMI/irq consolidation)
+$ git merge rcu/rcu/next
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/seccomp.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging arch/powerpc/mm/mmu_context.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/core-api/kernel-api.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ .../Design/Data-Structures/Data-Structures.html | 46 +-
+ .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 +
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 707 +++
+ .../TreeRCU-callback-invocation.svg | 486 ++
+ .../Memory-Ordering/TreeRCU-callback-registry.svg | 655 +++
+ .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 700 +++
+ .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 1126 +++++
+ .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 1309 +++++
+ .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 656 +++
+ .../Design/Memory-Ordering/TreeRCU-gp-init-2.svg | 656 +++
+ .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 632 +++
+ .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 5135 ++++++++++++++++++++
+ .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 775 +++
+ .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 1095 +++++
+ .../RCU/Design/Memory-Ordering/rcu_node-lock.svg | 229 +
+ Documentation/RCU/stallwarn.txt | 200 +-
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/core-api/kernel-api.rst | 14 -
+ Documentation/memory-barriers.txt | 209 +-
+ .../translations/ko_KR/memory-barriers.txt | 12 -
+ MAINTAINERS | 2 +
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/membarrier.h | 26 +
+ arch/powerpc/kernel/Makefile | 2 +
+ arch/powerpc/kernel/membarrier.c | 36 +
+ arch/powerpc/mm/mmu_context.c | 7 +
+ arch/x86/events/core.c | 2 +-
+ arch/x86/include/asm/mmu_context.h | 4 +-
+ arch/x86/kernel/ldt.c | 2 +-
+ arch/x86/mm/tlb.c | 5 +
+ drivers/md/dm-mpath.c | 20 +-
+ fs/dcache.c | 4 +-
+ fs/exec.c | 1 +
+ fs/overlayfs/ovl_entry.h | 2 +-
+ fs/overlayfs/readdir.c | 2 +-
+ include/linux/compiler.h | 21 +-
+ include/linux/irq_work.h | 3 -
+ include/linux/mm_types.h | 3 +
+ include/linux/rculist.h | 6 +-
+ include/linux/rcupdate.h | 26 +-
+ include/linux/rcutiny.h | 1 -
+ include/linux/rcutree.h | 1 -
+ include/linux/sched/mm.h | 37 +
+ include/linux/srcu.h | 1 +
+ include/linux/tracepoint.h | 5 +-
+ include/trace/events/rcu.h | 33 +-
+ include/uapi/linux/membarrier.h | 23 +-
+ init/Kconfig | 3 +
+ kernel/events/core.c | 4 +-
+ kernel/irq_work.c | 9 +-
+ kernel/rcu/rcu.h | 48 +-
+ kernel/rcu/rcu_segcblist.c | 1 +
+ kernel/rcu/rcutorture.c | 24 +-
+ kernel/rcu/srcutree.c | 2 +-
+ kernel/rcu/sync.c | 9 +-
+ kernel/rcu/tree.c | 507 +-
+ kernel/rcu/tree.h | 10 +-
+ kernel/rcu/tree_plugin.h | 14 +-
+ kernel/rcu/update.c | 25 +-
+ kernel/sched/core.c | 52 +-
+ kernel/sched/membarrier.c | 35 +-
+ kernel/seccomp.c | 2 +-
+ kernel/task_work.c | 2 +-
+ kernel/torture.c | 3 +-
+ kernel/trace/trace.c | 11 -
+ mm/slab.h | 2 +-
+ .../testing/selftests/membarrier/membarrier_test.c | 109 +-
+ .../selftests/rcutorture/bin/config_override.sh | 2 +-
+ .../selftests/rcutorture/bin/configcheck.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 4 +-
+ .../selftests/rcutorture/bin/parse-build.sh | 2 +-
+ .../selftests/rcutorture/bin/parse-torture.sh | 2 +-
+ 75 files changed, 15130 insertions(+), 690 deletions(-)
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg
+ create mode 100644 Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg
+ create mode 100644 arch/powerpc/include/asm/membarrier.h
+ create mode 100644 arch/powerpc/kernel/membarrier.c
+Merging kvm/linux-next (31afb2ea2b10 KVM: VMX: simplify and fix vmx_vcpu_pi_load)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/next (9b87e7a8bfb5 KVM: arm/arm64: Support uaccess of GICC_APRn)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
+$ git merge kvm-mips/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (31afb2ea2b10 KVM: VMX: simplify and fix vmx_vcpu_pi_load)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (373d2f76f375 KVM: s390: document memory ordering for kvm_s390_vcpu_wakeup)
+$ git merge kvms390/next
+Merge made by the 'recursive' strategy.
+ arch/s390/kvm/interrupt.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging xen-tip/linux-next (eac779aa509d xen/vcpu: Use a unified name about cpu hotplug state for pv and pvhvm)
+$ git merge xen-tip/linux-next
+Merge made by the 'recursive' strategy.
+ arch/x86/xen/enlighten.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging percpu/for-next (438a50618095 percpu: don't forget to free the temporary struct pcpu_alloc_info)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ mm/percpu.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging workqueues/for-next (d160a249ce34 Merge branch 'for-4.14-fixes' into for-next)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 37 +++++++++++++++----------------------
+ 1 file changed, 15 insertions(+), 22 deletions(-)
+Merging drivers-x86/for-next (cd6bf7741cf9 platform/x86: fujitsu-laptop: Don't oops when FUJ02E3 is not presnt)
+$ git merge drivers-x86/for-next
+Resolved 'Documentation/admin-guide/thunderbolt.rst' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/thunderbolt.rst
+CONFLICT (content): Merge conflict in Documentation/admin-guide/thunderbolt.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5a16ec6beae8] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../testing/sysfs-platform-intel-wmi-thunderbolt | 11 +++
+ Documentation/admin-guide/thunderbolt.rst | 15 ++++
+ MAINTAINERS | 7 +-
+ drivers/platform/x86/Kconfig | 15 +++-
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/asus-wmi.c | 63 ++++++++++++++
+ drivers/platform/x86/dell-smbios.c | 1 +
+ drivers/platform/x86/dell-wmi.c | 1 -
+ drivers/platform/x86/intel-hid.c | 18 ++++
+ drivers/platform/x86/intel-wmi-thunderbolt.c | 98 ++++++++++++++++++++++
+ drivers/platform/x86/intel_cht_int33fe.c | 70 ++++++++++++++--
+ drivers/platform/x86/intel_telemetry_debugfs.c | 16 ++--
+ drivers/platform/x86/wmi.c | 18 ++--
+ 13 files changed, 304 insertions(+), 30 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-intel-wmi-thunderbolt
+ create mode 100644 drivers/platform/x86/intel-wmi-thunderbolt.c
+Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function)
+$ git merge chrome-platform/for-next
+Auto-merging drivers/platform/chrome/chromeos_laptop.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/chromeos_laptop.c | 22 +++----
+ drivers/platform/chrome/cros_ec_debugfs.c | 18 +++++
+ drivers/platform/chrome/cros_ec_debugfs.h | 2 +
+ drivers/platform/chrome/cros_ec_dev.c | 49 ++++++++------
+ drivers/platform/chrome/cros_ec_proto.c | 8 ++-
+ drivers/platform/chrome/cros_ec_sysfs.c | 105 ++++++++++++++++++++++++------
+ include/linux/mfd/cros_ec.h | 1 +
+ 7 files changed, 149 insertions(+), 56 deletions(-)
+Merging hsi/for-next (8635d6b3afe6 dt-bindings: hsi: add omap4 hsi controller bindings)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/clients/hsi_char.c | 4 ++--
+ drivers/hsi/controllers/omap_ssi_core.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+Merging leds/for-next (94bf9e0cbb15 leds: tca6507: Remove unnecessary reg check)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/leds-pca955x.c | 17 +-
+ drivers/leds/leds-tca6507.c | 2 +-
+ drivers/leds/trigger/Kconfig | 9 +
+ drivers/leds/trigger/Makefile | 1 +
+ drivers/leds/trigger/ledtrig-activity.c | 273 +++++++++++++++++++++++++++++++
+ drivers/leds/trigger/ledtrig-heartbeat.c | 16 +-
+ include/linux/leds.h | 18 +-
+ 7 files changed, 315 insertions(+), 21 deletions(-)
+ create mode 100644 drivers/leds/trigger/ledtrig-activity.c
+Merging ipmi/for-next (b79bba15b3f2 ipmi: remove redundant initialization of bmc)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/IPMI.txt | 4 +-
+ drivers/char/ipmi/Kconfig | 35 +-
+ drivers/char/ipmi/Makefile | 10 +-
+ drivers/char/ipmi/ipmi_dmi.c | 76 +-
+ drivers/char/ipmi/ipmi_dmi.h | 8 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 1275 ++++++++++++-----
+ drivers/char/ipmi/ipmi_powernv.c | 4 +-
+ drivers/char/ipmi/ipmi_poweroff.c | 2 +-
+ drivers/char/ipmi/ipmi_si.h | 49 +
+ drivers/char/ipmi/ipmi_si_hardcode.c | 146 ++
+ drivers/char/ipmi/ipmi_si_hotmod.c | 242 ++++
+ drivers/char/ipmi/ipmi_si_intf.c | 2476 +++++++---------------------------
+ drivers/char/ipmi/ipmi_si_mem_io.c | 144 ++
+ drivers/char/ipmi/ipmi_si_parisc.c | 58 +
+ drivers/char/ipmi/ipmi_si_pci.c | 166 +++
+ drivers/char/ipmi/ipmi_si_platform.c | 593 ++++++++
+ drivers/char/ipmi/ipmi_si_port_io.c | 112 ++
+ drivers/char/ipmi/ipmi_si_sm.h | 23 +
+ drivers/char/ipmi/ipmi_ssif.c | 112 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 11 +-
+ include/linux/ipmi.h | 8 +-
+ include/linux/ipmi_smi.h | 27 +-
+ 22 files changed, 3185 insertions(+), 2396 deletions(-)
+ create mode 100644 drivers/char/ipmi/ipmi_si.h
+ create mode 100644 drivers/char/ipmi/ipmi_si_hardcode.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_hotmod.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_mem_io.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_parisc.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_pci.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_platform.c
+ create mode 100644 drivers/char/ipmi/ipmi_si_port_io.c
+Merging driver-core/driver-core-next (8a5776a5f498 Linux 4.14-rc4)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging usb/usb-next (4fcae770f302 Merge 4.14-rc4 into usb-next)
+$ git merge usb/usb-next
+Auto-merging include/linux/usb/tcpm.h
+Auto-merging include/linux/usb/pd.h
+Auto-merging drivers/usb/typec/tcpm.c
+Auto-merging drivers/usb/typec/fusb302/fusb302.c
+Auto-merging drivers/usb/gadget/udc/dummy_hcd.c
+Removing drivers/staging/typec/fusb302/TODO
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/maxim,max3421.txt | 24 +
+ Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 +
+ drivers/staging/typec/Kconfig | 10 -
+ drivers/staging/typec/Makefile | 2 -
+ drivers/staging/typec/TODO | 10 -
+ drivers/staging/typec/fusb302/TODO | 10 -
+ drivers/staging/typec/tcpci.c | 4 +-
+ drivers/usb/atm/cxacru.c | 4 +-
+ drivers/usb/atm/speedtch.c | 11 +-
+ drivers/usb/core/hcd.c | 4 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 8 +-
+ drivers/usb/gadget/udc/m66592-udc.c | 4 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c | 4 +-
+ drivers/usb/gadget/udc/r8a66597-udc.c | 4 +-
+ drivers/usb/gadget/udc/snps_udc_core.c | 8 +-
+ drivers/usb/host/Makefile | 4 +
+ drivers/usb/host/ehci-atmel.c | 3 +-
+ drivers/usb/host/max3421-hcd.c | 87 ++-
+ drivers/usb/host/xhci-debugfs.c | 526 ++++++++++++++++++
+ drivers/usb/host/xhci-debugfs.h | 137 +++++
+ drivers/usb/host/xhci-hub.c | 5 +-
+ drivers/usb/host/xhci-mem.c | 5 +-
+ drivers/usb/host/xhci-plat.c | 11 +-
+ drivers/usb/host/xhci-ring.c | 12 +-
+ drivers/usb/host/xhci-trace.h | 5 +
+ drivers/usb/host/xhci.c | 88 +--
+ drivers/usb/host/xhci.h | 18 +-
+ drivers/usb/phy/phy-isp1301-omap.c | 5 +-
+ drivers/usb/storage/option_ms.c | 4 +-
+ drivers/usb/typec/Kconfig | 25 +
+ drivers/usb/typec/Makefile | 3 +
+ drivers/{staging => usb}/typec/fusb302/Kconfig | 0
+ drivers/{staging => usb}/typec/fusb302/Makefile | 0
+ drivers/{staging => usb}/typec/fusb302/fusb302.c | 4 +-
+ .../{staging => usb}/typec/fusb302/fusb302_reg.h | 0
+ drivers/{staging => usb}/typec/tcpm.c | 48 +-
+ drivers/usb/typec/tps6598x.c | 475 ++++++++++++++++
+ drivers/usb/typec/typec_wcove.c | 594 +++++++++++++++------
+ {drivers/staging/typec => include/linux/usb}/pd.h | 5 +
+ .../staging/typec => include/linux/usb}/pd_bdo.h | 0
+ .../staging/typec => include/linux/usb}/pd_vdo.h | 0
+ .../staging/typec => include/linux/usb}/tcpm.h | 57 +-
+ tools/usb/usbip/Makefile.am | 3 +-
+ 43 files changed, 1902 insertions(+), 330 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/maxim,max3421.txt
+ delete mode 100644 drivers/staging/typec/fusb302/TODO
+ create mode 100644 drivers/usb/host/xhci-debugfs.c
+ create mode 100644 drivers/usb/host/xhci-debugfs.h
+ rename drivers/{staging => usb}/typec/fusb302/Kconfig (100%)
+ rename drivers/{staging => usb}/typec/fusb302/Makefile (100%)
+ rename drivers/{staging => usb}/typec/fusb302/fusb302.c (99%)
+ rename drivers/{staging => usb}/typec/fusb302/fusb302_reg.h (100%)
+ rename drivers/{staging => usb}/typec/tcpm.c (99%)
+ create mode 100644 drivers/usb/typec/tps6598x.c
+ rename {drivers/staging/typec => include/linux/usb}/pd.h (98%)
+ rename {drivers/staging/typec => include/linux/usb}/pd_bdo.h (100%)
+ rename {drivers/staging/typec => include/linux/usb}/pd_vdo.h (100%)
+ rename {drivers/staging/typec => include/linux/usb}/tcpm.h (68%)
+Merging usb-gadget/next (e42c6cd96353 usb: gadget: f_uvc: make uvc_v4l2_fops const)
+$ git merge usb-gadget/next
+Auto-merging drivers/usb/gadget/udc/dummy_hcd.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/renesas_usb3.txt | 4 +
+ .../devicetree/bindings/usb/renesas_usbhs.txt | 1 +
+ drivers/usb/dwc3/core.h | 2 +
+ drivers/usb/dwc3/gadget.c | 62 +++------
+ drivers/usb/gadget/function/uvc_v4l2.c | 2 +-
+ drivers/usb/gadget/function/uvc_v4l2.h | 2 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 65 +++++----
+ drivers/usb/gadget/udc/renesas_usb3.c | 71 ++++++++--
+ drivers/usb/phy/phy-generic.c | 5 +-
+ drivers/usb/phy/phy-mxs-usb.c | 154 +++++++++++++++++++++
+ drivers/usb/renesas_usbhs/common.c | 24 ++--
+ drivers/usb/renesas_usbhs/rcar3.c | 48 +++++++
+ drivers/usb/renesas_usbhs/rcar3.h | 1 +
+ include/linux/usb/gadget.h | 5 +
+ include/linux/usb/renesas_usbhs.h | 5 +-
+ 15 files changed, 357 insertions(+), 94 deletions(-)
+Merging usb-serial/usb-next (9eabd28e8baf USB: serial: garmin_gps: simplify init-session logic)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/garmin_gps.c | 67 +++++++++++++++++++++--------------------
+ 1 file changed, 35 insertions(+), 32 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (fc5b920c3b9b usb: chipidea: do charger detection in vbus session)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/udc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging phy-next/next (415060b21f31 phy: usb: phy-brcm-usb: Add ability to force DRD mode to host or device)
+$ git merge phy-next/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/phy/brcm,brcmstb-usb-phy.txt | 43 +
+ MAINTAINERS | 7 +
+ drivers/phy/broadcom/Kconfig | 13 +
+ drivers/phy/broadcom/Makefile | 3 +
+ drivers/phy/broadcom/phy-brcm-usb-init.c | 1017 ++++++++++++++++++++
+ drivers/phy/broadcom/phy-brcm-usb-init.h | 50 +
+ drivers/phy/broadcom/phy-brcm-usb.c | 459 +++++++++
+ drivers/soc/bcm/brcmstb/common.c | 12 +
+ include/linux/soc/brcmstb/brcmstb.h | 17 +
+ 9 files changed, 1621 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt
+ create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init.c
+ create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init.h
+ create mode 100644 drivers/phy/broadcom/phy-brcm-usb.c
+Merging tty/tty-next (9424e8b1fedb Merge 4.14-rc4 into tty-next)
+$ git merge tty/tty-next
+Auto-merging drivers/tty/vt/vt.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/stm32-dma.txt | 2 +-
+ .../devicetree/bindings/serial/atmel-usart.txt | 1 +
+ .../devicetree/bindings/serial/fsl-imx-uart.txt | 1 +
+ .../devicetree/bindings/serial/fsl-lpuart.txt | 1 +
+ .../devicetree/bindings/serial/omap_serial.txt | 1 +
+ .../devicetree/bindings/serial/st,stm32-usart.txt | 10 +--
+ arch/arm/boot/dts/stm32f429.dtsi | 12 ++--
+ arch/arm/boot/dts/stm32f746.dtsi | 12 ++--
+ arch/arm/boot/dts/stm32h743.dtsi | 4 +-
+ drivers/tty/mxser.c | 16 ++---
+ drivers/tty/n_gsm.c | 4 +-
+ drivers/tty/serial/8250/8250_core.c | 3 +-
+ drivers/tty/serial/8250/8250_dw.c | 30 ++++----
+ drivers/tty/serial/8250/8250_fintek.c | 84 +++++++++++++++++++++-
+ drivers/tty/serial/8250/8250_mid.c | 6 +-
+ drivers/tty/serial/8250/8250_mtk.c | 2 +-
+ drivers/tty/serial/8250/8250_omap.c | 4 +-
+ drivers/tty/serial/8250/8250_pci.c | 1 +
+ drivers/tty/serial/8250/8250_port.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 38 ++++------
+ drivers/tty/serial/bfin_sport_uart.c | 2 +-
+ drivers/tty/serial/fsl_lpuart.c | 27 ++++---
+ drivers/tty/serial/ifx6x60.c | 5 +-
+ drivers/tty/serial/imx.c | 22 +++---
+ drivers/tty/serial/jsm/jsm_tty.c | 2 +-
+ drivers/tty/serial/max3100.c | 5 +-
+ drivers/tty/serial/meson_uart.c | 18 ++++-
+ drivers/tty/serial/mux.c | 3 +-
+ drivers/tty/serial/omap-serial.c | 13 +---
+ drivers/tty/serial/pnx8xxx_uart.c | 5 +-
+ drivers/tty/serial/sa1100.c | 5 +-
+ drivers/tty/serial/serial_core.c | 36 ++++++++++
+ drivers/tty/serial/sh-sci.c | 60 ++++++++++++----
+ drivers/tty/serial/sh-sci.h | 3 +
+ drivers/tty/serial/sn_console.c | 4 +-
+ drivers/tty/serial/stm32-usart.c | 3 -
+ drivers/tty/serial/xilinx_uartps.c | 2 +-
+ drivers/tty/synclink.c | 3 +-
+ drivers/tty/sysrq.c | 9 ++-
+ drivers/tty/tty_port.c | 4 +-
+ drivers/tty/vcc.c | 9 +--
+ drivers/tty/vt/vt.c | 58 ++++++++-------
+ include/linux/serial_core.h | 5 ++
+ include/uapi/linux/serial_reg.h | 1 +
+ 44 files changed, 345 insertions(+), 193 deletions(-)
+Merging char-misc/char-misc-next (c2e5df616e1a vmbus: add per-channel sysfs info)
+$ git merge char-misc/char-misc-next
+Auto-merging include/linux/hyperv.h
+Auto-merging drivers/nvmem/core.c
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/hv/channel_mgmt.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-bus-vmbus | 56 ++
+ Documentation/ABI/testing/sysfs-driver-w1_ds28e17 | 21 +
+ .../devicetree/bindings/nvmem/snvs-lpgpr.txt | 20 +
+ Documentation/w1/slaves/00-INDEX | 2 +
+ Documentation/w1/slaves/w1_ds28e17 | 68 ++
+ MAINTAINERS | 2 +-
+ drivers/fpga/xilinx-pr-decoupler.c | 2 +-
+ drivers/fsi/fsi-core.c | 6 +-
+ drivers/hv/channel_mgmt.c | 10 +-
+ drivers/hv/hyperv_vmbus.h | 2 +
+ drivers/hv/vmbus_drv.c | 185 ++++-
+ drivers/misc/altera-stapl/Kconfig | 3 +-
+ drivers/misc/mic/Kconfig | 4 +
+ drivers/misc/pci_endpoint_test.c | 11 +
+ drivers/nvmem/Kconfig | 10 +
+ drivers/nvmem/Makefile | 2 +
+ drivers/nvmem/core.c | 11 +-
+ drivers/nvmem/snvs_lpgpr.c | 156 +++++
+ drivers/pcmcia/cistpl.c | 2 +-
+ drivers/pcmcia/cs_internal.h | 2 +-
+ drivers/vme/vme.c | 18 +-
+ drivers/w1/slaves/Kconfig | 15 +
+ drivers/w1/slaves/Makefile | 1 +
+ drivers/w1/slaves/w1_ds28e17.c | 771 +++++++++++++++++++++
+ drivers/w1/w1_io.c | 3 +-
+ include/linux/hyperv.h | 6 +
+ include/linux/w1.h | 1 +
+ 27 files changed, 1352 insertions(+), 38 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-w1_ds28e17
+ create mode 100644 Documentation/devicetree/bindings/nvmem/snvs-lpgpr.txt
+ create mode 100644 Documentation/w1/slaves/w1_ds28e17
+ create mode 100644 drivers/nvmem/snvs_lpgpr.c
+ create mode 100644 drivers/w1/slaves/w1_ds28e17.c
+Merging extcon/extcon-next (f12c89504cb8 extcon: make extcon_info static const, fixes warning)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging staging/staging-next (1236d6bb6e19 Merge 4.14-rc4 into staging-next)
+$ git merge staging/staging-next
+Resolved 'drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c' using previous resolution.
+Auto-merging drivers/staging/unisys/include/visorchannel.h
+Auto-merging drivers/staging/speakup/main.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+Auto-merging drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+Removing drivers/misc/ti_dac7512.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0c44c89aa5bd2506767c96af2352f1336d090828] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iio/adc/mcp320x.txt | 14 +
+ .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 +
+ .../devicetree/bindings/iio/st-sensors.txt | 2 +
+ arch/arm/configs/pxa_defconfig | 3 +-
+ arch/arm/configs/raumfeld_defconfig | 3 +-
+ drivers/iio/accel/adxl345_core.c | 1 -
+ drivers/iio/accel/bma180.c | 2 -
+ drivers/iio/accel/bma220_spi.c | 1 -
+ drivers/iio/accel/bmc150-accel-core.c | 3 -
+ drivers/iio/accel/da280.c | 1 -
+ drivers/iio/accel/da311.c | 1 -
+ drivers/iio/accel/dmard06.c | 1 -
+ drivers/iio/accel/dmard09.c | 1 -
+ drivers/iio/accel/dmard10.c | 1 -
+ drivers/iio/accel/hid-sensor-accel-3d.c | 1 -
+ drivers/iio/accel/kxcjk-1013.c | 2 -
+ drivers/iio/accel/kxsd9.c | 1 -
+ drivers/iio/accel/mc3230.c | 1 -
+ drivers/iio/accel/mma7455_core.c | 1 -
+ drivers/iio/accel/mma7660.c | 1 -
+ drivers/iio/accel/mma8452.c | 375 ++++++++++--------
+ drivers/iio/accel/mma9551.c | 1 -
+ drivers/iio/accel/mma9553.c | 1 -
+ drivers/iio/accel/mxc4005.c | 2 -
+ drivers/iio/accel/mxc6255.c | 1 -
+ drivers/iio/accel/sca3000.c | 1 -
+ drivers/iio/accel/st_accel_core.c | 2 -
+ drivers/iio/accel/stk8312.c | 2 -
+ drivers/iio/accel/stk8ba50.c | 2 -
+ drivers/iio/adc/ad7266.c | 1 -
+ drivers/iio/adc/ad7291.c | 1 -
+ drivers/iio/adc/ad7298.c | 1 -
+ drivers/iio/adc/ad7476.c | 1 -
+ drivers/iio/adc/ad7766.c | 2 -
+ drivers/iio/adc/ad7791.c | 2 -
+ drivers/iio/adc/ad7793.c | 2 -
+ drivers/iio/adc/ad7887.c | 1 -
+ drivers/iio/adc/ad7923.c | 1 -
+ drivers/iio/adc/ad799x.c | 3 -
+ drivers/iio/adc/ad_sigma_delta.c | 1 -
+ drivers/iio/adc/aspeed_adc.c | 1 -
+ drivers/iio/adc/at91-sama5d2_adc.c | 2 -
+ drivers/iio/adc/at91_adc.c | 2 -
+ drivers/iio/adc/axp20x_adc.c | 2 -
+ drivers/iio/adc/axp288_adc.c | 1 -
+ drivers/iio/adc/bcm_iproc_adc.c | 1 -
+ drivers/iio/adc/berlin2-adc.c | 1 -
+ drivers/iio/adc/cc10001_adc.c | 1 -
+ drivers/iio/adc/cpcap-adc.c | 1 -
+ drivers/iio/adc/da9150-gpadc.c | 1 -
+ drivers/iio/adc/dln2-adc.c | 6 -
+ drivers/iio/adc/envelope-detector.c | 1 -
+ drivers/iio/adc/ep93xx_adc.c | 1 -
+ drivers/iio/adc/exynos_adc.c | 1 -
+ drivers/iio/adc/hi8435.c | 1 -
+ drivers/iio/adc/hx711.c | 1 -
+ drivers/iio/adc/imx7d_adc.c | 1 -
+ drivers/iio/adc/ina2xx-adc.c | 2 -
+ drivers/iio/adc/lp8788_adc.c | 1 -
+ drivers/iio/adc/lpc18xx_adc.c | 1 -
+ drivers/iio/adc/lpc32xx_adc.c | 1 -
+ drivers/iio/adc/ltc2471.c | 1 -
+ drivers/iio/adc/ltc2485.c | 1 -
+ drivers/iio/adc/ltc2497.c | 1 -
+ drivers/iio/adc/max1027.c | 2 -
+ drivers/iio/adc/max11100.c | 1 -
+ drivers/iio/adc/max1118.c | 1 -
+ drivers/iio/adc/max1363.c | 2 -
+ drivers/iio/adc/max9611.c | 2 -
+ drivers/iio/adc/mcp320x.c | 121 +++---
+ drivers/iio/adc/mcp3422.c | 1 -
+ drivers/iio/adc/men_z188_adc.c | 1 -
+ drivers/iio/adc/meson_saradc.c | 1 -
+ drivers/iio/adc/mt6577_auxadc.c | 2 +-
+ drivers/iio/adc/mxs-lradc-adc.c | 2 -
+ drivers/iio/adc/nau7802.c | 1 -
+ drivers/iio/adc/palmas_gpadc.c | 1 -
+ drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 -
+ drivers/iio/adc/qcom-spmi-iadc.c | 1 -
+ drivers/iio/adc/qcom-spmi-vadc.c | 1 -
+ drivers/iio/adc/rcar-gyroadc.c | 1 -
+ drivers/iio/adc/rockchip_saradc.c | 1 -
+ drivers/iio/adc/spear_adc.c | 1 -
+ drivers/iio/adc/stm32-adc.c | 1 -
+ drivers/iio/adc/stx104.c | 1 -
+ drivers/iio/adc/sun4i-gpadc-iio.c | 1 -
+ drivers/iio/adc/ti-adc081c.c | 1 -
+ drivers/iio/adc/ti-adc0832.c | 1 -
+ drivers/iio/adc/ti-adc084s021.c | 1 -
+ drivers/iio/adc/ti-adc108s102.c | 1 -
+ drivers/iio/adc/ti-adc12138.c | 1 -
+ drivers/iio/adc/ti-adc128s052.c | 1 -
+ drivers/iio/adc/ti-adc161s626.c | 1 -
+ drivers/iio/adc/ti-ads1015.c | 22 +-
+ drivers/iio/adc/ti-ads7950.c | 1 -
+ drivers/iio/adc/ti-ads8688.c | 2 -
+ drivers/iio/adc/ti-tlc4541.c | 1 -
+ drivers/iio/adc/ti_am335x_adc.c | 1 -
+ drivers/iio/adc/twl4030-madc.c | 1 -
+ drivers/iio/adc/twl6030-gpadc.c | 1 -
+ drivers/iio/adc/vf610_adc.c | 1 -
+ drivers/iio/adc/viperboard_adc.c | 1 -
+ drivers/iio/adc/xilinx-xadc-core.c | 2 -
+ drivers/iio/amplifiers/ad8366.c | 1 -
+ drivers/iio/chemical/ams-iaq-core.c | 1 -
+ drivers/iio/chemical/atlas-ph-sensor.c | 2 -
+ drivers/iio/chemical/ccs811.c | 87 ++++-
+ drivers/iio/chemical/vz89x.c | 1 -
+ .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 -
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 1 -
+ drivers/iio/counter/104-quad-8.c | 1 -
+ drivers/iio/counter/stm32-lptimer-cnt.c | 1 -
+ drivers/iio/dac/Kconfig | 3 +-
+ drivers/iio/dac/ad5064.c | 1 -
+ drivers/iio/dac/ad5360.c | 1 -
+ drivers/iio/dac/ad5380.c | 1 -
+ drivers/iio/dac/ad5421.c | 1 -
+ drivers/iio/dac/ad5446.c | 14 +-
+ drivers/iio/dac/ad5449.c | 1 -
+ drivers/iio/dac/ad5504.c | 1 -
+ drivers/iio/dac/ad5592r-base.c | 1 -
+ drivers/iio/dac/ad5624r_spi.c | 1 -
+ drivers/iio/dac/ad5686.c | 1 -
+ drivers/iio/dac/ad5755.c | 1 -
+ drivers/iio/dac/ad5761.c | 1 -
+ drivers/iio/dac/ad5764.c | 1 -
+ drivers/iio/dac/ad5791.c | 1 -
+ drivers/iio/dac/ad7303.c | 1 -
+ drivers/iio/dac/ad8801.c | 1 -
+ drivers/iio/dac/cio-dac.c | 1 -
+ drivers/iio/dac/dpot-dac.c | 1 -
+ drivers/iio/dac/lpc18xx_dac.c | 1 -
+ drivers/iio/dac/ltc2632.c | 1 -
+ drivers/iio/dac/m62332.c | 1 -
+ drivers/iio/dac/max517.c | 1 -
+ drivers/iio/dac/max5821.c | 1 -
+ drivers/iio/dac/mcp4725.c | 1 -
+ drivers/iio/dac/mcp4922.c | 1 -
+ drivers/iio/dac/stm32-dac.c | 1 -
+ drivers/iio/dac/vf610_dac.c | 1 -
+ drivers/iio/dummy/iio_simple_dummy.c | 1 -
+ drivers/iio/frequency/ad9523.c | 1 -
+ drivers/iio/frequency/adf4350.c | 1 -
+ drivers/iio/gyro/adis16080.c | 1 -
+ drivers/iio/gyro/adis16130.c | 1 -
+ drivers/iio/gyro/adis16136.c | 1 -
+ drivers/iio/gyro/adis16260.c | 1 -
+ drivers/iio/gyro/adxrs450.c | 1 -
+ drivers/iio/gyro/bmg160_core.c | 2 -
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 -
+ drivers/iio/gyro/itg3200_buffer.c | 1 -
+ drivers/iio/gyro/itg3200_core.c | 1 -
+ drivers/iio/gyro/mpu3050-core.c | 2 -
+ drivers/iio/gyro/st_gyro_core.c | 2 -
+ drivers/iio/health/afe4403.c | 2 -
+ drivers/iio/health/afe4404.c | 2 -
+ drivers/iio/health/max30100.c | 1 -
+ drivers/iio/health/max30102.c | 1 -
+ drivers/iio/humidity/am2315.c | 1 -
+ drivers/iio/humidity/dht11.c | 1 -
+ drivers/iio/humidity/hdc100x.c | 1 -
+ drivers/iio/humidity/hid-sensor-humidity.c | 1 -
+ drivers/iio/humidity/hts221_buffer.c | 1 -
+ drivers/iio/humidity/hts221_core.c | 1 -
+ drivers/iio/humidity/htu21.c | 1 -
+ drivers/iio/humidity/si7005.c | 1 -
+ drivers/iio/humidity/si7020.c | 1 -
+ drivers/iio/imu/adis16400_core.c | 1 -
+ drivers/iio/imu/adis16480.c | 1 -
+ drivers/iio/imu/adis_trigger.c | 1 -
+ drivers/iio/imu/bmi160/bmi160_core.c | 1 -
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 13 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 1 -
+ drivers/iio/imu/kmx61.c | 3 -
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 20 +-
+ drivers/iio/industrialio-core.c | 35 +-
+ drivers/iio/industrialio-trigger.c | 35 +-
+ drivers/iio/light/acpi-als.c | 1 -
+ drivers/iio/light/adjd_s311.c | 1 -
+ drivers/iio/light/al3320a.c | 1 -
+ drivers/iio/light/apds9300.c | 2 -
+ drivers/iio/light/apds9960.c | 1 -
+ drivers/iio/light/bh1750.c | 1 -
+ drivers/iio/light/bh1780.c | 1 -
+ drivers/iio/light/cm32181.c | 1 -
+ drivers/iio/light/cm3232.c | 1 -
+ drivers/iio/light/cm3323.c | 1 -
+ drivers/iio/light/cm3605.c | 1 -
+ drivers/iio/light/cm36651.c | 1 -
+ drivers/iio/light/cros_ec_light_prox.c | 1 -
+ drivers/iio/light/gp2ap020a00f.c | 2 -
+ drivers/iio/light/hid-sensor-als.c | 1 -
+ drivers/iio/light/hid-sensor-prox.c | 1 -
+ drivers/iio/light/isl29018.c | 2 -
+ drivers/iio/light/isl29028.c | 1 -
+ drivers/iio/light/isl29125.c | 1 -
+ drivers/iio/light/jsa1212.c | 1 -
+ drivers/iio/light/lm3533-als.c | 1 -
+ drivers/iio/light/ltr501.c | 4 -
+ drivers/iio/light/max44000.c | 1 -
+ drivers/iio/light/opt3001.c | 1 -
+ drivers/iio/light/pa12203001.c | 1 -
+ drivers/iio/light/rpr0521.c | 2 -
+ drivers/iio/light/si1145.c | 3 -
+ drivers/iio/light/stk3310.c | 1 -
+ drivers/iio/light/tcs3414.c | 1 -
+ drivers/iio/light/tcs3472.c | 263 ++++++++++++-
+ drivers/iio/light/tsl2563.c | 2 -
+ drivers/iio/light/tsl2583.c | 1 -
+ drivers/iio/light/tsl4531.c | 1 -
+ drivers/iio/light/us5182d.c | 1 -
+ drivers/iio/light/vcnl4000.c | 1 -
+ drivers/iio/light/veml6070.c | 1 -
+ drivers/iio/light/vl6180.c | 1 -
+ drivers/iio/magnetometer/ak8974.c | 1 -
+ drivers/iio/magnetometer/ak8975.c | 1 -
+ drivers/iio/magnetometer/bmc150_magn.c | 2 -
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 1 -
+ drivers/iio/magnetometer/hmc5843_core.c | 1 -
+ drivers/iio/magnetometer/mag3110.c | 1 -
+ drivers/iio/magnetometer/mmc35240.c | 1 -
+ drivers/iio/magnetometer/st_magn_core.c | 2 -
+ drivers/iio/multiplexer/iio-mux.c | 7 +-
+ drivers/iio/orientation/hid-sensor-incl-3d.c | 1 -
+ drivers/iio/orientation/hid-sensor-rotation.c | 1 -
+ drivers/iio/potentiometer/ds1803.c | 1 -
+ drivers/iio/potentiometer/max5481.c | 2 -
+ drivers/iio/potentiometer/max5487.c | 2 -
+ drivers/iio/potentiometer/mcp4131.c | 1 -
+ drivers/iio/potentiometer/mcp4531.c | 1 -
+ drivers/iio/potentiometer/tpl0102.c | 1 -
+ drivers/iio/potentiostat/lmp91000.c | 2 -
+ drivers/iio/pressure/abp060mg.c | 1 -
+ drivers/iio/pressure/bmp280-core.c | 1 -
+ drivers/iio/pressure/cros_ec_baro.c | 3 -
+ drivers/iio/pressure/hid-sensor-press.c | 1 -
+ drivers/iio/pressure/hp03.c | 1 -
+ drivers/iio/pressure/hp206c.c | 1 -
+ drivers/iio/pressure/mpl115.c | 1 -
+ drivers/iio/pressure/mpl3115.c | 1 -
+ drivers/iio/pressure/ms5611_core.c | 1 -
+ drivers/iio/pressure/ms5637.c | 1 -
+ drivers/iio/pressure/st_pressure.h | 4 +
+ drivers/iio/pressure/st_pressure_core.c | 4 +-
+ drivers/iio/pressure/st_pressure_i2c.c | 10 +
+ drivers/iio/pressure/st_pressure_spi.c | 10 +
+ drivers/iio/pressure/t5403.c | 1 -
+ drivers/iio/pressure/zpa2326.c | 2 -
+ drivers/iio/proximity/as3935.c | 2 -
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 -
+ drivers/iio/proximity/srf04.c | 1 -
+ drivers/iio/proximity/srf08.c | 2 -
+ drivers/iio/proximity/sx9500.c | 2 -
+ drivers/iio/temperature/hid-sensor-temperature.c | 1 -
+ drivers/iio/temperature/maxim_thermocouple.c | 1 -
+ drivers/iio/temperature/mlx90614.c | 1 -
+ drivers/iio/temperature/tmp006.c | 1 -
+ drivers/iio/temperature/tmp007.c | 1 -
+ drivers/iio/temperature/tsys01.c | 1 -
+ drivers/iio/temperature/tsys02d.c | 1 -
+ drivers/iio/trigger/iio-trig-hrtimer.c | 1 -
+ drivers/iio/trigger/iio-trig-interrupt.c | 1 -
+ drivers/iio/trigger/iio-trig-loop.c | 1 -
+ drivers/iio/trigger/iio-trig-sysfs.c | 1 -
+ drivers/iio/trigger/stm32-lptimer-trigger.c | 1 -
+ drivers/iio/trigger/stm32-timer-trigger.c | 2 -
+ drivers/input/touchscreen/tsc2007_iio.c | 1 -
+ drivers/misc/Kconfig | 10 -
+ drivers/misc/Makefile | 1 -
+ drivers/misc/ti_dac7512.c | 103 -----
+ drivers/platform/x86/toshiba_acpi.c | 1 -
+ drivers/staging/android/TODO | 1 -
+ drivers/staging/android/ion/ion.h | 2 +-
+ drivers/staging/ccree/ssi_aead.c | 258 +++++++------
+ drivers/staging/ccree/ssi_buffer_mgr.c | 426 ++++++++++-----------
+ drivers/staging/ccree/ssi_buffer_mgr.h | 5 +-
+ drivers/staging/ccree/ssi_cipher.c | 165 ++++----
+ drivers/staging/ccree/ssi_cipher.h | 10 +-
+ drivers/staging/ccree/ssi_driver.c | 323 +++++++---------
+ drivers/staging/ccree/ssi_driver.h | 34 +-
+ drivers/staging/ccree/ssi_fips.c | 12 +-
+ drivers/staging/ccree/ssi_hash.c | 377 +++++++++---------
+ drivers/staging/ccree/ssi_ivgen.c | 18 +-
+ drivers/staging/ccree/ssi_pm.c | 31 +-
+ drivers/staging/ccree/ssi_request_mgr.c | 129 ++++---
+ drivers/staging/ccree/ssi_sram_mgr.c | 33 +-
+ drivers/staging/ccree/ssi_sysfs.c | 271 +------------
+ drivers/staging/comedi/drivers/das16.c | 10 +-
+ drivers/staging/dgnc/dgnc_driver.h | 16 -
+ drivers/staging/dgnc/dgnc_neo.c | 11 +-
+ drivers/staging/fbtft/fb_ra8875.c | 10 +-
+ drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 4 +-
+ drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 2 +-
+ drivers/staging/fsl-mc/include/dpaa2-io.h | 6 +-
+ drivers/staging/greybus/light.c | 8 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 2 +-
+ drivers/staging/iio/Documentation/device.txt | 3 -
+ drivers/staging/iio/Documentation/trigger.txt | 4 -
+ drivers/staging/iio/accel/adis16201.c | 1 -
+ drivers/staging/iio/accel/adis16203.c | 1 -
+ drivers/staging/iio/accel/adis16209.c | 1 -
+ drivers/staging/iio/accel/adis16240.c | 1 -
+ drivers/staging/iio/adc/ad7192.c | 2 -
+ drivers/staging/iio/adc/ad7280a.c | 1 -
+ drivers/staging/iio/adc/ad7606.c | 4 -
+ drivers/staging/iio/adc/ad7780.c | 1 -
+ drivers/staging/iio/adc/ad7816.c | 1 -
+ drivers/staging/iio/addac/adt7316.c | 2 -
+ drivers/staging/iio/cdc/ad7150.c | 1 -
+ drivers/staging/iio/cdc/ad7152.c | 1 -
+ drivers/staging/iio/cdc/ad7746.c | 1 -
+ drivers/staging/iio/frequency/ad9832.c | 1 -
+ drivers/staging/iio/frequency/ad9834.c | 2 -
+ drivers/staging/iio/gyro/adis16060_core.c | 1 -
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 1 -
+ drivers/staging/iio/light/tsl2x7x.c | 19 +-
+ drivers/staging/iio/light/tsl2x7x.h | 11 +-
+ drivers/staging/iio/meter/ade7753.c | 8 +-
+ drivers/staging/iio/meter/ade7754.c | 1 -
+ drivers/staging/iio/meter/ade7758_core.c | 1 -
+ drivers/staging/iio/meter/ade7758_trigger.c | 1 -
+ drivers/staging/iio/meter/ade7759.c | 28 +-
+ drivers/staging/iio/meter/ade7854.c | 1 -
+ drivers/staging/iio/resolver/ad2s1200.c | 1 -
+ drivers/staging/iio/resolver/ad2s1210.c | 1 -
+ drivers/staging/iio/resolver/ad2s90.c | 1 -
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 1 -
+ drivers/staging/irda/drivers/ali-ircc.c | 3 +-
+ drivers/staging/irda/drivers/au1k_ir.c | 40 +-
+ drivers/staging/irda/drivers/irda-usb.c | 4 +-
+ drivers/staging/irda/drivers/mcs7780.c | 9 +-
+ drivers/staging/irda/drivers/vlsi_ir.c | 18 +-
+ drivers/staging/irda/include/net/irda/qos.h | 20 +-
+ drivers/staging/irda/net/discovery.c | 4 +-
+ drivers/staging/irda/net/irda_device.c | 28 +-
+ drivers/staging/irda/net/irqueue.c | 3 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 28 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 14 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 9 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +-
+ .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 27 +-
+ .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 2 +-
+ .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 8 +-
+ drivers/staging/pi433/Documentation/pi433.txt | 24 +-
+ drivers/staging/pi433/pi433_if.c | 13 +-
+ drivers/staging/pi433/rf69.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 28 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 75 ++--
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 22 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 44 ++-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 64 ++--
+ drivers/staging/rtl8188eu/hal/odm.c | 2 +-
+ drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 4 +-
+ drivers/staging/rtl8188eu/hal/phy.c | 15 +-
+ drivers/staging/rtl8188eu/include/odm.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 5 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 112 +++---
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 27 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 1 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 15 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 9 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 2 +-
+ drivers/staging/rtl8192u/r8192U_wx.h | 2 +-
+ drivers/staging/rtl8712/hal_init.c | 4 +-
+ drivers/staging/rtl8712/os_intfs.c | 4 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c | 4 +-
+ drivers/staging/rtl8712/rtl8712_event.h | 1 -
+ drivers/staging/rtl8712/rtl8712_recv.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 3 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 4 +-
+ drivers/staging/rtl8712/usb_intf.c | 3 +-
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +-
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 84 ++--
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 11 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 108 +++---
+ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 -
+ drivers/staging/rtl8723bs/core/rtw_recv.c | 18 +-
+ drivers/staging/rtl8723bs/core/rtw_rf.c | 7 +-
+ drivers/staging/rtl8723bs/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +-
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 9 +-
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 4 +-
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 7 +-
+ drivers/staging/rtl8723bs/hal/hal_com.c | 4 +-
+ drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 69 ++--
+ drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +-
+ drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 +-
+ drivers/staging/rtl8723bs/include/osdep_service.h | 4 +-
+ .../rtl8723bs/include/osdep_service_linux.h | 2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 16 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 45 +--
+ drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 30 +-
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 227 +++++------
+ drivers/staging/rtl8723bs/os_dep/osdep_service.c | 17 +-
+ drivers/staging/rtlwifi/core.c | 46 +--
+ drivers/staging/rtlwifi/core.h | 4 -
+ drivers/staging/rtlwifi/debug.c | 32 +-
+ drivers/staging/rtlwifi/efuse.c | 5 +-
+ .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 50 +--
+ drivers/staging/rtlwifi/phydm/phydm_debug.c | 4 +-
+ .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c | 10 +-
+ .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c | 4 +-
+ .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c | 13 +-
+ drivers/staging/rtlwifi/rc.c | 4 +-
+ drivers/staging/rtlwifi/rtl8822be/phy.c | 4 +-
+ drivers/staging/rts5208/sd.c | 6 -
+ drivers/staging/sm750fb/ddk750_dvi.c | 4 +-
+ drivers/staging/sm750fb/ddk750_dvi.h | 4 +-
+ drivers/staging/sm750fb/ddk750_power.c | 2 +-
+ drivers/staging/sm750fb/ddk750_power.h | 7 +-
+ drivers/staging/sm750fb/ddk750_sii164.c | 3 +-
+ drivers/staging/sm750fb/ddk750_sii164.h | 4 +-
+ drivers/staging/sm750fb/sm750_cursor.c | 4 -
+ drivers/staging/speakup/buffers.c | 4 +-
+ drivers/staging/speakup/main.c | 4 +-
+ drivers/staging/speakup/speakup_acntsa.c | 2 +-
+ drivers/staging/speakup/speakup_apollo.c | 2 +-
+ drivers/staging/speakup/speakup_audptr.c | 2 +-
+ drivers/staging/speakup/speakup_bns.c | 2 +-
+ drivers/staging/speakup/speakup_decext.c | 2 +-
+ drivers/staging/speakup/speakup_dectlk.c | 2 +-
+ drivers/staging/speakup/speakup_dummy.c | 2 +-
+ drivers/staging/speakup/speakup_ltlk.c | 2 +-
+ drivers/staging/speakup/speakup_spkout.c | 2 +-
+ drivers/staging/speakup/speakup_txprt.c | 2 +-
+ drivers/staging/speakup/spk_ttyio.c | 10 +-
+ drivers/staging/unisys/include/iochannel.h | 9 +-
+ drivers/staging/unisys/include/visorbus.h | 159 ++++----
+ .../unisys/include/{channel.h => visorchannel.h} | 12 +-
+ drivers/staging/unisys/visorbus/controlvmchannel.h | 3 +-
+ drivers/staging/unisys/visorbus/vbuschannel.h | 12 +-
+ drivers/staging/unisys/visorbus/visorbus_main.c | 269 ++++++-------
+ drivers/staging/unisys/visorbus/visorbus_private.h | 8 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 81 +---
+ drivers/staging/unisys/visorbus/visorchipset.c | 298 ++++----------
+ drivers/staging/unisys/visorhba/visorhba_main.c | 12 +-
+ drivers/staging/unisys/visorinput/visorinput.c | 6 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 10 +-
+ drivers/staging/vc04_services/Kconfig | 12 -
+ .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 11 -
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 11 -
+ .../staging/vc04_services/bcm2835-audio/bcm2835.h | 2 -
+ .../vc04_services/bcm2835-camera/mmal-msg.h | 24 +-
+ .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
+ .../vc04_services/bcm2835-camera/mmal-vchiq.h | 2 +-
+ .../interface/vchi/connections/connection.h | 3 -
+ .../interface/vchi/message_drivers/message.h | 5 -
+ .../staging/vc04_services/interface/vchi/vchi.h | 12 +-
+ .../vc04_services/interface/vchi/vchi_common.h | 6 -
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 18 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 160 --------
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 5 -
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 10 -
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 -
+ .../interface/vchiq_arm/vchiq_debugfs.c | 3 -
+ .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 47 ++-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 78 ++--
+ drivers/staging/wlan-ng/prism2sta.c | 2 +-
+ drivers/staging/xgifb/XGI_main_26.c | 4 +-
+ drivers/staging/xgifb/vb_setmode.c | 7 +-
+ include/linux/iio/iio.h | 34 +-
+ include/linux/iio/trigger.h | 21 +-
+ 471 files changed, 2891 insertions(+), 3888 deletions(-)
+ delete mode 100644 drivers/misc/ti_dac7512.c
+ rename drivers/staging/unisys/include/{channel.h => visorchannel.h} (95%)
+Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4)
+$ git merge mux/for-next
+Already up-to-date.
+Merging slave-dma/next (967bec7c9c76 Merge branch 'topic/stm' into next)
+$ git merge slave-dma/next
+Auto-merging Documentation/devicetree/bindings/dma/stm32-dma.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 +
+ .../devicetree/bindings/dma/stm32-dma.txt | 4 +-
+ .../devicetree/bindings/dma/stm32-dmamux.txt | 84 +
+ .../devicetree/bindings/dma/stm32-mdma.txt | 94 ++
+ drivers/dma/Kconfig | 21 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/altera-msgdma.c | 37 +-
+ drivers/dma/dma-axi-dmac.c | 75 +-
+ drivers/dma/edma.c | 19 +-
+ drivers/dma/imx-sdma.c | 14 +-
+ drivers/dma/qcom/bam_dma.c | 169 +-
+ drivers/dma/sa11x0-dma.c | 11 +
+ drivers/dma/stm32-dmamux.c | 327 ++++
+ drivers/dma/stm32-mdma.c | 1666 ++++++++++++++++++++
+ drivers/dma/ti-dma-crossbar.c | 3 +-
+ drivers/dma/xilinx/xilinx_dma.c | 14 +
+ include/linux/dma/xilinx_dma.h | 14 -
+ include/linux/dmaengine.h | 30 +-
+ 18 files changed, 2456 insertions(+), 130 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/stm32-dmamux.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/stm32-mdma.txt
+ create mode 100644 drivers/dma/stm32-dmamux.c
+ create mode 100644 drivers/dma/stm32-mdma.c
+Merging cgroup/for-next (8cae35ab6264 Merge branch 'for-4.15' into for-next)
+$ git merge cgroup/for-next
+Resolved 'kernel/cgroup/cgroup.c' using previous resolution.
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/deadline.c
+Removing kernel/sched/cpuacct.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/cgroup/cgroup.c
+CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3b5b860b5d47] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroup-v2.txt | 45 +++---
+ include/linux/cgroup-defs.h | 57 +++++++
+ include/linux/cgroup.h | 60 ++++++++
+ include/linux/sched/cputime.h | 3 +-
+ kernel/cgroup/Makefile | 2 +-
+ kernel/cgroup/cgroup-internal.h | 8 +
+ kernel/cgroup/cgroup.c | 32 +++-
+ kernel/cgroup/stat.c | 334 ++++++++++++++++++++++++++++++++++++++++
+ kernel/sched/core.c | 179 ++++++++++++++++++++-
+ kernel/sched/cpuacct.h | 17 --
+ kernel/sched/cputime.c | 14 +-
+ kernel/sched/deadline.c | 2 +-
+ kernel/sched/fair.c | 2 +-
+ kernel/sched/rt.c | 2 +-
+ kernel/sched/sched.h | 2 +-
+ kernel/sched/stop_task.c | 2 +-
+ 16 files changed, 703 insertions(+), 58 deletions(-)
+ create mode 100644 kernel/cgroup/stat.c
+ delete mode 100644 kernel/sched/cpuacct.h
+Merging scsi/for-next (d546269d3048 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/lpfc/lpfc_nvme.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/scsi.rst | 2 +-
+ drivers/scsi/aic94xx/aic94xx_hwi.c | 3 -
+ drivers/scsi/be2iscsi/be.h | 19 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 55 ++-
+ drivers/scsi/be2iscsi/be_cmds.h | 48 ++-
+ drivers/scsi/be2iscsi/be_iscsi.c | 54 +--
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 102 ++---
+ drivers/scsi/be2iscsi/be_main.h | 49 +--
+ drivers/scsi/be2iscsi/be_mgmt.c | 278 ++++++++------
+ drivers/scsi/be2iscsi/be_mgmt.h | 10 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 10 -
+ drivers/scsi/csiostor/csio_hw.h | 3 +
+ drivers/scsi/csiostor/csio_init.c | 3 +
+ drivers/scsi/csiostor/csio_mb.c | 3 +
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
+ drivers/scsi/cxgbi/libcxgbi.c | 50 ++-
+ drivers/scsi/cxgbi/libcxgbi.h | 1 -
+ drivers/scsi/device_handler/scsi_dh_alua.c | 10 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c | 6 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 12 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 6 +-
+ drivers/scsi/fcoe/fcoe.c | 81 ++--
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 2 -
+ drivers/scsi/libfc/fc_rport.c | 2 +-
+ drivers/scsi/libiscsi.c | 2 +-
+ drivers/scsi/libsas/sas_dump.c | 10 -
+ drivers/scsi/libsas/sas_dump.h | 1 -
+ drivers/scsi/libsas/sas_event.c | 26 +-
+ drivers/scsi/libsas/sas_init.c | 12 -
+ drivers/scsi/lpfc/lpfc.h | 3 +
+ drivers/scsi/lpfc/lpfc_attr.c | 10 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 4 +-
+ drivers/scsi/lpfc/lpfc_els.c | 19 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 30 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 174 +++++----
+ drivers/scsi/lpfc/lpfc_nvmet.c | 148 +++++---
+ drivers/scsi/lpfc/lpfc_sli.c | 219 ++++++-----
+ drivers/scsi/lpfc/lpfc_sli4.h | 4 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 9 +
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 43 ++-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 564 ++++++++++++++++++++++++++--
+ drivers/scsi/mpt3sas/mpi/mpi2_init.h | 11 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 282 +++++++++++++-
+ drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 111 ++++++
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 14 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 19 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 10 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 6 -
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 383 +++++++++++--------
+ drivers/scsi/qla2xxx/qla_bsg.c | 3 +-
+ drivers/scsi/qla2xxx/qla_init.c | 3 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 27 +-
+ drivers/scsi/qla2xxx/qla_os.c | 3 +-
+ drivers/scsi/scsi_dh.c | 36 +-
+ drivers/scsi/scsi_logging.h | 8 +-
+ drivers/scsi/scsi_priv.h | 4 +-
+ drivers/scsi/scsi_sysfs.c | 18 +-
+ drivers/scsi/scsi_transport_fc.c | 3 +
+ drivers/scsi/sd.c | 20 +
+ drivers/scsi/smartpqi/smartpqi_init.c | 18 +-
+ drivers/scsi/ufs/tc-dwc-g210.c | 10 +-
+ drivers/scsi/ufs/ufs-qcom.c | 4 +-
+ drivers/scsi/ufs/ufs-qcom.h | 7 +-
+ drivers/scsi/ufs/ufshcd.c | 40 +-
+ drivers/scsi/ufs/ufshcd.h | 16 +-
+ drivers/scsi/ufs/ufshci.h | 70 ++--
+ include/scsi/libsas.h | 56 +--
+ 72 files changed, 2272 insertions(+), 1014 deletions(-)
+ create mode 100644 drivers/scsi/mpt3sas/mpi/mpi2_pci.h
+Merging scsi-mkp/for-next (2269848386c4 scsi: libcxgbi: simplify task->hdr allocation for mgmt cmds)
+$ git merge scsi-mkp/for-next
+Already up-to-date.
+Merging target-updates/for-next (04229774f692 tcmu: Oops in unmap_thread_fn())
+$ git merge target-updates/for-next
+Merge made by the 'recursive' strategy.
+ drivers/target/target_core_user.c | 136 ++++++++++++++++++++++++++++++++------
+ 1 file changed, 114 insertions(+), 22 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 (2ea659a9ef48 Linux 4.12-rc1)
+$ git merge target-bva/for-next
+Already up-to-date.
+Merging libata/for-next (1bbb1b0d97c3 Merge branch 'for-4.15' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ drivers/ata/ahci.c | 9 +++++++--
+ drivers/ata/libata-core.c | 3 ++-
+ drivers/ata/libata-eh.c | 10 +++++-----
+ drivers/ata/libata-scsi.c | 19 ++++++++++---------
+ drivers/ata/libata.h | 2 +-
+ drivers/ata/pata_artop.c | 2 +-
+ drivers/ata/sata_rcar.c | 7 +------
+ include/linux/libata.h | 1 +
+ 8 files changed, 28 insertions(+), 25 deletions(-)
+Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
+$ git merge binfmt_misc/for-next
+Already up-to-date.
+Merging vhost/linux-next (ac7380709f65 vhost: fix end of range for access_ok)
+$ git merge vhost/linux-next
+Auto-merging drivers/vhost/vhost.c
+Merge made by the 'recursive' strategy.
+ drivers/vhost/vhost.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging rpmsg/for-next (243ab38a4c0a 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 (d264ab0a52d9 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Recorded preimage for 'MAINTAINERS'
+Auto-merging drivers/gpio/gpio-xgene-sb.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'MAINTAINERS'.
+[master 475923205c20] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpio/consumer.txt | 22 ++++++-
+ MAINTAINERS | 7 +++
+ drivers/gpio/gpio-brcmstb.c | 4 ++
+ drivers/gpio/gpio-dwapb.c | 23 ++++++-
+ drivers/gpio/gpio-tb10x.c | 3 +
+ drivers/gpio/gpio-thunderx.c | 13 ----
+ drivers/gpio/gpio-xgene-sb.c | 13 +---
+ drivers/gpio/gpiolib.c | 136 +++++++++++++++++++++-------------------
+ 8 files changed, 127 insertions(+), 94 deletions(-)
+Merging pinctrl/for-next (a2ec7b6b92e1 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/pinctl.rst | 6 +-
+ Documentation/gpio/gpio-legacy.txt | 10 +-
+ Documentation/translations/zh_CN/gpio.txt | 6 +-
+ MAINTAINERS | 1 +
+ drivers/gpio/gpio-aspeed.c | 4 +-
+ drivers/gpio/gpio-em.c | 4 +-
+ drivers/gpio/gpio-pxa.c | 14 +-
+ drivers/gpio/gpio-rcar.c | 4 +-
+ drivers/gpio/gpio-tegra.c | 4 +-
+ drivers/gpio/gpio-tz1090.c | 4 +-
+ drivers/gpio/gpiolib.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 21 +-
+ drivers/pinctrl/core.c | 12 +-
+ drivers/pinctrl/core.h | 2 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 859 ++++++++++----------
+ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 818 ++++++++++---------
+ drivers/pinctrl/meson/pinctrl-meson.c | 50 +-
+ drivers/pinctrl/meson/pinctrl-meson.h | 8 +-
+ drivers/pinctrl/meson/pinctrl-meson8.c | 964 +++++++++++------------
+ drivers/pinctrl/meson/pinctrl-meson8b.c | 780 +++++++++---------
+ drivers/pinctrl/pinctrl-amd.c | 4 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 23 +-
+ drivers/pinctrl/pinctrl-single.c | 4 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 4 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 29 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 581 ++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 134 ++++
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 4 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 4 +-
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 6 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 14 +-
+ include/dt-bindings/gpio/meson-gxbb-gpio.h | 2 +-
+ include/dt-bindings/gpio/meson-gxl-gpio.h | 2 +-
+ include/linux/pinctrl/consumer.h | 8 +-
+ 37 files changed, 2538 insertions(+), 1866 deletions(-)
+Merging pinctrl-samsung/for-next (2bd6bf03f4c1 Linux 4.14-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up-to-date.
+Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/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
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 9726 and retry the command.
+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 4683a0a6000d] 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 (076a9bcacfc7 signal/mips: Remove FPE_FIXME usage from mips)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX)
+$ git merge random/dev
+Already up-to-date.
+Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
+$ git merge aio/master
+Already up-to-date.
+Merging kselftest/next (9e66317d3c92 Linux 4.14-rc3)
+$ git merge kselftest/next
+Already up-to-date.
+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 (93904f3ef04c Merge branch 'for-4.14/upstream-fixes' into for-next)
+$ git merge livepatching/for-next
+warning: inexact rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 2377 and retry the command.
+Merge made by the 'recursive' strategy.
+ Documentation/livepatch/shadow-vars.txt | 192 +++++++++++++++++++++
+ include/linux/livepatch.h | 8 +
+ kernel/livepatch/Makefile | 2 +-
+ kernel/livepatch/core.c | 60 ++++---
+ kernel/livepatch/shadow.c | 277 ++++++++++++++++++++++++++++++
+ samples/Kconfig | 5 +-
+ samples/livepatch/Makefile | 3 +
+ samples/livepatch/livepatch-shadow-fix1.c | 173 +++++++++++++++++++
+ samples/livepatch/livepatch-shadow-fix2.c | 168 ++++++++++++++++++
+ samples/livepatch/livepatch-shadow-mod.c | 224 ++++++++++++++++++++++++
+ 10 files changed, 1085 insertions(+), 27 deletions(-)
+ create mode 100644 Documentation/livepatch/shadow-vars.txt
+ create mode 100644 kernel/livepatch/shadow.c
+ create mode 100644 samples/livepatch/livepatch-shadow-fix1.c
+ create mode 100644 samples/livepatch/livepatch-shadow-fix2.c
+ create mode 100644 samples/livepatch/livepatch-shadow-mod.c
+Merging coresight/next (9a937c2f634e doc: coresight: correct usage for disabling idle states)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ Documentation/trace/coresight-cpu-debug.txt | 22 +++++++++++++++-----
+ .../coresight/coresight-dynamic-replicator.c | 4 ++--
+ drivers/hwtracing/coresight/coresight-etb10.c | 4 ++--
+ drivers/hwtracing/coresight/coresight-etm3x.c | 24 +++++++++++-----------
+ drivers/hwtracing/coresight/coresight-funnel.c | 4 ++--
+ drivers/hwtracing/coresight/coresight-stm.c | 8 ++++----
+ drivers/hwtracing/coresight/coresight-tmc.c | 4 ++--
+ drivers/hwtracing/coresight/coresight-tpiu.c | 4 ++--
+ 8 files changed, 43 insertions(+), 31 deletions(-)
+Merging rtc/rtc-next (74717b28cb32 rtc: set the alarm to the next expiring timer)
+$ git merge rtc/rtc-next
+Auto-merging Documentation/devicetree/bindings/trivial-devices.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/trivial-devices.txt | 2 +-
+ drivers/rtc/interface.c | 2 +-
+ drivers/rtc/rtc-rv3029c2.c | 2 ++
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+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 (2bd6bf03f4c1 Linux 4.14-rc1)
+$ 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 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
+$ git merge idr/idr-4.11
+Already up-to-date.
+Merging kspp/for-next/kspp (be53cdda2fdd lkdtm: Update usercopy tests for whitelisting)
+$ git merge kspp/for-next/kspp
+Auto-merging net/sctp/socket.c
+Auto-merging net/core/sock.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/slab.h
+Auto-merging kernel/fork.c
+Auto-merging include/net/sock.h
+Auto-merging include/net/sctp/structs.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/dcache.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/include/asm/processor.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/include/asm/processor.h
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 11 +++++
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/processor.h | 7 +++
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/processor.h | 8 ++++
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/processor.h | 8 ++++
+ drivers/misc/lkdtm.h | 4 +-
+ drivers/misc/lkdtm_core.c | 4 +-
+ drivers/misc/lkdtm_usercopy.c | 88 +++++++++++++++++++++-----------------
+ drivers/scsi/scsi_lib.c | 9 ++--
+ fs/befs/linuxvfs.c | 14 +++---
+ fs/cifs/cifsfs.c | 10 +++--
+ fs/dcache.c | 9 ++--
+ fs/exofs/super.c | 7 ++-
+ fs/ext2/super.c | 12 +++---
+ fs/ext4/super.c | 12 +++---
+ fs/fhandle.c | 3 +-
+ fs/freevxfs/vxfs_super.c | 8 +++-
+ fs/jfs/super.c | 8 ++--
+ fs/orangefs/super.c | 15 ++++---
+ fs/ufs/super.c | 13 +++---
+ fs/xfs/kmem.h | 10 +++++
+ fs/xfs/xfs_super.c | 7 ++-
+ include/linux/sched/task.h | 14 ++++++
+ include/linux/slab.h | 27 +++++++++---
+ include/linux/slab_def.h | 3 ++
+ include/linux/slub_def.h | 3 ++
+ include/linux/stddef.h | 2 +
+ include/net/sctp/structs.h | 9 +++-
+ include/net/sock.h | 2 +
+ kernel/fork.c | 31 +++++++++++---
+ mm/slab.c | 21 ++++++---
+ mm/slab.h | 8 +++-
+ mm/slab_common.c | 54 ++++++++++++++++++-----
+ mm/slub.c | 29 +++++++++----
+ mm/usercopy.c | 12 ++++++
+ net/caif/caif_socket.c | 2 +
+ net/core/sock.c | 4 +-
+ net/ipv4/raw.c | 2 +
+ net/ipv6/raw.c | 2 +
+ net/sctp/socket.c | 6 ++-
+ 42 files changed, 366 insertions(+), 135 deletions(-)
+Merging akpm-current/current (86766d4b6cdb sysvipc-make-get_maxid-o1-again-checkpatch-fixes)
+$ git merge --no-ff akpm-current/current
+Resolved 'include/linux/sched/mm.h' using previous resolution.
+Resolved 'mm/list_lru.c' using previous resolution.
+Auto-merging security/selinux/hooks.c
+Auto-merging scripts/spelling.txt
+Auto-merging scripts/checkpatch.pl
+Auto-merging mm/vmscan.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/oom_kill.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/memory.c
+Auto-merging mm/madvise.c
+Auto-merging mm/list_lru.c
+CONFLICT (content): Merge conflict in mm/list_lru.c
+Auto-merging mm/ksm.c
+Auto-merging mm/compaction.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/fork.c
+Auto-merging init/main.c
+Auto-merging include/linux/slab.h
+Auto-merging include/linux/sched/mm.h
+CONFLICT (content): Merge conflict in include/linux/sched/mm.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mmu_notifier.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/bitfield.h
+Auto-merging include/linux/backing-dev.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/proc/array.c
+Auto-merging fs/ext4/file.c
+Auto-merging fs/exec.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/dcache.c
+Auto-merging fs/dax.c
+Auto-merging drivers/rapidio/devices/rio_mport_cdev.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/Kconfig
+Auto-merging Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 862bbbdabbf5dbc47ac9d2115d79dfb12a81df3b] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/proc.txt | 3 +
+ Documentation/sysctl/vm.txt | 65 +++--
+ Documentation/vm/mmu_notifier.txt | 93 +++++++
+ Makefile | 22 +-
+ arch/Kconfig | 16 +-
+ arch/arm/include/asm/page.h | 2 +
+ arch/powerpc/mm/hugetlbpage.c | 1 +
+ arch/sh/boot/compressed/misc.c | 14 +
+ arch/sparc/mm/hugetlbpage.c | 1 +
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ block/blk-mq.c | 2 +-
+ block/genhd.c | 2 +-
+ drivers/base/node.c | 16 +-
+ drivers/block/brd.c | 2 +
+ drivers/block/zram/zcomp.c | 6 +-
+ drivers/block/zram/zram_drv.c | 16 +-
+ drivers/dax/device.c | 1 -
+ drivers/dax/super.c | 15 +-
+ drivers/infiniband/hw/qib/qib_init.c | 5 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 2 +-
+ drivers/nvdimm/btt.c | 3 +
+ drivers/nvdimm/pmem.c | 2 +
+ drivers/rapidio/devices/rio_mport_cdev.c | 5 +-
+ drivers/rapidio/switches/idt_gen2.c | 2 +-
+ drivers/rapidio/switches/idt_gen3.c | 2 +-
+ drivers/rapidio/switches/idtcps.c | 2 +-
+ drivers/rapidio/switches/tsi568.c | 2 +-
+ drivers/rapidio/switches/tsi57x.c | 2 +-
+ fs/dax.c | 9 +-
+ fs/dcache.c | 3 +-
+ fs/eventpoll.c | 4 +-
+ fs/exec.c | 1 +
+ fs/ext2/file.c | 1 -
+ fs/ext4/file.c | 1 -
+ fs/hugetlbfs/inode.c | 1 -
+ fs/ocfs2/dlm/dlmmaster.c | 66 +++--
+ fs/ocfs2/dlmglue.c | 2 +-
+ fs/ocfs2/filecheck.c | 357 +++++++++---------------
+ fs/ocfs2/filecheck.h | 29 +-
+ fs/ocfs2/ocfs2.h | 8 +
+ fs/ocfs2/stackglue.c | 6 -
+ fs/ocfs2/stackglue.h | 3 -
+ fs/ocfs2/super.c | 35 ++-
+ fs/ocfs2/super.h | 3 -
+ fs/proc/Makefile | 1 +
+ fs/proc/array.c | 6 +
+ fs/proc/internal.h | 23 +-
+ fs/proc/task_mmu.c | 5 +-
+ fs/proc/util.c | 23 ++
+ fs/seq_file.c | 10 -
+ fs/xfs/xfs_file.c | 2 -
+ include/linux/backing-dev.h | 8 +
+ include/linux/bitfield.h | 2 +-
+ include/linux/crash_core.h | 2 +
+ include/linux/hmm.h | 4 +-
+ include/linux/hugetlb.h | 2 +-
+ include/linux/ipc_namespace.h | 3 +
+ include/linux/kernel.h | 3 +-
+ include/linux/list_lru.h | 3 +-
+ include/linux/memblock.h | 8 +-
+ include/linux/mm.h | 36 ++-
+ include/linux/mm_types.h | 9 +-
+ include/linux/mmu_notifier.h | 3 +-
+ include/linux/mmzone.h | 6 -
+ include/linux/of.h | 10 +
+ include/linux/pageblock-flags.h | 11 +
+ include/linux/pid_namespace.h | 1 -
+ include/linux/radix-tree.h | 1 -
+ include/linux/reboot.h | 4 +
+ include/linux/sched/mm.h | 29 +-
+ include/linux/sched/signal.h | 3 +
+ include/linux/slab.h | 16 ++
+ include/linux/swap.h | 14 +-
+ include/linux/swap_slots.h | 1 -
+ include/linux/vmstat.h | 23 ++
+ include/uapi/linux/prctl.h | 4 +
+ include/uapi/linux/sysctl.h | 4 +
+ init/main.c | 3 +
+ init/version.c | 2 +-
+ ipc/sem.c | 1 +
+ ipc/shm.c | 1 +
+ ipc/util.c | 97 ++++---
+ ipc/util.h | 26 +-
+ kernel/cred.c | 1 +
+ kernel/exit.c | 4 +
+ kernel/fork.c | 461 ++++++++++++++++---------------
+ kernel/kcov.c | 2 +-
+ kernel/panic.c | 2 +
+ kernel/pid.c | 38 +--
+ kernel/pid_namespace.c | 6 -
+ kernel/reboot.c | 27 ++
+ kernel/sys.c | 11 +
+ kernel/sysctl.c | 14 +-
+ lib/Kconfig | 2 +-
+ lib/Kconfig.debug | 143 +++++-----
+ lib/Makefile | 1 +
+ lib/dma-debug.c | 6 +-
+ lib/string.c | 141 ----------
+ lib/test_string.c | 141 ++++++++++
+ mm/compaction.c | 59 +++-
+ mm/debug.c | 6 +-
+ mm/huge_memory.c | 28 +-
+ mm/hugetlb.c | 20 +-
+ mm/ksm.c | 18 +-
+ mm/list_lru.c | 59 ++--
+ mm/madvise.c | 9 +-
+ mm/memblock.c | 8 +-
+ mm/memory.c | 87 ++++--
+ mm/memory_hotplug.c | 52 ++--
+ mm/mempolicy.c | 7 +-
+ mm/mempool.c | 2 +-
+ mm/migrate.c | 6 +-
+ mm/mlock.c | 3 +-
+ mm/mmap.c | 3 +-
+ mm/oom_kill.c | 8 +-
+ mm/page-writeback.c | 10 +-
+ mm/page_alloc.c | 19 +-
+ mm/page_io.c | 6 +-
+ mm/page_owner.c | 4 +-
+ mm/page_vma_mapped.c | 3 +-
+ mm/rmap.c | 47 +++-
+ mm/swap_slots.c | 20 +-
+ mm/swapfile.c | 14 +-
+ mm/vmscan.c | 19 +-
+ mm/vmstat.c | 132 ++++++++-
+ mm/zsmalloc.c | 2 +-
+ net/rds/ib_fmr.c | 4 +-
+ scripts/bloat-o-meter | 89 +++---
+ scripts/checkpatch.pl | 30 +-
+ scripts/decodecode | 8 +
+ scripts/parse-maintainers.pl | 52 +++-
+ scripts/spelling.txt | 4 +
+ security/apparmor/lsm.c | 1 +
+ security/selinux/hooks.c | 1 +
+ usr/Makefile | 9 +-
+ 135 files changed, 1903 insertions(+), 1190 deletions(-)
+ create mode 100644 Documentation/vm/mmu_notifier.txt
+ create mode 100644 fs/proc/util.c
+ create mode 100644 lib/test_string.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..5450ba9d35e8
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,36 @@
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
+Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225
+Unchanged quilt series jdelvare-hwmon
+Importing dmi based on 0666f560b71b899cd11a7caf39fd45129e9030fd
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..c99e55599fd1
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20171012