diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-24 14:16:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-24 14:16:30 +1000 |
| commit | 0e055ad9508f467c37db85cd67f896f689724f22 (patch) | |
| tree | e3ad070dbdeda35c57bb6a607c2888fb39a68a56 | |
| parent | 1016c562f7fe8d95179c12ec0ea5d9720ba3fe4b (diff) | |
| download | linux-0e055ad9508f467c37db85cd67f896f689724f22.tar.gz linux-0e055ad9508f467c37db85cd67f896f689724f22.tar.xz | |
Add linux-next specific files for 20160824next-20160824
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 242 | ||||
| -rw-r--r-- | Next/Trees | 244 | ||||
| -rw-r--r-- | Next/merge.log | 5372 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5863 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..413c7467796c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,242 @@ +Name SHA1 +---- ---- +origin 7a1dcf6adaa7cc4b8cd93a3883267497a77b1051 +fixes d3396e1e4ec4aa41ef563841e8ba511ae0589003 +kbuild-current d3e2773c4ede5c62d2a92dae20e3a09b1ca55b6e +arc-current c57653dc94d0db7bf63067433ceaa97bdcd0a312 +arm-current 87eed3c74d7c65556f744230a90bf9556dd29146 +m68k-current 6bd80f372371a7b3f5ff13e4e8a560066299c001 +metag-fixes 97b1d23f7bcbee00a5b85bf2c022c612ea67429d +powerpc-fixes ca49e64f0cb1368fc666a53b16b45d4505763d9c +sparc 4620a06e4b3c5d076feb9a42ab43dce77c385358 +net 28a10c426e81afc88514bca8e73affccf850fdf6 +ipsec 11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b +netfilter b75911b66ad508a3c3f006ce37d9f9ebee34da43 +ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e +wireless-drivers c81396f3da22aa8f1e8fbf7943616a0839c4d63d +mac80211 4d0bd46a4d55383f7b925e6cf7865a77e0f0e020 +sound-current b027d11263836a0cd335520175257dcb99b43757 +pci-current 21c80c9fefc3db10b530a96eb0478c29eb28bf77 +driver-core.current 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +tty.current 87a713c8ffca33d8e497a8b6c02034332bd80394 +usb.current 53e5f36fbd2453ad69a3369a1db62dc06c30a4aa +usb-gadget-fixes a0ad85ae866f8a01f29a18ffa1e9b1aa8ca888bd +usb-serial-fixes 6695593e4a7659db49ac6eca98c164f7b5589f72 +usb-chipidea-fixes c4e94174983a86c935be1537a73e496b778b0287 +staging.current eafe5cfe718926c1ed8b3dacd2191c189b3cdcd2 +char-misc.current 51c70261b2575962cb9406cd92246b1cee6a3c71 +input-current e3a888a4bff0bef0b256d55c58bc32c99fb44ece +crypto-current e67479b13ede47cc2f5beb5b51e67fdb30778ee8 +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes c8952a707556e04374d7b2fdb3a079d63ddf6f2f +kselftest-fixes 29b4817d4018df78086157ea3a55c1d9424a7cfc +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26 +drm-intel-fixes 177d91aaea4bcafb29232336bafaa521b85286aa +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc e6aeb2fbb85f2b59793f0b0325abe31ac949f812 +arm d0a0f0bafaf4f01e70d1e1cb4966358b47031d18 +arm-perf 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +arm-soc 756c52412437d9c7685440f4ebd49f5bd8aabb5a +amlogic 57d06053f68b0b394758746b980875b107ab1ea3 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 ab4e0d3745d6d3046296a66cee6dd61e1cb5b850 +berlin d433580f3b4ef47f16f418a9723c22a78680f931 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 2c6bb730dd4ecaca5302a47fe1c40f36a7268845 +keystone eef6bb9fc17a5c7b8b624db8b81158b632740319 +mvebu 38b7b9bdeb7a8884de873d087e6bdbefdfae1e42 +omap 3853bd4d48a1e9dd4bcfc02c3b1ae8b868e944d2 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 289f9fb05d0c81122af489ae59f9f0601c237389 +renesas ae5e090b1e0c01d7b697108f636708fafa13a94b +rockchip 9931b02aa49506387eb75b227e6a4c4df9021733 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1a695a905c18548062509178b98bc91e67510864 +samsung-krzk 80a4cc177c0ead8a9986d108d68e98611507747d +tegra f56fa77c0ef94b379f9aa164320ecb728cdda42f +arm64 747a70e60b7234e8fd9c35dd2f2db10ac1db231d +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 6bd80f372371a7b3f5ff13e4e8a560066299c001 +m68knommu fa8410b355251fd30341662a40ac6b22d3e38468 +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 82440d0d030d8c47ce44579a1bf61a26d28409f2 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 523d939ef98fd712632d93a5a2b588e477a7565e +powerpc 29b4817d4018df78086157ea3a55c1d9424a7cfc +fsl 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 3baca64293f842393d0729814f3a1641858cbbea +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 74050a3188c83a2f12e4714892507b48eee885bf +uml dad2232844073295c64e9cc2d734a0ade043e0f6 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9e8511ff7e3f18df7d202da06c9704d940fa68f9 +befs 58d08821eaa76ab54bab2da1808d0947980364f6 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave e8838e2b55eca0eab72e7d4307e31dd2443d7fc3 +ceph b726bc557d4477b073c7139adea01e6e065cb204 +cifs 8e1e83d236068525bf8416c336162056c512eced +configfs 3dc3afadeb0403fd967b97ee282ab9053d36da2b +ecryptfs 2bdcdbea80bd161467f1dc32b09ccc67ddeefdc0 +ext3 3cd0126dca82ecba8b2a6bf5aca91454da0a0776 +ext4 7bc9491645118c9461bd21099c31755ff6783593 +f2fs 20a3d61d46e1fb45efa6eb4637c0dcd3f00a14e9 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 7244b9538994bdb60e94232677cbd78e135ebb11 +gfs2 23e5671a79be00b2f1c895aa93ff40fb75a4647e +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 41963c10c47a35185e68cb9049f7a3493c94d2d7 +nfsd e2ce4e03e317a5ae432c3a82ad4fd912a6cfa5d2 +orangefs a21aae3bb15a1d08040bdcf5a73504c0da9f5080 +overlayfs f200ea288c78526210e3786e09569cb9debe29ed +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 17ce1eb0b64eb27d4f9180daae7495fa022c7b0d +xfs 32438cf9d54bd53b531f6d98814e84dd278360c1 +file-locks d67fd44f697dff293d7cdc29af929241b669affe +vfs-miklos d55af8a321bea4c084d43e3004ce4aa2eafe7e08 +vfs 3baf32898e1c88792fa7cadc88f601833bdae3da +pci 29b4817d4018df78086157ea3a55c1d9424a7cfc +pstore e976e56423dc1cc01686861fc3e0c6c0ec8cd8b7 +hid dc1de1f4bebd14d21fec23a517e7e5b3feb85a1d +i2c 00f0ea70d2b82b7d7afeb1bdedc9169eb8ea6675 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 0deb6b2c087a9303386143963a6e6ce2bef08f04 +hwmon-staging 0cf56b7b9c312114ce5392a1295b66ed2d367e8e +v4l-dvb b6aa39228966e0d3f0bc3306be1892f87792903a +pm ed8a91cce5417aecb4ed173d4f6b231dadac2b29 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal bff9ca53745b0a4a065ba4b744e40dc0f97262ad +thermal-soc 9a1d2bd3e7fd393b209cb8d66e24c04dca2d2ab4 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 9b8b266033eb20f96809c077403b887490d2ef17 +net-next 184b49c89f39f5c5ad262a6456248284e10984c6 +ipsec-next 9d0380df6217e8dd014118fa1c99dda9974f3613 +netfilter-next b43f95695124baba9f7c48e247fc8fd212a984d9 +ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421 +wireless-drivers-next 60747ef4d173c2747bf7f0377fb22846cb422195 +bluetooth 0f3cce5ec5b6b4648e9d1087bbf63231a27d30ec +mac80211-next 2d75da13fbb957e955d212555b91101cef36f0ce +rdma 29b4817d4018df78086157ea3a55c1d9424a7cfc +rdma-leon 29b4817d4018df78086157ea3a55c1d9424a7cfc +rdma-leon-test 4dd75e30effb7b48f7d81fa9986bb401e30ce799 +mtd 11e8a7f9aa9427409ceca4ceef39e4ba18cff421 +l2-mtd 1dcff2e4ae728a36876bdb108173f4cbcae128bf +nand e5c88bb4ce0ac9b6f052e4aa22c6695b0a7ab1da +crypto d89a67134fcc7e863530624fe5a88dde0159cfb8 +drm 0d42204f374380b6334de7dd2fe7e7d795250290 +drm-panel 9bb34c4c730dbfaf9c91af57bf41d0a453067e87 +drm-intel ac96b5566926af83463ddcf4655856033c092f26 +drm-tegra 64ea25c3bc86c05c7da6c683b86663f4c90158d6 +drm-misc 28579f37467cd1a9130a6287cf8322986e0b56f9 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 0a677125d0ff726ed3d75ab311cf54674bf512bc +hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi d5a7764dc3e7f2bd0a68c9a32b3236c609d0ba7c +kbuild e007c53397acb5554e226693e3bff54a312ccd96 +kspp 09dd109d8241cd570391d4488337b77a4525f24e +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap db420765b793304aeb8c234a56ab9c99bbe42f33 +sound 07cb3272af7935babe8b421f4070a6e3f26ef59b +sound-asoc f64f56384d4e80a4c3d113aeb6ca1b5d6f1b6eb6 +modules 49aadcf1b6f4240751921dad52e86c760d70a5f1 +input 99ff4d3af80caa91eef5a4b709def6b8b362ce8c +block b013517951a168c4f60a633e3f39185897cd052f +lightnvm 191d684c5d4f478dcd225ea424b1a3e09f06ace2 +device-mapper 9e7d9367e6a29e4cac85aa6df199f760dfa39c8a +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh bf4a4e8a0acf2fb1f856139bbfbbf325619868fa +md a0667a61d4bfef96007727d9ef96fc2b63106523 +mfd f37be01e6dc606f2fcc5e95c9933d948ce19bd35 +backlight 602553073892c18f723f8aa090153a23b1312a16 +battery 1c4593edbd4a893691fa826c36e71946a5d54c1d +omap_dss2 e0299908d606a99e7ffb467bc3c11dfe54133af3 +regulator 53df648ee34178512e45642abdb00cbf57077825 +security 8ccc7d6bad84bebf1f1a6364d1fa04d3d7b575f6 +integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a +keys 05638c9bc586a0c8897f7e909aaa0a3d1ff052e0 +selinux 348a0db9e69e4c214bf5d7677f17cb99cdc47db0 +tpmdd 82cc1a49b6358394938e759dc4c22b2be773bbad +watchdog 29b4817d4018df78086157ea3a55c1d9424a7cfc +iommu 35ee9598972edfbf6e75206283be67fcba4ebbd4 +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio 0991bbdbf5b85bd14a26e783f087b0f2913c93b1 +jc_docs 8d8f60c5e0cdc05bd9785faffd1cc034acdcd6d6 +trivial 34df117414d73cb56d128bf7016a4c151f95c313 +audit 523d939ef98fd712632d93a5a2b588e477a7565e +devicetree 34276bb062b8449b3b0a208c9b848a1a27920075 +mailbox a68b216676e89fa959a23b583b56f9ce7df81b37 +spi a2b15c6f3ecbdd75cab99516d169cc4cf25b93ed +tip e3a4fb6d41b0609aa27f703b99691758f9556a35 +clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 6fa06b0d9e9514bfca9b89493161f2a2cbb079a9 +irqchip e9abd777ebe83acc3ac89a774ba73c89508d3a1d +ftrace 78aebca2c955c1c5aeb48e12645e13fe3c3461f2 +rcu 89d39c83d193733ed5fff1c480cd42c9de1da404 +kvm 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +kvm-arm 29b4817d4018df78086157ea3a55c1d9424a7cfc +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 93d17397e4e2182fdaad503e2f9da46202c0f1c3 +kvms390 1dbbcbf3f5532602468b9e5fa4750d365163dd9c +xen-tip d34c30cc1fa80f509500ff192ea6bc7d30671061 +percpu a67823c1ed1092160da94c31e6da5aeb35dca81c +workqueues d945b5e9f0e35cb56a3783d849b5f0f37da0a7f1 +drivers-x86 29b4817d4018df78086157ea3a55c1d9424a7cfc +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds 1d1a77ddc8acfa3d506f1958e09a12085e71fc69 +ipmi 92cad0931b08226e71110380304ad28e12547dcb +driver-core 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +tty 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +usb 1aaaa9acaea1dd2878d6c92b45e4c117ef425baf +usb-gadget 15e4292a2d21e9997fdb2b8c014cc461b3f268f0 +usb-serial 61fc51366b395f1441c7cd3615fb18837a4fa2f8 +usb-chipidea-next 1d9aabecde2929c3e68661a1a6bf52a594c37bea +staging d5bd1eba19230347acfc4960581a15bfb459a615 +char-misc 4c73c0882b34d0383ff417e2d66c127f848cfe06 +extcon 160a746f52055ee0f66f86f2828f8cf3c2ba1fa9 +cgroup 667430ec48e410070ae7074a893202fad3feec2d +scsi dc43bf39f50559c0c6b34a8290773080a31c0bc5 +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 6650248f46d79daedb062419016f0359f01ceea0 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +pinctrl 4bd0641c2d73c48a9dc86e3c7c315cb75b6dd6ba +vhost a77ec83a57890240c546df00ca5df1cdeedb1cc3 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg f6ed8014183307586fae61b58abf7f7437e27f90 +gpio 0926ebf30f55bcf65e78fb7dc75f9d1ad4d6779c +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 53de7c26ded7f5e954bfc202dffc43c0dd165337 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns aeaa4a79ff6a5ed912b7362f206cf8576fca538b +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk 63bb4fd6a391167f855f9b38b27945bed4015756 +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 29b4817d4018df78086157ea3a55c1d9424a7cfc +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 5ad75fcdd712d18b393c3b3fe52ab4108703d337 +coresight 67c52cac0c2427af61590c1dbb993457574be00f +rtc 6c6aba9e898582f289b4b93ecc0b991ab3caab31 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm d8d378fa1a0c98ecb50ca52c9bf3bc14e25aa2d2 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 7a944a8456be538f5666708d2d506d55121ccfc7 +akpm d160711665c3059c6cd929df613f8ee3eb153ceb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2d69ea3a3c61 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,244 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +befs git git://github.com/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..98ff48df1b03 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5372 @@ +$ date -R +Wed, 24 Aug 2016 09:20:51 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at fa8410b35525 Linux 4.8-rc3 +Merging origin/master (7a1dcf6adaa7 Merge tag 'usercopy-v4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge origin/master +Updating fa8410b35525..7a1dcf6adaa7 +Fast-forward + arch/arc/include/asm/entry.h | 4 ++-- + arch/arc/include/asm/irqflags-compact.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/include/uapi/asm/elf.h | 11 +++++++++-- + arch/arc/kernel/arcksyms.c | 2 ++ + arch/arc/kernel/process.c | 2 +- + arch/arc/kernel/setup.c | 6 ++++-- + arch/arc/mm/cache.c | 9 +++++++++ + arch/arc/mm/highmem.c | 1 + + arch/x86/crypto/sha256-mb/sha256_mb.c | 4 ++-- + arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 7 ++++--- + arch/x86/crypto/sha512-mb/sha512_mb.c | 4 ++-- + drivers/gpio/Kconfig | 11 ++++++----- + drivers/gpio/gpio-max730x.c | 8 ++++---- + mm/usercopy.c | 4 ++-- + tools/gpio/gpio-event-mon.c | 2 +- + 16 files changed, 51 insertions(+), 28 deletions(-) +Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured) +$ git merge kbuild-current/rc-fixes +Merge made by the 'recursive' strategy. + scripts/package/builddeb | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging arc-current/for-curr (c57653dc94d0 ARC: export __udivdi3 for modules) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (87eed3c74d7c ARM: fix address limit restoration for undefined instructions) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init()) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (ca49e64f0cb1 selftests/powerpc: Specify we expect to build with std=gnu99) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) +$ git merge sparc/master +Already up-to-date. +Merging net/master (28a10c426e81 net sched: fix encoding to use real length) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/cavium/thunder/nic_reg.h | 1 - + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +-- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 85 ++++++++++++++-------- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 21 ++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 16 ++-- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 26 +++++-- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 11 ++- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 59 ++++++++------- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 12 +-- + drivers/net/ethernet/qlogic/qed/qed.h | 11 ++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 5 +- + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 8 +- + drivers/net/usb/kaweth.c | 10 ++- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + include/linux/netfilter/nfnetlink_acct.h | 4 +- + include/net/tcp.h | 2 + + include/uapi/linux/atm_zatm.h | 1 + + include/uapi/linux/if_pppol2tp.h | 3 +- + include/uapi/linux/if_pppox.h | 3 + + include/uapi/linux/if_tunnel.h | 3 + + include/uapi/linux/ipx.h | 13 +++- + include/uapi/linux/libc-compat.h | 26 +++++++ + include/uapi/linux/openvswitch.h | 6 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/ip_tunnel_core.c | 8 +- + net/ipv6/addrconf.c | 34 +++++---- + net/l2tp/l2tp_ppp.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 4 + + net/netfilter/nfnetlink_acct.c | 17 +++-- + net/netfilter/nfnetlink_cttimeout.c | 16 ++-- + net/netfilter/nfnetlink_log.c | 1 + + net/netfilter/xt_TPROXY.c | 4 + + net/netfilter/xt_nfacct.c | 2 +- + net/sched/act_ife.c | 18 +++-- + net/sctp/input.c | 11 ++- + net/sctp/inqueue.c | 13 ---- + 44 files changed, 319 insertions(+), 180 deletions(-) +Merging ipsec/master (11d7a0bb95ea xfrm: Only add l3mdev oif to dst lookups) +$ git merge ipsec/master +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/xfrm6_input.c | 1 + + net/ipv6/xfrm6_policy.c | 2 +- + net/xfrm/xfrm_input.c | 14 +++++++------- + net/xfrm/xfrm_policy.c | 4 ++++ + net/xfrm/xfrm_user.c | 13 ++++--------- + 6 files changed, 18 insertions(+), 18 deletions(-) +Merging netfilter/master (b75911b66ad5 netfilter: cttimeout: fix use after free error when delete netns) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (c81396f3da22 mwifiex: fix large amsdu packets causing firmware hang) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mac80211/master (4d0bd46a4d55 Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel") +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-core.c | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) +Merging sound-current/for-linus (b027d1126383 ALSA: line6: Fix POD sysfs attributes segfault) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/usb/line6/pcm.c | 3 ++- + sound/usb/line6/pod.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 7 deletions(-) +Merging pci-current/for-linus (21c80c9fefc3 x86/PCI: VMD: Fix infinite loop executing irq's) +$ git merge pci-current/for-linus +Auto-merging drivers/pci/msi.c +Merge made by the 'recursive' strategy. + Documentation/PCI/MSI-HOWTO.txt | 24 ++++++++++-------------- + Documentation/kernel-parameters.txt | 4 ++++ + arch/x86/pci/vmd.c | 10 ++++++++-- + drivers/pci/msi.c | 18 ++++++++++-------- + include/linux/pci.h | 10 ++++++---- + 5 files changed, 38 insertions(+), 28 deletions(-) +Merging driver-core.current/driver-core-linus (694d0d0bb203 Linux 4.8-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (87a713c8ffca 8250/fintek: rename IRQ_MODE macro) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/8250_fintek.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging usb.current/usb-linus (53e5f36fbd24 USB: avoid left shift by -1) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devio.c | 16 +++++++++++----- + 2 files changed, 12 insertions(+), 6 deletions(-) +Merging usb-gadget-fixes/fixes (a0ad85ae866f usb: dwc3: gadget: stop processing on HWO set) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (6695593e4a76 USB: serial: option: add WeTelecom WM-D200) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/mos7720.c | 2 +- + drivers/usb/serial/mos7840.c | 4 ++-- + drivers/usb/serial/option.c | 5 +++++ + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (c4e94174983a usb: chipidea: udc: don't touch DP when controller is in host mode) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging staging.current/staging-linus (eafe5cfe7189 Merge tag 'iio-fixes-for-4.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-linus) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/iio/adc/rockchip-saradc.txt | 7 ++++ + MAINTAINERS | 9 ++--- + arch/arm/boot/dts/rk3066a.dtsi | 2 + + arch/arm/boot/dts/rk3288.dtsi | 2 + + arch/arm/boot/dts/rk3xxx.dtsi | 2 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 + + drivers/iio/accel/Kconfig | 5 ++- + drivers/iio/accel/bma220_spi.c | 2 +- + drivers/iio/accel/kxsd9.c | 1 + + drivers/iio/adc/Kconfig | 1 + + drivers/iio/adc/ad799x.c | 1 + + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/rockchip_saradc.c | 30 ++++++++++++++ + drivers/iio/adc/ti-ads1015.c | 3 +- + drivers/iio/adc/ti_am335x_adc.c | 16 ++++++-- + drivers/iio/chemical/atlas-ph-sensor.c | 2 +- + drivers/iio/dac/stx104.c | 38 +++++++++++++----- + drivers/iio/humidity/Kconfig | 2 + + drivers/iio/humidity/am2315.c | 2 +- + drivers/iio/humidity/hdc100x.c | 27 ++++--------- + drivers/iio/industrialio-buffer.c | 23 ++++++++--- + drivers/iio/light/Kconfig | 2 + + drivers/iio/pressure/bmp280-core.c | 8 ++-- + drivers/iio/proximity/as3935.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1760.c | 1 + + drivers/staging/comedi/drivers/comedi_test.c | 46 ++++++---------------- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/dt2811.c | 4 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 12 +++++- + drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- + drivers/staging/lustre/lustre/llite/namei.c | 43 +++++++++++--------- + drivers/staging/wilc1000/host_interface.c | 3 +- + drivers/staging/wilc1000/linux_wlan.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +- + include/linux/fence.h | 2 - + include/linux/iio/sw_trigger.h | 2 +- + include/linux/mfd/ti_am335x_tscadc.h | 8 ++-- + tools/iio/iio_generic_buffer.c | 2 +- + 38 files changed, 198 insertions(+), 128 deletions(-) +Merging char-misc.current/char-misc-linus (51c70261b257 Revert "android: binder: fix dangling pointer comparison") +$ git merge char-misc.current/char-misc-linus +Removing drivers/misc/bh1780gli.c +Auto-merging drivers/iio/light/Kconfig +Merge made by the 'recursive' strategy. + drivers/iio/light/Kconfig | 1 - + drivers/misc/Kconfig | 10 -- + drivers/misc/Makefile | 1 - + drivers/misc/bh1780gli.c | 259 ---------------------------------------------- + 4 files changed, 271 deletions(-) + delete mode 100644 drivers/misc/bh1780gli.c +Merging input-current/for-linus (e3a888a4bff0 Input: ads7846 - remove redundant regulator_disable call) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/keyboard/tegra-kbc.c | 2 +- + drivers/input/rmi4/rmi_driver.c | 3 ++- + drivers/input/serio/i8042.c | 1 + + drivers/input/touchscreen/ads7846.c | 1 - + drivers/input/touchscreen/silead.c | 2 +- + 5 files changed, 5 insertions(+), 4 deletions(-) +Merging crypto-current/master (e67479b13ede crypto: sha512-mb - fix ctx pointer) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ git merge ide/master +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (177d91aaea4b drm/i915: Fix botched merge that downgrades CSR versions.) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 13 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 +- + drivers/gpu/drm/i915/i915_reg.h | 13 ++ + drivers/gpu/drm/i915/intel_csr.c | 8 +- + drivers/gpu/drm/i915/intel_display.c | 11 ++ + drivers/gpu/drm/i915/intel_drv.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 270 ++++++++++++++++++++++++++++- + 7 files changed, 309 insertions(+), 22 deletions(-) +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (e6aeb2fbb85f ARC: Support syscall ABI v4) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. +Merging arm/for-next (d0a0f0bafaf4 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/Makefile +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 1 - + arch/arm/boot/Makefile | 2 ++ + arch/arm/include/asm/flat.h | 5 +++-- + arch/arm/include/asm/memory.h | 15 +++------------ + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +++++----- + arch/arm/kernel/smp.c | 2 +- + arch/arm/kernel/vdso.c | 11 ++++++----- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/cache-l2x0.c | 5 ++--- + arch/arm/mm/dma-mapping.c | 4 ++-- + arch/arm/mm/mmu.c | 2 +- + drivers/amba/bus.c | 5 +++++ + fs/Kconfig.binfmt | 2 +- + 14 files changed, 33 insertions(+), 35 deletions(-) +Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (756c52412437 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 | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (57d06053f68b Merge v4.8/mmc) +$ git merge amlogic/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 45 + + .../devicetree/bindings/mmc/amlogic,meson-gxbb.txt | 29 + + MAINTAINERS | 1 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 74 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 71 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 54 +- + arch/arm64/configs/defconfig | 5 +- + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/gxbb-aoclk.c | 191 +++++ + drivers/clk/meson/gxbb.c | 9 + + drivers/clk/meson/gxbb.h | 7 +- + drivers/mmc/host/Kconfig | 10 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/meson-gxbb.c | 918 +++++++++++++++++++++ + include/dt-bindings/clock/gxbb-aoclkc.h | 66 ++ + include/dt-bindings/clock/gxbb-clkc.h | 4 + + include/dt-bindings/reset/gxbb-aoclkc.h | 66 ++ + 17 files changed, 1547 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gxbb.txt + create mode 100644 drivers/clk/meson/gxbb-aoclk.c + create mode 100644 drivers/mmc/host/meson-gxbb.c + create mode 100644 include/dt-bindings/clock/gxbb-aoclkc.h + create mode 100644 include/dt-bindings/reset/gxbb-aoclkc.h +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (ab4e0d3745d6 Merge branch anholt/bcm2835-dt-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++ + drivers/gpu/drm/vc4/vc4_crtc.c | 52 ++++++++++++++++------ + drivers/gpu/drm/vc4/vc4_dpi.c | 11 +++++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 29 +++++++++++- + 4 files changed, 81 insertions(+), 15 deletions(-) +Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/berlin2.dtsi | 2 -- + arch/arm/boot/dts/berlin2q.dtsi | 2 -- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 12 +++++++++--- + 3 files changed, 9 insertions(+), 7 deletions(-) +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (2c6bb730dd4e Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/mx1.h +Removing arch/arm/mach-imx/mm-imx1.c +Removing arch/arm/mach-imx/mach-scb9328.c +Auto-merging arch/arm/mach-imx/mach-imx1.c +Removing arch/arm/mach-imx/mach-apf9328.c +Removing arch/arm/mach-imx/iomux-mx1.h +Removing arch/arm/mach-imx/devices-imx1.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/technologic.txt | 6 + + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/imx53.dtsi | 18 + + arch/arm/boot/dts/imx6dl-gw553x.dts | 55 +++ + arch/arm/boot/dts/imx6dl-riotboard.dts | 22 +- + arch/arm/boot/dts/imx6dl-ts4900.dts | 49 +++ + arch/arm/boot/dts/imx6q-arm2.dts | 24 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 24 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 24 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 24 +- + arch/arm/boot/dts/imx6q-evi.dts | 28 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 24 +- + arch/arm/boot/dts/imx6q-gw553x.dts | 55 +++ + arch/arm/boot/dts/imx6q-marsboard.dts | 24 +- + arch/arm/boot/dts/imx6q-novena.dts | 12 +- + arch/arm/boot/dts/imx6q-sbc6x.dts | 24 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 24 +- + arch/arm/boot/dts/imx6q-ts4900.dts | 53 +++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 39 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 39 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 44 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 12 + + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 12 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 433 +++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 36 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 481 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 24 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 21 + + arch/arm/boot/dts/imx7d.dtsi | 42 +- + arch/arm/boot/dts/imx7s-warp.dts | 370 ++++++++++++++++ + arch/arm/boot/dts/imx7s.dtsi | 364 +++++++++------- + arch/arm/configs/imx_v4_v5_defconfig | 3 +- + arch/arm/configs/imx_v6_v7_defconfig | 16 +- + arch/arm/configs/multi_v4t_defconfig | 4 +- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/mach-imx/Kconfig | 50 +-- + arch/arm/mach-imx/Makefile | 7 +- + arch/arm/mach-imx/common.h | 5 - + arch/arm/mach-imx/devices-imx1.h | 30 -- + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/devices-common.h | 12 - + arch/arm/mach-imx/devices/platform-imx-fb.c | 5 - + arch/arm/mach-imx/devices/platform-imx-i2c.c | 5 - + arch/arm/mach-imx/devices/platform-imx-uart.c | 37 -- + arch/arm/mach-imx/devices/platform-spi_imx.c | 9 - + arch/arm/mach-imx/hardware.h | 1 - + arch/arm/mach-imx/iomux-mx1.h | 155 ------- + arch/arm/mach-imx/iomux-mx3.h | 34 -- + arch/arm/mach-imx/mach-apf9328.c | 148 ------- + arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} | 23 +- + arch/arm/mach-imx/mach-imx6ul.c | 1 + + arch/arm/mach-imx/mach-pcm037.c | 2 +- + arch/arm/mach-imx/mach-scb9328.c | 143 ------ + arch/arm/mach-imx/mm-imx1.c | 67 --- + arch/arm/mach-imx/mx1.h | 172 -------- + arch/arm/mach-imx/pm-imx6.c | 2 +- + arch/arm/mach-mxs/mach-mxs.c | 77 ---- + drivers/clk/imx/clk-imx1.c | 46 +- + 71 files changed, 2265 insertions(+), 1497 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-gw553x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-ts4900.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw553x.dts + create mode 100644 arch/arm/boot/dts/imx6q-ts4900.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw553x.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-ts4900.dtsi + create mode 100644 arch/arm/boot/dts/imx7s-warp.dts + delete mode 100644 arch/arm/mach-imx/devices-imx1.h + delete mode 100644 arch/arm/mach-imx/iomux-mx1.h + delete mode 100644 arch/arm/mach-imx/mach-apf9328.c + rename arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} (63%) + delete mode 100644 arch/arm/mach-imx/mach-scb9328.c + delete mode 100644 arch/arm/mach-imx/mm-imx1.c + delete mode 100644 arch/arm/mach-imx/mx1.h +Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (38b7b9bdeb7a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/marvell/armada-39x.txt | 15 +- + arch/arm/boot/dts/armada-370-db.dts | 29 +-- + .../dts/armada-370-seagate-personal-cloud.dtsi | 40 ++-- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 112 +++++----- + arch/arm/boot/dts/armada-370-xp.dtsi | 56 +++-- + arch/arm/boot/dts/armada-370.dtsi | 34 ++- + arch/arm/boot/dts/armada-385-db-ap.dts | 58 +++-- + arch/arm/boot/dts/armada-385-linksys.dtsi | 9 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 56 ++--- + arch/arm/boot/dts/armada-388-db.dts | 25 ++- + arch/arm/boot/dts/armada-388-gp.dts | 30 +-- + arch/arm/boot/dts/armada-388-rd.dts | 25 ++- + arch/arm/boot/dts/armada-38x.dtsi | 48 ++-- + arch/arm/boot/dts/armada-390-db.dts | 175 +++++++++++++++ + arch/arm/boot/dts/armada-390.dtsi | 3 + + arch/arm/boot/dts/armada-395-gp.dts | 163 ++++++++++++++ + arch/arm/boot/dts/armada-395.dtsi | 76 +++++++ + arch/arm/boot/dts/armada-398-db.dts | 56 +++-- + arch/arm/boot/dts/armada-398.dtsi | 10 +- + arch/arm/boot/dts/armada-39x.dtsi | 126 ++++++++--- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 24 +- + arch/arm/boot/dts/armada-xp-db.dts | 24 +- + arch/arm/boot/dts/armada-xp-gp.dts | 24 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 24 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 112 +++++----- + arch/arm/boot/dts/armada-xp.dtsi | 31 +-- + arch/arm/configs/mvebu_v7_defconfig | 3 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 150 +++++++++++++ + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 1 + + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 246 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + 33 files changed, 1378 insertions(+), 410 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-390-db.dts + create mode 100644 arch/arm/boot/dts/armada-395-gp.dts + create mode 100644 arch/arm/boot/dts/armada-395.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +Merging omap/for-next (3853bd4d48a1 Merge branch 'omap-for-v4.9/dt' into for-next) +$ git merge omap/for-next +Removing arch/arm/mach-omap2/board-rx51.h +Removing arch/arm/mach-omap2/board-rx51.c +Removing arch/arm/mach-omap2/board-rx51-video.c +Removing arch/arm/mach-omap2/board-rx51-peripherals.c +Removing arch/arm/mach-omap2/board-ldp.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos.dtsi | 6 +- + arch/arm/boot/dts/am335x-base0033.dts | 4 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 10 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 6 +- + arch/arm/boot/dts/am335x-evm.dts | 14 +- + arch/arm/boot/dts/am335x-evmsk.dts | 26 +- + arch/arm/boot/dts/am335x-icev2.dts | 36 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 8 +- + arch/arm/boot/dts/am335x-lxm.dts | 4 +- + arch/arm/boot/dts/am335x-nano.dts | 2 +- + arch/arm/boot/dts/am335x-pepper.dts | 16 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 4 +- + arch/arm/boot/dts/am335x-shc.dts | 14 +- + arch/arm/boot/dts/am335x-sl50.dts | 10 +- + arch/arm/boot/dts/am335x-wega.dtsi | 2 +- + arch/arm/boot/dts/am3517.dtsi | 2 +- + arch/arm/boot/dts/am4372.dtsi | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 10 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 4 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 8 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + arch/arm/boot/dts/dm8148-evm.dts | 2 +- + arch/arm/boot/dts/dm8148-t410.dts | 2 +- + arch/arm/boot/dts/dm8168-evm.dts | 2 +- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 8 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 1 + + arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 4 +- + .../boot/dts/omap3-overo-chestnut43-common.dtsi | 6 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 2 - + arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 3 - + arch/arm/boot/dts/omap3-pandora-common.dtsi | 8 +- + arch/arm/boot/dts/omap3.dtsi | 2 +- + arch/arm/boot/dts/omap34xx.dtsi | 2 +- + arch/arm/boot/dts/omap36xx.dtsi | 2 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/mach-omap2/Kconfig | 12 - + arch/arm/mach-omap2/Makefile | 4 - + arch/arm/mach-omap2/board-ldp.c | 430 ------- + arch/arm/mach-omap2/board-rx51-peripherals.c | 1312 -------------------- + arch/arm/mach-omap2/board-rx51-video.c | 67 - + arch/arm/mach-omap2/board-rx51.c | 141 --- + arch/arm/mach-omap2/board-rx51.h | 11 - + arch/arm/mach-omap2/cm33xx.c | 6 - + arch/arm/mach-omap2/cminst44xx.c | 6 - + arch/arm/mach-omap2/omap_hwmod.c | 8 + + arch/arm/mach-omap2/omap_hwmod.h | 4 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 + + 61 files changed, 164 insertions(+), 2130 deletions(-) + delete mode 100644 arch/arm/mach-omap2/board-ldp.c + delete mode 100644 arch/arm/mach-omap2/board-rx51-peripherals.c + delete mode 100644 arch/arm/mach-omap2/board-rx51-video.c + delete mode 100644 arch/arm/mach-omap2/board-rx51.c + delete mode 100644 arch/arm/mach-omap2/board-rx51.h +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/msm8916.dtsi | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) +Merging renesas/next (ae5e090b1e0c Merge branch 'dt-for-v4.9' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 8 +- + arch/arm/boot/dts/r8a7790.dtsi | 23 - + arch/arm/boot/dts/r8a7791.dtsi | 18 - + arch/arm/boot/dts/r8a7792-blanche.dts | 97 ++++ + arch/arm/boot/dts/r8a7792.dtsi | 500 ++++++++++++++++++++- + arch/arm/boot/dts/r8a7794-alt.dts | 106 +++++ + arch/arm/boot/dts/r8a7794-silk.dts | 70 +++ + arch/arm/boot/dts/r8a7794.dtsi | 309 ++++++++++++- + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 80 ++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 268 +++++++++++ + arch/arm64/configs/defconfig | 2 + + include/dt-bindings/clock/r8a7794-clock.h | 25 ++ + 13 files changed, 1459 insertions(+), 48 deletions(-) +Merging rockchip/for-next (9931b02aa495 Merge branch 'v4.9-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi +Auto-merging arch/arm/boot/dts/rk3xxx.dtsi +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3036.dtsi | 12 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 + + arch/arm/boot/dts/rk3288-evb-rk808.dts | 4 + + arch/arm/boot/dts/rk3288-evb.dtsi | 45 ++- + arch/arm/boot/dts/rk3288-fennec.dts | 382 +++++++++++++++++++ + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 310 ++++++++++++++++ + arch/arm/boot/dts/rk3288-firefly-reload.dts | 403 +++++++++++++++++++++ + arch/arm/boot/dts/rk3288.dtsi | 73 ++-- + arch/arm/boot/dts/rk3xxx.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 382 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 + + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 44 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 216 +++++++++++ + drivers/clk/rockchip/clk-pll.c | 4 +- + drivers/clk/rockchip/clk-rk3399.c | 20 +- + drivers/clk/rockchip/clk.c | 2 +- + drivers/clk/rockchip/clk.h | 2 +- + drivers/soc/rockchip/pm_domains.c | 100 ++--- + include/dt-bindings/soc/rockchip,boot-mode.h | 15 + + 23 files changed, 1966 insertions(+), 90 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-fennec.dts + create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts + create mode 100644 include/dt-bindings/soc/rockchip,boot-mode.h +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (80a4cc177c0e Merge branch 'for-v4.9/defconfig-cpufreq-schedutil-builtin' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d74f8a8542e2] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + MAINTAINERS | 15 +++++++++------ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 +---- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 2 +- + arch/arm/configs/exynos_defconfig | 11 ++++++++++- + arch/arm/configs/multi_v7_defconfig | 3 ++- + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-s3c24xx/common.c | 20 +++++++++++++++----- + arch/arm/mach-s3c24xx/mach-mini2440.c | 1 + + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 3 +-- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +++++++++---- + 12 files changed, 51 insertions(+), 25 deletions(-) +Merging tegra/for-next (f56fa77c0ef9 Merge branch for-4.9/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 8 ++++---- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/bus/Kconfig | 6 +----- + drivers/bus/tegra-aconnect.c | 22 ++-------------------- + drivers/clk/tegra/clk-tegra-pmc.c | 2 +- + drivers/soc/tegra/pmc.c | 28 ++++++++-------------------- + 9 files changed, 20 insertions(+), 54 deletions(-) +Merging arm64/for-next/core (747a70e60b72 arm64: Fix copy-on-write referencing in HugeTLB) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea70b2eb2854] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (fa8410b35525 Linux 4.8-rc3) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (82440d0d030d Merge branch '4.8-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/kernel/smp-gic.c +Auto-merging arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/brcm/soc.txt | 4 +- + arch/mips/Kconfig | 13 ++ + arch/mips/ath79/clock.c | 2 +- + arch/mips/bcm47xx/serial.c | 11 +- + arch/mips/bmips/Kconfig | 20 ++- + arch/mips/bmips/setup.c | 4 +- + arch/mips/boot/dts/brcm/Makefile | 36 +++--- + .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 ++++ + arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++++++++++++++ + .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +++++++++++++++++ + arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +++++++++++++++++++++ + ...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 + + .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 ++++ + arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 38 +++--- + arch/mips/configs/loongson1c_defconfig | 126 +++++++++++++++++++ + arch/mips/configs/pistachio_defconfig | 2 - + arch/mips/include/asm/cpu-type.h | 3 +- + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/mach-loongson32/irq.h | 41 ++++++- + arch/mips/include/asm/mach-loongson32/loongson1.h | 5 + + arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 ++++++ + arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 ++++++++++ + arch/mips/kernel/proc.c | 7 ++ + arch/mips/kernel/setup.c | 7 ++ + arch/mips/kernel/smp-gic.c | 66 ---------- + arch/mips/kernel/smp-mt.c | 23 ---- + arch/mips/kernel/uprobes.c | 2 +- + arch/mips/lantiq/xway/vmmc.c | 6 +- + arch/mips/lantiq/xway/xrx200_phy_fw.c | 12 +- + arch/mips/loongson32/Kconfig | 15 +++ + arch/mips/loongson32/Makefile | 6 + + arch/mips/loongson32/Platform | 1 + + arch/mips/loongson32/common/irq.c | 55 ++++++++- + arch/mips/loongson32/common/platform.c | 19 +++ + arch/mips/loongson32/common/setup.c | 4 + + arch/mips/loongson32/ls1c/Makefile | 5 + + arch/mips/loongson32/ls1c/board.c | 28 +++++ + arch/mips/mm/init.c | 13 +- + arch/mips/pci/pci-mt7620.c | 1 - + arch/mips/ralink/timer.c | 28 ++--- + 41 files changed, 1035 insertions(+), 186 deletions(-) + create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi + rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%) + create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi + create mode 100644 arch/mips/configs/loongson1c_defconfig + delete mode 100644 arch/mips/kernel/smp-gic.c + create mode 100644 arch/mips/loongson32/ls1c/Makefile + create mode 100644 arch/mips/loongson32/ls1c/board.c +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (523d939ef98f Linux 4.7) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (29b4817d4018 Linux 4.8-rc1) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (3baca64293f8 s390/pci: add zpci_report_error interface) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/mmu.h | 1 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/pci.h | 4 ++ + arch/s390/include/asm/pgtable.h | 74 +++++++++++++------------------------ + arch/s390/include/asm/tlbflush.h | 72 ++++++++++-------------------------- + arch/s390/mm/gmap.c | 15 ++++++++ + arch/s390/mm/pageattr.c | 4 +- + arch/s390/mm/pgtable.c | 18 ++++----- + arch/s390/pci/pci.c | 9 +++++ + drivers/s390/cio/cio.h | 1 - + 10 files changed, 86 insertions(+), 113 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern) +$ git merge tile/master +Merge made by the 'recursive' strategy. + drivers/char/tile-srom.c | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) +Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/common.lds.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. +Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Auto-merging arch/xtensa/kernel/setup.c +Merge made by the 'recursive' strategy. + Documentation/xtensa/mmu.txt | 173 ++++++++++++++++--- + arch/xtensa/Kconfig | 90 ++++++++-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-elf/bootstrap.S | 7 +- + arch/xtensa/boot/boot-uboot/Makefile | 10 +- + arch/xtensa/include/asm/bitops.h | 2 +- + arch/xtensa/include/asm/cacheasm.h | 11 +- + arch/xtensa/include/asm/fixmap.h | 5 + + arch/xtensa/include/asm/highmem.h | 5 + + arch/xtensa/include/asm/initialize_mmu.h | 44 +++-- + arch/xtensa/include/asm/kmem_layout.h | 74 ++++++++ + arch/xtensa/include/asm/page.h | 27 ++- + arch/xtensa/include/asm/pgtable.h | 7 +- + arch/xtensa/include/asm/processor.h | 2 +- + arch/xtensa/include/asm/sysmem.h | 21 +-- + arch/xtensa/include/asm/vectors.h | 67 +++----- + arch/xtensa/include/uapi/asm/types.h | 3 +- + arch/xtensa/include/uapi/asm/unistd.h | 15 +- + arch/xtensa/kernel/entry.S | 5 +- + arch/xtensa/kernel/head.S | 2 +- + arch/xtensa/kernel/setup.c | 48 +++--- + arch/xtensa/kernel/vmlinux.lds.S | 4 - + arch/xtensa/mm/init.c | 279 +++---------------------------- + 23 files changed, 448 insertions(+), 455 deletions(-) + create mode 100644 arch/xtensa/include/asm/kmem_layout.h +Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 19 +--- + fs/befs/btree.c | 60 ++++++------ + fs/befs/datastream.c | 253 +++++++++++++++++++++++++-------------------------- + fs/befs/debug.c | 1 + + fs/befs/io.c | 26 +----- + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 130 +++++++++++++------------- + fs/befs/super.c | 36 +++++--- + 8 files changed, 244 insertions(+), 283 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (e8838e2b55ec Merge branch 'for-next-next-4.8-20160818' into for-next-20160818) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/btrfs/ctree.h | 7 +- + fs/btrfs/delayed-ref.c | 7 +- + fs/btrfs/disk-io.c | 101 ++++++++++++-- + fs/btrfs/disk-io.h | 4 + + fs/btrfs/extent-tree.c | 234 +++++++++++++++++--------------- + fs/btrfs/extent_io.c | 27 +++- + fs/btrfs/extent_io.h | 1 + + fs/btrfs/file.c | 26 ++-- + fs/btrfs/inode-map.c | 3 +- + fs/btrfs/inode.c | 37 +++-- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/qgroup.c | 62 +++++++-- + fs/btrfs/qgroup.h | 36 ++++- + fs/btrfs/relocation.c | 126 +++++++++++++++-- + fs/btrfs/root-tree.c | 27 ++-- + fs/btrfs/super.c | 16 +++ + fs/btrfs/transaction.c | 7 +- + fs/btrfs/tree-log.c | 16 +++ + fs/btrfs/volumes.c | 69 ++++++---- + 20 files changed, 947 insertions(+), 223 deletions(-) +Merging ceph/master (b726bc557d44 rbd: add force close option) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rbd | 29 +- + drivers/block/rbd.c | 1195 +++++++++++++++++++++++++++---- + drivers/block/rbd_types.h | 11 + + include/linux/ceph/auth.h | 2 +- + include/linux/ceph/ceph_fs.h | 11 + + include/linux/ceph/cls_lock_client.h | 49 ++ + include/linux/ceph/libceph.h | 3 +- + include/linux/ceph/mon_client.h | 3 + + include/linux/ceph/osd_client.h | 23 +- + net/ceph/Makefile | 1 + + net/ceph/auth.c | 7 +- + net/ceph/auth_none.c | 2 +- + net/ceph/ceph_common.c | 13 +- + net/ceph/ceph_strings.c | 1 + + net/ceph/cls_lock_client.c | 325 +++++++++ + net/ceph/mon_client.c | 82 +++ + net/ceph/osd_client.c | 169 +++++ + 17 files changed, 1777 insertions(+), 149 deletions(-) + create mode 100644 include/linux/ceph/cls_lock_client.h + create mode 100644 net/ceph/cls_lock_client.c +Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 29 ++++++++++++----------------- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 31 +++++++++++++++++++++++++++++-- + 3 files changed, 42 insertions(+), 20 deletions(-) +Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. +Merging ext3/for_next (3cd0126dca82 quota: fill in Q_XGETQSTAT inode information for inactive quotas) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/ialloc.c | 5 +++++ + fs/quota/quota.c | 18 ++++++++++++------ + 2 files changed, 17 insertions(+), 6 deletions(-) +Merging ext4/dev (7bc949164511 ext4: verify extent header depth) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (20a3d61d46e1 f2fs: avoid potential deadlock in f2fs_move_file_range) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/data.c | 2 +- + fs/f2fs/f2fs.h | 12 ++++++------ + fs/f2fs/file.c | 13 +++++++++---- + fs/f2fs/node.c | 47 +++++++++++++++++++++++------------------------ + fs/f2fs/super.c | 6 +----- + 5 files changed, 40 insertions(+), 40 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors()) +$ git merge fuse/for-next +Auto-merging fs/f2fs/node.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 1 - + fs/btrfs/inode.c | 15 --------------- + fs/btrfs/tree-log.c | 4 ++-- + fs/f2fs/node.c | 7 ++----- + 4 files changed, 4 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-btrfs-merge-fix-for-mm-export-filemap_check_errors-t.patch +Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/file.c +$ git add -A . +$ git commit -v -a --amend +[master 81a112bbe850] Merge remote-tracking branch 'fuse/for-next' + Date: Wed Aug 24 10:06:59 2016 +1000 +Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 19 +++++++++++++------ + fs/gfs2/bmap.c | 6 +++--- + fs/gfs2/dir.c | 20 ++++++++++---------- + fs/gfs2/glock.c | 2 +- + fs/gfs2/inode.h | 2 +- + fs/gfs2/meta_io.c | 35 +++++++++++++++++++---------------- + fs/gfs2/ops_fstype.c | 8 ++++---- + fs/gfs2/quota.c | 4 ++-- + fs/gfs2/super.c | 2 +- + 9 files changed, 54 insertions(+), 44 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (41963c10c47a pnfs/blocklayout: update last_write_offset atomically with extents) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/blocklayout/blocklayout.h | 3 ++- + fs/nfs/blocklayout/extent_tree.c | 10 ++++++--- + fs/nfs/client.c | 10 ++++----- + fs/nfs/flexfilelayout/flexfilelayout.c | 8 ++++---- + fs/nfs/flexfilelayout/flexfilelayout.h | 2 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 ++-- + fs/nfs/internal.h | 5 ++++- + fs/nfs/nfs42proc.c | 34 ++++++++++++++++++++++++++----- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 19 +++++++++++++++-- + 11 files changed, 73 insertions(+), 26 deletions(-) +Merging nfsd/nfsd-next (e2ce4e03e317 nfsd: eliminate cb_minorversion field) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/flexfilelayout.c | 1 + + fs/nfsd/nfs4callback.c | 7 +++---- + fs/nfsd/nfs4layouts.c | 6 +++++- + fs/nfsd/pnfs.h | 1 + + fs/nfsd/state.h | 1 - + 5 files changed, 10 insertions(+), 6 deletions(-) +Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/downcall.h | 5 +- + fs/orangefs/file.c | 36 ++++++++++- + fs/orangefs/orangefs-cache.c | 4 +- + fs/orangefs/orangefs-dev-proto.h | 2 +- + fs/orangefs/orangefs-sysfs.c | 127 +++++++++++++++++++++++++++++++++++---- + fs/orangefs/orangefs-utils.c | 2 +- + fs/orangefs/upcall.h | 12 +++- + 7 files changed, 167 insertions(+), 21 deletions(-) +Merging overlayfs/overlayfs-next (f200ea288c78 Revert "ovl: get_write_access() in truncate") +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/inode.c | 38 ++++++++++++++++++++++++++++------ + fs/locks.c | 53 +++++++++++++++++++++++++++--------------------- + fs/namespace.c | 2 +- + fs/open.c | 17 +++++++++++++--- + fs/overlayfs/copy_up.c | 2 ++ + fs/overlayfs/inode.c | 23 +-------------------- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 2 +- + include/linux/dcache.h | 5 +++-- + include/linux/fs.h | 16 +++++++++++++-- + include/linux/fsnotify.h | 14 ++++++++----- + include/uapi/linux/fs.h | 1 + + 12 files changed, 109 insertions(+), 65 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/tnc_commit.c | 2 +- + fs/ubifs/xattr.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging xfs/for-next (32438cf9d54b Merge branch 'iomap-fixes-4.8-rc3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns) +$ git merge file-locks/linux-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) +Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting) +$ git merge vfs-miklos/next +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/nfs/internal.h +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/inode.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 8 ++------ + Documentation/filesystems/directory-locking | 2 +- + Documentation/filesystems/porting | 4 ++++ + Documentation/filesystems/vfs.txt | 9 ++------- + drivers/staging/lustre/lustre/llite/namei.c | 8 ++++++-- + fs/9p/v9fs.h | 3 ++- + fs/9p/vfs_inode.c | 6 +++++- + fs/affs/affs.h | 3 ++- + fs/affs/namei.c | 6 +++++- + fs/afs/dir.c | 9 +++++++-- + fs/bad_inode.c | 2 +- + fs/bfs/dir.c | 6 +++++- + fs/btrfs/inode.c | 2 +- + fs/cachefiles/namei.c | 3 +-- + fs/ceph/dir.c | 6 +++++- + fs/cifs/cifsfs.c | 2 +- + fs/coda/dir.c | 6 +++++- + fs/debugfs/inode.c | 2 +- + fs/ecryptfs/inode.c | 6 +++++- + fs/exofs/namei.c | 8 ++++++-- + fs/ext2/namei.c | 6 +++++- + fs/ext4/namei.c | 2 +- + fs/f2fs/namei.c | 2 +- + fs/fat/namei_msdos.c | 6 +++++- + fs/fat/namei_vfat.c | 6 +++++- + fs/fuse/dir.c | 2 +- + fs/gfs2/inode.c | 2 +- + fs/hfs/dir.c | 6 +++++- + fs/hfsplus/dir.c | 6 +++++- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/namei.c | 6 +++++- + fs/jffs2/dir.c | 9 +++++++-- + fs/jfs/namei.c | 5 ++++- + fs/kernfs/dir.c | 6 +++++- + fs/libfs.c | 6 +++++- + fs/logfs/dir.c | 6 +++++- + fs/minix/namei.c | 6 +++++- + fs/namei.c | 15 +++------------ + fs/ncpfs/dir.c | 11 +++++++---- + fs/nfs/dir.c | 6 +++++- + fs/nfs/internal.h | 3 ++- + fs/nilfs2/namei.c | 6 +++++- + fs/ocfs2/namei.c | 6 +++++- + fs/omfs/dir.c | 6 +++++- + fs/orangefs/namei.c | 6 +++++- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/overlayfs.h | 4 ++-- + fs/reiserfs/namei.c | 6 +++++- + fs/sysv/namei.c | 6 +++++- + fs/ubifs/dir.c | 8 ++++++-- + fs/udf/namei.c | 6 +++++- + fs/ufs/namei.c | 6 +++++- + fs/xfs/xfs_iops.c | 4 ++-- + include/linux/fs.h | 5 ++--- + mm/shmem.c | 2 +- + security/tomoyo/realpath.c | 4 ++-- + 56 files changed, 206 insertions(+), 91 deletions(-) +Merging vfs/for-next (3baf32898e1c parisc: use %pD) +$ git merge vfs/for-next +Auto-merging fs/orangefs/namei.c +Auto-merging fs/orangefs/file.c +Merge made by the 'recursive' strategy. + arch/parisc/kernel/cache.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 4 +- + drivers/gpu/drm/msm/msm_perf.c | 4 +- + drivers/gpu/drm/msm/msm_rd.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 6 +-- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 16 ++++---- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +- + drivers/staging/lustre/lustre/llite/file.c | 4 +- + fs/orangefs/dir.c | 4 +- + fs/orangefs/file.c | 4 +- + fs/orangefs/inode.c | 12 +++--- + fs/orangefs/namei.c | 44 +++++++++++----------- + fs/orangefs/orangefs-debugfs.c | 4 +- + 13 files changed, 53 insertions(+), 59 deletions(-) +Merging pci/next (29b4817d4018 Linux 4.8-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (e976e56423dc ramoops: use persistent_ram_free() instead of kfree() for freeing prz) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (dc1de1f4bebd Merge branch 'for-4.8/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-wacom | 5 + + Documentation/hid/intel-ish-hid.txt | 454 +++++++++ + MAINTAINERS | 7 + + drivers/hid/Kconfig | 3 + + drivers/hid/Makefile | 2 + + drivers/hid/hid-core.c | 5 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 1 + + drivers/hid/hid-microsoft.c | 2 + + drivers/hid/hid-saitek.c | 2 + + drivers/hid/hid-sensor-hub.c | 4 + + drivers/hid/hid-sony.c | 6 +- + drivers/hid/intel-ish-hid/Kconfig | 17 + + drivers/hid/intel-ish-hid/Makefile | 22 + + drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h | 220 ++++ + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 71 ++ + drivers/hid/intel-ish-hid/ipc/ipc.c | 882 ++++++++++++++++ + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 333 ++++++ + drivers/hid/intel-ish-hid/ipc/utils.h | 64 ++ + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 978 ++++++++++++++++++ + drivers/hid/intel-ish-hid/ishtp-hid.c | 246 +++++ + drivers/hid/intel-ish-hid/ishtp-hid.h | 182 ++++ + drivers/hid/intel-ish-hid/ishtp/bus.c | 791 ++++++++++++++ + drivers/hid/intel-ish-hid/ishtp/bus.h | 114 +++ + drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 258 +++++ + drivers/hid/intel-ish-hid/ishtp/client.c | 1054 +++++++++++++++++++ + drivers/hid/intel-ish-hid/ishtp/client.h | 182 ++++ + drivers/hid/intel-ish-hid/ishtp/dma-if.c | 175 ++++ + drivers/hid/intel-ish-hid/ishtp/hbm.c | 1032 +++++++++++++++++++ + drivers/hid/intel-ish-hid/ishtp/hbm.h | 321 ++++++ + drivers/hid/intel-ish-hid/ishtp/init.c | 115 +++ + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 277 +++++ + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/wacom.h | 96 +- + drivers/hid/wacom_sys.c | 1187 ++++++++++++++++------ + drivers/hid/wacom_wac.c | 435 +++++--- + drivers/hid/wacom_wac.h | 22 +- + include/trace/events/intel_ish.h | 30 + + include/uapi/linux/input.h | 1 + + 39 files changed, 9082 insertions(+), 517 deletions(-) + create mode 100644 Documentation/hid/intel-ish-hid.txt + create mode 100644 drivers/hid/intel-ish-hid/Kconfig + create mode 100644 drivers/hid/intel-ish-hid/Makefile + create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h + create mode 100644 drivers/hid/intel-ish-hid/ipc/hw-ish.h + create mode 100644 drivers/hid/intel-ish-hid/ipc/ipc.c + create mode 100644 drivers/hid/intel-ish-hid/ipc/pci-ish.c + create mode 100644 drivers/hid/intel-ish-hid/ipc/utils.h + create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid-client.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp-hid.h + create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/bus.h + create mode 100644 drivers/hid/intel-ish-hid/ishtp/client-buffers.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/client.h + create mode 100644 drivers/hid/intel-ish-hid/ishtp/dma-if.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/hbm.h + create mode 100644 drivers/hid/intel-ish-hid/ishtp/init.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h + create mode 100644 include/trace/events/intel_ish.h +Merging i2c/i2c/for-next (00f0ea70d2b8 eeprom: at24: check if the chip is functional in probe()) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-amd756.c | 5 +---- + drivers/i2c/busses/i2c-at91.c | 2 -- + drivers/i2c/busses/i2c-axxia.c | 8 +------- + drivers/i2c/busses/i2c-bcm-iproc.c | 8 +------- + drivers/i2c/busses/i2c-bcm-kona.c | 4 +--- + drivers/i2c/busses/i2c-bfin-twi.c | 4 +--- + drivers/i2c/busses/i2c-brcmstb.c | 4 +--- + drivers/i2c/busses/i2c-cadence.c | 4 +--- + drivers/i2c/busses/i2c-cpm.c | 4 +--- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +--- + drivers/i2c/busses/i2c-davinci.c | 4 +--- + drivers/i2c/busses/i2c-diolan-u2c.c | 4 +--- + drivers/i2c/busses/i2c-dln2.c | 4 +--- + drivers/i2c/busses/i2c-efm32.c | 1 - + drivers/i2c/busses/i2c-exynos5.c | 4 +--- + drivers/i2c/busses/i2c-hix5hd2.c | 4 +--- + drivers/i2c/busses/i2c-i801.c | 1 - + drivers/i2c/busses/i2c-ibm_iic.c | 4 +--- + drivers/i2c/busses/i2c-img-scb.c | 4 +--- + drivers/i2c/busses/i2c-imx.c | 4 +--- + drivers/i2c/busses/i2c-isch.c | 4 +--- + drivers/i2c/busses/i2c-ismt.c | 4 +--- + drivers/i2c/busses/i2c-jz4780.c | 4 +--- + drivers/i2c/busses/i2c-lpc2k.c | 4 +--- + drivers/i2c/busses/i2c-meson.c | 1 - + drivers/i2c/busses/i2c-mpc.c | 4 +--- + drivers/i2c/busses/i2c-mt65xx.c | 4 +--- + drivers/i2c/busses/i2c-mxs.c | 1 - + drivers/i2c/busses/i2c-nforce2.c | 1 - + drivers/i2c/busses/i2c-nomadik.c | 4 +--- + drivers/i2c/busses/i2c-ocores.c | 4 +--- + drivers/i2c/busses/i2c-octeon.c | 4 +--- + drivers/i2c/busses/i2c-omap.c | 4 +--- + drivers/i2c/busses/i2c-piix4.c | 1 - + drivers/i2c/busses/i2c-pmcmsp.c | 4 +--- + drivers/i2c/busses/i2c-pnx.c | 4 +--- + drivers/i2c/busses/i2c-puv3.c | 5 +---- + drivers/i2c/busses/i2c-pxa.c | 4 +--- + drivers/i2c/busses/i2c-rcar.c | 4 +--- + drivers/i2c/busses/i2c-riic.c | 4 +--- + drivers/i2c/busses/i2c-rk3x.c | 4 +--- + drivers/i2c/busses/i2c-s3c2410.c | 1 - + drivers/i2c/busses/i2c-sh7760.c | 4 +--- + drivers/i2c/busses/i2c-sh_mobile.c | 1 - + drivers/i2c/busses/i2c-sirf.c | 4 +--- + drivers/i2c/busses/i2c-st.c | 4 +--- + drivers/i2c/busses/i2c-stu300.c | 5 +---- + drivers/i2c/busses/i2c-tegra.c | 4 +--- + drivers/i2c/busses/i2c-uniphier-f.c | 5 ----- + drivers/i2c/busses/i2c-uniphier.c | 5 ----- + drivers/i2c/busses/i2c-wmt.c | 4 +--- + drivers/i2c/busses/i2c-xgene-slimpro.c | 1 - + drivers/i2c/busses/i2c-xiic.c | 1 - + drivers/i2c/busses/i2c-xlp9xx.c | 4 +--- + drivers/i2c/busses/i2c-xlr.c | 4 +--- + drivers/misc/eeprom/at24.c | 15 +++++++++++++-- + 56 files changed, 55 insertions(+), 161 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 (0deb6b2c087a dmi-id: don't free dev structure after calling device_register) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging hwmon-staging/hwmon-next (0cf56b7b9c31 hwmon: (ucd9000) Add support for UCD90160 Power Supply Sequencer) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc4151.txt | 18 + + Documentation/hwmon/adt7470 | 17 + + Documentation/hwmon/hwmon-kernel-api.txt | 231 ++++++- + Documentation/hwmon/ucd9000 | 12 +- + Documentation/hwmon/xgene-hwmon | 30 + + drivers/hwmon/Kconfig | 7 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adt7411.c | 51 +- + drivers/hwmon/adt7470.c | 74 ++ + drivers/hwmon/ftsteutates.c | 45 ++ + drivers/hwmon/hwmon.c | 616 ++++++++++++++++- + drivers/hwmon/lm95241.c | 119 ++-- + drivers/hwmon/ltc4151.c | 22 +- + drivers/hwmon/nct6775.c | 8 +- + drivers/hwmon/ntc_thermistor.c | 107 +-- + drivers/hwmon/pmbus/Kconfig | 6 +- + drivers/hwmon/pmbus/pmbus.c | 20 +- + drivers/hwmon/pmbus/ucd9000.c | 3 +- + drivers/hwmon/scpi-hwmon.c | 1 - + drivers/hwmon/xgene-hwmon.c | 755 +++++++++++++++++++++ + include/linux/hwmon.h | 342 ++++++++++ + 21 files changed, 2306 insertions(+), 179 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt + create mode 100644 Documentation/hwmon/xgene-hwmon + create mode 100644 drivers/hwmon/xgene-hwmon.c +Merging v4l-dvb/master (b6aa39228966 Merge tag 'v4.8-rc1' into patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/usb/cx231xx/cx231xx-core.c | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) +Merging pm/linux-next (ed8a91cce541 Merge branches 'acpi-sysfs', 'acpi-ec' and 'acpi-soc' into linux-next) +$ git merge pm/linux-next +Removing tools/power/acpi/os_specific/service_layers/oslibcfs.c +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_apd.c | 6 + + drivers/acpi/acpica/acapps.h | 10 +- + drivers/acpi/acpica/acevents.h | 3 + + drivers/acpi/acpica/acglobal.h | 2 + + drivers/acpi/acpica/aclocal.h | 2 + + drivers/acpi/acpica/actables.h | 3 +- + drivers/acpi/acpica/acutils.h | 36 ++-- + drivers/acpi/acpica/dbfileio.c | 20 +- + drivers/acpi/acpica/dbobject.c | 4 +- + drivers/acpi/acpica/dsutils.c | 17 +- + drivers/acpi/acpica/evgpe.c | 57 ++++++ + drivers/acpi/acpica/evxfgpe.c | 43 ++++ + drivers/acpi/acpica/hwgpe.c | 23 ++- + drivers/acpi/acpica/nsaccess.c | 6 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 10 +- + drivers/acpi/acpica/tbutils.c | 3 +- + drivers/acpi/acpica/tbxface.c | 4 +- + drivers/acpi/acpica/tbxfload.c | 4 +- + drivers/acpi/acpica/tbxfroot.c | 5 +- + drivers/acpi/acpica/utbuffer.c | 30 ++- + drivers/acpi/acpica/utdebug.c | 61 +++--- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 - + drivers/acpi/acpica/utprint.c | 105 ++++++++-- + drivers/acpi/acpica/uttrack.c | 4 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 6 +- + drivers/acpi/ec.c | 53 +++++ + drivers/acpi/internal.h | 2 + + drivers/acpi/sleep.c | 2 +- + drivers/acpi/sysfs.c | 33 +++- + drivers/base/power/domain.c | 4 +- + drivers/cpufreq/Kconfig | 5 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/cpuidle/cpuidle-arm.c | 1 + + drivers/pnp/isapnp/core.c | 5 +- + include/acpi/acconfig.h | 4 + + include/acpi/acoutput.h | 6 +- + include/acpi/acpiosxf.h | 43 +--- + include/acpi/acpixf.h | 37 ++-- + include/acpi/actbl.h | 164 +++++++++------- + include/acpi/actypes.h | 48 ++--- + include/acpi/platform/acenv.h | 90 ++++----- + include/acpi/platform/acenvex.h | 21 +- + include/acpi/platform/acgcc.h | 17 +- + include/acpi/platform/acgccex.h | 58 ++++++ + include/acpi/platform/aclinux.h | 22 ++- + include/acpi/platform/aclinuxex.h | 2 +- + include/linux/sched.h | 12 +- + kernel/sched/cpufreq.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 67 ++++--- + kernel/sched/deadline.c | 5 +- + kernel/sched/fair.c | 15 +- + kernel/sched/rt.c | 5 +- + kernel/sched/sched.h | 40 ++-- + tools/power/acpi/common/cmfsize.c | 13 +- + tools/power/acpi/common/getopt.c | 4 +- + .../acpi/os_specific/service_layers/oslibcfs.c | 217 --------------------- + .../acpi/os_specific/service_layers/osunixxf.c | 3 - + tools/power/acpi/tools/acpidump/Makefile | 1 - + tools/power/acpi/tools/acpidump/acpidump.h | 12 +- + tools/power/acpi/tools/acpidump/apdump.c | 71 +++---- + tools/power/acpi/tools/acpidump/apfiles.c | 56 +++--- + tools/power/acpi/tools/acpidump/apmain.c | 33 ++-- + 68 files changed, 868 insertions(+), 784 deletions(-) + create mode 100644 include/acpi/platform/acgccex.h + delete mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (bff9ca53745b Merge branches 'for-rc' and 'release' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qcom-tsens.txt | 21 ++ + .../devicetree/bindings/thermal/thermal.txt | 10 +- + Documentation/thermal/sysfs-api.txt | 19 ++ + drivers/thermal/Kconfig | 18 +- + drivers/thermal/Makefile | 2 + + drivers/thermal/cpu_cooling.c | 21 +- + drivers/thermal/devfreq_cooling.c | 2 +- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/imx_thermal.c | 4 +- + drivers/thermal/int340x_thermal/int3406_thermal.c | 1 - + drivers/thermal/of-thermal.c | 44 +-- + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/tsens-8916.c | 113 +++++++ + drivers/thermal/qcom/tsens-8960.c | 292 ++++++++++++++++++ + drivers/thermal/qcom/tsens-8974.c | 244 +++++++++++++++ + drivers/thermal/qcom/tsens-8996.c | 84 ++++++ + drivers/thermal/qcom/tsens-common.c | 141 +++++++++ + drivers/thermal/qcom/tsens.c | 200 +++++++++++++ + drivers/thermal/qcom/tsens.h | 94 ++++++ + drivers/thermal/qoriq_thermal.c | 328 +++++++++++++++++++++ + drivers/thermal/rcar_thermal.c | 23 +- + drivers/thermal/rockchip_thermal.c | 104 +++++-- + drivers/thermal/thermal_core.c | 85 ++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +- + include/linux/thermal.h | 24 +- + 26 files changed, 1838 insertions(+), 76 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + create mode 100644 drivers/thermal/qcom/Kconfig + create mode 100644 drivers/thermal/qcom/Makefile + create mode 100644 drivers/thermal/qcom/tsens-8916.c + create mode 100644 drivers/thermal/qcom/tsens-8960.c + create mode 100644 drivers/thermal/qcom/tsens-8974.c + create mode 100644 drivers/thermal/qcom/tsens-8996.c + create mode 100644 drivers/thermal/qcom/tsens-common.c + create mode 100644 drivers/thermal/qcom/tsens.c + create mode 100644 drivers/thermal/qcom/tsens.h + create mode 100644 drivers/thermal/qoriq_thermal.c +Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/qcom/tsens-common.c' using previous resolution. +Resolved 'drivers/thermal/qcom/tsens.c' using previous resolution. +Resolved 'drivers/thermal/rockchip_thermal.c' using previous resolution. +Resolved 'drivers/thermal/thermal_core.c' using previous resolution. +Auto-merging include/linux/thermal.h +Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c +Auto-merging drivers/thermal/thermal_core.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/rockchip_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c +Auto-merging drivers/thermal/rcar_thermal.c +Auto-merging drivers/thermal/qcom/tsens.c +CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens.c +Auto-merging drivers/thermal/qcom/tsens-common.c +CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens-common.c +Auto-merging drivers/thermal/of-thermal.c +Auto-merging drivers/thermal/imx_thermal.c +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/acpi/thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 91bd741e5c15] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/thermal.c | 1 - + drivers/platform/x86/acerhdf.c | 1 - + drivers/thermal/Makefile | 3 +- + drivers/thermal/imx_thermal.c | 1 - + drivers/thermal/of-thermal.c | 5 - + drivers/thermal/rcar_thermal.c | 1 + + drivers/thermal/thermal_core.c | 1398 +++++--------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 174 +++ + drivers/thermal/thermal_sysfs.c | 855 ++++++++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 - + include/linux/thermal.h | 4 +- + 12 files changed, 1370 insertions(+), 1104 deletions(-) + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +$ git am -3 ../patches/0001-thermal-fix-up-for-fix-race-condition-when-updating-.patch +Applying: thermal: fix up for "fix race condition when updating cooling device" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_helpers.c +$ git add -A . +$ git commit -v -a --amend +[master 1f168c5d73a0] Merge remote-tracking branch 'thermal-soc/next' + Date: Wed Aug 24 10:50:54 2016 +1000 +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (9b8b266033eb Merge branch 'topic/tegra' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/dmaengine/provider.txt | 11 ++ + drivers/dma/at_hdmac.c | 11 +- + drivers/dma/at_xdmac.c | 12 +- + drivers/dma/coh901318.c | 9 +- + drivers/dma/cppi41.c | 2 +- + drivers/dma/dmaengine.c | 7 ++ + drivers/dma/dmaengine.h | 84 +++++++++++++ + drivers/dma/dw/core.c | 14 +-- + drivers/dma/ep93xx_dma.c | 10 +- + drivers/dma/fsl_raid.c | 11 +- + drivers/dma/fsldma.c | 8 +- + drivers/dma/img-mdc-dma.c | 4 +- + drivers/dma/imx-dma.c | 4 +- + drivers/dma/imx-sdma.c | 9 +- + drivers/dma/ioat/dma.c | 213 +++++++++++++++++++++++++++---- + drivers/dma/ioat/init.c | 2 +- + drivers/dma/ioat/registers.h | 2 + + drivers/dma/iop-adma.c | 3 +- + drivers/dma/ipu/ipu_idmac.c | 18 ++- + drivers/dma/mic_x100_dma.c | 6 +- + drivers/dma/mmp_pdma.c | 14 +-- + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/mpc512x_dma.c | 3 +- + drivers/dma/mv_xor.c | 7 +- + drivers/dma/mxs-dma.c | 3 +- + drivers/dma/nbpfaxi.c | 9 +- + drivers/dma/omap-dma.c | 234 +++++++++++++++++++++++++++++++---- + drivers/dma/pch_dma.c | 7 +- + drivers/dma/pl330.c | 10 +- + drivers/dma/ppc4xx/adma.c | 7 +- + drivers/dma/pxa_dma.c | 11 +- + drivers/dma/qcom/hidma.c | 11 +- + drivers/dma/sh/rcar-dmac.c | 16 ++- + drivers/dma/sh/shdma-base.c | 12 +- + drivers/dma/sh/usb-dmac.c | 19 +-- + drivers/dma/sirf-dma.c | 7 +- + drivers/dma/ste_dma40.c | 10 +- + drivers/dma/tegra20-apb-dma.c | 10 +- + drivers/dma/tegra210-adma.c | 14 +-- + drivers/dma/timb_dma.c | 9 +- + drivers/dma/txx9dmac.c | 9 +- + drivers/dma/virt-dma.c | 17 ++- + drivers/dma/xgene-dma.c | 6 +- + drivers/dma/xilinx/xilinx_dma.c | 10 +- + drivers/ntb/ntb_transport.c | 193 ++++++++++++++++++++++------- + include/linux/dmaengine.h | 16 +++ + 46 files changed, 795 insertions(+), 313 deletions(-) +Merging net-next/master (184b49c89f39 net: ena: change the return type of ena_set_push_mode() to be void.) +$ git merge net-next/master +Resolved 'drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c' using previous resolution. +Auto-merging net/l2tp/l2tp_ppp.c +Auto-merging include/uapi/linux/if_tunnel.h +Auto-merging include/net/tcp.h +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/cavium/thunder/nic_reg.h +Auto-merging drivers/net/ethernet/broadcom/bgmac-bcma.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8ba8ea4d606] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/apm-xgene-enet.txt | 3 + + .../bindings/net/brcm,bcm7445-switch-v4.0.txt | 45 +- + Documentation/devicetree/bindings/net/macb.txt | 1 + + .../devicetree/bindings/net/xilinx_gmii2rgmii.txt | 35 + + Documentation/networking/00-INDEX | 2 + + Documentation/networking/batman-adv.txt | 17 +- + Documentation/networking/ena.txt | 305 ++ + Documentation/networking/ip-sysctl.txt | 45 +- + Documentation/networking/strparser.txt | 136 + + MAINTAINERS | 10 + + arch/arm64/boot/dts/apm/apm-mustang.dts | 1 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- + drivers/atm/fore200e.c | 6 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/chelsio/Kconfig | 19 + + drivers/crypto/chelsio/Makefile | 4 + + drivers/crypto/chelsio/chcr_algo.c | 1525 +++++++++ + drivers/crypto/chelsio/chcr_algo.h | 471 +++ + drivers/crypto/chelsio/chcr_core.c | 240 ++ + drivers/crypto/chelsio/chcr_core.h | 80 + + drivers/crypto/chelsio/chcr_crypto.h | 203 ++ + drivers/infiniband/hw/mlx5/cq.c | 110 +- + drivers/infiniband/hw/mlx5/main.c | 10 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- + drivers/infiniband/hw/mlx5/mr.c | 184 +- + drivers/infiniband/hw/mlx5/qp.c | 189 +- + drivers/net/can/usb/ems_usb.c | 9 +- + drivers/net/can/usb/esd_usb2.c | 3 - + drivers/net/can/usb/gs_usb.c | 9 +- + drivers/net/can/usb/kvaser_usb.c | 7 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +- + drivers/net/can/usb/usb_8dev.c | 5 +- + drivers/net/dsa/b53/b53_common.c | 10 +- + drivers/net/dsa/b53/b53_mdio.c | 2 +- + drivers/net/dsa/b53/b53_mmap.c | 2 +- + drivers/net/dsa/b53/b53_priv.h | 3 +- + drivers/net/dsa/b53/b53_spi.c | 4 +- + drivers/net/dsa/b53/b53_srab.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 220 +- + drivers/net/dsa/mv88e6060.c | 7 +- + drivers/net/dsa/mv88e6xxx/Kconfig | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 630 ++-- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 133 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.c | 8 +- + drivers/net/ethernet/aeroflex/greth.c | 42 +- + drivers/net/ethernet/aeroflex/greth.h | 1 - + drivers/net/ethernet/amazon/Kconfig | 27 + + drivers/net/ethernet/amazon/Makefile | 5 + + drivers/net/ethernet/amazon/ena/Makefile | 7 + + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 973 ++++++ + drivers/net/ethernet/amazon/ena/ena_com.c | 2666 ++++++++++++++++ + drivers/net/ethernet/amazon/ena/ena_com.h | 1038 +++++++ + drivers/net/ethernet/amazon/ena/ena_common_defs.h | 48 + + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 501 +++ + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 160 + + drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h | 416 +++ + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 895 ++++++ + drivers/net/ethernet/amazon/ena/ena_netdev.c | 3272 ++++++++++++++++++++ + drivers/net/ethernet/amazon/ena/ena_netdev.h | 324 ++ + drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h | 67 + + drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 133 + + drivers/net/ethernet/apm/xgene/Kconfig | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 17 +- + drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 10 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 18 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 73 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 53 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 + + drivers/net/ethernet/broadcom/bgmac-bcma.c | 19 +- + drivers/net/ethernet/broadcom/bgmac.c | 28 +- + drivers/net/ethernet/broadcom/bgmac.h | 19 + + drivers/net/ethernet/brocade/bna/bnad.c | 27 +- + drivers/net/ethernet/brocade/bna/bnad.h | 1 - + drivers/net/ethernet/cadence/macb.c | 95 +- + drivers/net/ethernet/cadence/macb.h | 14 +- + drivers/net/ethernet/cavium/Kconfig | 10 + + drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 +- + drivers/net/ethernet/cavium/thunder/Makefile | 1 + + drivers/net/ethernet/cavium/thunder/nic.h | 85 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 433 ++- + drivers/net/ethernet/cavium/thunder/nic_reg.h | 15 + + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 67 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 59 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 5 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 460 ++- + drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 33 +- + drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 235 ++ + drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 117 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 432 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 554 ++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 34 +- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 556 ++++ + drivers/net/ethernet/chelsio/cxgb4/sched.h | 110 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 72 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 437 +++ + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 164 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 24 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 3 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 63 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 4 +- + drivers/net/ethernet/dec/tulip/de4x5.h | 4 +- + drivers/net/ethernet/emulex/benet/be.h | 21 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 202 +- + drivers/net/ethernet/emulex/benet/be_main.c | 422 ++- + drivers/net/ethernet/freescale/fec_main.c | 6 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 100 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 30 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 36 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 12 + + drivers/net/ethernet/ibm/ibmvnic.c | 34 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 + + drivers/net/ethernet/intel/i40e/i40e.h | 138 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 59 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 39 +- + drivers/net/ethernet/intel/i40e/i40e_client.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 258 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 162 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 59 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 58 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 26 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 55 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 5 + + drivers/net/ethernet/intel/igb/e1000_defines.h | 4 + + drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + + drivers/net/ethernet/intel/igb/igb.h | 50 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 345 +++ + drivers/net/ethernet/intel/igb/igb_main.c | 45 + + drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 193 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 11 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 62 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 21 +- + drivers/net/ethernet/marvell/mvneta.c | 60 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 278 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 109 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 50 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 80 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 98 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 178 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 43 +- + drivers/net/ethernet/mellanox/mlx5/core/mad.c | 41 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 91 +- + drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 72 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 189 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 156 +- + drivers/net/ethernet/mellanox/mlx5/core/pd.c | 61 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 149 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 299 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 49 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 183 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 67 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 94 +- + drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 29 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 8 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 47 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 169 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1438 ++++++--- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 137 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 95 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 132 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 255 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 7 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 162 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 157 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 50 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 15 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 95 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 179 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 231 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 7 +- + drivers/net/ethernet/qlogic/qede/qede.h | 39 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 290 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 475 +-- + drivers/net/ethernet/renesas/ravb.h | 1 - + drivers/net/ethernet/renesas/ravb_main.c | 113 +- + drivers/net/ethernet/renesas/sh_eth.c | 43 +- + drivers/net/ethernet/renesas/sh_eth.h | 1 - + drivers/net/ethernet/sfc/ef10.c | 222 +- + drivers/net/ethernet/sfc/efx.c | 96 +- + drivers/net/ethernet/sfc/efx.h | 2 + + drivers/net/ethernet/sfc/falcon.c | 9 +- + drivers/net/ethernet/sfc/mcdi.c | 5 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 530 +++- + drivers/net/ethernet/sfc/net_driver.h | 12 +- + drivers/net/ethernet/sfc/nic.h | 5 + + drivers/net/ethernet/sfc/ptp.c | 2 +- + drivers/net/ethernet/sfc/siena.c | 14 +- + drivers/net/ethernet/sfc/workarounds.h | 4 + + drivers/net/ethernet/ti/cpsw.c | 1305 ++++---- + drivers/net/ethernet/ti/davinci_cpdma.c | 91 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 13 +- + drivers/net/ethernet/ti/davinci_emac.c | 22 +- + drivers/net/fjes/fjes_main.c | 1 - + drivers/net/hyperv/hyperv_net.h | 31 +- + drivers/net/hyperv/netvsc.c | 414 ++- + drivers/net/hyperv/netvsc_drv.c | 223 +- + drivers/net/hyperv/rndis_filter.c | 41 +- + drivers/net/phy/Kconfig | 441 +-- + drivers/net/phy/Makefile | 76 +- + drivers/net/phy/mscc.c | 161 + + drivers/net/phy/xilinx_gmii2rgmii.c | 112 + + drivers/net/ppp/ppp_generic.c | 9 + + drivers/net/ppp/pptp.c | 64 +- + drivers/net/tun.c | 16 +- + drivers/net/usb/hso.c | 20 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/wimax/i2400m/usb-notif.c | 1 - + drivers/net/wireless/ath/ar5523/ar5523.c | 9 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 4 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 12 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 19 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +- + drivers/net/xen-netback/common.h | 4 + + drivers/net/xen-netback/hash.c | 81 +- + drivers/net/xen-netback/xenbus.c | 37 +- + drivers/staging/octeon/ethernet-mdio.c | 63 +- + drivers/staging/octeon/ethernet-rgmii.c | 2 +- + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/octeon/octeon-ethernet.h | 1 - + fs/proc/generic.c | 2 + + fs/proc/proc_net.c | 13 + + fs/proc/proc_sysctl.c | 5 + + include/linux/bcma/bcma.h | 3 + + include/linux/bcma/bcma_regs.h | 1 + + include/linux/cgroup.h | 23 + + include/linux/hyperv.h | 91 +- + include/linux/if_vlan.h | 1 + + include/linux/mlx5/cq.h | 6 +- + include/linux/mlx5/device.h | 429 +-- + include/linux/mlx5/driver.h | 20 +- + include/linux/mlx5/mlx5_ifc.h | 116 +- + include/linux/mlx5/qp.h | 128 +- + include/linux/mlx5/vport.h | 2 + + include/linux/netdevice.h | 4 + + include/linux/qed/common_hsi.h | 355 ++- + include/linux/qed/eth_common.h | 155 +- + include/linux/qed/iscsi_common.h | 28 +- + include/linux/qed/qed_chain.h | 13 - + include/linux/qed/qed_eth_if.h | 3 + + include/linux/qed/qed_if.h | 23 +- + include/linux/qed/tcp_common.h | 16 +- + include/linux/rhashtable.h | 14 +- + include/linux/skbuff.h | 43 +- + include/linux/sysctl.h | 4 + + include/net/dsa.h | 19 +- + include/net/flow_dissector.h | 12 +- + include/net/gre.h | 10 +- + include/net/kcm.h | 37 +- + include/net/netns/ipv4.h | 1 - + include/net/pkt_cls.h | 6 +- + include/net/pkt_sched.h | 4 +- + include/net/pptp.h | 23 + + include/net/sch_generic.h | 2 +- + include/net/sock.h | 10 + + include/net/strparser.h | 142 + + include/net/tc_act/tc_vlan.h | 1 + + include/net/tcp.h | 3 +- + include/trace/events/rxrpc.h | 56 + + include/uapi/linux/batman_adv.h | 94 + + include/uapi/linux/bpf.h | 22 + + include/uapi/linux/if_bridge.h | 2 +- + include/uapi/linux/if_tunnel.h | 15 +- + include/uapi/linux/mii.h | 1 + + include/uapi/linux/pkt_cls.h | 3 + + include/uapi/linux/tc_act/tc_vlan.h | 1 + + include/uapi/linux/tipc_netlink.h | 1 + + kernel/bpf/arraymap.c | 2 +- + kernel/bpf/verifier.c | 65 +- + kernel/trace/bpf_trace.c | 32 + + lib/rhashtable.c | 46 +- + net/Kconfig | 1 + + net/Makefile | 1 + + net/atm/mpc.c | 2 +- + net/batman-adv/Kconfig | 15 +- + net/batman-adv/Makefile | 4 +- + net/batman-adv/bat_algo.c | 70 + + net/batman-adv/bat_algo.h | 3 + + net/batman-adv/bat_iv_ogm.c | 837 ++++- + net/batman-adv/bat_v.c | 734 ++++- + net/batman-adv/bat_v_ogm.c | 5 +- + net/batman-adv/bridge_loop_avoidance.c | 348 ++- + net/batman-adv/bridge_loop_avoidance.h | 17 +- + net/batman-adv/debugfs.c | 18 + + net/batman-adv/debugfs.h | 2 +- + net/batman-adv/distributed-arp-table.c | 4 +- + net/batman-adv/gateway_client.c | 285 +- + net/batman-adv/gateway_client.h | 7 + + net/batman-adv/gateway_common.c | 5 +- + net/batman-adv/hard-interface.c | 84 +- + net/batman-adv/icmp_socket.h | 18 +- + net/batman-adv/main.c | 19 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 4 +- + net/batman-adv/netlink.c | 217 +- + net/batman-adv/netlink.h | 6 + + net/batman-adv/network-coding.c | 11 +- + net/batman-adv/originator.c | 172 +- + net/batman-adv/originator.h | 4 + + net/batman-adv/packet.h | 36 - + net/batman-adv/routing.c | 43 +- + net/batman-adv/send.c | 136 +- + net/batman-adv/send.h | 6 + + net/batman-adv/soft-interface.c | 51 +- + net/batman-adv/sysfs.c | 183 +- + net/batman-adv/translation-table.c | 556 +++- + net/batman-adv/translation-table.h | 7 + + net/batman-adv/tvlv.c | 9 + + net/batman-adv/types.h | 69 +- + net/bridge/br_netlink.c | 115 +- + net/core/dev.c | 3 + + net/core/filter.c | 152 +- + net/core/flow_dissector.c | 164 +- + net/core/neighbour.c | 3 +- + net/core/net_namespace.c | 21 +- + net/core/rtnetlink.c | 2 + + net/dsa/dsa.c | 12 +- + net/dsa/dsa2.c | 4 +- + net/ipv4/af_inet.c | 21 +- + net/ipv4/fib_frontend.c | 7 - + net/ipv4/fib_semantics.c | 3 +- + net/ipv4/igmp.c | 10 + + net/ipv4/ipconfig.c | 71 +- + net/ipv4/tcp.c | 17 - + net/ipv4/tcp_input.c | 47 +- + net/ipv4/tcp_output.c | 3 +- + net/ipv4/udp.c | 1 + + net/ipv6/ila/ila_common.c | 1 - + net/ipv6/ip6_gre.c | 12 +- + net/ipv6/ip6_tunnel.c | 10 +- + net/ipv6/ip6_vti.c | 10 +- + net/ipv6/mcast.c | 10 + + net/ipv6/sit.c | 12 +- + net/irda/af_irda.c | 3 - + net/kcm/Kconfig | 1 + + net/kcm/kcmproc.c | 58 +- + net/kcm/kcmsock.c | 457 +-- + net/l2tp/l2tp_ppp.c | 20 +- + net/mac80211/driver-ops.h | 8 +- + net/mac80211/mesh_hwmp.c | 27 +- + net/mac80211/sta_info.c | 25 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/tx.c | 28 +- + net/netlink/diag.c | 103 +- + net/rds/ib.h | 1 + + net/rds/rds.h | 1 + + net/rxrpc/af_rxrpc.c | 1 + + net/rxrpc/ar-internal.h | 93 +- + net/rxrpc/call_accept.c | 1 + + net/rxrpc/call_event.c | 27 +- + net/rxrpc/call_object.c | 26 +- + net/rxrpc/conn_client.c | 2 - + net/rxrpc/conn_event.c | 115 + + net/rxrpc/conn_object.c | 57 +- + net/rxrpc/input.c | 68 +- + net/rxrpc/local_event.c | 1 + + net/rxrpc/output.c | 5 +- + net/rxrpc/proc.c | 8 +- + net/rxrpc/recvmsg.c | 1 + + net/rxrpc/rxkad.c | 4 +- + net/rxrpc/skbuff.c | 72 +- + net/sched/act_vlan.c | 13 +- + net/sched/cls_basic.c | 12 +- + net/sched/cls_bpf.c | 27 +- + net/sched/cls_cgroup.c | 13 +- + net/sched/cls_flow.c | 26 +- + net/sched/cls_flower.c | 109 +- + net/sched/cls_fw.c | 18 +- + net/sched/cls_route.c | 14 +- + net/sched/cls_rsvp.h | 17 +- + net/sched/cls_tcindex.c | 90 +- + net/sched/cls_u32.c | 21 +- + net/sched/sch_api.c | 45 +- + net/sched/sch_generic.c | 8 +- + net/sched/sch_hfsc.c | 51 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 2 +- + net/strparser/Kconfig | 4 + + net/strparser/Makefile | 1 + + net/strparser/strparser.c | 500 +++ + net/switchdev/switchdev.c | 2 +- + net/sysctl_net.c | 29 +- + net/tipc/bearer.c | 78 +- + net/tipc/bearer.h | 1 + + net/tipc/link.c | 18 +- + net/tipc/net.h | 2 + + net/tipc/netlink.c | 5 + + net/tipc/node.c | 63 + + net/tipc/node.h | 1 + + net/tipc/udp_media.c | 2 +- + net/wireless/core.c | 6 + + net/wireless/nl80211.c | 94 +- + net/wireless/nl80211.h | 3 + + net/wireless/util.c | 2 +- + samples/bpf/Makefile | 6 + + samples/bpf/bpf_helpers.h | 14 +- + samples/bpf/tcbpf2_kern.c | 191 ++ + samples/bpf/test_current_task_under_cgroup_kern.c | 43 + + samples/bpf/test_current_task_under_cgroup_user.c | 145 + + samples/bpf/test_tunnel_bpf.sh | 127 + + samples/bpf/test_verifier.c | 114 +- + 433 files changed, 34054 insertions(+), 8981 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/xilinx_gmii2rgmii.txt + create mode 100644 Documentation/networking/ena.txt + create mode 100644 Documentation/networking/strparser.txt + create mode 100644 drivers/crypto/chelsio/Kconfig + create mode 100644 drivers/crypto/chelsio/Makefile + create mode 100644 drivers/crypto/chelsio/chcr_algo.c + create mode 100644 drivers/crypto/chelsio/chcr_algo.h + create mode 100644 drivers/crypto/chelsio/chcr_core.c + create mode 100644 drivers/crypto/chelsio/chcr_core.h + create mode 100644 drivers/crypto/chelsio/chcr_crypto.h + create mode 100644 drivers/net/ethernet/amazon/Kconfig + create mode 100644 drivers/net/ethernet/amazon/Makefile + create mode 100644 drivers/net/ethernet/amazon/ena/Makefile + create mode 100644 drivers/net/ethernet/amazon/ena/ena_admin_defs.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.c + create mode 100644 drivers/net/ethernet/amazon/ena/ena_com.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_common_defs.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.c + create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_com.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_ethtool.c + create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.c + create mode 100644 drivers/net/ethernet/amazon/ena/ena_netdev.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h + create mode 100644 drivers/net/ethernet/amazon/ena/ena_regs_defs.h + create mode 100644 drivers/net/ethernet/cavium/thunder/thunder_xcv.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/sched.h + create mode 100644 drivers/net/phy/mscc.c + create mode 100644 drivers/net/phy/xilinx_gmii2rgmii.c + create mode 100644 include/net/pptp.h + create mode 100644 include/net/strparser.h + create mode 100644 include/trace/events/rxrpc.h + create mode 100644 net/strparser/Kconfig + create mode 100644 net/strparser/Makefile + create mode 100644 net/strparser/strparser.c + create mode 100644 samples/bpf/tcbpf2_kern.c + create mode 100644 samples/bpf/test_current_task_under_cgroup_kern.c + create mode 100644 samples/bpf/test_current_task_under_cgroup_user.c + create mode 100755 samples/bpf/test_tunnel_bpf.sh +Merging ipsec-next/master (9d0380df6217 xfrm: policy: convert policy_lock to spinlock) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 10 ++-- + include/net/xfrm.h | 2 +- + net/xfrm/xfrm_policy.c | 145 ++++++++++++++++++++++++++++------------------- + net/xfrm/xfrm_replay.c | 6 +- + net/xfrm/xfrm_state.c | 103 ++++++++++++++++++++++----------- + 5 files changed, 164 insertions(+), 102 deletions(-) +Merging netfilter-next/master (b43f95695124 netfilter: nf_tables: typo in trace attribute definition) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nf_conntrack_standalone.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Removing net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +Auto-merging include/uapi/linux/netfilter/nf_tables.h +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_conntrack.h | 20 + + include/net/netfilter/nf_conntrack_core.h | 3 - + include/net/netfilter/nf_conntrack_l4proto.h | 8 - + include/net/netns/conntrack.h | 8 - + include/uapi/linux/netfilter/nf_tables.h | 65 ++- + net/ipv4/netfilter/Kconfig | 11 - + net/ipv4/netfilter/Makefile | 5 - + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 70 --- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 492 --------------------- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 39 +- + net/ipv4/netfilter/nf_dup_ipv4.c | 10 +- + net/netfilter/Kconfig | 22 +- + net/netfilter/Makefile | 7 +- + net/netfilter/ipvs/ip_vs_nfct.c | 7 +- + net/netfilter/nf_conntrack_core.c | 47 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 5 +- + net/netfilter/nf_conntrack_proto.c | 81 +--- + net/netfilter/nf_conntrack_proto_dccp.c | 3 +- + net/netfilter/nf_conntrack_proto_generic.c | 39 +- + net/netfilter/nf_conntrack_proto_sctp.c | 89 +--- + net/netfilter/nf_conntrack_proto_tcp.c | 131 +----- + net/netfilter/nf_conntrack_proto_udp.c | 53 +-- + net/netfilter/nf_conntrack_proto_udplite.c | 3 +- + net/netfilter/nf_conntrack_standalone.c | 3 +- + net/netfilter/nft_hash.c | 417 ++++------------- + net/netfilter/nft_numgen.c | 192 ++++++++ + net/netfilter/nft_quota.c | 121 +++++ + net/netfilter/nft_set_hash.c | 395 +++++++++++++++++ + net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} | 0 + net/netfilter/xt_conntrack.c | 4 +- + net/netfilter/xt_physdev.c | 4 +- + 32 files changed, 935 insertions(+), 1421 deletions(-) + delete mode 100644 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c + create mode 100644 net/netfilter/nft_numgen.c + create mode 100644 net/netfilter/nft_quota.c + create mode 100644 net/netfilter/nft_set_hash.c + rename net/netfilter/{nft_rbtree.c => nft_set_rbtree.c} (100%) +Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-drivers-next/master (60747ef4d173 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (0f3cce5ec5b6 Bluetooth: btusb: Add support for 0cf3:e009) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 12 +++ + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btqcomsmd.c | 182 +++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btusb.c | 6 +- + drivers/bluetooth/hci_intel.c | 6 +- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 6 +- + net/6lowpan/ndisc.c | 2 - + net/bluetooth/af_bluetooth.c | 5 ++ + net/bluetooth/leds.c | 27 ++++++ + net/bluetooth/leds.h | 10 +++ + net/mac802154/iface.c | 1 + + net/mac802154/rx.c | 9 +- + 13 files changed, 256 insertions(+), 12 deletions(-) + create mode 100644 drivers/bluetooth/btqcomsmd.c +Merging mac80211-next/master (2d75da13fbb9 nl80211: Allow GET_INTERFACE dumps to be filtered) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + net/wireless/nl80211.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) +Merging rdma/for-next (29b4817d4018 Linux 4.8-rc1) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (29b4817d4018 Linux 4.8-rc1) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (4dd75e30effb Merge branch 'topic/merge-branch' into testing/rdma-next) +$ git merge rdma-leon-test/testing/rdma-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/multicast.c | 13 +- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 328 +++++++---- + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/core/verbs.c | 18 +- + drivers/infiniband/hw/mlx4/cq.c | 34 +- + drivers/infiniband/hw/mlx4/main.c | 25 + + drivers/infiniband/hw/mlx5/Kconfig | 6 + + drivers/infiniband/hw/mlx5/cq.c | 17 +- + drivers/infiniband/hw/mlx5/main.c | 268 +++++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 10 +- + drivers/infiniband/hw/mlx5/qp.c | 82 ++- + drivers/infiniband/hw/mlx5/srq.c | 15 +- + drivers/infiniband/hw/mlx5/user.h | 20 + + drivers/infiniband/ulp/ipoib/ipoib.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 16 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 34 -- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 56 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 100 +++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 + + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 602 +++++++++++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 54 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 27 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 150 ++++- + include/linux/mlx5/device.h | 12 + + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/fs.h | 6 + + include/linux/mlx5/mlx5_ifc.h | 181 ++++++- + include/linux/mlx5/port.h | 40 +- + include/linux/mlx5/srq.h | 5 + + include/rdma/ib_verbs.h | 98 +++- + include/uapi/rdma/Kbuild | 1 + + include/uapi/rdma/hfi/Kbuild | 1 + + include/uapi/rdma/hfi/hfi1_ioctl.h | 173 ++++++ + include/uapi/rdma/hfi/hfi1_user.h | 175 +----- + include/uapi/rdma/ib_user_mad.h | 14 +- + include/uapi/rdma/ib_user_verbs.h | 73 ++- + include/uapi/rdma/rdma_user_ioctl.h | 127 +++++ + 45 files changed, 2362 insertions(+), 515 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag.c + create mode 100644 include/uapi/rdma/hfi/hfi1_ioctl.h + create mode 100644 include/uapi/rdma/rdma_user_ioctl.h +Merging mtd/master (11e8a7f9aa94 Merge tag 'for-linus-20160801' into HEAD) +$ git merge mtd/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (e5c88bb4ce0a mtd: nand_bbt: scan for next free bbt block if writing bbt fails) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/Kconfig | 4 +- + drivers/mtd/nand/bf5xx_nand.c | 3 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 3 +- + drivers/mtd/nand/docg4.c | 3 +- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 +- + drivers/mtd/nand/jz4780_nand.c | 3 +- + drivers/mtd/nand/nand_base.c | 30 +++--- + drivers/mtd/nand/nand_bbt.c | 161 ++++++++++++++++++++++++--------- + drivers/mtd/nand/nand_timings.c | 14 +-- + drivers/mtd/nand/ndfc.c | 3 +- + drivers/mtd/nand/pxa3xx_nand.c | 3 +- + drivers/mtd/nand/qcom_nandc.c | 3 +- + drivers/mtd/nand/s3c2410.c | 7 +- + drivers/mtd/nand/sh_flctl.c | 8 +- + drivers/mtd/nand/sunxi_nand.c | 3 +- + drivers/mtd/nand/txx9ndfmc.c | 3 +- + include/linux/mtd/nand.h | 7 ++ + 19 files changed, 174 insertions(+), 93 deletions(-) +Merging crypto/master (d89a67134fcc crypto: drbg - do not call drbg_instantiate in healt test) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + crypto/drbg.c | 15 +- + crypto/testmgr.c | 10 +- + crypto/xts.c | 2 +- + drivers/char/hw_random/pic32-rng.c | 1 - + drivers/crypto/caam/caamhash.c | 540 ++++++++------- + drivers/crypto/caam/ctrl.c | 2 + + drivers/crypto/caam/intern.h | 1 - + drivers/crypto/caam/jr.c | 25 +- + drivers/crypto/ccp/Makefile | 1 + + drivers/crypto/ccp/ccp-crypto-sha.c | 18 +- + drivers/crypto/ccp/ccp-dev-v3.c | 177 ++--- + drivers/crypto/ccp/ccp-dev-v5.c | 1011 +++++++++++++++++++++++++++++ + drivers/crypto/ccp/ccp-dev.c | 60 +- + drivers/crypto/ccp/ccp-dev.h | 310 +++++++-- + drivers/crypto/ccp/ccp-ops.c | 576 ++++++++-------- + drivers/crypto/ccp/ccp-pci.c | 23 +- + drivers/crypto/img-hash.c | 108 ++- + drivers/crypto/ixp4xx_crypto.c | 9 +- + drivers/crypto/marvell/cesa.c | 1 + + drivers/crypto/marvell/hash.c | 44 +- + drivers/crypto/marvell/tdma.c | 1 + + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 6 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 68 +- + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 164 +++-- + drivers/crypto/sunxi-ss/sun4i-ss.h | 2 +- + include/linux/ccp.h | 3 - + 26 files changed, 2330 insertions(+), 848 deletions(-) + create mode 100644 drivers/crypto/ccp/ccp-dev-v5.c +Merging drm/drm-next (0d42204f3743 drm/doc: Document uapi requirements in DRM) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution. +Auto-merging include/linux/fence.h +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_csr.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Removing drivers/gpu/drm/i915/i915_gem_debug.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_crtc_helper_internal.h +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/vgaarbiter.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1ba285d120df] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 4 + + Documentation/gpu/drm-internals.rst | 9 +- + Documentation/gpu/drm-kms-helpers.rst | 211 +- + Documentation/gpu/drm-kms.rst | 270 +- + Documentation/gpu/drm-mm.rst | 58 +- + Documentation/gpu/drm-uapi.rst | 70 + + Documentation/gpu/i915.rst | 3 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/vga-switcheroo.rst | 2 - + .../{vgaarbiter.txt => gpu/vgaarbiter.rst} | 161 +- + Documentation/sync_file.txt | 14 + + MAINTAINERS | 8 + + drivers/dma-buf/dma-buf.c | 23 + + drivers/dma-buf/fence-array.c | 7 +- + drivers/dma-buf/reservation.c | 2 +- + drivers/dma-buf/sync_file.c | 204 +- + drivers/gpu/drm/Kconfig | 8 - + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 1 - + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 1 - + .../amd/powerplay/hwmgr/tonga_processpptables.c | 1 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 2 - + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 20 +- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 1 - + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 26 +- + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 3 +- + drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c | 1 - + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 - + drivers/gpu/drm/drm_agpsupport.c | 6 +- + drivers/gpu/drm/drm_atomic.c | 5 +- + drivers/gpu/drm/drm_atomic_helper.c | 22 +- + drivers/gpu/drm/drm_auth.c | 2 +- + drivers/gpu/drm/drm_blend.c | 8 +- + drivers/gpu/drm/drm_bufs.c | 22 +- + drivers/gpu/drm/drm_connector.c | 1123 ++++++++ + drivers/gpu/drm/drm_context.c | 24 +- + drivers/gpu/drm/drm_crtc.c | 2420 ++--------------- + drivers/gpu/drm/drm_crtc_helper.c | 56 - + .../gpu/drm/drm_crtc_helper_internal.h | 36 +- + drivers/gpu/drm/drm_crtc_internal.h | 70 +- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 19 +- + drivers/gpu/drm/drm_dp_helper.c | 17 +- + drivers/gpu/drm/drm_drv.c | 44 +- + drivers/gpu/drm/drm_edid.c | 25 +- + drivers/gpu/drm/drm_fb_helper.c | 75 +- + drivers/gpu/drm/drm_fops.c | 6 +- + drivers/gpu/drm/drm_fourcc.c | 19 +- + drivers/gpu/drm/drm_framebuffer.c | 831 ++++++ + drivers/gpu/drm/drm_ioc32.c | 1 + + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_irq.c | 29 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_lock.c | 4 +- + drivers/gpu/drm/drm_mm.c | 142 +- + drivers/gpu/drm/drm_modes.c | 30 +- + drivers/gpu/drm/drm_modeset_helper.c | 153 ++ + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_plane_helper.c | 207 +- + drivers/gpu/drm/drm_rect.c | 30 +- + drivers/gpu/drm/drm_scatter.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 29 +- + drivers/gpu/drm/drm_vma_manager.c | 43 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 15 - + drivers/gpu/drm/gma500/accel_2d.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 8 - + drivers/gpu/drm/gma500/framebuffer.c | 1 - + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 - + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 - + drivers/gpu/drm/gma500/psb_intel_modes.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/i810/i810_drv.c | 4 +- + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 74 +- + drivers/gpu/drm/i915/i915_debugfs.c | 210 +- + drivers/gpu/drm/i915/i915_drv.c | 87 +- + drivers/gpu/drm/i915/i915_drv.h | 517 ++-- + drivers/gpu/drm/i915/i915_gem.c | 2786 +++++++------------- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 34 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 183 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 70 - + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 71 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 187 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 476 ++-- + drivers/gpu/drm/i915/i915_gem_fence.c | 52 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 586 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 183 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 120 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 18 - + drivers/gpu/drm/i915/i915_gem_request.c | 767 ++++++ + drivers/gpu/drm/i915/i915_gem_request.h | 676 +++++ + drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 20 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 52 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 57 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 459 ++-- + drivers/gpu/drm/i915/i915_guc_submission.c | 31 +- + drivers/gpu/drm/i915/i915_irq.c | 57 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 19 +- + drivers/gpu/drm/i915/i915_sysfs.c | 78 +- + drivers/gpu/drm/i915/i915_trace.h | 35 +- + drivers/gpu/drm/i915/i915_vgpu.c | 45 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 26 +- + drivers/gpu/drm/i915/intel_audio.c | 6 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 31 +- + drivers/gpu/drm/i915/intel_csr.c | 7 - + drivers/gpu/drm/i915/intel_ddi.c | 170 +- + drivers/gpu/drm/i915/intel_display.c | 456 ++-- + drivers/gpu/drm/i915/intel_dp.c | 231 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 49 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 231 ++ + drivers/gpu/drm/i915/intel_fbc.c | 23 +- + drivers/gpu/drm/i915/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 128 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 91 + + drivers/gpu/drm/i915/intel_guc.h | 1 - + drivers/gpu/drm/i915/intel_guc_fwif.h | 5 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 10 +- + drivers/gpu/drm/i915/intel_hotplug.c | 1 - + drivers/gpu/drm/i915/intel_lrc.c | 837 ++---- + drivers/gpu/drm/i915/intel_lrc.h | 52 +- + drivers/gpu/drm/i915/intel_lvds.c | 11 - + drivers/gpu/drm/i915/intel_mocs.c | 61 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_modes.c | 1 - + drivers/gpu/drm/i915/intel_overlay.c | 174 +- + drivers/gpu/drm/i915/intel_pm.c | 408 ++- + drivers/gpu/drm/i915/intel_psr.c | 26 +- + drivers/gpu/drm/i915/intel_renderstate.h | 16 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1149 ++++---- + drivers/gpu/drm/i915/intel_ringbuffer.h | 228 +- + drivers/gpu/drm/i915/intel_sprite.c | 113 +- + drivers/gpu/drm/i915/intel_uncore.c | 14 +- + drivers/gpu/drm/imx/imx-drm-core.c | 25 - + drivers/gpu/drm/imx/imx-drm.h | 6 - + drivers/gpu/drm/imx/imx-ldb.c | 151 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +- + drivers/gpu/drm/imx/parallel-display.c | 10 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 49 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 151 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 18 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 17 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 120 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 15 +- + drivers/gpu/drm/mga/mga_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 - + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 - + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 - + drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 14 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 14 +- + drivers/gpu/drm/qxl/qxl_fb.c | 5 +- + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 12 +- + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_fb.c | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 90 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 - + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/savage/savage_state.c | 12 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 1 + + drivers/gpu/drm/tegra/dc.c | 17 - + drivers/gpu/drm/tilcdc/Makefile | 1 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 375 +-- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 207 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 12 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 13 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 132 + + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +- + drivers/gpu/drm/udl/udl_connector.c | 3 - + drivers/gpu/drm/udl/udl_fb.c | 4 + + drivers/gpu/drm/udl/udl_main.c | 25 + + drivers/gpu/drm/udl/udl_modeset.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.c | 3 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 - + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 13 +- + drivers/gpu/drm/vmwgfx/Kconfig | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 11 - + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 7 - + drivers/gpu/ipu-v3/ipu-common.c | 12 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 13 + + drivers/gpu/ipu-v3/ipu-csi.c | 26 +- + drivers/gpu/ipu-v3/ipu-ic.c | 40 +- + drivers/gpu/ipu-v3/ipu-prv.h | 1 + + drivers/gpu/vga/vgaarb.c | 110 +- + drivers/staging/android/sync_debug.c | 12 +- + include/drm/drmP.h | 137 +- + include/drm/drm_atomic_helper.h | 2 + + include/drm/drm_connector.h | 747 ++++++ + include/drm/drm_crtc.h | 822 +----- + include/drm/drm_crtc_helper.h | 6 +- + include/drm/drm_fb_helper.h | 28 +- + include/drm/drm_fourcc.h | 2 +- + include/drm/drm_framebuffer.h | 250 ++ + include/drm/drm_gem.h | 4 +- + include/drm/drm_mm.h | 12 + + include/drm/drm_modes.h | 23 +- + include/drm/drm_modeset.h | 70 + + include/drm/drm_modeset_helper.h | 36 + + include/drm/drm_modeset_helper_vtables.h | 33 +- + include/drm/drm_plane_helper.h | 9 +- + include/drm/drm_vma_manager.h | 2 - + include/linux/fence-array.h | 10 + + include/linux/fence.h | 2 +- + include/linux/sync_file.h | 20 +- + include/linux/vgaarb.h | 128 +- + include/uapi/drm/i915_drm.h | 42 +- + include/video/imx-ipu-v3.h | 18 + + 246 files changed, 12460 insertions(+), 11172 deletions(-) + rename Documentation/{vgaarbiter.txt => gpu/vgaarbiter.rst} (65%) + create mode 100644 drivers/gpu/drm/drm_connector.c + rename include/drm/drm_dp_aux_dev.h => drivers/gpu/drm/drm_crtc_helper_internal.h (63%) + create mode 100644 drivers/gpu/drm/drm_framebuffer.c + create mode 100644 drivers/gpu/drm/drm_modeset_helper.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_request.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_request.h + create mode 100644 drivers/gpu/drm/i915/intel_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.h + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_plane.c + create mode 100644 include/drm/drm_connector.h + create mode 100644 include/drm/drm_framebuffer.h + create mode 100644 include/drm/drm_modeset.h + create mode 100644 include/drm/drm_modeset_helper.h +Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (ac96b5566926 io-mapping.h: s/PAGE_KERNEL_IO/PAGE_KERNEL/) +$ git merge drm-intel/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c' +Recorded preimage for 'drivers/gpu/drm/i915/intel_drv.h' +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'. +Recorded resolution for 'drivers/gpu/drm/i915/intel_drv.h'. +[master 45524a6d12ec] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/early-quirks.c | 9 +- + drivers/char/agp/intel-gtt.c | 2 + + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 309 +++--- + drivers/gpu/drm/i915/i915_debugfs.c | 1147 ++++++++++------------ + drivers/gpu/drm/i915/i915_drv.c | 160 ++-- + drivers/gpu/drm/i915/i915_drv.h | 519 +++++----- + drivers/gpu/drm/i915/i915_gem.c | 904 +++++++++--------- + drivers/gpu/drm/i915/i915_gem_context.c | 74 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 7 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 444 +++++---- + drivers/gpu/drm/i915/i915_gem_fence.c | 483 ++++------ + drivers/gpu/drm/i915/i915_gem_gtt.c | 295 +++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 71 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 40 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- + drivers/gpu/drm/i915/i915_gem_request.c | 76 +- + drivers/gpu/drm/i915/i915_gem_request.h | 74 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 43 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 72 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 17 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 447 +++++---- + drivers/gpu/drm/i915/i915_guc_submission.c | 243 ++--- + drivers/gpu/drm/i915/i915_irq.c | 30 +- + drivers/gpu/drm/i915/i915_memcpy.c | 101 ++ + drivers/gpu/drm/i915/i915_mm.c | 84 ++ + drivers/gpu/drm/i915/i915_params.c | 6 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_reg.h | 152 ++- + drivers/gpu/drm/i915/i915_suspend.c | 47 +- + drivers/gpu/drm/i915/i915_sysfs.c | 163 ++-- + drivers/gpu/drm/i915/intel_audio.c | 46 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 91 +- + drivers/gpu/drm/i915/intel_color.c | 24 +- + drivers/gpu/drm/i915/intel_crt.c | 33 +- + drivers/gpu/drm/i915/intel_ddi.c | 42 +- + drivers/gpu/drm/i915/intel_display.c | 1327 +++++++++++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 259 ++--- + drivers/gpu/drm/i915/intel_dp_mst.c | 92 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +- + drivers/gpu/drm/i915/intel_drv.h | 90 +- + drivers/gpu/drm/i915/intel_dsi.c | 40 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 120 ++- + drivers/gpu/drm/i915/intel_fbc.c | 70 +- + drivers/gpu/drm/i915/intel_fbdev.c | 24 +- + drivers/gpu/drm/i915/intel_guc.h | 18 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 61 +- + drivers/gpu/drm/i915/intel_hdmi.c | 75 +- + drivers/gpu/drm/i915/intel_hotplug.c | 3 +- + drivers/gpu/drm/i915/intel_i2c.c | 134 ++- + drivers/gpu/drm/i915/intel_lrc.c | 149 ++- + drivers/gpu/drm/i915/intel_lvds.c | 203 ++-- + drivers/gpu/drm/i915/intel_overlay.c | 71 +- + drivers/gpu/drm/i915/intel_pm.c | 55 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 481 ++++------ + drivers/gpu/drm/i915/intel_ringbuffer.h | 81 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 65 +- + drivers/gpu/drm/i915/intel_sdvo.c | 56 +- + drivers/gpu/drm/i915/intel_sprite.c | 118 +-- + drivers/gpu/drm/i915/intel_tv.c | 15 +- + include/drm/i915_drm.h | 2 +- + include/linux/io-mapping.h | 92 +- + include/uapi/drm/i915_drm.h | 16 +- + 66 files changed, 5565 insertions(+), 4457 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_memcpy.c + create mode 100644 drivers/gpu/drm/i915/i915_mm.c +Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (28579f37467c drm/fb-helper: Make docs for fb_set_suspend wrappers consistent) +$ git merge drm-misc/topic/drm-misc +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (d5a7764dc3e7 Merge branches 'sunxi/clk-for-4.9', 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/fixes-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/axp209.dtsi | 6 + + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 10 + + arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 138 +------------ + arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 100 +++++++++ + .../boot/dts/sun6i-reference-design-tablet.dtsi | 193 ++++++++++++++++++ + arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 192 +---------------- + arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 18 ++ + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 226 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 10 + + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 178 ++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 88 ++++++++ + .../boot/dts/sun8i-reference-design-tablet.dtsi | 28 +++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 29 +++ + arch/arm/boot/dts/sun9i-a80-optimus.dts | 29 +++ + arch/arm/boot/dts/sun9i-a80.dtsi | 11 +- + arch/arm/mach-sunxi/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_div.h | 2 +- + drivers/clk/sunxi-ng/ccu_mp.h | 2 +- + drivers/clk/sunxi-ng/ccu_mux.c | 2 +- + drivers/clk/sunxi-ng/ccu_mux.h | 8 +- + drivers/clk/sunxi-ng/ccu_nk.c | 6 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 40 +++- + drivers/clk/sunxi-ng/ccu_nkm.h | 23 +++ + drivers/clk/sunxi/clk-a10-pll2.c | 4 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 64 ++++-- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 52 ++++- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 4 + + 32 files changed, 1095 insertions(+), 383 deletions(-) + create mode 100644 arch/arm/boot/dts/sun6i-a31s-inet-q972.dts + create mode 100644 arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-a33-olinuxino.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts +Merging kbuild/for-next (e007c53397ac ia64: move exports to definitions) +$ git merge kbuild/for-next +Removing arch/x86/um/ksyms.c +Auto-merging arch/x86/lib/hweight.S +Removing arch/x86/kernel/x8664_ksyms_64.c +Removing arch/x86/kernel/i386_ksyms_32.c +Auto-merging arch/x86/entry/entry_64.S +Removing arch/sparc/lib/ksyms.c +Removing arch/sparc/kernel/sparc_ksyms_64.c +Removing arch/sparc/kernel/sparc_ksyms_32.c +Removing arch/s390/kernel/s390_ksyms.c +Removing arch/powerpc/lib/ppc_ksyms.c +Auto-merging arch/powerpc/lib/checksum_32.S +Auto-merging arch/powerpc/kernel/setup_32.c +Removing arch/powerpc/kernel/ppc_ksyms_32.c +Removing arch/powerpc/kernel/ppc_ksyms.c +Auto-merging arch/powerpc/kernel/pci-common.c +Removing arch/m68k/kernel/m68k_ksyms.c +Removing arch/arm/mach-imx/ssi-fiq-ksym.c +Auto-merging arch/arm/mach-imx/Makefile +Auto-merging arch/arm/lib/delay.c +Removing arch/arm/kernel/armksyms.c +Removing arch/alpha/kernel/alpha_ksyms.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/alpha_ksyms.c | 102 ------------------- + arch/alpha/kernel/machvec_impl.h | 6 +- + arch/alpha/kernel/setup.c | 1 + + arch/alpha/lib/callback_srm.S | 5 + + arch/alpha/lib/checksum.c | 3 + + arch/alpha/lib/clear_page.S | 3 +- + arch/alpha/lib/clear_user.S | 2 + + arch/alpha/lib/copy_page.S | 3 +- + arch/alpha/lib/copy_user.S | 3 + + arch/alpha/lib/csum_ipv6_magic.S | 2 + + arch/alpha/lib/csum_partial_copy.c | 2 + + arch/alpha/lib/dec_and_lock.c | 2 + + arch/alpha/lib/divide.S | 3 + + arch/alpha/lib/ev6-clear_page.S | 3 +- + arch/alpha/lib/ev6-clear_user.S | 3 +- + arch/alpha/lib/ev6-copy_page.S | 3 +- + arch/alpha/lib/ev6-copy_user.S | 3 +- + arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 + + arch/alpha/lib/ev6-divide.S | 3 + + arch/alpha/lib/ev6-memchr.S | 3 +- + arch/alpha/lib/ev6-memcpy.S | 3 +- + arch/alpha/lib/ev6-memset.S | 7 +- + arch/alpha/lib/ev67-strcat.S | 3 +- + arch/alpha/lib/ev67-strchr.S | 3 +- + arch/alpha/lib/ev67-strlen.S | 3 +- + arch/alpha/lib/ev67-strncat.S | 3 +- + arch/alpha/lib/ev67-strrchr.S | 3 +- + arch/alpha/lib/fpreg.c | 7 ++ + arch/alpha/lib/memchr.S | 3 +- + arch/alpha/lib/memcpy.c | 5 +- + arch/alpha/lib/memmove.S | 3 +- + arch/alpha/lib/memset.S | 7 +- + arch/alpha/lib/strcat.S | 2 + + arch/alpha/lib/strchr.S | 3 +- + arch/alpha/lib/strcpy.S | 3 +- + arch/alpha/lib/strlen.S | 3 +- + arch/alpha/lib/strncat.S | 3 +- + arch/alpha/lib/strncpy.S | 3 +- + arch/alpha/lib/strrchr.S | 3 +- + arch/arm/include/asm/Kbuild | 1 + + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/armksyms.c | 183 ---------------------------------- + arch/arm/kernel/entry-ftrace.S | 3 + + arch/arm/kernel/head.S | 3 + + arch/arm/kernel/smccc-call.S | 3 + + arch/arm/lib/ashldi3.S | 3 + + arch/arm/lib/ashrdi3.S | 3 + + arch/arm/lib/bitops.h | 5 + + arch/arm/lib/bswapsdi2.S | 3 + + arch/arm/lib/clear_user.S | 4 + + arch/arm/lib/copy_from_user.S | 2 + + arch/arm/lib/copy_page.S | 2 + + arch/arm/lib/copy_to_user.S | 4 + + arch/arm/lib/csumipv6.S | 3 +- + arch/arm/lib/csumpartial.S | 2 + + arch/arm/lib/csumpartialcopy.S | 1 + + arch/arm/lib/csumpartialcopygeneric.S | 2 + + arch/arm/lib/csumpartialcopyuser.S | 1 + + arch/arm/lib/delay.c | 2 + + arch/arm/lib/div64.S | 2 + + arch/arm/lib/findbit.S | 9 ++ + arch/arm/lib/getuser.S | 9 ++ + arch/arm/lib/io-readsb.S | 2 + + arch/arm/lib/io-readsl.S | 2 + + arch/arm/lib/io-readsw-armv3.S | 3 +- + arch/arm/lib/io-readsw-armv4.S | 2 + + arch/arm/lib/io-writesb.S | 2 + + arch/arm/lib/io-writesl.S | 2 + + arch/arm/lib/io-writesw-armv3.S | 2 + + arch/arm/lib/io-writesw-armv4.S | 2 + + arch/arm/lib/lib1funcs.S | 9 ++ + arch/arm/lib/lshrdi3.S | 3 + + arch/arm/lib/memchr.S | 2 + + arch/arm/lib/memcpy.S | 3 + + arch/arm/lib/memmove.S | 2 + + arch/arm/lib/memset.S | 3 + + arch/arm/lib/memzero.S | 2 + + arch/arm/lib/muldi3.S | 3 + + arch/arm/lib/putuser.S | 5 + + arch/arm/lib/strchr.S | 2 + + arch/arm/lib/strrchr.S | 2 + + arch/arm/lib/uaccess_with_memcpy.c | 3 + + arch/arm/lib/ucmpdi2.S | 3 + + arch/arm/mach-imx/Makefile | 1 - + arch/arm/mach-imx/ssi-fiq-ksym.c | 20 ---- + arch/arm/mach-imx/ssi-fiq.S | 7 +- + arch/ia64/hp/sim/boot/Makefile | 2 +- + arch/ia64/include/asm/export.h | 3 + + arch/ia64/kernel/entry.S | 3 + + arch/ia64/kernel/esi_stub.S | 2 + + arch/ia64/kernel/head.S | 2 + + arch/ia64/kernel/ia64_ksyms.c | 94 +---------------- + arch/ia64/kernel/ivt.S | 2 + + arch/ia64/kernel/pal.S | 7 ++ + arch/ia64/kernel/setup.c | 4 + + arch/ia64/lib/Makefile | 8 +- + arch/ia64/lib/clear_page.S | 2 + + arch/ia64/lib/clear_user.S | 2 + + arch/ia64/lib/copy_page.S | 2 + + arch/ia64/lib/copy_page_mck.S | 2 + + arch/ia64/lib/copy_user.S | 2 + + arch/ia64/lib/flush.S | 2 + + arch/ia64/lib/idiv32.S | 2 + + arch/ia64/lib/idiv64.S | 2 + + arch/ia64/lib/ip_fast_csum.S | 3 + + arch/ia64/lib/memcpy.S | 2 + + arch/ia64/lib/memcpy_mck.S | 3 + + arch/ia64/lib/memset.S | 2 + + arch/ia64/lib/strlen.S | 2 + + arch/ia64/lib/strlen_user.S | 2 + + arch/ia64/lib/strncpy_from_user.S | 2 + + arch/ia64/lib/strnlen_user.S | 2 + + arch/ia64/lib/xor.S | 5 + + arch/m68k/include/asm/export.h | 3 + + arch/m68k/kernel/Makefile | 2 +- + arch/m68k/kernel/m68k_ksyms.c | 32 ------ + arch/m68k/lib/ashldi3.c | 4 + + arch/m68k/lib/ashrdi3.c | 4 + + arch/m68k/lib/divsi3.S | 3 + + arch/m68k/lib/lshrdi3.c | 4 + + arch/m68k/lib/modsi3.S | 3 + + arch/m68k/lib/muldi3.c | 4 + + arch/m68k/lib/mulsi3.S | 4 +- + arch/m68k/lib/udivsi3.S | 4 +- + arch/m68k/lib/umodsi3.S | 4 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/kernel/Makefile | 4 - + arch/powerpc/kernel/entry_32.S | 2 + + arch/powerpc/kernel/entry_64.S | 3 + + arch/powerpc/kernel/epapr_hcalls.S | 2 + + arch/powerpc/kernel/fpu.S | 3 + + arch/powerpc/kernel/head_32.S | 5 + + arch/powerpc/kernel/head_40x.S | 2 + + arch/powerpc/kernel/head_44x.S | 2 + + arch/powerpc/kernel/head_64.S | 2 + + arch/powerpc/kernel/head_8xx.S | 2 + + arch/powerpc/kernel/head_fsl_booke.S | 2 + + arch/powerpc/kernel/misc.S | 2 + + arch/powerpc/kernel/misc_32.S | 11 ++ + arch/powerpc/kernel/misc_64.S | 4 + + arch/powerpc/kernel/pci-common.c | 1 + + arch/powerpc/kernel/pci_32.c | 2 + + arch/powerpc/kernel/ppc_ksyms.c | 37 ------- + arch/powerpc/kernel/ppc_ksyms_32.c | 60 ----------- + arch/powerpc/kernel/setup_32.c | 6 ++ + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vector.S | 3 + + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/checksum_32.S | 3 + + arch/powerpc/lib/checksum_64.S | 3 + + arch/powerpc/lib/copy_32.S | 5 + + arch/powerpc/lib/copypage_64.S | 2 + + arch/powerpc/lib/copyuser_64.S | 2 + + arch/powerpc/lib/hweight_64.S | 5 + + arch/powerpc/lib/mem_64.S | 3 + + arch/powerpc/lib/memcmp_64.S | 2 + + arch/powerpc/lib/memcpy_64.S | 2 + + arch/powerpc/lib/ppc_ksyms.c | 29 ------ + arch/powerpc/lib/string.S | 6 ++ + arch/powerpc/lib/string_64.S | 2 + + arch/powerpc/mm/hash_low_32.S | 3 + + arch/powerpc/sysdev/dcr-low.S | 3 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/entry.S | 6 ++ + arch/s390/kernel/mcount.S | 3 + + arch/s390/kernel/s390_ksyms.c | 15 --- + arch/s390/lib/mem.S | 3 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/string.h | 34 +++++++ + arch/sparc/include/asm/string_32.h | 56 ----------- + arch/sparc/include/asm/string_64.h | 44 -------- + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/entry.S | 3 + + arch/sparc/kernel/head_32.S | 3 + + arch/sparc/kernel/head_64.S | 7 +- + arch/sparc/kernel/helpers.S | 2 + + arch/sparc/kernel/hvcalls.S | 5 + + arch/sparc/kernel/sparc_ksyms.c | 12 +++ + arch/sparc/kernel/sparc_ksyms_32.c | 31 ------ + arch/sparc/kernel/sparc_ksyms_64.c | 53 ---------- + arch/sparc/lib/Makefile | 1 - + arch/sparc/lib/U1memcpy.S | 2 + + arch/sparc/lib/VISsave.S | 2 + + arch/sparc/lib/ashldi3.S | 2 + + arch/sparc/lib/ashrdi3.S | 2 + + arch/sparc/lib/atomic_64.S | 16 ++- + arch/sparc/lib/bitops.S | 7 ++ + arch/sparc/lib/blockops.S | 3 + + arch/sparc/lib/bzero.S | 4 + + arch/sparc/lib/checksum_32.S | 3 + + arch/sparc/lib/checksum_64.S | 2 + + arch/sparc/lib/clear_page.S | 3 + + arch/sparc/lib/copy_in_user.S | 2 + + arch/sparc/lib/copy_page.S | 2 + + arch/sparc/lib/copy_user.S | 2 + + arch/sparc/lib/csum_copy.S | 3 + + arch/sparc/lib/divdi3.S | 2 + + arch/sparc/lib/ffs.S | 3 + + arch/sparc/lib/hweight.S | 5 + + arch/sparc/lib/ipcsum.S | 2 + + arch/sparc/lib/ksyms.c | 174 -------------------------------- + arch/sparc/lib/locks.S | 5 + + arch/sparc/lib/lshrdi3.S | 2 + + arch/sparc/lib/mcount.S | 2 + + arch/sparc/lib/memcmp.S | 2 + + arch/sparc/lib/memcpy.S | 86 +--------------- + arch/sparc/lib/memmove.S | 2 + + arch/sparc/lib/memscan_32.S | 4 + + arch/sparc/lib/memscan_64.S | 4 + + arch/sparc/lib/memset.S | 3 + + arch/sparc/lib/muldi3.S | 2 + + arch/sparc/lib/strlen.S | 2 + + arch/sparc/lib/strncmp_32.S | 2 + + arch/sparc/lib/strncmp_64.S | 2 + + arch/sparc/lib/xor.S | 9 ++ + arch/x86/entry/entry_32.S | 2 + + arch/x86/entry/entry_64.S | 2 + + arch/x86/entry/thunk_32.S | 3 + + arch/x86/entry/thunk_64.S | 3 + + arch/x86/include/asm/export.h | 4 + + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/head_32.S | 2 + + arch/x86/kernel/head_64.S | 3 + + arch/x86/kernel/i386_ksyms_32.c | 47 --------- + arch/x86/kernel/mcount_64.S | 2 + + arch/x86/kernel/x8664_ksyms_64.c | 85 ---------------- + arch/x86/lib/checksum_32.S | 3 + + arch/x86/lib/clear_page_64.S | 2 + + arch/x86/lib/cmpxchg8b_emu.S | 2 + + arch/x86/lib/copy_page_64.S | 2 + + arch/x86/lib/copy_user_64.S | 8 ++ + arch/x86/lib/csum-partial_64.c | 1 + + arch/x86/lib/getuser.S | 5 + + arch/x86/lib/hweight.S | 3 + + arch/x86/lib/memcpy_64.S | 4 + + arch/x86/lib/memmove_64.S | 3 + + arch/x86/lib/memset_64.S | 3 + + arch/x86/lib/putuser.S | 5 + + arch/x86/lib/strstr_32.c | 3 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/checksum_32.S | 2 + + arch/x86/um/ksyms.c | 13 --- + include/asm-generic/export.h | 94 +++++++++++++++++ + scripts/Makefile.build | 20 ++++ + 247 files changed, 798 insertions(+), 1221 deletions(-) + delete mode 100644 arch/alpha/kernel/alpha_ksyms.c + delete mode 100644 arch/arm/kernel/armksyms.c + delete mode 100644 arch/arm/mach-imx/ssi-fiq-ksym.c + create mode 100644 arch/ia64/include/asm/export.h + create mode 100644 arch/m68k/include/asm/export.h + delete mode 100644 arch/m68k/kernel/m68k_ksyms.c + delete mode 100644 arch/powerpc/kernel/ppc_ksyms.c + delete mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c + delete mode 100644 arch/powerpc/lib/ppc_ksyms.c + delete mode 100644 arch/s390/kernel/s390_ksyms.c + create mode 100644 arch/sparc/kernel/sparc_ksyms.c + delete mode 100644 arch/sparc/kernel/sparc_ksyms_32.c + delete mode 100644 arch/sparc/kernel/sparc_ksyms_64.c + delete mode 100644 arch/sparc/lib/ksyms.c + create mode 100644 arch/x86/include/asm/export.h + delete mode 100644 arch/x86/kernel/i386_ksyms_32.c + delete mode 100644 arch/x86/kernel/x8664_ksyms_64.c + delete mode 100644 arch/x86/um/ksyms.c + create mode 100644 include/asm-generic/export.h +$ git am -3 ../patches/0001-Revert-ppc-move-exports-to-definitions.patch +Applying: Revert "ppc: move exports to definitions" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/Kbuild +M arch/powerpc/kernel/Makefile +M arch/powerpc/kernel/entry_32.S +M arch/powerpc/kernel/entry_64.S +M arch/powerpc/kernel/epapr_hcalls.S +M arch/powerpc/kernel/fpu.S +M arch/powerpc/kernel/head_32.S +M arch/powerpc/kernel/head_40x.S +M arch/powerpc/kernel/head_44x.S +M arch/powerpc/kernel/head_64.S +M arch/powerpc/kernel/head_8xx.S +M arch/powerpc/kernel/head_fsl_booke.S +M arch/powerpc/kernel/misc.S +M arch/powerpc/kernel/misc_32.S +M arch/powerpc/kernel/misc_64.S +M arch/powerpc/kernel/pci-common.c +M arch/powerpc/kernel/pci_32.c +M arch/powerpc/kernel/setup_32.c +M arch/powerpc/kernel/time.c +M arch/powerpc/kernel/vector.S +M arch/powerpc/lib/Makefile +M arch/powerpc/lib/checksum_32.S +M arch/powerpc/lib/checksum_64.S +M arch/powerpc/lib/copy_32.S +M arch/powerpc/lib/copypage_64.S +M arch/powerpc/lib/copyuser_64.S +M arch/powerpc/lib/hweight_64.S +M arch/powerpc/lib/mem_64.S +M arch/powerpc/lib/memcmp_64.S +M arch/powerpc/lib/memcpy_64.S +M arch/powerpc/lib/string.S +M arch/powerpc/lib/string_64.S +M arch/powerpc/mm/hash_low_32.S +M arch/powerpc/sysdev/dcr-low.S +$ git add -A . +$ git commit -v -a --amend +[master 67179f1bf81d] Merge remote-tracking branch 'kbuild/for-next' + Date: Wed Aug 24 11:42:35 2016 +1000 +Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy) +$ git merge kspp/for-next/kspp +Auto-merging net/core/dev.c +Auto-merging mm/page_alloc.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/fair.c +Auto-merging include/linux/compiler.h +Auto-merging fs/namespace.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 5 + + arch/Kconfig | 18 + + arch/powerpc/kernel/Makefile | 5 + + block/blk-softirq.c | 2 +- + drivers/char/random.c | 4 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/random.h | 15 +- + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/page_alloc.c | 26 ++ + net/core/dev.c | 4 +- + scripts/Makefile.gcc-plugins | 9 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + 25 files changed, 750 insertions(+), 22 deletions(-) + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (db420765b793 Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 1 + + drivers/base/regmap/regcache-rbtree.c | 38 ++++++++++++++++++++++++++--------- + drivers/base/regmap/regcache.c | 5 +++-- + drivers/base/regmap/regmap-debugfs.c | 16 ++++++++++++--- + drivers/base/regmap/regmap.c | 25 +++++++++++++++++++++++ + 5 files changed, 70 insertions(+), 15 deletions(-) +Merging sound/for-next (07cb3272af79 ALSA: hdspm: fix spelling mistake "Externel" -> "External") +$ git merge sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + include/sound/hda_register.h | 36 ++ + include/sound/hdaudio.h | 13 + + include/sound/hdaudio_ext.h | 12 - + sound/core/compress_offload.c | 10 +- + sound/core/seq/seq_clientmgr.c | 721 ++++++++++++++------------------- + sound/core/seq/seq_compat.c | 7 +- + sound/hda/ext/hdac_ext_controller.c | 91 +---- + sound/hda/ext/hdac_ext_stream.c | 46 +-- + sound/hda/hdac_controller.c | 75 ++++ + sound/pci/hda/hda_controller.c | 203 +++++++++- + sound/pci/hda/hda_controller.h | 3 + + sound/pci/hda/hda_intel.c | 17 + + sound/pci/rme9652/hdspm.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 4 +- + sound/soc/intel/skylake/skl-pcm.c | 8 +- + sound/soc/intel/skylake/skl.c | 6 +- + sound/usb/caiaq/audio.c | 1 - + sound/usb/card.h | 2 +- + sound/usb/endpoint.c | 13 +- + sound/usb/format.c | 4 +- + sound/usb/quirks.c | 6 + + 21 files changed, 720 insertions(+), 560 deletions(-) +Merging sound-asoc/for-next (f64f56384d4e Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/simple', 'asoc/topic/sunxi', 'asoc/topic/tegra' and 'asoc/topic/topology' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging arch/arm/mach-s3c24xx/mach-mini2440.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/nau8810.txt | 16 + + .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 + + .../devicetree/bindings/sound/omap-mcpdm.txt | 10 - + .../bindings/sound/rockchip,rk3399-gru-sound.txt | 15 + + Documentation/devicetree/bindings/sound/rt5659.txt | 3 + + .../bindings/sound/sunxi,sun4i-spdif.txt | 3 + + arch/arm/mach-s3c24xx/mach-mini2440.c | 19 + + include/sound/l3.h | 15 +- + include/sound/s3c24xx_uda134x.h | 1 - + include/sound/simple_card_utils.h | 34 + + include/sound/soc.h | 19 - + include/uapi/sound/Kbuild | 1 + + include/uapi/sound/asoc.h | 35 +- + include/uapi/sound/snd_sst_tokens.h | 214 +++++ + sound/soc/atmel/atmel-classd.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 20 +- + sound/soc/atmel/atmel_ssc_dai.c | 5 +- + sound/soc/codecs/88pm860x-codec.c | 14 +- + sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ab8500-codec.c | 24 +- + sound/soc/codecs/ac97.c | 10 +- + sound/soc/codecs/ad1836.c | 14 +- + sound/soc/codecs/ad193x.c | 14 +- + sound/soc/codecs/ad1980.c | 14 +- + sound/soc/codecs/ad73311.c | 10 +- + sound/soc/codecs/adau1373.c | 14 +- + sound/soc/codecs/adau1701.c | 15 +- + sound/soc/codecs/adau1761.c | 14 +- + sound/soc/codecs/adau1781.c | 14 +- + sound/soc/codecs/adau1977.c | 14 +- + sound/soc/codecs/adau7002.c | 10 +- + sound/soc/codecs/adav80x.c | 14 +- + sound/soc/codecs/ads117x.c | 10 +- + sound/soc/codecs/ak4104.c | 10 +- + sound/soc/codecs/ak4535.c | 14 +- + sound/soc/codecs/ak4554.c | 10 +- + sound/soc/codecs/ak4613.c | 14 +- + sound/soc/codecs/ak4641.c | 14 +- + sound/soc/codecs/ak4642.c | 14 +- + sound/soc/codecs/ak4671.c | 14 +- + sound/soc/codecs/ak5386.c | 10 +- + sound/soc/codecs/alc5632.c | 14 +- + sound/soc/codecs/bt-sco.c | 10 +- + sound/soc/codecs/cs35l32.c | 15 +- + sound/soc/codecs/cs35l33.c | 15 +- + sound/soc/codecs/cs4265.c | 15 +- + sound/soc/codecs/cs4270.c | 14 +- + sound/soc/codecs/cs4271.c | 14 +- + sound/soc/codecs/cs42l51.c | 14 +- + sound/soc/codecs/cs42l52.c | 15 +- + sound/soc/codecs/cs42l56.c | 15 +- + sound/soc/codecs/cs42l73.c | 19 +- + sound/soc/codecs/cs42xx8.c | 14 +- + sound/soc/codecs/cs4349.c | 15 +- + sound/soc/codecs/cs47l24.c | 24 +- + sound/soc/codecs/cs53l30.c | 23 +- + sound/soc/codecs/cx20442.c | 10 +- + sound/soc/codecs/da7210.c | 15 +- + sound/soc/codecs/da7213.c | 149 ++-- + sound/soc/codecs/da7213.h | 12 +- + sound/soc/codecs/da7218.c | 49 +- + sound/soc/codecs/da7218.h | 2 - + sound/soc/codecs/da7219-aad.c | 18 +- + sound/soc/codecs/da7219.c | 33 +- + sound/soc/codecs/da732x.c | 14 +- + sound/soc/codecs/da9055.c | 15 +- + sound/soc/codecs/dmic.c | 10 +- + sound/soc/codecs/es8328.c | 14 +- + sound/soc/codecs/gtm601.c | 10 +- + sound/soc/codecs/hdmi-codec.c | 79 +- + sound/soc/codecs/inno_rk3036.c | 14 +- + sound/soc/codecs/isabelle.c | 14 +- + sound/soc/codecs/jz4740.c | 14 +- + sound/soc/codecs/l3.c | 71 +- + sound/soc/codecs/lm49453.c | 14 +- + sound/soc/codecs/max98088.c | 14 +- + sound/soc/codecs/max98095.c | 14 +- + sound/soc/codecs/max98357a.c | 10 +- + sound/soc/codecs/max98371.c | 2 +- + sound/soc/codecs/max9850.c | 14 +- + sound/soc/codecs/max9860.c | 14 +- + sound/soc/codecs/max9867.c | 14 +- + sound/soc/codecs/max98925.c | 14 +- + sound/soc/codecs/max98926.c | 14 +- + sound/soc/codecs/mc13783.c | 14 +- + sound/soc/codecs/ml26124.c | 14 +- + sound/soc/codecs/nau8810.c | 883 +++++++++++++++++++++ + sound/soc/codecs/nau8810.h | 281 +++++++ + sound/soc/codecs/nau8825.c | 92 +-- + sound/soc/codecs/pcm1681.c | 14 +- + sound/soc/codecs/pcm179x.c | 14 +- + sound/soc/codecs/pcm3008.c | 10 +- + sound/soc/codecs/pcm3168a.c | 14 +- + sound/soc/codecs/pcm512x.c | 14 +- + sound/soc/codecs/rt286.c | 14 +- + sound/soc/codecs/rt298.c | 14 +- + sound/soc/codecs/rt5514.c | 14 +- + sound/soc/codecs/rt5616.c | 14 +- + sound/soc/codecs/rt5631.c | 14 +- + sound/soc/codecs/rt5640.c | 17 +- + sound/soc/codecs/rt5640.h | 1 + + sound/soc/codecs/rt5645.c | 14 +- + sound/soc/codecs/rt5651.c | 14 +- + sound/soc/codecs/rt5659.c | 38 +- + sound/soc/codecs/rt5659.h | 1 + + sound/soc/codecs/rt5670.c | 14 +- + sound/soc/codecs/rt5677.c | 14 +- + sound/soc/codecs/sgtl5000.c | 14 +- + sound/soc/codecs/si476x.c | 10 +- + sound/soc/codecs/sn95031.c | 14 +- + sound/soc/codecs/spdif_receiver.c | 10 +- + sound/soc/codecs/spdif_transmitter.c | 10 +- + sound/soc/codecs/ssm2518.c | 14 +- + sound/soc/codecs/ssm2602.c | 14 +- + sound/soc/codecs/ssm4567.c | 14 +- + sound/soc/codecs/sta32x.c | 14 +- + sound/soc/codecs/sta350.c | 14 +- + sound/soc/codecs/sta529.c | 6 +- + sound/soc/codecs/stac9766.c | 6 +- + sound/soc/codecs/sti-sas.c | 8 +- + sound/soc/codecs/tas2552.c | 14 +- + sound/soc/codecs/tas5086.c | 14 +- + sound/soc/codecs/tas571x.c | 14 +- + sound/soc/codecs/tas5720.c | 14 +- + sound/soc/codecs/tfa9879.c | 15 +- + sound/soc/codecs/tlv320aic23.c | 14 +- + sound/soc/codecs/tlv320aic26.c | 14 +- + sound/soc/codecs/tlv320aic31xx.c | 14 +- + sound/soc/codecs/tlv320aic32x4.c | 14 +- + sound/soc/codecs/tlv320aic3x.c | 14 +- + sound/soc/codecs/tlv320dac33.c | 14 +- + sound/soc/codecs/twl4030.c | 14 +- + sound/soc/codecs/twl6040.c | 14 +- + sound/soc/codecs/uda134x.c | 17 +- + sound/soc/codecs/uda1380.c | 14 +- + sound/soc/codecs/wl1273.c | 14 +- + sound/soc/codecs/wm0010.c | 10 +- + sound/soc/codecs/wm1250-ev1.c | 11 +- + sound/soc/codecs/wm2000.c | 16 +- + sound/soc/codecs/wm2200.c | 14 +- + sound/soc/codecs/wm5100.c | 14 +- + sound/soc/codecs/wm5102.c | 24 +- + sound/soc/codecs/wm5110.c | 24 +- + sound/soc/codecs/wm8350.c | 14 +- + sound/soc/codecs/wm8400.c | 14 +- + sound/soc/codecs/wm8510.c | 14 +- + sound/soc/codecs/wm8523.c | 14 +- + sound/soc/codecs/wm8580.c | 14 +- + sound/soc/codecs/wm8711.c | 14 +- + sound/soc/codecs/wm8727.c | 10 +- + sound/soc/codecs/wm8728.c | 14 +- + sound/soc/codecs/wm8731.c | 14 +- + sound/soc/codecs/wm8737.c | 14 +- + sound/soc/codecs/wm8741.c | 10 +- + sound/soc/codecs/wm8750.c | 14 +- + sound/soc/codecs/wm8753.c | 14 +- + sound/soc/codecs/wm8770.c | 14 +- + sound/soc/codecs/wm8776.c | 14 +- + sound/soc/codecs/wm8782.c | 10 +- + sound/soc/codecs/wm8804.c | 10 +- + sound/soc/codecs/wm8900.c | 14 +- + sound/soc/codecs/wm8903.c | 14 +- + sound/soc/codecs/wm8940.c | 14 +- + sound/soc/codecs/wm8955.c | 14 +- + sound/soc/codecs/wm8961.c | 14 +- + sound/soc/codecs/wm8971.c | 14 +- + sound/soc/codecs/wm8974.c | 14 +- + sound/soc/codecs/wm8978.c | 14 +- + sound/soc/codecs/wm8983.c | 14 +- + sound/soc/codecs/wm8985.c | 14 +- + sound/soc/codecs/wm8988.c | 14 +- + sound/soc/codecs/wm8990.c | 14 +- + sound/soc/codecs/wm8991.c | 14 +- + sound/soc/codecs/wm8995.c | 14 +- + sound/soc/codecs/wm8996.c | 14 +- + sound/soc/codecs/wm8997.c | 14 +- + sound/soc/codecs/wm8998.c | 24 +- + sound/soc/codecs/wm9081.c | 14 +- + sound/soc/codecs/wm9705.c | 14 +- + sound/soc/codecs/wm9712.c | 14 +- + sound/soc/codecs/wm9713.c | 14 +- + sound/soc/dwc/designware_i2s.c | 2 - + sound/soc/fsl/fsl_asrc.c | 10 +- + sound/soc/fsl/fsl_sai.c | 6 +- + sound/soc/generic/Makefile | 6 +- + sound/soc/generic/simple-card-utils.c | 147 ++++ + sound/soc/generic/simple-card.c | 190 +---- + sound/soc/img/pistachio-internal-dac.c | 14 +- + sound/soc/intel/atom/sst-atom-controls.c | 32 +- + sound/soc/intel/atom/sst-atom-controls.h | 6 + + sound/soc/intel/atom/sst/sst.c | 3 +- + sound/soc/intel/atom/sst/sst_acpi.c | 82 +- + sound/soc/intel/boards/bytcr_rt5640.c | 507 ++++++++++-- + sound/soc/intel/skylake/bxt-sst.c | 114 ++- + sound/soc/intel/skylake/skl-messages.c | 39 +- + sound/soc/intel/skylake/skl-pcm.c | 47 ++ + sound/soc/intel/skylake/skl-sst-dsp.h | 12 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 29 + + sound/soc/intel/skylake/skl-sst-ipc.h | 12 +- + sound/soc/intel/skylake/skl-sst-utils.c | 29 +- + sound/soc/intel/skylake/skl-sst.c | 43 +- + sound/soc/intel/skylake/skl-topology.c | 874 +++++++++++++++++--- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 92 +-- + sound/soc/intel/skylake/skl.c | 4 +- + sound/soc/intel/skylake/skl.h | 2 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 5 +- + sound/soc/omap/mcbsp.c | 3 +- + sound/soc/omap/omap-abe-twl6040.c | 61 +- + sound/soc/omap/omap-mcpdm.c | 22 +- + sound/soc/qcom/lpass-platform.c | 14 +- + sound/soc/qcom/lpass.h | 2 + + sound/soc/rockchip/Kconfig | 12 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rk3399_gru_sound.c | 374 +++++++++ + sound/soc/samsung/ac97.c | 28 +- + sound/soc/samsung/dma.h | 20 +- + sound/soc/samsung/dmaengine.c | 31 - + sound/soc/samsung/i2s.c | 48 +- + sound/soc/samsung/idma.c | 1 - + sound/soc/samsung/pcm.c | 26 +- + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c-i2s-v2.h | 4 +- + sound/soc/samsung/s3c2412-i2s.c | 24 +- + sound/soc/samsung/s3c24xx-i2s.c | 24 +- + sound/soc/samsung/s3c24xx_uda134x.c | 141 +--- + sound/soc/samsung/smdk_wm8580pcm.c | 1 - + sound/soc/samsung/smdk_wm8994pcm.c | 1 - + sound/soc/samsung/spdif.c | 12 +- + sound/soc/sh/rcar/core.c | 2 + + sound/soc/sh/rcar/rsrc-card.c | 155 +--- + sound/soc/sh/rcar/src.c | 6 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 20 +- + sound/soc/soc-dapm.c | 27 +- + sound/soc/soc-topology.c | 115 ++- + sound/soc/sunxi/sun4i-codec.c | 14 +- + sound/soc/sunxi/sun4i-spdif.c | 17 +- + sound/soc/tegra/Kconfig | 11 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra_sgtl5000.c | 212 +++++ + 243 files changed, 5934 insertions(+), 2037 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nau8810.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt + create mode 100644 include/uapi/sound/snd_sst_tokens.h + create mode 100644 sound/soc/codecs/nau8810.c + create mode 100644 sound/soc/codecs/nau8810.h + create mode 100644 sound/soc/rockchip/rk3399_gru_sound.c + create mode 100644 sound/soc/tegra/tegra_sgtl5000.c +Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (99ff4d3af80c Input: jornada720_kbd - switch to using dev_dbg) +$ git merge input/next +Removing drivers/input/touchscreen/ft6236.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/misc/max77693-haptic.c +Removing Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/edt-ft5x06.txt | 8 + + .../input/touchscreen/focaltech-ft6236.txt | 35 --- + arch/arm/mach-sa1100/jornada720.c | 6 + + drivers/input/keyboard/jornada720_kbd.c | 58 +--- + drivers/input/misc/max77693-haptic.c | 4 +- + drivers/input/touchscreen/Kconfig | 13 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/edt-ft5x06.c | 8 + + drivers/input/touchscreen/ft6236.c | 326 --------------------- + drivers/input/touchscreen/pixcir_i2c_ts.c | 13 +- + 10 files changed, 41 insertions(+), 431 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt + delete mode 100644 drivers/input/touchscreen/ft6236.c +Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (9e7d9367e6a2 dm raid: support raid0 with missing metadata devices) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (bf4a4e8a0acf mmc: sdhci-of-arasan: Don't power PHY w/ slow/no clock) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 2 + + Documentation/devicetree/bindings/mmc/mmc.txt | 15 +- + .../devicetree/bindings/mmc/sunxi-mmc.txt | 6 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 8 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 8 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 6 +- + drivers/mmc/core/pwrseq_simple.c | 9 ++ + drivers/mmc/core/sd.c | 37 ++--- + drivers/mmc/host/moxart-mmc.c | 5 +- + drivers/mmc/host/sdhci-bcm-kona.c | 6 +- + drivers/mmc/host/sdhci-brcmstb.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 7 +- + drivers/mmc/host/sdhci-of-arasan.c | 63 +++++++-- + drivers/mmc/host/sdhci-of-esdhc.c | 2 +- + drivers/mmc/host/sdhci.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 151 +++++++++++++-------- + drivers/mmc/host/vub300.c | 2 - + include/linux/mmc/card.h | 1 + + 19 files changed, 218 insertions(+), 119 deletions(-) +Merging md/for-next (a0667a61d4bf md-cluster: make resync lock also could be interruptted) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 47 ++++++++++++++++------- + drivers/md/md-cluster.c | 99 ++++++++++++++++++++++++++++++++++--------------- + drivers/md/md.c | 50 ++++++++++++++++--------- + drivers/md/md.h | 5 +-- + drivers/md/raid10.c | 4 +- + drivers/md/raid5.c | 16 +++++++- + 6 files changed, 153 insertions(+), 68 deletions(-) +Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (1c4593edbd4a power: supply: Change Krzysztof Kozlowski's email to kernel.org) +$ git merge battery/master +Auto-merging drivers/power/supply/z2_battery.c +Auto-merging drivers/power/supply/wm97xx_battery.c +Auto-merging drivers/power/supply/tps65217_charger.c +Auto-merging drivers/power/supply/sbs-battery.c +Auto-merging drivers/power/supply/pm2301_charger.c +Auto-merging drivers/power/supply/max77693_charger.c +Auto-merging drivers/power/supply/max14577_charger.c +Auto-merging drivers/power/supply/ipaq_micro_battery.c +Auto-merging drivers/power/supply/intel_mid_battery.c +Auto-merging drivers/power/supply/ds2781_battery.c +Auto-merging drivers/power/supply/ds2780_battery.c +Auto-merging drivers/power/supply/ds2760_battery.c +Auto-merging drivers/power/supply/bq27xxx_battery.c +Auto-merging drivers/power/supply/axp288_fuel_gauge.c +Auto-merging drivers/power/supply/axp288_charger.c +Auto-merging drivers/power/supply/abx500_chargalg.c +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/ab8500_charger.c +Auto-merging drivers/power/supply/ab8500_btemp.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 8 +- + .../{power_supply => power/reset}/axxia-reset.txt | 0 + .../reset}/imx-snvs-poweroff.txt | 0 + .../{power_supply => power/reset}/msm-poweroff.txt | 0 + .../reset}/qnap-poweroff.txt | 0 + .../reset}/restart-poweroff.txt | 0 + .../supply}/ab8500/btemp.txt | 0 + .../supply}/ab8500/chargalg.txt | 0 + .../supply}/ab8500/charger.txt | 0 + .../{power_supply => power/supply}/ab8500/fg.txt | 0 + .../power/{ => supply}/act8945a-charger.txt | 0 + .../supply}/axp20x_usb_power.txt | 0 + .../bindings/power/{ => supply}/bq2415x.txt | 0 + .../bindings/power/{ => supply}/bq24257.txt | 0 + .../bindings/power/{ => supply}/bq25890.txt | 0 + .../supply}/charger-manager.txt | 0 + .../bindings/power/{ => supply}/da9150-charger.txt | 0 + .../bindings/power/{ => supply}/da9150-fg.txt | 0 + .../supply}/gpio-charger.txt | 0 + .../bindings/power/{ => supply}/isp1704.txt | 0 + .../supply}/lp8727_charger.txt | 0 + .../bindings/power/{ => supply}/ltc2941.txt | 0 + .../supply}/max17042_battery.txt | 0 + .../supply}/max8925_batter.txt | 0 + .../supply}/olpc_battery.txt | 0 + .../supply}/power_supply.txt | 0 + .../power/{ => supply}/qcom,coincell-charger.txt | 0 + .../{power_supply => power/supply}/qcom_smbb.txt | 0 + .../bindings/power/{ => supply}/rt9455_charger.txt | 0 + .../bindings/power/{ => supply}/rx51-battery.txt | 0 + .../supply}/sbs_sbs-battery.txt | 0 + .../{power_supply => power/supply}/ti,bq24735.txt | 0 + .../{power_supply => power/supply}/tps65090.txt | 0 + .../supply}/tps65217_charger.txt | 0 + .../bindings/power/{ => supply}/twl-charger.txt | 0 + Documentation/driver-model/devres.txt | 4 + + Documentation/power/power_supply_class.txt | 4 +- + MAINTAINERS | 44 +- + drivers/power/Kconfig | 518 +-------------------- + drivers/power/Makefile | 75 +-- + drivers/power/reset/reboot-mode.c | 59 +++ + drivers/power/reset/reboot-mode.h | 4 + + drivers/power/reset/syscon-reboot-mode.c | 12 +- + drivers/power/{ => supply}/88pm860x_battery.c | 0 + drivers/power/{ => supply}/88pm860x_charger.c | 0 + drivers/power/supply/Kconfig | 514 ++++++++++++++++++++ + drivers/power/supply/Makefile | 74 +++ + drivers/power/{ => supply}/ab8500_bmdata.c | 0 + drivers/power/{ => supply}/ab8500_btemp.c | 2 +- + drivers/power/{ => supply}/ab8500_charger.c | 4 +- + drivers/power/{ => supply}/ab8500_fg.c | 2 +- + drivers/power/{ => supply}/abx500_chargalg.c | 4 +- + drivers/power/{ => supply}/act8945a_charger.c | 0 + drivers/power/{ => supply}/apm_power.c | 0 + drivers/power/{ => supply}/axp20x_usb_power.c | 0 + drivers/power/{ => supply}/axp288_charger.c | 1 - + drivers/power/{ => supply}/axp288_fuel_gauge.c | 1 - + drivers/power/{ => supply}/bq2415x_charger.c | 0 + drivers/power/{ => supply}/bq24190_charger.c | 0 + drivers/power/{ => supply}/bq24257_charger.c | 0 + drivers/power/{ => supply}/bq24735-charger.c | 0 + drivers/power/{ => supply}/bq25890_charger.c | 0 + drivers/power/{ => supply}/bq27xxx_battery.c | 5 +- + drivers/power/{ => supply}/bq27xxx_battery_i2c.c | 0 + drivers/power/{ => supply}/charger-manager.c | 0 + drivers/power/{ => supply}/collie_battery.c | 0 + drivers/power/{ => supply}/da9030_battery.c | 0 + drivers/power/{ => supply}/da9052-battery.c | 0 + drivers/power/{ => supply}/da9150-charger.c | 0 + drivers/power/{ => supply}/da9150-fg.c | 0 + drivers/power/{ => supply}/ds2760_battery.c | 7 +- + drivers/power/{ => supply}/ds2780_battery.c | 4 +- + drivers/power/{ => supply}/ds2781_battery.c | 4 +- + drivers/power/{ => supply}/ds2782_battery.c | 0 + drivers/power/{ => supply}/generic-adc-battery.c | 0 + drivers/power/{ => supply}/goldfish_battery.c | 0 + drivers/power/{ => supply}/gpio-charger.c | 0 + drivers/power/{ => supply}/intel_mid_battery.c | 3 +- + drivers/power/{ => supply}/ipaq_micro_battery.c | 2 +- + drivers/power/{ => supply}/isp1704_charger.c | 0 + drivers/power/{ => supply}/jz4740-battery.c | 0 + drivers/power/{ => supply}/lp8727_charger.c | 0 + drivers/power/{ => supply}/lp8788-charger.c | 0 + drivers/power/{ => supply}/ltc2941-battery-gauge.c | 0 + drivers/power/{ => supply}/max14577_charger.c | 4 +- + drivers/power/{ => supply}/max17040_battery.c | 0 + drivers/power/{ => supply}/max17042_battery.c | 0 + drivers/power/{ => supply}/max77693_charger.c | 4 +- + drivers/power/{ => supply}/max8903_charger.c | 0 + drivers/power/{ => supply}/max8925_power.c | 0 + drivers/power/{ => supply}/max8997_charger.c | 0 + drivers/power/{ => supply}/max8998_charger.c | 0 + drivers/power/{ => supply}/olpc_battery.c | 0 + drivers/power/{ => supply}/pcf50633-charger.c | 0 + drivers/power/{ => supply}/pda_power.c | 0 + drivers/power/{ => supply}/pm2301_charger.c | 3 +- + drivers/power/{ => supply}/pm2301_charger.h | 0 + drivers/power/{ => supply}/pmu_battery.c | 0 + drivers/power/{ => supply}/power_supply.h | 0 + drivers/power/{ => supply}/power_supply_core.c | 0 + drivers/power/{ => supply}/power_supply_leds.c | 0 + drivers/power/{ => supply}/power_supply_sysfs.c | 0 + drivers/power/{ => supply}/qcom_smbb.c | 0 + drivers/power/{ => supply}/rt5033_battery.c | 0 + drivers/power/{ => supply}/rt9455_charger.c | 0 + drivers/power/{ => supply}/rx51_battery.c | 0 + drivers/power/{ => supply}/s3c_adc_battery.c | 0 + drivers/power/{ => supply}/sbs-battery.c | 48 +- + drivers/power/{ => supply}/smb347-charger.c | 0 + drivers/power/{ => supply}/test_power.c | 0 + drivers/power/{ => supply}/tosa_battery.c | 0 + drivers/power/{ => supply}/tps65090-charger.c | 0 + drivers/power/{ => supply}/tps65217_charger.c | 40 +- + drivers/power/{ => supply}/twl4030_charger.c | 0 + drivers/power/{ => supply}/twl4030_madc_battery.c | 0 + drivers/power/{ => supply}/wm831x_backup.c | 0 + drivers/power/{ => supply}/wm831x_power.c | 0 + drivers/power/{ => supply}/wm8350_power.c | 0 + drivers/power/{ => supply}/wm97xx_battery.c | 2 - + drivers/power/{ => supply}/z2_battery.c | 1 - + 120 files changed, 777 insertions(+), 680 deletions(-) + rename Documentation/devicetree/bindings/{power_supply => power/reset}/axxia-reset.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/reset}/imx-snvs-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/reset}/msm-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/reset}/qnap-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/reset}/restart-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/btemp.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/chargalg.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/charger.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/ab8500/fg.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/act8945a-charger.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/axp20x_usb_power.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/bq2415x.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/bq24257.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/bq25890.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/charger-manager.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/da9150-charger.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/da9150-fg.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/gpio-charger.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/isp1704.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/lp8727_charger.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/ltc2941.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/max17042_battery.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/max8925_batter.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/olpc_battery.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/power_supply.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/qcom,coincell-charger.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/qcom_smbb.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/rt9455_charger.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/rx51-battery.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/sbs_sbs-battery.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/ti,bq24735.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65090.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/tps65217_charger.txt (100%) + rename Documentation/devicetree/bindings/power/{ => supply}/twl-charger.txt (100%) + rename drivers/power/{ => supply}/88pm860x_battery.c (100%) + rename drivers/power/{ => supply}/88pm860x_charger.c (100%) + create mode 100644 drivers/power/supply/Kconfig + create mode 100644 drivers/power/supply/Makefile + rename drivers/power/{ => supply}/ab8500_bmdata.c (100%) + rename drivers/power/{ => supply}/ab8500_btemp.c (99%) + rename drivers/power/{ => supply}/ab8500_charger.c (99%) + rename drivers/power/{ => supply}/ab8500_fg.c (99%) + rename drivers/power/{ => supply}/abx500_chargalg.c (99%) + rename drivers/power/{ => supply}/act8945a_charger.c (100%) + rename drivers/power/{ => supply}/apm_power.c (100%) + rename drivers/power/{ => supply}/axp20x_usb_power.c (100%) + rename drivers/power/{ => supply}/axp288_charger.c (99%) + rename drivers/power/{ => supply}/axp288_fuel_gauge.c (99%) + rename drivers/power/{ => supply}/bq2415x_charger.c (100%) + rename drivers/power/{ => supply}/bq24190_charger.c (100%) + rename drivers/power/{ => supply}/bq24257_charger.c (100%) + rename drivers/power/{ => supply}/bq24735-charger.c (100%) + rename drivers/power/{ => supply}/bq25890_charger.c (100%) + rename drivers/power/{ => supply}/bq27xxx_battery.c (99%) + rename drivers/power/{ => supply}/bq27xxx_battery_i2c.c (100%) + rename drivers/power/{ => supply}/charger-manager.c (100%) + rename drivers/power/{ => supply}/collie_battery.c (100%) + rename drivers/power/{ => supply}/da9030_battery.c (100%) + rename drivers/power/{ => supply}/da9052-battery.c (100%) + rename drivers/power/{ => supply}/da9150-charger.c (100%) + rename drivers/power/{ => supply}/da9150-fg.c (100%) + rename drivers/power/{ => supply}/ds2760_battery.c (99%) + rename drivers/power/{ => supply}/ds2780_battery.c (99%) + rename drivers/power/{ => supply}/ds2781_battery.c (99%) + rename drivers/power/{ => supply}/ds2782_battery.c (100%) + rename drivers/power/{ => supply}/generic-adc-battery.c (100%) + rename drivers/power/{ => supply}/goldfish_battery.c (100%) + rename drivers/power/{ => supply}/gpio-charger.c (100%) + rename drivers/power/{ => supply}/intel_mid_battery.c (99%) + rename drivers/power/{ => supply}/ipaq_micro_battery.c (99%) + rename drivers/power/{ => supply}/isp1704_charger.c (100%) + rename drivers/power/{ => supply}/jz4740-battery.c (100%) + rename drivers/power/{ => supply}/lp8727_charger.c (100%) + rename drivers/power/{ => supply}/lp8788-charger.c (100%) + rename drivers/power/{ => supply}/ltc2941-battery-gauge.c (100%) + rename drivers/power/{ => supply}/max14577_charger.c (99%) + rename drivers/power/{ => supply}/max17040_battery.c (100%) + rename drivers/power/{ => supply}/max17042_battery.c (100%) + rename drivers/power/{ => supply}/max77693_charger.c (99%) + rename drivers/power/{ => supply}/max8903_charger.c (100%) + rename drivers/power/{ => supply}/max8925_power.c (100%) + rename drivers/power/{ => supply}/max8997_charger.c (100%) + rename drivers/power/{ => supply}/max8998_charger.c (100%) + rename drivers/power/{ => supply}/olpc_battery.c (100%) + rename drivers/power/{ => supply}/pcf50633-charger.c (100%) + rename drivers/power/{ => supply}/pda_power.c (100%) + rename drivers/power/{ => supply}/pm2301_charger.c (99%) + rename drivers/power/{ => supply}/pm2301_charger.h (100%) + rename drivers/power/{ => supply}/pmu_battery.c (100%) + rename drivers/power/{ => supply}/power_supply.h (100%) + rename drivers/power/{ => supply}/power_supply_core.c (100%) + rename drivers/power/{ => supply}/power_supply_leds.c (100%) + rename drivers/power/{ => supply}/power_supply_sysfs.c (100%) + rename drivers/power/{ => supply}/qcom_smbb.c (100%) + rename drivers/power/{ => supply}/rt5033_battery.c (100%) + rename drivers/power/{ => supply}/rt9455_charger.c (100%) + rename drivers/power/{ => supply}/rx51_battery.c (100%) + rename drivers/power/{ => supply}/s3c_adc_battery.c (100%) + rename drivers/power/{ => supply}/sbs-battery.c (95%) + rename drivers/power/{ => supply}/smb347-charger.c (100%) + rename drivers/power/{ => supply}/test_power.c (100%) + rename drivers/power/{ => supply}/tosa_battery.c (100%) + rename drivers/power/{ => supply}/tps65090-charger.c (100%) + rename drivers/power/{ => supply}/tps65217_charger.c (89%) + rename drivers/power/{ => supply}/twl4030_charger.c (100%) + rename drivers/power/{ => supply}/twl4030_madc_battery.c (100%) + rename drivers/power/{ => supply}/wm831x_backup.c (100%) + rename drivers/power/{ => supply}/wm831x_power.c (100%) + rename drivers/power/{ => supply}/wm8350_power.c (100%) + rename drivers/power/{ => supply}/wm97xx_battery.c (99%) + rename drivers/power/{ => supply}/z2_battery.c (99%) +Merging omap_dss2/for-next (e0299908d606 video: fbdev: pxafb: potential NULL dereference on error) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/Kconfig | 6 +- + drivers/video/fbdev/Makefile | 1 + + drivers/video/fbdev/amba-clcd-nomadik.c | 257 ++++++++++++++ + drivers/video/fbdev/amba-clcd-nomadik.h | 24 ++ + drivers/video/fbdev/amba-clcd-versatile.c | 391 +++++++++++++++++++++ + drivers/video/fbdev/amba-clcd-versatile.h | 17 + + drivers/video/fbdev/amba-clcd.c | 199 ++++++++++- + drivers/video/fbdev/bfin_adv7393fb.c | 2 +- + drivers/video/fbdev/efifb.c | 6 +- + drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 7 +- + drivers/video/fbdev/omap/lcd_mipid.c | 9 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 8 - + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 8 - + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 8 - + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/s3c2410fb.c | 2 +- + drivers/video/fbdev/s3c2410fb.h | 2 +- + include/linux/amba/clcd.h | 63 +++- + 20 files changed, 952 insertions(+), 81 deletions(-) + create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.c + create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.h + create mode 100644 drivers/video/fbdev/amba-clcd-versatile.h +Merging regulator/for-next (53df648ee341 Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/ltc3676.txt | 94 +++++ + .../devicetree/bindings/regulator/regulator.txt | 2 +- + drivers/mfd/tps65218.c | 9 + + drivers/regulator/Kconfig | 10 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 6 +- + drivers/regulator/devres.c | 7 +- + drivers/regulator/ltc3676.c | 420 +++++++++++++++++++++ + drivers/regulator/max14577-regulator.c | 4 +- + drivers/regulator/max77693-regulator.c | 4 +- + drivers/regulator/qcom_smd-regulator.c | 30 +- + drivers/regulator/rk808-regulator.c | 3 +- + drivers/regulator/tps65218-regulator.c | 8 + + include/linux/mfd/tps65218.h | 6 + + include/linux/regulator/consumer.h | 3 - + 15 files changed, 573 insertions(+), 34 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ltc3676.txt + create mode 100644 drivers/regulator/ltc3676.c +Merging security/next (8ccc7d6bad84 seccomp: Remove 2-phase API documentation) +$ git merge security/next +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 11 ----------- + arch/um/kernel/skas/syscall.c | 10 +++------- + arch/x86/um/ptrace_32.c | 3 +++ + arch/x86/um/ptrace_64.c | 4 ++++ + include/linux/lsm_hooks.h | 1 - + include/linux/security.h | 1 - + 6 files changed, 10 insertions(+), 20 deletions(-) +Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging crypto/asymmetric_keys/pkcs7_verify.c +Auto-merging Documentation/crypto/asymmetric-keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (348a0db9e69e selinux: drop SECURITY_SELINUX_POLICYDB_VERSION_MAX) +$ git merge selinux/next +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/overlayfs/dir.c +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 22 +++++++++ + fs/overlayfs/dir.c | 10 +++++ + include/linux/lsm_hooks.h | 36 +++++++++++++++ + include/linux/security.h | 24 ++++++++++ + security/lsm_audit.c | 4 +- + security/security.c | 27 +++++++++++ + security/selinux/Kconfig | 38 ---------------- + security/selinux/hooks.c | 90 ++++++++++++++++++++++++++++++------- + security/selinux/include/security.h | 4 -- + security/smack/smack_netfilter.c | 4 +- + 10 files changed, 198 insertions(+), 61 deletions(-) +Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (29b4817d4018 Linux 4.8-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (35ee9598972e Merge branches 'iommu/fixes', 'x86/amd', 'arm/exynos' and 'arm/mediatek' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd_iommu.c | 3 ++- + drivers/iommu/arm-smmu-v3.c | 7 ++++-- + drivers/iommu/arm-smmu.c | 34 ++++++--------------------- + drivers/iommu/exynos-iommu.c | 4 ++-- + drivers/iommu/io-pgtable-arm-v7s.c | 4 +++- + include/dt-bindings/memory/mt2701-larb-port.h | 2 +- + 6 files changed, 20 insertions(+), 34 deletions(-) +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (8d8f60c5e0cd Merge branch 'doc/4.9' into docs-next) +$ git merge jc_docs/docs-next +Resolved 'Documentation/gpu/index.rst' using previous resolution. +Auto-merging Makefile +Auto-merging MAINTAINERS +Removing Documentation/kmemcheck.txt +Auto-merging Documentation/kernel-parameters.txt +Removing Documentation/kasan.txt +Auto-merging Documentation/gpu/index.rst +CONFLICT (content): Merge conflict in Documentation/gpu/index.rst +Removing Documentation/gcov.txt +Auto-merging Documentation/dev-tools/ubsan.rst +Auto-merging Documentation/dev-tools/sparse.rst +Auto-merging Documentation/dev-tools/kmemleak.rst +Auto-merging Documentation/dev-tools/kcov.rst +Auto-merging Documentation/dev-tools/gdb-kernel-debugging.rst +Auto-merging Documentation/dev-tools/coccinelle.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6f8f89f62c0] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/CodingStyle | 28 +- + Documentation/DocBook/Makefile | 8 + + Documentation/Makefile.sphinx | 64 +- + Documentation/arm/sunxi/README | 11 +- + Documentation/clk.txt | 42 +- + Documentation/conf.py | 102 ++- + .../{coccinelle.txt => dev-tools/coccinelle.rst} | 359 +++++----- + Documentation/dev-tools/gcov.rst | 256 +++++++ + .../gdb-kernel-debugging.rst} | 77 ++- + Documentation/dev-tools/kasan.rst | 173 +++++ + Documentation/{kcov.txt => dev-tools/kcov.rst} | 84 +-- + Documentation/dev-tools/kmemcheck.rst | 733 ++++++++++++++++++++ + .../{kmemleak.txt => dev-tools/kmemleak.rst} | 93 +-- + Documentation/{sparse.txt => dev-tools/sparse.rst} | 39 +- + Documentation/dev-tools/tools.rst | 25 + + Documentation/{ubsan.txt => dev-tools/ubsan.rst} | 42 +- + Documentation/docutils.conf | 7 + + Documentation/gcov.txt | 257 ------- + Documentation/gpu/conf.py | 5 + + Documentation/gpu/index.rst | 7 + + Documentation/index.rst | 9 +- + Documentation/kasan.txt | 171 ----- + Documentation/kbuild/kconfig-language.txt | 39 +- + Documentation/kernel-documentation.rst | 29 + + Documentation/kernel-parameters.txt | 2 +- + Documentation/kmemcheck.txt | 754 --------------------- + Documentation/kprobes.txt | 10 + + Documentation/media/Makefile | 3 +- + Documentation/media/conf.py | 5 + + Documentation/media/conf_nitpick.py | 93 +++ + Documentation/media/index.rst | 19 + + Documentation/media/uapi/cec/cec-func-open.rst | 2 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 5 +- + Documentation/serial/serial-rs485.txt | 5 +- + Documentation/sphinx/cdomain.py | 102 +++ + Documentation/sphinx/load_config.py | 32 + + Documentation/sphinx/parse-headers.pl | 2 +- + MAINTAINERS | 10 +- + Makefile | 2 +- + README | 8 +- + scripts/kernel-doc | 3 - + 41 files changed, 2125 insertions(+), 1592 deletions(-) + rename Documentation/{coccinelle.txt => dev-tools/coccinelle.rst} (56%) + create mode 100644 Documentation/dev-tools/gcov.rst + rename Documentation/{gdb-kernel-debugging.txt => dev-tools/gdb-kernel-debugging.rst} (73%) + create mode 100644 Documentation/dev-tools/kasan.rst + rename Documentation/{kcov.txt => dev-tools/kcov.rst} (78%) + create mode 100644 Documentation/dev-tools/kmemcheck.rst + rename Documentation/{kmemleak.txt => dev-tools/kmemleak.rst} (73%) + rename Documentation/{sparse.txt => dev-tools/sparse.rst} (82%) + create mode 100644 Documentation/dev-tools/tools.rst + rename Documentation/{ubsan.txt => dev-tools/ubsan.rst} (78%) + create mode 100644 Documentation/docutils.conf + delete mode 100644 Documentation/gcov.txt + create mode 100644 Documentation/gpu/conf.py + delete mode 100644 Documentation/kasan.txt + delete mode 100644 Documentation/kmemcheck.txt + create mode 100644 Documentation/media/conf.py + create mode 100644 Documentation/media/conf_nitpick.py + create mode 100644 Documentation/media/index.rst + create mode 100644 Documentation/sphinx/cdomain.py + create mode 100644 Documentation/sphinx/load_config.py +Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (523d939ef98f Linux 4.7) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (34276bb062b8 of: fix reference counting in of_graph_get_endpoint_by_regs) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (a2b15c6f3ecb Merge remote-tracking branches 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/jcore,spi.txt | 34 +++ + MAINTAINERS | 13 +- + drivers/spi/Kconfig | 14 ++ + drivers/spi/Makefile | 3 + + drivers/spi/spi-cavium-thunderx.c | 118 +++++++++++ + drivers/spi/spi-cavium.h | 3 + + drivers/spi/spi-fsl-dspi.c | 16 +- + drivers/spi/spi-fsl-espi.c | 91 ++------ + drivers/spi/spi-img-spfi.c | 2 - + drivers/spi/spi-jcore.c | 231 +++++++++++++++++++++ + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-pic32-sqi.c | 6 +- + drivers/spi/spi-qup.c | 1 - + drivers/spi/spi-rspi.c | 14 +- + drivers/spi/spi-sh-msiof.c | 3 + + drivers/spi/spi-ti-qspi.c | 139 +++++++++++-- + drivers/spi/spi-txx9.c | 6 +- + drivers/spi/spi-xlp.c | 13 +- + drivers/spi/spi.c | 19 +- + include/linux/spi/spi.h | 25 ++- + tools/spi/spidev_test.c | 1 + + 21 files changed, 637 insertions(+), 116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/jcore,spi.txt + create mode 100644 drivers/spi/spi-cavium-thunderx.c + create mode 100644 drivers/spi/spi-jcore.c +Merging tip/auto-latest (e3a4fb6d41b0 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Auto-merging include/linux/sched.h +Auto-merging drivers/acpi/internal.h +Auto-merging arch/x86/kernel/head_64.S +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/entry/entry_64.S +Merge made by the 'recursive' strategy. + Documentation/ko_KR/memory-barriers.txt | 3135 ++++++++++++++++++++++++++++++ + Documentation/memory-barriers.txt | 5 +- + arch/x86/entry/entry_64.S | 3 +- + arch/x86/events/core.c | 24 +- + arch/x86/events/intel/core.c | 31 +- + arch/x86/events/intel/ds.c | 108 +- + arch/x86/events/intel/lbr.c | 70 +- + arch/x86/events/intel/rapl.c | 2 + + arch/x86/events/intel/uncore.c | 2 + + arch/x86/events/intel/uncore_snb.c | 2 + + arch/x86/events/perf_event.h | 13 +- + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/kaslr.h | 1 + + arch/x86/include/asm/kdebug.h | 2 - + arch/x86/include/asm/pgtable_64_types.h | 4 +- + arch/x86/include/asm/realmode.h | 2 +- + arch/x86/include/asm/smp.h | 3 - + arch/x86/kernel/acpi/boot.c | 21 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/apic_flat_64.c | 6 +- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 13 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/dumpstack.c | 6 - + arch/x86/kernel/dumpstack_64.c | 11 +- + arch/x86/kernel/head_32.S | 8 +- + arch/x86/kernel/head_64.S | 12 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/mpparse.c | 3 + + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 10 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 7 +- + arch/x86/kernel/setup_percpu.c | 4 +- + arch/x86/kernel/smpboot.c | 13 +- + arch/x86/kernel/x86_init.c | 6 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/mm/amdtopology.c | 22 +- + arch/x86/mm/kaslr.c | 26 +- + arch/x86/pci/pcbios.c | 7 +- + arch/x86/platform/intel-mid/pwr.c | 6 +- + drivers/acpi/internal.h | 2 - + drivers/acpi/ioapic.c | 46 +- + drivers/acpi/pci_root.c | 12 +- + drivers/irqchip/irq-gic-v3-its.c | 7 +- + drivers/irqchip/irq-gic-v3.c | 11 +- + drivers/irqchip/irq-gic.c | 7 + + drivers/irqchip/irq-mips-gic.c | 18 +- + drivers/pci/setup-bus.c | 5 +- + fs/proc/base.c | 2 +- + include/linux/acpi.h | 6 + + include/linux/bitmap.h | 18 + + include/linux/percpu-rwsem.h | 84 +- + include/linux/perf_event.h | 24 +- + include/linux/rcu_sync.h | 1 + + include/linux/sched.h | 12 +- + kernel/cgroup.c | 6 + + kernel/cpu.c | 8 + + kernel/events/core.c | 97 +- + kernel/events/uprobes.c | 36 +- + kernel/irq/affinity.c | 2 + + kernel/irq/chip.c | 11 + + kernel/irq/manage.c | 8 +- + kernel/locking/percpu-rwsem.c | 228 ++- + kernel/locking/qspinlock_paravirt.h | 24 +- + kernel/locking/qspinlock_stat.h | 4 +- + kernel/locking/rwsem-xadd.c | 92 +- + kernel/rcu/sync.c | 14 + + kernel/sched/core.c | 75 +- + kernel/sched/cputime.c | 33 +- + kernel/sched/deadline.c | 22 +- + kernel/sched/fair.c | 118 +- + kernel/sched/sched.h | 3 +- + tools/include/linux/string.h | 6 +- + tools/perf/util/evsel.c | 6 +- + tools/perf/util/unwind-libdw.c | 2 +- + tools/perf/util/unwind-libunwind-local.c | 2 +- + 88 files changed, 4132 insertions(+), 551 deletions(-) + create mode 100644 Documentation/ko_KR/memory-barriers.txt +Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (6fa06b0d9e95 EDAC, mpc85xx: Fix PCIe error capture) +$ git merge edac-amd/for-next +Auto-merging drivers/edac/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 98 ++++++ + arch/arm/boot/dts/socfpga_arria10.dtsi | 16 + + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 12 + + drivers/edac/Kconfig | 35 +++ + drivers/edac/altera_edac.c | 327 ++++++++++++++++++++- + drivers/edac/altera_edac.h | 5 + + drivers/edac/amd64_edac.c | 15 +- + drivers/edac/mpc85xx_edac.c | 12 +- + drivers/edac/wq.c | 2 +- + 9 files changed, 506 insertions(+), 16 deletions(-) +Merging irqchip/irqchip/for-next (e9abd777ebe8 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Auto-merging drivers/irqchip/irq-mips-gic.c +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/jcore,aic.txt | 26 +++ + .../interrupt-controller/marvell,armada-8k-pic.txt | 25 +++ + arch/arm64/Kconfig.platforms | 1 + + arch/sh/Makefile | 2 +- + drivers/irqchip/Kconfig | 10 ++ + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-jcore-aic.c | 95 ++++++++++ + drivers/irqchip/irq-mips-gic.c | 7 +- + drivers/irqchip/irq-mvebu-pic.c | 197 +++++++++++++++++++++ + 9 files changed, 358 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/jcore,aic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-8k-pic.txt + create mode 100644 drivers/irqchip/irq-jcore-aic.c + create mode 100644 drivers/irqchip/irq-mvebu-pic.c +Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (89d39c83d193 rcu: Tighted up __call_rcu() rcu_head alignment check) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/cpu.c +Merge made by the 'recursive' strategy. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 476 ++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + .../RCU/Design/Requirements/Requirements.html | 22 + + Documentation/RCU/torture.txt | 15 - + drivers/misc/lkdtm.h | 2 + + drivers/misc/lkdtm_bugs.c | 68 ++ + drivers/misc/lkdtm_core.c | 2 + + include/linux/bug.h | 17 + + include/linux/list.h | 44 +- + include/linux/rculist.h | 8 +- + include/linux/rcupdate.h | 1 + + include/linux/torture.h | 2 +- + kernel/cpu.c | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcuperf.c | 7 +- + kernel/rcu/rcutorture.c | 62 +- + kernel/rcu/tree.c | 51 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 124 +-- + kernel/rcu/tree_plugin.h | 1 + + kernel/rcu/tree_trace.c | 7 +- + kernel/rcu/update.c | 3 +- + kernel/rcu/waketorture.c | 537 +++++++++++++ + kernel/sched/core.c | 7 + + kernel/torture.c | 27 +- + lib/Kconfig.debug | 30 + + lib/list_debug.c | 99 +-- + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + 47 files changed, 5983 insertions(+), 230 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (694d0d0bb203 Linux 4.8-rc2) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (29b4817d4018 Linux 4.8-rc1) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (1dbbcbf3f553 KVM: s390: lazy enable RI) +$ git merge kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kvm/gaccess.c | 37 ++++++++--------- + arch/s390/kvm/guestdbg.c | 28 ++++++++----- + arch/s390/kvm/intercept.c | 1 + + arch/s390/kvm/interrupt.c | 94 +++++++++++++++++++++++++++++++----------- + arch/s390/kvm/kvm-s390.c | 47 ++++++--------------- + arch/s390/kvm/kvm-s390.h | 4 +- + arch/s390/kvm/priv.c | 21 ++++++++++ + 8 files changed, 143 insertions(+), 90 deletions(-) +Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + lib/percpu-refcount.c | 169 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 95 insertions(+), 74 deletions(-) +Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (29b4817d4018 Linux 4.8-rc1) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + include/uapi/linux/hsi/hsi_char.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging leds/for-next (1d1a77ddc8ac leds: centralize definition of "default-state" property) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 7 + + .../devicetree/bindings/leds/leds-bcm6328.txt | 2 +- + .../devicetree/bindings/leds/leds-bcm6358.txt | 2 +- + .../devicetree/bindings/leds/leds-gpio.txt | 9 +- + .../devicetree/bindings/leds/leds-is31fl319x.txt | 59 +++ + .../devicetree/bindings/leds/leds-pm8058.txt | 67 +++ + .../devicetree/bindings/leds/register-bit-led.txt | 9 +- + drivers/leds/Kconfig | 20 + + drivers/leds/Makefile | 2 + + drivers/leds/led-triggers.c | 18 +- + drivers/leds/leds-is31fl319x.c | 450 +++++++++++++++++++++ + drivers/leds/leds-pm8058.c | 191 +++++++++ + 12 files changed, 810 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-is31fl319x.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-pm8058.txt + create mode 100644 drivers/leds/leds-is31fl319x.c + create mode 100644 drivers/leds/leds-pm8058.c +Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (694d0d0bb203 Linux 4.8-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (694d0d0bb203 Linux 4.8-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (1aaaa9acaea1 Merge 4.8-rc3 into usb-next) +$ git merge usb/usb-next +Auto-merging include/linux/bcma/bcma_regs.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb4604.txt | 19 ++ + drivers/usb/atm/cxacru.c | 2 - + drivers/usb/atm/ueagle-atm.c | 4 +- + drivers/usb/atm/usbatm.c | 1 - + drivers/usb/class/cdc-wdm.c | 149 +++++++++-- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/common/ulpi.c | 5 +- + drivers/usb/core/Kconfig | 1 - + drivers/usb/core/Makefile | 3 +- + drivers/usb/core/of.c | 1 + + drivers/usb/dwc2/hcd.c | 2 +- + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/host/bcma-hcd.c | 101 +++++++- + drivers/usb/host/ehci-platform.c | 2 +- + drivers/usb/host/fsl-mph-dr-of.c | 18 +- + drivers/usb/host/whci/init.c | 2 +- + drivers/usb/misc/Kconfig | 6 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/adutux.c | 8 +- + drivers/usb/misc/appledisplay.c | 14 +- + drivers/usb/misc/ftdi-elan.c | 66 +---- + drivers/usb/misc/iowarrior.c | 6 +- + drivers/usb/misc/ldusb.c | 8 +- + drivers/usb/misc/legousbtower.c | 8 +- + drivers/usb/misc/lvstest.c | 21 +- + drivers/usb/misc/sisusbvga/sisusb.c | 3 - + drivers/usb/misc/usb4604.c | 175 +++++++++++++ + drivers/usb/misc/uss720.c | 1 - + drivers/usb/misc/yurex.c | 8 +- + drivers/usb/storage/usb.c | 10 +- + drivers/usb/usb-skeleton.c | 5 +- + drivers/usb/usbip/Kconfig | 21 ++ + drivers/usb/usbip/stub_rx.c | 1 - + drivers/usb/usbip/vhci.h | 54 +++- + drivers/usb/usbip/vhci_hcd.c | 285 ++++++++++++++------- + drivers/usb/usbip/vhci_rx.c | 21 +- + drivers/usb/usbip/vhci_sysfs.c | 296 +++++++++++++++++----- + drivers/usb/wusbcore/wa-nep.c | 4 +- + drivers/usb/wusbcore/wa-xfer.c | 4 +- + drivers/uwb/hwa-rc.c | 4 +- + include/linux/bcma/bcma_regs.h | 1 + + include/linux/ulpi/driver.h | 6 +- + 42 files changed, 989 insertions(+), 364 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/usb4604.txt + create mode 100644 drivers/usb/misc/usb4604.c +Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/keyspan_pda.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 171 ++++++++++++---------------------- + 2 files changed, 60 insertions(+), 115 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (1d9aabecde29 usb: chipidea: udc: Use direction flags consequently) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 ++ + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 31 ++++++++++------------ + drivers/usb/chipidea/usbmisc_imx.c | 22 +++++++++++---- + 6 files changed, 38 insertions(+), 22 deletions(-) +Merging staging/staging-next (d5bd1eba1923 Merge tag 'iio-for-4.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-testing) +$ git merge staging/staging-next +Auto-merging drivers/staging/wilc1000/linux_wlan.c +Removing drivers/staging/unisys/visorbus/periodic_work.c +Removing drivers/staging/unisys/include/periodic_work.h +Auto-merging drivers/staging/octeon/ethernet.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/comedi/drivers/dt2811.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +Auto-merging drivers/iio/light/Kconfig +Auto-merging drivers/iio/humidity/Kconfig +Auto-merging drivers/iio/chemical/atlas-ph-sensor.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/accel/Kconfig +Auto-merging drivers/dma-buf/sync_trace.h +Auto-merging drivers/dma-buf/sync_debug.h +Auto-merging drivers/dma-buf/sync_debug.c +Auto-merging drivers/dma-buf/sw_sync.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/soc/mediatek/auxadc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/iio/accel/dmard06.txt | 19 + + .../devicetree/bindings/iio/accel/kionix,kxsd9.txt | 22 + + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 29 + + .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 16 + + .../bindings/iio/chemical/atlas,orp-sm.txt | 22 + + .../bindings/iio/magnetometer/ak8974.txt | 29 + + .../iio/temperature/maxim_thermocouple.txt | 21 + + .../devicetree/bindings/soc/mediatek/auxadc.txt | 21 - + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 14 + + drivers/android/binder.c | 7 +- + drivers/dma-buf/Kconfig | 13 + + drivers/dma-buf/Makefile | 1 + + drivers/{staging/android => dma-buf}/sw_sync.c | 37 +- + drivers/{staging/android => dma-buf}/sync_debug.c | 2 +- + drivers/{staging/android => dma-buf}/sync_debug.h | 2 +- + .../android/trace/sync.h => dma-buf/sync_trace.h} | 6 +- + drivers/iio/accel/Kconfig | 21 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/bma180.c | 9 +- + drivers/iio/accel/dmard06.c | 241 ++++ + drivers/iio/accel/dmard09.c | 157 +++ + drivers/iio/accel/kxcjk-1013.c | 1 + + drivers/iio/adc/Kconfig | 25 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7298.c | 20 +- + drivers/iio/adc/ad7793.c | 10 +- + drivers/iio/adc/mt6577_auxadc.c | 291 +++++ + drivers/iio/adc/nau7802.c | 2 +- + drivers/iio/adc/ti-adc161s626.c | 248 ++++ + drivers/iio/buffer/industrialio-buffer-cb.c | 24 +- + drivers/iio/chemical/Kconfig | 1 + + drivers/iio/chemical/atlas-ph-sensor.c | 81 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 22 +- + drivers/iio/dac/Kconfig | 9 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/cio-dac.c | 144 +++ + drivers/iio/humidity/Kconfig | 8 +- + drivers/iio/light/Kconfig | 6 +- + drivers/iio/light/us5182d.c | 2 +- + drivers/iio/light/vcnl4000.c | 72 +- + drivers/iio/magnetometer/Kconfig | 16 +- + drivers/iio/magnetometer/Makefile | 1 + + drivers/iio/magnetometer/ak8974.c | 863 +++++++++++++ + drivers/iio/magnetometer/mag3110.c | 23 +- + drivers/iio/proximity/sx9500.c | 2 +- + drivers/iio/temperature/Kconfig | 16 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/maxim_thermocouple.c | 281 ++++ + drivers/staging/android/Kconfig | 13 - + drivers/staging/android/Makefile | 1 - + drivers/staging/android/ion/ion.c | 109 +- + drivers/staging/android/ion/ion.h | 41 - + drivers/staging/android/ion/ion_carveout_heap.c | 33 +- + drivers/staging/android/ion/ion_chunk_heap.c | 17 +- + drivers/staging/android/ion/ion_cma_heap.c | 34 +- + drivers/staging/android/ion/ion_heap.c | 10 +- + drivers/staging/android/ion/ion_page_pool.c | 10 +- + drivers/staging/android/ion/ion_priv.h | 35 +- + drivers/staging/android/ion/ion_system_heap.c | 229 ++-- + drivers/staging/android/ion/ion_test.c | 23 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 141 -- + drivers/staging/comedi/drivers/addi_apci_3501.c | 85 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 4 +- + drivers/staging/comedi/drivers/das08_cs.c | 73 +- + drivers/staging/comedi/drivers/dt2811.c | 4 +- + drivers/staging/comedi/drivers/dt9812.c | 4 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +- + drivers/staging/comedi/drivers/ni_670x.c | 62 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 103 +- + drivers/staging/comedi/drivers/ni_atmio.c | 165 ++- + drivers/staging/comedi/drivers/ni_atmio16d.c | 106 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 58 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 67 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 95 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 216 ++-- + drivers/staging/comedi/drivers/ni_usb6501.c | 4 +- + drivers/staging/comedi/drivers/plx9080.h | 95 +- + drivers/staging/comedi/drivers/s626.c | 3 +- + drivers/staging/comedi/drivers/usbduxfast.c | 4 +- + drivers/staging/comedi/drivers/vmk80xx.c | 12 +- + drivers/staging/dgnc/dgnc_cls.c | 965 +++++++------- + drivers/staging/dgnc/dgnc_driver.c | 8 +- + drivers/staging/dgnc/dgnc_driver.h | 10 +- + drivers/staging/dgnc/dgnc_neo.c | 14 - + drivers/staging/dgnc/dgnc_tty.c | 50 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 4 +- + drivers/staging/fbtft/fb_ili9320.c | 4 +- + drivers/staging/fbtft/fb_ili9325.c | 10 +- + drivers/staging/fbtft/fb_pcd8544.c | 4 +- + drivers/staging/fbtft/fb_ssd1289.c | 2 +- + drivers/staging/fbtft/fb_ssd1351.c | 2 +- + drivers/staging/fbtft/fb_tls8204.c | 2 +- + drivers/staging/fbtft/fb_uc1611.c | 12 +- + drivers/staging/fbtft/fb_watterott.c | 8 +- + drivers/staging/fbtft/fbtft-core.c | 26 +- + drivers/staging/fbtft/fbtft.h | 26 +- + drivers/staging/fbtft/fbtft_device.c | 22 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 4 +- + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 +- + drivers/staging/fsl-mc/bus/mc-allocator.c | 6 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 27 +- + drivers/staging/fsl-mc/include/mc.h | 7 + + drivers/staging/gdm724x/gdm_tty.c | 1 - + drivers/staging/gdm724x/gdm_usb.c | 8 +- + drivers/staging/gdm724x/netlink_k.c | 11 +- + drivers/staging/i4l/icn/icn.c | 73 +- + drivers/staging/i4l/pcbit/capi.c | 4 +- + drivers/staging/i4l/pcbit/drv.c | 16 +- + drivers/staging/i4l/pcbit/edss1.c | 7 +- + drivers/staging/i4l/pcbit/layer2.c | 8 +- + drivers/staging/iio/light/isl29018.c | 134 +- + drivers/staging/iio/light/isl29028.c | 103 +- + drivers/staging/iio/meter/ade7854.c | 40 +- + drivers/staging/ks7010/ks7010_sdio.c | 25 +- + drivers/staging/ks7010/ks_hostif.c | 18 +- + drivers/staging/ks7010/michael_mic.c | 20 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 10 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 3 + + .../lustre/include/linux/libcfs/libcfs_private.h | 9 - + .../staging/lustre/include/linux/lnet/lib-lnet.h | 65 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 5 +- + drivers/staging/lustre/include/linux/lnet/types.h | 16 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 5 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 152 +-- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 - + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 8 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 44 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 207 +-- + drivers/staging/lustre/lnet/libcfs/debug.c | 9 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 2 - + .../lustre/lnet/libcfs/linux/linux-crypto.c | 4 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 352 ++--- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 18 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 21 +- + drivers/staging/lustre/lnet/lnet/lo.c | 39 +- + drivers/staging/lustre/lnet/lnet/router.c | 10 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 15 +- + drivers/staging/lustre/lnet/selftest/framework.c | 4 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 8 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 19 + + drivers/staging/lustre/lustre/fld/fld_request.c | 55 +- + drivers/staging/lustre/lustre/include/cl_object.h | 77 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 6 + + drivers/staging/lustre/lustre/include/lu_object.h | 22 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 433 ++++--- + .../lustre/lustre/include/lustre/lustre_ioctl.h | 412 ++++++ + .../lustre/lustre/include/lustre/lustre_user.h | 77 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 11 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 36 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 32 +- + .../staging/lustre/lustre/include/lustre_handles.h | 3 +- + .../staging/lustre/lustre/include/lustre_import.h | 22 - + drivers/staging/lustre/lustre/include/lustre_lib.h | 286 +---- + .../staging/lustre/lustre/include/lustre_lite.h | 14 +- + drivers/staging/lustre/lustre/include/lustre_lmv.h | 121 ++ + drivers/staging/lustre/lustre/include/lustre_log.h | 3 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 23 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 3 - + .../lustre/lustre/include/lustre_req_layout.h | 3 - + drivers/staging/lustre/lustre/include/lustre_ver.h | 17 +- + drivers/staging/lustre/lustre/include/obd.h | 202 +-- + drivers/staging/lustre/lustre/include/obd_class.h | 121 +- + .../staging/lustre/lustre/include/obd_support.h | 23 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 106 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 17 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 24 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 79 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 21 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 38 +- + drivers/staging/lustre/lustre/llite/dir.c | 872 ++++++------- + drivers/staging/lustre/lustre/llite/file.c | 361 ++++-- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 70 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 472 +++++-- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 69 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 123 +- + drivers/staging/lustre/lustre/llite/namei.c | 190 ++- + drivers/staging/lustre/lustre/llite/rw.c | 13 +- + drivers/staging/lustre/lustre/llite/rw26.c | 9 +- + drivers/staging/lustre/lustre/llite/statahead.c | 98 +- + drivers/staging/lustre/lustre/llite/super25.c | 4 +- + drivers/staging/lustre/lustre/llite/symlink.c | 12 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 6 - + drivers/staging/lustre/lustre/llite/vvp_internal.h | 6 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 2 + + drivers/staging/lustre/lustre/llite/xattr.c | 318 +++-- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 24 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 371 ++++-- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 131 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 1341 ++++++++++++++------ + .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 22 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 23 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 1 + + drivers/staging/lustre/lustre/lov/lov_page.c | 12 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 17 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 27 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 207 ++- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 129 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 17 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 598 +++++++-- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 10 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 14 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 35 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 140 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 1 + + .../lustre/lustre/obdclass/linux/linux-obdo.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 1 + + .../lustre/lustre/obdclass/lprocfs_status.c | 146 +++ + drivers/staging/lustre/lustre/obdclass/lu_object.c | 125 +- + .../lustre/lustre/obdclass/lustre_handles.c | 6 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 31 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 33 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 13 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 2 +- + .../staging/lustre/lustre/obdecho/echo_internal.h | 4 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 143 +-- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 3 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 9 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 208 ++- + drivers/staging/lustre/lustre/osc/osc_request.c | 90 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 17 - + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 3 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 104 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 32 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 42 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 665 +++++----- + drivers/staging/media/lirc/lirc_imon.c | 9 +- + drivers/staging/media/lirc/lirc_sasem.c | 5 - + drivers/staging/most/aim-cdev/cdev.c | 24 +- + drivers/staging/most/aim-network/networking.c | 26 +- + drivers/staging/most/aim-v4l2/video.c | 117 +- + drivers/staging/most/hdm-dim2/dim2_hal.c | 71 +- + drivers/staging/most/hdm-dim2/dim2_hal.h | 3 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 16 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 8 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 290 ++--- + drivers/staging/most/mostcore/core.c | 72 +- + drivers/staging/octeon/ethernet-util.h | 7 +- + drivers/staging/octeon/ethernet.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 99 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 + + drivers/staging/rtl8188eu/include/osdep_service.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_efuse.h | 12 - + drivers/staging/rtl8188eu/include/rtw_event.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 17 +- + drivers/staging/rtl8188eu/include/rtw_xmit.h | 3 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 7 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 40 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 12 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 120 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 3 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 5 + + drivers/staging/rtl8192e/rtllib.h | 10 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 58 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 34 +- + drivers/staging/rtl8192e/rtllib_wx.c | 10 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + drivers/staging/rtl8192u/r8192U.h | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 19 +- + drivers/staging/rtl8712/ieee80211.c | 25 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/osdep_intf.h | 2 +- + drivers/staging/rtl8712/recv_linux.c | 1 - + drivers/staging/rtl8712/rtl8712_cmd.c | 4 +- + drivers/staging/rtl8712/rtl8712_recv.h | 1 - + drivers/staging/rtl8712/rtl871x_cmd.c | 8 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 4 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 2 +- + drivers/staging/rtl8712/usb_ops_linux.c | 92 +- + drivers/staging/rtl8712/xmit_linux.c | 17 +- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 80 +- + drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 11 +- + drivers/staging/rtl8723au/core/rtw_xmit.c | 4 - + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 2 +- + drivers/staging/rtl8723au/include/osdep_service.h | 1 - + drivers/staging/rtl8723au/include/rtw_io.h | 2 - + drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 3 +- + drivers/staging/rtl8723au/include/rtw_xmit.h | 5 - + drivers/staging/rtl8723au/os_dep/usb_intf.c | 11 +- + drivers/staging/rts5208/ms.c | 29 +- + drivers/staging/rts5208/ms.h | 1 - + drivers/staging/rts5208/rtsx.c | 7 - + drivers/staging/rts5208/rtsx.h | 2 +- + drivers/staging/rts5208/rtsx_card.c | 1 - + drivers/staging/rts5208/rtsx_chip.h | 6 - + drivers/staging/rts5208/rtsx_scsi.c | 6 +- + drivers/staging/rts5208/rtsx_transport.h | 1 - + drivers/staging/rts5208/sd.c | 4 - + drivers/staging/rts5208/spi.h | 1 - + drivers/staging/rts5208/xd.c | 4 - + drivers/staging/slicoss/slic.h | 66 +- + drivers/staging/slicoss/slichw.h | 409 ++---- + drivers/staging/slicoss/slicoss.c | 629 ++++----- + drivers/staging/sm750fb/ddk750_chip.c | 14 +- + drivers/staging/sm750fb/ddk750_display.c | 13 +- + drivers/staging/sm750fb/ddk750_dvi.c | 8 +- + drivers/staging/sm750fb/sm750_hw.c | 100 +- + drivers/staging/speakup/devsynth.c | 2 +- + drivers/staging/speakup/synth.c | 2 +- + drivers/staging/unisys/include/guestlinuxdebug.h | 4 +- + drivers/staging/unisys/include/periodic_work.h | 40 - + drivers/staging/unisys/include/visorbus.h | 80 +- + drivers/staging/unisys/visorbus/Makefile | 1 - + drivers/staging/unisys/visorbus/periodic_work.c | 204 --- + drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 65 +- + .../unisys/{include => visorbus}/vbushelper.h | 0 + drivers/staging/unisys/visorbus/visorbus_main.c | 615 +++++---- + drivers/staging/unisys/visorbus/visorbus_private.h | 73 +- + drivers/staging/unisys/visorbus/visorchannel.c | 269 ++-- + drivers/staging/unisys/visorbus/visorchipset.c | 434 ++++--- + drivers/staging/unisys/visorinput/visorinput.c | 141 +- + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/vt6655/channel.c | 3 +- + drivers/staging/vt6655/device_main.c | 8 +- + drivers/staging/vt6655/power.c | 12 +- + drivers/staging/vt6656/baseband.h | 4 +- + drivers/staging/vt6656/card.c | 75 +- + drivers/staging/vt6656/dpc.c | 14 +- + drivers/staging/vt6656/dpc.h | 2 +- + drivers/staging/vt6656/main_usb.c | 12 +- + drivers/staging/wilc1000/TODO | 1 - + drivers/staging/wilc1000/linux_wlan.c | 1 - + drivers/staging/wilc1000/wilc_debugfs.c | 29 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +- + drivers/staging/wilc1000/wilc_wlan.h | 2 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 506 ++++---- + drivers/staging/wlan-ng/prism2usb.c | 14 +- + include/linux/hid-sensor-hub.h | 1 + + include/linux/iio/consumer.h | 12 + + tools/iio/lsiio.c | 3 +- + 367 files changed, 13148 insertions(+), 9602 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard06.txt + create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt + create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8974.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim_thermocouple.txt + delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/auxadc.txt + rename drivers/{staging/android => dma-buf}/sw_sync.c (87%) + rename drivers/{staging/android => dma-buf}/sync_debug.c (99%) + rename drivers/{staging/android => dma-buf}/sync_debug.h (97%) + rename drivers/{staging/android/trace/sync.h => dma-buf/sync_trace.h} (84%) + create mode 100644 drivers/iio/accel/dmard06.c + create mode 100644 drivers/iio/accel/dmard09.c + create mode 100644 drivers/iio/adc/mt6577_auxadc.c + create mode 100644 drivers/iio/adc/ti-adc161s626.c + create mode 100644 drivers/iio/dac/cio-dac.c + create mode 100644 drivers/iio/magnetometer/ak8974.c + create mode 100644 drivers/iio/temperature/maxim_thermocouple.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_lmv.h + delete mode 100644 drivers/staging/unisys/include/periodic_work.h + delete mode 100644 drivers/staging/unisys/visorbus/periodic_work.c + rename drivers/staging/unisys/{include => visorbus}/vbushelper.h (100%) +Merging char-misc/char-misc-next (4c73c0882b34 checkkconfigsymbols.py: add --no-color option, don't print color to non-TTY) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + scripts/checkkconfigsymbols.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging extcon/extcon-next (160a746f5205 extcon: Use the extcon_set_state_sync() instead of deprecated functions) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-adc-jack.c | 27 +- + drivers/extcon/extcon-arizona.c | 27 +- + drivers/extcon/extcon-axp288.c | 8 +- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon-max14577.c | 18 +- + drivers/extcon/extcon-max3355.c | 8 +- + drivers/extcon/extcon-max77693.c | 46 +- + drivers/extcon/extcon-max77843.c | 22 +- + drivers/extcon/extcon-max8997.c | 20 +- + drivers/extcon/extcon-palmas.c | 16 +- + drivers/extcon/extcon-rt8973a.c | 4 +- + drivers/extcon/extcon-sm5502.c | 4 +- + drivers/extcon/extcon-usb-gpio.c | 8 +- + drivers/extcon/extcon.c | 774 ++++++++++++++++++++++++++------- + include/linux/extcon.h | 181 +++++++- + include/linux/extcon/extcon-adc-jack.h | 4 +- + 16 files changed, 893 insertions(+), 276 deletions(-) +Merging cgroup/for-next (667430ec48e4 Merge branch 'for-4.8-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup.c +Auto-merging include/linux/cgroup.h +Auto-merging fs/kernfs/dir.c +Merge made by the 'recursive' strategy. + fs/kernfs/dir.c | 84 +++++----------------- + fs/sysfs/dir.c | 6 +- + include/linux/blk-cgroup.h | 11 +-- + include/linux/cgroup.h | 9 ++- + include/linux/kernfs.h | 28 +++++--- + include/trace/events/cgroup.h | 163 ++++++++++++++++++++++++++++++++++++++++++ + kernel/cgroup.c | 73 ++++++++++++------- + kernel/cpuset.c | 27 +++++-- + kernel/fork.c | 4 +- + kernel/sched/debug.c | 3 +- + 10 files changed, 280 insertions(+), 128 deletions(-) + create mode 100644 include/trace/events/cgroup.h +Merging scsi/for-next (dc43bf39f505 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 + + drivers/s390/scsi/zfcp_dbf.c | 162 +- + drivers/s390/scsi/zfcp_dbf.h | 14 +- + drivers/s390/scsi/zfcp_erp.c | 12 +- + drivers/s390/scsi/zfcp_ext.h | 8 +- + drivers/s390/scsi/zfcp_fsf.c | 22 +- + drivers/s390/scsi/zfcp_fsf.h | 4 +- + drivers/s390/scsi/zfcp_scsi.c | 8 +- + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + drivers/scsi/constants.c | 5 +- + drivers/scsi/cxlflash/superpipe.c | 110 +- + drivers/scsi/cxlflash/superpipe.h | 2 + + drivers/scsi/libfc/fc_exch.c | 1 - + drivers/scsi/libfc/fc_rport.c | 26 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 259 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 24 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 7 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 49 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 169 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 28 +- + drivers/scsi/qla2xxx/qla_os.c | 12 +- + drivers/scsi/scsi_devinfo.c | 4 + + drivers/scsi/scsi_transport_sas.c | 16 - + drivers/scsi/ses.c | 2 +- + drivers/scsi/smartpqi/Kconfig | 50 + + drivers/scsi/smartpqi/Makefile | 3 + + drivers/scsi/smartpqi/smartpqi.h | 1133 +++++ + drivers/scsi/smartpqi/smartpqi_init.c | 6306 ++++++++++++++++++++++++ + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 350 ++ + drivers/scsi/smartpqi/smartpqi_sis.c | 394 ++ + drivers/scsi/smartpqi/smartpqi_sis.h | 32 + + include/scsi/scsi_transport_sas.h | 5 +- + 33 files changed, 8799 insertions(+), 431 deletions(-) + create mode 100644 drivers/scsi/smartpqi/Kconfig + create mode 100644 drivers/scsi/smartpqi/Makefile + create mode 100644 drivers/scsi/smartpqi/smartpqi.h + create mode 100644 drivers/scsi/smartpqi/smartpqi_init.c + create mode 100644 drivers/scsi/smartpqi/smartpqi_sas_transport.c + create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.c + create mode 100644 drivers/scsi/smartpqi/smartpqi_sis.h +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (6650248f46d7 Merge branch 'for-4.8-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stih407-family.dtsi | 4 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 ++- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 ++ + drivers/ata/ahci_qoriq.c | 12 ++++++------ + drivers/ata/ahci_st.c | 4 ++++ + drivers/ata/libahci.c | 4 ++-- + drivers/ata/libata-scsi.c | 8 ++++---- + 7 files changed, 24 insertions(+), 13 deletions(-) +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging pinctrl/for-next (4bd0641c2d73 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/pinctrl-st.txt | 8 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 5 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 5 +- + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 32 +- + drivers/pinctrl/meson/pinctrl-meson.c | 222 +- + drivers/pinctrl/meson/pinctrl-meson.h | 52 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 24 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 24 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/pinctrl-palmas.c | 4 +- + drivers/pinctrl/pinctrl-pistachio.c | 12 +- + drivers/pinctrl/pinctrl-st.c | 17 - + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 + + drivers/pinctrl/samsung/pinctrl-exynos.c | 6 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 2624 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 356 ++- + drivers/pinctrl/sh-pfc/sh_pfc.h | 108 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 12 +- + 24 files changed, 3212 insertions(+), 325 deletions(-) + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7792.c +Merging vhost/linux-next (a77ec83a5789 vhost/scsi: fix reuse of &vq->iov[out] in response) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vhost/scsi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (f6ed80141833 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../bindings/remoteproc/qcom,wcnss-pil.txt | 132 +++++ + drivers/remoteproc/Kconfig | 16 + + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/omap_remoteproc.c | 5 +- + drivers/remoteproc/qcom_q6v5_pil.c | 4 +- + drivers/remoteproc/qcom_wcnss.c | 624 +++++++++++++++++++++ + drivers/remoteproc/qcom_wcnss.h | 22 + + drivers/remoteproc/qcom_wcnss_iris.c | 188 +++++++ + drivers/remoteproc/remoteproc_core.c | 185 +++--- + drivers/remoteproc/remoteproc_debugfs.c | 20 +- + drivers/remoteproc/remoteproc_elf_loader.c | 6 +- + drivers/remoteproc/remoteproc_internal.h | 15 +- + drivers/remoteproc/remoteproc_virtio.c | 35 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 + + drivers/rpmsg/virtio_rpmsg_bus.c | 70 +-- + include/linux/platform_data/remoteproc-omap.h | 6 +- + include/linux/remoteproc.h | 9 +- + include/linux/rpmsg.h | 8 +- + samples/rpmsg/rpmsg_client_sample.c | 18 +- + 20 files changed, 1171 insertions(+), 198 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 drivers/remoteproc/qcom_wcnss.c + create mode 100644 drivers/remoteproc/qcom_wcnss.h + create mode 100644 drivers/remoteproc/qcom_wcnss_iris.c +Merging gpio/for-next (0926ebf30f55 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/gpio/gpio-tps65086.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/brcm,bcm6345-gpio.txt | 46 ++ + .../devicetree/bindings/gpio/gpio-axp209.txt | 30 ++ + .../devicetree/bindings/gpio/gpio-tps65086.txt | 16 - + .../devicetree/bindings/gpio/gpio-ts4900.txt | 30 ++ + Documentation/devicetree/bindings/mfd/stmpe.txt | 2 +- + Documentation/gpio/board.txt | 6 +- + Documentation/gpio/gpio-legacy.txt | 16 +- + MAINTAINERS | 6 + + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 12 +- + arch/blackfin/Kconfig | 2 +- + drivers/gpio/Kconfig | 60 ++- + drivers/gpio/Makefile | 4 + + drivers/gpio/gpio-axp209.c | 162 +++++++ + drivers/gpio/gpio-gpio-mm.c | 267 ++++++++++++ + drivers/gpio/gpio-mmio.c | 4 + + drivers/gpio/gpio-pca953x.c | 41 +- + drivers/gpio/gpio-stmpe.c | 167 +++++--- + drivers/gpio/gpio-ts4900.c | 190 +++++++++ + drivers/gpio/gpio-wcove.c | 469 +++++++++++++++++++++ + drivers/gpio/gpiolib.c | 12 +- + drivers/mfd/stmpe-i2c.c | 2 + + drivers/mfd/stmpe.c | 161 +++++-- + drivers/mfd/stmpe.h | 85 +++- + include/linux/mfd/stmpe.h | 21 + + 25 files changed, 1649 insertions(+), 163 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-axp209.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tps65086.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4900.txt + create mode 100644 drivers/gpio/gpio-axp209.c + create mode 100644 drivers/gpio/gpio-gpio-mm.c + create mode 100644 drivers/gpio/gpio-ts4900.c + create mode 100644 drivers/gpio/gpio-wcove.c +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9687fa3f660d] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (63bb4fd6a391 clk: qcom: gdsc: Add the missing BIMC gdsc for msm8996) +$ git merge clk/clk-next +Removing drivers/clk/clk-max77802.c +Removing drivers/clk/clk-max-gen.h +Removing drivers/clk/clk-max-gen.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/maxim,max77802.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 3 +- + .../bindings/arm/mediatek/mediatek,bdpsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,ethsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,hifsys.txt | 24 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 3 +- + .../bindings/arm/mediatek/mediatek,infracfg.txt | 3 +- + .../bindings/arm/mediatek/mediatek,mmsys.txt | 3 +- + .../bindings/arm/mediatek/mediatek,pericfg.txt | 3 +- + .../bindings/arm/mediatek/mediatek,topckgen.txt | 3 +- + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 3 +- + .../bindings/clock/armada3700-periph-clock.txt | 70 + + .../bindings/clock/armada3700-tbg-clock.txt | 27 + + .../bindings/clock/armada3700-xtal-clock.txt | 28 + + .../devicetree/bindings/clock/maxim,max77686.txt | 118 +- + .../devicetree/bindings/clock/maxim,max77802.txt | 44 - + .../bindings/clock/mvebu-gated-clock.txt | 2 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/qcom,lcc.txt | 1 + + MAINTAINERS | 1 + + drivers/clk/Kconfig | 19 +- + drivers/clk/Makefile | 2 - + drivers/clk/axis/clk-artpec6.c | 4 +- + drivers/clk/berlin/berlin2-avpll.c | 12 +- + drivers/clk/berlin/berlin2-avpll.h | 8 +- + drivers/clk/berlin/berlin2-div.c | 4 +- + drivers/clk/berlin/berlin2-div.h | 4 +- + drivers/clk/berlin/berlin2-pll.c | 6 +- + drivers/clk/berlin/berlin2-pll.h | 9 +- + drivers/clk/berlin/bg2.c | 98 +- + drivers/clk/berlin/bg2q.c | 39 +- + drivers/clk/clk-divider.c | 2 +- + drivers/clk/clk-fixed-factor.c | 74 +- + drivers/clk/clk-fixed-rate.c | 72 +- + drivers/clk/clk-ls1x.c | 69 +- + drivers/clk/clk-max-gen.c | 194 --- + drivers/clk/clk-max-gen.h | 32 - + drivers/clk/clk-max77686.c | 262 ++- + drivers/clk/clk-max77802.c | 96 -- + drivers/clk/clk-qoriq.c | 6 +- + drivers/clk/clk-twl6040.c | 80 +- + drivers/clk/clk.c | 27 +- + drivers/clk/imx/clk-imx7d.c | 16 +- + drivers/clk/imx/clk.h | 9 + + drivers/clk/mediatek/Kconfig | 21 + + drivers/clk/mediatek/Makefile | 6 +- + drivers/clk/mediatek/clk-gate.c | 2 +- + drivers/clk/mediatek/clk-mtk.c | 12 +- + drivers/clk/mediatek/clk-pll.c | 2 +- + drivers/clk/meson/gxbb.c | 6 +- + drivers/clk/mvebu/Kconfig | 3 + + drivers/clk/mvebu/Makefile | 3 + + drivers/clk/mvebu/armada-37xx-periph.c | 449 +++++ + drivers/clk/mvebu/armada-37xx-tbg.c | 158 ++ + drivers/clk/mvebu/armada-37xx-xtal.c | 91 ++ + drivers/clk/mvebu/armada-39x.c | 2 + + drivers/clk/nxp/clk-lpc18xx-creg.c | 3 +- + drivers/clk/qcom/Kconfig | 17 + + drivers/clk/qcom/Makefile | 5 +- + drivers/clk/qcom/gcc-ipq4019.c | 1 - + drivers/clk/qcom/gcc-mdm9615.c | 1727 ++++++++++++++++++++ + drivers/clk/qcom/lcc-mdm9615.c | 580 +++++++ + drivers/clk/qcom/mmcc-msm8996.c | 9 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 7 + + drivers/clk/sunxi/clk-mod0.c | 3 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +- + include/dt-bindings/clock/maxim,max77620.h | 21 + + include/dt-bindings/clock/mt2701-clk.h | 486 ++++++ + include/dt-bindings/clock/qcom,gcc-mdm9615.h | 327 ++++ + include/dt-bindings/clock/qcom,lcc-mdm9615.h | 52 + + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 1 + + include/dt-bindings/reset/mt2701-resets.h | 83 + + include/dt-bindings/reset/qcom,gcc-mdm9615.h | 136 ++ + include/linux/clk-provider.h | 12 + + 74 files changed, 5123 insertions(+), 640 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,bdpsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,hifsys.txt + create mode 100644 Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/armada3700-xtal-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt + delete mode 100644 drivers/clk/clk-max-gen.c + delete mode 100644 drivers/clk/clk-max-gen.h + delete mode 100644 drivers/clk/clk-max77802.c + create mode 100644 drivers/clk/mediatek/Kconfig + create mode 100644 drivers/clk/mvebu/armada-37xx-periph.c + create mode 100644 drivers/clk/mvebu/armada-37xx-tbg.c + create mode 100644 drivers/clk/mvebu/armada-37xx-xtal.c + create mode 100644 drivers/clk/qcom/gcc-mdm9615.c + create mode 100644 drivers/clk/qcom/lcc-mdm9615.c + create mode 100644 include/dt-bindings/clock/maxim,max77620.h + create mode 100644 include/dt-bindings/clock/mt2701-clk.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-mdm9615.h + create mode 100644 include/dt-bindings/clock/qcom,lcc-mdm9615.h + create mode 100644 include/dt-bindings/reset/mt2701-resets.h + create mode 100644 include/dt-bindings/reset/qcom,gcc-mdm9615.h +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (29b4817d4018 Linux 4.8-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (5ad75fcdd712 Documentation: livepatch: add section about arch-specific code) +$ git merge livepatching/for-next +Auto-merging arch/x86/kernel/Makefile +Merge made by the 'recursive' strategy. + Documentation/livepatch/module-elf-format.txt | 20 +++++++-- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/livepatch.c | 65 +++++++++++++++++++++++++++ + include/linux/livepatch.h | 3 ++ + kernel/livepatch/core.c | 16 +++++-- + 5 files changed, 98 insertions(+), 7 deletions(-) + create mode 100644 arch/x86/kernel/livepatch.c +Merging coresight/next (67c52cac0c24 coresight: etm4x: adding configurable start/stop filtering) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 28 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 153 +++++++- + drivers/hwtracing/coresight/coresight-etm-perf.h | 34 ++ + drivers/hwtracing/coresight/coresight-etm.h | 8 - + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 3 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 39 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 63 +++- + drivers/hwtracing/coresight/coresight-etm4x.c | 419 ++++++++++++++++----- + drivers/hwtracing/coresight/coresight-etm4x.h | 11 +- + drivers/hwtracing/coresight/coresight-funnel.c | 20 +- + drivers/hwtracing/coresight/coresight-priv.h | 23 +- + .../coresight/coresight-replicator-qcom.c | 18 +- + drivers/hwtracing/coresight/coresight-replicator.c | 20 +- + drivers/hwtracing/coresight/coresight-stm.c | 53 ++- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +- + drivers/hwtracing/coresight/coresight-tmc.c | 76 ++-- + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 18 +- + drivers/hwtracing/coresight/coresight.c | 29 +- + drivers/hwtracing/coresight/of_coresight.c | 3 +- + include/linux/coresight.h | 5 +- + 22 files changed, 727 insertions(+), 316 deletions(-) +Merging rtc/rtc-next (6c6aba9e8985 rtc: rx6110: remove owner assignment) +$ git merge rtc/rtc-next +Removing drivers/rtc/rtc-isl12057.c +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 - + .../devicetree/bindings/rtc/dallas,ds1390.txt | 2 +- + drivers/rtc/Kconfig | 32 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-bq32k.c | 16 +- + drivers/rtc/rtc-ds1307.c | 54 +- + drivers/rtc/rtc-isl12057.c | 643 --------------------- + drivers/rtc/rtc-pcf2123.c | 5 +- + drivers/rtc/rtc-pic32.c | 1 - + drivers/rtc/rtc-rx6110.c | 1 - + drivers/rtc/rtc-sysfs.c | 4 +- + 11 files changed, 83 insertions(+), 677 deletions(-) + delete mode 100644 drivers/rtc/rtc-isl12057.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (d8d378fa1a0c tools/testing/nvdimm: fix SIGTERM vs hotplug crash) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (7a944a8456be ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes) +$ git merge --no-ff akpm-current/current +Auto-merging sound/soc/intel/skylake/skl-sst-ipc.c +Auto-merging mm/page_alloc.c +Auto-merging include/linux/sysctl.h +Auto-merging include/linux/random.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/proc/base.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/char/random.c +Auto-merging arch/x86/mm/kaslr.c +Auto-merging arch/x86/include/asm/smp.h +Auto-merging arch/mips/cavium-octeon/setup.c +Merge made by the 'recursive' strategy. + Documentation/DMA-attributes.txt | 17 + + Documentation/RCU/lockdep-splat.txt | 2 +- + .../filesystems/autofs4-mount-control.txt | 71 +-- + Documentation/filesystems/autofs4.txt | 8 +- + Kbuild | 12 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/process.c | 3 +- + arch/arm64/kernel/process.c | 8 +- + arch/ia64/kernel/Makefile | 8 +- + arch/mips/cavium-octeon/setup.c | 14 + + arch/mips/include/asm/kexec.h | 1 + + arch/mips/include/asm/page.h | 4 +- + arch/mips/kernel/crash.c | 18 +- + arch/mips/kernel/machine_kexec.c | 1 + + arch/powerpc/kernel/fadump.c | 1 + + arch/powerpc/kernel/iommu.c | 6 +- + arch/s390/kernel/compat_linux.c | 4 +- + arch/s390/kernel/setup.c | 6 +- + arch/tile/mm/mmap.c | 3 +- + arch/um/Makefile | 2 +- + arch/unicore32/kernel/process.c | 3 +- + arch/x86/include/asm/kexec.h | 1 + + arch/x86/include/asm/smp.h | 1 + + arch/x86/kernel/crash.c | 22 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/process.c | 3 +- + arch/x86/kernel/smp.c | 5 + + arch/x86/kernel/sys_x86_64.c | 5 +- + arch/x86/kvm/i8254.c | 14 +- + arch/x86/mm/kaslr.c | 2 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + block/genhd.c | 2 +- + crypto/crypto_engine.c | 16 +- + drivers/block/loop.c | 8 +- + drivers/char/random.c | 36 +- + drivers/infiniband/sw/rdmavt/cq.c | 10 +- + drivers/md/dm-rq.c | 6 +- + drivers/md/dm.c | 4 +- + drivers/media/pci/ivtv/ivtv-driver.c | 6 +- + drivers/media/pci/ivtv/ivtv-irq.c | 2 +- + drivers/net/ethernet/microchip/encx24j600.c | 10 +- + drivers/nvme/host/pci.c | 3 +- + drivers/of/base.c | 2 + + drivers/rapidio/rio_cm.c | 15 +- + drivers/spi/spi.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 22 +- + fs/autofs4/autofs_i.h | 7 +- + fs/autofs4/dev-ioctl.c | 32 +- + fs/autofs4/inode.c | 45 +- + fs/autofs4/root.c | 4 +- + fs/compat.c | 14 - + fs/nfsd/auth.c | 6 +- + fs/nfsd/nfs4state.c | 2 +- + fs/proc/array.c | 189 ++++--- + fs/proc/base.c | 44 +- + fs/proc/meminfo.c | 211 ++++---- + fs/proc/stat.c | 49 +- + fs/seq_file.c | 57 +- + include/linux/auto_dev-ioctl.h | 211 +------- + include/linux/auto_fs.h | 1 - + include/linux/bitops.h | 36 +- + include/linux/compaction.h | 39 +- + include/linux/compat.h | 1 - + include/linux/compiler-gcc.h | 8 +- + include/linux/console.h | 6 + + include/linux/crc64_ecma.h | 56 ++ + include/linux/cred.h | 11 +- + include/linux/dma-mapping.h | 5 + + include/linux/kbuild.h | 2 +- + include/linux/kernel.h | 48 +- + include/linux/kexec.h | 2 + + include/linux/kthread.h | 77 ++- + include/linux/memcontrol.h | 15 + + include/linux/mm.h | 6 +- + include/linux/oom.h | 43 +- + include/linux/page_ext.h | 8 +- + include/linux/page_owner.h | 2 + + include/linux/radix-tree.h | 8 + + include/linux/random.h | 2 +- + include/linux/relay.h | 17 +- + include/linux/sem.h | 1 + + include/linux/seq_file.h | 4 +- + include/linux/sysctl.h | 2 + + include/linux/writeback.h | 1 - + include/trace/events/compaction.h | 2 +- + include/trace/events/zsmalloc.h | 76 +++ + include/uapi/linux/auto_dev-ioctl.h | 221 ++++++++ + include/uapi/linux/auto_fs.h | 1 + + ipc/msg.c | 211 ++++---- + ipc/sem.c | 138 +++-- + kernel/configs/android-base.config | 1 - + kernel/groups.c | 67 +-- + kernel/kthread.c | 577 ++++++++++++++++++--- + kernel/memremap.c | 8 +- + kernel/panic.c | 47 +- + kernel/printk/braille.c | 4 +- + kernel/printk/printk.c | 13 +- + kernel/relay.c | 74 +-- + kernel/smpboot.c | 5 + + kernel/sysctl.c | 55 +- + kernel/uid16.c | 4 +- + kernel/watchdog.c | 1 - + kernel/workqueue.c | 2 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++ + lib/stackdepot.c | 6 + + mm/Kconfig | 9 +- + mm/compaction.c | 154 +++--- + mm/filemap.c | 4 +- + mm/huge_memory.c | 7 +- + mm/internal.h | 2 +- + mm/memcontrol.c | 120 ++--- + mm/oom_kill.c | 205 ++++---- + mm/page-writeback.c | 30 -- + mm/page_alloc.c | 200 +++---- + mm/page_ext.c | 45 +- + mm/page_owner.c | 158 +++++- + mm/slab.c | 25 +- + mm/slab.h | 15 +- + mm/slub.c | 19 +- + mm/vmacache.c | 8 +- + mm/vmalloc.c | 8 +- + mm/vmscan.c | 51 +- + mm/vmstat.c | 84 +-- + mm/zsmalloc.c | 27 +- + net/ipv4/ping.c | 15 +- + net/sunrpc/auth_generic.c | 4 +- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/auth_unix.c | 4 +- + net/sunrpc/svcauth_unix.c | 6 +- + scripts/basic/fixdep.c | 67 +-- + scripts/checkpatch.pl | 63 ++- + scripts/get_maintainer.pl | 4 +- + scripts/mod/Makefile | 11 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 2 +- + sound/soc/intel/common/sst-ipc.c | 6 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + tools/testing/radix-tree/Makefile | 3 +- + tools/testing/radix-tree/iteration_check.c | 180 +++++++ + tools/testing/radix-tree/main.c | 1 + + tools/testing/radix-tree/regression1.c | 2 +- + tools/testing/radix-tree/test.h | 1 + + 148 files changed, 3251 insertions(+), 1849 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 include/uapi/linux/auto_dev-ioctl.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 tools/testing/radix-tree/iteration_check.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s +Applying: kdump, vmcoreinfo: report memory sections virtual addresses +Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 678efb25b2f5...d160711665c3 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d160711665c3 mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kmemleak.rst | 9 +++++ + arch/x86/kernel/machine_kexec_64.c | 3 ++ + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + include/linux/kexec.h | 6 ++++ + include/linux/kmemleak.h | 18 ++++++++++ + include/linux/mlx5/device.h | 2 -- + mm/bootmem.c | 6 ++-- + mm/cma.c | 2 +- + mm/kmemleak.c | 47 ++++++++++++++++++++++++++ + mm/memblock.c | 8 ++--- + mm/nobootmem.c | 2 +- + 11 files changed, 93 insertions(+), 13 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6779ea062b4d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c7a853c96bc1 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160824 |